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

Import cortex-jsonnet into mimir repo #506

Merged
merged 304 commits into from
Dec 20, 2021
Merged

Import cortex-jsonnet into mimir repo #506

merged 304 commits into from
Dec 20, 2021

Conversation

simonswine
Copy link
Contributor

@simonswine simonswine commented Nov 18, 2021 •
edited
Loading

As discussed at the project weekly meeting, we would like to bring the jsonnet for Mimir into the project itself.

There is a bit more work required:

  • Ensure we are running the same CI as the cortex-jsonnet project
  • Bring over the CHANGELOG

pracucci and others added 30 commits June 16, 2020 14:09
@pracucci
Added mega_user class
a2c2f28 
Signed-off-by: Marco Pracucci <marco@pracucci.com>
@pracucci
Merge pull request grafana/cortex-jsonnet#94 from grafana/add-mega-user
3363cea 
Added mega_user class
@pracucci
Fine-tune blocks storage config
1815a63 
Signed-off-by: Marco Pracucci <marco@pracucci.com>
@pracucci
Merge pull request grafana/cortex-jsonnet#96 from grafana/fine-tune-c…
3964f49 
…ortex-blocks-config

Fine-tune blocks storage config
@amckinley
Disable tests by default to fix README instructions
41aa70d 
Ref grafana/cortex-jsonnet#95
@tomwilkie
Merge pull request grafana/cortex-jsonnet#97 from amckinley/patch-1
b87ec2f 
Disable tests by default to fix README instructions
@pracucci
Run store-gateway without CPU limits
bf55175 
Signed-off-by: Marco Pracucci <marco@pracucci.com>
@pracucci
Merge pull request grafana/cortex-jsonnet#103 from grafana/run-store-…
443de56 
…gateway-without-cpu-limit

Run store-gateway without CPU limits
@jtlisi
Merge branch 'master' into add-clarifying-comment
f4195ef
@jtlisi
Merge pull request grafana/cortex-jsonnet#52 from weeco/add-clarifyin…
e5820c5 
…g-comment

Fixes grafana/cortex-jsonnet#49

Linting job was not triggered from circleCI. However, this is a small comment only change.
@amckinley @tomwilkie
Use v1 API for Deployment and StatefulSet resources
04d14d0
@amckinley @tomwilkie
Version bump to v1.1.0
30d37b9
@gouthamve
Merge pull request grafana/cortex-jsonnet#110 from amckinley/version-…
af82850 
…bump

