upgrade to latest prometheus release 2.3.2 and alertmanager 0.15.1 (#6623)

* upgrade to latest prometheus release 2.3.2

* upgrade alertmanager
This commit is contained in:
David J. M. Karlsen
2018-07-13 03:39:25 -07:00
committed by k8s-ci-robot
parent 18dca6281e
commit 4728544e05
3 changed files with 6 additions and 6 deletions
+2 -2
View File
@@ -1,6 +1,6 @@
name: prometheus
version: 6.9.0
appVersion: 2.3.1
version: 6.10.0
appVersion: 2.3.2
description: Prometheus is a monitoring system and time series database.
home: https://prometheus.io/
icon: https://raw.githubusercontent.com/prometheus/prometheus.github.io/master/assets/prometheus_logo-cb55bb5c346.png
+2 -2
View File
@@ -95,7 +95,7 @@ Parameter | Description | Default
`alertmanager.enabled` | If true, create alertmanager | `true`
`alertmanager.name` | alertmanager container name | `alertmanager`
`alertmanager.image.repository` | alertmanager container image repository | `prom/alertmanager`
`alertmanager.image.tag` | alertmanager container image tag | `v0.15.0`
`alertmanager.image.tag` | alertmanager container image tag | `v0.15.1`
`alertmanager.image.pullPolicy` | alertmanager container image pull policy | `IfNotPresent`
`alertmanager.prefixURL` | The prefix slug at which the server can be accessed | ``
`alertmanager.baseURL` | The external url at which the server can be accessed | `/`
@@ -212,7 +212,7 @@ Parameter | Description | Default
`rbac.create` | If true, create & use RBAC resources | `true`
`server.name` | Prometheus server container name | `server`
`server.image.repository` | Prometheus server container image repository | `prom/prometheus`
`server.image.tag` | Prometheus server container image tag | `v2.3.1`
`server.image.tag` | Prometheus server container image tag | `v2.3.2`
`server.image.pullPolicy` | Prometheus server container image pull policy | `IfNotPresent`
`server.enableAdminApi` | If true, Prometheus administrative HTTP API will be enabled. Please note, that you should take care of administrative API access protection (ingress or some frontend Nginx with auth) before enabling it. | `false`
`server.global.scrape_interval` | How frequently to scrape targets by default | `1m`
+2 -2
View File
@@ -33,7 +33,7 @@ alertmanager:
##
image:
repository: prom/alertmanager
tag: v0.15.0
tag: v0.15.1
pullPolicy: IfNotPresent
## alertmanager priorityClassName
@@ -449,7 +449,7 @@ server:
##
image:
repository: prom/prometheus
tag: v2.3.1
tag: v2.3.2
pullPolicy: IfNotPresent
## prometheus server priorityClassName