Feat/Unify grafana-operator based setup on k8s/openshift overlays

Makefile

@@ -103,6 +103,19 @@ argocd-url:
 argocd-login: argocd
 	$(ARGOCD) login $(ARGOCD_IP):443 --insecure --username admin --password $(ARGOCD_PASSWD)
 
+##@ Grafana management targets
+GRAFANA_USER = $(shell kubectl --kubeconfig=$(PWD)/kubeconfig -n monitoring get secret grafana-admin-credentials -o jsonpath="{.data.GF_SECURITY_ADMIN_USER}" | base64 -d)
+GRAFANA_PASSWD = $(shell kubectl --kubeconfig=$(PWD)/kubeconfig -n monitoring get secret grafana-admin-credentials -o jsonpath="{.data.GF_SECURITY_ADMIN_PASSWORD}" | base64 -d)
+GRAFANA_IP = $(shell kubectl --kubeconfig=$(PWD)/kubeconfig -n monitoring get svc grafana-service -o jsonpath="{.status.loadBalancer.ingress[0].ip}")
+
+grafana-url:
+	@echo -e "\n"
+	@echo -e ">>> Grafana is available at:"
+	@echo -e ">>> \tURL: \thttp://$(GRAFANA_IP)/login"
+	@echo -e ">>> \tuser: \t$(GRAFANA_USER)"
+	@echo -e ">>> \tpass: \t$(GRAFANA_PASSWD)"
+	@echo -e "\n"
+
 ##@ Local setup
 
 local-setup: export KUBECONFIG = $(PWD)/kubeconfig

manifests/observability-hub/base/grafana/dashboards.yaml

@@ -0,0 +1,84 @@
+apiVersion: grafana.integreatly.org/v1beta1
+kind: GrafanaDashboard
+metadata:
+  annotations:
+    argocd.argoproj.io/sync-options: SkipDryRunOnMissingResource=true
+  name: istio-workload
+spec:
+  allowCrossNamespaceImport: true
+  instanceSelector:
+    matchLabels:
+      dashboards: grafana
+  configMapRef:
+    name: istio-workload
+    key: grafana-dashboard-istio-workload.json
+
+---
+apiVersion: grafana.integreatly.org/v1beta1
+kind: GrafanaDashboard
+metadata:
+  annotations:
+    argocd.argoproj.io/sync-options: SkipDryRunOnMissingResource=true
+  name: app-developer
+spec:
+  allowCrossNamespaceImport: true
+  instanceSelector:
+    matchLabels:
+      dashboards: grafana
+  url: "https://raw.githubusercontent.com/Kuadrant/kuadrant-operator/refs/tags/v1.0.2/examples/dashboards/app_developer.json"
+
+---
+apiVersion: grafana.integreatly.org/v1beta1
+kind: GrafanaDashboard
+metadata:
+  annotations:
+    argocd.argoproj.io/sync-options: SkipDryRunOnMissingResource=true
+  name: platform-engineer
+spec:
+  allowCrossNamespaceImport: true
+  instanceSelector:
+    matchLabels:
+      dashboards: grafana
+  url: "https://raw.githubusercontent.com/Kuadrant/kuadrant-operator/refs/tags/v1.0.2/examples/dashboards/platform_engineer.json"
+
+---
+apiVersion: grafana.integreatly.org/v1beta1
+kind: GrafanaDashboard
+metadata:
+  annotations:
+    argocd.argoproj.io/sync-options: SkipDryRunOnMissingResource=true
+  name: bussiness-user
+spec:
+  allowCrossNamespaceImport: true
+  instanceSelector:
+    matchLabels:
+      dashboards: grafana
+  url: "https://raw.githubusercontent.com/Kuadrant/kuadrant-operator/refs/tags/v1.0.2/examples/dashboards/business_user.json"
+
+---
+apiVersion: grafana.integreatly.org/v1beta1
+kind: GrafanaDashboard
+metadata:
+  annotations:
+    argocd.argoproj.io/sync-options: SkipDryRunOnMissingResource=true
+  name: controller-resources-metrics
+spec:
+  allowCrossNamespaceImport: true
+  instanceSelector:
+    matchLabels:
+      dashboards: grafana
+  url: "https://raw.githubusercontent.com/Kuadrant/kuadrant-operator/refs/tags/v1.0.2/examples/dashboards/controller-resources-metrics.json"
+
+---
+apiVersion: grafana.integreatly.org/v1beta1
+kind: GrafanaDashboard
+metadata:
+  annotations:
+    argocd.argoproj.io/sync-options: SkipDryRunOnMissingResource=true
+  name: controller-runtime-metrics
+spec:
+  allowCrossNamespaceImport: true
+  instanceSelector:
+    matchLabels:
+      dashboards: grafana
+  url: "https://raw.githubusercontent.com/Kuadrant/kuadrant-operator/refs/tags/v1.0.2/examples/dashboards/controller-runtime-metrics.json"

