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 basic-auth fixes #1918

Open
wants to merge 5 commits into
base: main
Choose a base branch
from
Open

Prometheus basic-auth fixes #1918

wants to merge 5 commits into from

Conversation

kflynn
Copy link
Member

@kflynn kflynn commented Jan 31, 2025

Originally by @JadKHaddad in #1659, thanks!

  • Subject: Communication Issue Between Viz and External Prometheus
  • Example without basic auth added. Same changes in 2.14 done
  • Update for 2.14+, and talk about basic-auth Secrets for 2.17 & 2-edge.

JadKHaddad and others added 3 commits January 31, 2025 16:25
Problem: In the documentation explaining the usage of an external Prometheus, the protocol is missing in provided example. This is causing Viz to be unable to establish communication with the external Prometheus, resulting in a "unsupported protocol" error message in the logs.

Solution: added protocol and basic auth to prometheus url

Fixes #1658

Signed-off-by: JadKHaddad <[email protected]>
@kflynn kflynn requested a review from alpeb January 31, 2025 23:03
@kflynn kflynn requested a review from adleong February 4, 2025 15:17
Copy link
Member

@alpeb alpeb left a comment

Choose a reason for hiding this comment

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

Thanks @kflynn !

The manifest lines pointed at in the note under "Prometheus Scrape Configuration" have drifted in the repo. Can you update that? :-)

components can be configured to an external Prometheus URL. This is allowed
both through Helm and the CLI. Additionally, if the external Prometheus is
secured with basic auth, you can retrieve those credentials from a Secret or
include them credentials in the URL.
Copy link
Member

Choose a reason for hiding this comment

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

Suggested change
include them credentials in the URL.
include the credentials in the URL.

If you wish to disable it, be sure to include the
following configuration as well:
Finally, when using an external Prometheus and configuring the `prometheusUrl`
field, Linkerd's Prometheus will still be included in installation unless you
Copy link
Member

Choose a reason for hiding this comment

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

Suggested change
field, Linkerd's Prometheus will still be included in installation unless you
field, Linkerd's Prometheus will still be included in the installation unless you

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.

3 participants