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

chore: follow-up to #11151 and #11025 #11225

Merged
merged 4 commits into from
Nov 14, 2023
Merged

chore: follow-up to #11151 and #11025 #11225

merged 4 commits into from
Nov 14, 2023

Conversation

ashwanthgoli
Copy link
Contributor

@ashwanthgoli ashwanthgoli commented Nov 14, 2023 •
edited
Loading

What this PR does / why we need it:

Which issue(s) this PR fixes:
Fixes #

Special notes for your reviewer:

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. Example PR

@github-actions github-actions bot added area/helm type/docs Issues related to technical documentation; the Docs Squad uses this label across many repositories labels Nov 14, 2023
@ashwanthgoli ashwanthgoli marked this pull request as ready for review November 14, 2023 06:59
@ashwanthgoli ashwanthgoli requested a review from a team as a code owner November 14, 2023 06:59
@github-actions GitHub Actions
Copy link
Contributor

Trivy scan found the following vulnerabilities:

dannykopping
dannykopping reviewed Nov 14, 2023
View reviewed changes
pkg/ruler/base/client_pool.go
@@ -48,27 +48,29 @@ func newRulerClientPool(clientCfg grpcclient.Config, logger log.Logger, reg prom
})

return &rulerClientsPool{
client.NewPool("ruler", poolCfg, nil, newRulerClientFactory(clientCfg, reg), clientsCount, logger),
client.NewPool("ruler", poolCfg, nil, newRulerClientFactory(clientCfg, reg, metricsNamespace), clientsCount, logger),
Copy link
Contributor

Choose a reason for hiding this comment

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

It feels weird to me that we're passing in the metrics namespace all over the codebase. Feels like we should be able to solve this with prometheus.WrapRegistererWithPrefix("loki_", reg) or defining the namespace in one central location as a singleton.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

I remember @MichelHollands tried to make WrapRegistererWithPrefix work. I'll check with him and do this change in a follow-up

Copy link
Contributor

Choose a reason for hiding this comment

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

Cool, works for me

poyzannur
poyzannur approved these changes Nov 14, 2023
View reviewed changes
Copy link
Contributor

@poyzannur poyzannur left a comment

Choose a reason for hiding this comment

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

LGTM in terms of enforce_metric_name removal.

dannykopping
dannykopping approved these changes Nov 14, 2023
View reviewed changes
Copy link
Contributor

@dannykopping dannykopping left a comment

Choose a reason for hiding this comment

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

LGTM

@ashwanthgoli ashwanthgoli merged commit 32e9ee8 into main Nov 14, 2023
10 checks passed
@ashwanthgoli ashwanthgoli deleted the ashwanth/follow-up-11151 branch November 14, 2023 13:21
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)
@JStickler JStickler mentioned this pull request Apr 15, 2024
Closed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@dannykopping dannykopping dannykopping approved these changes

@poyzannur poyzannur poyzannur approved these changes

@paul1r paul1r paul1r approved these changes

Assignees
No one assigned
Labels
area/helm size/M 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.

None yet
4 participants
@ashwanthgoli @dannykopping @poyzannur @paul1r