Merge pull request #1797 from mxinden/bump-am-prom

Update Prometheus to v2.3.2 and Alertmanager to 0.15.2
This commit is contained in:
Frederic Branczyk
2018-08-16 15:16:14 +02:00
committed by GitHub
5 changed files with 7 additions and 7 deletions

View File

@@ -5,7 +5,7 @@ local k = import 'ksonnet/ksonnet.beta.3/k.libsonnet';
namespace: 'default', namespace: 'default',
versions+:: { versions+:: {
alertmanager: 'v0.15.0', alertmanager: 'v0.15.2',
}, },
imageRepos+:: { imageRepos+:: {

View File

@@ -5,7 +5,7 @@ local k = import 'ksonnet/ksonnet.beta.3/k.libsonnet';
namespace: 'default', namespace: 'default',
versions+:: { versions+:: {
prometheus: 'v2.3.1', prometheus: 'v2.3.2',
}, },
imageRepos+:: { imageRepos+:: {

View File

@@ -8,7 +8,7 @@
"subdir": "contrib/kube-prometheus/jsonnet/kube-prometheus" "subdir": "contrib/kube-prometheus/jsonnet/kube-prometheus"
} }
}, },
"version": "cfb1c0ac6c458401cf47390a35d48b707612af0a" "version": "7a050d711ce4c4704bef5f139aacefb2b75f8cf3"
}, },
{ {
"name": "ksonnet", "name": "ksonnet",
@@ -48,7 +48,7 @@
"subdir": "grafana-builder" "subdir": "grafana-builder"
} }
}, },
"version": "a17504d81e2ab5b29d97c77faf72b8d7644bbabf" "version": "8c4610783991b82ff12e485d24ac4f82d8839743"
}, },
{ {
"name": "grafana", "name": "grafana",
@@ -78,7 +78,7 @@
"subdir": "Documentation/etcd-mixin" "subdir": "Documentation/etcd-mixin"
} }
}, },
"version": "3c89938adf2988a2a2f6bb031cb075ae38ae1d0e" "version": "2a6bc7d1130d2fa3336af5ffa2bcf82d760c945e"
} }
] ]
} }

View File

@@ -11,4 +11,4 @@ spec:
beta.kubernetes.io/os: linux beta.kubernetes.io/os: linux
replicas: 3 replicas: 3
serviceAccountName: alertmanager-main serviceAccountName: alertmanager-main
version: v0.15.0 version: v0.15.2

View File

@@ -25,4 +25,4 @@ spec:
serviceAccountName: prometheus-k8s serviceAccountName: prometheus-k8s
serviceMonitorNamespaceSelector: {} serviceMonitorNamespaceSelector: {}
serviceMonitorSelector: {} serviceMonitorSelector: {}
version: v2.3.1 version: v2.3.2