Make hostname configurable (#9)
Make hostname configurable
diff --git a/collectd/files/collectd.conf b/collectd/files/collectd.conf
index 8c28563..c839530 100644
--- a/collectd/files/collectd.conf
+++ b/collectd/files/collectd.conf
@@ -15,7 +15,11 @@
# Global settings for the daemon. #
##############################################################################
+{%- if client.use_fqdn %}
Hostname "{{ system.name }}.{{ system.domain }}"
+{%- else %}
+Hostname "{{ system.name }}"
+{%- endif %}
FQDNLookup false
#BaseDir "/var/lib/collectd"
diff --git a/collectd/map.jinja b/collectd/map.jinja
index bdfd1d1..c25b5cb 100644
--- a/collectd/map.jinja
+++ b/collectd/map.jinja
@@ -8,6 +8,7 @@
'read_interval': 60,
'file_logging': True,
'remote_collector': False
+ 'use_fqdn': True,
},
'Debian': {
'pkgs': ['collectd-core', 'snmp', 'python-yaml', 'python-simplejson'],
@@ -17,6 +18,7 @@
'read_interval': 60,
'file_logging': True,
'remote_collector': False
+ 'use_fqdn': True,
},
'RedHat': {
'pkgs': ['collectd', 'collectd-ping', 'net-snmp', 'PyYAML'],
@@ -26,5 +28,6 @@
'read_interval': 60,
'file_logging': True,
'remote_collector': False
+ 'use_fqdn': True,
},
}, merge=salt['pillar.get']('collectd:client')) %}
diff --git a/metadata/service/client/init.yml b/metadata/service/client/init.yml
index cbf9f47..6ef1257 100644
--- a/metadata/service/client/init.yml
+++ b/metadata/service/client/init.yml
@@ -7,3 +7,4 @@
client:
enabled: true
read_interval: 60
+ use_fqdn: true