Merge branch 'release/1.0.0'

ICGC-TCGA-PanCancer · Nov 18, 2015 · 9bd86a5 · 9bd86a5
2 parents 253273d + 5d1e93b
commit 9bd86a5
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 3 deletions.
diff --git a/roles/server/tasks/main.yml b/roles/server/tasks/main.yml
@@ -11,11 +11,12 @@
 - name: Template over Graphite relay config
   template: src=relay.json.j2 dest=/etc/sensu/conf.d/relay.json
   notify: restart sensu server services
-
+  when: use_grafana
+
 - name: Template checks
   template: src=checks.json.j2 dest=/etc/sensu/conf.d/checks.json
   notify: restart sensu server services
-  
+
 - name: Disk usage metrics
   template: src=disk-usage-metrics.json.j2 dest=/etc/sensu/conf.d/disk-usage-metrics.json
   notify: restart sensu server services
@@ -46,14 +47,17 @@
 
 - name: Create the directory structure needed by the Graphite relay
   file: path=/etc/sensu/extensions/{{item}} owner=root group=root mode=0755 state=directory
+  when: use_grafana
   with_items:
     - mutators
     - handlers
 
 - name: Copy over relay.rb needed by Graphite data collection
   copy: src=relay.rb dest=/etc/sensu/extensions/handlers/relay.rb mode=0644
   notify: restart sensu server services
+  when: use_grafana
 
 - name: Copy over metrics.rb needed by Graphite data collection
   copy: src=metrics.rb dest=/etc/sensu/extensions/mutators/metrics.rb mode=0644
   notify: restart sensu server services
+  when: use_grafana
diff --git a/roles/server/vars/main.yml b/roles/server/vars/main.yml
@@ -1,5 +1,6 @@
 ---
 sensu_password: "seqware"
 rabbit_password: "seqware"
-graphite_host: "54.165.156.160"
+graphite_host: "localhost"
 sensu_server_host: "localhost"
+use_grafana: false