Cleanup config files

saltstack-formulas · Apr 20, 2019 · 27d6ed3 · 27d6ed3
1 parent 3defa8e
commit 27d6ed3
Show file tree

Hide file tree

Showing 43 changed files with 258 additions and 327 deletions.
diff --git a/collectd/files/apache.conf b/collectd/files/apache.conf
@@ -1,5 +1,4 @@
 {%- from "collectd/map.jinja" import collectd_settings with context %}
-
 #
 # DO NOT EDIT
 #
@@ -9,29 +8,28 @@
 
 LoadPlugin apache
 
-<Plugin apache>
-
+<Plugin "apache">
 {%- for instance in collectd_settings.plugins.apache.instances %}
-        <Instance "{{ instance.name }}">
-                URL "{{ instance.url }}"
-    {%- if instance.user is defined and instance.user %}
-                User "{{ instance.user }}"
-    {%- endif -%}
-    {% if instance.pass is defined and instance.pass %}
-                Password "{{ instance.pass }}"
-    {%- endif -%}    
-    {% if instance.verifypeer is defined and instance.verifypeer %}
-                VerifyPeer {{ instance.verifypeer }}
-    {%- endif -%}
-    {% if instance.verifyhost is defined and instance.verifyhost %}
-                VerifyHost {{ instance.verifyhost | lower }}
-    {%- endif -%}
-    {% if instance.cacert is defined and instance.cacert %}
-                CACert "{{ instance.cacert }}"
-    {%- endif -%}
-    {% if instance.server is defined and instance.server %}
-                Server "{{ instance.server }}"
-    {% endif %}
-        </Instance>
+  <Instance "{{ instance.name }}">
+    URL "{{ instance.url }}"
+{%- if instance.user is defined and instance.user %}
+    User "{{ instance.user }}"
+{%- endif %}
+{%- if instance.pass is defined and instance.pass %}
+    Password "{{ instance.pass }}"
+{%- endif %}
+{%- if instance.verifypeer is defined and instance.verifypeer %}
+    VerifyPeer {{ instance.verifypeer }}
+{%- endif %}
+{%- if instance.verifyhost is defined and instance.verifyhost %}
+    VerifyHost {{ instance.verifyhost | lower }}
+{%- endif %}
+{%- if instance.cacert is defined and instance.cacert %}
+    CACert "{{ instance.cacert }}"
+{%- endif %}
+{%- if instance.server is defined and instance.server %}
+    Server "{{ instance.server }}"
+{% endif %}
+  </Instance>
 {%- endfor %}
 </Plugin>
diff --git a/collectd/files/bind.conf b/collectd/files/bind.conf
@@ -1,5 +1,4 @@
 {%- from "collectd/map.jinja" import collectd_settings with context %}
-
 #
 # DO NOT EDIT
 #
@@ -9,42 +8,42 @@
 
 LoadPlugin bind
 
-<Plugin bind>
-        URL            "{{ collectd_settings.plugins.bind.proto }}://{{ collectd_settings.plugins.bind.host }}:{{ collectd_settings.plugins.bind.port }}/"
-        ParseTime      {{ collectd_settings.plugins.bind.parsetime | lower }}
-        OpCodes        {{ collectd_settings.plugins.bind.opcodes | lower }}
-        QTypes         {{ collectd_settings.plugins.bind.qtypes | lower }}
+<Plugin "bind">
+  URL            "{{ collectd_settings.plugins.bind.proto }}://{{ collectd_settings.plugins.bind.host }}:{{ collectd_settings.plugins.bind.port }}/"
+  ParseTime      {{ collectd_settings.plugins.bind.parsetime | lower }}
+  OpCodes        {{ collectd_settings.plugins.bind.opcodes | lower }}
+  QTypes         {{ collectd_settings.plugins.bind.qtypes | lower }}
 
-        ServerStats    {{ collectd_settings.plugins.bind.serverstats | lower }}
-        ZoneMaintStats {{ collectd_settings.plugins.bind.zonemaintstats | lower }}
-        ResolverStats  {{ collectd_settings.plugins.bind.resolverstats | lower }}
-        MemoryStats    {{ collectd_settings.plugins.bind.memorystats | lower }}
+  ServerStats    {{ collectd_settings.plugins.bind.serverstats | lower }}
+  ZoneMaintStats {{ collectd_settings.plugins.bind.zonemaintstats | lower }}
+  ResolverStats  {{ collectd_settings.plugins.bind.resolverstats | lower }}
+  MemoryStats    {{ collectd_settings.plugins.bind.memorystats | lower }}
 
 {%- if collectd_settings.plugins.bind.views is defined %}
