Merge remote-tracking branch 'origin/bb-843-grafana' into staging

chart/templates/monitoring/monitoring-helmrelease.yaml

@@ -54,6 +54,24 @@ spec:
       image:
         pullSecrets:
         - private-registry
+      grafana.ini:
+{{- if .Values.istio.enabled }}
+        server:
+          root_url: https://grafana.{{ .Values.hostname }}/
+{{- end }}
+        auth: 
+          signout_redirect_url: https://{{ .Values.sso.oidc.host }}/auth/realms/{{ .Values.sso.oidc.realm }}/protocol/openid-connect/logout
+        auth.generic_oauth:
+          enabled: {{ .Values.monitoring.sso.enabled }}
+          client_id: {{ .Values.monitoring.sso.grafana.client_id }}
+          client_secret: {{ .Values.monitoring.sso.grafana.client_secret }}
+          scopes: {{ .Values.monitoring.sso.grafana.scopes | default "openid profile email" }}
+          auth_url: https://{{ .Values.sso.oidc.host }}/auth/realms/{{ .Values.sso.oidc.realm }}/protocol/openid-connect/auth
+          token_url: https://{{ .Values.sso.oidc.host }}/auth/realms/{{ .Values.sso.oidc.realm }}/protocol/openid-connect/token
+          api_url: https://{{ .Values.sso.oidc.host }}/auth/realms/{{ .Values.sso.oidc.realm }}/protocol/openid-connect/userinfo
+          allow_sign_up: {{ .Values.monitoring.sso.grafana.allow_sign_up | default "True" }}
+          role_attribute_path: {{ .Values.monitoring.sso.grafana.role_attribute_path | default "Viewer" }}
+
     prometheus-node-exporter:
       serviceAccount:
         imagePullSecrets:
@@ -86,4 +104,4 @@ spec:
       namespace: {{ .Release.Namespace }}
   {{- end }}
   {{- end }}
-{{- end }}
\ No newline at end of file
+{{- end }}

chart/values.yaml

@@ -155,7 +155,7 @@ monitoring:
   git:
     repo: https://repo1.dsop.io/platform-one/big-bang/apps/core/monitoring.git
     path: "./chart"
-    tag: "11.0.0-bb.8"
+    tag: "11.0.0-bb.9"
   sso:
     enabled: false
     prometheus:
@@ -167,6 +167,9 @@ monitoring:
     grafana:
       client_id: grafana
       client_secret: "change_me"
+      scopes: ""
+      allow_sign_up: "true"
+      role_attribute_path: "Viewer"
   values: {}
 # ----------------------------------------------------------------------------------------------------------------------