Skip to content

Upgrade Thanos and Prometheus #3518

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
Nov 20, 2020
Merged

Conversation

pracucci
Copy link
Contributor

What this PR does:
In this PR I'm upgrading Thanos and Prometheus, in order to introduced the config option for the TSDB head chunks write buffer size. In details:

  1. Added -blocks-storage.tsdb.head-chunks-write-buffer-size-bytes
  2. Mapped 2 new alertmanager metrics
  3. Renamed MetricMetadata field MetricName to MetricFamilyName to match naming in Prometheus (in this PR it has been added to Prometheus too 🎉 )

I manually checked all Thanos changes and LGTM. There are no new Thanos metrics to map.

Which issue(s) this PR fixes:
N/A

Checklist

  • Tests updated
  • Documentation added
  • CHANGELOG.md updated - the order of entries should be [CHANGE], [FEATURE], [ENHANCEMENT], [BUGFIX]
Signed-off-by: Marco Pracucci <marco@pracucci.com>
Signed-off-by: Marco Pracucci <marco@pracucci.com>
@@ -165,7 +165,7 @@ message MetricMetadata {
}

MetricType type = 1;
string metric_name = 2;
string metric_family_name = 2;
Copy link
Contributor

Choose a reason for hiding this comment

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

Does this break backwards compatibility?

Copy link
Contributor

Choose a reason for hiding this comment

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

Also, why are we making this change? does it break anything?

Copy link
Contributor

Choose a reason for hiding this comment

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

Field name changes don't break compatibility, as long as tag values are preserved.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Does this break backwards compatibility?

No, field name change doesn't break it.

why are we making this change?

To keep the same exact naming of Prometheus, given the same struct is defined in Prometheus too now.

Copy link
Contributor

@pstibrany pstibrany left a comment

Choose a reason for hiding this comment

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

Cortex changes lgtm. Quick look at Thanos changes also doesn't raise concerns. Haven't verified Prometheus and other libs changes.

Signed-off-by: Marco Pracucci <marco@pracucci.com>
@pracucci pracucci merged commit d385f47 into master Nov 20, 2020
@pracucci pracucci deleted the upgrade-thanos-and-prometheus branch November 20, 2020 08:16
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
3 participants