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

Update Cortex to latest master #1869

Merged
merged 8 commits into from
Apr 14, 2020
Merged

Update Cortex to latest master #1869

merged 8 commits into from
Apr 14, 2020

Conversation

pstibrany
Copy link
Member

@pstibrany pstibrany commented Mar 31, 2020

What this PR does / why we need it: This PR once again updates Cortex in Loki to latest master (just before cutting 1.0 version). Changelog since last Cortex update (just after 0.7 release) is massive and may require documentation changes (not yet done in this PR).

Cortex 1.0 changelog: https://cortexmetrics.io/docs/changelog/#1-0-0-2020-04-02

Checklist

  • Documentation added
  • Tests updated

@pstibrany pstibrany changed the title Cortex master Update Cortex to latest master Mar 31, 2020
@pstibrany pstibrany mentioned this pull request Mar 31, 2020
2 tasks
@codecov-io
Copy link

Codecov Report

Merging #1869 into master will not change coverage by %.
The diff coverage is 0.00%.

Impacted file tree graph

@@           Coverage Diff           @@
##           master    #1869   +/-   ##
=======================================
  Coverage   64.64%   64.64%           
=======================================
  Files         125      125           
  Lines        9462     9462           
=======================================
  Hits         6117     6117           
  Misses       2921     2921           
  Partials      424      424           
Impacted Files Coverage Δ
pkg/loki/modules.go 12.78% <0.00%> (ø)

Signed-off-by: Peter Štibraný <peter.stibrany@grafana.com>
Signed-off-by: Peter Štibraný <peter.stibrany@grafana.com>
Signed-off-by: Peter Štibraný <peter.stibrany@grafana.com>
Signed-off-by: Peter Štibraný <peter.stibrany@grafana.com>
Signed-off-by: Peter Štibraný <peter.stibrany@grafana.com>
Signed-off-by: Peter Štibraný <peter.stibrany@grafana.com>
Signed-off-by: Peter Štibraný <peter.stibrany@grafana.com>
Signed-off-by: Peter Štibraný <peter.stibrany@grafana.com>
@pstibrany pstibrany marked this pull request as ready for review April 8, 2020 15:42
@pstibrany
Copy link
Member Author

I think this is ready for review (@owen-d @cyriltovena). When deploying to kubernetes via Tanka, make sure to vendor updated json files first.

@pstibrany
Copy link
Member Author

I could use some help with Helm chart tests failing...

Unable to parse config: /etc/promtail/promtail.yaml: yaml: unmarshal errors:
  line 3: field max_period not found in type util.BackoffConfig
  line 4: field max_retries not found in type util.BackoffConfig
  line 5: field min_period not found in type util.BackoffConfig

New promtail configuration uses max_period, max_retries and min_period, but it seems that this test uses older promtail?

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.

Thanks for the PR. I'm not sure what we should do about the breaking config changes wrt our version number.

Additionally I'm considering writing a config file migration tool. I'd love to get some other opinions here.

@@ -152,7 +152,13 @@ func (m *mockChunkStore) GetChunkRefs(ctx context.Context, userID string, from,
}
refs = append(refs, r)
}
f, err := chunk.NewChunkFetcher(cache.Config{}, false, m.client)

cache, err := cache.New(cache.Config{Prefix: "chunks"})
Copy link
Member

Choose a reason for hiding this comment

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

the prefix was previously set in chunk.NewChunkFetcher. I like the explicit nature of this more 👍

@@ -6,6 +6,16 @@ Unfortunately Loki is software and software is hard and sometimes things are not

On this page we will document any upgrade issues/gotchas/considerations we are aware of.

## 1.5.0
Copy link
Member

Choose a reason for hiding this comment

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

I'm torn - Cortex included many breaking changes in it's major (1.0) release. Should we increment to 2.0 here?

@owen-d owen-d merged commit 6d5408c into grafana:master Apr 14, 2020
mraboosk pushed a commit to mraboosk/loki that referenced this pull request Oct 7, 2024
* Update Cortex to master

Signed-off-by: Peter Štibraný <peter.stibrany@grafana.com>

* Fix compilation errors after Cortex update.

Signed-off-by: Peter Štibraný <peter.stibrany@grafana.com>

* Update to Cortex v1.0.0-rc.0

Signed-off-by: Peter Štibraný <peter.stibrany@grafana.com>

* Added missing vendored file.

Signed-off-by: Peter Štibraný <peter.stibrany@grafana.com>

* Vendor Cortex 1.0.0

Signed-off-by: Peter Štibraný <peter.stibrany@grafana.com>

* Configuration changes.

Signed-off-by: Peter Štibraný <peter.stibrany@grafana.com>

* Mention Cortex 1.0 changes and link to docs.

Signed-off-by: Peter Štibraný <peter.stibrany@grafana.com>

* Fix jsonnet files, and mention fields that were removed.

Signed-off-by: Peter Štibraný <peter.stibrany@grafana.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants