Skip to content

Commit

Permalink
*: bump jsonnet and re-generate
Browse files Browse the repository at this point in the history
  • Loading branch information
squat committed Sep 28, 2018
1 parent 22b2470 commit 27a5cc4
Show file tree
Hide file tree
Showing 5 changed files with 11 additions and 24 deletions.
2 changes: 1 addition & 1 deletion assets/prometheus-k8s/prometheus.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -72,4 +72,4 @@ spec:
matchExpressions:
- key: k8s-app
operator: Exists
version: v2.3.2
version: v2.4.2
9 changes: 0 additions & 9 deletions assets/prometheus-k8s/rules.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -954,15 +954,6 @@ spec:
for: 5m
labels:
severity: critical
- alert: AlertmanagerDownOrMissing
annotations:
message: An unexpected number of Alertmanagers were scraped or disappeared
from discovery.
expr: |
label_replace(prometheus_operator_alertmanager_spec_replicas{job="prometheus-operator"}, "job", "alertmanager-$1", "alertmanager", "(.*)") / ON(job) GROUP_RIGHT() sum(up{job="alertmanager-main"}) BY (job) != 1
for: 5m
labels:
severity: warning
- alert: AlertmanagerFailedReload
annotations:
message: Reloading Alertmanager's configuration has failed for {{ $labels.namespace
Expand Down
6 changes: 1 addition & 5 deletions assets/telemeter-client/deployment.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ spec:
secretKeyRef:
key: to
name: telemeter-client
image: openshift/telemeter:v3.11
image: quay.io/openshift/origin-telemeter:v4.0
name: telemeter-client
ports:
- containerPort: 8080
Expand All @@ -45,10 +45,6 @@ spec:
- mountPath: /etc/telemeter
name: credentials
readOnly: false
securityContext:
runAsNonRoot: true
runAsUser: 65534
serviceAccountName: telemeter-client
volumes:
- name: credentials
secret:
Expand Down
8 changes: 4 additions & 4 deletions jsonnet/jsonnetfile.lock.json
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
"subdir": "contrib/kube-prometheus/jsonnet/kube-prometheus"
}
},
"version": "fd3299ce5ceef27c092082f74c0aafcf93a41d64"
"version": "807a9e10cc2387b7bf1bf110fb2bcc27471ce005"
},
{
"name": "ksonnet",
Expand Down Expand Up @@ -48,7 +48,7 @@
"subdir": "grafana-builder"
}
},
"version": "94aef231932810633416bfe596a41dbad2b1ebb9"
"version": "bce24b0b087f7dc09c9e9f066f3e554a851792e9"
},
{
"name": "grafana",
Expand Down Expand Up @@ -78,7 +78,7 @@
"subdir": "Documentation/etcd-mixin"
}
},
"version": "a3e242d80ae1a13ae57904fc12e91fe4c9ecf972"
"version": "1a8c52097971fbc1e0988ab8f807c7bdde1fc3e7"
},
{
"name": "telemeter-client",
Expand All @@ -88,7 +88,7 @@
"subdir": "jsonnet/telemeter/client"
}
},
"version": "45552d0fa00f856ff1b564ab195349029e76dcc0"
"version": "f6385aa775963ad40055e95971d9e3107b9abd81"
}
]
}
10 changes: 5 additions & 5 deletions pkg/manifests/bindata.go

Large diffs are not rendered by default.

0 comments on commit 27a5cc4

Please sign in to comment.