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

Make build-in prom compatible with mergeMetrics feature #1192

Merged
merged 3 commits into from
Nov 21, 2024

Conversation

ciiiii
Copy link
Member

@ciiiii ciiiii commented Nov 21, 2024

Motivation

Allow external non-Istio prometheus and build-in prometheus to scrape Pulsar metrics simultaneously

Modifications

  • Disable Istio Injection on Prom and Grafana when mergeMetrics enabled
  • Scrape Metrics with http when mergeMetrics enabled

Verifying this change

  • Make sure that the change passes the CI checks.

This change is a trivial rework / code cleanup without any test coverage.

Documentation

Check the box below.

Need to update docs?

  • doc-required

    (If you need help on updating docs, create a doc issue)

  • no-need-doc

    (Please explain why)

  • doc

    (If this PR contains doc changes)

@ciiiii ciiiii requested review from a team as code owners November 21, 2024 08:21
@github-actions github-actions bot added the no-need-doc This pr does not need any document label Nov 21, 2024
@ericsyh ericsyh merged commit d0965ba into master Nov 21, 2024
3 checks passed
@ericsyh ericsyh deleted the yscai/istio-merge-metrics branch November 21, 2024 14:58
ericsyh pushed a commit that referenced this pull request Nov 22, 2024
* Make buildin prom compatible with mergeMetrics feature

* Disable prom Istio when mergeMetrics

* Disable prom Istio when mergeMetrics

(cherry picked from commit d0965ba)
ericsyh pushed a commit that referenced this pull request Nov 22, 2024
* Make buildin prom compatible with mergeMetrics feature

* Disable prom Istio when mergeMetrics

* Disable prom Istio when mergeMetrics

(cherry picked from commit d0965ba)
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
no-need-doc This pr does not need any document
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants