MON-4115: expose label metrics for jobs and cronjobs

Adds jobs and cronjobs to the exposed set of label metrics:
* '--metric-labels-allowlist=pods=[*],nodes=[*],namespaces=[*],persistentvolumes=[*],persistentvolumeclaims=[*],poddisruptionbudgets=[*],jobs=[*],cronjobs=[*]'

Signed-off-by: Pranshu Srivastava <[email protected]>

Author: rexagod

CHANGELOG.md

@@ -1,5 +1,9 @@
 # Note: This CHANGELOG is only for the monitoring team to track all monitoring related changes. Please see OpenShift release notes for official changes.
 
+## 4.19
+
+- [#2553](https://github.com/openshift/cluster-monitoring-operator/pull/2553) Expose `kube_cronjob_labels` and `kube_job_labels` metrics.
+
 ## 4.18
 
 - [#2503](https://github.com/openshift/cluster-monitoring-operator/issues/2503) Expose `scrapeInterval` setting for UWM Prometheus.

Documentation/deps-versions.md

@@ -1,7 +1,7 @@
 |  OCP Version |                                   alertmanager                                   |                              kubeRbacProxy                               |                              kubeStateMetrics                               |                              kubernetesMetricsServer                              |                             monitoringPlugin                              |                             nodeExporter                              |                              promLabelProxy                               |                             prometheus                              |                              prometheusOperator                              |                             thanos                              |
 |--------------|----------------------------------------------------------------------------------|--------------------------------------------------------------------------|-----------------------------------------------------------------------------|-----------------------------------------------------------------------------------|---------------------------------------------------------------------------|-----------------------------------------------------------------------|---------------------------------------------------------------------------|---------------------------------------------------------------------|------------------------------------------------------------------------------|-----------------------------------------------------------------|
-| release-4.20 | [0.27.0](https://github.com/openshift/prometheus-alertmanager/blob/release-4.20) | [0.18.2](https://github.com/openshift/kube-rbac-proxy/blob/release-4.20) | [2.13.0](https://github.com/openshift/kube-state-metrics/blob/release-4.20) | [0.7.2](https://github.com/openshift/kubernetes-metrics-server/blob/release-4.20) | [1.0.0](https://github.com/openshift/monitoring-plugin/blob/release-4.20) | [1.8.2](https://github.com/openshift/node_exporter/blob/release-4.20) | [0.11.0](https://github.com/openshift/prom-label-proxy/blob/release-4.20) | [2.55.1](https://github.com/openshift/prometheus/blob/release-4.20) | [0.78.2](https://github.com/openshift/prometheus-operator/blob/release-4.20) | [0.36.1](https://github.com/openshift/thanos/blob/release-4.20) |
-| release-4.19 | [0.27.0](https://github.com/openshift/prometheus-alertmanager/blob/release-4.19) | [0.18.2](https://github.com/openshift/kube-rbac-proxy/blob/release-4.19) | [2.13.0](https://github.com/openshift/kube-state-metrics/blob/release-4.19) | [0.7.2](https://github.com/openshift/kubernetes-metrics-server/blob/release-4.19) | [1.0.0](https://github.com/openshift/monitoring-plugin/blob/release-4.19) | [1.8.2](https://github.com/openshift/node_exporter/blob/release-4.19) | [0.11.0](https://github.com/openshift/prom-label-proxy/blob/release-4.19) | [2.55.1](https://github.com/openshift/prometheus/blob/release-4.19) | [0.78.2](https://github.com/openshift/prometheus-operator/blob/release-4.19) | [0.36.1](https://github.com/openshift/thanos/blob/release-4.19) |
+| release-4.20 | [0.27.0](https://github.com/openshift/prometheus-alertmanager/blob/release-4.20) | [0.18.2](https://github.com/openshift/kube-rbac-proxy/blob/release-4.20) | [2.13.0](https://github.com/openshift/kube-state-metrics/blob/release-4.20) | [0.7.2](https://github.com/openshift/kubernetes-metrics-server/blob/release-4.20) | [1.0.0](https://github.com/openshift/monitoring-plugin/blob/release-4.20) | [1.8.2](https://github.com/openshift/node_exporter/blob/release-4.20) | [0.11.0](https://github.com/openshift/prom-label-proxy/blob/release-4.20) | [2.55.1](https://github.com/openshift/prometheus/blob/release-4.20) | [0.79.2](https://github.com/openshift/prometheus-operator/blob/release-4.20) | [0.37.2](https://github.com/openshift/thanos/blob/release-4.20) |
+| release-4.19 | [0.27.0](https://github.com/openshift/prometheus-alertmanager/blob/release-4.19) | [0.18.2](https://github.com/openshift/kube-rbac-proxy/blob/release-4.19) | [2.13.0](https://github.com/openshift/kube-state-metrics/blob/release-4.19) | [0.7.2](https://github.com/openshift/kubernetes-metrics-server/blob/release-4.19) | [1.0.0](https://github.com/openshift/monitoring-plugin/blob/release-4.19) | [1.8.2](https://github.com/openshift/node_exporter/blob/release-4.19) | [0.11.0](https://github.com/openshift/prom-label-proxy/blob/release-4.19) | [2.55.1](https://github.com/openshift/prometheus/blob/release-4.19) | [0.79.2](https://github.com/openshift/prometheus-operator/blob/release-4.19) | [0.37.2](https://github.com/openshift/thanos/blob/release-4.19) |
 | release-4.18 | [0.27.0](https://github.com/openshift/prometheus-alertmanager/blob/release-4.18) | [0.18.1](https://github.com/openshift/kube-rbac-proxy/blob/release-4.18) | [2.13.0](https://github.com/openshift/kube-state-metrics/blob/release-4.18) | [0.7.2](https://github.com/openshift/kubernetes-metrics-server/blob/release-4.18) | [1.0.0](https://github.com/openshift/monitoring-plugin/blob/release-4.18) | [1.8.2](https://github.com/openshift/node_exporter/blob/release-4.18) | [0.11.0](https://github.com/openshift/prom-label-proxy/blob/release-4.18) | [2.55.1](https://github.com/openshift/prometheus/blob/release-4.18) | [0.78.1](https://github.com/openshift/prometheus-operator/blob/release-4.18) | [0.36.1](https://github.com/openshift/thanos/blob/release-4.18) |
 | release-4.17 | [0.27.0](https://github.com/openshift/prometheus-alertmanager/blob/release-4.17) | [0.17.1](https://github.com/openshift/kube-rbac-proxy/blob/release-4.17) | [2.13.0](https://github.com/openshift/kube-state-metrics/blob/release-4.17) | [0.7.1](https://github.com/openshift/kubernetes-metrics-server/blob/release-4.17) | [1.0.0](https://github.com/openshift/monitoring-plugin/blob/release-4.17) | [1.8.2](https://github.com/openshift/node_exporter/blob/release-4.17) | [0.11.0](https://github.com/openshift/prom-label-proxy/blob/release-4.17) | [2.53.1](https://github.com/openshift/prometheus/blob/release-4.17) | [0.75.2](https://github.com/openshift/prometheus-operator/blob/release-4.17) | [0.35.1](https://github.com/openshift/thanos/blob/release-4.17) |
 | release-4.16 | [0.26.0](https://github.com/openshift/prometheus-alertmanager/blob/release-4.16) | [0.17.1](https://github.com/openshift/kube-rbac-proxy/blob/release-4.16) | [2.12.0](https://github.com/openshift/kube-state-metrics/blob/release-4.16) | [0.7.1](https://github.com/openshift/kubernetes-metrics-server/blob/release-4.16) | [1.0.0](https://github.com/openshift/monitoring-plugin/blob/release-4.16) | [1.8.0](https://github.com/openshift/node_exporter/blob/release-4.16) | [0.8.1](https://github.com/openshift/prom-label-proxy/blob/release-4.16)  | [2.52.0](https://github.com/openshift/prometheus/blob/release-4.16) | [0.73.2](https://github.com/openshift/prometheus-operator/blob/release-4.16) | [0.35.0](https://github.com/openshift/thanos/blob/release-4.16) |

assets/kube-state-metrics/deployment.yaml

@@ -42,7 +42,7 @@ spec:
           ^kube_.+_annotations$
           ^kube_customresource_.+_annotations_info$,
           ^kube_customresource_.+_labels_info$,
-        - --metric-labels-allowlist=pods=[*],nodes=[*],namespaces=[*],persistentvolumes=[*],persistentvolumeclaims=[*],poddisruptionbudgets=[*]
+        - --metric-labels-allowlist=pods=[*],nodes=[*],namespaces=[*],persistentvolumes=[*],persistentvolumeclaims=[*],poddisruptionbudgets=[*],jobs=[*],cronjobs=[*]
         - |
           --metric-denylist=
           ^kube_.+_created$,

assets/thanos-ruler/service-monitor.yaml

@@ -7,7 +7,7 @@ metadata:
     app.kubernetes.io/managed-by: cluster-monitoring-operator
     app.kubernetes.io/name: thanos-rule
     app.kubernetes.io/part-of: openshift-monitoring
-    app.kubernetes.io/version: 0.36.1
+    app.kubernetes.io/version: 0.37.2
   name: thanos-ruler
   namespace: openshift-user-workload-monitoring
 spec:

assets/thanos-ruler/service.yaml

@@ -15,7 +15,7 @@ metadata:
     app.kubernetes.io/managed-by: cluster-monitoring-operator
     app.kubernetes.io/name: thanos-rule
     app.kubernetes.io/part-of: openshift-monitoring
-    app.kubernetes.io/version: 0.36.1
+    app.kubernetes.io/version: 0.37.2
   name: thanos-ruler
   namespace: openshift-user-workload-monitoring
 spec:

assets/thanos-ruler/thanos-ruler.yaml

@@ -102,7 +102,7 @@ spec:
     caFile: /etc/tls/grpc/ca.crt
     certFile: /etc/tls/grpc/server.crt
     keyFile: /etc/tls/grpc/server.key
-  image: quay.io/thanos/thanos:v0.36.1
+  image: quay.io/thanos/thanos:v0.37.2
   listenLocal: true
   podMetadata:
     annotations:
@@ -144,7 +144,7 @@ spec:
     seccompProfile:
       type: RuntimeDefault
   serviceAccountName: thanos-ruler
-  version: 0.36.1
+  version: 0.37.2
   volumes:
   - configmap:
       items:

jsonnet/components/kube-state-metrics.libsonnet

@@ -244,7 +244,7 @@ function(params)
                           ^kube_customresource_.+_annotations_info$,
                           ^kube_customresource_.+_labels_info$,
                         |||,
-                        '--metric-labels-allowlist=pods=[*],nodes=[*],namespaces=[*],persistentvolumes=[*],persistentvolumeclaims=[*],poddisruptionbudgets=[*]',
+                        '--metric-labels-allowlist=pods=[*],nodes=[*],namespaces=[*],persistentvolumes=[*],persistentvolumeclaims=[*],poddisruptionbudgets=[*],jobs=[*],cronjobs=[*]',
                       ],
                       securityContext: {},
                       resources: {

jsonnet/versions.yaml

@@ -23,5 +23,5 @@ versions:
     promLabelProxy: 0.11.0
     prometheus: 2.55.1
     prometheusAdapter: 0.12.0
-    prometheusOperator: 0.78.2
-    thanos: 0.36.1
+    prometheusOperator: 0.79.2
+    thanos: 0.37.2