OCPBUGS-34568,OCPBUGS-35095,OCPBUGS-60689,OCPBUGS-60691,OCPBUGS-60692: non-HA alert cases

CHANGELOG.md

@@ -3,6 +3,10 @@
 ## 4.20
 
 - [#2595](https://github.com/openshift/cluster-monitoring-operator/pull/2595) Multi-tenant support for KSM's CRS feature-set downstream.
+- [#2360](https://github.com/openshift/cluster-monitoring-operator/pull/2630) Make `KubeCPUOvercommit` and `KubeMemoryOvercommit` alerts accommodate for non-HA scenarios, in addition to HA ones. Also, the following alerts were added:
+  - `KubePdbNotEnoughHealthyPods`
+  - `KubeNodePressure`
+  - `KubeNodeEviction`
 
 ## 4.18
 

assets/admission-webhook/deployment.yaml

@@ -5,7 +5,7 @@ metadata:
     app.kubernetes.io/managed-by: cluster-monitoring-operator
     app.kubernetes.io/name: prometheus-operator-admission-webhook
     app.kubernetes.io/part-of: openshift-monitoring
-    app.kubernetes.io/version: 0.84.0
+    app.kubernetes.io/version: 0.84.1
   name: prometheus-operator-admission-webhook
   namespace: openshift-monitoring
 spec:
@@ -27,7 +27,7 @@ spec:
         app.kubernetes.io/managed-by: cluster-monitoring-operator
         app.kubernetes.io/name: prometheus-operator-admission-webhook
         app.kubernetes.io/part-of: openshift-monitoring
-        app.kubernetes.io/version: 0.84.0
+        app.kubernetes.io/version: 0.84.1
     spec:
       affinity:
         podAntiAffinity:
@@ -47,7 +47,7 @@ spec:
         - --web.key-file=/etc/tls/private/tls.key
         - --web.tls-cipher-suites=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256,TLS_ECDHE_ECDSA_WITH_AES_128_GCM_SHA256,TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384,TLS_ECDHE_ECDSA_WITH_AES_256_GCM_SHA384,TLS_ECDHE_RSA_WITH_CHACHA20_POLY1305,TLS_ECDHE_ECDSA_WITH_CHACHA20_POLY1305
         - --web.tls-min-version=VersionTLS12
-        image: quay.io/prometheus-operator/admission-webhook:v0.84.0
+        image: quay.io/prometheus-operator/admission-webhook:v0.84.1
         livenessProbe:
           httpGet:
             path: /healthz

assets/admission-webhook/pod-disruption-budget.yaml

@@ -5,7 +5,7 @@ metadata:
     app.kubernetes.io/managed-by: cluster-monitoring-operator
     app.kubernetes.io/name: prometheus-operator-admission-webhook
     app.kubernetes.io/part-of: openshift-monitoring
-    app.kubernetes.io/version: 0.84.0
+    app.kubernetes.io/version: 0.84.1
   name: prometheus-operator-admission-webhook
   namespace: openshift-monitoring
 spec:

assets/admission-webhook/service-account.yaml

@@ -6,6 +6,6 @@ metadata:
     app.kubernetes.io/managed-by: cluster-monitoring-operator
     app.kubernetes.io/name: prometheus-operator-admission-webhook
     app.kubernetes.io/part-of: openshift-monitoring
-    app.kubernetes.io/version: 0.84.0
+    app.kubernetes.io/version: 0.84.1
   name: prometheus-operator-admission-webhook
   namespace: openshift-monitoring

assets/admission-webhook/service.yaml

@@ -8,7 +8,7 @@ metadata:
     app.kubernetes.io/managed-by: cluster-monitoring-operator
     app.kubernetes.io/name: prometheus-operator-admission-webhook
     app.kubernetes.io/part-of: openshift-monitoring
-    app.kubernetes.io/version: 0.84.0
+    app.kubernetes.io/version: 0.84.1
   name: prometheus-operator-admission-webhook
   namespace: openshift-monitoring
 spec:

assets/prometheus-operator-user-workload/cluster-role-binding.yaml

@@ -6,7 +6,7 @@ metadata:
     app.kubernetes.io/managed-by: cluster-monitoring-operator
     app.kubernetes.io/name: prometheus-operator
     app.kubernetes.io/part-of: openshift-monitoring
-    app.kubernetes.io/version: 0.84.0
+    app.kubernetes.io/version: 0.84.1
   name: prometheus-user-workload-operator
 roleRef:
   apiGroup: rbac.authorization.k8s.io

assets/prometheus-operator-user-workload/cluster-role.yaml

@@ -6,7 +6,7 @@ metadata:
     app.kubernetes.io/managed-by: cluster-monitoring-operator
     app.kubernetes.io/name: prometheus-operator
     app.kubernetes.io/part-of: openshift-monitoring
-    app.kubernetes.io/version: 0.84.0
+    app.kubernetes.io/version: 0.84.1
   name: prometheus-user-workload-operator
 rules:
 - apiGroups:

assets/prometheus-operator-user-workload/deployment.yaml

@@ -6,7 +6,7 @@ metadata:
     app.kubernetes.io/managed-by: cluster-monitoring-operator
     app.kubernetes.io/name: prometheus-operator
     app.kubernetes.io/part-of: openshift-monitoring
-    app.kubernetes.io/version: 0.84.0
+    app.kubernetes.io/version: 0.84.1
   name: prometheus-operator
   namespace: openshift-user-workload-monitoring
 spec:
@@ -27,12 +27,12 @@ spec:
         app.kubernetes.io/managed-by: cluster-monitoring-operator
         app.kubernetes.io/name: prometheus-operator
         app.kubernetes.io/part-of: openshift-monitoring
-        app.kubernetes.io/version: 0.84.0
+        app.kubernetes.io/version: 0.84.1
     spec:
       automountServiceAccountToken: true
       containers:
       - args:
-        - --prometheus-config-reloader=quay.io/prometheus-operator/prometheus-config-reloader:v0.84.0
+        - --prometheus-config-reloader=quay.io/prometheus-operator/prometheus-config-reloader:v0.84.1
         - --kubelet-endpoints=true
         - --kubelet-endpointslice=false
         - --prometheus-instance-namespaces=openshift-user-workload-monitoring
@@ -47,7 +47,7 @@ spec:
         env:
         - name: GOGC
           value: "30"
-        image: quay.io/prometheus-operator/prometheus-operator:v0.84.0
+        image: quay.io/prometheus-operator/prometheus-operator:v0.84.1
         name: prometheus-operator
         ports: []
         resources:

assets/prometheus-operator-user-workload/service-account.yaml

@@ -7,6 +7,6 @@ metadata:
     app.kubernetes.io/managed-by: cluster-monitoring-operator
     app.kubernetes.io/name: prometheus-operator
     app.kubernetes.io/part-of: openshift-monitoring
-    app.kubernetes.io/version: 0.84.0
+    app.kubernetes.io/version: 0.84.1
   name: prometheus-operator
   namespace: openshift-user-workload-monitoring

assets/prometheus-operator-user-workload/service-monitor.yaml

@@ -6,7 +6,7 @@ metadata:
     app.kubernetes.io/managed-by: cluster-monitoring-operator
     app.kubernetes.io/name: prometheus-operator
     app.kubernetes.io/part-of: openshift-monitoring
-    app.kubernetes.io/version: 0.84.0
+    app.kubernetes.io/version: 0.84.1
   name: prometheus-operator
   namespace: openshift-user-workload-monitoring
 spec:
@@ -24,4 +24,4 @@ spec:
       app.kubernetes.io/component: controller
       app.kubernetes.io/name: prometheus-operator
       app.kubernetes.io/part-of: openshift-monitoring
-      app.kubernetes.io/version: 0.84.0
+      app.kubernetes.io/version: 0.84.1

assets/prometheus-operator-user-workload/service.yaml

@@ -9,7 +9,7 @@ metadata:
     app.kubernetes.io/managed-by: cluster-monitoring-operator
     app.kubernetes.io/name: prometheus-operator
     app.kubernetes.io/part-of: openshift-monitoring
-    app.kubernetes.io/version: 0.84.0
+    app.kubernetes.io/version: 0.84.1
   name: prometheus-operator
   namespace: openshift-user-workload-monitoring
 spec:

assets/prometheus-operator/cluster-role-binding.yaml

@@ -6,7 +6,7 @@ metadata:
     app.kubernetes.io/managed-by: cluster-monitoring-operator
     app.kubernetes.io/name: prometheus-operator
     app.kubernetes.io/part-of: openshift-monitoring
-    app.kubernetes.io/version: 0.84.0
+    app.kubernetes.io/version: 0.84.1
   name: prometheus-operator
 roleRef:
   apiGroup: rbac.authorization.k8s.io

assets/prometheus-operator/cluster-role.yaml

@@ -6,7 +6,7 @@ metadata:
     app.kubernetes.io/managed-by: cluster-monitoring-operator
     app.kubernetes.io/name: prometheus-operator
     app.kubernetes.io/part-of: openshift-monitoring
-    app.kubernetes.io/version: 0.84.0
+    app.kubernetes.io/version: 0.84.1
   name: prometheus-operator
 rules:
 - apiGroups:

assets/prometheus-operator/deployment.yaml

@@ -6,7 +6,7 @@ metadata:
     app.kubernetes.io/managed-by: cluster-monitoring-operator
     app.kubernetes.io/name: prometheus-operator
     app.kubernetes.io/part-of: openshift-monitoring
-    app.kubernetes.io/version: 0.84.0
+    app.kubernetes.io/version: 0.84.1
   name: prometheus-operator
   namespace: openshift-monitoring
 spec:
@@ -27,13 +27,13 @@ spec:
         app.kubernetes.io/managed-by: cluster-monitoring-operator
         app.kubernetes.io/name: prometheus-operator
         app.kubernetes.io/part-of: openshift-monitoring
-        app.kubernetes.io/version: 0.84.0
+        app.kubernetes.io/version: 0.84.1
     spec:
       automountServiceAccountToken: true
       containers:
       - args:
         - --kubelet-service=kube-system/kubelet
-        - --prometheus-config-reloader=quay.io/prometheus-operator/prometheus-config-reloader:v0.84.0
+        - --prometheus-config-reloader=quay.io/prometheus-operator/prometheus-config-reloader:v0.84.1
         - --kubelet-endpoints=true
         - --kubelet-endpointslice=false
         - --prometheus-instance-namespaces=openshift-monitoring
@@ -48,7 +48,7 @@ spec:
         env:
         - name: GOGC
           value: "30"
-        image: quay.io/prometheus-operator/prometheus-operator:v0.84.0
+        image: quay.io/prometheus-operator/prometheus-operator:v0.84.1
         name: prometheus-operator
         ports: []
         resources:

assets/prometheus-operator/prometheus-rule.yaml

@@ -6,7 +6,7 @@ metadata:
     app.kubernetes.io/managed-by: cluster-monitoring-operator
     app.kubernetes.io/name: prometheus-operator
     app.kubernetes.io/part-of: openshift-monitoring
-    app.kubernetes.io/version: 0.84.0
+    app.kubernetes.io/version: 0.84.1
     prometheus: k8s
     role: alert-rules
   name: prometheus-operator-rules

assets/prometheus-operator/service-account.yaml

@@ -7,6 +7,6 @@ metadata:
     app.kubernetes.io/managed-by: cluster-monitoring-operator
     app.kubernetes.io/name: prometheus-operator
     app.kubernetes.io/part-of: openshift-monitoring
-    app.kubernetes.io/version: 0.84.0
+    app.kubernetes.io/version: 0.84.1
   name: prometheus-operator
   namespace: openshift-monitoring

assets/prometheus-operator/service-monitor.yaml

@@ -6,7 +6,7 @@ metadata:
     app.kubernetes.io/managed-by: cluster-monitoring-operator
     app.kubernetes.io/name: prometheus-operator
     app.kubernetes.io/part-of: openshift-monitoring
-    app.kubernetes.io/version: 0.84.0
+    app.kubernetes.io/version: 0.84.1
   name: prometheus-operator
   namespace: openshift-monitoring
 spec:
@@ -24,4 +24,4 @@ spec:
       app.kubernetes.io/component: controller
       app.kubernetes.io/name: prometheus-operator
       app.kubernetes.io/part-of: openshift-monitoring
-      app.kubernetes.io/version: 0.84.0
+      app.kubernetes.io/version: 0.84.1

assets/prometheus-operator/service.yaml

@@ -9,7 +9,7 @@ metadata:
     app.kubernetes.io/managed-by: cluster-monitoring-operator
     app.kubernetes.io/name: prometheus-operator
     app.kubernetes.io/part-of: openshift-monitoring
-    app.kubernetes.io/version: 0.84.0
+    app.kubernetes.io/version: 0.84.1
   name: prometheus-operator
   namespace: openshift-monitoring
 spec:

jsonnet/jsonnetfile.lock.json

@@ -129,8 +129,8 @@
           "subdir": ""
         }
       },
-      "version": "a3fbf21977deb89b7d843eb8371170c011ea6835",
-      "sum": "57zW2IGJ9zbYd8BI0qe6JkoWTRSMNiBUWC6+YcnEsWo="
+      "version": "ab4cb2bed5100a770bf8755bece4beffce270544",
+      "sum": "roiseQzK4R46XLohgGXED6IpZXiy8ivMPoZW3opTrYw="
     },
     {
       "source": {

jsonnet/main.jsonnet

@@ -383,6 +383,7 @@ local inCluster =
             pvExcludedSelector: 'label_alerts_k8s_io_kube_persistent_volume_filling_up="disabled"',
             containerfsSelector: 'id!=""',
             clusterLabel: $.values.common.dashboardClusterLabel,
+            showMultiCluster: false,  // Opt-out of multi-cluster dashboards (opted-in by midstream kube-prometheus)
           },
         },
       },

jsonnet/versions.yaml

@@ -23,5 +23,5 @@ versions:
     promLabelProxy: 0.12.0
     prometheus: 3.5.0
     prometheusAdapter: 0.12.0
-    prometheusOperator: 0.84.0
+    prometheusOperator: 0.84.1
     thanos: 0.39.2