Commit Graph

351 Commits

Author SHA1 Message Date
Aleksandar Topuzovic acb7ce62bf Commit generated files 2018-06-05 15:05:41 +01:00
Aleksandar Topuzovic 64c73eafe5 Ignore '/etc/*' mountpoints
* Ignores '/etc/resolv.conf', '/etc/hosts' and '/etc/hostname' mountpoints
* Otherwise 3 additional alerts are generated
2018-06-05 14:59:40 +01:00
Frederic Branczyk 9b4f6ce56b *: Remove PrometheusRuleSelector 2018-06-05 13:59:31 +02:00
Frederic Branczyk e84b101fe7 *: Rename RuleFile to PrometheusRule 2018-06-05 13:34:13 +02:00
Max Leonard Inden 8f3b505049 kube-prometheus: Adjust to new Prometheus rule file CRD
89fc4e306972604eba2dcb961a6d29cc27a668ad introduced the new Prometheus
rule file custom resource definition. This patch adjusts the
kube-prometheus project to use the new custom resource definition.
2018-06-04 20:23:02 +02:00
Max Inden a47d97859a Merge pull request #1407 from mxinden/rm-leftover
kube-prometheus: Remove duplicate unused files
2018-06-04 11:59:25 +02:00
Frederic Branczyk b7d0da01d5 kube-prometheus: Remove unnecessary namespace selectors 2018-05-31 17:37:43 +02:00
Max Leonard Inden 304db75813 kube-prometheus: Remove duplicate unused files
afe9711ce2ef5dd0e0b5091f921ae9bc0aab3711 introduced
contrib/kube-prometheus/0prometheus-operator-clusterRole.yaml and
contrib/kube-prometheus/0prometheus-operator-deployment.yaml by mistake.
2018-05-31 16:09:53 +02:00
Frederic Branczyk 10bbf403fe Merge pull request #1404 from mxinden/rm-tpr
rbac: Remove Third Party Resources rules
2018-05-31 15:40:36 +02:00
Max Leonard Inden 553d6b0c63 rbac: Remove Third Party Resources rules
Since PR 460 [1] the Prometheus Operator is using Kubernetes Custom Resource
Definitions instead of Kubernetes Third Party Resources. Permissions to
handle Third Party Resources in the RBAC rules of the Prometheus
Operator is thereby obsolete.

[1] https://github.com/coreos/prometheus-operator/pull/460
2018-05-31 15:12:15 +02:00
slene 49c76ac80f update generated kube-prometheus manifests 2018-05-31 18:59:44 +08:00
slene 6f6d7dcdc9 support custom kube-prometheus configmapReloader & prometheusConfigReloader image 2018-05-31 18:55:13 +08:00
Frederic Branczyk 4ba6995481 Merge pull request #1399 from mxinden/rule-file-live-migration
prometheus: Enable live migration of rule configmaps to rule file crds
2018-05-31 11:47:55 +02:00
Max Leonard Inden 453e170f6a prometheus: Enable live migration of rule configmaps to rule file crds
With this patch the Prometheus Operator checks if there are any
Kubernetes ConfigMaps inside the Prometheus namespace which fullfill the
`Spec.RuleSelector` requirement. If so, it creates a RuleFile for each
key in the `ConfigMap.Spec.Data` map inside the Prometheus namespace.
2018-05-31 10:47:50 +02:00
Frederic Branczyk b405326bfc Merge pull request #1386 from nickman/master
Adds proxy_url to v1.Endpoint. Fixes #1385
2018-05-30 14:17:24 +02:00
Nicholas Whitehead 7eee585cdf Adds proxy_url to v1.Endpoint. Fixes #1385 2018-05-30 05:20:21 -04:00
Frederic Branczyk fedfc8afd3 Merge pull request #1395 from brancz/migrate-alerts
Migrate alerts
2018-05-29 13:36:42 +02:00
Joakim Karlsson 62fff622e9 Update gencerts.sh 2018-05-29 11:42:20 +02:00
Joakim Karlsson 2093b981a0 Mac compat
Make certgen work on OSX
2018-05-29 11:40:50 +02:00
Frederic Branczyk 0bb4be801c Remove etcd alerts
These alerts will be vendored in the future through jsonnet-bundler
directly from the etcd repository.
2018-05-29 11:29:11 +02:00
Frederic Branczyk 64db049d3a kube-prometheus: Migrate kube-prometheus alerts to jsonnet 2018-05-29 11:06:59 +02:00
Frederic Branczyk 309974fadb Remove old python script to generate Grafana dashboards 2018-05-28 16:54:06 +02:00
Frederic Branczyk 25a3ae65b2 Remove static alertmanager config 2018-05-28 16:53:51 +02:00
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