-  {% for view in collectd_settings.plugins.bind.views %}
-    <View "{{ view.name }}">
-    {%- if view.qtypes is defined %}
-        QTypes        {{ view.qtypes | lower }}
-    {%- else %}
-        QTypes        true
-    {%- endif %}
-    {%- if view.resolverstats is defined %}
-        ResolverStats {{ view.resolverstats | lower }}
-    {%- else %}
-        ResolverStats true
-    {%- endif %}
-    {%- if view.cacherrsets is defined %}
-        CacheRRSets   {{ view.cacherrsets | lower }}
-    {%- else %}
-        CacheRRSets   true
-    {%- endif %}
+{% for view in collectd_settings.plugins.bind.views %}
+  <View "{{ view.name }}">
+  {%- if view.qtypes is defined %}
+    QTypes        {{ view.qtypes | lower }}
+  {%- else %}
+    QTypes        true
+  {%- endif %}
+  {%- if view.resolverstats is defined %}
+    ResolverStats {{ view.resolverstats | lower }}
+  {%- else %}
+    ResolverStats true
+  {%- endif %}
+  {%- if view.cacherrsets is defined %}
+    CacheRRSets   {{ view.cacherrsets | lower }}
+  {%- else %}
+    CacheRRSets   true
+  {%- endif %}
 
-    {%- if view.zones is defined %}
-      {% for zone in view.zones %}
-        Zone "{{ zone }}"
-      {%- endfor %}
-    {%- endif %}
-    </View>
+  {%- if view.zones is defined %}
+  {% for zone in view.zones %}
+    Zone "{{ zone }}"
   {%- endfor %}
+  {%- endif %}
+  </View>
+{%- endfor %}
 {%- endif %}
 </Plugin>
diff --git a/collectd/files/collectd.conf b/collectd/files/collectd.conf
@@ -1,5 +1,4 @@
-{%- from "collectd/map.jinja" import collectd_settings with context -%}
-
+{%- from "collectd/map.jinja" import collectd_settings with context %}
 #
 # DO NOT EDIT
 #
@@ -9,19 +8,15 @@
 
 Hostname "{{ collectd_settings.Hostname }}"
 FQDNLookup {{ collectd_settings.FQDNLookup }}
-#BaseDir "/var/lib/collectd"
-#PluginDir "/usr/lib/collectd"
 
 {% for type in collectd_settings.TypesDB %}
 TypesDB "{{ type }}"
 {%- endfor %}
 Interval {{ collectd_settings.Interval }}
 Timeout {{ collectd_settings.Timeout }}
 ReadThreads {{ collectd_settings.ReadThreads }}
-WriteQueueLimitHigh {{ collectd_settings.WriteQueueLimitHigh  }} 
-WriteQueueLimitLow {{ collectd_settings.WriteQueueLimitLow  }}
+WriteQueueLimitHigh {{ collectd_settings.WriteQueueLimitHigh }}
+WriteQueueLimitLow {{ collectd_settings.WriteQueueLimitLow }}
 CollectInternalStats {{ collectd_settings.CollectInternalStats }}
 
-
-
 Include "{{ collectd_settings.plugindirconfig }}/*.conf"
diff --git a/collectd/files/curl_json.conf b/collectd/files/curl_json.conf
@@ -1,5 +1,4 @@
 {%- from "collectd/map.jinja" import collectd_settings with context %}
-
 #
 # DO NOT EDIT
 #
@@ -9,7 +8,7 @@
 
 LoadPlugin curl_json
 
-<Plugin curl_json>
+<Plugin "curl_json">
 {% for block, block_data in collectd_settings.plugins.curl_json.items() %}
   <{{ block }}>
     {%- if block_data.instance is defined %}

diff --git a/collectd/files/curl_xml.conf b/collectd/files/curl_xml.conf
@@ -1,5 +1,4 @@
 {%- from "collectd/map.jinja" import collectd_settings with context %}
-
 #
 # DO NOT EDIT
 #
@@ -9,7 +8,7 @@
 
 LoadPlugin curl_xml
 
-<Plugin curl_xml>
+<Plugin "curl_xml">
 {% for block, block_data in collectd_settings.plugins.curl_xml.items() %}
   <{{ block }}>
     {%- if block_data.host is defined %}

diff --git a/collectd/files/dbi.conf b/collectd/files/dbi.conf
@@ -1,5 +1,4 @@
 {%- from "collectd/map.jinja" import collectd_settings with context %}
