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.

Sign up for GitHub

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

Jump to bottom

Use metrics namespace for more metrics #11025

Merged
merged 35 commits into from
Oct 30, 2023
Merged

Use metrics namespace for more metrics #11025

merged 35 commits into from
Oct 30, 2023

Conversation

MichelHollands
Copy link
Contributor

@MichelHollands MichelHollands commented Oct 25, 2023 •
edited
Loading

What this PR does / why we need it:

Use the metrics namespace setting instead of hardcoding to cortex. This is a follow up to (and based on) #11014.

Checklist

  • Reviewed the CONTRIBUTING.md guide (required)
  • Documentation added
  • Tests updated
  • CHANGELOG.md updated
    • If the change is worth mentioning in the release notes, add add-to-release-notes label
  • Changes that require user attention or interaction to upgrade are documented in docs/sources/setup/upgrade/_index.md
  • For Helm chart changes bump the Helm chart version in production/helm/loki/Chart.yaml and update production/helm/loki/CHANGELOG.md and production/helm/loki/README.md. Example PR
  • If the change is deprecating or removing a configuration option, update the deprecated-config.yaml and deleted-config.yaml files respectively in the tools/deprecated-config-checker directory.

MichelHollands and others added 15 commits October 24, 2023 14:58
@MichelHollands
Add metrics namespace
e406484 
Signed-off-by: Michel Hollands <[email protected]>
@MichelHollands
Do not use underscore in metrics namespace param
a63be83 
Signed-off-by: Michel Hollands <[email protected]>
@MichelHollands
Do not use underscore in metrics namespace param
04f1830 
Signed-off-by: Michel Hollands <[email protected]>
@MichelHollands
Add option to specify metrics namespace in migrate
d88cbc3 
Signed-off-by: Michel Hollands <[email protected]>
@MichelHollands
Make cortex the default metrics namespace
1bda0a9 
Signed-off-by: Michel Hollands <[email protected]>
@MichelHollands
Update changelog
ff2a058 
Signed-off-by: Michel Hollands <[email protected]>
@MichelHollands
Add docs update
619b5ee 
Signed-off-by: Michel Hollands <[email protected]>
@MichelHollands
Rename distributor field
f5e4808 
Signed-off-by: Michel Hollands <[email protected]>
@MichelHollands
Add temp image override in docker compose
c0480cc
@MichelHollands
Merge branch 'main' into add_metrics_namespace_setting
0518a76
@MichelHollands
Rename some more metrics starting with cortex
065b45f 
Signed-off-by: Michel Hollands <[email protected]>
@MichelHollands
Change setting to metrics namespace
5b59e91 
Signed-off-by: Michel Hollands <[email protected]>
@MichelHollands
Revert test image
9a4471e 
Signed-off-by: Michel Hollands <[email protected]>
@MichelHollands
Remove change of metrics namespace to loki
f0eddd6 
Signed-off-by: Michel Hollands <[email protected]>
@MichelHollands
Replace cortex namespace with setting
f28d682 
Signed-off-by: Michel Hollands <[email protected]>
@github-actions github-actions bot added the type/docs Issues related to technical documentation; the Docs Squad uses this label across many repositories label Oct 25, 2023
ashwanthgoli
ashwanthgoli reviewed Oct 25, 2023
View reviewed changes
pkg/bloomgateway/client.go Outdated Show resolved Hide resolved
pkg/distributor/clientpool/ingester_client_pool.go Outdated Show resolved Hide resolved
pkg/loki/modules.go Outdated Show resolved Hide resolved
pkg/lokifrontend/frontend/v1/frontend.go Outdated Show resolved Hide resolved
pkg/querier/queryrange/roundtrip.go Outdated Show resolved Hide resolved
pkg/scheduler/scheduler.go Outdated Show resolved Hide resolved
@MichelHollands MichelHollands mentioned this pull request Oct 25, 2023
Closed
8 tasks
@MichelHollands MichelHollands marked this pull request as ready for review October 25, 2023 14:32
@MichelHollands MichelHollands requested a review from a team as a code owner October 25, 2023 14:32
cstyan
cstyan reviewed Oct 25, 2023
View reviewed changes
pkg/queue/metrics.go Outdated Show resolved Hide resolved
salvacorts
salvacorts reviewed Oct 26, 2023
View reviewed changes
pkg/bloomgateway/bloomgateway.go Outdated
@@ -195,7 +195,7 @@ func New(cfg Config, schemaCfg config.SchemaConfig, storageCfg storage.Config, s
pendingTasks: makePendingTasks(pendingTasksInitialCap),
}

