Skip to content

Commit

Permalink
[stable/prometheus] update prometheus to 2.15.2 and also all other us…
Browse files Browse the repository at this point in the history
…ed images to newest … (helm#19927)

* update prometheus to 2.15.2 and also all other used images to newest version

Signed-off-by: André Bauer <monotek23@gmail.com>

* changed alertmanager baseurl to satisfy the new check of the url on container startup

Signed-off-by: André Bauer <monotek23@gmail.com>

* removed executable flag from files

Signed-off-by: André Bauer <monotek23@gmail.com>

* fix merge conflict

Signed-off-by: André Bauer <andre.bauer@kiwigrid.com>
  • Loading branch information
monotek authored and k8s-ci-robot committed Jan 9, 2020
1 parent 35ce90a commit c582455
Show file tree
Hide file tree
Showing 7 changed files with 16 additions and 17 deletions.
4 changes: 2 additions & 2 deletions stable/prometheus/Chart.yaml
100755 → 100644
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
apiVersion: v1
name: prometheus
version: 9.7.5
appVersion: 2.13.1
version: 10.0.0
appVersion: 2.15.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
Expand Down
14 changes: 7 additions & 7 deletions stable/prometheus/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -127,10 +127,10 @@ 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.18.0`
`alertmanager.image.tag` | alertmanager container image tag | `v0.20.0`
`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 | `/`
`alertmanager.baseURL` | The external url at which the server can be accessed | `"http://localhost:9093"`
`alertmanager.extraArgs` | Additional alertmanager container arguments | `{}`
`alertmanager.extraSecretMounts` | Additional alertmanager Secret mounts | `[]`
`alertmanager.configMapOverrideName` | Prometheus alertmanager ConfigMap override where full-name is `{{.Release.Name}}-{{.Values.alertmanager.configMapOverrideName}}` and setting this value will prevent the default alertmanager ConfigMap from being generated | `""`
Expand Down Expand Up @@ -180,7 +180,7 @@ Parameter | Description | Default
`alertmanagerFiles.alertmanager.yml` | Prometheus alertmanager configuration | example configuration
`configmapReload.name` | configmap-reload container name | `configmap-reload`
`configmapReload.image.repository` | configmap-reload container image repository | `jimmidyson/configmap-reload`
`configmapReload.image.tag` | configmap-reload container image tag | `v0.2.2`
`configmapReload.image.tag` | configmap-reload container image tag | `v0.3.0`
`configmapReload.image.pullPolicy` | configmap-reload container image pull policy | `IfNotPresent`
`configmapReload.extraArgs` | Additional configmap-reload container arguments | `{}`
`configmapReload.extraVolumeDirs` | Additional configmap-reload volume directories | `{}`
Expand All @@ -195,7 +195,7 @@ Parameter | Description | Default
`kubeStateMetrics.enabled` | If true, create kube-state-metrics | `true`
`kubeStateMetrics.name` | kube-state-metrics container name | `kube-state-metrics`
`kubeStateMetrics.image.repository` | kube-state-metrics container image repository| `quay.io/coreos/kube-state-metrics`
`kubeStateMetrics.image.tag` | kube-state-metrics container image tag | `v1.5.0`
`kubeStateMetrics.image.tag` | kube-state-metrics container image tag | `v1.9.0`
`kubeStateMetrics.image.pullPolicy` | kube-state-metrics container image pull policy | `IfNotPresent`
`kubeStateMetrics.args` | kube-state-metrics container arguments | `{}`
`kubeStateMetrics.nodeSelector` | node labels for kube-state-metrics pod assignment | `{}`
Expand All @@ -219,7 +219,7 @@ Parameter | Description | Default
`nodeExporter.enabled` | If true, create node-exporter | `true`
`nodeExporter.name` | node-exporter container name | `node-exporter`
`nodeExporter.image.repository` | node-exporter container image repository| `prom/node-exporter`
`nodeExporter.image.tag` | node-exporter container image tag | `v0.18.0`
`nodeExporter.image.tag` | node-exporter container image tag | `v0.18.1`
`nodeExporter.image.pullPolicy` | node-exporter container image pull policy | `IfNotPresent`
`nodeExporter.extraArgs` | Additional node-exporter container arguments | `{}`
`nodeExporter.extraHostPathMounts` | Additional node-exporter hostPath mounts | `[]`
Expand Down Expand Up @@ -249,7 +249,7 @@ Parameter | Description | Default
`pushgateway.enabled` | If true, create pushgateway | `true`
`pushgateway.name` | pushgateway container name | `pushgateway`
`pushgateway.image.repository` | pushgateway container image repository | `prom/pushgateway`
`pushgateway.image.tag` | pushgateway container image tag | `v0.8.0`
`pushgateway.image.tag` | pushgateway container image tag | `v1.0.1`
`pushgateway.image.pullPolicy` | pushgateway container image pull policy | `IfNotPresent`
`pushgateway.extraArgs` | Additional pushgateway container arguments | `{}`
`pushgateway.ingress.enabled` | If true, pushgateway Ingress will be created | `false`
Expand Down Expand Up @@ -288,7 +288,7 @@ Parameter | Description | Default
`server.enabled` | If false, Prometheus server will not be created | `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.13.1`
`server.image.tag` | Prometheus server container image tag | `v2.15.2`
`server.image.pullPolicy` | Prometheus server container image pull policy | `IfNotPresent`
`server.configPath` | Path to a prometheus server config file on the container FS | `/etc/config/prometheus.yml`
`server.global.scrape_interval` | How frequently to scrape targets by default | `1m`
Expand Down
Empty file modified stable/prometheus/templates/alertmanager-podsecuritypolicy.yaml
100755 → 100644
Empty file.
Empty file.
Empty file modified stable/prometheus/templates/pushgateway-podsecuritypolicy.yaml
100755 → 100644
Empty file.
Empty file modified stable/prometheus/templates/server-podsecuritypolicy.yaml
100755 → 100644
Empty file.
15 changes: 7 additions & 8 deletions stable/prometheus/values.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ alertmanager:
##
image:
repository: prom/alertmanager
tag: v0.18.0
tag: v0.20.0
pullPolicy: IfNotPresent

## alertmanager priorityClassName
Expand All @@ -56,8 +56,7 @@ alertmanager:
prefixURL: ""

## External URL which can access alertmanager
## Maybe same with Ingress host name
baseURL: "/"
baseURL: "http://localhost:9093"

## Additional alertmanager container environment variable
## For instance to add a http_proxy
Expand Down Expand Up @@ -311,7 +310,7 @@ configmapReload:
##
image:
repository: jimmidyson/configmap-reload
tag: v0.2.2
tag: v0.3.0
pullPolicy: IfNotPresent

## Additional configmap-reload container arguments
Expand Down Expand Up @@ -350,7 +349,7 @@ kubeStateMetrics:
##
image:
repository: quay.io/coreos/kube-state-metrics
tag: v1.6.0
tag: v1.9.0
pullPolicy: IfNotPresent

## kube-state-metrics priorityClassName
Expand Down Expand Up @@ -462,7 +461,7 @@ nodeExporter:
##
image:
repository: prom/node-exporter
tag: v0.18.0
tag: v0.18.1
pullPolicy: IfNotPresent

## Specify if a Pod Security Policy for node-exporter must be created
Expand Down Expand Up @@ -584,7 +583,7 @@ server:
##
image:
repository: prom/prometheus
tag: v2.13.1
tag: v2.15.2
pullPolicy: IfNotPresent

## prometheus server priorityClassName
Expand Down Expand Up @@ -952,7 +951,7 @@ pushgateway:
##
image:
repository: prom/pushgateway
tag: v0.8.0
tag: v1.0.1
pullPolicy: IfNotPresent

## pushgateway priorityClassName
Expand Down

0 comments on commit c582455

Please sign in to comment.