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

[prometheus] Fix volume name evaluation #3348

Merged

Conversation

zeritti
Copy link
Member

@zeritti zeritti commented May 8, 2023

What this PR does / why we need it

When evaluating a persistent volume name, the ternary function expects a real bool on input, i.e. from the test. If the test results in a string, even empty, an invalid value error gets raised. Now, we can provide the desired bool through the empty function. Readability is slightly impacted, though, when compared to a simple conditional.

Which issue this PR fixes

Special notes for your reviewer

Checklist

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

Signed-off-by: zeritti <47476160+zeritti@users.noreply.github.com>
@zeritti zeritti marked this pull request as ready for review May 8, 2023 09:36
Signed-off-by: zeritti <47476160+zeritti@users.noreply.github.com>
@zanhsieh zanhsieh merged commit c6445f7 into prometheus-community:main May 8, 2023
scott-grimes pushed a commit to scott-grimes/helm-charts that referenced this pull request May 8, 2023
Signed-off-by: zeritti <47476160+zeritti@users.noreply.github.com>
Signed-off-by: Scott Grimes <scott.grimes@waldzell.net>
Matiasmct pushed a commit to giffgaff/prometheus-charts-backup that referenced this pull request May 16, 2023
Signed-off-by: zeritti <47476160+zeritti@users.noreply.github.com>
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>
@zeritti zeritti deleted the fix/prometheus-persistent-vol-name branch May 18, 2023 10:44
Matiasmct pushed a commit to giffgaff/prometheus-charts-backup 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.

[prometheus] Prometheus fails to upgrade to version 22.3.2 whe stateful set and persistent storage are enabled
2 participants