Gh 668

PROJECT

@@ -1,7 +1,12 @@
+# Code generated by tool. DO NOT EDIT.
+# This file is used to track the info used to scaffold your project
+# and allow the plugins properly work.
+# More info: https://book.kubebuilder.io/reference/project-config.html
 domain: kuadrant.io
 layout:
 - go.kubebuilder.io/v3
 plugins:
+  grafana.kubebuilder.io/v1-alpha: {}
   manifests.sdk.operatorframework.io/v2: {}
   scorecard.sdk.operatorframework.io/v2: {}
 projectName: kuadrant-operator

config/observability/grafana_deployment_patch.yaml → config/observability/grafana/grafana_deployment_patch.yaml

@@ -50,24 +50,38 @@
 - op: add
   path: /spec/template/spec/volumes/-
   value:
-    name: grafana-appdeveloper
+    name: grafana-app-developer
     configMap:
       defaultMode: 420
-      name: grafana-appdeveloper
+      name: grafana-app-developer
 - op: add
   path: /spec/template/spec/volumes/-
   value:
-    name: grafana-platformengineer
+    name: grafana-platform-engineer
     configMap:
       defaultMode: 420
-      name: grafana-platformengineer
+      name: grafana-platform-engineer
 - op: add
   path: /spec/template/spec/volumes/-
   value:
-    name: grafana-businessuser
+    name: grafana-business-user
     configMap:
       defaultMode: 420
-      name: grafana-businessuser
+      name: grafana-business-user
+- op: add
+  path: /spec/template/spec/volumes/-
+  value:
+    name: grafana-controller-resources
+    configMap:
+      defaultMode: 420
+      name: grafana-controller-resources
+- op: add
+  path: /spec/template/spec/volumes/-
+  value:
+    name: grafana-controller-runtime
+    configMap:
+      defaultMode: 420
+      name: grafana-controller-runtime          
 - op: add
   path: /spec/template/spec/containers/0/volumeMounts/-
   value:
@@ -97,7 +111,7 @@
   path: /spec/template/spec/containers/0/volumeMounts/-
   value:
     name: grafana-tcproutes
-    mountPath: /grafana-dashboard-definitions/0/grafana-tcpcroutes
+    mountPath: /grafana-dashboard-definitions/0/grafana-tcproutes
 - op: add
   path: /spec/template/spec/containers/0/volumeMounts/-
   value:
@@ -106,15 +120,25 @@
 - op: add
   path: /spec/template/spec/containers/0/volumeMounts/-
   value:
-    name: grafana-appdeveloper
-    mountPath: /grafana-dashboard-definitions/0/grafana-appdeveloper
+    name: grafana-app-developer
+    mountPath: /grafana-dashboard-definitions/0/grafana-app-developer
+- op: add
+  path: /spec/template/spec/containers/0/volumeMounts/-
+  value:
+    name: grafana-business-user
+    mountPath: /grafana-dashboard-definitions/0/grafana-business-user
+- op: add
+  path: /spec/template/spec/containers/0/volumeMounts/-
+  value:
+    name: grafana-platform-engineer
+    mountPath: /grafana-dashboard-definitions/0/grafana-platform-engineer
 - op: add
   path: /spec/template/spec/containers/0/volumeMounts/-
   value:
-    name: grafana-businessuser
-    mountPath: /grafana-dashboard-definitions/0/grafana-businessuser
+    name: grafana-controller-runtime
+    mountPath: /grafana-dashboard-definitions/0/grafana-controller-runtime
 - op: add
   path: /spec/template/spec/containers/0/volumeMounts/-
   value:
-    name: grafana-platformengineer
-    mountPath: /grafana-dashboard-definitions/0/grafana-platformengineer
+    name: grafana-controller-resources
+    mountPath: /grafana-dashboard-definitions/0/grafana-controller-resources

config/observability/kustomization.yaml

@@ -7,9 +7,9 @@ resources:
   - github.com/Kuadrant/gateway-api-state-metrics/config/examples/dashboards?ref=main
 # To scrape istio metrics, 3 configurations are required:
 # 1. Envoy metrics directly from the istio ingress gateway pod
-  - podmonitor-envoy.yaml
+  - prometheus/monitors/pod-monitor-envoy.yaml
 # 2. Istiod metrics via the istiod service
