Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[kube-prometheus-stack] add prometheus config reloader liveness and readiness prob… #3337

Merged

Conversation

dongjiang1989
Copy link
Member

…e setting

[ENHANCEMENT] Add optional liveness and readiness probes to prometheus-config-reloader. This can be enabled via the --enable-config-reloader-probes CLI flag. prometheus-operator/prometheus-operator#5449

prometheus-operator releases in v0.65.0 version

What this PR does / why we need it

Which issue this PR fixes

(optional, in fixes #<issue number>(, fixes #<issue_number>, ...) format, will close that issue when PR gets merged)

  • fixes #

Special notes for your reviewer

Checklist

  • DCO signed
  • Chart Version bumped
  • Title of the PR starts with chart name (e.g. [kube-prometheus-stack])

…e setting

Signed-off-by: dongjiang1989 <dongjiang1989@126.com>
Signed-off-by: dongjiang1989 <dongjiang1989@126.com>
Signed-off-by: dongjiang <dongjiang1989@126.com>
Signed-off-by: dongjiang1989 <dongjiang1989@126.com>
Signed-off-by: dongjiang1989 <dongjiang1989@126.com>
@dongjiang1989
Copy link
Member Author

@GMartinez-Sisti PTAL!

@GMartinez-Sisti GMartinez-Sisti merged commit 934ef46 into prometheus-community:main May 8, 2023
4 checks passed
scott-grimes pushed a commit to scott-grimes/helm-charts that referenced this pull request May 8, 2023
…eadiness prob… (prometheus-community#3337)

* dongjiang, add prometheus config reloader liveness and readiness probe setting

Signed-off-by: dongjiang1989 <dongjiang1989@126.com>

* update appVersion to v0.65.1

Signed-off-by: dongjiang1989 <dongjiang1989@126.com>

* Update the Chart version to 45.26.0

Signed-off-by: dongjiang <dongjiang1989@126.com>
Signed-off-by: dongjiang1989 <dongjiang1989@126.com>

* dongjiang, fix trailing spaces

Signed-off-by: dongjiang1989 <dongjiang1989@126.com>

---------

Signed-off-by: dongjiang1989 <dongjiang1989@126.com>
Signed-off-by: dongjiang <dongjiang1989@126.com>
@onedr0p
Copy link
Contributor

onedr0p commented May 8, 2023

Shouldn't this have been a major upgrade since two new CRDs were added to Prometheus Operator since 0.63.0 and then documented in the README as such to apply them?

I am talking about monitoring.coreos.com_scrapeconfigs and monitoring.coreos.com_prometheusagents

@GMartinez-Sisti
Copy link
Member

GMartinez-Sisti commented May 8, 2023

Shouldn't have this been a major upgrade since two new CRDs were added to Prometheus Operator since 0.63.0 and then documented in the README as such to apply them?

I am talking about the monitoring.coreos.com_scrapeconfigs and monitoring.coreos.com_prometheusagents crds.

Thanks for the input @onedr0p. From what I understood, they are backwards compatible. My understanding is due to these two lines on the changelog:

NOTE: if these conditions aren't met, the operator will start but it won't be able to reconcile the ScrapeConfig resources.

[BUGFIX] Don't start the PrometheusAgent controller if the CRD isn't present or the operator lacks permissions.

So until we add them to this helm chart, they just won't work and can't be used. WDYT?

@onedr0p
Copy link
Contributor

onedr0p commented May 8, 2023

To stay consistent I believe they should have been included in this release but now we might need to add them and do a major upgrade anyways.

@QuentinBisson
Copy link
Member

There is a major version coming (I will have to upgrade to 0.65.1) but this is not as trivial as we are going over a kubernetes limitation: #3267

Matiasmct pushed a commit to giffgaff/prometheus-charts that referenced this pull request May 16, 2023
…eadiness prob… (prometheus-community#3337)

* dongjiang, add prometheus config reloader liveness and readiness probe setting

Signed-off-by: dongjiang1989 <dongjiang1989@126.com>

* update appVersion to v0.65.1

Signed-off-by: dongjiang1989 <dongjiang1989@126.com>

* Update the Chart version to 45.26.0

Signed-off-by: dongjiang <dongjiang1989@126.com>
Signed-off-by: dongjiang1989 <dongjiang1989@126.com>

* dongjiang, fix trailing spaces

Signed-off-by: dongjiang1989 <dongjiang1989@126.com>

---------

Signed-off-by: dongjiang1989 <dongjiang1989@126.com>
Signed-off-by: dongjiang <dongjiang1989@126.com>
@mikejoh
Copy link
Contributor

mikejoh commented May 16, 2023

This is so confusing, so this PR bumped the appVersion to v0.65.1 but should've been done during a major bump of the kube-prometheus-stack chart? Nothing in this PR should've led to the appVersion bump, or am I missing something?

@QuentinBisson
Copy link
Member

Nothing should have led to it but it is not a breaking change as the old CRDs can work as is with this version of the prometheus-operator. We are currently trying to upgrade the CRDs and make it a major version but the new CRDs are causing issues in regards to Kubernetes Secret limit #3267

@mikejoh
Copy link
Contributor

mikejoh commented May 16, 2023

Nothing should have led to it but it is not a breaking change as the old CRDs can work as is with this version of the prometheus-operator. We are currently trying to upgrade the CRDs and make it a major version but the new CRDs are causing issues in regards to Kubernetes Secret limit #3267

I think understand! A major bump of the chart, when the app version of the operator is bumped, isn't always needed - it depends as always! And thanks for the quick reply!

zanhsieh added a commit that referenced this pull request May 17, 2023
* update add_custom_labels to apply labels to all PrometheusRules

Signed-off-by: Scott Grimes <scott.grimes@waldzell.net>

* update rules templates compiled from sync_prometheus_rules.p6

Signed-off-by: Scott Grimes <scott.grimes@waldzell.net>

* bump chart version

Signed-off-by: Scott Grimes <scott.grimes@waldzell.net>

* fix node-exporter listen address with kubeRBACProxy enabled (#3336)

Signed-off-by: rob <rob@unx.pl>
Co-authored-by: MH <zanhsieh@gmail.com>
Signed-off-by: Scott Grimes <scott.grimes@waldzell.net>

* [prometheus] Bump Prometheus release (#3335)

* Bump Prometheus to v2.43.1

Signed-off-by: zeritti <47476160+zeritti@users.noreply.github.com>
Co-authored-by: MH <zanhsieh@gmail.com>
Signed-off-by: Scott Grimes <scott.grimes@waldzell.net>

* Fix RoleBinding subject namespace reference (#3342)

Signed-off-by: Tom Walker <walker.thomas.p@gmail.com>
Signed-off-by: MH <zanhsieh@gmail.com>
Co-authored-by: MH <zanhsieh@gmail.com>
Signed-off-by: Scott Grimes <scott.grimes@waldzell.net>

* Update extraManifests example to be multiline string instead of YAML (#3343)

Signed-off-by: Tom Walker <walker.thomas.p@gmail.com>
Signed-off-by: Scott Grimes <scott.grimes@waldzell.net>

* [prometheus-stackdriver-exporter] Add prometheusRule support (#3115)

* [prometheus-stackdriver-exporter] Add prometheusRule support

Signed-off-by: Baptiste Roux <arte.but.posix@gmail.com>

* [prometheus-stackdriver-exporter] Bump version to 4.3.0

Signed-off-by: Baptiste Roux <arte.but.posix@gmail.com>

---------

Signed-off-by: Baptiste Roux <arte.but.posix@gmail.com>
Co-authored-by: MH <zanhsieh@gmail.com>
Co-authored-by: Rico Pahlisch <pahli88@googlemail.com>
Signed-off-by: Scott Grimes <scott.grimes@waldzell.net>

* [kube-prometheus-stack] add prometheus config reloader liveness and readiness prob… (#3337)

* dongjiang, add prometheus config reloader liveness and readiness probe setting

Signed-off-by: dongjiang1989 <dongjiang1989@126.com>

* update appVersion to v0.65.1

Signed-off-by: dongjiang1989 <dongjiang1989@126.com>

* Update the Chart version to 45.26.0

Signed-off-by: dongjiang <dongjiang1989@126.com>
Signed-off-by: dongjiang1989 <dongjiang1989@126.com>

* dongjiang, fix trailing spaces

Signed-off-by: dongjiang1989 <dongjiang1989@126.com>

---------

Signed-off-by: dongjiang1989 <dongjiang1989@126.com>
Signed-off-by: dongjiang <dongjiang1989@126.com>

* [prometheus] env vars for configmap-reload (#3344)

* Add support for env vars for configmap-reload
  to better support basic authentication at Prometheus

* Bump configmap-reload release to 0.65.1

* Update values schema with the latest values

Signed-off-by: zeritti <47476160+zeritti@users.noreply.github.com>
Co-authored-by: MH <zanhsieh@gmail.com>
Signed-off-by: Scott Grimes <scott.grimes@waldzell.net>

* [prometheus] Fix volume name evaluation (#3348)

Signed-off-by: zeritti <47476160+zeritti@users.noreply.github.com>
Signed-off-by: Scott Grimes <scott.grimes@waldzell.net>

* formatting

Signed-off-by: Scott Grimes <scott-grimes@users.noreply.github.com>

* Update Chart.yaml

Signed-off-by: Scott Grimes <scott-grimes@users.noreply.github.com>

* Update sync_prometheus_rules.py

Signed-off-by: Scott Grimes <scott-grimes@users.noreply.github.com>

---------

Signed-off-by: Scott Grimes <scott.grimes@waldzell.net>
Signed-off-by: rob <rob@unx.pl>
Signed-off-by: zeritti <47476160+zeritti@users.noreply.github.com>
Signed-off-by: Tom Walker <walker.thomas.p@gmail.com>
Signed-off-by: MH <zanhsieh@gmail.com>
Signed-off-by: Baptiste Roux <arte.but.posix@gmail.com>
Signed-off-by: dongjiang1989 <dongjiang1989@126.com>
Signed-off-by: dongjiang <dongjiang1989@126.com>
Signed-off-by: Scott Grimes <scott-grimes@users.noreply.github.com>
Co-authored-by: Robert Jerzak <r0bj@users.noreply.github.com>
Co-authored-by: MH <zanhsieh@gmail.com>
Co-authored-by: zeritti <47476160+zeritti@users.noreply.github.com>
Co-authored-by: Tom Walker <walker.thomas.p@gmail.com>
Co-authored-by: Baptiste Roux <32563450+BapRx@users.noreply.github.com>
Co-authored-by: Rico Pahlisch <pahli88@googlemail.com>
Co-authored-by: dongjiang <dongjiang1989@126.com>
Matiasmct pushed a commit to giffgaff/prometheus-charts that referenced this pull request May 31, 2023
* update add_custom_labels to apply labels to all PrometheusRules

Signed-off-by: Scott Grimes <scott.grimes@waldzell.net>

* update rules templates compiled from sync_prometheus_rules.p6

Signed-off-by: Scott Grimes <scott.grimes@waldzell.net>

* bump chart version

Signed-off-by: Scott Grimes <scott.grimes@waldzell.net>

* fix node-exporter listen address with kubeRBACProxy enabled (prometheus-community#3336)

Signed-off-by: rob <rob@unx.pl>
Co-authored-by: MH <zanhsieh@gmail.com>
Signed-off-by: Scott Grimes <scott.grimes@waldzell.net>

* [prometheus] Bump Prometheus release (prometheus-community#3335)

* Bump Prometheus to v2.43.1

Signed-off-by: zeritti <47476160+zeritti@users.noreply.github.com>
Co-authored-by: MH <zanhsieh@gmail.com>
Signed-off-by: Scott Grimes <scott.grimes@waldzell.net>

* Fix RoleBinding subject namespace reference (prometheus-community#3342)

Signed-off-by: Tom Walker <walker.thomas.p@gmail.com>
Signed-off-by: MH <zanhsieh@gmail.com>
Co-authored-by: MH <zanhsieh@gmail.com>
Signed-off-by: Scott Grimes <scott.grimes@waldzell.net>

* Update extraManifests example to be multiline string instead of YAML (prometheus-community#3343)

Signed-off-by: Tom Walker <walker.thomas.p@gmail.com>
Signed-off-by: Scott Grimes <scott.grimes@waldzell.net>

* [prometheus-stackdriver-exporter] Add prometheusRule support (prometheus-community#3115)

* [prometheus-stackdriver-exporter] Add prometheusRule support

Signed-off-by: Baptiste Roux <arte.but.posix@gmail.com>

* [prometheus-stackdriver-exporter] Bump version to 4.3.0

Signed-off-by: Baptiste Roux <arte.but.posix@gmail.com>

---------

Signed-off-by: Baptiste Roux <arte.but.posix@gmail.com>
Co-authored-by: MH <zanhsieh@gmail.com>
Co-authored-by: Rico Pahlisch <pahli88@googlemail.com>
Signed-off-by: Scott Grimes <scott.grimes@waldzell.net>

* [kube-prometheus-stack] add prometheus config reloader liveness and readiness prob… (prometheus-community#3337)

* dongjiang, add prometheus config reloader liveness and readiness probe setting

Signed-off-by: dongjiang1989 <dongjiang1989@126.com>

* update appVersion to v0.65.1

Signed-off-by: dongjiang1989 <dongjiang1989@126.com>

* Update the Chart version to 45.26.0

Signed-off-by: dongjiang <dongjiang1989@126.com>
Signed-off-by: dongjiang1989 <dongjiang1989@126.com>

* dongjiang, fix trailing spaces

Signed-off-by: dongjiang1989 <dongjiang1989@126.com>

---------

Signed-off-by: dongjiang1989 <dongjiang1989@126.com>
Signed-off-by: dongjiang <dongjiang1989@126.com>

* [prometheus] env vars for configmap-reload (prometheus-community#3344)

* Add support for env vars for configmap-reload
  to better support basic authentication at Prometheus

* Bump configmap-reload release to 0.65.1

* Update values schema with the latest values

Signed-off-by: zeritti <47476160+zeritti@users.noreply.github.com>
Co-authored-by: MH <zanhsieh@gmail.com>
Signed-off-by: Scott Grimes <scott.grimes@waldzell.net>

* [prometheus] Fix volume name evaluation (prometheus-community#3348)

Signed-off-by: zeritti <47476160+zeritti@users.noreply.github.com>
Signed-off-by: Scott Grimes <scott.grimes@waldzell.net>

* formatting

Signed-off-by: Scott Grimes <scott-grimes@users.noreply.github.com>

* Update Chart.yaml

Signed-off-by: Scott Grimes <scott-grimes@users.noreply.github.com>

* Update sync_prometheus_rules.py

Signed-off-by: Scott Grimes <scott-grimes@users.noreply.github.com>

---------

Signed-off-by: Scott Grimes <scott.grimes@waldzell.net>
Signed-off-by: rob <rob@unx.pl>
Signed-off-by: zeritti <47476160+zeritti@users.noreply.github.com>
Signed-off-by: Tom Walker <walker.thomas.p@gmail.com>
Signed-off-by: MH <zanhsieh@gmail.com>
Signed-off-by: Baptiste Roux <arte.but.posix@gmail.com>
Signed-off-by: dongjiang1989 <dongjiang1989@126.com>
Signed-off-by: dongjiang <dongjiang1989@126.com>
Signed-off-by: Scott Grimes <scott-grimes@users.noreply.github.com>
Co-authored-by: Robert Jerzak <r0bj@users.noreply.github.com>
Co-authored-by: MH <zanhsieh@gmail.com>
Co-authored-by: zeritti <47476160+zeritti@users.noreply.github.com>
Co-authored-by: Tom Walker <walker.thomas.p@gmail.com>
Co-authored-by: Baptiste Roux <32563450+BapRx@users.noreply.github.com>
Co-authored-by: Rico Pahlisch <pahli88@googlemail.com>
Co-authored-by: dongjiang <dongjiang1989@126.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

5 participants