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

[k102] Backport Remove whole stream deletion mode (#6435) #6477

Merged
merged 4 commits into from
Jun 23, 2022

Conversation

MichelHollands
Copy link
Contributor

  • Remove whole-stream-deletion mode

Signed-off-by: Michel Hollands michel.hollands@grafana.com

  • Remove whole-stream-deletion from docs

Signed-off-by: Michel Hollands michel.hollands@grafana.com

  • Update the changelog

Signed-off-by: Michel Hollands michel.hollands@grafana.com

  • Sort changelog entries

Signed-off-by: Michel Hollands michel.hollands@grafana.com

  • Remove link to wrong configuration

Signed-off-by: Michel Hollands michel.hollands@grafana.com

  • Fix integration test

Signed-off-by: Michel Hollands michel.hollands@grafana.com

  • Set default deletion mode to disabled

Signed-off-by: Michel Hollands michel.hollands@grafana.com

  • Remove extra white line in documentation

Signed-off-by: Michel Hollands michel.hollands@grafana.com

  • Fix default value in docs

Signed-off-by: Michel Hollands michel.hollands@grafana.com

  • Fix changelog

Signed-off-by: Michel Hollands michel.hollands@grafana.com

  • Add DeletionEnabled method on mode

Signed-off-by: Michel Hollands michel.hollands@grafana.com

  • Rename test

Signed-off-by: Michel Hollands michel.hollands@grafana.com
(cherry picked from commit f80e487)

What this PR does / why we need it:

Which issue(s) this PR fixes:
Fixes #

Special notes for your reviewer:

Checklist

  • Documentation added
  • Tests updated
  • Is this an important fix or new feature? Add an entry in the CHANGELOG.md.
  • Changes that require user attention or interaction to upgrade are documented in docs/sources/upgrading/_index.md

* Remove whole-stream-deletion mode

Signed-off-by: Michel Hollands <michel.hollands@grafana.com>

* Remove whole-stream-deletion from docs

Signed-off-by: Michel Hollands <michel.hollands@grafana.com>

* Update the changelog

Signed-off-by: Michel Hollands <michel.hollands@grafana.com>

* Sort changelog entries

Signed-off-by: Michel Hollands <michel.hollands@grafana.com>

* Remove link to wrong configuration

Signed-off-by: Michel Hollands <michel.hollands@grafana.com>

* Fix integration test

Signed-off-by: Michel Hollands <michel.hollands@grafana.com>

* Set default deletion mode to disabled

Signed-off-by: Michel Hollands <michel.hollands@grafana.com>

* Remove extra white line in documentation

Signed-off-by: Michel Hollands <michel.hollands@grafana.com>

* Fix default value in docs

Signed-off-by: Michel Hollands <michel.hollands@grafana.com>

* Fix changelog

Signed-off-by: Michel Hollands <michel.hollands@grafana.com>

* Add DeletionEnabled method on mode

Signed-off-by: Michel Hollands <michel.hollands@grafana.com>

* Rename test

Signed-off-by: Michel Hollands <michel.hollands@grafana.com>
(cherry picked from commit f80e487)
MichelHollands and others added 2 commits June 23, 2022 13:12
Signed-off-by: Michel Hollands <michel.hollands@grafana.com>
@grafanabot
Copy link
Collaborator

./tools/diff_coverage.sh ../loki-main/test_results.txt test_results.txt ingester,distributor,querier,querier/queryrange,iter,storage,chunkenc,logql,loki

Change in test coverage per package. Green indicates 0 or positive change, red indicates that test coverage for a package fell.

+           ingester	0.4%
+        distributor	0.3%
-            querier	-0.3%
- querier/queryrange	-0.1%
+               iter	0%
+            storage	0%
+           chunkenc	0%
+              logql	0.2%
-               loki	-1.2%

Signed-off-by: Michel Hollands <michel.hollands@grafana.com>
@grafanabot
Copy link
Collaborator

./tools/diff_coverage.sh ../loki-main/test_results.txt test_results.txt ingester,distributor,querier,querier/queryrange,iter,storage,chunkenc,logql,loki

Change in test coverage per package. Green indicates 0 or positive change, red indicates that test coverage for a package fell.

+           ingester	0.4%
-        distributor	-0.3%
-            querier	-0.3%
+ querier/queryrange	0%
+               iter	0%
+            storage	0%
+           chunkenc	0%
+              logql	0.2%
-               loki	-1.2%

@MichelHollands MichelHollands merged commit da3fbd9 into grafana:k102 Jun 23, 2022
@vlad-diachenko vlad-diachenko added the backport release-2.6.x Tag a PR with this label to create a PR which cherry pics it into the release-2.6.x branch label Jun 24, 2022
@grafanabot
Copy link
Collaborator

The backport to release-2.6.x failed:

The process '/usr/bin/git' failed with exit code 1

To backport manually, run these commands in your terminal:

# Fetch latest updates from GitHub
git fetch
# Create a new branch
git switch --create backport-6477-to-release-2.6.x origin/release-2.6.x
# Cherry-pick the merged commit of this pull request and resolve the conflicts
git cherry-pick -x da3fbd965bd4d1f31130dacaa2d1e1dff388321f
# Push it to GitHub
git push --set-upstream origin backport-6477-to-release-2.6.x
git switch main
# Remove the local backport branch
git branch -D backport-6477-to-release-2.6.x

Then, create a pull request where the base branch is release-2.6.x and the compare/head branch is backport-6477-to-release-2.6.x.

@vlad-diachenko vlad-diachenko added backport release-2.6.x Tag a PR with this label to create a PR which cherry pics it into the release-2.6.x branch and removed backport release-2.6.x Tag a PR with this label to create a PR which cherry pics it into the release-2.6.x branch labels Jun 24, 2022
grafanabot pushed a commit that referenced this pull request Jun 24, 2022
* Remove whole stream deletion mode (#6435)

* Remove whole-stream-deletion mode

Signed-off-by: Michel Hollands <michel.hollands@grafana.com>

* Remove whole-stream-deletion from docs

Signed-off-by: Michel Hollands <michel.hollands@grafana.com>

* Update the changelog

Signed-off-by: Michel Hollands <michel.hollands@grafana.com>

* Sort changelog entries

Signed-off-by: Michel Hollands <michel.hollands@grafana.com>

* Remove link to wrong configuration

Signed-off-by: Michel Hollands <michel.hollands@grafana.com>

* Fix integration test

Signed-off-by: Michel Hollands <michel.hollands@grafana.com>

* Set default deletion mode to disabled

Signed-off-by: Michel Hollands <michel.hollands@grafana.com>

* Remove extra white line in documentation

Signed-off-by: Michel Hollands <michel.hollands@grafana.com>

* Fix default value in docs

Signed-off-by: Michel Hollands <michel.hollands@grafana.com>

* Fix changelog

Signed-off-by: Michel Hollands <michel.hollands@grafana.com>

* Add DeletionEnabled method on mode

Signed-off-by: Michel Hollands <michel.hollands@grafana.com>

* Rename test

Signed-off-by: Michel Hollands <michel.hollands@grafana.com>
(cherry picked from commit f80e487)

* Fix changelog

Signed-off-by: Michel Hollands <michel.hollands@grafana.com>

* Fix changelog link

Signed-off-by: Michel Hollands <michel.hollands@grafana.com>
(cherry picked from commit da3fbd9)
vlad-diachenko pushed a commit that referenced this pull request Jun 24, 2022
)

* Remove whole stream deletion mode (#6435)

* Remove whole-stream-deletion mode

Signed-off-by: Michel Hollands <michel.hollands@grafana.com>

* Remove whole-stream-deletion from docs

Signed-off-by: Michel Hollands <michel.hollands@grafana.com>

* Update the changelog

Signed-off-by: Michel Hollands <michel.hollands@grafana.com>

* Sort changelog entries

Signed-off-by: Michel Hollands <michel.hollands@grafana.com>

* Remove link to wrong configuration

Signed-off-by: Michel Hollands <michel.hollands@grafana.com>

* Fix integration test

Signed-off-by: Michel Hollands <michel.hollands@grafana.com>

* Set default deletion mode to disabled

Signed-off-by: Michel Hollands <michel.hollands@grafana.com>

* Remove extra white line in documentation

Signed-off-by: Michel Hollands <michel.hollands@grafana.com>

* Fix default value in docs

Signed-off-by: Michel Hollands <michel.hollands@grafana.com>

* Fix changelog

Signed-off-by: Michel Hollands <michel.hollands@grafana.com>

* Add DeletionEnabled method on mode

Signed-off-by: Michel Hollands <michel.hollands@grafana.com>

* Rename test

Signed-off-by: Michel Hollands <michel.hollands@grafana.com>
(cherry picked from commit f80e487)

* Fix changelog

Signed-off-by: Michel Hollands <michel.hollands@grafana.com>

* Fix changelog link

Signed-off-by: Michel Hollands <michel.hollands@grafana.com>
(cherry picked from commit da3fbd9)

Co-authored-by: Michel Hollands <42814411+MichelHollands@users.noreply.github.com>
@osg-grafana osg-grafana added type/docs Issues related to technical documentation; the Docs Squad uses this label across many repositories and removed area/docs labels Oct 19, 2022
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
backport release-2.6.x Tag a PR with this label to create a PR which cherry pics it into the release-2.6.x branch size/L type/docs Issues related to technical documentation; the Docs Squad uses this label across many repositories
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants