Migrate prometheus operator from coreos #6765

gianrubio · 2018-07-23T09:41:32Z

What this PR does / why we need it:

This a FR from coreos/prometheus-operator project. Moving the chart to helm upstream will make easier to run e2e tests and to accept/merge PR.

@richerve @pierreozoux @vsliouniaev please review it

prometheus-operator/prometheus-operator#1154
#3490

vsliouniaev · 2018-07-23T18:32:22Z

incubator/prometheus-operator/values.yaml

+  #  memory: 100Mi
+  # requests:
+  #  cpu: 100m
+  #  memory: 50Mi


prometheus-operator/prometheus-operator@dcca972#diff-316e3be0fdb46f4d221f84162f7d03f8

I think the values in the sample should reflect the updated memory limit - defaults are forever!

vsliouniaev · 2018-07-23T18:39:06Z

incubator/prometheus-operator/templates/crd-alertmanager.yaml

@@ -0,0 +1,2412 @@
+{{- if .Values.createCustomResource -}}


createCustomResource should be documented and added to values.yaml ?

vsliouniaev · 2018-07-23T18:40:59Z

incubator/prometheus-operator/templates/psp-clusterrole.yaml

@@ -0,0 +1,16 @@
+{{- if .Values.rbacEnable }}


These appear as rbac.* configurations in the readme and values.yaml

vsliouniaev · 2018-07-24T11:14:32Z

Made updates here with these and other suggested changes.

bhack · 2018-07-25T11:26:45Z

incubator/prometheus-operator/README.md

+
+## Introduction
+
+This chart bootstraps a [prometheus-operator](https://github.com/coreos/prometheus-operator) deployment on a [Kubernetes](http://kubernetes.io) cluster using the [Helm](https://helm.sh) package manager.


As we have already https://github.com/helm/charts/tree/master/stable/prometheus. Can we quickly specify the differences to the users.

gianrubio · 2018-08-01T14:52:45Z

Made updates here with these and other suggested changes.

@vsliouniaev I applied your changes here.

TODO list

Review Readme.md
Load grafana dashboards

stealthybox · 2018-08-20T10:11:07Z

@gianrubio, since we're planning to use stable/grafana, it looks like we could enable the ConfigMap sidecar and create the datasource and dashboards directly from the prometheus-operator.

It should be easy to template and we could even provide it as a subchart so that it's usable with stable/prometheus
This same mechanism would be usable by users for their own dashboard charts.

I would say we should try to get #7060 merged if we go that route.

Using the grafana values to embed dashboards seems problematic for size reasons.

richerve · 2018-08-24T14:12:04Z

@stealthybox I think the creation of dashboards and datasources is better handled by the kube-prometheus Chart, that at some point it will pull this new upstream Charts as dependencies, since dashboards and datasources are not directly related to the prometheus-operator.

stable/grafana has a way to read dashboards from ConfigMaps so the kube-prometheus Chart can create those and then reference them on the Grafana config.

stealthybox · 2018-08-24T17:53:07Z

@richerve we're on the same page.

We can configure stable/grafana as a sub-chart to use the sidecar that loads dashboards from ConfigMaps.

The incubator/kube-prometheus chart could then use incubator/kube-prometheus-dashboards as a subchart to create ConfigMaps that are properly labeled such that the grafana sidecar loads them.

incubator/kube-prometheus-dashboards would then be a usable, even for folks who manage their own prometheus or grafana.

mrueg · 2018-09-11T12:20:44Z

incubator/prometheus-operator/templates/exporters/kube-controller-manager/servicemonitor.yaml

+  endpoints:
+  - port: http-metrics
+    interval: 15s
+    tlsConfig:


Should we drop/comment out tlsConfig here? kube-controller-manager metrics are only available via http kubernetes/kubernetes#58982

mrueg · 2018-09-19T07:56:23Z

@gianrubio anything I can do to help out here? I would love to see this PR getting merged.

greggdonovan · 2018-09-25T15:42:58Z

@gianrubio anything I can do to help out here? I would love to see this PR getting merged.

The pull-charts-e2e job appears to be failing on a stray tab character:

I0905 12:25:30.551] incubator/prometheus-operator/values.yaml
I0905 12:25:30.557]   29:15     error    syntax error: found character '\t' that cannot start any token

Can we remove that and try the e2e job again? We'd also love to see this move forward, as well.

gianrubio · 2018-09-27T13:02:55Z

