Merge pull request #854 from RiRa12621/master

Bug 1846707: changing KubeQuotaExceeded to KubeQuotaFullyUsed

CHANGELOG.md

@@ -7,3 +7,4 @@
 - [#800](https://github.com/openshift/cluster-monitoring-operator/pull/800) Collect metrics and implement alerting rules for Thanos querier.
 - [#804](https://github.com/openshift/cluster-monitoring-operator/pull/804) Allow user workload monitoring configuration ConfigMap to be created in openshift-user-workload-monitoring namespace.
 - [#736](https://github.com/openshift/cluster-monitoring-operator/pull/800) Expose /api/v1/rules endpoint of Thanos Querier via the 9093 TCP port with multi-tenancy support.
+- [#854](https://github.com/openshift/cluster-monitoring-operator/pull/854) Change KubeQuotaExceeded to KubeQuotaFullyUsed

assets/prometheus-k8s/rules.yaml

@@ -1343,17 +1343,17 @@ spec:
       for: 5m
       labels:
         severity: warning
-    - alert: KubeQuotaExceeded
+    - alert: KubeQuotaFullyUsed
       annotations:
         message: Namespace {{ $labels.namespace }} is using {{ $value | humanizePercentage }} of its {{ $labels.resource }} quota.
       expr: |
         kube_resourcequota{namespace=~"(openshift-.*|kube-.*|default|logging)",job="kube-state-metrics", type="used"}
           / ignoring(instance, job, type)
         (kube_resourcequota{namespace=~"(openshift-.*|kube-.*|default|logging)",job="kube-state-metrics", type="hard"} > 0)
-          > 0.90
+          >= 1
       for: 15m
       labels:
-        severity: warning
+        severity: info
   - name: kubernetes-storage
     rules:
     - alert: KubePersistentVolumeFillingUp

jsonnet/jsonnetfile.lock.json

@@ -79,8 +79,8 @@
           "subdir": ""
         }
       },
-      "version": "d353b060f1965cc8ec2dce00c6dd2d565cb1825f",
-      "sum": "CcrZ6OPgNp8WWXtGqRGOdPm6XbRSvSRb9Dwqbzxe+QE="
+      "version": "9992325a3429a8975caa95bf0ead13804f76fd47",
+      "sum": "0uaxB7PnxVk6e8pgc/HXaReiDAAPBmkQCjzIcMV/BcM="
     },
     {
       "source": {