Skip to content

Adding pgsql datasource for Grafana #564

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.

Sign up for GitHub

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

Merged
merged 1 commit into from
Oct 10, 2024
Merged

Adding pgsql datasource for Grafana #564

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
9 changes: 9 additions & 0 deletions charts/sourcegraph/templates/grafana/grafana.ConfigMap.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,15 @@ data:
type: Jaeger
access: proxy
url: http://{{ default "jaeger-query" .Values.jaeger.query.name }}:16686/-/debug/jaeger
- name: pgsql
type: postgres
url: $PGHOST:$PGPORT
user: $PGGRAFANAUSER
database: $PGDATABASE
secureJsonData:
password: $PGGRAFANAPASSWORD
jsonData:
sslmode: $PGSSLMODE
Comment on lines +18 to +26
Copy link
Contributor

@jdpleiness jdpleiness Oct 10, 2024

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Can we make this optional with something like {{- if .Values.grafana.postgres.enabled }} wrapping it?
I'd be worried about this being on by default.

Copy link
Contributor Author

@marcleblanc2 marcleblanc2 Oct 10, 2024 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Grafana doesn't create this datasource if the env vars are not defined, so the switch to enable it is defining all of these env vars on the Grafana container; this process is consistent across all deployment methods, which is a big win.

Adding another config flag would be redundant, and would increase the delta of maintaining the Cody Airgapped Analytics solution between different deployment methods.

Copy link
Contributor

@DaedalusG DaedalusG Oct 10, 2024

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@jdpleiness had a call with @marcleblanc2 and discussed this, things look okay and yea grafana shouldn't deploy these unless the specific env vars are set. They're only set by default via our helpers in frontend and migrator

kind: ConfigMap
metadata:
labels:
Expand Down