From 87beb86f7cb8fa6dd62f7af60f501557825cb3fb Mon Sep 17 00:00:00 2001 From: eMCeee89 Date: Sat, 4 Jan 2020 05:07:40 +0100 Subject: [PATCH] Merge branch 'master' of https://github.com/helm/charts (#17071) Signed-off-by: eMCeee89 --- stable/prometheus/Chart.yaml | 2 +- stable/prometheus/README.md | 3 +-- .../prometheus/templates/server-deployment.yaml | 13 +++++-------- .../templates/server-statefulset.yaml | 10 +++------- stable/prometheus/values.yaml | 17 +++++++++++------ 5 files changed, 21 insertions(+), 24 deletions(-) diff --git a/stable/prometheus/Chart.yaml b/stable/prometheus/Chart.yaml index 4cd755a450..181e1a1b0b 100755 --- a/stable/prometheus/Chart.yaml +++ b/stable/prometheus/Chart.yaml @@ -1,6 +1,6 @@ apiVersion: v1 name: prometheus -version: 9.7.2 +version: 9.7.3 appVersion: 2.13.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 5e106dfb20..dd2ca4794e 100644 --- a/stable/prometheus/README.md +++ b/stable/prometheus/README.md @@ -262,13 +262,12 @@ Parameter | Description | Default `server.image.repository` | Prometheus server container image repository | `prom/prometheus` `server.image.tag` | Prometheus server container image tag | `v2.13.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.skipTSDBLock` | If true, Prometheus skip TSDB locking. | `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` `server.extraArgs` | Additional Prometheus server container arguments | `{}` +`server.extraFlags` | Additional Prometheus server container flags | `["web.enable-lifecycle"]` `server.extraInitContainers` | Init containers to launch alongside the server | `[]` `server.prefixURL` | The prefix slug at which the server can be accessed | `` `server.baseURL` | The external url at which the server can be accessed | `` diff --git a/stable/prometheus/templates/server-deployment.yaml b/stable/prometheus/templates/server-deployment.yaml index a7686a6534..54404616bb 100644 --- a/stable/prometheus/templates/server-deployment.yaml +++ b/stable/prometheus/templates/server-deployment.yaml @@ -83,18 +83,15 @@ spec: - --storage.tsdb.path={{ .Values.server.persistentVolume.mountPath }} - --web.console.libraries=/etc/prometheus/console_libraries - --web.console.templates=/etc/prometheus/consoles - - --web.enable-lifecycle - {{- range $key, $value := .Values.server.extraArgs }} - - --{{ $key }}={{ $value }} + {{- range .Values.server.extraFlags }} + - --{{ . }} {{- end }} {{- if .Values.server.baseURL }} - --web.external-url={{ .Values.server.baseURL }} {{- end }} - {{- if .Values.server.enableAdminApi }} - - --web.enable-admin-api - {{- end }} - {{- if .Values.server.skipTSDBLock }} - - --storage.tsdb.no-lockfile + + {{- range $key, $value := .Values.server.extraArgs }} + - --{{ $key }}={{ $value }} {{- end }} ports: - containerPort: 9090 diff --git a/stable/prometheus/templates/server-statefulset.yaml b/stable/prometheus/templates/server-statefulset.yaml index 8b9df09bab..4569fefb2d 100644 --- a/stable/prometheus/templates/server-statefulset.yaml +++ b/stable/prometheus/templates/server-statefulset.yaml @@ -83,19 +83,15 @@ spec: - --storage.tsdb.path={{ .Values.server.persistentVolume.mountPath }} - --web.console.libraries=/etc/prometheus/console_libraries - --web.console.templates=/etc/prometheus/consoles - - --web.enable-lifecycle + {{- range .Values.server.extraFlags }} + - --{{ . }} + {{- end }} {{- range $key, $value := .Values.server.extraArgs }} - --{{ $key }}={{ $value }} {{- end }} {{- if .Values.server.baseURL }} - --web.external-url={{ .Values.server.baseURL }} {{- end }} - {{- if .Values.server.enableAdminApi }} - - --web.enable-admin-api - {{- end }} - {{- if .Values.server.skipTSDBLock }} - - --storage.tsdb.no-lockfile - {{- end }} ports: - containerPort: 9090 readinessProbe: diff --git a/stable/prometheus/values.yaml b/stable/prometheus/values.yaml index 871a1fa4f1..2616e6af25 100644 --- a/stable/prometheus/values.yaml +++ b/stable/prometheus/values.yaml @@ -617,12 +617,17 @@ server: ## key: username env: {} - ## This flag controls access to the administrative HTTP API which includes functionality such as deleting time - ## series. This is disabled by default. - enableAdminApi: false - - ## This flag controls BD locking - skipTSDBLock: false + extraFlags: + - web.enable-lifecycle + ## web.enable-admin-api flag controls access to the administrative HTTP API which includes functionality such as + ## deleting time series. This is disabled by default. + # - web.enable-admin-api + ## + ## storage.tsdb.no-lockfile flag controls BD locking + # - storage.tsdb.no-lockfile + ## + ## storage.tsdb.wal-compression flag enables compression of the write-ahead log (WAL) + # - storage.tsdb.wal-compression ## Path to a configuration file on prometheus server container FS configPath: /etc/config/prometheus.yml