Merge branch 'master' into diskstat_disk_id

.bazelversion

@@ -1 +1 @@
-6.1.1
+7.1.1

.gitignore

@@ -20,8 +20,8 @@
 .testmondata
 .venv.lock
 /.venv/
-/.docker_workspace/
-/build_user_home/
+/container_shadow_workspace*/
+/shared_cargo_folder/
 *.cookie
 *.gcno
 *.gcov
@@ -61,6 +61,7 @@ GPATH
 GRTAGS
 GTAGS
 htmlcov/
+logback.log
 mk-livestatus-*.tar.gz
 node_modules/
 omd/bazel-*
@@ -76,7 +77,6 @@ tests/var/*
 tests/results/*
 tests/.hypothesis/
 /results
-/buildscripts/infrastructure/build-nodes/scripts/defines.make
 /buildscripts/docker_image_aliases/docker-image-alias-resolve-error.txt
 /bazel-*
 
@@ -99,3 +99,7 @@ tests/.hypothesis/
 .ionide
 
 # End of https://www.toptal.com/developers/gitignore/api/visualstudiocode
+
+# gui-e2e tests: playwright specific ignores
+test-results/
+*.png

.gitmodules

@@ -1,4 +1,4 @@
 [submodule "tests/qa-test-data"]
 	path = tests/qa-test-data
         url = ../qa-test-data
-	branch = main
+	branch = master

.groovylintrc.json

@@ -0,0 +1,78 @@
+{
+    "extends": "recommended",
+    "rules":
+    {
+        "basic.DeadCode": "error",
+        "convention.CompileStatic": "off",
+        "convention.FieldTypeRequired": "info",
+        "convention.IfStatementCouldBeTernary": "info",
+        "convention.MethodReturnTypeRequired": "off",
+        "convention.NoDef": "off",
+        "convention.TrailingComma": "warning",
+        "convention.VariableTypeRequired": "off",
+        "design.Instanceof": "off",
+        "dry.DuplicateListLiteral": "info",
+        "dry.DuplicateMapLiteral": "warning",
+        "dry.DuplicateStringLiteral":
+        {
+            "ignoreStrings": "nexus",
+            "severity": "info"
+        },
+        "exceptions.ThrowException": "warning",
+        "exceptions.ThrowNullPointerException": "info",
+        "exceptions.ThrowRuntimeException": "info",
+        "exceptions.ThrowThrowable": "info",
+        "formatting.BracesForClass": "info",
+        "formatting.BracesForForLoop": "info",
+        "formatting.BracesForIfElse": "info",
+        "formatting.BracesForMethod": "info",
+        "formatting.BracesForTryCatchFinally": "info",
+        "formatting.ConsecutiveBlankLines": "warning",
+        "formatting.FileEndsWithoutNewline": "warning",
+        "formatting.Indentation":
+        {
+            "severity": "warning",
+            "spacesPerIndentLevel": 4
+        },
+        "formatting.LineLength":
+        {
+            "length": 140,
+            "severity": "warning"
+        },
+        "formatting.SpaceAroundMapEntryColon": "off",
+        "groovyism.ExplicitCallToEqualsMethod": "info",
+        "logging.Println": "off",
+        "naming.FactoryMethodName": "off",
+        "naming.ParameterName":
+        {
+            "regex": "^[a-zA-Z0-9_]*$",
+            "severity": "info"
+        },
+        "naming.VariableName":
+        {
+            "regex": "^[a-zA-Z0-9_]*$",
+            "severity": "info"
+        },
+        "size.MethodSize":
+        {
+            "maxLines": 150,
+            "severity": "warning"
+        },
+        "size.NestedBlockDepth":
+        {
+            "maxNestedBlockDepth": 8,
+            "severity": "warning"
+        },
+        "unnecessary.UnnecessaryGString": "off",
+        "unnecessary.UnnecessaryParenthesesForMethodCallWithClosure": "off",
+        "unnecessary.UnnecessaryReturnKeyword": "off",
+        "unnecessary.UnnecessarySemicolon": "off",
+        "unused.UnusedArray": "error",
+        "unused.UnusedMethodParameter": "error",
+        "unused.UnusedObject": "error",
+        "unused.UnusedPrivateField": "error",
+        "unused.UnusedPrivateMethod": "error",
+        "unused.UnusedPrivateMethodParameter": "error",
+        "unused.UnusedVariable": "error"
+    }
+}

.pre-commit-config.yaml

@@ -34,11 +34,16 @@ repos:
             exclude: |
                 (?x)^(
                     ^agents/plugins/|
-                    ^enterprise/agents/plugins/|
+                    ^non-free/cmk-update-agent/|
                     ^tests/agent-plugin-unit/
                 )
     - repo: local
       hooks:
+          - id: check-cmk-namespace
+            name: Check cmk namespace package
+            language: script
+            entry: scripts/check-cmk-namespace
+            types: [file, python]
           - id: remove-stale-imports
             name: Remove stale imports
             language: script
@@ -54,12 +59,25 @@ repos:
             entry: scripts/run-black
             language: script
             types: [file, python]
+          - id: bandit
+            name: Run bandit
+            # -l level low -ll = level medium -lll level high
+            entry: scripts/run-pipenv run bandit --config bandit.yaml -ll
+            language: script
+            types: [file, python]
           - id: omd-python-modules
             name: Check Python modules in OMD
             entry: scripts/check-omd-python-modules
             language: script
             files: omd/packages/python3?-modules
             types: [file]
+          - id: sphinx
+            name: Sphinx Documentation
+            entry: scripts/run-pipenv run make -C doc/documentation html
+            files: ^doc/documentation/.*(rst|puml)$
+            pass_filenames: false
+            language: script
+            types: [file]
           - id: pylint
             name: Check pylint
             entry: scripts/check-pylint

.pylintrc

@@ -48,11 +48,6 @@ disable=
     # programming practice. In some cases, they can even hide bugs.
     broad-except,
     #---------------------------------------------------------------------------
-    # Enabling this would be nice, but not crucial. Nevertheless, this would
-    # improve readability and involve some cleanups in our class hierarchy, so
-    # we should do this some day.
-    protected-access,
-    #---------------------------------------------------------------------------
     # Enabling this would be nice, but not crucial. At the moment, we have quite
     # a few violations, so we postpone fixing this. When we do it eventually, we
     # probably want to use "include-naming-hint=yes" in the BASIC section.
@@ -99,9 +94,15 @@ disable=
     # Black doesn't split long strings, we'll have to this by ourselves, see
     # https://github.com/psf/black/issues/1331
     line-too-long,
-    #---------------------------------------------------------------------------
-    # We are light years away from enabling this...
-    missing-docstring,
+    # Since Black 24 black and pylint started to disagree on `def foo(): ...`
+    # https://github.com/psf/black/issues/4173
+    # black is our formatter so the black way is the proper way...
+    multiple-statements,
+    #---------------------------------------------------------------------------
+    # We are light years away from enabling these...
+    missing-module-docstring,
+    missing-class-docstring,
+    missing-function-docstring,
     #---------------------------------------------------------------------------
     # Enabling the two spelling-related checks increases pylints runtime from
     # 11 min to 40 min, so we better keep those disabled for normal runs.

.pylintrc-windows

@@ -96,8 +96,10 @@ disable=
     # https://github.com/psf/black/issues/1331
     line-too-long,
     #---------------------------------------------------------------------------
-    # We are light years away from enabling this...
-    missing-docstring,
+    # We are light years away from enabling these...
+    missing-module-docstring,
+    missing-class-docstring,
+    missing-function-docstring,
     #---------------------------------------------------------------------------
     # Enabling the two spelling-related checks increases pylints runtime from
     # 11 min to 40 min, so we better keep those disabled for normal runs.

.werks/14219

@@ -0,0 +1,9 @@
+Title: Setup: Improved speed of ineffective rule search
+Class: feature
+Compatible: compat
+Component: wato
+Date: 1702891112
+Edition: cre
+Level: 1
+Version: 2.3.0b1
+

.werks/14220.md

@@ -0,0 +1,14 @@
+[//]: # (werk v2)
+# BI: fixed exception in check if aggregation was in state PENDING
+
+key        | value
+---------- | ---
+date       | 2024-01-30T08:17:38+00:00
+version    | 2.4.0b1
+class      | fix
+edition    | cre
+component  | bi
+level      | 1
+compatible | yes
+
+

.werks/14221.md

@@ -0,0 +1,14 @@
+[//]: # (werk v2)
+# Parent/Child topology: No longer ignoring additionally configured filters
+
+key        | value
+---------- | ---
+date       | 2024-01-30T14:11:43+00:00
+version    | 2.4.0b1
+class      | fix
+edition    | cre
+component  | multisite
+level      | 1
+compatible | yes
+
+

.werks/14222.md

@@ -0,0 +1,17 @@
+[//]: # (werk v2)
+# BI configuration: Changed element order of "restrict severity to at worst"
+
+key        | value
+---------- | ---
+compatible | yes
+version    | 2.4.0b1
+date       | 2024-01-31T09:55:00+00:00
+level      | 1
+class      | feature
+component  | bi
+edition    | cre
+
+This werk only introduces a visual fix, so no functional changes.
+The order of the dropdown choice elements did not reflect the severity of the states.
+The correct severity order for the BI is OK->WARN->UNKNOWN->CRIT, which differs
+from the order of the monitoring states OK->WARN->CRIT->UNKNOWN.

.werks/14223.md

@@ -0,0 +1,47 @@
+[//]: # (werk v2)
+# Introduced topology visualization
+
+key        | value
+---------- | ---
+date       | 2024-02-25T15:22:55+00:00
+version    | 2.4.0b1
+class      | feature
+edition    | cee
+component  | multisite
+level      | 2
+compatible | yes
+
+
+The topology visualization is a new feature that allows the visualization of complex interconnected networks.
+A simple example for this visualization is the parent/child topology. The new mechanism that comes with this werk allows the linking of external data with the data of the monitoring core.
+When it comes to the display, you simply define some starting points via the filter form.
+Based on these, the topology visualization then builds a mesh of incoming and outgoing connections.
+
+The type of external data might be
+* Netstat, showing connections between the interfaces/ips/ports
+* LLDP/CDP, showing the network neighbors
+
+
+There is a common data format specification for all external data.
+So you just can create your own data file which provides information about the relationships between hosts, services or generic objects which are not linked to the core.
+If you drop this file into a specific folder, the visualization will handle the rest. There is no need to write python code.
+
+Right now you can configure
+* Objects - either linked to an entity in the core or some standalone object
+* Icons/emblems which should be added to the object
+* Connections between objects
+* Line style/color of specific connections
+
+Since this is a quite visualization heavy topic and hard to explain only via text, feel free to check out the
+[thread](https://forum.checkmk.com/t/network-visualization-now-in-version-2-3/44467) in our checkmk forum
+
+We will also publish a blog article in the coming weeks
+
+
+```
+Important:
+The visualization only works if external data is provided in a special folder.
+At the moment these are not created by Checkmk, but come from external MKP developments.
+```
+
+

.werks/14224.md

@@ -0,0 +1,14 @@
+[//]: # (werk v2)
+# Frozen BI: Frozen icon now also indicates if the non-frozen version differs from the frozen one
+
+key        | value
+---------- | ---
+date       | 2024-02-27T15:09:59+00:00
+version    | 2.4.0b1
+class      | feature
+edition    | cre
+component  | bi
+level      | 1
+compatible | yes
+
+