-
 #
 # DO NOT EDIT
 #
@@ -9,8 +8,8 @@
 
 LoadPlugin dbi
 
-<Plugin dbi>
-{%- for query in collectd_settings.plugins.dbi.queries  %}
+<Plugin "dbi">
+{%- for query in collectd_settings.plugins.dbi.queries %}
   <Query {{ query.name }}>
     Statement "{{ query.statement }}"
       {%- for res in query.results %}

diff --git a/collectd/files/default.conf b/collectd/files/default.conf
@@ -1,4 +1,4 @@
-{%- from "collectd/map.jinja" import collectd_settings with context -%}
+{%- from "collectd/map.jinja" import collectd_settings with context %}
 #
 # DO NOT EDIT
 #
@@ -7,7 +7,6 @@
 #
 # Loaded by collectd.conf (Include {{ collectd_settings.plugindirconfig }}/*.conf)
 
-
 {% for plugin in collectd_settings.plugins.default %}
 LoadPlugin {{ plugin }}
 {%- endfor %}
diff --git a/collectd/files/df.conf b/collectd/files/df.conf
@@ -1,5 +1,4 @@
 {%- from "collectd/map.jinja" import collectd_settings with context %}
-
 #
 # DO NOT EDIT
 #
@@ -10,29 +9,29 @@
 LoadPlugin df
 
 {%- if collectd_settings.plugins.df.Device is defined and collectd_settings.plugins.df.Device %}
