Skip to content

Transition ruler to use Thanos bucket clients #2543

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

Conversation

jtlisi
Copy link
Contributor

@jtlisi jtlisi commented Apr 29, 2020

What this PR does:

As a next step for #2262 this PR transitions the ruler to using the Thanos bucket client instead of the chunk object client.

The swift integration tests were removed since the client library Thanos uses no longer supports the Auth protocol of the image we are using for integration tests:
Thanos Upstream Client
Docker Image

Which issue(s) this PR fixes:
Related: #2262

Checklist

  • Tests updated
  • Documentation added
  • CHANGELOG.md updated - the order of entries should be [CHANGE], [FEATURE], [ENHANCEMENT], [BUGFIX]

@jtlisi jtlisi changed the title 20200420 migrate ruler thanos objstore Transition ruler to use Thanos bucket clients Apr 29, 2020
@jtlisi jtlisi force-pushed the 20200420_migrate_ruler_thanos_objstore branch from 2375c26 to e5de464 Compare April 30, 2020 01:24
Comment on lines +6 to +18
* Removed `-ruler.storage.azure.download-buffer-size`
* Removed `-ruler.storage.azure.upload-buffer-size`
* Added `-ruler.storage.azure.endpoint-suffix`
* Added `-ruler.storage.azure.max-retries`
* Changed `-ruler.storage.gcs.bucketname` > `-ruler.storage.gcs.bucket-name`
* Removed `-ruler.storage.gcs.chunk-buffer-size`
* Removed `-ruler.storage.gcs.request-timeout`
* Added `-ruler.storage.gcs.service-account`
* Changed `-ruler.storage.s3.url` > `-ruler.storage.s3.endpoint`, credentials are no longer url encoded and in-memory is no longer an option
* Changed `-ruler.storage.s3.buckets` > `-ruler.storage.s3.bucket-name`, multiple buckets can no longer be specified
* Added `-ruler.storage.s3.secret-access-key`
* Added `-ruler.storage.s3.access-key-id`
* Added `-ruler.storage.s3.insecure`
Copy link
Contributor

Choose a reason for hiding this comment

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

Is this compatible with 1.x guarantees? It says that Ruler API is experimental, but Ruler itself is not.

so we will will keep deprecated flags around for 2 minor release

Copy link
Contributor Author

Choose a reason for hiding this comment

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

In order to use object storage with the ruler you need to use the experimental API. Since these configs are directly tied to the experimental API I think they should be safe to change.

GCS gcp.GCSConfig `yaml:"gcs"`
S3 aws.S3Config `yaml:"s3"`
Swift openstack.SwiftConfig `yaml:"swift"`
S3 s3.Config `yaml:"s3"`
Copy link
Contributor

Choose a reason for hiding this comment

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

Super silly thing. Would you mind keeping the same order as before? Will help to simplify the configuration-file-reference.md diff, to easily spot all the changes in the config.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Yea, sure thing. I got a bit over eager and decided to make it alphabetical for no reason in particular

@jtlisi jtlisi force-pushed the 20200420_migrate_ruler_thanos_objstore branch from e5de464 to ae75042 Compare May 7, 2020 19:00
@jtlisi jtlisi mentioned this pull request May 28, 2020
2 tasks
@jtlisi
Copy link
Contributor Author

jtlisi commented Jun 1, 2020

Closing for now

@jtlisi jtlisi closed this Jun 1, 2020
@jtlisi jtlisi reopened this Aug 28, 2020
@jtlisi
Copy link
Contributor Author

jtlisi commented Aug 28, 2020

I only reopened to see what conflicts exist.

@jtlisi jtlisi closed this Aug 28, 2020
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants