[freeze break request] Another attempt at fixing collectd on proxies/apache boxes

[Ricky Elrod]

SELinux is blocking collectd from connecting to apache on localhost.
Also our config was missing an Instance tag, which seems to be required,
at least on the rhel7 version of collectd-apache.

I'd like to have this working so we have apache graphs of the release
tomorrow. +1's?

-Ricky


commit 9b3821d1b99df9719e63cdecdb11647966e0635e
Author: Ricky Elrod <codeblock at fedoraproject.org>
Date:   Mon May 25 19:28:08 2015 +0000

    Toggle sebool and fix missing Instance tag to collectd-apache working

    Signed-off-by: Ricky Elrod <codeblock at fedoraproject.org>

diff --git a/roles/collectd/base/files/apache.conf
b/roles/collectd/base/files/apache.conf
index dacd82a..441da4c 100644
--- a/roles/collectd/base/files/apache.conf
+++ b/roles/collectd/base/files/apache.conf
@@ -1,6 +1,8 @@
 LoadPlugin apache

 <Plugin apache>
+  <Instance "apache">
         URL "http://localhost/apache-status?auto"
+  </Instance>
 </Plugin>

diff --git a/roles/collectd/base/tasks/main.yml
b/roles/collectd/base/tasks/main.yml
index 210e7d9..697c8cb 100644
--- a/roles/collectd/base/tasks/main.yml
+++ b/roles/collectd/base/tasks/main.yml
@@ -56,6 +56,14 @@
   - restart collectd
   when: collectd_apache is defined

+- name: Let collectd talk to apache over tcp
+  seboolean: name=collectd_tcp_network_connect state=yes persistent=yes
+  tags:
+  - collectd
+  ignore_errors: True
+  notify:
+  - restart collectd
+  when: collectd_apache is defined

 # Three tasks for handling our (two) custom selinux modules.
 - name: ensure a directory exists for our custom selinux module

-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 819 bytes
Desc: OpenPGP digital signature
URL: <http://lists.fedoraproject.org/pipermail/infrastructure/attachments/20150525/28cfde55/attachment.sig>