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

Sync prometheus #595

Merged
merged 15 commits into from
Feb 5, 2024
Merged

Sync prometheus #595

merged 15 commits into from
Feb 5, 2024

Conversation

pracucci
Copy link
Collaborator

@pracucci pracucci commented Feb 5, 2024

I've got another Ruler PR merged upstream and in this PR I'm re-syncing Prometheus in our mimir-prometheus. The changeset is very small. A part from the ruler changes, there's a change in TSDB which adds an extra check when writing blocks.

captncraig and others added 15 commits January 30, 2024 09:27
Signed-off-by: Craig Peterson <192540+captncraig@users.noreply.github.com>
This alert will never return anything as the left side of the query has
the labels `[component, environment, instance, job, type]` while the
right side has `[component, environment, instance, job]`.

The `type` label was added to `prometheus_tsdb_head_samples_appended_total` in this PR but the mixin wasn't updated
for the new label: prometheus/prometheus#11395

This was found with [pint](https://github.com/cloudflare/pint) PromQL
linting

Signed-off-by: Will Bollock <wbollock@linode.com>
Signed-off-by: Paweł Szulik <paul.szulik@gmail.com>
Signed-off-by: Paweł Szulik <paul.szulik@gmail.com>
Signed-off-by: Paweł Szulik <paul.szulik@gmail.com>
Signed-off-by: Paweł Szulik <paul.szulik@gmail.com>
Signed-off-by: Paweł Szulik <paul.szulik@gmail.com>
For instance `require.NoError` will print the unexpected error; we don't
need to include it in the message.

Signed-off-by: Bryan Boreham <bjboreham@gmail.com>
Signed-off-by: Marco Pracucci <marco@pracucci.com>
…-dependency-controller

Decouple ruler dependency controller from concurrency controller
…ples_label_matching

mixin: PrometheusNotIngestingSamples label matching
storage/remote: apply custom headers before sigv4 transport
Document conditions on chunks. Add check on chunk time ordering.

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

CLAassistant commented Feb 5, 2024

CLA assistant check
Thank you for your submission! We really appreciate it. Like many open source projects, we ask that you all sign our Contributor License Agreement before we can accept your contribution.
5 out of 8 committers have signed the CLA.

✅ captncraig
✅ pracucci
✅ bboreham
✅ gotjosh
✅ pstibrany
❌ wbollock
❌ Creatone
❌ metalmatze
You have signed the CLA already but the status is still pending? Let us recheck it.

@krajorama krajorama self-requested a review February 5, 2024 10:13
Copy link
Contributor

@krajorama krajorama left a comment

Choose a reason for hiding this comment

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

LGTM

@pracucci pracucci merged commit 84eae04 into main Feb 5, 2024
5 of 6 checks passed
@pracucci pracucci deleted the sync-prometheus branch February 5, 2024 11:23
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.

10 participants