diff --git a/README.md b/README.md index 4c65a56964a81c46b3dd7cafb60b172c62123ac0..5ac40049603bcb2147948660e8c712b128b852ec 100644 --- a/README.md +++ b/README.md @@ -258,13 +258,13 @@ These are the available fields with their respective default values: namespace: "default", versions+:: { - alertmanager: "v0.16.2", - nodeExporter: "v0.17.0", + alertmanager: "v0.17.0", + nodeExporter: "v0.18.1", kubeStateMetrics: "v1.5.0", kubeRbacProxy: "v0.4.1", addonResizer: "1.8.4", - prometheusOperator: "v0.29.0", - prometheus: "v2.7.2", + prometheusOperator: "v0.30.0", + prometheus: "v2.10.0", }, imageRepos+:: { diff --git a/jsonnet/kube-prometheus/kube-prometheus.libsonnet b/jsonnet/kube-prometheus/kube-prometheus.libsonnet index 72142b0a4dd8b2e6e319d15ae67aeb07757f03bf..631423bde4094b5873eaeb7363e7b0f236c7f8a8 100644 --- a/jsonnet/kube-prometheus/kube-prometheus.libsonnet +++ b/jsonnet/kube-prometheus/kube-prometheus.libsonnet @@ -44,7 +44,7 @@ local configMapList = k3.core.v1.configMapList; namespace: 'default', versions+:: { - grafana: '6.0.1', + grafana: '6.2.2', }, tlsCipherSuites: [ diff --git a/jsonnet/kube-prometheus/node-exporter/node-exporter.libsonnet b/jsonnet/kube-prometheus/node-exporter/node-exporter.libsonnet index f4aa9f479e9774f002d05b5f48c0dac2e833539c..c857291592211736e30cf8c94eeaff526c5fee3a 100644 --- a/jsonnet/kube-prometheus/node-exporter/node-exporter.libsonnet +++ b/jsonnet/kube-prometheus/node-exporter/node-exporter.libsonnet @@ -5,7 +5,7 @@ local k = import 'ksonnet/ksonnet.beta.4/k.libsonnet'; namespace: 'default', versions+:: { - nodeExporter: 'v0.17.0', + nodeExporter: 'v0.18.1', kubeRbacProxy: 'v0.4.1', }, diff --git a/jsonnet/kube-prometheus/prometheus/prometheus.libsonnet b/jsonnet/kube-prometheus/prometheus/prometheus.libsonnet index 9a52f38b83f5d90967af15a44fd8bc14b2d74023..24e23bf50da80ebe73cfd2ca0ab44f162448c139 100644 --- a/jsonnet/kube-prometheus/prometheus/prometheus.libsonnet +++ b/jsonnet/kube-prometheus/prometheus/prometheus.libsonnet @@ -1,12 +1,12 @@ -local k = import 'ksonnet/ksonnet.beta.4/k.libsonnet'; local k3 = import 'ksonnet/ksonnet.beta.3/k.libsonnet'; +local k = import 'ksonnet/ksonnet.beta.4/k.libsonnet'; { _config+:: { namespace: 'default', versions+:: { - prometheus: 'v2.7.2', + prometheus: 'v2.10.0', }, imageRepos+:: { diff --git a/jsonnetfile.lock.json b/jsonnetfile.lock.json index b05fa9140a5fe4e706c04d11b695ec02368cdb17..4d86b65e537bf25494c998aadb98b0fa06c241cd 100644 --- a/jsonnetfile.lock.json +++ b/jsonnetfile.lock.json @@ -8,7 +8,7 @@ "subdir": "jsonnet/kube-prometheus" } }, - "version": "df8a5b51b4e05fc7ba1a168346a80cbc9bec48d3" + "version": "e188100e971b1fd5e084b0a8c3018d42d244428b" }, { "name": "ksonnet", @@ -78,7 +78,7 @@ "subdir": "Documentation/etcd-mixin" } }, - "version": "d6280f9ea54849e5364545ca34bdac0a58317569" + "version": "0de9b8abf57f7b44f6319bacc0656b813c8526c1" } ] } diff --git a/manifests/grafana-deployment.yaml b/manifests/grafana-deployment.yaml index 18133259c7f70b7996bd57dcce942b78036cff7e..c977e450991afc4f4848a9f0ccd743d2ef7338ba 100644 --- a/manifests/grafana-deployment.yaml +++ b/manifests/grafana-deployment.yaml @@ -16,7 +16,7 @@ spec: app: grafana spec: containers: - - image: grafana/grafana:6.0.1 + - image: grafana/grafana:6.2.2 name: grafana ports: - containerPort: 3000 diff --git a/manifests/node-exporter-daemonset.yaml b/manifests/node-exporter-daemonset.yaml index 8213bc117b189356538eef911fcb1e175ee5123e..a1a48d20bd83521fbcc37a95b4cb57b4dfd718b7 100644 --- a/manifests/node-exporter-daemonset.yaml +++ b/manifests/node-exporter-daemonset.yaml @@ -22,7 +22,7 @@ spec: - --path.rootfs=/host/root - --collector.filesystem.ignored-mount-points=^/(dev|proc|sys|var/lib/docker/.+)($|/) - --collector.filesystem.ignored-fs-types=^(autofs|binfmt_misc|cgroup|configfs|debugfs|devpts|devtmpfs|fusectl|hugetlbfs|mqueue|overlay|proc|procfs|pstore|rpc_pipefs|securityfs|sysfs|tracefs)$ - image: quay.io/prometheus/node-exporter:v0.17.0 + image: quay.io/prometheus/node-exporter:v0.18.1 name: node-exporter resources: limits: diff --git a/manifests/prometheus-prometheus.yaml b/manifests/prometheus-prometheus.yaml index c5952cc7fad4c78e4656750dd888c6d4ee3e4065..ac38e8efbaa4a3e4cd2ceeb7fc059629e74531cd 100644 --- a/manifests/prometheus-prometheus.yaml +++ b/manifests/prometheus-prometheus.yaml @@ -29,4 +29,4 @@ spec: serviceAccountName: prometheus-k8s serviceMonitorNamespaceSelector: {} serviceMonitorSelector: {} - version: v2.7.2 + version: v2.10.0