From 5c5a7276bdaad34b39aac2005733f143cd2d0fac Mon Sep 17 00:00:00 2001 From: Avi Biton Date: Sun, 30 Jul 2023 12:53:29 +0300 Subject: [PATCH] fix(RHTAPWATCH-8): update GrafanaDashboard to match GrafanaOperator v5 replacing `apiVersion` adding `instanceSelector` update path to dashbords in infra-deployments Signed-off-by: Avi Biton --- .tekton/push.yaml | 2 +- config/grafana/dashboard.yaml | 5 ++++- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/.tekton/push.yaml b/.tekton/push.yaml index a06560dfa..6a739ee3e 100644 --- a/.tekton/push.yaml +++ b/.tekton/push.yaml @@ -18,7 +18,7 @@ spec: - name: infra-deployment-update-script value: | sed -i -e 's|\(https://github.com/redhat-appstudio/integration-service/.*?ref=\)\(.*\)|\1{{ revision }}|' -e 's/\(newTag: \).*/\1{{ revision }}/' components/integration/kustomization.yaml - sed -i -e 's|\(https://github.com/redhat-appstudio/integration-service/.*?ref=\)\(.*\)|\1{{ revision }}|' -e 's/\(newTag: \).*/\1{{ revision }}/' components/monitoring/grafana/base/integration/kustomization.yaml + sed -i -e 's|\(https://github.com/redhat-appstudio/integration-service/.*?ref=\)\(.*\)|\1{{ revision }}|' -e 's/\(newTag: \).*/\1{{ revision }}/' components/monitoring/grafana/base/dashboards/integration/kustomization.yaml pipelineRef: name: docker-build bundle: quay.io/redhat-appstudio-tekton-catalog/pipeline-core-services-docker-build:latest diff --git a/config/grafana/dashboard.yaml b/config/grafana/dashboard.yaml index a6a689ffd..75d68de21 100644 --- a/config/grafana/dashboard.yaml +++ b/config/grafana/dashboard.yaml @@ -1,10 +1,13 @@ -apiVersion: integreatly.org/v1alpha1 +apiVersion: grafana.integreatly.org/v1beta1 kind: GrafanaDashboard metadata: name: grafana-dashboard-integration-service labels: app: appstudio-grafana spec: + instanceSelector: + matchLabels: + dashboards: "appstudio-grafana" configMapRef: name: grafana-dashboard-integration-service key: integration-service-dashboard.json