Commit Graph
50 Commits
Author SHA1 Message Date
John Naulty Jr 0f032a47f4 [stable/prometheus-operator] fix #15572 alertmanager (#15582)
* [stable/prometheus-operator] fix #15572 alertmanager

- fixes issue with alertmanager not coming up due to <nil> logFormat
value

Signed-off-by: John Naulty <johnnaulty@bitgo.com>

* bump version up after rebase

Signed-off-by: John Naulty <johnnaulty@bitgo.com>
2019-07-24 15:31:53 -07:00
moskitone 55fe0b38c1 [stable/prometheus-operator] Kube-dns dnsmasq relabelings. (#15150)
Added metrics relabeling config to kube-dns dnsmasq service monitor.

Signed-off-by: Volodymyr Moseichuk <moskitone@gmail.com>
2019-07-23 04:06:54 -07:00
Haoyu Wang 1c0d7ce99d Add kube-proxy exporter to prometheus-operator charts. (#15664)
Signed-off-by: whypro <whypro@live.com>
2019-07-18 23:49:10 -07:00
clsau 3c7f982b4f Adding TLS params to kube controller manager and kube scheduler (#15277)
Signed-off-by: Clarisse Sauvage <clarisse.sauvage@jet.com>
2019-07-05 09:02:36 -07:00
Shini31 138b61febb [stable/prometheus-operator] Fix #14874 (#14877)
* [stable/prometheus-operator] Fix #14874

Signed-off-by: Mathieu Cinquin <github@capitoul.net>

* Bump version

Signed-off-by: Mathieu Cinquin <github@capitoul.net>
2019-06-28 03:57:38 -07:00
Carlos Alexandro Becker d58247103f [stable/prometheus-operator] updated to 0.31.1 (#14943)
* feat: update prometheus-operator

Signed-off-by: Carlos Alexandro Becker <caarlos0@gmail.com>

* fix: remove thanos-cluster port from examples

Signed-off-by: Carlos Alexandro Becker <caarlos0@gmail.com>

* docs: manual del/install crd

Signed-off-by: Carlos Alexandro Becker <caarlos0@gmail.com>

* fix: cleanup crds

Signed-off-by: Carlos Alexandro Becker <caarlos0@gmail.com>

* fix: update test-values

Signed-off-by: Carlos Alexandro Becker <caarlos0@gmail.com>

* fix: clusterrole

Signed-off-by: Carlos Alexandro Becker <caarlos0@gmail.com>

* bump: prometheus-operator

Signed-off-by: Carlos Alexandro Becker <caarlos0@gmail.com>

* fix: crds

Signed-off-by: Carlos Alexandro Becker <caarlos0@gmail.com>

* bump: prometheus-operator

Signed-off-by: Carlos Alexandro Becker <caarlos0@gmail.com>

* fix: undo rules upgrade

Signed-off-by: Carlos Alexandro Becker <caarlos0@gmail.com>

* docs: fix readme

Signed-off-by: Carlos Alexandro Becker <caarlos0@gmail.com>

* ci: cleanup crd before install

Signed-off-by: Carlos Alexandro Becker <caarlos0@gmail.com>

* Clean up CRDs before install for CI

Signed-off-by: Vasily Sliouniaev <vasily.sliouniaev@jet.com>
2019-06-27 23:57:38 -07:00
Chris 213b37bf47 [stable/prometheus-operator] replaced kubernetes api-conventions link (#14956)
* [stable/prometheus-operator] replaced kubernetes api-conventions link

Signed-off-by: Christian Niehoff <christian.niehoff@dwpbank.de>

* [stable/prometheus-operator] run hack/update-ci.sh

Signed-off-by: Christian Niehoff <christian.niehoff@dwpbank.de>

* [stable/prometheus-operator] bumbed chart version

Signed-off-by: Christian Niehoff <christian.niehoff@dwpbank.de>

* [stable/prometheus-operator] added #metadata to link

Signed-off-by: Christian Niehoff <christian.niehoff@dwpbank.de>

* [stable/prometheus-operator] run hack/update-ci.sh again

Signed-off-by: Christian Niehoff <christian.niehoff@dwpbank.de>
2019-06-21 04:20:36 -07:00
Bismarck Paliz 350abaff4d Adding support for replicaExternalLabelName and prometheusExternalLabelName. (#14572)
Signed-off-by: Bismarck Paliz <bismarck.paliz@jet.com>
2019-06-06 13:34:02 -07:00
moskitone 7f5a7783ce [stable/prometheus-operator] Kubelet relabelings. (#14551)
* [stable/prometheus-operator] Kubelet relabelings.

Added metrics relabeling config to kubelet service monitor.

Signed-off-by: Volodymyr Moseichuk <moskitone@gmail.com>

* [stable/prometheus-operator] Kubelet relabelings.

Added metrics relabeling config to kubelet service monitor.

Signed-off-by: Volodymyr Moseichuk <moskitone@gmail.com>
2019-06-06 07:36:15 -07:00
Vasily Sliouniaev af2af1af66 [stable/prometheus-operator] Update components,cleanup (#14387)
* [stable/prometheus-operator] Bump app to 0.30.1

Signed-off-by: vas <v.sliouniaev@gmail.com>

* Update kube-state-metrics, node-exporter

Signed-off-by: vas <v.sliouniaev@gmail.com>

* Bump chart minor version

Signed-off-by: vas <v.sliouniaev@gmail.com>

* Remove no-op roles and rolebindings

The clusterrole used by Prometheus already incorporates permissions
that are granted by these. Removing to help with possible confusion.

Signed-off-by: vas <v.sliouniaev@gmail.com>
2019-06-03 01:32:27 -07:00
Stanislav Petrashov 56890097c1 [stable/prometheus-operator] Update prometheus-operator image to v0.30.0 (#14178)
- Updated README
- Updated chart version
- Updated values.yaml
- Updated test-values.yaml

Signed-off-by: Stanislav Petrashov <sp@hellofresh.com>
2019-05-28 15:47:50 -07:00
mmiller1 164ee72d34 allow adding targetLabels to servicemonitors (#14072)
Signed-off-by: Matt Miller <mamiller@rosettastone.com>

update-ci
2019-05-22 09:34:09 -07:00
lostick 6a52d19861 [stable/prometheus-operator] Bump alertmanager to 0.17.0 (#14035)
Signed-off-by: Laurent Godet <mevoyasf@gmail.com>
2019-05-21 10:02:15 -07:00
Amine Benseddik 9fa4db5f3f [stable/prometheus-operator]: add EnableAdminAPI option (#14030)
Signed-off-by: Amine Benseddik <amine@qonto.eu>
2019-05-21 08:04:49 -07:00
Lukas Grossar 0269736bfd [stable/prometheus-operator] allow definition of affinity for alertmanagerSpec/prometheusSpec (#12936)
* [stable/prometheus-operator] add affinity configuration

Extends the prometheus-operator to allow the definition of additional
affinity rules for alertmanager and prometheus without breaking the
existing podAntiAffinity functionality.

Signed-off-by: Lukas Grossar <lukas.grossar@adfinis-sygroup.ch>

* [stable/prometheus-operator] update ci/test-values.yaml

Got forgotten in some other PRs.

Signed-off-by: Lukas Grossar <lukas.grossar@adfinis-sygroup.ch>
2019-05-21 03:00:45 -07:00
Liviu Costea ede60d8bf0 [stable/prometheus-operator] Secure the alertmanager integrations by using an existing secret (#12433)
* Secure the alertmanager integrations by using an existing secret

Alertmanager is a sensible app because all the integrations are defined there
(like PagerDuty, OpsGenie etc). So its configuration can contain many secrets
This will allow to skip the configuration passed from values.yaml and use
an existing secret, which can be created with sealed secrets, aws-ssm etc

Signed-off-by: Liviu Costea <email.lcostea@gmail.com>

* Add existing secret configuration to the ci values

Signed-off-by: Liviu Costea <email.lcostea@gmail.com>

* Bump chart version

Signed-off-by: Liviu Costea <email.lcostea@gmail.com>
2019-04-30 02:27:38 -07:00
Christopher Randles 8bb861bb36 add relabelings/metricRelabelings to all exporter serviceMonitors (#13143)
Signed-off-by: Chris Randles <randles.chris@gmail.com>
2019-04-18 09:00:16 -07:00
Marcos Estévez Martínez 9c12247662 [stable/prometheus-operator] Allow metricRelabelings in default kube-state-metrics exporter (#12960)
* [stable/prometheus-operator] metricRelabelings in kube-state exporter

Signed-off-by: Marcos Estevez <marcos.stvz@gmail.com>

* Adding kubeStateMetrics.serviceMonitor.metricRelabelings to ci

Signed-off-by: Marcos Estevez <marcos.stvz@gmail.com>
2019-04-11 05:22:11 -07:00
Rafael Jesus eb7c2d5cef Make grafana default datasource optional (#12895)
* make default ds optional

Signed-off-by: Rafael Jesus <rafaelljesus86@gmail.com>

* add example on ci folder

Signed-off-by: Rafael Jesus <rafaelljesus86@gmail.com>
2019-04-08 02:40:29 -07:00
Ben Pehling fac7381293 [stable/prometheus-operator] add support for pod annotations (#12800)
* [stable/prometheus-operator] add support for pod annotations

Signed-off-by: Ben Pehling <shinjipehling@gmail.com>

* [stable/prometheus-operator] add support for pod annotations

bump versions and ran hack/update-ci.sh

Signed-off-by: Ben Pehling <shinjipehling@gmail.com>

* [stable/prometheus-operator] add support for pod annotations

undo appVersion bump

Signed-off-by: Ben Pehling <shinjipehling@gmail.com>

* [stable/prometheus-operator] add support for pod annotations

updated README.md

Signed-off-by: Ben Pehling <shinjipehling@gmail.com>

* [stable/prometheus-operator] add support for pod annotations

bump Chart version again

Signed-off-by: Ben Pehling <shinjipehling@gmail.com>
2019-04-04 14:45:18 -07:00
arthurvanduynhoven eb4ba54569 [stable/prometheus-operator] Updated to allow Ingress Capture Groups (#12813)
Signed-off-by: Arthur Van Duynhoven <arthur.vanduynhoven@irdeto.com>
2019-04-04 06:00:50 -07:00
Vasily Sliouniaev 894bbe0ebf [stable/prometheus-operator] Update defaults for scraping cluster components (#12292)
* Update defaults for scraping cluster components

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

* Remove custom scrape intervals

These were not consistent in some cases (kubelet http vs https
configuration). The best-practice for this is to allow the config
to come from prometheus's default.

Added configuration options to specify custom durations if overrides
are desired

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

* Fix kubelet secure configuration relabellings

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

* Add hack/minikube

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

* Update README.md with changes to defaults

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

* chmod

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

* Fix up minikube

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

* Fix monitors when using defaults

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

* Update contributing.md

Signed-off-by: Vasily <vasily.sliouniaev@jet.com>
2019-03-19 07:22:26 -07:00
Ondrej Kuchar 852b3aa032 [stable/prometheus-operator] Possibility to add grafana datasources (#12296)
* [stable/prometheus-operator] Possibility to add grafana datasources

Signed-off-by: Ondrej Kuchar <ondrej.kuchar@pan-net.eu>

* [stable/prometheus-operator] add additionalDataSources to ci dir

Signed-off-by: Ondrej Kuchar <ondrej.kuchar@pan-net.eu>
2019-03-18 03:13:15 -07:00
Vasily Sliouniaev 90e50f1e08 [stable/prometheus-operator] Add configuration options (#11811)
* Add configuration options for reloader limits

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

* Add documentation to work around crd-install hook issue

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

* Add query params to prometheus

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

* Bump version

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

* Fix indent

Signed-off-by: Vasily <vasily.sliouniaev@jet.com>
2019-03-07 11:46:08 -08:00
Wei Kin Huang efbcad4e5c [stable/prometheus-operator] Add metricRelabelings to node exporter servicemonitor (#11937)
Signed-off-by: Wei Kin Huang <weikin.huang04@gmail.com>
2019-03-05 12:36:00 -08:00
Nicholas Gibson 40aee78f3f added additional ports option for prometheus-operator prometheus service (#11506)
* added additional ports option for prometheus-operator prometheus service

Signed-off-by: GIBSON, NICHOLAS R <ng560p@us.att.com>

* updated version, readme, fixed data type, added ci values

Signed-off-by: GIBSON, NICHOLAS R <ng560p@us.att.com>

* trailing spaces

Signed-off-by: GIBSON, NICHOLAS R <ng560p@us.att.com>

* bumped version to 2.2.7

Signed-off-by: GIBSON, NICHOLAS R <ng560p@us.att.com>

* bumped version to 3.0.1

Signed-off-by: GIBSON, NICHOLAS R <ng560p@us.att.com>

* fixed merge conflict with appVersion

Signed-off-by: GIBSON, NICHOLAS R <ng560p@us.att.com>
2019-02-28 14:14:40 -08:00
Maha Gamal 6d79ab03f2 [stable/prometheus-operator] Added target port (#11675)
- Updated README
    - Updated chart version
    - Updated values.yaml
    - Added tagetport in prometheus service component templates

Signed-off-by: Maha <you@example.com>
2019-02-25 10:48:09 -08:00
Dmitry Verkhoturov 28250ead20 [stable/prometheus-operator] Improve rules sync rules and description (#11617)
* [stable/prometheus-operator] bump kube-state-metrics

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

* [stable/prometheus-operator] sync rules and dashboards

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

* [stable/prometheus-operator] move rules to prometheus folder

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

* [stable/prometheus-operator] clarify instructions for prometheus rules and grafana dashboards changes

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

* [stable/prometheus-operator] add prometheus rules namespace replacement

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

* [stable/prometheus-operator] add alertmanager-$1 replacement rule

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

* [stable/prometheus-operator] major version bump, rename DeadMansSwitch alert to Watchdog

Signed-off-by: Dmitry Verkhoturov <paskal.07@gmail.com>
2019-02-22 10:27:28 -08:00
Vasily Sliouniaev 205644e0c7 [stable/prometheus-operator] Multiple features / fixes (#11501)
* Bump component versions

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

* Fix readme docs for namespaceSelector

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

* Expand on components that come with the chart

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

* Upgrade grafana to fix side-car race condition

This is a major version bump due to the requirement of the grafana
chart to run a newer version of the dashboard/datasource sidecars

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

* Add migration info for coreos chart to readme

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

* Move additionalPrometheusrules to prometheus

- Fix broken indentation
- This component is not alertmanager specific
- Since this PR has a major version change, so it is appropriate to
  make this configuration change also

Signed-off-by: Vasily <vasily.sliouniaev@jet.com>
2019-02-20 07:58:50 -08:00
Goutham Veeramachaneni 8e8282d049 Add ability to drop metrics from cAdvisor (#11173)
* Add ability to drop metrics from cAdvisor

Tons and tons of them are useless.

Signed-off-by: Goutham Veeramachaneni <gouthamve@gmail.com>

* Add values to files

Signed-off-by: Goutham Veeramachaneni <gouthamve@gmail.com>
2019-02-19 22:29:12 -08:00
Viktor Radnai e5c66bb3cc Prometheus operator grafana servicemonitor (#11545)
* [stable/prometheus-operator] Add ServiceMonitor for bundled Grafana

Signed-off-by: Viktor Radnai <viktor.radnai@ticketmaster.co.uk>

* Update documentation (also for alertmanager monitoring)

Signed-off-by: Viktor Radnai <viktor.radnai@ticketmaster.co.uk>

* Bump chart version

Signed-off-by: Viktor Radnai <viktor.radnai@ticketmaster.co.uk>

* Add grafana selfMonitor setting to ci/test-values.yaml

Signed-off-by: Viktor Radnai <viktor.radnai@ticketmaster.co.uk>
2019-02-19 14:43:27 -08:00
Ash Caire 7de3fa9300 [stable/prometheus-operator] Add custom PrometheusRules (#11266)
This commit allows the specification of custom PrometheusRule
resources via alertmanager.additionalPrometheusRules.

To assist the implementation, the ServiceMonitor manifest has also been
updated to remove the v1 List type, which was subsequently clobbered.

Signed-off-by: Ash Caire <ash.caire@gmail.com>
2019-02-18 05:00:51 -08:00
Mathieu Herbert e0c72d4805 [stable/prometheus-operator]: Add specific condition for each alerts (#10890)
* condition each alerts

Signed-off-by: Mathieu Herbert <mherbert@talend.com>

* add documentation

Signed-off-by: Mathieu Herbert <mherbert@talend.com>

* remove double space

Signed-off-by: Mathieu Herbert <mherbert@talend.com>

* add kubernetesAbsent

Signed-off-by: Mathieu Herbert <mherbert@talend.com>

* fix condition on sync prometheus rules

Signed-off-by: Mathieu Herbert <mherbert@talend.com>

* run sync scripts to get new rules

Signed-off-by: Mathieu Herbert <mherbert@talend.com>

* update grafana dashboard

Signed-off-by: Mathieu Herbert <mherbert@talend.com>

* add rules configuration in test-values

Signed-off-by: Mathieu Herbert <mherbert@talend.com>
2019-01-29 08:57:00 -08:00
Vasily Sliouniaev 3bcc64f351 [stable/prometheus-operator] Upgrade prometheus and prometheus-operator (#10931)
* Fix typo

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

* Use prometheus 2.6.1 and prometheus-operator 2.7

Bumping version of chart to 2.0.0 to indicate a change in
the way the operator stateful sets behave as described here
https://github.com/coreos/prometheus-operator/issues/2339

Prometheus 2.6.x has some very positive changes to startup
time that are particularly advantageous when using PVs and
running large instances

Signed-off-by: Vasily <vasily.sliouniaev@jet.com>
2019-01-28 01:35:46 -08:00
Dmitry Verkhoturov 0d8aa34edd [stable/prometheus-operator] adjust dashboards and rules sync (#10794)
* [stable/prometheus-operator] Enable etcd rules import

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

* [stable/prometheus-operator] Disable coredns dashboard sync

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

* [stable/prometheus-operator] Fix typos

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

* [stable/prometheus-operator] Bump version

Signed-off-by: Dmitry Verkhoturov <paskal.07@gmail.com>
2019-01-24 07:05:59 -08:00
Vasily Sliouniaev 41b9b3d0be [stable/prometheus-operator] Custom topologyKey for antiaffinity (#10674)
* Custom topologyKey for antiaffinity

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

* Remove trailing spaces

Signed-off-by: Vasily <vasily.sliouniaev@jet.com>
2019-01-24 07:05:45 -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
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
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
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
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
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
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
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
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