From c2c328eaa6de6690deefe05e3db085395ada30ef Mon Sep 17 00:00:00 2001 From: Ivan Kiselev Date: Wed, 30 Jan 2019 19:24:32 +0100 Subject: [PATCH] [stable/prometheus] Added configPath parameter (#10976) * Added configPath parameter Signed-off-by: Ivan Kiselev * bump chart version Signed-off-by: Ivan Kiselev --- stable/prometheus/Chart.yaml | 2 +- stable/prometheus/README.md | 1 + stable/prometheus/templates/server-deployment.yaml | 2 +- stable/prometheus/templates/server-statefulset.yaml | 2 +- stable/prometheus/values.yaml | 3 +++ 5 files changed, 7 insertions(+), 3 deletions(-) diff --git a/stable/prometheus/Chart.yaml b/stable/prometheus/Chart.yaml index b902540859..244418a3ab 100755 --- a/stable/prometheus/Chart.yaml +++ b/stable/prometheus/Chart.yaml @@ -1,5 +1,5 @@ name: prometheus -version: 8.4.8 +version: 8.4.9 appVersion: 2.6.1 description: Prometheus is a monitoring system and time series database. home: https://prometheus.io/ diff --git a/stable/prometheus/README.md b/stable/prometheus/README.md index f9a5d74ebf..cc6f92e34d 100644 --- a/stable/prometheus/README.md +++ b/stable/prometheus/README.md @@ -230,6 +230,7 @@ Parameter | Description | Default `server.image.tag` | Prometheus server container image tag | `v2.6.1` `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.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` `server.global.scrape_timeout` | How long until a scrape request times out | `10s` `server.global.evaluation_interval` | How frequently to evaluate rules | `1m` diff --git a/stable/prometheus/templates/server-deployment.yaml b/stable/prometheus/templates/server-deployment.yaml index ed6f4468ee..73f6171457 100644 --- a/stable/prometheus/templates/server-deployment.yaml +++ b/stable/prometheus/templates/server-deployment.yaml @@ -89,7 +89,7 @@ spec: {{- if .Values.server.retention }} - --storage.tsdb.retention={{ .Values.server.retention }} {{- end }} - - --config.file=/etc/config/prometheus.yml + - --config.file={{ .Values.server.configPath }} - --storage.tsdb.path={{ .Values.server.persistentVolume.mountPath }} - --web.console.libraries=/etc/prometheus/console_libraries - --web.console.templates=/etc/prometheus/consoles diff --git a/stable/prometheus/templates/server-statefulset.yaml b/stable/prometheus/templates/server-statefulset.yaml index 388387dd12..82d85f72c6 100644 --- a/stable/prometheus/templates/server-statefulset.yaml +++ b/stable/prometheus/templates/server-statefulset.yaml @@ -82,7 +82,7 @@ spec: {{- if .Values.server.retention }} - --storage.tsdb.retention={{ .Values.server.retention }} {{- end }} - - --config.file=/etc/config/prometheus.yml + - --config.file={{ .Values.server.configPath }} - --storage.tsdb.path={{ .Values.server.persistentVolume.mountPath }} - --web.console.libraries=/etc/prometheus/console_libraries - --web.console.templates=/etc/prometheus/consoles diff --git a/stable/prometheus/values.yaml b/stable/prometheus/values.yaml index 5a53153182..32f35f4f73 100644 --- a/stable/prometheus/values.yaml +++ b/stable/prometheus/values.yaml @@ -555,6 +555,9 @@ server: ## series. This is disabled by default. enableAdminApi: false + ## Path to a configuration file on prometheus server container FS + configPath: /etc/config/prometheus.yml + global: ## How frequently to scrape targets by default ##