summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBen Kochie <bjk@gitlab.com>2017-11-29 08:21:19 +0100
committerBen Kochie <bjk@gitlab.com>2017-11-29 08:21:19 +0100
commitd1e990d9927ea7b3dc9c9ad4e89800443a21eee8 (patch)
tree7048bee34ead5f43eb408b0fbae504a31ecbf3c2
parent4ab1a1bd1767b6ea408a20dd1af7a0d29af82bfd (diff)
downloadgitlab-ce-bjk/prom_demo_config.tar.gz
Simplify Prometheus configmapbjk/prom_demo_config
Use the default config file location[0] to avoid having to set an args. [0]: https://github.com/prometheus/prometheus/blob/master/Dockerfile#L19
-rw-r--r--doc/user/project/integrations/samples/prometheus.yml12
1 files 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