Merge branch '0.25.6' of github.com:Altinity/clickhouse-operator into fix-keeper-dashboard

Signed-off-by: Slach <[email protected]>

# Conflicts:
#	deploy/prometheus/prometheus-alert-rules-chkeeper.yaml

Author: Slach

.github/workflows/run_tests.yaml

@@ -47,7 +47,7 @@ jobs:
         with:
           driver: docker
           container-runtime: containerd
-          kubernetes-version: v1.31.2
+          kubernetes-version: v1.33.5
           cpus: max
           memory: max
 

config/config-dev.yaml

@@ -123,7 +123,7 @@ clickhouse:
           # these settings should not lead to pod restarts
           - settings/display_secrets_in_show_and_select: "no"
 
-          - zookeeper/*: "yes"
+          - zookeeper/*: "no"
 
           - files/*.xml: "yes"
           - files/config.d/*.xml: "yes"
@@ -455,8 +455,8 @@ status:
   fields:
     action: false
     actions: false
-    error: false
-    errors: false
+    error: true
+    errors: true
 
 ################################################
 ##

config/config.yaml

@@ -121,7 +121,7 @@ clickhouse:
           # these settings should not lead to pod restarts
           - settings/display_secrets_in_show_and_select: "no"
 
-          - zookeeper/*: "yes"
+          - zookeeper/*: "no"
 
           - files/*.xml: "yes"
           - files/config.d/*.xml: "yes"
@@ -453,8 +453,8 @@ status:
   fields:
     action: false
     actions: false
-    error: false
-    errors: false
+    error: true
+    errors: true
 
 ################################################
 ##

deploy/builder/templates-config/config.yaml

@@ -115,7 +115,7 @@ clickhouse:
           # these settings should not lead to pod restarts
           - settings/display_secrets_in_show_and_select: "no"
 
-          - zookeeper/*: "yes"
+          - zookeeper/*: "no"
 
           - files/*.xml: "yes"
           - files/config.d/*.xml: "yes"
@@ -447,8 +447,8 @@ status:
   fields:
     action: false
     actions: false
-    error: false
-    errors: false
+    error: true
+    errors: true
 
 ################################################
 ##

deploy/grafana/grafana-with-grafana-operator/grafana-dashboard-clickhouse-keeper-cr-template.yaml

@@ -20,6 +20,6 @@ spec:
   json: ""
   plugins:
     - name: "vertamedia-clickhouse-datasource"
-      version: "3.3.1"
+      version: "3.4.8"
     - name: "grafana-piechart-panel"
       version: "1.6.4"

deploy/grafana/grafana-with-grafana-operator/grafana-dashboard-operator-cr-template.yaml

@@ -21,6 +21,6 @@ spec:
   # TODO remove this plugin definition after resolve https://github.com/integr8ly/grafana-operator/issues/155
   plugins:
     - name: "vertamedia-clickhouse-datasource"
-      version: "3.3.1"
+      version: "3.4.8"
     - name: "grafana-piechart-panel"
       version: "1.6.4"

deploy/grafana/grafana-with-grafana-operator/grafana-dashboard-queries-cr-template.yaml

@@ -20,4 +20,4 @@ spec:
       datasourceName: "$GRAFANA_PROMETHEUS_DATASOURCE_NAME"
   plugins:
     - name: "vertamedia-clickhouse-datasource"
-      version: "3.3.1"
+      version: "3.4.8"

deploy/helm/clickhouse-operator/values.yaml

@@ -324,7 +324,7 @@ configs:
                 - settings/user_directories/*: "no"
                 # these settings should not lead to pod restarts
                 - settings/display_secrets_in_show_and_select: "no"
-                - zookeeper/*: "yes"
+                - zookeeper/*: "no"
                 - files/*.xml: "yes"
                 - files/config.d/*.xml: "yes"
                 - files/config.d/*dict*.xml: "no"
@@ -634,8 +634,8 @@ configs:
         fields:
           action: false
           actions: false
-          error: false
-          errors: false
+          error: true
+          errors: true
       ################################################
       ##
       ## StatefulSet management section

deploy/operator/clickhouse-operator-install-ansible.yaml

@@ -4775,7 +4775,7 @@ data:
               # these settings should not lead to pod restarts
               - settings/display_secrets_in_show_and_select: "no"
     
-              - zookeeper/*: "yes"
+              - zookeeper/*: "no"
     
               - files/*.xml: "yes"
               - files/config.d/*.xml: "yes"
@@ -5107,8 +5107,8 @@ data:
       fields:
         action: false
         actions: false
-        error: false
-        errors: false
+        error: true
+        errors: true
     
     ################################################
     ##

deploy/operator/clickhouse-operator-install-bundle-v1beta1.yaml

@@ -4974,7 +4974,7 @@ data:
               # these settings should not lead to pod restarts
               - settings/display_secrets_in_show_and_select: "no"
 
-              - zookeeper/*: "yes"
+              - zookeeper/*: "no"
 
               - files/*.xml: "yes"
               - files/config.d/*.xml: "yes"
@@ -5306,8 +5306,8 @@ data:
       fields:
         action: false
         actions: false
-        error: false
-        errors: false
+        error: true
+        errors: true
 
     ################################################
     ##