From d1e990d9927ea7b3dc9c9ad4e89800443a21eee8 Mon Sep 17 00:00:00 2001 From: Ben Kochie Date: Wed, 29 Nov 2017 08:21:19 +0100 Subject: Simplify Prometheus configmap Use the default config file location[0] to avoid having to set an args. [0]: https://github.com/prometheus/prometheus/blob/master/Dockerfile#L19 --- doc/user/project/integrations/samples/prometheus.yml | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) diff --git a/doc/user/project/integrations/samples/prometheus.yml b/doc/user/project/integrations/samples/prometheus.yml index 30b59e172a1..9cd82be0891 100644 --- a/doc/user/project/integrations/samples/prometheus.yml +++ b/doc/user/project/integrations/samples/prometheus.yml @@ -6,7 +6,7 @@ metadata: apiVersion: v1 kind: ConfigMap metadata: - name: prometheus + name: prometheus-config namespace: prometheus data: prometheus.yml: |- @@ -93,15 +93,13 @@ spec: containers: - name: prometheus image: prom/prometheus:latest - args: - - '-config.file=/prometheus-data/prometheus.yml' ports: - name: prometheus containerPort: 9090 volumeMounts: - - name: data-volume - mountPath: /prometheus-data + - name: config-volume + mountPath: /etc/prometheus volumes: - - name: data-volume + - name: config-volume configMap: - name: prometheus + name: prometheus-config -- cgit v1.2.1