From 3a633dbad3e29f1e78b3ce4e187ec4b76a6ae394 Mon Sep 17 00:00:00 2001 From: Hiram Chirino Date: Thu, 7 Mar 2024 14:54:35 -0500 Subject: [PATCH] grafana: update CRDs to new version structure. Signed-off-by: Hiram Chirino --- .../base/grafana/apiserver-dashboard.yaml | 4 ++++ .../base/grafana/grafana.yaml | 20 ++++++------------- 2 files changed, 10 insertions(+), 14 deletions(-) diff --git a/deploy/nexodus-monitoring/base/grafana/apiserver-dashboard.yaml b/deploy/nexodus-monitoring/base/grafana/apiserver-dashboard.yaml index 450284118..50943598a 100644 --- a/deploy/nexodus-monitoring/base/grafana/apiserver-dashboard.yaml +++ b/deploy/nexodus-monitoring/base/grafana/apiserver-dashboard.yaml @@ -3,6 +3,10 @@ kind: GrafanaDashboard metadata: name: nexodus-dashboard spec: + resyncPeriod: 30s + instanceSelector: + matchLabels: + dashboards: "nexodus-grafana" json: > { "annotations": { diff --git a/deploy/nexodus-monitoring/base/grafana/grafana.yaml b/deploy/nexodus-monitoring/base/grafana/grafana.yaml index 261737bdb..8ae88cc82 100644 --- a/deploy/nexodus-monitoring/base/grafana/grafana.yaml +++ b/deploy/nexodus-monitoring/base/grafana/grafana.yaml @@ -2,14 +2,11 @@ apiVersion: grafana.integreatly.org/v1beta1 kind: Grafana metadata: name: nexodus-grafana + labels: + dashboards: "nexodus-grafana" spec: client: - preferService: true - ingress: - enabled: true - hostname: grafana.127.0.0.1.nip.io - path: / - pathType: Prefix + preferIngress: false config: log: mode: "console" @@ -20,12 +17,7 @@ spec: server: root_url: http://grafana.127.0.0.1.nip.io auth: - disable_login_form: false - disable_signout_menu: true + disable_login_form: "false" + disable_signout_menu: "true" auth.anonymous: - enabled: true - dashboardLabelSelector: - - matchExpressions: - - key: app.kubernetes.io/component - operator: In - values: [grafana] + enabled: "true" \ No newline at end of file