From 699a882e9b1d7d1055d6bab8b0fb563ff416d4f9 Mon Sep 17 00:00:00 2001
From: Daniel STAN <daniel.stan@crans.org>
Date: Sat, 18 May 2013 18:21:00 +0200
Subject: [PATCH] [munin/apt] on graphe le plugin apt

---
 munin/apt                      | 3 +++
 munin/scripts/hosts_plugins.py | 4 +++-
 munin/scripts/link_plugins.py  | 1 -
 munin/vigile                   | 0
 4 files changed, 6 insertions(+), 2 deletions(-)
 create mode 100755 munin/apt
 delete mode 100644 munin/vigile

diff --git a/munin/apt b/munin/apt
new file mode 100755
index 00000000..e08011be
--- /dev/null
+++ b/munin/apt
@@ -0,0 +1,3 @@
+#!/bin/bash
+
+/usr/share/munin/plugins/apt "$@" | grep -v "graph no"
diff --git a/munin/scripts/hosts_plugins.py b/munin/scripts/hosts_plugins.py
index e838aa9c..6db7fe1a 100755
--- a/munin/scripts/hosts_plugins.py
+++ b/munin/scripts/hosts_plugins.py
@@ -73,8 +73,8 @@ hosts_plugins = {
 	"bind9_rndc": "/usr/share/munin/plugins/bind9_rndc",
 	},
     "gordon": {
+        "wifi_clients": "/usr/scripts/wifi_new/munin.py",
         "ap_states": "/usr/scripts/wifi_new/munin.py",
-        "wifi_auth": "/usr/scripts/wifi_new/munin_auth",
 	    "bind9_rndc": "/usr/share/munin/plugins/bind9_rndc"
         },
     "thot": {
@@ -101,6 +101,7 @@ hosts_plugins = {
         "batiments": "batiments",
         "munin": "munin",
         "stats-ip": "stats-ip",
+        "ap_states": "/usr/scripts/wifi_new/munin.py",
         # La suite plus bas...
         },
     "news": {
@@ -113,6 +114,7 @@ hosts_plugins = {
 # Plugins Cr@ns systématiquement rajoutés
 general_plugins = {
     "check_ntp": "check_ntp",
+    'apt': 'apt',
 }
 
 ####
diff --git a/munin/scripts/link_plugins.py b/munin/scripts/link_plugins.py
index bc719d84..fbc0c930 100755
--- a/munin/scripts/link_plugins.py
+++ b/munin/scripts/link_plugins.py
@@ -153,7 +153,6 @@ def add_plugin(plugin):
 
 register_quirk(add_plugin("uptime")) # Coucou MoSaN
 register_quirk(add_plugin("netstat"))
-register_quirk(add_plugin("apt"))
 register_quirk(add_plugin("nfs_client"))
 
 # Hacks sales
diff --git a/munin/vigile b/munin/vigile
deleted file mode 100644
index e69de29b..00000000