Merge branch 'Checkmk:master' into feature-support-valkey

Author: mayrstefan

.bazelignore

@@ -7,3 +7,4 @@ bazel/tools/node_modules
 packages/cmk-frontend/node_modules
 packages/cmk-frontend-vue/node_modules
 packages/cmk-shared-typing/node_modules
+packages/cmk-werks/node_modules

.bazelrc

@@ -41,22 +41,22 @@ common --test_summary=detailed
 
 ## For specific commands
 # Always require debug info.
-# build --copt="-g"
-build --flag_alias=cmk_version=@cmk//version
-build --flag_alias=cmk_edition=@cmk//edition
-build --flag_alias=cmk_distro=@cmk//distro
+# common --copt="-g"
+common --flag_alias=cmk_version=@cmk//version
+common --flag_alias=cmk_edition=@cmk//edition
+common --flag_alias=cmk_distro=@cmk//distro
 
 # For some obscure reason, the re2 project made itself valgrind-dirty by default:
 # https://github.com/google/re2/commit/ce6f2884c4b52509fd6c5d12b8f1c40587067784
 # Defining the symbol below has a small performance hit, but makes our stuff
 # valgrind-clean again, which is a crucial feature for debugging the NEB & CMC!
-build --copt="-DRE2_ON_VALGRIND"
+common --copt="-DRE2_ON_VALGRIND"
 
 clean --async
 # all bazel-created temporary and build output files
 # clean --expunge
 # run ...
-test --test_output=all
+common --test_output=all
 
 # Flags for CI builds
 # Definition of "bazel x --config=ci -- ..."
@@ -80,14 +80,14 @@ common --@aspect_rules_ts//ts:skipLibCheck=always
 # common --@aspect_rules_ts//ts:skipLibCheck=honor_tsconfig
 
 ## For specific commands
-# build:ci ...
+# common:ci ...
 # Don't require system python for bootstrapping
 # See: https://github.com/bazelbuild/rules_python/commit/f5b19dce7bc0837396ac03a425cdb9b64643cf61
 # TODO: should be dropped as soon as this becomes the default
 # TODO: this should be the overall default, see discussions in
 # https://tribe29.slack.com/archives/C03PW9280U9/p1728303949973099
-build:ci --@rules_python//python/config_settings:bootstrap_impl=script
-build:ci --noshow_progress
+common:ci --@rules_python//python/config_settings:bootstrap_impl=script
+common:ci --noshow_progress
 
 # clean:ci ...
 # run:ci ...
@@ -101,49 +101,44 @@ common:debug --announce_rc
 common:debug --verbose_failures
 
 ## For specific commands
-# build:debug ...
-# clean:debug ...
-# run:debug ...
-# test:debug ...
 
 ################################################################################
 # Example: bazel build --config=iwyu //non-free/packages/cmc:all
 ################################################################################
-
-build:iwyu --aspects @bazel_iwyu//bazel/iwyu:iwyu.bzl%iwyu_aspect
-build:iwyu --output_groups=report
-build:iwyu --@bazel_iwyu//:iwyu_executable=//bazel/tools:iwyu_bin
-build:iwyu --@bazel_iwyu//:iwyu_opts="--error"
-build:iwyu --@bazel_iwyu//:iwyu_mappings=//bazel/tools:iwyu_mappings
+common:iwyu --aspects @bazel_iwyu//bazel/iwyu:iwyu.bzl%iwyu_aspect
+common:iwyu --output_groups=report
+common:iwyu --@bazel_iwyu//:iwyu_executable=//bazel/tools:iwyu_bin
+common:iwyu --@bazel_iwyu//:iwyu_opts="--error"
+common:iwyu --@bazel_iwyu//:iwyu_mappings=//bazel/tools:iwyu_mappings
 
 ################################################################################
 # Example: bazel build --config=mypy //packages/cmk-agent-based:all
 ################################################################################
