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": {