From a9cd434b06d2da17fd447adecdd98dee41102d52 Mon Sep 17 00:00:00 2001 From: Ricardo Hernandez Date: Tue, 15 Nov 2016 13:14:48 +0000 Subject: [PATCH] Use file serialize insted a jinja template to render main prometheus config. This fixed the rendering of regex on yaml --- prometheus/files/config.jinja | 1 - prometheus/server.sls | 8 ++------ 2 files changed, 2 insertions(+), 7 deletions(-) delete mode 100644 prometheus/files/config.jinja diff --git a/prometheus/files/config.jinja b/prometheus/files/config.jinja deleted file mode 100644 index b37813c..0000000 --- a/prometheus/files/config.jinja +++ /dev/null @@ -1 +0,0 @@ -{{ data|yaml(False) }} diff --git a/prometheus/server.sls b/prometheus/server.sls index dd9475f..0761a62 100644 --- a/prometheus/server.sls +++ b/prometheus/server.sls @@ -20,15 +20,11 @@ prometheus_bin_link: - archive: prometheus_server_tarball prometheus_server_config: - file.managed: + file.serialize: - name: {{ prometheus.server.args.config_file }} - - source: salt://prometheus/files/config.jinja - - template: jinja - user: prometheus - group: prometheus - - makedirs: True - - defaults: - data: {{ prometheus.server.config }} + - dataset: {{prometheus.server.config}} prometheus_defaults: file.managed: