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

metrics-generator: don't inject X-Scope-OrgID header for single-tenant setups #1417

Conversation

yvrhdn
Copy link
Member

@yvrhdn yvrhdn commented May 2, 2022

What this PR does:
The metrics-generator will always inject the X-Scope-OrgID header set to the current tenant. This doesn't make sense when run in single tenant modus.

Which issue(s) this PR fixes:
Fixes #

Checklist

  • Tests updated
  • Documentation added
  • CHANGELOG.md updated - the order of entries should be [CHANGE], [FEATURE], [ENHANCEMENT], [BUGFIX]

@yvrhdn yvrhdn merged commit 046319f into grafana:main May 2, 2022
@yvrhdn yvrhdn deleted the kvrhdn/metrics-generator-single-tenant-x-scope-orgid-header branch May 2, 2022 15:10
mapno pushed a commit that referenced this pull request May 5, 2022
…t setups (#1417)

* metrics-generator: don't inject X-Scope-OrgID header for single-tenant setups

* Update CHANGELOG.md
joe-elliott added a commit that referenced this pull request Jun 13, 2022
…ers based on the trace id hashes instead of all healthy ingesters (#1484)

* metrics-generator: don't inject X-Scope-OrgID header for single-tenant setups (#1417)

* metrics-generator: don't inject X-Scope-OrgID header for single-tenant setups

* Update CHANGELOG.md

* Fix compactor missing compaction_objects_combined_total metric and not honoring max_bytes_per_trace  (#1420)

* Fix compactor to record compaction_objects_combined_total and honor max_bytes_per_trace again

* changelog

* distributor: prevent panics when concurrently calling  to forwarder's… (#1422)

* distributor: prevent panics when concurrently calling  to forwarder's queueManager

* Update PR number

* Pin k6 version to v0.37.0

* update querier to get ingester instance based on trace id

* rebase with main

* added change log for the config

* update config name as per PR comments

* Doc tweak

Signed-off-by: Joe Elliott <number101010@gmail.com>

Co-authored-by: Koenraad Verheyden <koenraad.verheyden@grafana.com>
Co-authored-by: Martin Disibio <martin.disibio@grafana.com>
Co-authored-by: Mario <mariorvinas@gmail.com>
Co-authored-by: Joe Elliott <number101010@gmail.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.

2 participants