Commit Graph

12 Commits

Author SHA1 Message Date
Eduardo Gonzalez
c510324253 newline bugfix modified in grafana configmap generator 2017-10-22 11:20:57 +02:00
Frederic Branczyk
3388dd2e55 Merge pull request #670 from valdisrigdon/fix-datasource-configmap
Fix merging of -datasource.json files
2017-10-16 13:53:49 +02:00
Valdis Rigdon
7eed244db7 Fix merging of -datasource.json files
The merge was missing a new line at the end of the merge, so only
the first datasource was being put into the ConfigMap.
2017-10-13 11:55:56 -04:00
jordanjennings
1a30399883 [kube-prometheus] Update to Grafana 4.5.2 in template
In the generated version of this file at /contrib/kube-prometheus/manifests/grafana/grafana-deployment.yaml the version was bumped to 4.5.2 but seems it was overlooked in this templated version of the file.
2017-10-11 15:09:11 -04:00
Giap Tran
6aadd5cfd9 grafana_dashboards_generate: fix "file" local variable 2017-09-22 12:00:43 +07:00
Eduardo Gonzalez
3c4dec7a1c grafana-deployment-original file deleted 2017-09-15 11:43:13 +02:00
Eduardo Gonzalez
41972d362c added grafana-deployment updates when configmaps are generated 2017-09-14 15:26:45 +02:00
Eduardo Gonzalez
ec4fabad9c set options added to main script 2017-09-14 12:46:00 +02:00
Eduardo Gonzalez
e517658b57 dashboards removed from tool 2017-09-09 12:54:12 +02:00
Eduardo Gonzalez
46671b7ee4 grafana configmap generator tool added 2017-09-09 12:54:12 +02:00
Eduardo Gonzalez
53b616e77d deleted configmap generator 2017-09-09 12:54:12 +02:00
Eduardo Gonzalez
b75d263567 grafana configmap generator integrated 2017-08-15 17:18:09 +02:00