From 2874a92e6d7bac0fdc43fb6a15b879bb1c201f33 Mon Sep 17 00:00:00 2001 From: Jean-Charles Lopez Date: Wed, 13 Dec 2017 10:00:24 -0300 Subject: [PATCH 1/3] Fix a typo in purge.yml Author JC Lopez Fix. Change /var/lig/graphite-web with /var/lib/graphite-web --- ansible/purge.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 From 95e07c858974e3851c7bafb2c50546eaa7f936fc Mon Sep 17 00:00:00 2001 From: Jean-Charles Lopez Date: Thu, 14 Dec 2017 12:32:32 -0300 Subject: [PATCH 2/3] Update collectd.conf --- etc/collectd.conf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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" From bb92282fe126d2bcf7092bd2d8574ab20998b48d Mon Sep 17 00:00:00 2001 From: Jean-Charles Lopez Date: Thu, 14 Dec 2017 12:35:09 -0300 Subject: [PATCH 3/3] Update configure_collectd.yml --- ansible/roles/ceph-collectd/tasks/configure_collectd.yml | 7 +++++++ 1 file changed, 7 insertions(+) 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 }}"