fix(grafana): move grafana.ini to hr

tyriis · Apr 3, 2024 · e102918 · e102918
1 parent d652ea7
commit e102918
Show file tree

Hide file tree

Showing 3 changed files with 20 additions and 40 deletions.
diff --git a/kubernetes/talos-flux/apps/observability/grafana/app/config/grafana.ini b/kubernetes/talos-flux/apps/observability/grafana/app/config/grafana.ini
diff --git a/kubernetes/talos-flux/apps/observability/grafana/app/helm-release.yaml b/kubernetes/talos-flux/apps/observability/grafana/app/helm-release.yaml
@@ -29,6 +29,10 @@ spec:
 
     env:
       TZ: ${SETTING_TZ}
+      GF_EXPLORE_ENABLED: "true"
+      GF_PANELS_DISABLE_SANITIZE_HTML: "true"
+      GF_DATE_FORMATS_USE_BROWSER_LOCALE: "true"
+      GF_LOG_LEVEL: info
 
     envFromSecrets:
       - name: grafana-env
@@ -38,6 +42,19 @@ spec:
       userKey: USERNAME
       passwordKey: PASSWORD
 
+    grafana.ini:
+      server:
+        root_url: https://grafana.techtales.io
+      users:
+        auto_assign_org_role: Admin
+      auth.google:
+        enabled: true
+        allow_sign_up: true
+        allowed_domains: techtales.io
+        scopes: https://www.googleapis.com/auth/userinfo.profile https://www.googleapis.com/auth/userinfo.email
+        auth_url: https://accounts.google.com/o/oauth2/auth
+        token_url: https://accounts.google.com/o/oauth2/token
+
     dashboards:
       default:
         # Ref: https://grafana.com/grafana/dashboards/11074
@@ -91,22 +108,17 @@ spec:
     createConfigmap: true
     extraConfigmapMounts:
       - name: grafana-contactpoints
-        mountPath: /etc/grafana/alerting/
+        mountPath: /etc/grafana/alerting/contactpoints.yaml
         subPath: contactpoints.yaml
         configMap: grafana-contactpoints
         readOnly: true
       - name: grafana-datasources
-        mountPath: /etc/grafana/datasources/
+        mountPath: /etc/grafana/datasources/datasources.yaml
         subPath: datasources.yaml
         configMap: grafana-datasources
         readOnly: true
-      - name: grafana-ini
-        mountPath: /etc/grafana/grafana.ini
-        subPath: grafana.ini
-        configMap: grafana-ini
-        readOnly: true
       - name: grafana-policies
-        mountPath: /etc/grafana/alerting/
+        mountPath: /etc/grafana/alerting/policies.yaml
         subPath: policies.yaml
         configMap: grafana-policies
         readOnly: true
diff --git a/kubernetes/talos-flux/apps/observability/grafana/app/kustomization.yaml b/kubernetes/talos-flux/apps/observability/grafana/app/kustomization.yaml
@@ -14,9 +14,6 @@ configMapGenerator:
   - name: grafana-datasources
     files:
       - datasources.yaml=config/datasources.yaml
-  - name: grafana-ini
-    files:
-      - grafana.ini=config/grafana.ini
   - name: grafana-policies
     files:
       - policies.yaml=config/policies.yaml