Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix(grafana): move grafana.ini to hr #2765

Merged
merged 1 commit into from
Apr 3, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view

This file was deleted.

Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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
Expand Down Expand Up @@ -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
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
Loading