Skip to content

Upgrade Prometheus to 59d02b5ef003f125286a62aa6daf4c8b7583042f #16

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

Merged
merged 3 commits into from
Jul 20, 2021

Conversation

codesome
Copy link
Member

@codesome codesome commented Jul 20, 2021

What this PR does:

Upgrades Prometheus to prometheus/prometheus@59d02b5 to get prometheus/prometheus#9081 in

Checklist

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

@codesome codesome force-pushed the codesome/upgrade-prom branch from b9708f9 to 5b3a2a5 Compare July 20, 2021 12:53
@colega colega mentioned this pull request Jul 20, 2021
4 tasks
Signed-off-by: Ganesh Vernekar <[email protected]>
@codesome codesome force-pushed the codesome/upgrade-prom branch from f3ca6ad to b2ea888 Compare July 20, 2021 13:23
Comment on lines +1569 to +1572
enableExemplars := false
if i.cfg.BlocksStorageConfig.TSDB.MaxExemplars > 0 {
enableExemplars = true
}
Copy link
Member Author

Choose a reason for hiding this comment

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

Additionally, we could always keep it enabled and resize the exemplar storage when needed (this upgrades brings in the Resize function on exemplar storage).

Copy link
Collaborator

Choose a reason for hiding this comment

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

For now, it's fine to keep it disabled if MaxExemplars = 0.

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.

Changes LGTM but I would remove the CHANGELOG entry (or just add a [BUGFIX] entry for the specific fix we're vendording in). I think you also need to run go mod tidy.

CHANGELOG.md Outdated
@@ -5,6 +5,7 @@
* [CHANGE] Removed `configdb` support from Ruler and Alertmanager backend storages. #15
* [CHANGE] Changed `-ruler.storage.type` default value from `configdb` to `local`. #15
* [CHANGE] Changed `-alertmanager.storage.type` default value from `configdb` to `local`. #15
* [ENHANCEMENT] Prometheus upgraded. #4 #16
Copy link
Collaborator

Choose a reason for hiding this comment

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

See this:
#4 (comment)

Copy link
Member Author

Choose a reason for hiding this comment

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

I made it a BUGFIX since this is a important bugfix for the bug that we are hitting. Does the wording look fine?

Copy link
Collaborator

Choose a reason for hiding this comment

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

Yep, thanks!

Signed-off-by: Ganesh Vernekar <[email protected]>
@pracucci pracucci enabled auto-merge (squash) July 20, 2021 13:38
@pracucci pracucci merged commit a763fdc into main Jul 20, 2021
@pracucci pracucci deleted the codesome/upgrade-prom branch July 20, 2021 14:02
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.

2 participants