Commit Graph

157 Commits

Author SHA1 Message Date
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
Frederic Branczyk
8baa7b1f03 Merge pull request #673 from brancz/version-updates
kube-prometheus: various version updates
2017-10-06 18:52:58 +02:00
Frederic Branczyk
461c01b063 kube-prometheus: various version updates 2017-10-06 15:45:43 +02:00
Alexander Brandstedt
710110603b change make generate to use docker run to be more protable 2017-10-06 12:15:46 +02:00
Giancarlo Rubio
f8c48a976a bump kube-state-metrics to v1.0.1 + fix rbac metric 2017-09-29 15:21:13 +02:00
Frederic Branczyk
40fa4ccd15 grafana-dashboards: various small improvements 2017-09-26 15:59:44 +02:00
Frederic Branczyk
ea3a2c43ba Merge pull request #632 from brancz/cut-0.13.0
cut 0.13.0 & promote project to beta
2017-09-22 10:55:43 +02:00
Giap Tran
6aadd5cfd9 grafana_dashboards_generate: fix "file" local variable 2017-09-22 12:00:43 +07:00
Daniel Sachse
6213964317 Updated to prometheus 1.7.1
This updates prometheus to 1.7.1 where it was missing
2017-09-21 17:08:01 +02:00
Frederic Branczyk
3cbffd9ed6 *: bump version to v0.13.0 2017-09-21 14:28:33 +02:00
Frederic Branczyk
c8cb2df928 kube-prometheus: exclude pod log subresource from latency alerts 2017-09-18 11:11:30 +02:00
Frederic Branczyk
4b4cdb9f2f Merge pull request #567 from eedugon/feature/grafana_configmap_generator
Feature/grafana configmap generator
2017-09-15 15:30:02 +02: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
5a253f192b changed prometheus memory to default of 400Mi 2017-09-14 12:57:16 +02:00
Eduardo Gonzalez
ec4fabad9c set options added to main script 2017-09-14 12:46:00 +02:00
Frederic Branczyk
788d99c22f Merge pull request #601 from VinceMD/doc/monitor-secure-etcd-cluster
Documentation Add doc to monitor a secure etcd cluster, typically set up via kube-aws
2017-09-13 13:28:22 +02:00
Arve Knudsen
40718bed62 Fix ServiceMonitor documentation link 2017-09-13 12:26:34 +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
d0aa27b081 memory prometheus raised to 4g 2017-09-09 12:14:02 +02:00
Eduardo Gonzalez
7067e8d6d1 Merge branch 'master' of https://github.com/coreos/prometheus-operator 2017-09-09 12:03:36 +02:00
Yang Li
88fe225e81 add tolerations to allow node-exporter running on all nodes 2017-09-08 18:13:20 +08:00
Frederic Branczyk
d81943d124 Merge pull request #604 from brancz/dashboards
assets: modify and add grafana dashboards
2017-09-08 09:48:31 +02:00
Vincent Brouillet
ab9ba85f8b minor fixes to monitoring external etcd 2017-09-08 10:54:05 +10:00
Frederic Branczyk
dfd2ee2847 assets: modify and add grafana dashboards 2017-09-07 13:44:12 +02:00
Arve Knudsen
ebffe0dae6 Refer to CRDs as opposed to TPRs 2017-09-07 11:21:59 +02:00
Vincent Brouillet
781d00bc5d Add doc to monitor a secure etcd cluster, typically set up via kube-aws 2017-09-06 11:58:14 +10:00
Arve Knudsen
bbfabfaf4d Don't name Grafana port 2017-08-30 18:27:29 +02:00
Frederic Branczyk
146c024950 kube-prometheus: bump kube-state-metrics to v1.0.1 release 2017-08-28 16:45:08 +02:00
Frederic Branczyk
7708f8eb83 kube-prometheus: adapt deploy script to wait for CRDs 2017-08-28 09:37:24 +02:00
Frederic Branczyk
57efea743f kube-prometheus: update the Prometheus Operator RBAC roles 2017-08-24 14:01:26 +02:00
Frederic Branczyk
d5285e0288 *: bump version to v0.12.0 2017-08-24 11:14:50 +02:00
Frederic Branczyk
e4ee14b7d5 Merge pull request #555 from brancz/v1-move
Move to v1 from v1alpha1
2017-08-24 08:45:35 +02:00
Frederic Branczyk
40a45fcf7d *: adapt all manifests from v1alpha1 to v1 2017-08-23 14:36:00 +02:00
Frederic Branczyk
20a7a43eac Merge branch 'grafana-retry' 2017-08-23 10:37:28 +02:00
Frederic Branczyk
1d5bfeb81e Merge pull request #561 from ryanwalls/patch-2
Update to latest kube-state-metrics
2017-08-23 10:28:14 +02:00
Ryan Walls
f87fd9cc0a Update kube-prometheus to use kube-state-metrics v1.0.0 2017-08-22 17:09:37 -06:00
Sam Manzer
abc7bcd11a bump grafana-watcher version to v0.0.8 2017-08-22 10:09:25 -05:00
crandl201
e48278f397 update kube-state rules for 1.0.0 2017-08-17 20:05:55 -04:00
Eduardo Gonzalez
b75d263567 grafana configmap generator integrated 2017-08-15 17:18:09 +02:00
Eduardo Gonzalez
b4996f917d Merge branch 'master' of https://github.com/coreos/prometheus-operator 2017-08-15 16:48:53 +02:00
Reinhard Nägele
afc95c87dd Use grafana watcher v0.0.7 throughout the repo 2017-08-11 14:35:38 +02:00
eedugon
66dd7b253d Hints and notes added to handle grafana dashboards (#534) 2017-08-02 12:09:44 +02:00
eedugon
bcb2db7ce5 Removed grafana restart comment
Removed grafana restart comment from doc, as it's not necessary (grafana-watcher should pick up the changes and reload the dashboards).
2017-08-02 12:08:03 +02:00
eedugon
4e4b00bb5c link in dashboard section
Including a link in dashboard section to the document with all the details (docs/developing-alerts-and-dashboards.md)
2017-08-02 11:42:24 +02:00
eedugon
e1db00daed Update developing-alerts-and-dashboards.md 2017-08-02 11:38:26 +02:00