-build:mypy --aspects //bazel/tools:aspects.bzl%mypy_aspect
-build:mypy --output_groups=mypy
+common:mypy --aspects //bazel/tools:aspects.bzl%mypy_aspect
+common:mypy --output_groups=mypy
 
 ################################################################################
 # Example: bazel build --config=clippy //packages/host/cmk-agent-ctl:all
 ################################################################################
-build:clippy --aspects=@rules_rust//rust:defs.bzl%rust_clippy_aspect
-build:clippy --output_groups=+clippy_checks
-build:clippy --@rules_rust//:clippy_flags=-Dwarnings
+common:clippy --aspects=@rules_rust//rust:defs.bzl%rust_clippy_aspect
+common:clippy --output_groups=+clippy_checks
+common:clippy --@rules_rust//:clippy_flags=-Dwarnings
 
 # Turn off automatic capturing of environmental stuff like PATH - those will be set explicitly
 # (see https://blog.aspect.build/bazelrc-flags)
-build --incompatible_strict_action_env
+common --incompatible_strict_action_env
 
 # Set PATH manually (see above) for both action_env and host_action_env
 # Note: in the future PATH might not be needed at all as long as Bazel provides all the tools
 #       currently taken from system. For now we still need `/usr/bin` and `/bin` for stuff like
 #       `git`, etc.
 #       Also note that in some distro specific exceptions we force tools to be located in
 #       `/usr/bin` (by symlinking) when building the build images
-build --enable_platform_specific_config
-build:linux --action_env=PATH="/usr/bin:/bin"
-build:linux --host_action_env=PATH="/usr/bin:/bin"
-build:windows --action_env=PATH="c:\\Windows;c:\\Windows\\system32;C:\\Program Files (x86)\\Windows Kits\\10\\App Certification Kit"
-build:windows --host_action_env=PATH="c:\\Windows;c:\\Windows\\system32;C:\\Program Files (x86)\\Windows Kits\\10\\App Certification Kit"
+common --enable_platform_specific_config
+common:linux --action_env=PATH="/usr/bin:/bin"
+common:linux --host_action_env=PATH="/usr/bin:/bin"
+common:windows --action_env=PATH="c:\\Windows;c:\\Windows\\system32;C:\\Program Files (x86)\\Windows Kits\\10\\App Certification Kit"
+common:windows --host_action_env=PATH="c:\\Windows;c:\\Windows\\system32;C:\\Program Files (x86)\\Windows Kits\\10\\App Certification Kit"
 
 # Default coverage configuration
 coverage --keep_going

.dockerignore

@@ -62,7 +62,6 @@ check-mk-*.tar.gz
 check-mk-*_amd64.deb
 clang-analyzer/
 cmc-*.tar.gz
-cme-*.tar.gz
 /container_shadow_workspace*/
 download/
 doc/plugin-api/build/

.envrc

@@ -11,3 +11,9 @@ layout_cmk_uv() {
 }
 
 layout cmk_uv
+
+watch_file bazel-out/bazel_env-opt/bin/bazel/tools/bazel_env/bin
+PATH_add bazel-out/bazel_env-opt/bin/bazel/tools/bazel_env/bin
+if [[ ! -d bazel-out/bazel_env-opt/bin/bazel/tools/bazel_env/bin ]]; then
+  bazel run //bazel/tools:bazel_env
+fi

.github/workflows/pr.yaml

@@ -11,62 +11,64 @@ name: PR-CI
 on: [push, pull_request]
 
 jobs:
