commit 2c185618c9b0f23313d9835e228e7d87ff4d7af0
author mcp-jenkins <mcp-jenkins@mirantis.com> Thu Jul 11 15:46:24 2019 +0000
committer Gerrit Code Review <mail@domain.com> Thu Jul 11 15:46:24 2019 +0000
tree df470a49f9afb4318b8fd86a3c243bf976b68499
parent 1f55294e420486173d7d992efe29c47faaa8ed87
parent 7986e9ad7026dfb00077032fb079c1c45e5dcaf7

Merge "Set 755 on Prometheus config dir explicitly" into release/2019.2.0

prometheus/init.sls

diff --git a/prometheus/init.sls b/prometheus/init.sls
index 608e759..08f7654 100644
--- a/prometheus/init.sls
+++ b/prometheus/init.sls
@@ -2,7 +2,6 @@
        pillar.prometheus.get('relay', {}).get('enabled', False) or
        pillar.prometheus.get('alerta', {}).get('enabled', False) or
        pillar.prometheus.get('pushgateway', {}).get('enabled', False) or
-       pillar.prometheus.get('sf_notifier', {}).get('enabled', False) or
        pillar.prometheus.get('elasticsearch_exporter', {}).get('enabled', False) or
        pillar.prometheus.alertmanager is defined or
        pillar.prometheus.exporters is defined %}
@@ -19,9 +18,6 @@
   {%- if pillar.prometheus.get('pushgateway', {}).get('enabled', False) %}
   - prometheus.pushgateway
   {%- endif %}
-  {%- if pillar.prometheus.get('sf_notifier', {}).get('enabled', False) %}
-  - prometheus.sf_notifier
-  {%- endif %}
   {%- if pillar.prometheus.get('elasticsearch_exporter', {}).get('enabled', False) %}
   - prometheus.elasticsearch_exporter
   {%- endif %}

prometheus/meta/prometheus.yml

diff --git a/prometheus/meta/prometheus.yml b/prometheus/meta/prometheus.yml
index b8266fd..6607168 100644
--- a/prometheus/meta/prometheus.yml
+++ b/prometheus/meta/prometheus.yml
@@ -1,5 +1,6 @@
 {%- if pillar.prometheus is defined %}
 {%- from "prometheus/map.jinja" import server, alertmanager, remote_storage_adapter, monitoring, relay, sf_notifier with context %}
+{%- if server.get('enabled', False) or remote_storage_adapter.get('enabled', False) or alertmanager.get('enabled', False) or relay.get('enabled', False) or sf_notifier.get('enabled', False) %}
 server:
   alert:
 {%- if server.get('enabled', False) %}
@@ -218,3 +219,4 @@
   {%- endif %}
 {%- endif %}
 {%- endif %}
+{%- endif %}