7 Commits

Author SHA1 Message Date
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
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
Frederic Branczyk
fbab1e4212 *: bump versions 2017-05-18 11:15:34 +02:00
Fabian Reinartz
d53553444b Remove unnecessary prometheus- prefix 2017-05-02 12:10:44 +02:00
Fabian Reinartz
48bda634ce Bump default Prometheus version to 1.6.1 2017-04-20 16:08:16 +02:00
Frederic Branczyk
89ed6773e7 Add 'contrib/kube-prometheus/' from commit '81c0d2f4d30f63a4e274c2870c5afc89241827b0'
git-subtree-dir: contrib/kube-prometheus
git-subtree-mainline: 050ca21276696c8603375c699513ec487301ed62
git-subtree-split: 81c0d2f4d30f63a4e274c2870c5afc89241827b0
2017-03-06 09:55:36 +01:00