I’m being lazy to finish this PR. I’ll get some time during this weekend to make it mergeable. Sorry for any inconvenience

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 (helm#6765 (comment)) 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 helm#6765 (comment) * 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 helm#6765 (comment) helm#6765 (comment) * 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 helm#6765 (comment) Fix cleanup, requirements.lock file (#7)

viglesiasce · 2018-10-23T16:24:55Z

Tested and worked great for me.

/lgtm

k8s-ci-robot · 2018-10-23T16:25:05Z

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: gianrubio, viglesiasce

The full list of commands accepted by this bot can be found here.

The pull request process is described here

Needs approval from an approver in each of these files:

~~OWNERS~~ [viglesiasce]

Approvers can indicate their approval by writing /approve in a comment
Approvers can cancel approval by writing /approve cancel in a comment

vsliouniaev · 2018-10-23T16:36:39Z

@trevex this was fixed
#6765 (comment)

andig · 2018-10-23T16:52:05Z

The readme still points to incubator in various places like:

helm install --name my-release incubator/prometheus-operator

andig · 2018-10-23T16:59:10Z

There also seems to be some confusion around the prometheus ingress config:

prometheus.ingress.enabled If true, **alertmanager** Ingress will be created

gianrubio · 2018-10-23T17:09:40Z

@andig prs with thiese fixes are very welcome 😋

andig · 2018-10-23T17:19:30Z

Absolutely if these are as you expect them! Happy to have been watching this issue and looking forward to give it a ride tomorrow.

andig · 2018-10-23T17:21:49Z

Another one: the readme gives an example for sendAnalytics, but its not in the values.yml?

* 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 (helm#6765 (comment)) 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 (helm#5) * Fix lint * Fix missing selector on kubelet helm#6765 (comment) * 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 helm#6765 (comment) helm#6765 (comment) * 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 (helm#6) * Fix additional service monitor template * Fix label indentation helm#6765 (comment) Fix cleanup, requirements.lock file (helm#7) Signed-off-by: Jakob Niggel <info@jakobniggel.de>

* 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 (helm#6765 (comment)) 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 (helm#5) * Fix lint * Fix missing selector on kubelet helm#6765 (comment) * 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 helm#6765 (comment) helm#6765 (comment) * 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 (helm#6) * Fix additional service monitor template * Fix label indentation helm#6765 (comment) Fix cleanup, requirements.lock file (helm#7)

* 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 (helm/charts#6765 (comment)) 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 helm/charts#6765 (comment) * 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 helm/charts#6765 (comment) helm/charts#6765 (comment) * 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 helm/charts#6765 (comment) Fix cleanup, requirements.lock file (#7)

k8s-ci-robot requested review from sameersbn and viglesiasce July 23, 2018 09:41

k8s-ci-robot added the cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. label Jul 23, 2018

gianrubio force-pushed the prometheus-operator branch 2 times, most recently from afaa2b1 to 952e6e5 Compare July 23, 2018 14:12

vsliouniaev reviewed Jul 23, 2018

View reviewed changes

bhack reviewed Jul 25, 2018

View reviewed changes

gianrubio force-pushed the prometheus-operator branch from bb0a81b to 4c7ac8b Compare August 1, 2018 14:42

This was referenced Aug 3, 2018

helm: Update prometheus operator to 0.22.2 prometheus-operator/prometheus-operator#1740

Closed

Add ability to define service ports for Prometheus & Alertmanager prometheus-operator/prometheus-operator#1752

Closed

gianrubio mentioned this pull request Aug 8, 2018

[stable/prometheus-operator] add chart #3490

Closed

This was referenced Aug 13, 2018

Add backend element to ingress specs prometheus-operator/prometheus-operator#1675

Closed

Change rules to list prometheus-operator/prometheus-operator#1634

Closed

cpick mentioned this pull request Aug 16, 2018

Fix APIServerErrorsHigh alert rule prometheus-operator/prometheus-operator#1799

Closed

stealthybox mentioned this pull request Aug 20, 2018

rework helm-charts prometheus-operator/prometheus-operator#592

Closed

mattfarina added the Contribution Allowed If the contributor has signed the DCO or the CNCF CLA (prior to the move to a DCO). label Aug 27, 2018

ey-bot removed the Contribution Allowed If the contributor has signed the DCO or the CNCF CLA (prior to the move to a DCO). label Sep 5, 2018

greggdonovan mentioned this pull request Sep 5, 2018

helm: Update Helm chart dependencies prometheus-operator/prometheus-operator#1851

Closed

mrueg reviewed Sep 11, 2018

View reviewed changes

brancz mentioned this pull request Sep 21, 2018

Helm pathPrefix config fix prometheus-operator/prometheus-operator#1598

Closed

helm-bot added the size/XXL Denotes a PR that changes 1000+ lines, ignoring generated files. label Oct 23, 2018

gianrubio force-pushed the prometheus-operator branch from 31c4906 to a02501d Compare October 23, 2018 15:20

helm-bot added size/XXL Denotes a PR that changes 1000+ lines, ignoring generated files. and removed size/XXL Denotes a PR that changes 1000+ lines, ignoring generated files. labels Oct 23, 2018

gianrubio force-pushed the prometheus-operator branch from a02501d to 0a431fe Compare October 23, 2018 15:21

helm-bot added size/XXL Denotes a PR that changes 1000+ lines, ignoring generated files. and removed size/XXL Denotes a PR that changes 1000+ lines, ignoring generated files. labels Oct 23, 2018

k8s-ci-robot assigned viglesiasce Oct 23, 2018

k8s-ci-robot added the lgtm Indicates that a PR is ready to be merged. label Oct 23, 2018

k8s-ci-robot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Oct 23, 2018

k8s-ci-robot merged commit 7d04502 into helm:master Oct 23, 2018

andig mentioned this pull request Oct 23, 2018

Correct repo name and ingress labels #8662

Merged

vsliouniaev mentioned this pull request Feb 15, 2019

Add vsliouniaev as a trusted collaborator #11445

Closed

sungmincs mentioned this pull request Oct 24, 2022

[prometheus-kube-stack] additional***Configs generate 'confg' name in postfix prometheus-community/helm-charts#2533

Closed

appimpersonator bot mentioned this pull request Mar 23, 2024

Broken links detected 🔗 cftechwiz/homelab-ops#2006

Closed

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Migrate prometheus operator from coreos #6765

Migrate prometheus operator from coreos #6765

gianrubio commented Jul 23, 2018 •

edited

Loading

vsliouniaev Jul 23, 2018

vsliouniaev Jul 23, 2018 •

edited

Loading

vsliouniaev Jul 23, 2018

vsliouniaev commented Jul 24, 2018

bhack Jul 25, 2018

gianrubio commented Aug 1, 2018

stealthybox commented Aug 20, 2018

richerve commented Aug 24, 2018

stealthybox commented Aug 24, 2018

mrueg Sep 11, 2018

mrueg commented Sep 19, 2018

greggdonovan commented Sep 25, 2018

gianrubio commented Sep 27, 2018

viglesiasce commented Oct 23, 2018

k8s-ci-robot commented Oct 23, 2018

vsliouniaev commented Oct 23, 2018

andig commented Oct 23, 2018

andig commented Oct 23, 2018 •

edited

Loading

gianrubio commented Oct 23, 2018

andig commented Oct 23, 2018

andig commented Oct 23, 2018


		## Introduction

		This chart bootstraps a [prometheus-operator](https://github.com/coreos/prometheus-operator) deployment on a [Kubernetes](http://kubernetes.io) cluster using the [Helm](https://helm.sh) package manager.

Migrate prometheus operator from coreos #6765

Migrate prometheus operator from coreos #6765

Conversation

gianrubio commented Jul 23, 2018 • edited Loading

vsliouniaev Jul 23, 2018

Choose a reason for hiding this comment

vsliouniaev Jul 23, 2018 • edited Loading

Choose a reason for hiding this comment

vsliouniaev Jul 23, 2018

Choose a reason for hiding this comment

vsliouniaev commented Jul 24, 2018

bhack Jul 25, 2018

Choose a reason for hiding this comment

gianrubio commented Aug 1, 2018

stealthybox commented Aug 20, 2018

richerve commented Aug 24, 2018

stealthybox commented Aug 24, 2018

mrueg Sep 11, 2018

Choose a reason for hiding this comment

mrueg commented Sep 19, 2018

greggdonovan commented Sep 25, 2018

gianrubio commented Sep 27, 2018

viglesiasce commented Oct 23, 2018

k8s-ci-robot commented Oct 23, 2018

vsliouniaev commented Oct 23, 2018

andig commented Oct 23, 2018

andig commented Oct 23, 2018 • edited Loading

gianrubio commented Oct 23, 2018

andig commented Oct 23, 2018

andig commented Oct 23, 2018

gianrubio commented Jul 23, 2018 •

edited

Loading

vsliouniaev Jul 23, 2018 •

edited

Loading

andig commented Oct 23, 2018 •

edited

Loading