manifests/observability-hub/overlays/k8s/grafana/dashboards/grafana-dashboard-istio-workload.json → manifests/observability-hub/base/grafana/dashboards/grafana-dashboard-istio-workload.json

@@ -68,7 +68,7 @@
     {
       "datasource": {
         "type": "prometheus",
-        "uid": "P8D9ADF90DB2E3ECF"
+        "uid": "$datasource"
       },
       "fieldConfig": {
         "defaults": {
@@ -143,7 +143,7 @@
     {
       "datasource": {
         "type": "prometheus",
-        "uid": "P8D9ADF90DB2E3ECF"
+        "uid": "$datasource"
       },
       "fieldConfig": {
         "defaults": {
@@ -225,7 +225,7 @@
       "dashes": false,
       "datasource": {
         "type": "prometheus",
-        "uid": "P8D9ADF90DB2E3ECF"
+        "uid": "$datasource"
       },
       "fill": 1,
       "fillGradient": 0,
@@ -325,7 +325,7 @@
     {
       "datasource": {
         "type": "prometheus",
-        "uid": "P8D9ADF90DB2E3ECF"
+        "uid": "$datasource"
       },
       "fieldConfig": {
         "defaults": {
@@ -401,7 +401,7 @@
     {
       "datasource": {
         "type": "prometheus",
-        "uid": "P8D9ADF90DB2E3ECF"
+        "uid": "$datasource"
       },
       "fieldConfig": {
         "defaults": {
@@ -515,7 +515,7 @@
       "dashes": false,
       "datasource": {
         "type": "prometheus",
-        "uid": "P8D9ADF90DB2E3ECF"
+        "uid": "$datasource"
       },
       "fill": 0,
       "fillGradient": 0,
@@ -612,7 +612,7 @@
       "dashes": false,
       "datasource": {
         "type": "prometheus",
-        "uid": "P8D9ADF90DB2E3ECF"
+        "uid": "$datasource"
       },
       "fill": 1,
       "fillGradient": 0,
@@ -710,7 +710,7 @@
       "dashes": false,
       "datasource": {
         "type": "prometheus",
-        "uid": "P8D9ADF90DB2E3ECF"
+        "uid": "$datasource"
       },
       "description": "",
       "fill": 1,
@@ -864,7 +864,7 @@
       "dashes": false,
       "datasource": {
         "type": "prometheus",
-        "uid": "P8D9ADF90DB2E3ECF"
+        "uid": "$datasource"
       },
       "fill": 1,
       "fillGradient": 0,
@@ -1016,7 +1016,7 @@
       "dashes": false,
       "datasource": {
         "type": "prometheus",
-        "uid": "P8D9ADF90DB2E3ECF"
+        "uid": "$datasource"
       },
       "fill": 1,
       "fillGradient": 0,
@@ -1168,7 +1168,7 @@
       "dashes": false,
       "datasource": {
         "type": "prometheus",
-        "uid": "P8D9ADF90DB2E3ECF"
+        "uid": "$datasource"
       },
       "fill": 1,
       "fillGradient": 0,
@@ -1262,7 +1262,7 @@
       "dashes": false,
       "datasource": {
         "type": "prometheus",
-        "uid": "P8D9ADF90DB2E3ECF"
+        "uid": "$datasource"
       },
       "fill": 1,
       "fillGradient": 0,
@@ -1389,7 +1389,7 @@
       "dashes": false,
       "datasource": {
         "type": "prometheus",
-        "uid": "P8D9ADF90DB2E3ECF"
+        "uid": "$datasource"
       },
       "fill": 0,
       "fillGradient": 0,
@@ -1486,7 +1486,7 @@
       "dashes": false,
       "datasource": {
         "type": "prometheus",
-        "uid": "P8D9ADF90DB2E3ECF"
+        "uid": "$datasource"
       },
       "fill": 1,
       "fillGradient": 0,
@@ -1584,7 +1584,7 @@
       "dashes": false,
       "datasource": {
         "type": "prometheus",
-        "uid": "P8D9ADF90DB2E3ECF"
+        "uid": "$datasource"
       },
       "description": "",
       "fill": 1,
@@ -1738,7 +1738,7 @@
       "dashes": false,
       "datasource": {
         "type": "prometheus",
-        "uid": "P8D9ADF90DB2E3ECF"
+        "uid": "$datasource"
       },
       "fill": 1,
       "fillGradient": 0,
@@ -1890,7 +1890,7 @@
       "dashes": false,
       "datasource": {
         "type": "prometheus",
-        "uid": "P8D9ADF90DB2E3ECF"
+        "uid": "$datasource"
       },
       "fill": 1,
       "fillGradient": 0,
@@ -2042,7 +2042,7 @@
       "dashes": false,
       "datasource": {
         "type": "prometheus",
-        "uid": "P8D9ADF90DB2E3ECF"
+        "uid": "$datasource"
       },
       "fill": 1,
       "fillGradient": 0,
@@ -2135,7 +2135,7 @@
       "dashes": false,
       "datasource": {
         "type": "prometheus",
-        "uid": "P8D9ADF90DB2E3ECF"
+        "uid": "$datasource"
       },
       "fill": 1,
       "fillGradient": 0,
@@ -2254,7 +2254,7 @@
         },
         "datasource": {
           "type": "prometheus",
-          "uid": "P8D9ADF90DB2E3ECF"
+          "uid": "$datasource"
         },
         "definition": "",
         "hide": 0,
@@ -2284,7 +2284,7 @@
         },
         "datasource": {
           "type": "prometheus",
-          "uid": "P8D9ADF90DB2E3ECF"
+          "uid": "$datasource"
         },
         "definition": "",
         "hide": 0,
@@ -2316,7 +2316,7 @@
             "source"
           ]
         },
-        "datasource": "P8D9ADF90DB2E3ECF",
+        "datasource": "$datasource",
         "definition": "",
         "hide": 0,
         "includeAll": false,
@@ -2354,7 +2354,7 @@
         },
         "datasource": {
           "type": "prometheus",
-          "uid": "P8D9ADF90DB2E3ECF"
+          "uid": "$datasource"
         },
         "definition": "",
         "hide": 0,
@@ -2384,7 +2384,7 @@
         },
         "datasource": {
           "type": "prometheus",
-          "uid": "P8D9ADF90DB2E3ECF"
+          "uid": "$datasource"
         },
         "definition": "",
         "hide": 0,
@@ -2414,7 +2414,7 @@
         },
         "datasource": {
           "type": "prometheus",
-          "uid": "P8D9ADF90DB2E3ECF"
+          "uid": "$datasource"
         },
         "definition": "",
         "hide": 0,

manifests/observability-hub/base/grafana/grafana.yaml

@@ -0,0 +1,32 @@
+apiVersion: grafana.integreatly.org/v1beta1
+kind: Grafana
+metadata:
+  annotations:
+    argocd.argoproj.io/sync-options: SkipDryRunOnMissingResource=true
+  labels:
+    dashboards: grafana
+  name: grafana
+spec:
+  config:
+    auth.anonymous:
+      enabled: "True"
+    auth:
+      disable_login_form: "False"
+      disable_signout_menu: "True"
+    auth.basic:
+      enabled: "True"
+    log:
+      mode: console
+    security:
+      admin_password: secret
+      admin_user: root
+  service:
+    spec:
+      ports:
+        - name: http
+          port: 80
+          protocol: TCP
+          targetPort: grafana-http
+  client:
+    preferIngress: false
+  version: 10.4.3

manifests/observability-hub/overlays/openshift/grafana/subscription.yaml → manifests/observability-hub/base/grafana/subscription.yaml

@@ -1,11 +1,13 @@
 apiVersion: operators.coreos.com/v1alpha1
 kind: Subscription
 metadata:
+  annotations:
+    argocd.argoproj.io/sync-options: SkipDryRunOnMissingResource=true
   name: grafana-operator
-  namespace: openshift-operators
+  namespace: operators
 spec:
   channel: v5
   installPlanApproval: Automatic
   name: grafana-operator
-  source: community-operators
-  sourceNamespace: openshift-marketplace
+  source: operatorhubio-catalog
+  sourceNamespace: olm

manifests/observability-hub/base/kustomization.yaml

@@ -2,4 +2,14 @@ apiVersion: kustomize.config.k8s.io/v1beta1
 kind: Kustomization
 
 resources:
-  - github.com/Kuadrant/kuadrant-operator/examples/dashboards?ref=v1.0.1
+  - ./grafana/subscription.yaml
+  - ./grafana/grafana.yaml
+  - ./grafana/dashboards.yaml
+
+configMapGenerator:
+  - files:
+    - ./grafana/dashboards/grafana-dashboard-istio-workload.json
+    name: istio-workload
+    namespace: monitoring
+    options:
+        disableNameSuffixHash: true