Merge pull request #2741 from simonpasquier/bump-jsonnet-deps

NO-ISSUE: bump jsonnet dependencies

Author: openshift-merge-bot[bot]

assets/alertmanager-user-workload/alertmanager.yaml

@@ -25,6 +25,7 @@ spec:
         namespaces:
         - openshift-user-workload-monitoring
         topologyKey: kubernetes.io/hostname
+  alertmanagerConfigSelector: null
   automountServiceAccountToken: true
   containers:
   - env:

assets/alertmanager/alertmanager.yaml

@@ -25,6 +25,7 @@ spec:
         namespaces:
         - openshift-monitoring
         topologyKey: kubernetes.io/hostname
+  alertmanagerConfigSelector: null
   automountServiceAccountToken: true
   containers:
   - env:

assets/control-plane/prometheus-rule.yaml

@@ -313,10 +313,16 @@ spec:
         description: Namespace {{ $labels.namespace }} is using {{ $value | humanizePercentage }} of its {{ $labels.resource }} quota.
         summary: Namespace quota is going to be full.
       expr: |
-        kube_resourcequota{namespace=~"(openshift-.*|kube-.*|default)",job="kube-state-metrics", type="used"}
-          / ignoring(instance, job, type)
-        (kube_resourcequota{namespace=~"(openshift-.*|kube-.*|default)",job="kube-state-metrics", type="hard"} > 0)
-          > 0.9 < 1
+        max without (instance, job, type) (
+          kube_resourcequota{namespace=~"(openshift-.*|kube-.*|default)",job="kube-state-metrics", type="used"}
+        )
+        / on (cluster, namespace, resource, resourcequota) group_left()
+        (
+          max without (instance, job, type) (
+            kube_resourcequota{namespace=~"(openshift-.*|kube-.*|default)",job="kube-state-metrics", type="hard"}
+          ) > 0
+        )
+        > 0.9 < 1
       for: 15m
       labels:
         severity: info
@@ -325,10 +331,16 @@ spec:
         description: Namespace {{ $labels.namespace }} is using {{ $value | humanizePercentage }} of its {{ $labels.resource }} quota.
         summary: Namespace quota is fully used.
       expr: |
-        kube_resourcequota{namespace=~"(openshift-.*|kube-.*|default)",job="kube-state-metrics", type="used"}
-          / ignoring(instance, job, type)
-        (kube_resourcequota{namespace=~"(openshift-.*|kube-.*|default)",job="kube-state-metrics", type="hard"} > 0)
-          == 1
+        max without (instance, job, type) (
+          kube_resourcequota{namespace=~"(openshift-.*|kube-.*|default)",job="kube-state-metrics", type="used"}
+        )
+        / on (cluster, namespace, resource, resourcequota) group_left()
+        (
+          max without (instance, job, type) (
+            kube_resourcequota{namespace=~"(openshift-.*|kube-.*|default)",job="kube-state-metrics", type="hard"}
+          ) > 0
+        )
+        == 1
       for: 15m
       labels:
         severity: info
@@ -337,10 +349,15 @@ spec:
         description: Namespace {{ $labels.namespace }} is using {{ $value | humanizePercentage }} of its {{ $labels.resource }} quota.
         summary: Namespace quota has exceeded the limits.
       expr: |
-        kube_resourcequota{namespace=~"(openshift-.*|kube-.*|default)",job="kube-state-metrics", type="used"}
-          / ignoring(instance, job, type)
-        (kube_resourcequota{namespace=~"(openshift-.*|kube-.*|default)",job="kube-state-metrics", type="hard"} > 0)
-          > 1
+        max without (instance, job, type) (
+          kube_resourcequota{namespace=~"(openshift-.*|kube-.*|default)",job="kube-state-metrics", type="used"}
+        )
+        / on (cluster, namespace, resource, resourcequota) group_left()
+        (
+          max without (instance, job, type) (
+            kube_resourcequota{namespace=~"(openshift-.*|kube-.*|default)",job="kube-state-metrics", type="hard"}
+          ) > 0
+        ) > 1
       for: 15m
       labels:
         severity: warning
@@ -495,7 +512,7 @@ spec:
         runbook_url: https://github.com/openshift/runbooks/blob/master/alerts/cluster-monitoring-operator/KubeletDown.md
         summary: Target disappeared from Prometheus target discovery.
       expr: |
-        absent(up{job="kubelet", metrics_path="/metrics"} == 1)
+        absent(up{job="kubelet", metrics_path="/metrics"})
       for: 15m
       labels:
         namespace: kube-system
@@ -756,10 +773,10 @@ spec:
   - name: kube-scheduler.rules
     rules:
     - expr: |
-        histogram_quantile(0.99, sum(rate(scheduler_e2e_scheduling_duration_seconds_bucket{job="scheduler"}[5m])) without(instance, pod))
+        histogram_quantile(0.99, sum(rate(scheduler_scheduling_attempt_duration_seconds_bucket{job="scheduler"}[5m])) without(instance, pod))
       labels:
         quantile: "0.99"
-      record: cluster_quantile:scheduler_e2e_scheduling_duration_seconds:histogram_quantile
+      record: cluster_quantile:scheduler_scheduling_attempt_duration_seconds:histogram_quantile
     - expr: |
         histogram_quantile(0.99, sum(rate(scheduler_scheduling_algorithm_duration_seconds_bucket{job="scheduler"}[5m])) without(instance, pod))
       labels:
