Commit Graph
13 Commits
Author SHA1 Message Date
Max Leonard Inden 157ad7eaea kube-prometheus: Update Prometheus Operator version before generating 2018-04-26 12:50:51 +02:00
Max IndenandGitHub c776fa4c48 Merge pull request #1238 from brancz/kube-prometheus-fixes
Various kube-prometheus fixes
2018-04-23 14:15:17 +02:00
Max IndenandGitHub 26d1dc86c9 Merge pull request #1229 from mxinden/move-serv-mon-to-target
kube-prometheus: Move service monitors to target folder
2018-04-18 14:15:26 +02:00
Max Leonard Inden 971ed1010e kube-prometheus: Move service monitors to target folder
With 1d00e0ab ("ServiceMonitor: Enable Prometheus to select ServMon
outside own ns") merged: To emphasize the fact, that ServiceMonitors can
be deployed alongside their targets, this patch moves the Alertmanager,
Kube-State-Metrics, Node-Exporter and Prometheus Operator
Service-Monitor into the respective target folder in the kube-prometheus
project.
2018-04-18 13:44:45 +02:00
Max IndenandGitHub 73e9a9882f Merge pull request #1206 from brancz/jsonnet
Convert kube-prometheus to jsonnet
2018-04-17 09:52:49 +02:00
Max IndenandGitHub b1aae67d99 Merge pull request #1219 from coreos/thanos4
Enable Thanos sidecar
2018-04-13 17:05:38 +02:00
Max Leonard Inden 3b13afb562 kube-prometheus/thanos: Move to experimental folder
In preparation of PR #1206 [1], This patch moves the Thanos manifests to the
`experimental` folder.

[1] https://github.com/coreos/prometheus-operator/pull/1206
2018-04-13 15:10:18 +02:00
Max Leonard Inden b10e343689 kube-prometheus: Fix minor typo 2018-04-10 10:27:54 +02:00
Max Leonard Inden 46c49616e0 *: Bump version to v0.18.1 2018-04-09 14:47:34 +02: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 2f302943fe Unify rule file label accross repository
In some cases we have been using `alert-rules` in some cases
`prometheus-rulefiles`. This led to confusion [1]. Instead, unify the
Prometheus rules configmap labels to:

```yaml
labels:
  role: alert-rules
```

[1] https://github.com/coreos/prometheus-operator/issues/1102
2018-03-19 14:24:48 +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
Max IndenandGitHub f51416ba99 Update README.md 2017-03-13 09:26:20 +01:00