-  - servicemonitor-istiod.yaml
+  - 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.
@@ -18,12 +18,17 @@ resources:
 # exposed or named, so we need to drop to raw custom prometheus
 # scrape config.
 # See https://github.com/prometheus-operator/prometheus-operator/issues/3071#issuecomment-763746836
-  - additional-scrape-configs.yaml
+  - prometheus/additional-scrape-configs.yaml
   #https://istio.io/latest/docs/reference/config/telemetry/#MetricSelector-IstioMetric
-  - telemetry.yaml
+  - prometheus/monitors/service-monitor-limitador-operator.yaml
+  - prometheus/monitors/service-monitor-kuadrant-operator.yaml
+  - prometheus/monitors/service-monitor-authorino-operator.yaml
+  - prometheus/monitors/service-monitor-dns-operator.yaml
+
+  - prometheus/telemetry.yaml
 
 patchesStrategicMerge:
-  - cluster_role.yaml
+  - rbac/cluster_role.yaml
 
 patches:
   - target:
@@ -71,19 +76,19 @@ patchesJson6902:
       version: v1
       kind: Deployment
       name: kube-state-metrics
-    path: ksm_deployment_patch.yaml
+    path: openshift/ksm_deployment_patch.yaml
   - target:
       group: rbac.authorization.k8s.io
       version: v1
       kind: ClusterRole
       name: kube-state-metrics
-    path: ksm_clusterrole_patch.yaml
+    path: rbac/ksm_clusterrole_patch.yaml
   - target:
       group: apps
       version: v1
       kind: Deployment
       name: grafana
-    path: grafana_deployment_patch.yaml
+    path: grafana/grafana_deployment_patch.yaml
 
 generatorOptions:
   disableNameSuffixHash: true
@@ -93,5 +98,4 @@ secretGenerator:
   namespace: monitoring
   behavior: replace
   files:
-  - grafana_datasources.yaml
-
+  - grafana/grafana_datasources.yaml

config/observability/prometheus/monitors/service-monitor-authorino-operator.yaml

@@ -0,0 +1,19 @@
+
+# Prometheus Monitor Service (Metrics)
+apiVersion: monitoring.coreos.com/v1
+kind: ServiceMonitor
+metadata:
+  labels:
+    control-plane: controller-manager
+  name: authorino-operator-metrics
+  namespace: kuadrant-system
+spec:
+  endpoints:
+    - path: /metrics
+      port: metrics
+      scheme: http
+  selector:
+    matchLabels:
+      control-plane: authorino-operator
+
+

config/observability/prometheus/monitors/service-monitor-dns-operator.yaml

@@ -0,0 +1,23 @@
+
+apiVersion: monitoring.coreos.com/v1
+kind: ServiceMonitor
+metadata:
+  labels:
+    control-plane: controller-manager
+    app.kubernetes.io/name: servicemonitor
+    app.kubernetes.io/instance: controller-manager-metrics-monitor
+    app.kubernetes.io/component: metrics
+    app.kubernetes.io/created-by: dns-operator
+    app.kubernetes.io/part-of: dns-operator
+    app.kubernetes.io/managed-by: kustomize
+  name: dns-operator-metrics-monitor
+  namespace: kuadrant-system
+spec:
+  endpoints:
+    - path: /metrics
+      port: metrics
+      scheme: http
+  selector:
+    matchLabels:
+      control-plane: dns-operator-controller-manager
+

config/observability/prometheus/monitors/service-monitor-kuadrant-operator.yaml

@@ -0,0 +1,19 @@
+
+# Prometheus Monitor Service (Metrics)
+apiVersion: monitoring.coreos.com/v1
+kind: ServiceMonitor
+metadata:
+  labels:
+    control-plane: controller-manager
+  name: kuadrant-operator-metrics
+  namespace: kuadrant-system
+spec:
+  endpoints:
+    - path: /metrics
+      port: metrics
+      scheme: http
+  selector:
+    matchLabels:
+      control-plane: controller-manager
+      app: kuadrant
+

config/prometheus/monitor.yaml → config/observability/prometheus/monitors/service-monitor-limitador-operator.yaml

@@ -5,8 +5,8 @@ kind: ServiceMonitor
 metadata:
   labels:
     control-plane: controller-manager
-  name: controller-manager-metrics-monitor
-  namespace: system
+  name: limitador-operator-metrics
+  namespace: kuadrant-system
 spec:
   endpoints:
     - path: /metrics
@@ -15,3 +15,4 @@ spec:
   selector:
     matchLabels:
       control-plane: controller-manager
+