Skip to content

Commit

Permalink
Merge branch 'main' into add-loki-compaction-alert
Browse files Browse the repository at this point in the history
  • Loading branch information
QuentinBisson authored Sep 25, 2024
2 parents 2e672fa + a0f03dd commit 8ee418d
Show file tree
Hide file tree
Showing 4 changed files with 7 additions and 44 deletions.
4 changes: 4 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,10 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0

- Add `LokiFailedCompaction` alert to know when Loki did not manage to run a successfull compaction in the last 2 hours.

### Removed

- Remove CRsync alerting rules.

### Changed

- Upgrade Alloy to 0.5.2 which brings no value to this repo.
Expand Down

This file was deleted.

2 changes: 1 addition & 1 deletion test/hack/checkLabels/go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ toolchain go1.23.1
require (
// Try to keep version in sync with our prometheus rule CRD version.
// see https://github.com/giantswarm/prometheus-operator-crd/blob/master/helm/prometheus-operator-crd/Chart.yaml#L11
github.com/prometheus-operator/prometheus-operator/pkg/apis/monitoring v0.77.0
github.com/prometheus-operator/prometheus-operator/pkg/apis/monitoring v0.77.1
sigs.k8s.io/yaml v1.4.0
)

Expand Down
2 changes: 2 additions & 0 deletions test/hack/checkLabels/go.sum
Original file line number Diff line number Diff line change
Expand Up @@ -551,6 +551,8 @@ github.com/prometheus-operator/prometheus-operator/pkg/apis/monitoring v0.76.2 h
github.com/prometheus-operator/prometheus-operator/pkg/apis/monitoring v0.76.2/go.mod h1:Rd8YnCqz+2FYsiGmE2DMlaLjQRB4v2jFNnzCt9YY4IM=
github.com/prometheus-operator/prometheus-operator/pkg/apis/monitoring v0.77.0 h1:qJ0oVdazkVKcmVJNZncFylrbyf8c48sym/2b8P/0Ahg=
github.com/prometheus-operator/prometheus-operator/pkg/apis/monitoring v0.77.0/go.mod h1:D0KY8md81DQKdaR/cXwnhoWB3MYYyc/UjvqE8GFkIvA=
github.com/prometheus-operator/prometheus-operator/pkg/apis/monitoring v0.77.1 h1:XGoEXT6WTTihO+MD8MAao+YaQIH905HbK0WK2lyo28k=
github.com/prometheus-operator/prometheus-operator/pkg/apis/monitoring v0.77.1/go.mod h1:D0KY8md81DQKdaR/cXwnhoWB3MYYyc/UjvqE8GFkIvA=
github.com/prometheus/alertmanager v0.22.2 h1:JrDZalSEMb2/2bqGAhls6ZnvOxbC5jMIu29JV+uWTC0=
github.com/prometheus/alertmanager v0.22.2/go.mod h1:rYinOWxFuCnNssc3iOjn2oMTlhLaPcUuqV5yk5JKUAE=
github.com/prometheus/alertmanager v0.25.0 h1:vbXKUR6PYRiZPRIKfmXaG+dmCKG52RtPL4Btl8hQGvg=
Expand Down

0 comments on commit 8ee418d

Please sign in to comment.