Commit Graph
89 Commits
Author SHA1 Message Date
Sam Song 48cd0b1990 [stable/prometheus-operator] Fix default values for prometheus-operator remoteRead/Write (#12919)
* Fix default values for prometheus-operator remoteRead/Write

Signed-off-by: Sam Song <ssong@sumologic.com>

* Bump up version

Signed-off-by: Sam Song <ssong@sumologic.com>
2019-04-08 12:21:55 -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
Hans Kristian Flaatten cfc030321f [prometheus-operator]: use valid service nodeports (#12478)
Signed-off-by: Hans Kristian Flaatten <hans.flaatten@evry.com>
2019-04-01 12:28:34 -07:00
jnsvd 71987f963f Update grafana to a newer version in requirements.yaml of stable/prom… (#12454)
* Update grafana to a newer version in requirements.yaml of stable/prometheus-operator

Signed-off-by: Jens Van Duyse <jens.van.duyse@theglue.com>

* Bumped version, generated requirements.lock for new version

Signed-off-by: Jens Van Duyse <jens.van.duyse@theglue.com>

* Bumped chart version

Signed-off-by: Jens Van Duyse <jens.van.duyse@theglue.com>

* Generated requirements.lock with higher version of Grafana

Signed-off-by: Jens Van Duyse <jens.van.duyse@theglue.com>
2019-03-26 01:13:17 -07:00
Moritz Schmitz von Hülst 7edf78c42b [stable/prometheus-operator] Fix documentation to use LabelSelector (#12420)
* Fix documentation to use LabelSelector

Signed-off-by: Moritz Schmitz von Hülst <msc@marketlogicsoftware.com>

* bump version

Signed-off-by: Moritz Schmitz von Hülst <msc@marketlogicsoftware.com>
2019-03-23 12:21:06 -07:00
Martin Hoefling 09a88ab50e Metrics are incorrectly prefixed with ingress path (#12316)
Grafana always exposes metrics at /metrics and thus are not scraped if an ingress path is provided.

http://docs.grafana.org/installation/configuration/#metrics
Signed-off-by: Martin Hoefling <martin.hoefling@gmx.de>
2019-03-20 12:57:42 -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
Brian Nutt 610e47e34c [stable/prometheus-operator] Disable AlertmanagerDown alert if alertmanager is disabled (#12027)
In the case alertingEndpoints is used, not every deployment may require an alertmanager with it. Prometheus will throw an alert in this case unless the rule is manually removed. This will just exlude the rule automatically should alertmanager be disabled.

Signed-off-by: Brian Nutt <brian@slice.com>
2019-03-18 13:00:28 -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
mpursley cff1ef7245 Fix a few typeos in stable/prometheus-operator/README.md (#12264)
* Fix a few typeos in stable/prometheus-operator/README.md

Signed-off-by: Matt Pursley <mpursley@gmail.com>

* Bump the version to 4.3.4

Signed-off-by: Matt Pursley <mpursley@gmail.com>
2019-03-15 02:59:08 -07:00
Han Xiao da8b2fa27f fix typo in readme (#11595)
* fix typo in readme

Signed-off-by: Xiao Han <xhan@cogent.co.jp>

* bump chart version for doc fix

Signed-off-by: Xiao Han <xhan@cogent.co.jp>
2019-03-11 01:21:27 -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
Tomasz Szuba 31c9ac5729 Add possibility to scrape kube-scheduler and kube-controller-manager over https (#11894)
Signed-off-by: Tomasz Szuba <tomasz.szuba@hltech.com>
2019-03-04 05:38:47 -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
leigh schrandt b4d174da9d [stable/prometheus-operator] Update deps for grafana v6 (#11824)
Signed-off-by: leigh schrandt <leigh@null.net>
2019-02-28 01:54:48 -08:00
Todd Brown 2811cbeb60 [stable/prometheus-operator] Correct spelling (#11711)
* [stable/prometheus-operator] Correct spelling

Signed-off-by: Todd Brown <mrbrownt@me.com>

* Bump prometheus-operator version

Signed-off-by: Todd Brown <mrbrownt@me.com>
2019-02-25 14:52:42 -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
Giancarlo Rubio 61d621c708 fix servicemonitors and prometheusrule yaml list (#11563)
Signed-off-by: Giancarlo Rubio <gianrubio@gmail.com>
2019-02-20 03:51:42 -08:00
Karol Chrapek 50f34762dc [stable/prometheus-operator] Bump node exporter version (#11487)
* [stable/prometheus-operator] Bump node exporter version

Signed-off-by: Karol Chrapek <kaarol@it-flow.pl>

* Update .lock

Signed-off-by: Karol Chrapek <kaarol@it-flow.pl>

* Update chart version

Signed-off-by: Karol Chrapek <kaarol@it-flow.pl>
2019-02-20 03:07:41 -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
Nik Voss ccfb3d0417 Fixed configmap dashboard problems, when no custom files are provided. (#11034)
Signed-off-by: Niklas Voss <niklas.voss@gmail.com>
2019-02-19 05:04:59 -08:00
acondrat 51b2fd57f5 [stable/prometheus] allow for relabeling in the apiserver ServiceMonitor (#11015)
* Relablings for the API Server ServiceMonitor

Signed-off-by: Arcadie Condrat <arcadie.condrat@gmail.com>

* removed extra spaces

Signed-off-by: Arcadie Condrat <arcadie.condrat@gmail.com>

* version bump

Signed-off-by: Arcadie Condrat <arcadie.condrat@gmail.com>

* version bump

Signed-off-by: Arcadie Condrat <arcadie.condrat@gmail.com>

* version bump

Signed-off-by: Arcadie Condrat <arcadie.condrat@gmail.com>

* version bump

Signed-off-by: Arcadie Condrat <arcadie.condrat@gmail.com>

* version bump

Signed-off-by: acondrat <arcadie.condrat@gmail.com>

* version bump

Signed-off-by: acondrat <arcadie.condrat@gmail.com>
2019-02-19 01:33:29 -08:00
Eduardo Baitello 6b08a1052b [stable/prometheus-operator] fix README.md (#11333)
* Fix stable/prometheus-operator README.md 

Fix configuration parameter documentation for controller-manager Exporter
Signed-off-by: Eduardo Baitello <eduardobaitello@gmail.com>

* [stable/prometheus-operator] Bump chart version

Signed-off-by: Eduardo Baitello <eduardobaitello@gmail.com>
2019-02-18 11:34:45 -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
Nick Troast 6877582cd8 [stable/prometheus-operator] allow empty ruleSelector and ruleNamespaceSelector (#11395)
Currently an empty ruleSelector or ruleNamespaceSelector does not select
all PrometheusRules or Namespaces respectively. Fix the prometheus
template to allow empty ruleSelector and ruleNamespaceSelector.

Signed-off-by: Nick Troast <ntroast@gmail.com>
2019-02-18 02:52:27 -08:00
Itay Shakury 4a64117b98 [stable/prometheus-operator] allow to configure operator log level (#11326)
* allow to configure operator log level

Signed-off-by: Itay Shakury <itay@itaysk.com>

* bump chart version again after rebase

Signed-off-by: Itay Shakury <itay@itaysk.com>
2019-02-15 10:05:03 -08:00
Vasily Sliouniaev cec86f65c7 [stable/prometheus-operator] Add vsliouniaev to approvers, reviewers (#11443)
* Add vsliouniaev to approvers, reviewers

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

* Bump chart vers

Seems strange, to have to bump for things in the ignore file

Signed-off-by: Vasily <vasily.sliouniaev@jet.com>
2019-02-15 03:21:11 -08:00
Kyle von Bredow 8df3775ffe [stable/prometheus-operator] update dependencies (#11044)
* Updating dependencies

Signed-off-by: Kyle von Bredow <kylevonbredow@gmail.com>

* Regenerated lock file for kube-state-metrics 0.13.1

Signed-off-by: Kyle von Bredow <kylevonbredow@gmail.com>
2019-02-11 05:34:18 -08:00
tillkahlbrock b27cd98a26 [stable/prometheus-operator] allow setting sessionAffinity (#11229)
* [stable/prometheus-operator] allow setting sessionAffinity on prometheus service

Signed-off-by: Till Kahlbrock <till.kahlbrock@gmail.com>

* bump chart version

Signed-off-by: Till Kahlbrock <till.kahlbrock@gmail.com>
2019-02-07 16:13:59 -08:00
Abhishek Jaisingh 0150265af8 [stable/prometheus-operator] Fix README: prometheusOperator.logFormat highlight (#11050)
Signed-off-by: Abhishek Jaisingh <abhi2254015@gmail.com>
2019-02-01 05:16:03 -08:00
Benjamin Lee b5600383bc [stable/prometheus-operator] Removed duplicate nodePort in prometheus service (#9684)
* Removed duplicate nodePort in prometheus service

Signed-off-by: Benjamin Lee <benjamintllee@hotmail.com>

* Bumped version

Signed-off-by: Benjamin Lee <benjamintllee@hotmail.com>

* [stable/prometheus-operator] Merged upstream master and bumped version again

Signed-off-by: Benjamin Lee <benjamintllee@hotmail.com>
2019-02-01 00:13:57 -08:00
Manuel Rüger 15493df5ad [stable/prometheus-operator] Add option to set log formatting (#10341)
Signed-off-by: Manuel Rüger <manuel@rueg.eu>
2019-01-31 23:22:30 -08:00
Jawshua 8e946f3ea8 [stable/prometheus-operator] fix conditional rule inserts (#10935)
* [stable/prometheus-operator] Fix conditional rule insert bug

Signed-off-by: Joshua Welsh <Jawshua@users.noreply.github.com>

* [stable/prometheus-operator] Bump version

Signed-off-by: Joshua Welsh <Jawshua@users.noreply.github.com>
2019-01-31 04:32:51 -08:00
Oleg b1def63d1b [stable/prometheus-operator] Fix readme typos (#10958)
* [stable/prometheus-operator] Fix readme typos

Signed-off-by: Oleg Selin <oleg.selin@gmail.com>

* [stable/prometheus-operator] Fix readme typo

Signed-off-by: Oleg Selin <oleg.selin@gmail.com>

* [stable/prometheus-operator] Bump version

Signed-off-by: Oleg Selin <oleg.selin@gmail.com>
2019-01-30 10:47:21 -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
DerekHeldtWerle 6340adbd3b [stable/prometheus-operator] Prometheus operator version updates (#10684)
* Updated grafana dep for extraConfigmapMounts, kube-state-metrics for psp

Signed-off-by: Derek Heldt-Werle <derek.heldt-werle@viasat.com>

* Added newly supported options to both the README and values.yaml file

Signed-off-by: Derek Heldt-Werle <derek.heldt-werle@viasat.com>

* Bump version number

Signed-off-by: Derek Heldt-Werle <derek.heldt-werle@viasat.com>
2019-01-24 09:05:13 -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
Dmitry Verkhoturov c3d847f979 [stable/prometheus-operator] sync prometheus rules from coreos and etcd upstream (#10538)
* [stable/prometheus-operator] move rules and dashboards to new locations

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

* [stable/prometheus-operator] sync rules with upstream

Signed-off-by: Dmitry Verkhoturov <paskal.07@gmail.com>
2019-01-17 04:40:29 -08:00
Bort Verwilst 29273eba9c Update grafana dep version to 1.24 (#10613)
Signed-off-by: Bart Verwilst <bart@verwilst.be>
2019-01-14 15:41:20 -08:00
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