From 3343d4057ca0d89fb7201b3d857036d95f631016 Mon Sep 17 00:00:00 2001 From: Zack Cerza Date: Mon, 26 Jun 2017 13:19:21 -0600 Subject: [PATCH] Name unnamed tasks Signed-off-by: Zack Cerza --- .../ceph-collectd/tasks/install_collectd_plugins.yml | 3 ++- .../roles/ceph-grafana/tasks/configure_carbon.yml | 3 ++- .../roles/ceph-grafana/tasks/configure_grafana.yml | 12 ++++++++---- ansible/roles/ceph-grafana/tasks/grafana_plugins.yml | 3 ++- 4 files changed, 14 insertions(+), 7 deletions(-) diff --git a/ansible/roles/ceph-collectd/tasks/install_collectd_plugins.yml b/ansible/roles/ceph-collectd/tasks/install_collectd_plugins.yml index 5cf05e5..34f7489 100644 --- a/ansible/roles/ceph-collectd/tasks/install_collectd_plugins.yml +++ b/ansible/roles/ceph-collectd/tasks/install_collectd_plugins.yml @@ -1,5 +1,6 @@ --- -- set_fact: +- name: Set collectd_dir + set_fact: collectd_dir: /usr/lib64/collectd/cephmetrics - name: Create collectors directory diff --git a/ansible/roles/ceph-grafana/tasks/configure_carbon.yml b/ansible/roles/ceph-grafana/tasks/configure_carbon.yml index 6a7bbe7..e51a3d6 100644 --- a/ansible/roles/ceph-grafana/tasks/configure_carbon.yml +++ b/ansible/roles/ceph-grafana/tasks/configure_carbon.yml @@ -1,5 +1,6 @@ --- -- set_fact: +- name: Set whisper_retention + set_fact: # Changing collectd_interval is not supported at this time whisper_retention: "{{ collectd_interval|default('10') }}s:7d,1m:30d,15m:5y" diff --git a/ansible/roles/ceph-grafana/tasks/configure_grafana.yml b/ansible/roles/ceph-grafana/tasks/configure_grafana.yml index 8099dd4..1309fb6 100644 --- a/ansible/roles/ceph-grafana/tasks/configure_grafana.yml +++ b/ansible/roles/ceph-grafana/tasks/configure_grafana.yml @@ -39,7 +39,8 @@ wait_for: port: 3000 -- set_fact: +- name: Set grafana_data_source + set_fact: grafana_data_source: > { "name":"{{ graphite.grafana_name }}", @@ -103,17 +104,20 @@ src: dashboard.yml dest: /tmp/dashboard.yml -- set_fact: +- name: Set dashupdate_cmd and dashboard_dir + set_fact: dashupdate_cmd: "python /tmp/dashUpdater.py" dashboard_dir: "/tmp/dashboards" when: devel_mode -- set_fact: +- name: Set dashupdate_cmd and dashboard_dir + set_fact: dashupdate_cmd: "/usr/libexec/cephmetrics/dashUpdater.py" dashboard_dir: "/usr/share/cephmetrics/dashboards" when: not devel_mode -- set_fact: +- name: Set dashupdate_mode + set_fact: dashupdate_mode: "{{ 'refresh' if replace_dashboards else 'update' }}" - name: Push dashboards to Grafana diff --git a/ansible/roles/ceph-grafana/tasks/grafana_plugins.yml b/ansible/roles/ceph-grafana/tasks/grafana_plugins.yml index a58bad0..84dec0d 100644 --- a/ansible/roles/ceph-grafana/tasks/grafana_plugins.yml +++ b/ansible/roles/ceph-grafana/tasks/grafana_plugins.yml @@ -4,7 +4,8 @@ name: /var/lib/grafana/plugins state: directory -- set_fact: +- name: Set grafana_plugins + set_fact: grafana_plugins: "['vonage-status-panel', 'grafana-piechart-panel']" - name: Install Grafana plugins -- 2.47.3