mikewalch closed pull request #220: Remove dependency on Fluo for Grafana
URL: https://github.com/apache/fluo-muchos/pull/220
This is a PR merged from a forked repository.
As GitHub hides the original diff on merge, it is displayed below for
the sake of provenance:
As this is a foreign pull request (from a fork), the diff is supplied
below (as it won't show otherwise due to GitHub magic):
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)"
----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
[email protected]
With regards,
Apache Git Services
