Skip to content

Commit

Permalink
Merge pull request #727 from paulfantom/fix_alert_dups
Browse files Browse the repository at this point in the history
Bug 1817597: Fix alert duplicates
  • Loading branch information
openshift-merge-robot committed Mar 31, 2020
2 parents 6791732 + 22b6046 commit f972d0c
Show file tree
Hide file tree
Showing 3 changed files with 9 additions and 9 deletions.
6 changes: 3 additions & 3 deletions assets/prometheus-k8s/rules.yaml
Expand Up @@ -1044,7 +1044,7 @@ spec:
for: 5m
labels:
severity: warning
- alert: KubeMemOvercommit
- alert: KubeMemoryOvercommit
annotations:
message: Cluster has overcommitted memory resource requests for Pods and cannot
tolerate node failure.
Expand All @@ -1059,7 +1059,7 @@ spec:
for: 5m
labels:
severity: warning
- alert: KubeCPUOvercommit
- alert: KubeCPUQuotaOvercommit
annotations:
message: Cluster has overcommitted CPU resource requests for Namespaces.
expr: |
Expand All @@ -1070,7 +1070,7 @@ spec:
for: 5m
labels:
severity: warning
- alert: KubeMemOvercommit
- alert: KubeMemoryQuotaOvercommit
annotations:
message: Cluster has overcommitted memory resource requests for Namespaces.
expr: |
Expand Down
8 changes: 4 additions & 4 deletions jsonnet/jsonnetfile.lock.json
Expand Up @@ -79,8 +79,8 @@
"subdir": ""
}
},
"version": "bf3064885199f90080bec6790f2d27c5ad08184d",
"sum": "MFXrg/dNmfAHIm+H8bEGdZ957E1Y6B6aS42iFQCE1O0="
"version": "544148ee3ea4da1ffa1e97ebb66599a9548fde8d",
"sum": "6uEUlF5xrvjk8FBLpGaIyfH+3PNAPnzedbTsbqEaB3U="
},
{
"source": {
Expand Down Expand Up @@ -140,8 +140,8 @@
"subdir": "jsonnet/telemeter"
}
},
"version": "7246a9504c9871c18fa622ac57763b562438e7be",
"sum": "fuHm4rY1VFxcPshHk99q8OL6mgdiJ4ghQBZbqkOwmLU=",
"version": "b512aa4a0512f54b3fd1f2bee850e2ceed51299a",
"sum": "LG7mr5TOA/pXTeWO/Pdn9MQgazWJi//iLJdfglyCDnc=",
"name": "telemeter-client"
},
{
Expand Down
4 changes: 2 additions & 2 deletions pkg/manifests/bindata.go

Large diffs are not rendered by default.

0 comments on commit f972d0c

Please sign in to comment.