Commit Graph
42 Commits
Author SHA1 Message Date
Dmitry Verkhoturov ec50b6265a [stable/prometheus-operator] Add sync scripts (#10488)
* [stable/prometheus-operator] add dashboards and rules sync scripts

Signed-off-by: Dmitry Verkhoturov <paskal.07@gmail.com>

* [stable/prometheus-operator] fix script to create dirs in case of their absence

Signed-off-by: Dmitry Verkhoturov <paskal.07@gmail.com>
2019-01-10 09:15:25 -08:00
Sébastien Prud'homme 7be0b80cf0 [stable/prometheus-operator] Resolve scraping controller-manager and scheduler outside out the cluster (#10366)
* [stable/prometheus-operator] Resolve scraping controller-manager and scheduler outside out the cluster

Signed-off-by: Sébastien Prud'homme <sebastien.prudhomme@gmail.com>

* [stable/prometheus-operator] Bump version

Signed-off-by: Sébastien Prud'homme <sebastien.prudhomme@gmail.com>
2019-01-08 08:08:09 -08:00
Andrew Mellen 76e9f774b7 [stable/prometheus-operator] Set default for svc monitor selector (#10390)
* Set default for svc monitor selector

If selector = {} and nilusehelmvals = false, nothing gets put. I want selector to be {} so it matches all service monitors

Signed-off-by: Andrew Mellen <andrew_mellen@icloud.com>

* Merge remote-tracking branch 'upstream/master' into feature/match-all-svcmonitors

Signed-off-by: Andrew Mellen <andrew_mellen@icloud.com>

* Bump version for svcmonitor update

Signed-off-by: Andrew Mellen <andrew_mellen@icloud.com>
2019-01-05 09:01:39 -08:00
Salvatore Mazzarino b16f2b0ff8 [prometheus-operator] update dependencies (#10320)
* update dependencies

Signed-off-by: Salvatore Mazzarino <dev@mazzarino.cz>

* bump chart version

Signed-off-by: Salvatore Mazzarino <dev@mazzarino.cz>
2019-01-04 07:53:11 -08:00
Joe Hohertz 72d9a04034 recent change broke additional service monitors by not breaking out of range scope to get other variables. fixed. (#10384)
Signed-off-by: Joe Hohertz <joe@viafoura.com>
2019-01-03 09:30:36 -08:00
Antoni Florit Homar 285f45ba5c [stable/prometheus-operator]Generate a complete Kubernetes Service (#9814)
* Generate a complete Kubernetes Service

Signed-off-by: Antoni Florit Homar <toniflorithomar@gmail.com>

* Fix lint

Signed-off-by: Antoni Florit Homar <toniflorithomar@gmail.com>

* Fix  lint 3

Signed-off-by: Antoni Florit Homar <toniflorithomar@gmail.com>

* Update Versión

Signed-off-by: Antoni Florit Homar <toniflorithomar@gmail.com>

* Fix Notes lint

Signed-off-by: Antoni Florit Homar <toniflorithomar@gmail.com>

* Fix error

Signed-off-by: Antoni Florit Homar <toniflorithomar@gmail.com>

* Delete notes content

Signed-off-by: Antoni Florit Homar <toniflorithomar@gmail.com>

* Fix Service

Signed-off-by: Antoni Florit Homar <toniflorithomar@gmail.com>
2019-01-02 12:17:29 -08:00
Anand Singh Kunwar 8769497e64 [stable/prometheus-operator] Custom API Group support (#10091) (#10092)
Signed-off-by: Anand Singh Kunwar <anandkunwar95@gmail.com>
2019-01-02 10:51:32 -08:00
Denis Iskandarov ef0300e8fd use proper k8s image registry (#10325)
as by https://github.com/kubernetes/kubernetes/pull/54174

Signed-off-by: Denis Iskandarov <d.iskandarov@gmail.com>
2019-01-02 03:30:27 -08:00
Maria Niță 5b924a1923 [stable/prometheus-operator] - Bump prometheus-node-exporter version to 0.6.2 (#10071)
Signed-off-by: Maria Nita <nita@adobe.com>
2018-12-18 22:38:22 -08:00
Vasily Sliouniaev 295b8a192f [stable/prometheus-operator] Fix typo selecor -> selector (#10053)
* Fix typo

Signed-off-by: Vasily <vasily.sliouniaev@jet.com>

* bump chart version to 1.0.0 since its a stable repo

Signed-off-by: Paul Czarkowski <username.taken@gmail.com>
2018-12-17 12:27:33 -08:00
Vasily Sliouniaev ffa0580f93 [stable/prometheus-operator] Update to v0.26.0, address setting empty selectors (#9647)
* Option to set empty servicemonitor, rules selector

Signed-off-by: Vasily <vasily.sliouniaev@jet.com>

* Update to 0.26 operator

Signed-off-by: Vasily <vasily.sliouniaev@jet.com>

* Remove spaces to fix lint

Signed-off-by: Vasily <vasily.sliouniaev@jet.com>
2018-12-15 00:40:48 -08:00
Harshal Shah eb4180bd15 [stable/prometheus-operator] Upgrading prometheus version to v2.5.0 (#9710)
* Upgrading operator, prometheus and alertmanager versions

- Upgrading prometheus-operator version to 0.26.0
- Upgrading prometheus version to 2.5.0
- Upgrading alertmanager version to 0.15.3
- Tested on GKE by installing prometheus operator with above versions.
- helm lint passed.

Signed-off-by: Harshal Shah <harshal2623@gmail.com>

* Removing operator version upgrade

Keeping prometheus and alertmanager upgrades intact.

Signed-off-by: Harshal Shah <harshal2623@gmail.com>

* Fixing the chart app version

Signed-off-by: Harshal Shah <harshal2623@gmail.com>
2018-12-08 15:03:18 -08:00
Kangseok Thomas Lee c93be5e2af securityContext in prometheus-operator needs to be configurable (#9595)
the current securityContext is fixed. it needs to be configurable

Signed-off-by: gangseok.lee <gangseok.lee@samsung.com>
2018-12-02 23:02:06 -08:00
chrisob 0e24eca2f4 [stable/prometheus-operator] Update chart dependency versions with priorityClassName (#9552)
* Update chart dependency versions

Signed-off-by: Chris O'Brien <chrisob91@gmail.com>

* Bump chart version

Signed-off-by: Chris O'Brien <chrisob91@gmail.com>

* Use latest version of kube-state-metrics

Signed-off-by: Chris O'Brien <chrisob91@gmail.com>

* Bump chart version

Signed-off-by: Chris O'Brien <chrisob91@gmail.com>
2018-11-30 05:42:36 -08:00
Kangseok Thomas Lee b784104489 remove duplicated SecurityContext in alertmanager (#9594)
it is duplicated

Signed-off-by: gangseok.lee <gangseok.lee@samsung.com>
2018-11-28 05:58:24 -08:00
chrisob 6616a6b22f Add priorityClassName option to values (#9489)
Signed-off-by: Chris O'Brien <chrisob91@gmail.com>
2018-11-23 02:00:57 -08:00
Tim Showalter 6c92662972 Do not create a serviceaccount for prometheus-operator if configured (#9159)
* Do not create a serviceaccount for prometheus-operator if configured

Signed-off-by: Tim Showalter <tjs@psaux.com>

* bump chart to 0.1.21

Signed-off-by: Tim Showalter <tjs@psaux.com>

* bump prometheus-operator chart to 0.1.22

Signed-off-by: Tim Showalter <tim.showalter@opendoor.com>

* bump prometheus-operator chart to 0.1.25

Signed-off-by: Tim Showalter <tim.showalter@opendoor.com>
2018-11-19 12:17:44 -08:00
David J. Bourke a84bae3025 Updated grafana version reference (#9381)
Signed-off-by: David Bourke <david.bourke@jet.com>
2018-11-19 09:45:43 -08:00
Jakub Krčma 39d4e70825 [stable/prometheus-operator] Fix missing rbac.create condition (#9109)
* [stable/prometheus-operator] Fix missing rbac.create condition

Signed-off-by: Jakub Krcma <jakub.krcma@heureka.cz>

* [stable/prometheus-operator] Fix setting a SA when rbac is disabled, but
custom SA is provided

Handles a use case, where the service accounts and roles/binding are
managed centrally by cluster administrators but allowing the regular
users with access to their project namespaces to install Prometheus
using the provided SA/roles/bindings.

Signed-off-by: Jakub Krcma <jakub.krcma@heureka.cz>
2018-11-19 03:15:07 -08:00
Yurii Polishchuk f6564ae8b8 [stable/prometheus-operator] fix typo in README.md (#9149)
* fix typo

Signed-off-by: Yurii Polishchuk <yuriy.pol@gmail.com>

* bump chart version

Signed-off-by: Yurii Polishchuk <yuriy.pol@gmail.com>
2018-11-16 10:34:35 -08:00
Rajat Vig e320d5188c Allow for custom labels and annotations for default rules (#9154)
Signed-off-by: Rajat Vig <rajat.vig@gmail.com>
2018-11-13 01:12:47 -08:00
Rajat Vig ede12d00eb Fix ReadMe (#9183)
Signed-off-by: Rajat Vig <rajat.vig@gmail.com>
2018-11-11 14:05:26 -08:00
Kierran McPherson 635d310027 [stable/prometheus-operator] Allow annotations on prometheus service (#8867)
* Allow annotations on prometheus service

Signed-off-by: Kierran McPherson <kierranm@gmail.com>

* Add annotations to alertmanager

Signed-off-by: Kierran McPherson <kierranm@gmail.com>

* service.type and service.nodePort for prometheus

Signed-off-by: Kierran McPherson <kierranm@gmail.com>

* Update Chart.yaml versions

Signed-off-by: Kierran McPherson <kierranm@gmail.com>

* Fix typo

Signed-off-by: Kierran McPherson <kierranm@gmail.com>

* Remove indentation

Signed-off-by: Kierran McPherson <kierranm@gmail.com>

* Remove extra service in values; Add annotations

Signed-off-by: Kierran McPherson <kierranm@gmail.com>
2018-11-11 12:42:06 -08:00
Dmitry Verkhoturov ea6bcddea1 Sync etc and general rules with coreos/prometheus-operator (#9103)
* sync etc and general rules with coreos/prometheus-operator

Signed-off-by: Dmitry Verkhoturov <paskal.07@gmail.com>

* fix namespaces and jobs labels, fix #9034

Signed-off-by: Dmitry Verkhoturov <paskal.07@gmail.com>

* fix naming, bump version

Signed-off-by: Dmitry Verkhoturov <paskal.07@gmail.com>

* revert identation to original

Signed-off-by: Dmitry Verkhoturov <paskal.07@gmail.com>

* bump version

Signed-off-by: Dmitry Verkhoturov <paskal.07@gmail.com>

* disable kubeEtcd.enable switch for consistency with rest of the code

Signed-off-by: Dmitry Verkhoturov <paskal.07@gmail.com>

* sync etcd rules with etcd-io upstream

Signed-off-by: Dmitry Verkhoturov <paskal.07@gmail.com>

* add proper variables escaping

Signed-off-by: Dmitry Verkhoturov <paskal.07@gmail.com>

* bump version

Signed-off-by: Dmitry Verkhoturov <paskal.07@gmail.com>
2018-11-11 10:41:39 -08:00
Rajat Vig 75b020f7e8 Allow for custom service annotations for prometheus and alertmanager (#8966)
* Allow for custom service annotations for prometheus and alertmanager

Signed-off-by: Rajat Vig <rvig@etsy.com>

* Add documentation for the values.yaml

Signed-off-by: Rajat Vig <rvig@etsy.com>

* Update the CI file

Signed-off-by: Rajat Vig <rvig@etsy.com>

* Bump the chart version

Signed-off-by: Rajat Vig <rajat.vig@gmail.com>
2018-11-11 10:04:27 -08:00
Andrew Drake b42f7289a8 Fix storageSpec parameter name in prometheus-operator README. (#9086)
Signed-off-by: Andrew Drake <andrew@frontapp.com>
2018-11-08 05:35:40 -08:00
Vasily Sliouniaev 7fb417dbaf Update dependencies for RBAC, readme (#9006)
Update node-exporter for fixed RBAC
Update alertmanager retention description

Signed-off-by: Vasily Sliouniaev <vasily.sliouniaev@jet.com>
2018-11-06 12:10:03 -08:00
Bort Verwilst 3f052158a0 Lock kube-state-metrics to newest version (#9027)
Signed-off-by: Bart Verwilst <bart@verwilst.be>
2018-11-06 02:08:41 -08:00
Vasily Sliouniaev deb5aa63c4 Add rbac condition in alertmanager (#9007)
Signed-off-by: Vasily Sliouniaev <vasily.sliouniaev@jet.com>
2018-11-05 11:23:46 -08:00
Victor Boissiere c54c9eb849 [stable/prometheus-operator]: Fix cadvisor endpoint for http (#8997)
* prometheus-operator: Fix cadvisor endpoint

Signed-off-by: Victor Boissiere <victor.boissiere@gmail.com>

* Upgrade chart version

Signed-off-by: Victor Boissiere <victor.boissiere@gmail.com>
2018-11-05 05:54:58 -08:00
Vasily Sliouniaev 12b6bbbfb9 Upgrade to 0.25.0 (#8987)
This release (https://github.com/coreos/prometheus-operator/releases/tag/v0.25.0) introduces two new features
* [FEATURE] Allow passing additional alert relabel configs in Prometheus custom resource (coreos/prometheus-operator#2022)
* [FEATURE] Add ability to mount custom ConfigMaps into Alertmanager and Prometheus (coreos/prometheus-operator#2028)

- Skip deploying CRDs on upgrade - the resources already exist and helm
  is not able to modify them using the CRD hook. The operator manages the
  upgrade by itself and it's possible to use the extra features and
  perform the upgrade all in one step. In the future it may be necessary
  to use a job to perform the CRD upgrade at the crd-install point

Signed-off-by: Vasily Sliouniaev <vasily.sliouniaev@jet.com>
2018-11-04 06:09:40 -08:00
Dmitry Verkhoturov 42092b0db2 [stable/prometheus-operator] fix prometheus ruleSelector example (#8888)
* fix prometheus ruleSelector example (#8831)

Signed-off-by: Dmitry Verkhoturov <paskal.07@gmail.com>

* remove outdated comment, unify text in values.yaml and test-values.yaml

Signed-off-by: Dmitry Verkhoturov <paskal.07@gmail.com>

* remove outdated comment, unify text in values.yaml and test-values.yaml

Signed-off-by: Dmitry Verkhoturov <paskal.07@gmail.com>
2018-11-02 06:35:50 -07:00
Gustavo Michels b083549b79 Fix Prometheus and Alertmanager templates to support routePrefix (#8760)
* Fix Prometheus and Alertmanager templates to support routePrefix

Signed-off-by: Gustavo Michels <gustavo.michels@nanthealth.com>

Bump up chart version

Signed-off-by: Gustavo Michels <gustavo.michels@nanthealth.com>

Fix routePrefix reference for Prometheus ingress

Signed-off-by: Gustavo Michels <gustavo.michels@nanthealth.com>

Simplify logic to handle routePrefix in Prometheus and Alertmanager ServiceMonitors

Signed-off-by: Gustavo Michels <gustavo.michels@nanthealth.com>

* Simplify logic for Prometheus routePrefix in Grafana datasource ConfigMap. Bump up chart version.

Signed-off-by: Gustavo Michels <gustavo.michels@nanthealth.com>

* Fix ci/test-values.yaml to match values.yaml except for cleanupCustomResource

Signed-off-by: Gustavo Michels <gustavo.michels@nanthealth.com>
2018-11-02 05:14:37 -07:00
Joe Hohertz f77b473719 Fix default values for tolerations, nodeSelector and resources. (#8849)
In several places, the empty default for tolerations was an object
where it should have been an array, for nodeSelectors the opposite,
should be an object but was specified in an array, and for one
case of resources, the empty object was just missing.

Updated these all to what they should be, which has eliminated
errors like the following when running:

```
2018/10/27 00:46:18 warning: cannot overwrite table with non table for tolerations (map[])
2018/10/27 00:46:18 warning: destination for nodeSelector is a table. Ignoring non-table value []
2018/10/27 00:46:18 warning: destination for nodeSelector is a table. Ignoring non-table value []
2018/10/27 00:46:18 warning: destination for resources is a table. Ignoring non-table value <nil>
2018/10/27 00:46:18 warning: cannot overwrite table with non table for tolerations (map[])
2018/10/27 00:46:18 warning: destination for nodeSelector is a table. Ignoring non-table value []
```

Signed-off-by: Joe Hohertz <joe@viafoura.com>
2018-10-29 11:47:40 -07:00
Faheem Nadeem 7de016bd66 [stable/prometheus-operator] Remove unnecessary indent in serviceMonitorNamespaceSelector (#8780)
* Remove unnecessary space in serviceMonitorNamespaceSelector template

Signed-off-by: Faheem Nadeem <faheem@cliqz.com>

* Bump chart version to 0.1.7

Signed-off-by: Faheem Nadeem <faheem@cliqz.com>
2018-10-26 05:52:45 -07:00
Vasily Sliouniaev 35a2602e44 Add missing prometheus options to resource (#8738)
- scrapeInterval
- evaluationInterval

Signed-off-by: Vasily Sliouniaev <vasily.sliouniaev@jet.com>
2018-10-25 03:40:26 -07:00
Vasily Sliouniaev 666945ada8 Update readme and examples (#8709)
Signed-off-by: Vasily Sliouniaev <vasily.sliouniaev@jet.com>
2018-10-24 14:58:19 -07:00
Dmitry Verkhoturov f432fe893d fix typos in prometheus-operator (#8705)
* fix typos

Signed-off-by: Dmitry Verkhoturov <paskal.07@gmail.com>

* bump version

Signed-off-by: Dmitry Verkhoturov <paskal.07@gmail.com>

* fix typo

Signed-off-by: Dmitry Verkhoturov <paskal.07@gmail.com>
2018-10-24 09:57:40 -07:00
Vasily Sliouniaev f38d6464c4 Update readme with helm workaround (#8670)
Signed-off-by: Vasily Sliouniaev <vasily.sliouniaev@jet.com>
2018-10-24 01:21:10 -07:00
Vasily Sliouniaev acf7c2b3b2 Correct prometheus-operator app version (#8665)
Signed-off-by: Vasily Sliouniaev <vasily.sliouniaev@jet.com>
2018-10-23 12:20:30 -07:00
andig 51f4756fbf Correct repo name and ingress labels (#8662)
Signed-off-by: andig <cpuidle@gmx.de>
2018-10-23 11:24:34 -07:00
Giancarlo Rubio 7d0450231c Migrate prometheus operator from coreos (#6765)
* Create promethues-operator chart

Signed-off-by: Giancarlo Rubio <gianrubio@gmail.com>

* Fixes for stable/prometheus-operator

Changed:
- Update Prometheus to 2.4.3, alertmanager to 0.15.2
- Change some job labels - should refer to a label appearing on the service. Tried to keep this consistent with what was used in the coreos version
- Add confguration for using CoreDNS
- Add insecureSkipVerify to kubeApiServer
- Add `prometheus.additionalScrapeConfigs`, `prometheus.additionalAlertManagerConfigs`

- Add ability to deploy an operated prometheus without installing anything else
  - Switch `prometheus.serviceAccountName` to be based on `prometheus.fullname` to prevent clashes
- Fix `serviceMonitorSelector` typo
- Add `serviceMonitorNamespaceSelector` to values.yaml
- Fix grafana typo (https://github.com/helm/charts/pull/6765#issuecomment-428653560)

Add CoreDNS dashboard

- Fixed dashboard use of updated name metric

Signed-off-by: Giancarlo Rubio <gianrubio@gmail.com>
Signed-off-by: Vasily Sliouniaev <vsliouniaev@users.noreply.github.com>

Vas prometheus operator (#5)

* Fix lint

* Fix missing selector on kubelet

https://github.com/helm/charts/pull/6765#issuecomment-431035212

* Fix braces in files

* Fix naming

* Move non-exporters out of exporters folder

* Use common value names, add to readme

* Change value names deploy -> enabled

https://github.com/helm/charts/pull/6765#issuecomment-428283768
https://github.com/helm/charts/pull/6765#issuecomment-430070684

* Update etcd rules

https://github.com/etcd-io/etcd/blob/master/Documentation/op-guide/etcd3_alert.rules.yml

* Fix etcd rules to match job name

* Review readme

* Change initial version to 0.1.0

Additional Fixes While Github is down (#6)

* Fix additional service monitor template

* Fix label indentation

https://github.com/helm/charts/pull/6765#issuecomment-431788727

Fix cleanup, requirements.lock file (#7)
2018-10-23 09:34:30 -07:00