Remove hardcoded username
Change-Id: I3103dc4c174be7b8c199508b0b53941e687012bf
Depends-On: Ib4c218af6e880963cadff807246d65ff68ddf5e1
diff --git a/prometheus/alertmanager.sls b/prometheus/alertmanager.sls
index 00902e4..0031863 100644
--- a/prometheus/alertmanager.sls
+++ b/prometheus/alertmanager.sls
@@ -7,13 +7,10 @@
file.directory:
- makedirs: True
-# prometheus user is available inside docker container not on docker host
-# in dockerfile for alertmanager we ensure that it will have 999 uid
{{alertmanager.dir.data}}:
file.directory:
- makedirs: True
- mode: 755
- - user: {{alertmanager.user}}
{{alertmanager.dir.config}}/alertmanager.yml:
file.managed:
diff --git a/prometheus/map.jinja b/prometheus/map.jinja
index 1819231..c9aadce 100644
--- a/prometheus/map.jinja
+++ b/prometheus/map.jinja
@@ -1,11 +1,5 @@
{% set server = salt['grains.filter_by']({
- 'default': {
- 'user': '999',
- },
}, merge=salt['pillar.get']('prometheus:server')) %}
{% set alertmanager = salt['grains.filter_by']({
- 'default': {
- 'user': '999',
- },
}, merge=salt['pillar.get']('prometheus:alertmanager')) %}
diff --git a/prometheus/server.sls b/prometheus/server.sls
index 9aeb00c..d790553 100644
--- a/prometheus/server.sls
+++ b/prometheus/server.sls
@@ -7,13 +7,10 @@
file.directory:
- makedirs: True
-# prometheus user is available inside docker container not on docker host
-# in dockerfile for prometheus we ensure that it will have 999 uid
{{server.dir.data}}:
file.directory:
- makedirs: True
- mode: 755
- - user: {{server.user}}
{{server.dir.config}}/prometheus.yml:
file.managed: