diff --git a/ansible/purge.yml b/ansible/purge.yml index f640505..be6a489 100644 --- a/ansible/purge.yml +++ b/ansible/purge.yml @@ -31,7 +31,7 @@ state: absent with_items: - /var/lib/graphite - - /var/lig/graphite-web + - /var/lib/graphite-web - /var/lib/grafana - /var/lib/carbon - /etc/grafana/grafana.ini diff --git a/ansible/roles/ceph-collectd/tasks/configure_collectd.yml b/ansible/roles/ceph-collectd/tasks/configure_collectd.yml index 9a295db..e35839b 100644 --- a/ansible/roles/ceph-collectd/tasks/configure_collectd.yml +++ b/ansible/roles/ceph-collectd/tasks/configure_collectd.yml @@ -5,6 +5,13 @@ dest: "{{ collectd_conf }}" notify: Restart collectd +- name: Make sure collected uses shor hostanem in collectd.conf + replace: + dest: "{{ collectd_conf }}" + regexp: 'Hostname ".*"' + replace: 'Hostname "{{ ansible_hostname }}"' + notify: Restart collectd + - name: Set PluginDir in collectd.conf replace: dest: "{{ collectd_conf }}" diff --git a/etc/collectd.conf b/etc/collectd.conf index 5c8a26d..1e9fe10 100644 --- a/etc/collectd.conf +++ b/etc/collectd.conf @@ -1,4 +1,4 @@ -# Hostname "obj-mon-1.storage.lab" +Hostname "obj-mon-1.storage.lab" BaseDir "/var/lib/collectd" PluginDir "/usr/lib64/collectd"