@@ -771,10 +788,10 @@ spec:
         quantile: "0.99"
       record: cluster_quantile:scheduler_binding_duration_seconds:histogram_quantile
     - expr: |
-        histogram_quantile(0.9, sum(rate(scheduler_e2e_scheduling_duration_seconds_bucket{job="scheduler"}[5m])) without(instance, pod))
+        histogram_quantile(0.9, sum(rate(scheduler_scheduling_attempt_duration_seconds_bucket{job="scheduler"}[5m])) without(instance, pod))
       labels:
         quantile: "0.9"
-      record: cluster_quantile:scheduler_e2e_scheduling_duration_seconds:histogram_quantile
+      record: cluster_quantile:scheduler_scheduling_attempt_duration_seconds:histogram_quantile
     - expr: |
         histogram_quantile(0.9, sum(rate(scheduler_scheduling_algorithm_duration_seconds_bucket{job="scheduler"}[5m])) without(instance, pod))
       labels:
@@ -786,10 +803,10 @@ spec:
         quantile: "0.9"
       record: cluster_quantile:scheduler_binding_duration_seconds:histogram_quantile
     - expr: |
-        histogram_quantile(0.5, sum(rate(scheduler_e2e_scheduling_duration_seconds_bucket{job="scheduler"}[5m])) without(instance, pod))
+        histogram_quantile(0.5, sum(rate(scheduler_scheduling_attempt_duration_seconds_bucket{job="scheduler"}[5m])) without(instance, pod))
       labels:
         quantile: "0.5"
-      record: cluster_quantile:scheduler_e2e_scheduling_duration_seconds:histogram_quantile
+      record: cluster_quantile:scheduler_scheduling_attempt_duration_seconds:histogram_quantile
     - expr: |
         histogram_quantile(0.5, sum(rate(scheduler_scheduling_algorithm_duration_seconds_bucket{job="scheduler"}[5m])) without(instance, pod))
       labels:

assets/prometheus-k8s/prometheus.yaml

@@ -42,7 +42,7 @@ spec:
       scheme: https
       tlsConfig:
         caFile: /etc/prometheus/configmaps/serving-certs-ca-bundle/service-ca.crt
-        serverName: alertmanager-main
+        serverName: alertmanager-main.openshift-monitoring.svc
   configMaps:
   - serving-certs-ca-bundle
   - kubelet-serving-ca-bundle

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

@@ -77,7 +77,7 @@ rules:
   - list
   - watch
 - apiGroups:
-  - ""
+  - events.k8s.io
   resources:
   - events
   verbs:

assets/prometheus-operator/cluster-role.yaml

@@ -77,7 +77,7 @@ rules:
   - list
   - watch
 - apiGroups:
-  - ""
+  - events.k8s.io
   resources:
   - events
   verbs:

jsonnet/components/alertmanager-user-workload.libsonnet

@@ -195,6 +195,8 @@ function(params)
         },
       },
       spec+: {
+        // The value of alertmanagerConfigSelector is defined at runtime by the Cluster Monitoring Operator.
+        alertmanagerConfigSelector: null,
         automountServiceAccountToken: true,
         securityContext: {
           fsGroup: 65534,

jsonnet/components/alertmanager.libsonnet

@@ -235,6 +235,8 @@ function(params)
         },
       },
       spec+: {
+        // The value of alertmanagerConfigSelector is defined at runtime by the Cluster Monitoring Operator.
+        alertmanagerConfigSelector: null,
         podMetadata+: {
           annotations+: {
             'openshift.io/required-scc': 'nonroot',

jsonnet/components/prometheus-user-workload.libsonnet

@@ -308,24 +308,6 @@ function(params)
             },
           },
         },
-        alerting+: {
-          alertmanagers:
-            std.map(
-              function(a) a {
-                scheme: 'https',
-                // the user-workload alertmanager configuration points to the openshift-monitoring namespace
-                // since there is no dedicated alertmanager in the user-workload monitoring stack.
-                namespace: 'openshift-monitoring',  //FIXME(paulfantom)
-                tlsConfig: {
-                  caFile: '/etc/prometheus/configmaps/serving-certs-ca-bundle/service-ca.crt',
-                  serverName: 'alertmanager-main.openshift-monitoring.svc',
-                },
-                bearerTokenFile: '/var/run/secrets/kubernetes.io/serviceaccount/token',
-                apiVersion: 'v2',
-              },
-              super.alertmanagers,
-            ),
-        },
         podMetadata+: {
           annotations+: {
             'openshift.io/required-scc': 'nonroot-v2',

jsonnet/components/prometheus.libsonnet

@@ -331,21 +331,6 @@ function(params)
         // Enable some experimental features.
         // More at https://prometheus.io/docs/prometheus/latest/feature_flags/
         enableFeatures+: ['delayed-compaction', 'use-uncached-io'],
-        alerting+: {
-          alertmanagers:
-            std.map(
-              function(a) a {
-                scheme: 'https',
-                tlsConfig: {
-                  caFile: '/etc/prometheus/configmaps/serving-certs-ca-bundle/service-ca.crt',
-                  serverName: 'alertmanager-main',
-                },
-                bearerTokenFile: '/var/run/secrets/kubernetes.io/serviceaccount/token',
-                apiVersion: 'v2',
-              },
-              super.alertmanagers,
-            ),
-        },
         resources: {
           requests: {
             memory: '1Gi',