diff --git a/apps/grafana.yaml b/apps/grafana.yaml deleted file mode 100644 index ed36e8e..0000000 --- a/apps/grafana.yaml +++ /dev/null @@ -1,20 +0,0 @@ -apiVersion: argoproj.io/v1alpha1 -kind: Application -metadata: - name: grafana - namespace: argocd -spec: - project: default - destination: - server: https://kubernetes.default.svc - namespace: grafana - syncPolicy: - automated: - prune: true - selfHeal: false - syncOptions: - - CreateNamespace=true - source: - repoURL: https://github.com/zoriya/snow - targetRevision: HEAD - path: apps/grafana diff --git a/apps/grafana/clickhouse-datasource.yaml b/apps/otel/clickhouse-datasource.yaml similarity index 100% rename from apps/grafana/clickhouse-datasource.yaml rename to apps/otel/clickhouse-datasource.yaml diff --git a/apps/grafana/oidc.yaml b/apps/otel/grafana-oidc.yaml similarity index 100% rename from apps/grafana/oidc.yaml rename to apps/otel/grafana-oidc.yaml diff --git a/apps/grafana/grafana.yaml b/apps/otel/grafana.yaml similarity index 93% rename from apps/grafana/grafana.yaml rename to apps/otel/grafana.yaml index 3d69a8e..8a2eaf5 100644 --- a/apps/grafana/grafana.yaml +++ b/apps/otel/grafana.yaml @@ -7,6 +7,7 @@ metadata: spec: config: log: + level: debug mode: "console" auth: disable_login_form: "false" @@ -24,7 +25,8 @@ spec: auth_url: "https://authentik.sdg.moe/application/o/authorize/" token_url: "https://authentik.sdg.moe/application/o/token/" api_url: "https://authentik.sdg.moe/application/o/userinfo/" - role_attribute_path: 'Admin' #contains(groups, 'Grafana Admins') && 'Admin' || contains(groups, 'Grafana Editors') && 'Editor' || 'Viewer' + role_attribute_path: contains(groups[*], 'admins') && 'GrafanaAdmin' || 'Editor' + allow_assign_grafana_admin: "true" persistentVolumeClaim: spec: