kustomise-wip

Author: R-Lawton

config/observability/kustomization.yaml

@@ -4,8 +4,6 @@ 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
-  - prometheus/monitors/service-monitor-istiod.yaml
-
 # 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,
@@ -20,7 +18,6 @@ resources:
   - prometheus/monitors/service-monitor-authorino-operator.yaml
   - prometheus/monitors/service-monitor-dns-operator.yaml
 
-  - prometheus/telemetry.yaml
 
 patchesStrategicMerge:
   - rbac/cluster_role.yaml

config/observability/prometheus/monitors/base/kustomization.yaml

@@ -0,0 +1,4 @@
+resources:  
+  - service-monitor-istiod.yaml
+  - telemetry.yaml
+  

config/observability/prometheus/monitors/service-monitor-istiod.yaml renamed to config/observability/prometheus/monitors/base/service-monitor-istiod.yaml

@@ -2,7 +2,6 @@ apiVersion: monitoring.coreos.com/v1
 kind: ServiceMonitor
 metadata:
   name: istiod
-  namespace: istio-system
 spec:
   namespaceSelector:
     matchNames:

config/observability/prometheus/telemetry.yaml renamed to config/observability/prometheus/monitors/base/telemetry.yaml

@@ -0,0 +1,10 @@
+resources:
+- ../../base
+- pod-monitor-envoy.yaml
+
+namespace: gateway-system 
+
+patchesStrategicMerge:
+  -  service-monitor.yaml
+
+

config/observability/prometheus/monitors/overlays/envoy/kustomization.yaml

@@ -0,0 +1,14 @@
+apiVersion: monitoring.coreos.com/v1
+kind: PodMonitor
+metadata:
+  name: envoy-stats
+spec:
+  namespaceSelector:
+    matchNames:
+      - gateway-system
+  selector:
+    matchLabels:
+      app: kuadrant-ingressgateway
+  podMetricsEndpoints:
+    - port: http-envoy-prom
+      path: /stats/prometheus

config/observability/prometheus/monitors/overlays/envoy/pod-monitor-envoy.yaml

@@ -0,0 +1,9 @@
+apiVersion: monitoring.coreos.com/v1
+kind: ServiceMonitor
+metadata:
+  name: istiod
+spec:
+  namespaceSelector:
+    matchNames:
+    - gateway-system
+  

config/observability/prometheus/monitors/overlays/envoy/service-monitor.yaml

@@ -0,0 +1,7 @@
+apiVersion: telemetry.istio.io/v1alpha1
+kind: Telemetry
+metadata:
+  name: namespace-metrics
+  namespace: gateway-system
+spec:
+  metrics:

config/observability/prometheus/monitors/overlays/envoy/telemetry.yaml

@@ -84,6 +84,7 @@ KUADRANT_CERT_MANAGER_KUSTOMIZATION="${KUADRANT_REPO}/config/dependencies/cert-m
 KUADRANT_METALLB_KUSTOMIZATION="${KUADRANT_REPO}/config/metallb?ref=${KUADRANT_REF}"
 KUADARNT_THANOS_KUSTOMIZATION="${KUADRANT_REPO}/config/thanos?ref=${KUADRANT_REF}"
 KUADARNT_OBSERVABILITY_KUSTOMIZATION="${KUADRANT_REPO}/config/observability?ref=${KUADRANT_REF}"
+KUADARNT_OBSERVABILITY_ISTIO_KUSTOMIZATION="${KUADRANT_REPO}/config/observability/promtheus/monitors/base?ref=${KUADRANT_REF}"
 KUADRANT_DASHBOARDS_KUSTOMIZATION="${KUADRANT_REPO}/examples/dashboards?ref=${KUADRANT_REF}"
 KUADRANT_ALERTS_KUSTOMIZATION="${KUADRANT_REPO}/examples/alerts?ref=${KUADRANT_REF}"
 MGC_REPO="github.com/${KUADRANT_ORG}/multicluster-gateway-controller.git"
@@ -460,8 +461,8 @@ fi
 
 # Install observability stack
 info "Installing observability stack in ${KUADRANT_CLUSTER_NAME}..."
-kubectl kustomize ${KUADARNT_OBSERVABILITY_KUSTOMIZATION} | $CONTAINER_RUNTIME_BIN run --rm -i docker.io/ryane/kfilt -i kind=CustomResourceDefinition | kubectl apply --server-side -f -
-kubectl kustomize ${KUADARNT_OBSERVABILITY_KUSTOMIZATION} | $CONTAINER_RUNTIME_BIN run --rm -i docker.io/ryane/kfilt -x kind=CustomResourceDefinition | kubectl apply -f -
+kubectl kustomize ${KUADARNT_OBSERVABILITY_KUSTOMIZATION} | kubectl kustomize ${KUADARNT_OBSERVABILITY_ISTIO_KUSTOMIZATION} | $CONTAINER_RUNTIME_BIN run --rm -i docker.io/ryane/kfilt -i kind=CustomResourceDefinition | kubectl apply --server-side -f -
+kubectl kustomize ${KUADARNT_OBSERVABILITY_KUSTOMIZATION} | kubectl kustomize ${KUADARNT_OBSERVABILITY_ISTIO_KUSTOMIZATION} | $CONTAINER_RUNTIME_BIN run --rm -i docker.io/ryane/kfilt -x kind=CustomResourceDefinition | kubectl apply -f -
 kubectl kustomize ${KUADRANT_DASHBOARDS_KUSTOMIZATION} | kubectl apply --server-side -f -
 kubectl kustomize ${KUADRANT_ALERTS_KUSTOMIZATION} | kubectl apply --server-side -f -
 success "observability stack installed successfully."