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

Vendor latest mimir-prometheus/main #2243

Merged
merged 2 commits into from
Jun 27, 2022
Merged

Vendor latest mimir-prometheus/main #2243

merged 2 commits into from
Jun 27, 2022

Conversation

codesome
Copy link
Member

What this PR does

Vendor Prometheus to get this patch grafana/mimir-prometheus#277

Which issue(s) this PR fixes or relates to

Fixes #

Checklist

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

Signed-off-by: Ganesh Vernekar <ganeshvern@gmail.com>
@codesome codesome requested a review from pstibrany June 27, 2022 14:58
@jesusvazquez
Copy link
Member

Re running failed jobs

With the new vendored version of mimir-prometheus the meta files now
have a new property called out_of_order to state if the block was an
out-of-order block or not.

This new property gets added to every meta file so we need to update the
expected lengths of this tests.

This is how the new property looks in the metas:
- "out_of_order": false,
@jesusvazquez
Copy link
Member

I had to add an extra commit in this PR since some tests where checking the length of meta files and they now have a new property:

"out_of_order": false,

@replay replay enabled auto-merge (squash) June 27, 2022 18:12
@replay replay merged commit 1355190 into main Jun 27, 2022
@replay replay deleted the codesome/ven-prom-again branch June 27, 2022 18:14
jesusvazquez added a commit that referenced this pull request Jun 28, 2022
* Vendor latest mimir-prometheus/main

Signed-off-by: Ganesh Vernekar <ganeshvern@gmail.com>

* Update the bytes length of the meta files

With the new vendored version of mimir-prometheus the meta files now
have a new property called out_of_order to state if the block was an
out-of-order block or not.

This new property gets added to every meta file so we need to update the
expected lengths of this tests.

This is how the new property looks in the metas:
- "out_of_order": false,

Co-authored-by: Jesus Vazquez <jesus.vazquez@grafana.com>
rlex added a commit to rlex/mimir that referenced this pull request Jun 28, 2022
* main: (63 commits)
  Add new section on website for links to blog posts, podcasts and talks. (grafana#2216)
  Rename codified errors to errors catalog (grafana#2256)
  Helm: add a step to contributing doc (grafana#2257)
  Signal that 2.2 release is now in progress. (grafana#2254)
  Removed migration of alertmanager local state files from old hierarchy (Cortex 1.8 and earlier) (grafana#2253)
  operations/mimir: Change multi_zone_ingester_max_unavailable to 25 (grafana#2251)
  Helm: weekly release (grafana#2252)
  Jsonnet: Configure ingester max global metadata per user and per metric (grafana#2250)
  Helm: metamonitor naming (grafana#2236)
  Mimir documentation about out-of-order (grafana#2183)
  Vendor latest mimir-prometheus/main (grafana#2243)
  Set CODEOWNERS to primary technical writer (grafana#2242)
  Use BasicLifecycler for distributors and auto-forget (grafana#2154)
  Docs: Basic documentation for deploying the ruler using jsonnet. (grafana#2127)
  Fix post merge reviews on 2187 (grafana#2230)
  Add tests for user metadata in the ingester (grafana#2184)
  Change the error message template for per-tenant limits (grafana#2234)
  helm: meta-monitoring (grafana#2068)
  Article about migrating from Consul to memberlist. Added documentation for /memberlist endpoint. (grafana#2166)
  Update runbooks to mention possibility to investigate memberlist KV store in various alerts (grafana#2158)
  ...
masonmei pushed a commit to udmire/mimir that referenced this pull request Jul 11, 2022
* Vendor latest mimir-prometheus/main

Signed-off-by: Ganesh Vernekar <ganeshvern@gmail.com>

* Update the bytes length of the meta files

With the new vendored version of mimir-prometheus the meta files now
have a new property called out_of_order to state if the block was an
out-of-order block or not.

This new property gets added to every meta file so we need to update the
expected lengths of this tests.

This is how the new property looks in the metas:
- "out_of_order": false,

Co-authored-by: Jesus Vazquez <jesus.vazquez@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.

None yet

4 participants