Salt-Formulas/munin-formula
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Updated the Munin node config - I fixed the munin node plugin directory source and destination directories for the symlinks

Browse Source
This commit is contained in:
Gregory Ballantine 2017-11-02 10:40:58 -04:00
parent 735b19698e
commit e3b499516e
2 changed files with 13 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
munin/map.jinja
View File

@ -51,7 +51,8 @@
'service': 'munin-node', 'service': 'munin-node',
'config': '/etc/munin/munin-node.conf', 'config': '/etc/munin/munin-node.conf',
'config_src': 'salt://munin/files/munin-node.conf', 'config_src': 'salt://munin/files/munin-node.conf',
'plugin_dir': '/usr/share/munin/plugins', 'plugin_dir': '/etc/munin/plugins',
'plugin_target_dir': '/usr/share/munin/plugins',
'file_user': 'root', 'file_user': 'root',
'file_group': 'root', 'file_group': 'root',
}, },
@ -60,7 +61,8 @@
'service': 'munin-node', 'service': 'munin-node',
'config': '/etc/munin/munin-node.conf', 'config': '/etc/munin/munin-node.conf',
'config_src': 'salt://munin/files/munin-node.conf', 'config_src': 'salt://munin/files/munin-node.conf',
'plugin_dir': '/usr/share/munin/plugins', 'plugin_dir': '/etc/munin/plugins',
'plugin_target_dir': '/usr/share/munin/plugins',
'file_user': 'root', 'file_user': 'root',
'file_group': 'root', 'file_group': 'root',
}, },
@ -69,7 +71,8 @@
'service': 'munin-node', 'service': 'munin-node',
'config': '/etc/munin/munin-node.conf', 'config': '/etc/munin/munin-node.conf',
'config_src': 'salt://munin/files/munin-node.conf', 'config_src': 'salt://munin/files/munin-node.conf',
'plugin_dir': '/usr/share/munin/plugins', 'plugin_dir': '/etc/munin/plugins',
'plugin_target_dir': '/usr/share/munin/plugins',
'file_user': 'root', 'file_user': 'root',
'file_group': 'root', 'file_group': 'root',
}, },
@ -78,7 +81,8 @@
'service': 'munin-node', 'service': 'munin-node',
'config': '/etc/munin/munin-node.conf', 'config': '/etc/munin/munin-node.conf',
'config_src': 'salt://munin/files/munin-node.conf', 'config_src': 'salt://munin/files/munin-node.conf',
'plugin_dir': '/usr/lib/munin/plugins', 'plugin_dir': '/etc/munin/plugins',
'plugin_target_dir': '/usr/lib/munin/plugins',
'file_user': 'root', 'file_user': 'root',
'file_group': 'root', 'file_group': 'root',
}, },
@ -87,7 +91,8 @@
'service': 'munin-node', 'service': 'munin-node',
'config': '/etc/munin/munin-node.conf', 'config': '/etc/munin/munin-node.conf',
'config_src': 'salt://munin/files/munin-node.conf', 'config_src': 'salt://munin/files/munin-node.conf',
'plugin_dir': '/usr/libexec/munin/plugins', 'plugin_dir': '/etc/munin/plugins',
'plugin_target_dir': '/usr/libexec/munin/plugins',
'file_user': 'root', 'file_user': 'root',
'file_group': 'root', 'file_group': 'root',
}, },
@ -97,6 +102,7 @@
'config': '/usr/local/etc/munin/munin-node.conf', 'config': '/usr/local/etc/munin/munin-node.conf',
'config_src': 'salt://munin/files/munin-node.conf', 'config_src': 'salt://munin/files/munin-node.conf',
'plugin_dir': '/usr/local/etc/munin/plugins', 'plugin_dir': '/usr/local/etc/munin/plugins',
'plugin_target_dir': '/usr/local/share/munin/plugins',
'file_user': 'root', 'file_user': 'root',
'file_group': 'wheel', 'file_group': 'wheel',
}, },
@ -139,4 +145,3 @@
'ca_certificate': '/usr/local/etc/munin/tls/cacert.pem', 'ca_certificate': '/usr/local/etc/munin/tls/cacert.pem',
}, },
}, merge=salt['pillar.get']('munin:lookup:tls')) %} }, merge=salt['pillar.get']('munin:lookup:tls')) %}

4
munin/node/plugins.sls
View File

@ -7,7 +7,7 @@ include:
{% for plugin, linked_file in pillar.get('munin_node_common_plugins', {}).items() %} {% for plugin, linked_file in pillar.get('munin_node_common_plugins', {}).items() %}
{{ munin_node.plugin_dir }}/{{ plugin }}: {{ munin_node.plugin_dir }}/{{ plugin }}:
file.symlink: file.symlink:
- target: {{ munin_node.plugin_dir}}/{{ linked_file }} - target: {{ munin_node.plugin_target_dir}}/{{ linked_file }}
- user: {{ munin_node.file_user }} - user: {{ munin_node.file_user }}
- group: {{ munin_node.file_group }} - group: {{ munin_node.file_group }}
- mode: 755 - mode: 755
@ -19,7 +19,7 @@ include:
{% for plugin_name, linked_file in plugin.items() %} {% for plugin_name, linked_file in plugin.items() %}
{{ munin_node.plugin_dir }}/{{ plugin_name }}: {{ munin_node.plugin_dir }}/{{ plugin_name }}:
file.symlink: file.symlink:
- target: {{ munin_node.plugin_dir}}/{{ linked_file }} - target: {{ munin_node.plugin_target_dir}}/{{ linked_file }}
- user: {{ munin_node.file_user }} - user: {{ munin_node.file_user }}
- group: {{ munin_node.file_group }} - group: {{ munin_node.file_group }}
- mode: 755 - mode: 755