From 549f1500ecabc2628d3f4b12109296fd8bb0a509 Mon Sep 17 00:00:00 2001 From: David Martin Date: Fri, 8 Nov 2024 09:35:52 +0000 Subject: [PATCH] Update observability resources to use gateway-system namespace (#969) Signed-off-by: David Martin --- config/observability/openshift/telemetry.yaml | 2 +- .../prometheus/monitors/istio/service-monitor-istiod.yaml | 4 ++-- doc/install/install-openshift.md | 6 ++++-- 3 files changed, 7 insertions(+), 5 deletions(-) diff --git a/config/observability/openshift/telemetry.yaml b/config/observability/openshift/telemetry.yaml index c3a7509b2..7b6c6f11f 100644 --- a/config/observability/openshift/telemetry.yaml +++ b/config/observability/openshift/telemetry.yaml @@ -2,7 +2,7 @@ apiVersion: telemetry.istio.io/v1alpha1 kind: Telemetry metadata: name: namespace-metrics - namespace: istio-system + namespace: gateway-system spec: metrics: - providers: diff --git a/config/observability/prometheus/monitors/istio/service-monitor-istiod.yaml b/config/observability/prometheus/monitors/istio/service-monitor-istiod.yaml index e2af452b7..c4215fc39 100644 --- a/config/observability/prometheus/monitors/istio/service-monitor-istiod.yaml +++ b/config/observability/prometheus/monitors/istio/service-monitor-istiod.yaml @@ -2,11 +2,11 @@ apiVersion: monitoring.coreos.com/v1 kind: ServiceMonitor metadata: name: istiod - namespace: istio-system + namespace: gateway-system spec: namespaceSelector: matchNames: - - istio-system + - gateway-system selector: matchLabels: app: istiod diff --git a/doc/install/install-openshift.md b/doc/install/install-openshift.md index 6c12c6dfa..41cae2a63 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?ref=main +kubectl apply -k https://github.com/Kuadrant/gateway-api-state-metrics/config/kuadrant?ref=0.5.0 ``` To enable request metrics in Istio and scrape them, create the following resource: @@ -205,6 +205,7 @@ kubectl apply -f https://raw.githubusercontent.com/Kuadrant/kuadrant-operator/ma You can configure scraping of metrics from the various Kuadrant operators with the below resources. ```bash +kubectl create ns kuadrant-system kubectl apply -f https://raw.githubusercontent.com/Kuadrant/kuadrant-operator/refs/heads/main/config/observability/prometheus/monitors/operators.yaml ``` @@ -225,7 +226,8 @@ For Grafana installation details, see [installing Grafana on OpenShift](https:// ### Step 7 - Setup the catalogsource -Before installing the Kuadrant Operator, you must enter the following commands to set up secrets that you will use later: +Before installing the Kuadrant Operator, you must enter the following commands to set up secrets that you will use later. +If you haven't aleady created the `kuadrant-system` namespace during the optional observability setup, do that first: ```bash kubectl create ns kuadrant-system