g.queueMetrics = queue.NewMetrics("bloom_gateway", reg)
g.queueMetrics = queue.NewMetrics("bloom_gateway", reg, "loki")
Copy link
Contributor

Choose a reason for hiding this comment

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

I think we should have this "loki" string in a constant somewhere. Same for the "cortex" string.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Constants were added. It does look kinda busy though so please have a look.

@MichelHollands
Fix the import order
937ffb8 
Signed-off-by: Michel Hollands <[email protected]>
@MichelHollands
Fix tests and formatting
216be21 
Signed-off-by: Michel Hollands <[email protected]>
ashwanthgoli
ashwanthgoli approved these changes Oct 30, 2023
View reviewed changes
docs/sources/configure/_index.md Outdated Show resolved Hide resolved
@MichelHollands MichelHollands merged commit 8628b15 into main Oct 30, 2023
6 checks passed
@MichelHollands MichelHollands deleted the use_metrics_namespace_for_more_metrics branch October 30, 2023 14:57
ashwanthgoli added a commit that referenced this pull request Nov 14, 2023
@ashwanthgoli
chore: follow-up to #11151 and #11025 (#11225)
32e9ee8 
**What this PR does / why we need it**:

- remove usage of `enforce_metric_name` in ksonnet -
#11151
- make `cortex_ruler_client_request_duration_seconds` prefix
configurable
- updates upgrade guide to remove reference to metrics that loki does
not export

**Which issue(s) this PR fixes**:
Fixes #<issue number>

**Special notes for your reviewer**:

