6 Commits

Author SHA1 Message Date
Frederic Branczyk
3246c48913 prometheus: Add ability to whitelist Kubernetes labels 2018-03-23 16:13:28 +01:00
Frederic Branczyk
3c278a202f Merge branch 'master' into restrict-service-monitor 2018-03-20 08:47:43 -04:00
Max Leonard Inden
310f471cf6 contrib/kube: Add rbac role to discover prometheus
The current example-app setup in the kube-prometheus project is able to
discover scraping targets in the default namespace. It is not able to
discover the configured Alertmanager in the monitoring namespace.

This patch adds an alertmanager-discovery rbac role, to permit the
above described action. In addition it does the following cleanups:

- Remove kubeconfig configuration in deploy and teardown script. kubectl
chooses .kube/config whenever KUBECONFIG is not set by default

- Remove namespace specification option via NAMESPACE env var. In most
of the manifests the metadata/namespace was hardcoded anyways, in
addition in the promtheus frontend role binding the service account
namespace is hardcoded to default as well.

- Instead of `kubectl {apply,delete}` individual manifests, the deploy
and teardown shell scripts {apply,delete} on the entire folder.
2018-03-19 17:13:33 +01:00
Max Leonard Inden
3a6d38ea0e contrib/kube: Restrict example-app servicemonitor to default ns
The `prometheus-frontend` role of the example app kubeprometheus section
is scoped to the default namespace. Thereby the frontend Prometheus
instance is not able to discover anything outside of the default
namespace. We might as well restrict the front end service monitor to
the default namespace too.
2018-03-19 13:34:18 +01:00
Frederic Branczyk
40a45fcf7d *: adapt all manifests from v1alpha1 to v1 2017-08-23 14:36:00 +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