Merge branch 'master' of ssh://git.maketank.net:2222/chaos/salt-master

base/packages/prometheus/init.sls

@@ -8,13 +8,11 @@ set has_promexporter = salt['pillar.get'](
 # This has to be here, otherwise:
 # https://stackoverflow.com/questions/59268721/saltstack-use-include-twice-in-one-sls-file
 # 
+{%- if 'prometheus-node_exporter' in has_promexporter %}
 include:
-  {%- if 'prometheus-node_exporter' in has_promexporter %}
   - prometheus
   - systemd.reload
-  {%- else %}
-  #- prometheus.clean #Dat klappt nuesch!
-  {%- endif %}
+{%- endif %}
 
 {%- if 'prometheus-node_exporter' in has_promexporter %}
 systemd-prometheus-node-exporter-service-override:
@@ -44,9 +42,12 @@ link-orig-prom-path:
     - require:
       - file: delete-orig-prom-path
 
+{% if grains['oscodename'] != 'bullseye' %}
 patch-smartmon.sh:
   file.managed:
     - name: /usr/share/prometheus-node-exporter/smartmon.sh
     - source: salt://base/packages/prometheus/files/smartmon.sh
     - mode: 0755
+{% endif %}
+
 {%- endif %}