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] ConfigReloader ServiceMonitor HTTP scheme is not set correctly when HTTPS is enabled #3815

Merged
merged 5 commits into from Oct 17, 2023

Conversation

n1kofr
Copy link
Contributor

@n1kofr n1kofr commented Sep 20, 2023

What this PR does / why we need it

The goal of this PR is to fix Prometheus target not being able to be scraped because of incompatible scheme for ConfigReloader when HTTPS is enabled on Prometheus.

@andrewgkew
@gianrubio
@gkarthiks
@GMartinez-Sisti
@scottrigby
@Xtigyro
@QuentinBisson

related to issue [https://github.com//issues/3802]

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])

Set HTTP as default scheme (only HTTP is supported by ConfigReloader)

Signed-off-by: Nicolas <60761885+n1kofr@users.noreply.github.com>
Force HTTP for ConfigReloader scheme

Signed-off-by: Nicolas <60761885+n1kofr@users.noreply.github.com>
Signed-off-by: Nicolas <60761885+n1kofr@users.noreply.github.com>
Signed-off-by: Nicolas <60761885+n1kofr@users.noreply.github.com>
@gsmith-sas
Copy link

Looking over the file changes, doesn't this PR just hard-code the use of HTTP for all of the metric endpoints including for Alertmanager rather only impacting the metric endpoint for the config-reloader?

@n1kofr
Copy link
Contributor Author

n1kofr commented Oct 17, 2023

The goal is to force the use of HTTP only for ConfigReloader port (for both Prometheus and Alertmanager) as I did not see any support for HTTPS on ConfigReloader and I would like to unlock the current issue which is impacted us (generating alerts).

To summarize, collect metrics on Prometheus and Alertmanager is still using HTTPS, but ConfigReloader for both will be using HTTP.

@gsmith-sas
Copy link

Sorry, I should have expanded the code around the change to get a better idea of the context. Thanks for clarifying that @n1kofr .

Copy link
Member

@GMartinez-Sisti GMartinez-Sisti left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@GMartinez-Sisti
Copy link
Member

Please fix conflicts so we can proceed 🙂

@n1kofr
Copy link
Contributor Author

n1kofr commented Oct 17, 2023

Ok, i will update the conflict right now :)

Signed-off-by: Nicolas <60761885+n1kofr@users.noreply.github.com>
@n1kofr
Copy link
Contributor Author

n1kofr commented Oct 17, 2023

I fixed the conflicts, let me know if anything else needs to be done (or if i messed up somewhere) :)

Copy link
Member

@GMartinez-Sisti GMartinez-Sisti left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks @n1kofr!

@GMartinez-Sisti GMartinez-Sisti merged commit 30dada6 into prometheus-community:main Oct 17, 2023
4 checks passed
nrdufour added a commit to nrdufour/home-ops that referenced this pull request Oct 18, 2023
This PR contains the following updates:

| Package | Update | Change |
|---|---|---|
| [kube-prometheus-stack](https://github.com/prometheus-operator/kube-prometheus) ([source](https://github.com/prometheus-community/helm-charts)) | patch | `51.9.0` -> `51.9.1` |

---

> ⚠ **Warning**
>
> Some dependencies could not be looked up. Check the warning logs for more information.

---

### Release Notes

<details>
<summary>prometheus-community/helm-charts (kube-prometheus-stack)</summary>

### [`v51.9.1`](https://github.com/prometheus-community/helm-charts/releases/tag/kube-prometheus-stack-51.9.1)

[Compare Source](prometheus-community/helm-charts@kube-prometheus-stack-51.9.0...kube-prometheus-stack-51.9.1)

kube-prometheus-stack collects Kubernetes manifests, Grafana dashboards, and Prometheus rules combined with documentation and scripts to provide easy to operate end-to-end Kubernetes cluster monitoring with Prometheus using the Prometheus Operator.

#### What's Changed

-   \[kube-prometheus-stack] ConfigReloader ServiceMonitor HTTP scheme is not set correctly when HTTPS is enabled by [@&#8203;n1kofr](https://github.com/n1kofr) in prometheus-community/helm-charts#3815

#### New Contributors

-   [@&#8203;n1kofr](https://github.com/n1kofr) made their first contribution in prometheus-community/helm-charts#3815

**Full Changelog**: prometheus-community/helm-charts@prometheus-conntrack-stats-exporter-0.5.8...kube-prometheus-stack-51.9.1

</details>

---

### Configuration

📅 **Schedule**: Branch creation - At any time (no schedule defined), Automerge - At any time (no schedule defined).

🚦 **Automerge**: Disabled by config. Please merge this manually once you are satisfied.

♻ **Rebasing**: Whenever PR becomes conflicted, or you tick the rebase/retry checkbox.

🔕 **Ignore**: Close this PR and you won't be reminded about this update again.

---

 - [ ] <!-- rebase-check -->If you want to rebase/retry this PR, check this box

---

This PR has been generated by [Renovate Bot](https://github.com/renovatebot/renovate).
<!--renovate-debug:eyJjcmVhdGVkSW5WZXIiOiIzNy4yNC4wIiwidXBkYXRlZEluVmVyIjoiMzcuMjQuMCIsInRhcmdldEJyYW5jaCI6Im1haW4ifQ==-->

Reviewed-on: https://git.home/nrdufour/home-ops/pulls/159
Co-authored-by: Renovate <renovate@ptinem.io>
Co-committed-by: Renovate <renovate@ptinem.io>
@verejoel
Copy link

This change completely breaks working ServiceMonitor configs with Istio

@GMartinez-Sisti
Copy link
Member

This change completely breaks working ServiceMonitor configs with Istio

Hi @verejoel, can you please report an issue with the details so we can look into it?

@verejoel
Copy link

Sure no problem! Voila: #4039

Matiasmct pushed a commit to giffgaff/prometheus-charts that referenced this pull request Mar 20, 2024
…not set correctly when HTTPS is enabled (prometheus-community#3815)

* Update servicemonitor.yaml

Set HTTP as default scheme (only HTTP is supported by ConfigReloader)

Signed-off-by: Nicolas <60761885+n1kofr@users.noreply.github.com>

* Update servicemonitor.yaml

Force HTTP for ConfigReloader scheme

Signed-off-by: Nicolas <60761885+n1kofr@users.noreply.github.com>

* Update Chart Version

Signed-off-by: Nicolas <60761885+n1kofr@users.noreply.github.com>

---------

Signed-off-by: Nicolas <60761885+n1kofr@users.noreply.github.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.

[kube-prometheus-stack] ServiceMonitor needs separate scheme parameters
4 participants