From 91b75f4697ebd69e8493c0b8a7f32c65e9b50bc2 Mon Sep 17 00:00:00 2001
From: Andrea Dell'Amico <adellam@sevenseas.org>
Date: Wed, 12 Aug 2015 18:35:41 +0200
Subject: [PATCH] san, xen: monitor the presence of the gmond process.

---
 ganglia/tasks/main.yml | 25 +++++++++----------------
 1 file changed, 9 insertions(+), 16 deletions(-)

diff --git a/ganglia/tasks/main.yml b/ganglia/tasks/main.yml
index b4873dd7..d1976cdb 100644
--- a/ganglia/tasks/main.yml
+++ b/ganglia/tasks/main.yml
@@ -12,18 +12,16 @@
   with_items:
     - ganglia-modules-linux
     - ganglia-monitor-python
-  notify:
-    Restart ganglia monitor
-  when: is_trusty_or_debian7
+  notify: Restart ganglia monitor
+  when: ( is_trusty_or_debian7 ) or ( is_debian8 )
   tags:
     - monitoring
     - ganglia
 
 - name: Distribute the ganglia configuration file for Ubuntu >= 12.04
   template: src=gmond.j2 dest=/etc/ganglia/gmond.conf owner=root group=root mode=444
-  when: is_not_ubuntu_less_than_precise
-  notify:
-    Restart ganglia monitor
+  when: ( is_not_ubuntu_less_than_precise ) or ( is_debian8 )
+  notify: Restart ganglia monitor
   tags:
     - monitoring
     - ganglia
@@ -31,8 +29,7 @@
 - name: Distribute the ganglia configuration file for Debian 7
   template: src=gmond.j2 dest=/etc/ganglia/gmond.conf owner=root group=root mode=444
   when: is_debian7
-  notify:
-    Restart ganglia monitor
+  notify: Restart ganglia monitor
   tags:
     - monitoring
     - ganglia
@@ -40,8 +37,7 @@
 - name: Distribute the ganglia configuration file for Ubuntu < 12.04 and >= 10.04 and Debian 6
   template: src=gmond-3.1.j2 dest=/etc/ganglia/gmond.conf owner=root group=root mode=444
   when: is_ubuntu_between_10_04_and_11_04_and_is_debian_6
-  notify:
-    Restart ganglia monitor
+  notify: Restart ganglia monitor
   tags:
     - monitoring
     - ganglia
@@ -50,8 +46,7 @@
   template: src=gmond-2.5.j2 dest=/etc/gmond.conf owner=root group=root mode=444
   when:
     - is_ubuntu_between_8_and_9_and_is_debian_4
-  notify:
-    Restart ganglia monitor
+  notify: Restart ganglia monitor
   tags:
     - monitoring
     - ganglia
@@ -60,8 +55,7 @@
   template: src=gmond-2.5.j2 dest=/etc/gmond.conf owner=root group=root mode=444
   when:
     - is_broken_hardy_lts
-  notify:
-    Restart ganglia monitor
+  notify: Restart ganglia monitor
   tags:
     - monitoring
     - ganglia
@@ -82,8 +76,7 @@
 
 - name: Setup the ganglia configuration for python modules
   copy: src=modpython.conf dest=/etc/ganglia/conf.d/modpython.conf owner=root group=root mode=0644
-  notify:
-    - Restart ganglia monitor
+  notify: Restart ganglia monitor
   when: is_precise
   tags:
     - monitoring