Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: giantswarm/prometheus-meta-operator
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: v1.29.0
Choose a base ref
...
head repository: giantswarm/prometheus-meta-operator
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: v1.29.1
Choose a head ref
  • 5 commits
  • 4 files changed
  • 6 contributors

Commits on Apr 9, 2021

  1. Bump version to 1.29.1-dev (#496)

    Co-authored-by: GitHub Action <action@github.com>
    github-actions[bot] and actions-user authored Apr 9, 2021

    Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
    Copy the full SHA
    7cf1f28 View commit details
  2. Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
    Copy the full SHA
    424231a View commit details
  3. Fix inhibition of MatchingNumberOfPrometheusAndCluster (#481)

    Use the new inhibition label `cancel_if_mc_kube_state_metrics_down` provided by
    [g8s-prometheus-v5.1.0](https://github.com/giantswarm/g8s-prometheus/blob/master/CHANGELOG.md#510---2021-04-09)
    so it matches when KSM on the Management Cluster is down, as it provides the
    `kube_pod_container_status_running` metric needed for the alert. Previously it
    was trying to match KSM down alert from the cluster the alert is firing for
    which doesn't play a role in this case.
    
    Closes: giantswarm/giantswarm#15948
    Co-authored-by: mig4 <42650719@auril.club>
    TheoBrigitte and mig4 authored Apr 9, 2021

    Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
    Copy the full SHA
    24e0465 View commit details
  4. Fix changelog (#498)

    Somehow the changelog entry from #481 ended up under previous release header.
    mig4 authored Apr 9, 2021

    Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
    Copy the full SHA
    353eddd View commit details
  5. Release v1.29.1 (#499)

    Co-authored-by: github-actions <action@github.com>
    github-actions[bot] and actions-user authored Apr 9, 2021

    Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
    Copy the full SHA
    f2c2d15 View commit details
10 changes: 9 additions & 1 deletion CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -7,6 +7,13 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0

## [Unreleased]

## [1.29.1] - 2021-04-09

### Fixed

- Fix inhibition for `MatchingNumberOfPrometheusAndCluster` alert by matching it with
source from Management Cluster instead of the cluster the alert is firing for.

## [1.29.0] - 2021-04-09

### Added
@@ -967,7 +974,8 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
- First release.


[Unreleased]: https://github.com/giantswarm/prometheus-meta-operator/compare/v1.29.0...HEAD
[Unreleased]: https://github.com/giantswarm/prometheus-meta-operator/compare/v1.29.1...HEAD
[1.29.1]: https://github.com/giantswarm/prometheus-meta-operator/compare/v1.29.0...v1.29.1
[1.29.0]: https://github.com/giantswarm/prometheus-meta-operator/compare/v1.28.0...v1.29.0
[1.28.0]: https://github.com/giantswarm/prometheus-meta-operator/compare/v1.27.4...v1.28.0
[1.27.4]: https://github.com/giantswarm/prometheus-meta-operator/compare/v1.27.3...v1.27.4
Original file line number Diff line number Diff line change
@@ -61,7 +61,7 @@ spec:
annotations:
description: '{{`Persistent volume {{ $labels.mountpoint}} on {{ $labels.instance }} does not have enough free space.`}}'
opsrecipe: low-disk-space/#persistent-volume
expr: 100 * ((node_filesystem_free_bytes{mountpoint=~"(/rootfs)?/var/lib/kubelet.*"} / node_filesystem_size_bytes{mountpoint=~"(/rootfs)?/var/lib/kubelet.*"}) * on (pod_id) label_replace(kube_pod_info{priority_class!="prometheus"}, "pod_id", "$1", "uid", "(.*)")) < 10
expr: 100 * ((node_filesystem_free_bytes{mountpoint=~"(/rootfs)?/var/lib/kubelet.*"} / node_filesystem_size_bytes{mountpoint=~"(/rootfs)?/var/lib/kubelet.*"}) * on (pod_id) group_left label_replace(kube_pod_info{priority_class!="prometheus"}, "pod_id", "$1", "uid", "(.*)")) < 10
for: 10m
labels:
area: kaas
@@ -85,7 +85,7 @@ spec:
annotations:
description: '{{`Persistent volume {{ $labels.mountpoint}} on {{ $labels.instance }} does not have enough free space.`}}'
opsrecipe: low-disk-space/#persistent-volume
expr: 100 * ((node_filesystem_free_bytes{mountpoint=~"(/rootfs)?/var/lib/kubelet.*"} / node_filesystem_size_bytes{mountpoint=~"(/rootfs)?/var/lib/kubelet.*"}) * on (pod_id) label_replace(kube_pod_info{priority_class="prometheus"}, "pod_id", "$1", "uid", "(.*)")) < 10
expr: 100 * ((node_filesystem_free_bytes{mountpoint=~"(/rootfs)?/var/lib/kubelet.*"} / node_filesystem_size_bytes{mountpoint=~"(/rootfs)?/var/lib/kubelet.*"}) * on (pod_id) group_left label_replace(kube_pod_info{priority_class="prometheus"}, "pod_id", "$1", "uid", "(.*)")) < 10
for: 10m
labels:
area: empowerment
Original file line number Diff line number Diff line change
@@ -29,7 +29,7 @@ spec:
for: 10m
labels:
area: "empowerment"
cancel_if_kube_state_metrics_down: "true"
cancel_if_mc_kube_state_metrics_down: "true"
installation: {{ .Values.Installation.V1.Name }}
severity: "page"
team: "atlas"
2 changes: 1 addition & 1 deletion pkg/project/project.go
Original file line number Diff line number Diff line change
@@ -5,7 +5,7 @@ var (
gitSHA = "n/a"
name = "prometheus-meta-operator"
source = "https://github.com/giantswarm/prometheus-meta-operator"
version = "1.29.0"
version = "1.29.1"
)

func Description() string {