From f6e10c1db16267ec433445e74bc9a03f6bb3dd7e Mon Sep 17 00:00:00 2001
From: Guilhem Moulin <guilhem@fripost.org>
Date: Thu, 11 Jun 2015 10:49:36 +0200
Subject: Use a single LDAP connection per Munin round to collect slapd
 statistics.

Using multigraphs instead.
---
 roles/common-LDAP/tasks/main.yml | 21 ++++++---------------
 1 file changed, 6 insertions(+), 15 deletions(-)

(limited to 'roles/common-LDAP')

diff --git a/roles/common-LDAP/tasks/main.yml b/roles/common-LDAP/tasks/main.yml
index a8c784d..aff0e58 100644
--- a/roles/common-LDAP/tasks/main.yml
+++ b/roles/common-LDAP/tasks/main.yml
@@ -8,7 +8,7 @@
     - ldapvi
     - db-util
     - python-ldap
-    # for the 'slapd2_' munin plugin
+    # for the 'slapd2' munin plugin
     - libnet-ldap-perl
     - libauthen-sasl-perl
 
@@ -137,22 +137,13 @@
         mode=0755
 
 
-- name: Install 'slapd2_' Munin wildcard plugin
-  # we don't install 'slapd_' because it doesn't support SASL binds
-  file: src=/usr/local/share/munin/plugins/slapd2_
-        dest=/etc/munin/plugins/slapd2_{{ item }}
+- name: Install 'slapd2' Munin plugin
+  # we don't install 'slapd_' because it doesn't support SASL binds and
+  # ours is more parcimonious with LDAP connections
+  file: src=/usr/local/share/munin/plugins/slapd2
+        dest=/etc/munin/plugins/slapd2
         owner=root group=root
         state=link force=yes
-  with_items:
-    # sudo /usr/share/munin/plugins/slapd2_ suggest
-    - connections
-    - statistics_entries
-    - operations_diff
-    - statistics_referrals
-    - statistics_pdu
-    - waiters
-    - statistics_bytes
-    - operations
   tags:
     - munin
     - munin-node
-- 
cgit v1.2.3