diff --git a/kubernetes/apps/monitoring/grafana/app/helmrelease.yaml b/kubernetes/apps/monitoring/grafana/app/helmrelease.yaml index 4b27f9c..dcda776 100644 --- a/kubernetes/apps/monitoring/grafana/app/helmrelease.yaml +++ b/kubernetes/apps/monitoring/grafana/app/helmrelease.yaml @@ -14,7 +14,7 @@ spec: kind: HelmRepository name: grafana namespace: flux-system - version: 6.60.1 + version: 6.60.2 interval: 30m timeout: 20m maxHistory: 2 @@ -29,212 +29,7 @@ spec: uninstall: keepHistory: false values: + annotations: + configmap.reloader.stakater.com/reload: grafana + secret.reloader.stakater.com/reload: grafana-secrets replicas: 1 - - dashboardProviders: - dashboardproviders.yaml: - apiVersion: 1 - providers: - - name: default - orgId: 1 - folder: "" - type: file - disableDeletion: false - editable: true - options: - path: /var/lib/grafana/dashboards/default - - datasources: - datasources.yaml: - apiVersion: 1 - deleteDatasources: - - name: Loki - orgId: 1 - - name: Alertmanager - orgId: 1 - datasources: - - name: Prometheus - type: prometheus - access: proxy - url: http://thanos-query-frontend.monitoring.svc.cluster.local:9090 - isDefault: true - - name: Loki - type: loki - access: proxy - url: http://loki-gateway.monitoring.svc.cluster.local - jsonData: - maxLines: 250 - - name: Alertmanager - type: alertmanager - access: proxy - url: http://kube-prometheus-stack-alertmanager.monitoring.svc.cluster.local:9093 - jsonData: - implementation: prometheus - - dashboards: - default: - # Ref: https://grafana.com/grafana/dashboards/1860-node-exporter-full/ - node-exporter-full: - gnetId: 1860 - revision: 30 - datasource: Prometheus - # Ref: https://grafana.com/grafana/dashboards/5342-ceph-pools/ - ceph-pools: - gnetId: 5342 - revision: 9 - datasource: Prometheus - # Ref: https://grafana.com/grafana/dashboards/5336-ceph-osd-single/ - ceph-osd: - gnetId: 5336 - revision: 9 - datasource: Prometheus - # Ref: https://grafana.com/grafana/dashboards/2842-ceph-cluster/ - ceph-cluster: - gnetId: 2842 - revision: 16 - datasource: Prometheus - cert-manager: - url: https://raw.githubusercontent.com/monitoring-mixins/website/master/assets/cert-manager/dashboards/cert-manager.json - datasource: Prometheus - external-secrets: - url: https://raw.githubusercontent.com/external-secrets/external-secrets/main/docs/snippets/dashboard.json - datasource: Prometheus - flux-cluster: - url: https://raw.githubusercontent.com/fluxcd/flux2/main/manifests/monitoring/monitoring-config/dashboards/cluster.json - datasource: Prometheus - flux-control-plane: - url: https://raw.githubusercontent.com/fluxcd/flux2/main/manifests/monitoring/monitoring-config/dashboards/control-plane.json - datasource: Prometheus - flux-logs: - url: https://raw.githubusercontent.com/fluxcd/flux2/main/manifests/monitoring/monitoring-config/dashboards/logs.json - datasource: Prometheus - kubernetes-api-server: - url: https://raw.githubusercontent.com/dotdc/grafana-dashboards-kubernetes/master/dashboards/k8s-system-api-server.json - datasource: Prometheus - kubernetes-coredns: - url: https://raw.githubusercontent.com/dotdc/grafana-dashboards-kubernetes/master/dashboards/k8s-system-coredns.json - datasource: Prometheus - kubernetes-global: - url: https://raw.githubusercontent.com/dotdc/grafana-dashboards-kubernetes/master/dashboards/k8s-views-global.json - datasource: Prometheus - kubernetes-namespaces: - url: https://raw.githubusercontent.com/dotdc/grafana-dashboards-kubernetes/master/dashboards/k8s-views-namespaces.json - datasource: Prometheus - kubernetes-nodes: - url: https://raw.githubusercontent.com/dotdc/grafana-dashboards-kubernetes/master/dashboards/k8s-views-nodes.json - datasource: Prometheus - kubernetes-pods: - url: https://raw.githubusercontent.com/dotdc/grafana-dashboards-kubernetes/master/dashboards/k8s-views-pods.json - datasource: Prometheus - ingress-nginx: - url: https://raw.githubusercontent.com/kubernetes/ingress-nginx/master/deploy/grafana/dashboards/nginx.json - datasource: Prometheus - ingress-nginx-request-handling-performance: - url: https://raw.githubusercontent.com/kubernetes/ingress-nginx/master/deploy/grafana/dashboards/request-handling-performance.json - datasource: Prometheus - - deploymentStrategy: - type: Recreate - - env: - GF_ANALYTICS_CHECK_FOR_UPDATES: false - GF_DATE_FORMATS_USE_BROWSER_LOCALE: true - GF_EXPLORE_ENABLED: true - GF_GRAFANA_NET_URL: https://grafana.net - GF_LOG_FILTERS: rendering:debug - GF_PANELS_DISABLE_SANITIZE_HTML: true - GF_SECURITY_ALLOW_EMBEDDING: true - GF_SECURITY_COOKIE_SAMESITE: grafana - GF_SERVER_ROOT_URL: "https://grafana.valinor.social" - - envFromSecret: grafana-secrets - - grafana.ini: - analytics: - check_for_updates: false - auth: - oauth_auto_login: true - auth.basic: - enabled: false - auth.generic_oauth: - enabled: true - name: Auth0 - scopes: "openid profile email" - client_id: # Set by env vars - client_secret: # Set by env vars - auth_url: # Set by env vars - token_url: # Set by env vars - api_url: # Set by env vars - use_pkce: true - - auth.generic_oauth.group_mapping: - role_attribute_path: | - contains("https://hsndev/groups"[*], 'grafana-admin') && 'Admin' || contains("https://hsndev/groups"[*], 'grafana-viewer') && 'Viewer' - org_id: 1 - grafana_net: - url: https://grafana.net - log: - mode: console - paths: - data: /var/lib/grafana/data - logs: /var/log/grafana - plugins: /var/lib/grafana/plugins - provisioning: /etc/grafana/provisioning - server: - root_url: https://grafana.valinor.social - - imageRenderer: - enabled: false - - ingress: - enabled: true - ingressClassName: nginx - annotations: - external-dns.alpha.kubernetes.io/target: ingress.valinor.social - hosts: - - &host grafana.valinor.social - tls: - - hosts: - - *host - - persistence: - enabled: false - - plugins: - - natel-discrete-panel - - pr0ps-trackmap-panel - - grafana-piechart-panel - - vonage-status-panel - - grafana-worldmap-panel - - grafana-clock-panel - - podAnnotations: - configmap.reloader.stakater.com/reload: grafana - secret.reloader.stakater.com/reload: grafana-secrets - - rbac: - pspEnabled: false - - resources: - requests: - cpu: 23m - memory: 127M - - serviceMonitor: - enabled: true - - sidecar: - dashboards: - enabled: true - labelValue: "" - label: grafana_dashboard - folderAnnotation: grafana_folder - searchNamespace: ALL - provider: - disableDelete: true - foldersFromFilesStructure: true - datasources: - enabled: true - labelValue: "" - searchNamespace: ALL - logLevel: INFO