-  testing:
-    runs-on: ubuntu-22.04
-    env:
-      PYTHONWARNINGS: ignore:DeprecationWarning
-      # Avoid falling back to our internal bazel remote cache on github actions
-      BAZEL_CACHE_URL: ""
-    strategy:
-      matrix:
-        include:
-        - name: Bandit tests
-          target: test-bandit
-        - name: Python formatting
-          target: test-format-python
-        - name: Ruff lint tests
-          target: test-ruff
-        - name: Python unit tests
-          target: test-unit
-        - name: mypy tests
-          target: test-mypy-raw
-    steps:
-    - name: Set Environment Variables
-      run: |
-        # Using existing environment variables within another variables is not working in the jobs.*.env section
-        #  more infos see: https://brandur.org/fragments/github-actions-env-vars-in-env-vars
-        echo "UV_CACHE_DIR=$HOME/.cache/uv" >> $GITHUB_ENV
-    - name: Checkout Repository
-      uses: actions/checkout@v3
-    - name: Cache uv
-      uses: actions/cache@v3
-      with:
-        key: uv-${{ runner.os }}-${{ hashFiles('requirements_all_lock.txt') }}
-        path: ${{ env.UV_CACHE_DIR  }}
-    - name: Cache bazel
-      uses: actions/cache@v3
-      with:
-        key: ${{ runner.os }}-bazel-${{ hashFiles('.bazelversion', '.bazelrc', 'WORKSPACE', 'MODULE.bazel') }}
-        path: |
-          ~/.cache/bazel
-        restore-keys: |
-          ${{ runner.os }}-bazel-
-    - name: Setup Environment
-      run: |
-        # ksh: Needed for some "unit test" (test_mk_errpt_aix).
-        # librrd-dev: Needed for building rrdtool python bindings.
-        # libldap2-dev: Needed for building python-ldap.
-        # libsasl2-dev: Needed for building python-ldap.
-        # libkrb5-dev: Needed for building pykerberos.
-        # libglib2.0-dev: required by packages/glib and therfore transitive by python unit tests
-        # gettext: Needed for some "unit tests" (test_i18n.py)
-        sudo add-apt-repository -y ppa:ubuntu-toolchain-r/ppa
-        sudo add-apt-repository -y ppa:ubuntu-toolchain-r/test
-        sudo apt-get update
-        sudo apt-get install ksh libpango1.0-dev librrd-dev libldap2-dev libsasl2-dev libkrb5-dev libglib2.0-dev gettext g++-13 g++-14
-        make .venv
-    - name: Run ${{ matrix.name  }}
-      env:
-        TEST_TARGETS: ${{ matrix.target }}
-      run: |
-        make -C tests $TEST_TARGETS
+    testing:
+        runs-on: ubuntu-24.04
+        env:
+            PYTHONWARNINGS: ignore:DeprecationWarning
+            # Avoid falling back to our internal bazel remote cache on github actions
+            BAZEL_CACHE_URL: ""
+            # Needed by "make .venv" to compute PYTHON_REQUIREMENTS_TEST
+            EDITION: community
+        strategy:
+            matrix:
+                include:
+                    - name: Bandit tests
+                      target: test-bandit
+                    - name: Formatting
+                      target: test-format
+                    - name: Ruff lint tests
+                      target: test-ruff
+                    - name: Python unit tests
+                      target: test-unit
+                    - name: mypy tests
+                      target: test-mypy-gpl
+        steps:
+            - name: Set Environment Variables
+              run: |
+                  # Using existing environment variables within another variables is not working in the jobs.*.env section
+                  #  more infos see: https://brandur.org/fragments/github-actions-env-vars-in-env-vars
+                  echo "UV_CACHE_DIR=$HOME/.cache/uv" >> $GITHUB_ENV
+            - name: Checkout Repository
+              uses: actions/checkout@v3
+            - name: Cache uv
+              uses: actions/cache@v3
+              with:
+                  key: uv-${{ runner.os }}-${{ hashFiles('requirements_all_lock.txt') }}
+                  path: ${{ env.UV_CACHE_DIR  }}
+            - name: Cache bazel
+              uses: actions/cache@v3
+              with:
+                  key: ${{ runner.os }}-bazel-${{ hashFiles('.bazelversion', '.bazelrc', 'WORKSPACE', 'MODULE.bazel') }}
+                  path: |
+                      ~/.cache/bazel
+                  restore-keys: |
+                      ${{ runner.os }}-bazel-
+            - name: Setup Environment
+              run: |
+                  # ksh: Needed for some "unit test" (test_mk_errpt_aix).
+                  # librrd-dev: Needed for building rrdtool python bindings.
+                  # libldap2-dev: Needed for building python-ldap.
+                  # libsasl2-dev: Needed for building python-ldap.
+                  # libkrb5-dev: Needed for building pykerberos.
+                  # libglib2.0-dev: required by packages/glib and therfore transitive by python unit tests
+                  # gettext: Needed for some "unit tests" (test_i18n.py)
+                  sudo add-apt-repository -y ppa:ubuntu-toolchain-r/ppa
+                  sudo add-apt-repository -y ppa:ubuntu-toolchain-r/test
+                  sudo apt-get update
+                  sudo apt-get install ksh libpango1.0-dev librrd-dev libldap2-dev libsasl2-dev libkrb5-dev libglib2.0-dev gettext "^g\+\+-14$"
+                  make .venv
+            - name: Run ${{ matrix.name  }}
+              env:
+                  TEST_TARGETS: ${{ matrix.target }}
+              run: |
+                  make -C tests $TEST_TARGETS

