Skip to content

entries in grafanaDatasources must be filenames ending with .yml #209

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
woodsaj merged 1 commit into from
Jan 21, 2020
Merged

entries in grafanaDatasources must be filenames ending with .yml #209

Show file tree
Hide file tree
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
entries in grafanaDatasources must be filenames ending with .yml
  • Loading branch information
@woodsaj
woodsaj committed Jan 21, 2020
commit e7d3c2feb498c8024aa12c13322094e54f3b447d
4 changes: 2 additions & 2 deletions prometheus-ksonnet/lib/grafana-configmaps.libsonnet
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,8 +33,8 @@
to add datasources:

grafanaDatasources+:: {
'my-datasource': $.grafana_datasource(name, url, default, method),
'secure-datasource': $.grafana_datasource_with_basicauth(name, url, username, password, default, method),
'my-datasource.yml': $.grafana_datasource(name, url, default, method),
'secure-datasource.yml': $.grafana_datasource_with_basicauth(name, url, username, password, default, method),
},
*/
grafanaDatasources+:: {},
Expand Down
6 changes: 3 additions & 3 deletions prometheus-ksonnet/lib/grafana.libsonnet
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,9 +47,9 @@
}),

grafanaDatasources+:: {
prometheus: $.grafana_datasource('prometheus',
'http://prometheus.%(namespace)s.svc.%(cluster_dns_suffix)s%(prometheus_web_route_prefix)s' % $._config,
default=true),
'prometheus.yml': $.grafana_datasource('prometheus',
'http://prometheus.%(namespace)s.svc.%(cluster_dns_suffix)s%(prometheus_web_route_prefix)s' % $._config,
default=true),
},

local container = $.core.v1.container,
Expand Down