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

[new] chunk backend: Integrate Alibaba Cloud oss #8410

Merged
merged 27 commits into from
Feb 9, 2023

Conversation

liguozhong
Copy link
Contributor

@liguozhong liguozhong commented Feb 6, 2023

What this PR does / why we need it:

This PR is in preparation for another PR review(https://github.com/grafana/loki/pull/5522), mainly to resolve code conflicts after the merge master branch.
Which issue(s) this PR fixes:
Fixes (#5522)

Special notes for your reviewer:

Checklist

  • Reviewed the CONTRIBUTING.md guide (required)
  • Documentation added
  • Tests updated
  • CHANGELOG.md updated
  • Changes that require user attention or interaction to upgrade are documented in docs/sources/upgrading/_index.md

# Conflicts:
#	docs/sources/configuration/_index.md
#	docs/sources/configuration/examples.md
#	go.mod
#	go.sum
#	pkg/storage/config/schema_config.go
#	pkg/storage/factory.go
#	vendor/modules.txt
@liguozhong liguozhong requested review from JStickler and a team as code owners February 6, 2023 07:51
@github-actions github-actions bot added the type/docs Issues related to technical documentation; the Docs Squad uses this label across many repositories label Feb 6, 2023
Copy link
Member

@owen-d owen-d left a comment

Choose a reason for hiding this comment

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

Please remove the tests file I mentioned, but LGTM!

@@ -0,0 +1,40 @@
package alibaba
Copy link
Member

Choose a reason for hiding this comment

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

Let's remove this file -- it's not regularly run and checks for keys Prom/prometheus which isn't guaranteed to exist. I think it's easier to remove.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

ok

Copy link
Contributor Author

Choose a reason for hiding this comment

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

done.

@liguozhong liguozhong changed the title dot not review [new] chunk backend: Integrate Alibaba Cloud oss Feb 9, 2023
@owen-d owen-d merged commit 1fc00fa into grafana:main Feb 9, 2023
@liguozhong liguozhong deleted the chunk_alibaba_oss branch April 11, 2024 05:58
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
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.

2 participants