Commit Graph

328 Commits

Author SHA1 Message Date
Frederic Branczyk
549589f95c Merge pull request #1390 from brancz/cleanup
Cleanup
2018-05-28 16:49:37 +02:00
Frederic Branczyk
0a98b8edaf Remove grafana-dashboards-configmap-generator 2018-05-28 10:31:21 +02:00
Frederic Branczyk
7b9d97de7f Remove rules that have been migrated to kubernetes-mixins 2018-05-28 10:30:37 +02:00
Matthias Loibl
23cd630d33 Change the roleBinding and rules names too 2018-05-25 22:46:58 +02:00
Matthias Loibl
da6fc256b5 Make the prometheus & alertmanager name configurable 2018-05-25 18:02:23 +02:00
Frederic Branczyk
c11db46863 kube-prometheus: Re-generate 2018-05-25 17:01:41 +02:00
Frederic Branczyk
1969fada7e kube-prometheus: Add table of contents 2018-05-25 16:49:19 +02:00
Frederic Branczyk
ef4673705e kube-prometheus/docs: Add guide on exposing via Ingress 2018-05-25 16:27:22 +02:00
Frederic Branczyk
3a7628e842 Fix link to Prometheus rules & Grafana dashboards guide 2018-05-25 15:56:48 +02:00
Frederic Branczyk
ca057722e5 Add formatting jsonnet to generate make target 2018-05-25 15:56:10 +02:00
Frederic Branczyk
d8f6b6f81b kube-prometheus: Update kops docs 2018-05-25 15:54:54 +02:00
Frederic Branczyk
5776092b6d Merge pull request #1381 from dwdraju/kube-prom-doc
fix doc guide link of kube-prometheus
2018-05-25 11:12:35 +02:00
alpha
f1553a76b7 fix doc guide link of kube-prometheus 2018-05-25 14:41:28 +05:45
Frederic Branczyk
a911aa08bf Merge pull request #1367 from jolson490/fix-watch-namespace-error
kube-prometheus: add the watch verb (to the namespace apiGroup for the prometheus-operator ClusterRole).
2018-05-25 10:55:37 +02:00
Joshua Olson
3605c0eb44 Also checking in the changes made to prometheus-rules.yaml by "make generate", in order to (hopefully) get the build to be green. 2018-05-24 16:53:32 -05:00
Joshua Olson
2b81c0090b After modifying prometheus-operator.libsonnet (see commit ec19c16), these are the changes that were made to 0prometheus-operator-clusterRole.yaml by running "make generate". 2018-05-24 16:35:19 -05:00
Joshua Olson
3bd7d36abd add the watch verb (to the namespace apiGroup for the prometheus-operator ClusterRole).
To get the "Failed to watch" error to stop happening in the prometheus-operator logs.

Fixes #1324 for kube-prometheus.
2018-05-21 16:18:57 -05:00
hsinhoyeh
2408e243b2 fix again 2018-05-20 10:53:31 +08:00
hsinhoyeh
b7949ee520 fixed dashboard example json path 2018-05-20 10:28:07 +08:00
Frederic Branczyk
3edf5c5410 Merge pull request #1333 from mxinden/alerting-rule-file-crd
prometheus: Introduce RuleFile Custom Resource Definition
2018-05-18 17:14:28 +02:00
Max Leonard Inden
9e180452f8 prometheus: Introduce RuleFile Custom Resource Definition
This patch introduces a new Custom Resource Definition to the
Prometheus Operator - the Rule CRD. It addresses two main
needs:

1. Prometheus (alerting and recording) Rule validation during creation time
via Kubernetes Custom Resource Definition validation.

2. Life-cycle management of Prometheus application Rules alongside the
application itself, inside the applications Kubernetes namespace, not
necessarily the namespace of the scraping Prometheus instance.

A user defines Prometheus alerting and recording Rules via a Kubernetes
Custom Resource Definition. These Custom Resource Definitions can be
fully validated by the Kubernetes API server during creation time via
automatically generated OpenAPI specifications. Instead of the
restriction of a Prometheus instance to only select Rule definitions
inside its own namespace, the Prometheus specification is extended to
also specify namespaces to look for Rule Custom Resource Definitions
outside its own namespace.

---

Dependent technical changes:

- prometheus: Use github.com/jimmidyson/configmap-reload to reload rules

- prometheus: Remove Prometheus Statefulset deletion function. Starting
with K8s >=1.8 this is handled via OwnerReferences.

- prometheus: Do not add rule files checksum to Prometheus configuration
secret

- prometheus: Update StatefulSet only on relevant changes. Instead of
updating the Prometheus StatefulSet on every `sync()` run, only update
it if the input parameters to `makeStatefulSet` change.  Enforce this
via a checksum of the parameters which is saved inside the annotations
of the statefulset.

- e2e/prometheus: Check how often resources (Secret, ConfigMap,
Prometheus CRD, Service) are updated to enforce that Prometheus Operator
only updated created resources if necessary.

- contrib/prometheus-config-reloader: Remove logic to retriev K8s
ConfigMaps. These are mounted into the pod right away now.
2018-05-18 16:27:20 +02:00
Frederic Branczyk
fef0a65938 Adapt docs on additional rules and dashboards 2018-05-18 11:00:11 +02:00
Max Leonard Inden
0461c85098 docs: Run embedmd on both Docs and kube-prometheus README.md 2018-05-14 11:55:16 +02:00
Max Leonard Inden
0124e8c272 contrib/kube-prometheus: add -f to rm in build.sh
According to the man pages of `rm` and the `-f` option:
> Attempt to remove the files without prompting for confirma- tion,
> regardless of the file's permissions.  If the file does not exist, do
> not display a diagnostic message or modify the exit status to reflect an
> error.  The -f option overrides any previous -i options.

This patch prevents the `build.sh` script from failing if files do not
exist when attempting to delete them.
2018-05-11 11:23:10 +02:00
piglei™
a9e667d24c kube-prometheus: fix alert rule K8SManyNodesNotReady (#1313)
* kube-prometheus: fix alert rule K8SManyNodesNotReady

* fix alert "K8SManyNodesNotReady" in helm templates & make generate

* Use sync_kube_prometheus.py to make rules in helm in sync
2018-05-11 10:59:34 +02:00
Giancarlo Rubio
2a6b3db38b Fix CI running make generate (#1327) 2018-05-10 17:50:14 +02:00
Frederic Branczyk
116aaf88be kube-prometheus: regenerate 2018-05-08 07:36:13 -07:00
Frederic Branczyk
3388f96afe Address comments 2018-05-06 08:29:52 -07:00
Frederic Branczyk
edf21e4382 kube-prometheus/jsonnet: Use jsonnet-bundler 2018-04-28 19:05:19 +01:00
Max Leonard Inden
992bcdccc1 *: Bump version to v0.19.0 2018-04-26 21:42:57 +02:00
Frederic Branczyk
8406f8a7a0 Merge pull request #1254 from mxinden/fix-jsonnet-version
kube-prometheus: Remove hard-coded Prometheus Operator version
2018-04-26 13:39:08 +01:00
Max Leonard Inden
157ad7eaea kube-prometheus: Update Prometheus Operator version before generating 2018-04-26 12:50:51 +02:00
Brandon Dimcheff
45076a6a1f kube-prometheus: fix addon-resizer role binding
The addon resizer was referring to an incorrect role binding and was unable to
access the API.  This changes the rolebinding name to refer to the correctly
defined rolebinding.
2018-04-25 22:05:56 -04:00
Max Inden
c776fa4c48 Merge pull request #1238 from brancz/kube-prometheus-fixes
Various kube-prometheus fixes
2018-04-23 14:15:17 +02:00
Frederic Branczyk
8c49a641e2 kube-prometheus/hack: Fix cyclic ServiceMonitor dependency
Previously the script errored out, as ServiceMonitor objects are only
registered once the Prometheus Operator is running.
2018-04-23 10:16:07 +01:00
naseemkullah
754ba95991 Update Monitoring external etcd.md 2018-04-22 22:31:04 -04:00
Frederic Branczyk
2afaeab294 kube-prometheus: Update to latest kubernetes-grafana 2018-04-22 16:37:13 +01:00
Frederic Branczyk
0610c45e13 kube-prometheus: Fix rule label selector 2018-04-22 10:50:58 +01:00
Frederic Branczyk
7c07940cb8 kube-prometheus: Fix config reloader RBAC 2018-04-22 10:50:26 +01:00
Max Inden
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
Joakim Karlsson
f6dae8bd71 updated jsonnet code 2018-04-18 12:52:58 +02:00
Joakim Karlsson
00df72cf5e cleanup 2018-04-18 11:20:45 +02:00
Joakim Karlsson
e3e5105699 added rbac permissions for operator to work properly 2018-04-18 11:15:18 +02:00
Max Inden
73e9a9882f Merge pull request #1206 from brancz/jsonnet
Convert kube-prometheus to jsonnet
2018-04-17 09:52:49 +02:00
naseemkullah
73b3259f62 Update kube-prometheus-on-kubeadm.md
In kubeadm 1.10 (and perhaps earlier versions, not sure), ctrl-mgr and scheduler pods' label key is `component=` rather than `k8s-app=`, which is the selector key used for kube-prometheus exporters for these components.
2018-04-15 02:01:30 -04:00
Max Inden
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
Frederic Branczyk
507617e150 Remove old manifests and replace with jsonnet build 2018-04-13 13:36:34 +02:00
Fabian Reinartz
e7e23cd81f contrib: add Thanos example manifests 2018-04-13 11:53:43 +02:00