Merge branch 'openshift:main' into revert_pr_2738

Author: juzhao

CHANGELOG.md

@@ -7,7 +7,7 @@
   - `KubePdbNotEnoughHealthyPods`
   - `KubeNodePressure`
   - `KubeNodeEviction`
-- [#2677](https://github.com/openshift/cluster-monitoring-operator/pull/2677) Fix KSM deny-list typo that put `^kube_.+_annotations$^kube_customresource_.+_annotations_info$,` in the deny-list instead of seperate entries, like so, `^kube_.+_annotations$,^kube_customresource_.+_annotations_info$,`, due to the omission of a comma.
+- [#2677](https://github.com/openshift/cluster-monitoring-operator/pull/2677) Fix KSM deny-list typo that put `^kube_.+_annotations$^kube_customresource_.+_annotations_info$,` in the deny-list instead of separate entries, like so, `^kube_.+_annotations$,^kube_customresource_.+_annotations_info$,`, due to the omission of a comma.
 
 ## 4.18
 

Documentation/api.md

@@ -569,6 +569,12 @@ data:
     # value. The possible values for tls_termination are edge, passthrough and reencrypt.
     - '{__name__="cluster:openshift_route_info:tls_termination:sum"}'
     #
+    # owners: (@openshift/network-edge)
+    #
+    # openshift:gateway_api_usage:count tracks the amount of gateway resources created in the cluster 
+    # aggregated by Gateway class type.
+    - '{__name__="openshift:gateway_api_usage:count",gateway_class_type=~"openshift|not-openshift"}'
+    #
     # owners: (https://github.com/openshift/insights-operator/blob/master/OWNERS)
     #
     # insightsclient_request_send tracks the number of metrics sends.

Documentation/data-collection.md

@@ -1,7 +1,7 @@
 |  OCP Version |                                   alertmanager                                   |                              kubeRbacProxy                               |                              kubeStateMetrics                               |                              kubernetesMetricsServer                              |                             monitoringPlugin                              |                              nodeExporter                              |                              promLabelProxy                               |                             prometheus                              |                              prometheusOperator                              |                             thanos                              |
 |--------------|----------------------------------------------------------------------------------|--------------------------------------------------------------------------|-----------------------------------------------------------------------------|-----------------------------------------------------------------------------------|---------------------------------------------------------------------------|------------------------------------------------------------------------|---------------------------------------------------------------------------|---------------------------------------------------------------------|------------------------------------------------------------------------------|-----------------------------------------------------------------|
-| release-4.22 | [0.28.1](https://github.com/openshift/prometheus-alertmanager/blob/release-4.22) | [0.19.1](https://github.com/openshift/kube-rbac-proxy/blob/release-4.22) | [2.17.0](https://github.com/openshift/kube-state-metrics/blob/release-4.22) | [0.8.0](https://github.com/openshift/kubernetes-metrics-server/blob/release-4.22) | [1.0.0](https://github.com/openshift/monitoring-plugin/blob/release-4.22) | [1.10.2](https://github.com/openshift/node_exporter/blob/release-4.22) | [0.12.1](https://github.com/openshift/prom-label-proxy/blob/release-4.22) | [3.6.0](https://github.com/openshift/prometheus/blob/release-4.22)  | [0.86.1](https://github.com/openshift/prometheus-operator/blob/release-4.22) | [0.39.2](https://github.com/openshift/thanos/blob/release-4.22) |
-| release-4.21 | [0.28.1](https://github.com/openshift/prometheus-alertmanager/blob/release-4.21) | [0.19.1](https://github.com/openshift/kube-rbac-proxy/blob/release-4.21) | [2.17.0](https://github.com/openshift/kube-state-metrics/blob/release-4.21) | [0.8.0](https://github.com/openshift/kubernetes-metrics-server/blob/release-4.21) | [1.0.0](https://github.com/openshift/monitoring-plugin/blob/release-4.21) | [1.10.2](https://github.com/openshift/node_exporter/blob/release-4.21) | [0.12.1](https://github.com/openshift/prom-label-proxy/blob/release-4.21) | [3.6.0](https://github.com/openshift/prometheus/blob/release-4.21)  | [0.86.1](https://github.com/openshift/prometheus-operator/blob/release-4.21) | [0.39.2](https://github.com/openshift/thanos/blob/release-4.21) |
+| release-4.22 | [0.29.0](https://github.com/openshift/prometheus-alertmanager/blob/release-4.22) | [0.19.1](https://github.com/openshift/kube-rbac-proxy/blob/release-4.22) | [2.17.0](https://github.com/openshift/kube-state-metrics/blob/release-4.22) | [0.8.0](https://github.com/openshift/kubernetes-metrics-server/blob/release-4.22) | [1.0.0](https://github.com/openshift/monitoring-plugin/blob/release-4.22) | [1.10.2](https://github.com/openshift/node_exporter/blob/release-4.22) | [0.12.1](https://github.com/openshift/prom-label-proxy/blob/release-4.22) | [3.6.0](https://github.com/openshift/prometheus/blob/release-4.22)  | [0.86.2](https://github.com/openshift/prometheus-operator/blob/release-4.22) | [0.39.2](https://github.com/openshift/thanos/blob/release-4.22) |
+| release-4.21 | [0.29.0](https://github.com/openshift/prometheus-alertmanager/blob/release-4.21) | [0.19.1](https://github.com/openshift/kube-rbac-proxy/blob/release-4.21) | [2.17.0](https://github.com/openshift/kube-state-metrics/blob/release-4.21) | [0.8.0](https://github.com/openshift/kubernetes-metrics-server/blob/release-4.21) | [1.0.0](https://github.com/openshift/monitoring-plugin/blob/release-4.21) | [1.10.2](https://github.com/openshift/node_exporter/blob/release-4.21) | [0.12.1](https://github.com/openshift/prom-label-proxy/blob/release-4.21) | [3.6.0](https://github.com/openshift/prometheus/blob/release-4.21)  | [0.86.2](https://github.com/openshift/prometheus-operator/blob/release-4.21) | [0.39.2](https://github.com/openshift/thanos/blob/release-4.21) |
 | release-4.20 | [0.28.1](https://github.com/openshift/prometheus-alertmanager/blob/release-4.20) | [0.19.1](https://github.com/openshift/kube-rbac-proxy/blob/release-4.20) | [2.16.0](https://github.com/openshift/kube-state-metrics/blob/release-4.20) | [0.8.0](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.9.1](https://github.com/openshift/node_exporter/blob/release-4.20)  | [0.12.0](https://github.com/openshift/prom-label-proxy/blob/release-4.20) | [3.5.0](https://github.com/openshift/prometheus/blob/release-4.20)  | [0.85.0](https://github.com/openshift/prometheus-operator/blob/release-4.20) | [0.39.2](https://github.com/openshift/thanos/blob/release-4.20) |
 | release-4.19 | [0.28.1](https://github.com/openshift/prometheus-alertmanager/blob/release-4.19) | [0.19.0](https://github.com/openshift/kube-rbac-proxy/blob/release-4.19) | [2.15.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.9.1](https://github.com/openshift/node_exporter/blob/release-4.19)  | [0.11.0](https://github.com/openshift/prom-label-proxy/blob/release-4.19) | [3.2.1](https://github.com/openshift/prometheus/blob/release-4.19)  | [0.81.0](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.2](https://github.com/openshift/prometheus-operator/blob/release-4.18) | [0.36.1](https://github.com/openshift/thanos/blob/release-4.18) |

Documentation/deps-versions.md

@@ -42,7 +42,7 @@ GOLANGCI_LINT_VERSION=v1.64.8
 PROMTOOL_BIN=$(BIN_DIR)/promtool
 DOCGEN_BIN=$(BIN_DIR)/docgen
 MISSPELL_BIN=$(BIN_DIR)/misspell
-TOOLING=$(EMBEDMD_BIN) $(JB_BIN) $(GOJSONTOYAML_BIN) $(JSONNET_BIN) $(JSONNETFMT_BIN) $(PROMTOOL_BIN) $(DOCGEN_BIN) $(GOLANGCI_LINT_BIN)
+TOOLING=$(EMBEDMD_BIN) $(JB_BIN) $(GOJSONTOYAML_BIN) $(JSONNET_BIN) $(JSONNETFMT_BIN) $(PROMTOOL_BIN) $(DOCGEN_BIN) $(GOLANGCI_LINT_BIN) $(MISSPELL_BIN)
 
 MANIFESTS_DIR ?= $(shell pwd)/manifests
 JSON_MANIFESTS_DIR ?= $(shell pwd)/tmp/json-manifests/manifests
@@ -226,11 +226,11 @@ golangci-lint-fix: $(GOLANGCI_LINT_BIN)
 	$(GOLANGCI_LINT_BIN) run --verbose --print-resources-usage --fix
 
 .PHONY:
-misspell:
+misspell: $(MISSPELL_BIN)
 	$(MISSPELL_BIN) -error $(MARKDOWN_DOCS)
 
 .PHONY:
-misspell-fix:
+misspell-fix: $(MISSPELL_BIN)
 	$(MISSPELL_BIN) -w $(MARKDOWN_DOCS)
 
 .PHONY: jsonnet-fmt

Documentation/sample-metrics.md

@@ -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.86.1
+    app.kubernetes.io/version: 0.86.2
   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.86.1
+        app.kubernetes.io/version: 0.86.2
     spec:
       affinity:
         podAntiAffinity:

Documentation/telemetry/telemeter_query

@@ -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.86.1
+    app.kubernetes.io/version: 0.86.2
   name: prometheus-operator-admission-webhook
   namespace: openshift-monitoring
 spec:

Makefile

@@ -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.86.1
+    app.kubernetes.io/version: 0.86.2
   name: prometheus-operator-admission-webhook
   namespace: openshift-monitoring