Version bump to v1.1.0
@amckinley @tomwilkie
Actually include the ruler
32e2308
@amckinley @tomwilkie
Update config option name
42e05b4
@tomwilkie
Merge pull request grafana/cortex-jsonnet#112 from amckinley/add-ruler
6f5c7f1 
Actually include the ruler
@pstibrany
Added ruler_enabled and alertmanager_enabled flags. (grafana/cortex-j…
56f59b2 
…sonnet#116)
@joe-elliott
Added publish not ready addresses
82ab771 
Signed-off-by: Joe Elliott <number101010@gmail.com>
@pracucci
Removed -experimental.tsdb.store-gateway-enabled flag
78e222b 
Signed-off-by: Marco Pracucci <marco@pracucci.com>
@joe-elliott
Added a discovery svc and pointed the querier service at itself
fbe8643 
Signed-off-by: Joe Elliott <number101010@gmail.com>
@joe-elliott
lint
a2e2b22 
Signed-off-by: Joe Elliott <number101010@gmail.com>
@pracucci
Added PodDisruptionBudget for store-gateway
a02b59c 
Signed-off-by: Marco Pracucci <marco@pracucci.com>
@pracucci
Allow to configure the blocks replication factor
deb23b3 
Signed-off-by: Marco Pracucci <marco@pracucci.com>
@pracucci
Switch store-gateway StatefulSets to Parallel Pod Management
e36c2af 
Signed-off-by: Marco Pracucci <marco@pracucci.com>
@pracucci
Merge pull request grafana/cortex-jsonnet#125 from grafana/add-store-…
7c774cd 
…gateway-pdb

Add store-gateway pod disruption budget
@pstibrany
Ruler should use metadata cache as well, if configured. (grafana/cort…
a9ca8e8 
…ex-jsonnet#128)

Ruler instantiates querier internally, so it can use metadata cache.
@pracucci
Merge pull request grafana/cortex-jsonnet#126 from grafana/switch-sto…
b5b38c2 
…re-gateway-to-parallel-pod-management

Switch store-gateway StatefulSets to Parallel Pod Management
@joe-elliott
Merge pull request grafana/cortex-jsonnet#118 from grafana/query-fron…
7546759 
…tend-not-ready-addresses

Added publish not ready addresses
@pracucci
Allow to customize ingester disk size and class
e259402 
Signed-off-by: Marco Pracucci <marco@pracucci.com>
@pracucci
Merge pull request grafana/cortex-jsonnet#136 from grafana/allow-to-c…
1a03df7 
…ustomize-ingester-disk

Allow to customize ingester disk size and class
pracucci
pracucci reviewed Nov 18, 2021
View reviewed changes
Copy link
Collaborator

@pracucci pracucci left a comment

Choose a reason for hiding this comment

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

What do you think about importing the CHANGELOG too?

pracucci
pracucci reviewed Nov 18, 2021
View reviewed changes
Copy link
Collaborator

@pracucci pracucci left a comment

Choose a reason for hiding this comment

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

We should also lint it in CI 🙏

pracucci and others added 9 commits November 22, 2021 11:03
@pracucci
Upstream some config improvements
e7759ad 
Signed-off-by: Marco Pracucci <marco@pracucci.com>
@pracucci
Increased max connections for memcached chunks and index-queries too
2bbb7de 
Signed-off-by: Marco Pracucci <marco@pracucci.com>
@pracucci
Merge pull request grafana/cortex-jsonnet#420 from grafana/backport-i…
a1c68bd 
…mprovements

Upstream some config improvements
@stevesg
Ruler: Pass -ruler-storage.s3.endpoint to ruler when using S3.
2b1e021 
This argument is is required, without it, the following error appears:

```
no s3 endpoint in config file
```
@stevesg
Merge pull request grafana/cortex-jsonnet#421 from stevesg/fix-ruler-s3
ec2c846 
Ruler: Pass `-ruler-storage.s3.endpoint` to ruler when using S3.
@pracucci
Allow to create custom store-gateway StatefulSets via newStoreGateway…
3c98410 
…StatefulSet()

Signed-off-by: Marco Pracucci <marco@pracucci.com>
@pracucci
Merge pull request grafana/cortex-jsonnet#424 from grafana/allow-to-c…
c592bfb 
…lone-store-gateway-statefulset

Allow to create custom store-gateway StatefulSets via newStoreGatewayStatefulSet()
@pracucci
Fix newStoreGatewayStatefulSet() to use input container
bb2c109 
Signed-off-by: Marco Pracucci <marco@pracucci.com>
@pracucci
Merge pull request grafana/cortex-jsonnet#425 from grafana/fix-newSto…
f686b05 
…reGatewayStatefulSet

Fix newStoreGatewayStatefulSet() to use input container
@pracucci pracucci force-pushed the 20211118_import-cortex-jsonnet branch from 1093ccf to 7341e4c Compare December 20, 2021 10:04
@pracucci
Copy link
Collaborator

I just pushed a commit to rebase main.

@simonswine simonswine force-pushed the 20211118_import-cortex-jsonnet branch from 41d8d8b to 65398c0 Compare December 20, 2021 12:10
@simonswine
Copy link
Contributor Author

I just pushed a commit to rebase main.

I have rebase onto latest mimir/main and renamed operations/jsonnet to operations/mimir. This change will make it easier to use legacy imports in jsonnet bundler, but will make us no longer align with the folder format of grafana/tempo.

@simonswine
Copy link
Contributor Author

The CI Jsonnet format check is now also in place.

What do you think about importing the CHANGELOG too?

@pracucci Would you like to maintain those as part of the /CHANGELOG.md or should it be in a separate file under /operations/CHANGELOG.md or even more granular in /operations/mimir-mixin/CHANGELOG.md and /operations/mimir/CHANGELOG.md.

@pracucci
Copy link
Collaborator

The CI Jsonnet format check is now also in place.

What do you think about importing the CHANGELOG too?

@pracucci Would you like to maintain those as part of the /CHANGELOG.md or should it be in a separate file under /operations/CHANGELOG.md or even more granular in /operations/mimir-mixin/CHANGELOG.md and /operations/mimir/CHANGELOG.md.

I would keep it simple and add it to /CHANGELOG.md for now (under a different section, like we did for the mixin). Then we can discuss with the rest of the team whether splitting it or not.

@pracucci
Imported cortex-jsonnet CHANGELOG entries from 1.9.0
82a04e3 
Signed-off-by: Marco Pracucci <marco@pracucci.com>
@pracucci pracucci marked this pull request as ready for review December 20, 2021 14:06
@pracucci
Copy link
Collaborator

The CI Jsonnet format check is now also in place.

What do you think about importing the CHANGELOG too?

@pracucci Would you like to maintain those as part of the /CHANGELOG.md or should it be in a separate file under /operations/CHANGELOG.md or even more granular in /operations/mimir-mixin/CHANGELOG.md and /operations/mimir/CHANGELOG.md.

I've import CHANGELOG entries since cortex-jsonnet 1.9.0 both for the mixin and jsonnet.

simonswine
simonswine commented Dec 20, 2021
View reviewed changes
CHANGELOG.md Outdated Show resolved Hide resolved
simonswine
simonswine commented Dec 20, 2021
View reviewed changes
CHANGELOG.md Outdated Show resolved Hide resolved
@pracucci
Improved CHANGELOG header
930ec05 
Signed-off-by: Marco Pracucci <marco@pracucci.com>
pracucci
pracucci approved these changes Dec 20, 2021
View reviewed changes
Copy link
Collaborator

@pracucci pracucci left a comment

Choose a reason for hiding this comment

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

Thanks!

@pracucci pracucci merged commit 529646f into main Dec 20, 2021
@pracucci pracucci deleted the 20211118_import-cortex-jsonnet branch December 20, 2021 14:30
@pracucci pracucci mentioned this pull request Dec 20, 2021
Merged
3 tasks
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@pracucci pracucci pracucci approved these changes

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.