Skip to content

Commit

Permalink
Changing the namespace for the pod monitors as gateway-namesapce is n…
Browse files Browse the repository at this point in the history
…o longer created with istio being installed by sail

Signed-off-by: R-Lawton <[email protected]>
  • Loading branch information
R-Lawton committed Oct 8, 2024
1 parent 520737f commit e3e3497
Show file tree
Hide file tree
Showing 5 changed files with 5 additions and 22 deletions.
6 changes: 1 addition & 5 deletions config/observability/kustomization.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -4,12 +4,8 @@ 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
# To scrape istio metrics, 3 configurations are required:
# 1. Envoy metrics directly from the istio ingress gateway pod
- prometheus/monitors/pod-monitor-envoy.yaml
# 2. Istiod metrics via the istiod service
- prometheus/monitors/service-monitor-istiod.yaml
# 3. Istio metrics exposed via envoy on 15020 in each application.

# 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,
Expand Down
2 changes: 1 addition & 1 deletion config/observability/openshift/telemetry.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ apiVersion: telemetry.istio.io/v1alpha1
kind: Telemetry
metadata:
name: namespace-metrics
namespace: gateway-system
namespace: istio-system
spec:
metrics:
- providers:
Expand Down
14 changes: 0 additions & 14 deletions config/observability/prometheus/monitors/pod-monitor-envoy.yaml

This file was deleted.

Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,11 @@ apiVersion: monitoring.coreos.com/v1
kind: ServiceMonitor
metadata:
name: istiod
namespace: istio-system
spec:
namespaceSelector:
matchNames:
- gateway-system
- istio-system
selector:
matchLabels:
app: istiod
Expand Down
2 changes: 1 addition & 1 deletion config/observability/prometheus/telemetry.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ apiVersion: telemetry.istio.io/v1alpha1
kind: Telemetry
metadata:
name: namespace-metrics
namespace: gateway-system
namespace: istio-system
spec:
metrics:
- providers:
Expand Down

0 comments on commit e3e3497

Please sign in to comment.