From ea4d25f597ec6de6959e245bec506bd937dbbc62 Mon Sep 17 00:00:00 2001 From: Charlie Jacomme Date: Tue, 29 Sep 2015 18:48:48 +0200 Subject: [PATCH] Deleting laserjet and changing cat name --- {munin => archive/munin}/laserjet_ | 0 {munin => archive/munin}/laserjet__etat | 0 {munin => archive/munin}/laserjet__pages | 0 munin/consommables_hp | 2 +- munin/scripts/hosts_plugins.py | 11 +---------- 5 files changed, 2 insertions(+), 11 deletions(-) rename {munin => archive/munin}/laserjet_ (100%) rename {munin => archive/munin}/laserjet__etat (100%) rename {munin => archive/munin}/laserjet__pages (100%) diff --git a/munin/laserjet_ b/archive/munin/laserjet_ similarity index 100% rename from munin/laserjet_ rename to archive/munin/laserjet_ diff --git a/munin/laserjet__etat b/archive/munin/laserjet__etat similarity index 100% rename from munin/laserjet__etat rename to archive/munin/laserjet__etat diff --git a/munin/laserjet__pages b/archive/munin/laserjet__pages similarity index 100% rename from munin/laserjet__pages rename to archive/munin/laserjet__pages diff --git a/munin/consommables_hp b/munin/consommables_hp index a6c6470b..39baec56 100755 --- a/munin/consommables_hp +++ b/munin/consommables_hp @@ -41,7 +41,7 @@ def ffindconsomable(color, raw): if __name__ == '__main__': if 'config' in sys.argv: - print("host_name laserjet") + print("host_name hp") print("graph_category consommables") print("graph_args --lower-limit 0 --upper-limit 100 --rigid") print("graph_title Etat des consommables (pourcentage)") diff --git a/munin/scripts/hosts_plugins.py b/munin/scripts/hosts_plugins.py index 3015ab49..e906835b 100755 --- a/munin/scripts/hosts_plugins.py +++ b/munin/scripts/hosts_plugins.py @@ -118,16 +118,7 @@ hosts_plugins = { "wifi_uptime": "/usr/scripts/wifi_new/munin.py", "wifi_idle": "/usr/scripts/wifi_new/munin.py", "wifi_channels": "/usr/scripts/wifi_new/munin.py", - "laserjet_car": "laserjet_", - "laserjet_car-p": "laserjet_", - "laserjet__etat": "laserjet__etat", - "laserjet_kit": "laserjet_", - "laserjet__pages": "laserjet__pages", - "laserjet_stock-papier": "laserjet_", - "laserjet_stock-papier-p": "laserjet_", - "laserjet_tam": "laserjet_", - "laserjet_tam-p": "laserjet_", - "laserjet_consommables": "consommables_hp", + "hp_consommables": "consommables_hp", # La suite plus bas... }, "news": {