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

Support GET for /ingester/shutdown #11477

Merged
merged 4 commits into from
Dec 14, 2023
Merged

Support GET for /ingester/shutdown #11477

merged 4 commits into from
Dec 14, 2023

Conversation

MichelHollands
Copy link
Contributor

@MichelHollands MichelHollands commented Dec 13, 2023 •
edited
Loading

Which issue(s) this PR fixes:
Fixes #11431

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

@MichelHollands
Support GET for /ingester/shutdown
8c2842c 
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 Dec 13, 2023
@MichelHollands
Update changelog
9680bb3 
Signed-off-by: Michel Hollands <[email protected]>
@github-actions GitHub Actions
Copy link
Contributor

github-actions bot commented Dec 13, 2023 •
edited
Loading

Trivy scan found the following vulnerabilities:

  • HIGH, Target: docker.io/grafana/loki:main-8822ae6 (alpine 3.18.4), Type: alpine openssl: Incorrect cipher key and IV length processing in libcrypto3 v3.1.3-r0. Fixed in v3.1.4-r0
  • HIGH, Target: docker.io/grafana/loki:main-8822ae6 (alpine 3.18.4), Type: alpine openssl: Incorrect cipher key and IV length processing in libssl3 v3.1.3-r0. Fixed in v3.1.4-r0
    \nTo see more details on these vulnerabilities, and how/where to fix them, please run docker build -t grafana/loki:main-8822ae6 -f cmd/loki/Dockerfile .
    trivy i grafana/loki:main-8822ae6 on your branch. If these were not introduced by your PR, please considering fixing them in via a subsequent PR. Thanks!

@MichelHollands MichelHollands marked this pull request as ready for review December 13, 2023 16:46
@MichelHollands MichelHollands requested a review from a team as a code owner December 13, 2023 16:46
paul1r
paul1r approved these changes Dec 13, 2023
View reviewed changes
Copy link
Collaborator

@paul1r paul1r left a comment

Choose a reason for hiding this comment

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

lgtm

@andresperezl
Copy link
Contributor

Will the update to the chart template (which still uses the deprecated flush_shutdown) endpoint come later?

@andresperezl andresperezl mentioned this pull request Dec 13, 2023
Closed
8 tasks
@MichelHollands
Copy link
Contributor Author

MichelHollands commented Dec 14, 2023 •
edited
Loading

Will the update to the chart template (which still uses the deprecated flush_shutdown) endpoint come later?

@andresperezl If you create a PR I'll merge it :)

@MichelHollands MichelHollands merged commit 37a0ed6 into main Dec 14, 2023
8 checks passed
@MichelHollands MichelHollands deleted the support_get_for_ingester_shutdown branch December 14, 2023 14:49
@andresperezl
Copy link
Contributor

@MichelHollands I opened the PR here #11490, I guess we still need to wait for the next loki release for this change to be available

rhnasc pushed a commit to inloco/loki that referenced this pull request Apr 12, 2024
@MichelHollands @rhnasc
Support GET for /ingester/shutdown (grafana#11477)
56d5822 
**Which issue(s) this PR fixes**:
Fixes grafana#11431 

**Checklist**
- [X] Reviewed the
[`CONTRIBUTING.md`](https://github.com/grafana/loki/blob/main/CONTRIBUTING.md)
guide (**required**)
- [X] Documentation added
- [ ] 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.
[Example
PR](grafana@0d4416a)

---------

Signed-off-by: Michel Hollands <[email protected]>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@paul1r paul1r paul1r approved these changes

@JordanRushing JordanRushing JordanRushing approved these changes

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

Make /ingester/shutdown endpoint work with GET
4 participants
@MichelHollands @andresperezl @JordanRushing @paul1r