Merge pull request #4010 from Azure/grafana_sync_dashboards

Sync grafana dashboards from git

Author: openshift-merge-bot[bot]

dev-infrastructure/global-pipeline.yaml

@@ -10,6 +10,12 @@
 $schema: "pipeline.schema.v1"
 serviceGroup: Microsoft.Azure.ARO.HCP.Global
 rolloutName: Global Resource Rollout
+buildStep:
+  command: make
+  args:
+  - -C
+  - ../tooling/grafanactl
+  - bundle
 resourceGroups:
 - name: global
   resourceGroup: '{{ .global.rg }}'
@@ -91,22 +97,25 @@ resourceGroups:
   - name: grafana-dashboards
     action: Shell
     omitFromServiceGroupCompletion: true
-    command: make grafana
-    workingDir: ./../observability/
+    command: ./grafanactl sync dashboards --subscription=${SUBSCRIPTION_ID} --resource-group=${GLOBAL_RESOURCEGROUP} --grafana-name=${GRAFANA_NAME} --config-file=./observability.yaml
+    workingDir: ../tooling/grafanactl
     dependsOn:
     - resourceGroup: global
       step: housekeeping
     - resourceGroup: global
-      step: infra
+      step: output
     dryRun:
-      variables:
-      - name: DRY_RUN
-        value: "true"
+      command: ./grafanactl sync dashboards --subscription=${SUBSCRIPTION_ID} --resource-group=${GLOBAL_RESOURCEGROUP} --grafana-name=${GRAFANA_NAME} --config-file=./observability.yaml --dry-run
     variables:
     - name: GRAFANA_NAME
       configRef: monitoring.grafanaName
     - name: GLOBAL_RESOURCEGROUP
       configRef: global.rg
+    - name: SUBSCRIPTION_ID
+      input:
+        resourceGroup: global
+        step: output
+        name: subscriptionId
     shellIdentity:
       input:
         resourceGroup: global

dev-infrastructure/templates/output-global.bicep

@@ -107,3 +107,9 @@ resource genevaActionsKV 'Microsoft.KeyVault/vaults@2024-04-01-preview' existing
 }
 
 output genevaActionKeyVaultUrl string = genevaActionsKV.properties.vaultUri
+
+//
+//   S U B S C R I P T I O N
+//
+
+output subscriptionId string = subscription().subscriptionId

observability/Makefile

@@ -2,10 +2,6 @@ deploy:
 	make -C ./tracing deploy
 .PHONY: deploy
 
-grafana:
-	python3 grafana/grafana.py
-.PHONY: grafana
-
 kubernetesControlPlane-prometheusRule:
 	PROMETHEUS_OPERATOR_REF=$(shell yq -r '.prometheusRules.prometheusOperatorVersion' observability.yaml) && \
 	wget --quiet --output-document=alerts/kubernetesControlPlane-prometheusRule.yaml \