.gitignore

@@ -1,4 +1,3 @@
-.*.swo
 .*.swp
 .bugs/.last
 .bugs/.my_ids
@@ -52,7 +51,6 @@ check-mk-*.tar.gz
 check-mk-*_amd64.deb
 clang-analyzer/
 cmc-*.tar.gz
-cme-*.tar.gz
 agents/linux/*
 doc/plugin-api/build/
 doc/plugin-api/source/apidoc/

.pre-commit-config.yaml

@@ -142,9 +142,10 @@ repos:
             verbose: true
             require_serial: true
           - id: taplo
-            name: format pyproject.toml
-            entry: bazel run //bazel/tools:taplo_bin -- format pyproject.toml
-            pass_filenames: false
+            name: format pyproject.toml files
+            entry: bazel run //bazel/tools/format:taplo_bin -- format
+            pass_filenames: true
             language: system
+            files: pyproject.toml
             verbose: true
             require_serial: true

.prettierignore

@@ -2,11 +2,14 @@
 package-lock.json
 pnpm-lock.yaml
 node_modules/
+.werks/
 
 *.jsonl
 
-# cmk-frontend
 # 3rd party
+third_party/
+
+# cmk-frontend
 packages/cmk-frontend/src/js/modules/colorpicker.js
 packages/cmk-frontend/src/jquery
 packages/cmk-frontend/src/openapi

.werks/16732.md

@@ -0,0 +1,18 @@
+[//]: # (werk v2)
+# Fix: Improve description on FutureWarning errors
+
+key        | value
+---------- | ---
+date       | 2025-11-03T13:38:29+00:00
+version    | 2.5.0b1
+class      | fix
+edition    | cre
+component  | wato
+level      | 1
+compatible | yes
+
+The error message for warnings of type FutureWarning now includes the specific regex that triggered the warning, which was previously missing.
+
+This enhancement provides users with more detailed information, making it easier to identify and address deprecated or problematic configurations early. As a result, users can improve system reliability by resolving issues before they cause failures.
+
+No configuration changes are required; this update is purely informational.

.werks/16906.md

@@ -0,0 +1,22 @@
+[//]: # (werk v2)
+# Bytecode compilation in post-install step rather than packaging
+
+key        | value
+---------- | ---
+date       | 2025-11-03T13:37:23+00:00
+version    | 2.5.0b1
+class      | feature
+edition    | cre
+component  | omd
+level      | 1
+compatible | yes
+
+Pre-compilation for Python byte code had previously been done during package
+builds, resulting in bigger Checkmk installation packages and potentially
+missing precompiled files due to differences in packaging processes.
+
+This change turns the different `compileall` call sites into one post-install
+step for both `.deb` and `.rpm` packages, handling the whole Checkmk package
+at once.
+
+As a result the whole Checkmk installation process takes roughly 10sec longer.