[annuaires/munin] rajouts de switchs

This commit is contained in:
Daniel STAN 2013-05-10 19:16:23 +02:00
parent 15bc866616
commit d059fb154b
3 changed files with 31 additions and 29 deletions

View file

@ -37,7 +37,7 @@ file_host=`basename $0 | sed 's/^ping_//g' | sed 's/_/-/g'`
host=${host:-${file_host:-www.google.com}}
if [ "$1" = "config" ]; then
echo host_name `basename $host | sed 's/-//g'`
echo host_name `basename $host`
echo graph_title Ping times from $hostname
echo 'graph_args --base 1000 -l 0'
echo 'graph_vlabel seconds'

View file

@ -101,7 +101,6 @@ hosts_plugins = {
"audimat": "audimat",
"batiments": "batiments",
"munin": "munin",
"ping_multiprise_v6.adm": "ping_",
"stats-ip": "stats-ip",
# La suite plus bas...
},
@ -133,11 +132,12 @@ for bat in annuaires.bat_switchs:
hosts_plugins["dyson"]["stats-batiment_%s" % bat] = "stats-batiment_"
# Ping de tous les switches de bâtiments
for switch in annuaires.all_switchs():
# Suppression du .adm.crans.org
switch = switch[:switch.index('.')]
for switch in annuaires.all_switchs(hide=[]):
# Suppression du .crans.org pour plus de clarté dans les confs
# (tous les switchs n'étant pas sur adm, on garde quand-même ce suffixe)
switch = switch[:switch.rindex('.crans.org')]
switch = switch.replace('-', '_')
hosts_plugins["dyson"]["ping_%s.adm" % switch] = "ping_bat_"
hosts_plugins["dyson"]["ping_%s" % switch] = "ping_bat_"
# On rajoute les stats de connexion
for host in hosts_plugins.keys():