From 21f6600811e17cb62dcbe668fce9bbf7cd3af779 Mon Sep 17 00:00:00 2001
From: Ralph Bean <rbean@redhat.com>
Date: Wed, 30 Apr 2014 19:25:20 +0000
Subject: [PATCH] Ridiculous, but collectd exec plugins cannot accept
 arguments.

So we have to template our script and "hardcode" the process we want to
monitor there.
---
 playbooks/groups/notifs-backend.yml                         | 2 ++
 roles/collectd/fedmsg-service/tasks/main.yml                | 6 +++---
 .../{files => templates}/fedmsg-service-collectd.py         | 2 +-
 roles/collectd/fedmsg-service/templates/fedmsg-service.conf | 2 +-
 4 files changed, 7 insertions(+), 5 deletions(-)
 rename roles/collectd/fedmsg-service/{files => templates}/fedmsg-service-collectd.py (98%)

diff --git a/playbooks/groups/notifs-backend.yml b/playbooks/groups/notifs-backend.yml
index 3c5023e49c..448d92e043 100644
--- a/playbooks/groups/notifs-backend.yml
+++ b/playbooks/groups/notifs-backend.yml
@@ -63,6 +63,8 @@
   roles:
   - fedmsg/hub
   - notifs/backend
+  - role: collectd/fedmsg-service
+    process: fedmsg-hub
 
   vars_files: 
    - /srv/web/infra/ansible/vars/global.yml
diff --git a/roles/collectd/fedmsg-service/tasks/main.yml b/roles/collectd/fedmsg-service/tasks/main.yml
index 71018d6e8d..b761ba8375 100644
--- a/roles/collectd/fedmsg-service/tasks/main.yml
+++ b/roles/collectd/fedmsg-service/tasks/main.yml
@@ -2,13 +2,13 @@
 
 - name: Copy in /usr/local/bin/fedmsg-service-collectd
   copy: >
-    src=fedmsg-service-collectd.py
-    dest=/usr/local/bin/fedmsg-service-collectd
+    template=fedmsg-service-collectd.py
+    dest="/usr/local/bin/fedmsg-service-collectd-{{ process }}"
     mode=0755
   notify: restart collectd
 
 - name: Copy in /etc/collectd.d/fedmsg-service.conf
   template: >
     src=fedmsg-service.conf
-    dest=/etc/collectd.d/{{ process }}-conf
+    dest=/etc/collectd.d/{{ process }}.conf
   notify: restart collectd
diff --git a/roles/collectd/fedmsg-service/files/fedmsg-service-collectd.py b/roles/collectd/fedmsg-service/templates/fedmsg-service-collectd.py
similarity index 98%
rename from roles/collectd/fedmsg-service/files/fedmsg-service-collectd.py
rename to roles/collectd/fedmsg-service/templates/fedmsg-service-collectd.py
index 2dcccc6731..067bf9da12 100644
--- a/roles/collectd/fedmsg-service/files/fedmsg-service-collectd.py
+++ b/roles/collectd/fedmsg-service/templates/fedmsg-service-collectd.py
@@ -43,7 +43,7 @@ def print_producer(service, producer):
 
 
 if __name__ == '__main__':
-    service, = sys.argv[-1:]
+    service = "{{ process }}"
     fname = '/var/run/fedmsg/monitoring-%s.socket' % service
 
     if not os.path.exists(fname):
diff --git a/roles/collectd/fedmsg-service/templates/fedmsg-service.conf b/roles/collectd/fedmsg-service/templates/fedmsg-service.conf
index 322006c3e6..117baab328 100644
--- a/roles/collectd/fedmsg-service/templates/fedmsg-service.conf
+++ b/roles/collectd/fedmsg-service/templates/fedmsg-service.conf
@@ -1,4 +1,4 @@
 LoadPlugin exec
 <Plugin exec>
-    Exec "{{ process }}" "/usr/local/bin/fedmsg-service-collectd {{ process }}"
+    Exec "fedmsg" "/usr/local/bin/fedmsg-service-collectd-{{ process }}"
 </Plugin>