1
0
mirror of https://github.com/coreos/prometheus-operator.git synced 2026-02-05 06:45:27 +01:00

295 Commits

Author SHA1 Message Date
Giancarlo Rubio
02165c1b48 Merge branch 'master' into patch-1 2018-06-01 16:41:58 +02:00
Giancarlo Rubio
b495ee0a9b Update Chart.yaml 2018-06-01 16:41:24 +02:00
Giancarlo Rubio
0505a8b22f Update requirements.yaml 2018-06-01 16:40:40 +02:00
Giancarlo Rubio
771b734278 Update Chart.yaml 2018-06-01 16:39:49 +02:00
Giancarlo Rubio
ad8753f337 Add serviceMonitorNamespaceSelector to prometheus helm chart 2018-06-01 15:00:23 +02:00
Hayden Ball
abb297c062 Helm - Prometheus: Change example alerting endpoint port to http
The Helm Prometheus chart expects alertingEndpoints to have a port
of http, not a port number.
I'm unsure of the reasoning behind this, but this corrects the
documentation to reflect the current behaviour.

See #1356
2018-05-31 21:23:06 +01:00
Stijn De Haes
e14cea9311 Added grafana and grafana watcher resources to templates (#1388)
* Added grafana and grafana watcher resources to templates
2018-05-30 18:19:19 +02:00
Ricardo Hernandez
4f64e84328 [helm/prometheus] Use contains on prometheus.fullname template (#1398)
* Use contains in prometheus.fullname

* Add suffix to rules ConfigMap name
2018-05-30 12:56:58 +02:00
Sami Turcotte
2b3c255183 Fix Crashlooping panels in Grafana dashboards (#1347)
* Fix Crashlooping Pods panel in Grafana dashboard
2018-05-30 08:58:50 +02:00
Sergii Manannikov
156d151ddd prometheus chart: fix identation on serviceMonitorSelector (#1360)
* prometheus chart: fix identation on serviceMonitorSelector

* bump kube-prometheus chart version
2018-05-23 16:18:44 +02:00
Sergii Manannikov
4263ea055a prometheus-operator chart: remove redundant Label selector (#1358) 2018-05-19 14:28:22 +02:00
Laurent Godet
894695f48f Fix kube-prometheus chart not deploying when some features are disabled (#1345) 2018-05-17 11:53:47 +02:00
Thu Nguyen
8bead79bf1 ISSUE-1306: Fix the Toleration field (#1339) 2018-05-16 21:43:47 +02:00
piglei™
3a4da27c68 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
Etienne
0bc2f76feb Add kube-state-metrics to Prometheus service monitor selector (#1316)
* Add kube-state-metrics to Prometheus service monitor selector
2018-05-11 10:11:17 +02:00
Thu Nguyen
7b51c6052f ISSUE-1320: To fix the missing kube-state scraping config in Prometheus (#1321) 2018-05-11 08:53:36 +02:00
Haoyu Wang
58c2f5532a Add additional scrape configs to helm charts. (#1276)
* Add additional scrape configs to helm charts.
2018-05-10 20:09:55 +02:00
Kevin J. Qiu
b69f53186e Fix prometheus service default pod selector in the prometheus chart (#1305)
* Fix wrong service selector in prometheus chart

* Fix prometheus service default pod selector in the prometheus chart
2018-05-07 12:42:20 +02:00
Ted Wexler
f796045443 Use 'prometheus.fullname' template when setting prometheus' labels (#1302)
* Use 'prometheus.fullname' template when setting prometheus' prometheus label, instead of only .Release.Name

* Update Chart.yaml

* Update requirements.yaml

* use if/else
2018-05-06 00:22:19 +02:00
Christopher Randles
9c0d80ec8b helm/prometheus-operator: add nodeSelector & tolerations to SM job (#1255) 2018-05-05 20:26:32 +02:00
Giancarlo Rubio
51c7460ef0 set app name in servicemonitor (#1294) 2018-05-02 13:24:02 +02:00
Wylie Hobbs
c1314dba2d Prometheus operator clusterrole needs namespace/watch permissions (#1292)
* Prometheus operator clusterrole needs namespace/watch permissions
2018-05-01 21:41:57 +02:00
tmestdagh
e7c84c6cfb Added support for multiple hostnames to alertmanager/prometheus/grafana (#1290)
* Added support for multiple hostnames to alertmanager/prometheus/grafana
Ingress

* Fixed grafana/NOTES.txt and kube-prometheus/NOTES.txt

* Fixed kube-prometheus/NOTES.txt
2018-05-01 17:10:24 +02:00
Giancarlo Rubio
d7ca475ba0 Bump helm prometheus operator chart (#1261)
* bump operator to v0.18.1

* fix serviceMonitor selector
2018-05-01 15:22:57 +02:00
Christopher Schmidt
738c3642b1 Added Pod Security Policies to the HELM Charts (#1187)
* added Pod Security Policies
2018-04-29 20:40:42 +02:00
Giancarlo Rubio
f7cb6f5906 Adapt Charts.yaml according of the requirments from k8s charts upstream (#1266)
Use an empty serviceMonitorSelector to avoid users struggling when they use operator for the first time
Sync kube-promehteus rules
2018-04-27 13:58:54 +02:00
Manuel Rüger
c7dbb4fcd4 helm: Support fullnameOverride for prometheus.yaml (#1258)
* helm: Support fullnameOverride for prometheus.yaml

* Bump version for prometheus chart to 0.0.29
2018-04-27 11:23:41 +02:00
Julian Poschmann
7d4d93734a Fix scope when adding serviceMonitors to prometheus (#1263) 2018-04-26 15:05:43 +02:00
Ahmed Kamel
48890db283 added tolerations field (#1237)
* added tolerations field
2018-04-25 23:15:02 +02:00
Manuel Rüger
4c8cb6ab31 Drop compat for <prometheus-operator-0.13.0 (#1243)
* helm: Drop compat for prometheus-operator <0.13.0

* README: Minimal supported K8s version is 1.8

* helm: Bump prometheus-operator to 0.0.17
2018-04-23 09:18:35 +02:00
Ricardo Hernandez
a18f90f504 [helm/prometheus] Custom ServiceAccountName when rbac disabled (#1230)
* Allows custom serviceAccountName value

* Adapt best practices for serviceAccount
2018-04-22 22:04:10 +02:00
jstpierre24
210782b5fa Fix typo for "directory" to "Directory" in volume mounts (#1236)
* Fix typo of directory to DIrectory

https://kubernetes.io/docs/concepts/storage/volumes/
`apiVersion: v1
kind: Pod
metadata:
  name: test-pd
spec:
  containers:
  - image: k8s.gcr.io/test-webserver
    name: test-container
    volumeMounts:
    - mountPath: /test-pd
      name: test-volume
  volumes:
  - name: test-volume
    hostPath:
      # directory location on host
      path: /data
      # this field is optional
      type: Directory
`

Tried to deploy with the mountGrafanaConfig and got an error saying "directory" not supported

* Increment version

* Increment version

* Change version for grafana
2018-04-21 10:49:02 +02:00
Ricardo Hernandez
75983e3300 [helm/prometheus] Custom prometheus label value (#1235)
* Make prometheus label value configurable
2018-04-19 15:44:36 +02:00
Ricardo Hernandez
9e52fed16b [helm/alertmanager] Choose custom prometheus label value (#1226)
* Let choose prometheus label value
2018-04-18 15:49:29 +02:00
Kousik Sundar
83f9ba41ee Helm chart changes (#1218)
* helm: Added additionalServiceMonitorLabels template

Add additional labels to ServiceMonitors in case of
custom ServiceMonitorSelector values in Prometheus.

* helm: Fixed file permissions

Removed unnecessary executable bit from helm chart files

* helm: Added additionalRulesConfigMapLabels template

Add additional labels to Prometheus Rules configmaps in
case of custom RuleSelector in Prometheus

* Revert "helm: Fixed file permissions"

This reverts commit 4d7d2e0745.

* helm: Bumped Chart Versions

Bumped chart versions as per review comments
2018-04-18 13:19:14 +02:00
Julian Poschmann
8677855cb4 Helm: Allow adding dashboards to grafana via configmaps (#1146)
* helm: possibility to add dashboards from custom configmaps to grafana

Dashboards can already be added by with .Values.serverDashboardFiles,
but this leads to very messy values-files when adding multiple complex
dashboards.

* helm: bump grafana and kube-prometheus chart versions

* template style fixes

* Update Chart.yaml
2018-04-16 09:29:23 +02:00
Dan O'Brien
2383424712 Adding Secrets for Prometheus Object, updating AlertManager wording (#1209) 2018-04-15 20:40:38 +02:00
Frederic Branczyk
d80f7c6bf9 Merge pull request #1205 from zuzzas/cpu-rules
Fixed CPU accounting in recording rules
2018-04-11 15:08:15 +02:00
Arslanbekov Denis
9dc4e1c876 In description is displayed correctly namespace (#1190)
* in description is displayed correctly namespace

* Bump kube state version

* Update Chart.yaml
2018-04-10 17:18:24 +02:00
Andrey Klimentyev
857270e849 kube-prometheus: fixed CPU accounting
Currently, node recording rules feature
an incorrect idle CPU accounting. This
change aims to fix that.
2018-04-10 15:14:48 +03:00
Giancarlo Rubio
0ae7f5ddf9 Bump chart prometheus-operator to v0.18.0 (#1183)
* Add s3 sync to coredns, bump operator to v0.18.0

* bump operator version
2018-04-05 11:58:59 +02:00
Richard Maynard
86b169e744 charts: Add Core DNS Support (#1176)
* charts: Add Core DNS Support

With CoreDNS becoming a first class citizen it should be an optional part
of the kube-prometheus deployment.

Fixes: #1174

* added kube-prometheus service and service monitor

In order to work directly with a cluster created by bootkube used port 9153,
and created a service exposing metrics since bootkube does does not. Also in
the helm chart changed the default port to 9153 since that is the coredns
plugins default port and to be consistent throughout the repo.
2018-04-05 09:57:56 +02:00
Richard Maynard
46e1404851 charts: Pass TLS config to etcd service monitor (#1164)
* charts: Pass TLS config to etcd service monitor

In order to use this chart in our environment we need to specify a TLS configuration
this will allow us to pass one.

Fixes #1162
2018-04-03 21:09:58 +02:00
lebenitza
7ff0982169 helm/prometheus: custom rules ConfigMap (#1155)
* helm/prometheus: prometheus template

allow Rules Selector to use other Selectors besides matchLabels

* helm/prometheus: fix custom prometheus rules

Fixed labelling of custom rules ConfigMap, caused by #1096

* helm/prometheus: add comments for custom prometheus rules

comments regarding prometheus rulesSelector and rules.additionalLabels

* helm/kube-prometheus: info about rules.additionalLabels

Added rules.additionalLabels that was introduced in the required chart, helm/prometheus
2018-04-03 14:08:41 +02:00
Jon Campbell
71c6c5da4c Helm: Adding a ServiceMonitor for Grafana Chart (#1156)
* Helm: Adding a ServiceMonitor for Grafana Chart
2018-03-28 13:53:48 +02:00
danhartfiction
2ae83a9eef Updating configmap.yaml to use templates (#1130)
* Updating configmap.yaml to use templates
2018-03-28 13:19:20 +02:00
Mehdi Ben Abdallah
ffba6e02b1 helm/exporter-node : add args and volumes configurability to the node-exporter (#1126)
* helm/exporter-node : add args and volumes configurability to the node-exporter

* helm/exporter-node : review feedbacks - move extra* values under the 'container' key

* helm/exporter-node : review feedbacks - flatten nested if statements using the and function
2018-03-28 12:23:13 +02:00
Sébastien GLON
634f94c259 Add new alert for samples rejected due ti duplicate timestamp (#1148)
Signed-off-by: Sébastien GLON <sebastien.glon@akeneo.com>
2018-03-26 18:11:40 +02:00
abelgana
0971f911e2 Add the possibility to mount grafana config (#1047)
* Add the possibility to mount grafana config

* Bump grafana version

* Bump kube-prometheus version

* Rebase master and bump grafan and kube-prometheus versions
2018-03-23 08:44:22 +01:00
Alexander Holte-Davidsen
b2fc29a14f Update Alert Manager rules for NodeDiskRunningFull with summary 2018-03-22 12:24:24 +01:00