**Checklist**
- [x] Reviewed the
[`CONTRIBUTING.md`](https://github.com/grafana/loki/blob/main/CONTRIBUTING.md)
guide (**required**)
- [ ] Documentation added
- [ ] Tests updated
- [ ] `CHANGELOG.md` updated
- [ ] If the change is worth mentioning in the release notes, add
`add-to-release-notes` label
- [ ] Changes that require user attention or interaction to upgrade are
documented in `docs/sources/setup/upgrade/_index.md`
- [ ] For Helm chart changes bump the Helm chart version in
`production/helm/loki/Chart.yaml` and update
`production/helm/loki/CHANGELOG.md` and
`production/helm/loki/README.md`. [Example
PR](d10549e)
- [ ] If the change is deprecating or removing a configuration option,
update the `deprecated-config.yaml` and `deleted-config.yaml` files
respectively in the `tools/deprecated-config-checker` directory.
[Example
PR](0d4416a)
rhnasc pushed a commit to inloco/loki that referenced this pull request Apr 12, 2024
@MichelHollands @ashwanthgoli @rhnasc
Use metrics namespace for more metrics (grafana#11025)
e55ebf2 
**What this PR does / why we need it**:

Use the metrics namespace setting instead of hardcoding to `cortex`.
This is a follow up to (and based on)
grafana#11014.

**Checklist**
- [x] Reviewed the
[`CONTRIBUTING.md`](https://github.com/grafana/loki/blob/main/CONTRIBUTING.md)
guide (**required**)
- [ ] Documentation added
- [X] Tests updated
- [x] `CHANGELOG.md` updated
- [ ] If the change is worth mentioning in the release notes, add
`add-to-release-notes` label
- [ ] Changes that require user attention or interaction to upgrade are
documented in `docs/sources/setup/upgrade/_index.md`
- [ ] For Helm chart changes bump the Helm chart version in
`production/helm/loki/Chart.yaml` and update
`production/helm/loki/CHANGELOG.md` and
`production/helm/loki/README.md`. [Example
PR](grafana@d10549e)
- [ ] If the change is deprecating or removing a configuration option,
update the `deprecated-config.yaml` and `deleted-config.yaml` files
respectively in the `tools/deprecated-config-checker` directory. <!--
TODO(salvacorts): Add example PR -->

---------

Signed-off-by: Michel Hollands <[email protected]>
Co-authored-by: Ashwanth <[email protected]>
rhnasc pushed a commit to inloco/loki that referenced this pull request Apr 12, 2024
@ashwanthgoli @rhnasc
chore: follow-up to grafana#11151 and grafana#11025 (grafana#11225)
57a56ab 
**What this PR does / why we need it**:

- remove usage of `enforce_metric_name` in ksonnet -
grafana#11151
- make `cortex_ruler_client_request_duration_seconds` prefix
configurable
- updates upgrade guide to remove reference to metrics that loki does
not export

**Which issue(s) this PR fixes**:
Fixes #<issue number>

**Special notes for your reviewer**:

**Checklist**
- [x] Reviewed the
[`CONTRIBUTING.md`](https://github.com/grafana/loki/blob/main/CONTRIBUTING.md)
guide (**required**)
- [ ] Documentation added
- [ ] Tests updated
- [ ] `CHANGELOG.md` updated
- [ ] If the change is worth mentioning in the release notes, add
`add-to-release-notes` label
- [ ] Changes that require user attention or interaction to upgrade are
documented in `docs/sources/setup/upgrade/_index.md`
- [ ] For Helm chart changes bump the Helm chart version in
`production/helm/loki/Chart.yaml` and update
`production/helm/loki/CHANGELOG.md` and
`production/helm/loki/README.md`. [Example
PR](grafana@d10549e)
- [ ] If the change is deprecating or removing a configuration option,
update the `deprecated-config.yaml` and `deleted-config.yaml` files
respectively in the `tools/deprecated-config-checker` directory.
[Example
PR](grafana@0d4416a)
mraboosk pushed a commit to mraboosk/loki that referenced this pull request Oct 7, 2024
@ashwanthgoli
chore: follow-up to grafana#11151 and grafana#11025 (grafana#11225)
bbd184d 
**What this PR does / why we need it**:

- remove usage of `enforce_metric_name` in ksonnet -
grafana#11151
- make `cortex_ruler_client_request_duration_seconds` prefix
configurable
- updates upgrade guide to remove reference to metrics that loki does
not export

**Which issue(s) this PR fixes**:
Fixes #<issue number>

**Special notes for your reviewer**:

**Checklist**
- [x] Reviewed the
[`CONTRIBUTING.md`](https://github.com/grafana/loki/blob/main/CONTRIBUTING.md)
guide (**required**)
- [ ] Documentation added
- [ ] Tests updated
- [ ] `CHANGELOG.md` updated
- [ ] If the change is worth mentioning in the release notes, add
`add-to-release-notes` label
- [ ] Changes that require user attention or interaction to upgrade are
documented in `docs/sources/setup/upgrade/_index.md`
- [ ] For Helm chart changes bump the Helm chart version in
`production/helm/loki/Chart.yaml` and update
`production/helm/loki/CHANGELOG.md` and
`production/helm/loki/README.md`. [Example
PR](grafana@2cef71e)
- [ ] If the change is deprecating or removing a configuration option,
update the `deprecated-config.yaml` and `deleted-config.yaml` files
respectively in the `tools/deprecated-config-checker` directory.
[Example
PR](grafana@0d4416a)
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@ashwanthgoli ashwanthgoli ashwanthgoli approved these changes

@salvacorts salvacorts Awaiting requested review from salvacorts

@cstyan cstyan Awaiting requested review from cstyan

Assignees
No one assigned
Labels
size/XXL type/docs Issues related to technical documentation; the Docs Squad uses this label across many repositories
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
4 participants
@MichelHollands @cstyan @ashwanthgoli @salvacorts