Commit Graph

319 Commits

Author SHA1 Message Date
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
eedugon
f201c79f5d hints and notes added to handle grafana dashboards
Added some comments to the doc, to:
- Point the directory where make generate should be executed from
- Mention that the dashboard file should be suffixed with "-dashboard.json".
- Added hints to apply the new configMap and restart grafana
2017-08-02 11:37:22 +02:00
Eduardo Gonzalez
29d696ca08 Merge remote-tracking branch 'upstream/master' 2017-08-02 11:19:35 +02:00
xvzup
d34811cbe9 Update prometheus-k8s-roles.yaml
Resource pods added to role prometheus-k8s for namespace default. This is required to monitor kube-apiserver.
2017-08-01 18:10:23 +02:00
Frederic Branczyk
caeaaf52ea *: bump version 2017-07-28 12:06:00 +02:00
Frederic Branczyk
154456ad79 generate Prometheus Operator deployments with jsonnet (#508)
* *: use jsonnet to generate manifests

* generate Prometheus Operator manifests with jsonnet

* add jsonnet dockenfile for generating with jenkins
2017-07-27 14:17:57 +02:00
Zachary Yonash
7010e32130 Added a few extra node rules (#478) 2017-07-27 09:49:25 +02:00
Frederic Branczyk
5b93d32b90 Merge pull request #470 from weiwei04/grafana-chart
grafana chart for kube-prometheus
2017-07-25 14:59:24 +02:00
Wei Wei
f63473a269 add grafana chart for kube-prometheus 2017-07-25 20:48:55 +08:00
Frederic Branczyk
817bd1da97 kube-prometheus/docs: add docs on how to modify assets 2017-07-24 16:29:39 +02:00
Frederic Branczyk
cd6eef6ca8 Merge pull request #461 from brancz/namespaced-prom-k8s
kube-prometheus: run prometheus-k8s with only those roles it needs
2017-07-24 12:01:49 +02:00
Frederic Branczyk
6571c71e8c *: bump version to v0.11.0 2017-07-21 09:30:23 +02:00
Frederic Branczyk
c97a329792 kube-prometheus: run prometheus-k8s with only those roles it needs 2017-07-20 14:33:20 +02:00
Andy Lindeman
eae253db74 Scrapes cAdvisor port for metrics in Kubernetes 1.7 2017-07-13 12:51:59 -04:00
Gabi Davar
c0a3447c01 remove duplicate volumeMount entry. 2017-07-08 14:29:23 +03:00
Eduardo Gonzalez
92d7d4ad31 Merge remote-tracking branch 'upstream/master' 2017-07-06 09:43:45 +02:00
Jean-Paul Calderone
1db18ae87c bump patch level in grafana-watcher version 2017-06-30 12:31:39 -04:00
jordanjennings
5a5bfab855 kube-prometheus: Update RBAC for kube-state-metrics
kube-state-metrics needs additional permissions for replicationcontrollers, limitranges, and services (otherwise the API server logs are flooded with RBAC DENY messages)
2017-06-30 08:36:58 -04:00
Frederic Branczyk
a5533a4f6c kube-prometheus: ensure triggering alerts on down targets 2017-06-28 14:11:05 +02:00
Eduardo Gonzalez
0278420991 Merge remote-tracking branch 'upstream/master' 2017-06-26 08:06:43 +02:00
Frederic Branczyk
4c42ab4fcc kube-prometheus: fix correct selector 2017-06-19 11:33:28 +02:00
Frederic Branczyk
065ee1e99c Merge pull request #428 from jordanjennings/patch-2
kube-prometheus: update serviceMonitorSelector
2017-06-19 11:31:06 +02:00
jordanjennings
dea5226b9f kube-prometheus: update serviceMonitorSelector
In cleanup commit 9cd05a8c39c6ed03688859de92372d93af5cc6e2 the labels on the ServiceMonitors were changed from k8s-apps to k8s-app. This commit makes the Prometheus selector match that change.
2017-06-17 13:03:50 -04:00
Christian Jauvin
81fdfaddb3 Fix relative links in kube-prometheus readme 2017-06-16 16:34:38 -04:00
Frederic Branczyk
915677eaa2 Revert "alerting rules: replace severity with action" 2017-06-15 10:45:51 +02:00
Frederic Branczyk
a1afce8707 alerting rules: replace severity with action 2017-06-15 09:34:59 +02:00
Frederic Branczyk
e1cda3fa7d cut v0.10.1 2017-06-13 11:24:30 +02:00
chenxingyu
98cdf68a0c fix alert rule bug 2017-06-13 16:40:56 +08:00
Frederic Branczyk
9808fdba66 Merge pull request #410 from gianrubio/fix-auth
Fix basicAuth, swapping key and name
2017-06-13 10:35:44 +02:00
Giancarlo Rubio
9b1f9b6c47 Fix basicAuth, swapping key and name 2017-06-13 09:21:10 +02:00
Frederic Branczyk
74cc46d984 *: update default versions and example usages 2017-06-12 14:42:18 +02:00
Frederic Branczyk
77adbc079e cut v0.10.0 2017-06-09 12:14:10 +02:00
Frederic Branczyk
67de2c17fe *: default -route-prefix to root
Whenever serving Prometheus or Alertmanager through non root
ExternalURLs we require the reverse proxy to trim the URL to be to the
root Prometheus/Alertmanager.
2017-06-08 20:01:05 +02:00
Frederic Branczyk
a152fabfd3 Merge pull request #391 from brancz/alerting
Alerting
2017-06-07 14:08:23 +02:00
Frederic Branczyk
373e5cf096 *: use Prometheus 1.7 2017-06-07 13:17:11 +02:00
Frederic Branczyk
1a457371bc kube-prometheus: regenerate the rule file configmap manifest 2017-06-06 16:00:17 +02:00
Frederic Branczyk
4da7a872ba kube-prometheus: add comment on apiserver latency unit 2017-06-06 15:34:10 +02:00
Frederic Branczyk
0c35d73e2c kube-prometheus: drop conntrack alerts and direct up alerts 2017-06-06 15:22:28 +02:00
eedugon
3238ba257a small changes in k8s/minikube and example-app (#392)
* namespace has to be kube-system

In order for this service to be discovered by ServiceMonitor k8s-apps-http, it should belong to namespace kube-system.

* namespace has to be kube-system

* namespace has to be kube-system

for service discovery to work within prometheus configuration (ServiceMonitor k8s-app) these service and endpoints should belong to kube-system namespace. Otherwise the service monitor won't fetch it.

* selector was incorrect

selector prometheus: prometheus-frontend is incorrect, the name of the Prometheus resource in the example is "frontend", not "prometheus-frontend"
2017-05-31 11:55:56 -07:00