-    {%- do collectd_settings.plugins.df.Devices.append(collectd_settings.plugins.df.Device) %} {# backwards compat #}
+  {%- do collectd_settings.plugins.df.Devices.append(collectd_settings.plugins.df.Device) %} {# backwards compat #}
 {%- endif %}
 
-<Plugin df>
+<Plugin "df">
 {%- for device in collectd_settings.plugins.df.Devices %}
-      Device "{{ device }}"
+  Device "{{ device }}"
 {%- endfor %}
 {%- if collectd_settings.plugins.df.MountPoints is defined and collectd_settings.plugins.df.MountPoints %}
-    {%- for mountpoint in collectd_settings.plugins.df.MountPoints %}
-      MountPoint "{{ mountpoint }}"
-    {%- endfor %}
+  {%- for mountpoint in collectd_settings.plugins.df.MountPoints %}
+  MountPoint "{{ mountpoint }}"
+  {%- endfor %}
 {%- endif %}
 {%- if collectd_settings.plugins.df.FSTypes is defined and collectd_settings.plugins.df.FSTypes %}
-    {%- for fstype in collectd_settings.plugins.df.FSTypes %}
-      FSType "{{ fstype }}"
-    {%- endfor %}
+  {%- for fstype in collectd_settings.plugins.df.FSTypes %}
+  FSType "{{ fstype }}"
+  {%- endfor %}
 {%- endif %}
-      IgnoreSelected "{{ collectd_settings.plugins.df.IgnoreSelected|lower }}"
-      ReportByDevice "{{ collectd_settings.plugins.df.ReportByDevice|lower }}"
+  IgnoreSelected "{{ collectd_settings.plugins.df.IgnoreSelected|lower }}"
+  ReportByDevice "{{ collectd_settings.plugins.df.ReportByDevice|lower }}"
 {%- if not collectd_settings.plugins.df.disable_report_reserved %}
-      # ReportReserved is only supported in old versions of collectd
-      ReportReserved "{{ collectd_settings.plugins.df.ReportReserved|lower }}"
+  # ReportReserved is only supported in old versions of collectd
+  ReportReserved "{{ collectd_settings.plugins.df.ReportReserved|lower }}"
 {%- endif %}
-      ReportInodes "{{ collectd_settings.plugins.df.ReportInodes|lower }}"
-      ValuesPercentage "{{ collectd_settings.plugins.df.ValuesPercentage|lower }}"
+  ReportInodes "{{ collectd_settings.plugins.df.ReportInodes|lower }}"
+  ValuesPercentage "{{ collectd_settings.plugins.df.ValuesPercentage|lower }}"
 </Plugin>
diff --git a/collectd/files/disk.conf b/collectd/files/disk.conf
@@ -1,5 +1,4 @@
 {%- from "collectd/map.jinja" import collectd_settings with context %}
-
 #
 # DO NOT EDIT
 #
@@ -9,9 +8,9 @@
 
 LoadPlugin disk
 
-<Plugin disk>
+<Plugin "disk">
 {%- for match in collectd_settings.plugins.disk.matches %}
-        Disk "{{ match}}"
+  Disk "{{ match}}"
 {%- endfor %}
-        IgnoreSelected "{{ collectd_settings.plugins.disk.IgnoreSelected }}"
+  IgnoreSelected "{{ collectd_settings.plugins.disk.IgnoreSelected }}"
 </Plugin>
diff --git a/collectd/files/elasticsearch.conf b/collectd/files/elasticsearch.conf
@@ -1,19 +1,23 @@
 {%- from "collectd/map.jinja" import collectd_settings with context %}
+#
+# DO NOT EDIT
+#
+# This file is managed by salt via {{ source }}
+# Modify the config that generates this file instead
+#
 
 <LoadPlugin "python">
-    Globals true
+  Globals true
 </LoadPlugin>
 
 <Plugin "python">
-    ModulePath "{{ collectd_settings.moduledirconfig }}"
-
-    Import "elasticsearch"
-
-    <Module "elasticsearch">
-        Host {{ collectd_settings.plugins.elasticsearch.host }}
-        Port {{ collectd_settings.plugins.elasticsearch.port }}
-        Verbose {{ collectd_settings.plugins.elasticsearch.verbose }}
-        Version "{{ collectd_settings.plugins.elasticsearch.version }}"
-        Cluster "{{ collectd_settings.plugins.elasticsearch.cluster }}"
-    </Module>
+  ModulePath "{{ collectd_settings.moduledirconfig }}"
+  Import "elasticsearch"
+  <Module "elasticsearch">
+    Host {{ collectd_settings.plugins.elasticsearch.host }}
+    Port {{ collectd_settings.plugins.elasticsearch.port }}
+    Verbose {{ collectd_settings.plugins.elasticsearch.verbose }}
+    Version "{{ collectd_settings.plugins.elasticsearch.version }}"
+    Cluster "{{ collectd_settings.plugins.elasticsearch.cluster }}"
+  </Module>
 </Plugin>
diff --git a/collectd/files/ethstat.conf b/collectd/files/ethstat.conf
@@ -1,5 +1,4 @@
 {%- from "collectd/map.jinja" import collectd_settings with context %}
-
 #
 # DO NOT EDIT
 #

diff --git a/collectd/files/exec.conf b/collectd/files/exec.conf
@@ -1,5 +1,4 @@
 {%- from "collectd/map.jinja" import collectd_settings with context %}
-
 #
 # DO NOT EDIT
 #

diff --git a/collectd/files/interface.conf b/collectd/files/interface.conf
@@ -1,5 +1,4 @@
 {%- from "collectd/map.jinja" import collectd_settings with context %}
-
 #
 # DO NOT EDIT
 #

diff --git a/collectd/files/java.conf b/collectd/files/java.conf
@@ -1,5 +1,4 @@
 {%- from "collectd/map.jinja" import collectd_settings with context %}
-
 #
 # DO NOT EDIT
 #

diff --git a/collectd/files/librato.conf b/collectd/files/librato.conf
@@ -1,5 +1,4 @@
 {%- from "collectd/map.jinja" import collectd_settings with context %}
-
 #
 # DO NOT EDIT
 #
@@ -9,8 +8,7 @@
 
 LoadPlugin write_http
 
-
-<Plugin write_http>
+<Plugin "write_http">
   <URL "https://collectd.librato.com/v1/measurements">
     User "{{ collectd_settings.plugins.librato.user }}"
     Password "{{ collectd_settings.plugins.librato.token }}"

diff --git a/collectd/files/logfile.conf b/collectd/files/logfile.conf
@@ -1,5 +1,4 @@
 {%- from "collectd/map.jinja" import collectd_settings with context %}
-
 #
 # DO NOT EDIT
 #

diff --git a/collectd/files/md.conf b/collectd/files/md.conf
@@ -1,5 +1,4 @@
 {%- from "collectd/map.jinja" import collectd_settings with context %}
-
 #
 # DO NOT EDIT
 #
@@ -9,9 +8,9 @@
 
 LoadPlugin md
 
-<Plugin md>
+<Plugin "md">
 {%- for device in collectd_settings.plugins.md.Devices %}
-        Device "{{ device }}"
+  Device "{{ device }}"
 {%- endfor %}
-        IgnoreSelected "{{ collectd_settings.plugins.md.IgnoreSelected }}"
+  IgnoreSelected "{{ collectd_settings.plugins.md.IgnoreSelected }}"
 </Plugin>