Documentation generation fixes
diff --git a/linux/files/collectd.conf b/linux/files/collectd.conf
deleted file mode 100644
index 56c3106..0000000
--- a/linux/files/collectd.conf
+++ /dev/null
@@ -1,38 +0,0 @@
-
-LoadPlugin cpu
-LoadPlugin df
-LoadPlugin disk
-LoadPlugin entropy
-LoadPlugin interface
-LoadPlugin memory
-LoadPlugin processes
-LoadPlugin swap
-LoadPlugin uptime
-LoadPlugin users
-
-<Plugin df>
-# Device "/dev/sda1"
-# Device "192.168.0.2:/mnt/nfs"
-# MountPoint "/home"
-# FSType "ext3"
-
- # ignore rootfs; else, the root file-system would appear twice, causing
- # one of the updates to fail and spam the log
- FSType rootfs
- # ignore the usual virtual / temporary file-systems
- FSType sysfs
- FSType proc
- FSType devtmpfs
- FSType devpts
- FSType tmpfs
- FSType fusectl
- FSType cgroup
- IgnoreSelected true
-# ReportByDevice false
-# ReportReserved false
-# ReportInodes false
-</Plugin>
-
-<Plugin disk>
- IgnoreSelected true
-</Plugin>
diff --git a/linux/files/sensu.conf b/linux/files/sensu.conf
deleted file mode 100644
index ae4f23b..0000000
--- a/linux/files/sensu.conf
+++ /dev/null
@@ -1,36 +0,0 @@
-local_linux_system_zombie_procs:
- command: "PATH=$PATH:/usr/lib64/nagios/plugins:/usr/lib/nagios/plugins check_procs -w 2 -c 7 -s Z"
- interval: 60
- occurrences: 3
- subscribers:
- - local-linux-system
-local_linux_system_total_procs:
- command: "PATH=$PATH:/usr/lib64/nagios/plugins:/usr/lib/nagios/plugins check_procs -w 1500 -c 3000"
- interval: 60
- occurrences: 5
- subscribers:
- - local-linux-system
-local_linux_system_load:
- command: "PATH=$PATH:/usr/lib64/nagios/plugins:/usr/lib/nagios/plugins check_load -r -w 6,4,2 -c 12,8,4"
- interval: 60
- occurrences: 1
- subscribers:
- - local-linux-system
-local_linux_storage_swap_usage:
- command: "PATH=$PATH:/usr/lib64/nagios/plugins:/usr/lib/nagios/plugins check_swap -a -w 50% -c 20%"
- interval: 60
- occurrences: 1
- subscribers:
- - local-linux-storage
-local_linux_storage_disk_usage:
- command: "PATH=$PATH:/usr/lib64/nagios/plugins:/usr/lib/nagios/plugins check_disk -w 15% -c 5% -p / -p /var -p /usr -p /tmp -p /var/log"
- interval: 60
- occurrences: 1
- subscribers:
- - local-linux-storage
-local_linux_network_fqdn:
- command: "PATH=$PATH:/etc/sensu/plugins check_fqdn.py -n :::hostname::: -f :::fqdn:::"
- interval: 60
- occurrences: 1
- subscribers:
- - local-linux-network
diff --git a/linux/files/sphinx.grain b/linux/files/sphinx.grain
index 6fc2931..f439be9 100644
--- a/linux/files/sphinx.grain
+++ b/linux/files/sphinx.grain
@@ -1,10 +1,10 @@
-{%- set grains = {'sphinx': {'doc': {}}} %}
+{%- set service_grains = {'sphinx': {'doc': {}}} %}
{%- for service_name, service in pillar.items() %}
{%- if service.get('_support', {}).get('sphinx', {}).get('enabled', False) %}
{%- set grains_fragment_file = service_name+'/meta/sphinx.yml' %}
{%- macro load_grains_file() %}{% include grains_fragment_file %}{% endmacro %}
{%- set grains_yaml = load_grains_file()|load_yaml %}
-{%- set _dummy = grains.sphinx.doc.update({ service_name: grains_yaml.doc }) %}
+{%- set _dummy = service_grains.sphinx.doc.update({ service_name: grains_yaml.doc }) %}
{%- endif %}
{%- endfor %}
-{{ grains|yaml(False) }}
\ No newline at end of file
+{{ service_grains|yaml(False) }}
\ No newline at end of file