Skip to content

Commit

Permalink
Merge branch 'main' into loki-canary
Browse files Browse the repository at this point in the history
  • Loading branch information
hervenicol authored Oct 7, 2024
2 parents aad83c2 + b6a05ac commit 64c4b78
Show file tree
Hide file tree
Showing 5 changed files with 10 additions and 296 deletions.
9 changes: 8 additions & 1 deletion CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,12 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0

- Alerting rule for Loki missing logs at ingestion

## [4.17.0] - 2024-10-03

### Removed

- Remove legacy in-house slo framework.

## [4.16.1] - 2024-09-26

### Fixed
Expand Down Expand Up @@ -3127,7 +3133,8 @@ Fix `PromtailRequestsErrors` alerts as promtail retries after some backoff so ac

- Add existing rules from https://github.com/giantswarm/prometheus-meta-operator/pull/637/commits/bc6a26759eb955de92b41ed5eb33fa37980660f2

[Unreleased]: https://github.com/giantswarm/prometheus-rules/compare/v4.16.1...HEAD
[Unreleased]: https://github.com/giantswarm/prometheus-rules/compare/v4.17.0...HEAD
[4.17.0]: https://github.com/giantswarm/prometheus-rules/compare/v4.16.1...v4.17.0
[4.16.1]: https://github.com/giantswarm/prometheus-rules/compare/v4.16.0...v4.16.1
[4.16.0]: https://github.com/giantswarm/prometheus-rules/compare/v4.15.2...v4.16.0
[4.15.2]: https://github.com/giantswarm/prometheus-rules/compare/v4.15.1...v4.15.2
Expand Down
2 changes: 1 addition & 1 deletion helm/prometheus-rules/Chart.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ home: https://github.com/giantswarm/prometheus-rules
icon: https://s.giantswarm.io/app-icons/1/png/default-app-light.png
name: prometheus-rules
appVersion: '0.1.0'
version: '4.16.1'
version: '4.17.0'
annotations:
application.giantswarm.io/team: "atlas"
config.giantswarm.io/version: 1.x.x

This file was deleted.

This file was deleted.

Original file line number Diff line number Diff line change
Expand Up @@ -149,7 +149,7 @@ spec:
annotations:
description: '{{`App-exporter ({{ $labels.instance }}) is down.`}}'
opsrecipe: app-exporter-down/
expr: (up{app="app-exporter"} == 0) and (up{service="app-exporter"} == 0)
expr: up{job="app-exporter"} == 0
for: 15m
labels:
area: platform
Expand Down

0 comments on commit 64c4b78

Please sign in to comment.