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

fix(helm): fix queryScheduler servicemonitor #12753

Merged
merged 5 commits into from
May 24, 2024

Conversation

rlex
Copy link
Contributor

@rlex rlex commented Apr 23, 2024

What this PR does / why we need it:
Loki Query Scheduler had wrong targetPort for metrics port, which caused serviceMonitor to miss it.

Which issue(s) this PR fixes:
N/A

Special notes for your reviewer:

Checklist

  • Reviewed the CONTRIBUTING.md guide (required)
  • Documentation added
  • Tests updated
  • Title matches the required conventional commits format, see here
  • 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

@rlex rlex requested a review from a team as a code owner April 23, 2024 12:56
@CLAassistant
Copy link

CLAassistant commented Apr 23, 2024

CLA assistant check
All committers have signed the CLA.

@rlex rlex changed the title [helm] fix queryScheduler servicemonitor fix(helm): fix queryScheduler servicemonitor Apr 23, 2024
@JStickler
Copy link
Contributor

Please also bump the version number in production/helm/loki/README.md.

@rlex
Copy link
Contributor Author

rlex commented Apr 23, 2024

done

@rlex
Copy link
Contributor Author

rlex commented May 23, 2024

Any chance it will be merged? Along with #12766

@MichelHollands MichelHollands merged commit 8101e21 into grafana:main May 24, 2024
61 checks passed
@@ -21,7 +21,7 @@ spec:
ports:
- name: http-metrics
port: 3100
targetPort: http
targetPort: http-metrics
Copy link

Choose a reason for hiding this comment

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

Do we have the same issue for service-query-frontend-headless.yaml?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

1ab9d27 looks like it was fixed just recently

mraboosk pushed a commit to mraboosk/loki that referenced this pull request Oct 7, 2024
Co-authored-by: Michel Hollands <42814411+MichelHollands@users.noreply.github.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants