From 91aa6a0cb345e16a3401ad6ac02d3257cfd6b9d4 Mon Sep 17 00:00:00 2001 From: David Martin Date: Wed, 13 Nov 2024 12:41:21 +0000 Subject: [PATCH 1/2] Fix escaping of podmonitor in bash cmd Signed-off-by: David Martin --- .../secure-protect-connect-single-multi-cluster.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/doc/user-guides/secure-protect-connect-single-multi-cluster.md b/doc/user-guides/secure-protect-connect-single-multi-cluster.md index 69f3865b8..ffa292684 100644 --- a/doc/user-guides/secure-protect-connect-single-multi-cluster.md +++ b/doc/user-guides/secure-protect-connect-single-multi-cluster.md @@ -192,7 +192,7 @@ spec: ["__meta_kubernetes_pod_annotationpresent_prometheus_io_scrape"] - action: replace regex: (\d+);(([A-Fa-f0-9]{1,4}::?){1,7}[A-Fa-f0-9]{1,4}) - replacement: "[$2]:$1" + replacement: "[\$2]:\$1" sourceLabels: [ "__meta_kubernetes_pod_annotation_prometheus_io_port", @@ -201,7 +201,7 @@ spec: targetLabel: "__address__" - action: replace regex: (\d+);((([0-9]+?)(\.|$)){4}) - replacement: "$2:$1" + replacement: "\$2:\$1" sourceLabels: [ "__meta_kubernetes_pod_annotation_prometheus_io_port", From db28b86d9c75f3617951e86e57567f65bc355df9 Mon Sep 17 00:00:00 2001 From: David Martin Date: Wed, 13 Nov 2024 12:44:00 +0000 Subject: [PATCH 2/2] Bump gateway-api-state-metrics version to use v1 of kaudrant apis for metrics Signed-off-by: David Martin --- config/observability/kustomization.yaml | 2 +- doc/install/install-openshift.md | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/config/observability/kustomization.yaml b/config/observability/kustomization.yaml index 06528dd84..f12133dde 100644 --- a/config/observability/kustomization.yaml +++ b/config/observability/kustomization.yaml @@ -3,7 +3,7 @@ kind: Kustomization resources: - github.com/prometheus-operator/kube-prometheus?ref=release-0.13 - - github.com/Kuadrant/gateway-api-state-metrics/config/kuadrant?ref=0.5.0 + - github.com/Kuadrant/gateway-api-state-metrics/config/kuadrant?ref=0.6.0 # We're using the additionalScrapeConfigs field of the Prometheus CR # here to read existing prometheus scrape annotations on pods. # Ideally this would be done via another PodMonitor or ServicMonitor, diff --git a/doc/install/install-openshift.md b/doc/install/install-openshift.md index 41cae2a63..e53bb3de6 100644 --- a/doc/install/install-openshift.md +++ b/doc/install/install-openshift.md @@ -183,7 +183,7 @@ To scrape these additional metrics, you can install a `kube-state-metrics` insta ```bash kubectl apply -f https://raw.githubusercontent.com/Kuadrant/kuadrant-operator/main/config/observability/openshift/kube-state-metrics.yaml -kubectl apply -k https://github.com/Kuadrant/gateway-api-state-metrics/config/kuadrant?ref=0.5.0 +kubectl apply -k https://github.com/Kuadrant/gateway-api-state-metrics/config/kuadrant?ref=0.6.0 ``` To enable request metrics in Istio and scrape them, create the following resource: