[fluo-muchos] branch master updated: Remove dependency on Fluo for Grafana (#220)

[mw...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

mwalch pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/fluo-muchos.git


The following commit(s) were added to refs/heads/master by this push:
     new 65075c0  Remove dependency on Fluo for Grafana (#220)
65075c0 is described below

commit 65075c05e7384451d0a27e0e0c51340bfa64cb53
Author: Mike Walch <mw...@apache.org>
AuthorDate: Thu Jun 28 12:00:30 2018 -0400

    Remove dependency on Fluo for Grafana (#220)
---
 ansible/roles/grafana/meta/main.yml  | 2 --
 ansible/roles/grafana/tasks/main.yml | 4 ++--
 2 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/ansible/roles/grafana/meta/main.yml b/ansible/roles/grafana/meta/main.yml
deleted file mode 100644
index f76d4d4..0000000
--- a/ansible/roles/grafana/meta/main.yml
+++ /dev/null
@@ -1,2 +0,0 @@
-dependencies:
-  - { role: fluo }
diff --git a/ansible/roles/grafana/tasks/main.yml b/ansible/roles/grafana/tasks/main.yml
index 4a195ce..4af4114 100644
--- a/ansible/roles/grafana/tasks/main.yml
+++ b/ansible/roles/grafana/tasks/main.yml
@@ -14,12 +14,12 @@
 - name: "add cluster dashboard configuration"
   template: src=cluster-dashboard.json dest=/etc/grafana/dashboards/cluster-dashboard.json owner=grafana group=grafana
 - name: "configure fluo dashboards"
-  command: cp {{ fluo_home }}/contrib/grafana/{{ item }} /etc/grafana/dashboards/
+  get_url: url=https://raw.githubusercontent.com/apache/fluo/master/contrib/grafana/{{ item }} dest=/etc/grafana/dashboards/{{ item }}
   with_items:
     - fluo-recent-dashboard.json
     - fluo-historical-dashboard.json
 - name: "configure accumulo dashboards"
-  get_url: url=https://raw.githubusercontent.com/astralway/uno/master/conf/grafana/accumulo-dashboard.json dest=/etc/grafana/dashboards/accumulo-dashboard.json
+  get_url: url=https://raw.githubusercontent.com/apache/fluo-uno/master/conf/grafana/accumulo-dashboard.json dest=/etc/grafana/dashboards/accumulo-dashboard.json
 - name: "ensure owner and group are correct for /etc/grafana"
   file: path=/etc/grafana/ recurse=yes owner=grafana group=grafana
 - name: "ensure grafana is running (and enable it at boot)"