Index: /noc/munin/munin.conf =================================================================== --- /noc/munin/munin.conf (revision 1006) +++ /noc/munin/munin.conf (revision 1007) @@ -89,19 +89,29 @@ use_node_name yes +[scripts.mit.edu;sx-blade-4] + address 18.181.0.167 + use_node_name yes + [scripts-LVS;not-forward] address 18.181.0.54 use_node_name yes - cps_www.SCRIPTS_MIT_EDU_BETTER_MOUSETRAP_MIT_EDU.type DERIVE - cps_www.SCRIPTS_MIT_EDU_OLD_FAITHFUL_MIT_EDU.type DERIVE - cps_www.SCRIPTS_CERT_MIT_EDU_BETTER_MOUSETRAP_MIT_EDU.type DERIVE - cps_www.SCRIPTS_CERT_MIT_EDU_OLD_FAITHFUL_MIT_EDU.type DERIVE + update no + cps_www.SCRIPTS_MIT_EDU_BETTER_MOUSETRAP_MIT_EDU.type DERIVE + cps_www.SCRIPTS_MIT_EDU_OLD_FAITHFUL_MIT_EDU.type DERIVE + cps_www.SCRIPTS_MIT_EDU_SX_BLADE_4_MIT_EDU.type DERIVE + cps_www.SCRIPTS_CERT_MIT_EDU_BETTER_MOUSETRAP_MIT_EDU.type DERIVE + cps_www.SCRIPTS_CERT_MIT_EDU_OLD_FAITHFUL_MIT_EDU.type DERIVE + cps_www.SCRIPTS_CERT_MIT_EDU_SX_BLADE_4_MIT_EDU.type DERIVE [scripts-LVS;not-backward] address 18.181.0.55 use_node_name yes - cps_www.SCRIPTS_MIT_EDU_BETTER_MOUSETRAP_MIT_EDU.type DERIVE - cps_www.SCRIPTS_MIT_EDU_OLD_FAITHFUL_MIT_EDU.type DERIVE - cps_www.SCRIPTS_CERT_MIT_EDU_BETTER_MOUSETRAP_MIT_EDU.type DERIVE - cps_www.SCRIPTS_CERT_MIT_EDU_OLD_FAITHFUL_MIT_EDU.type DERIVE + update no + cps_www.SCRIPTS_MIT_EDU_BETTER_MOUSETRAP_MIT_EDU.type DERIVE + cps_www.SCRIPTS_MIT_EDU_OLD_FAITHFUL_MIT_EDU.type DERIVE + cps_www.SCRIPTS_MIT_EDU_SX_BLADE_4_MIT_EDU.type DERIVE + cps_www.SCRIPTS_CERT_MIT_EDU_BETTER_MOUSETRAP_MIT_EDU.type DERIVE + cps_www.SCRIPTS_CERT_MIT_EDU_OLD_FAITHFUL_MIT_EDU.type DERIVE + cps_www.SCRIPTS_CERT_MIT_EDU_SX_BLADE_4_MIT_EDU.type DERIVE [scripts-LVS;rack-forward] @@ -110,6 +120,10 @@ cps_www.SCRIPTS_MIT_EDU_BETTER_MOUSETRAP_MIT_EDU.type DERIVE cps_www.SCRIPTS_MIT_EDU_OLD_FAITHFUL_MIT_EDU.type DERIVE - cps_www.SCRIPTS_CERT_MIT_EDU_BETTER_MOUSETRAP_MIT_EDU.type DERIVE - cps_www.SCRIPTS_CERT_MIT_EDU_OLD_FAITHFUL_MIT_EDU.type DERIVE + cps_www.SCRIPTS_MIT_EDU_SX_BLADE_4_MIT_EDU.type DERIVE + cps_www.SCRIPTS_MIT_EDU_BEES_KNEES_MIT_EDU.type DERIVE + cps_www.SCRIPTS_CERT_MIT_EDU_BETTER_MOUSETRAP_MIT_EDU.type DERIVE + cps_www.SCRIPTS_CERT_MIT_EDU_OLD_FAITHFUL_MIT_EDU.type DERIVE + cps_www.SCRIPTS_CERT_MIT_EDU_SX_BLADE_4_MIT_EDU.type DERIVE + cps_www.SCRIPTS_CERT_MIT_EDU_BEES_KNEES_MIT_EDU.type DERIVE [scripts-LVS;rack-backward] @@ -118,6 +132,10 @@ cps_www.SCRIPTS_MIT_EDU_BETTER_MOUSETRAP_MIT_EDU.type DERIVE cps_www.SCRIPTS_MIT_EDU_OLD_FAITHFUL_MIT_EDU.type DERIVE - cps_www.SCRIPTS_CERT_MIT_EDU_BETTER_MOUSETRAP_MIT_EDU.type DERIVE - cps_www.SCRIPTS_CERT_MIT_EDU_OLD_FAITHFUL_MIT_EDU.type DERIVE + cps_www.SCRIPTS_MIT_EDU_SX_BLADE_4_MIT_EDU.type DERIVE + cps_www.SCRIPTS_CERT_MIT_EDU_BETTER_MOUSETRAP_MIT_EDU.type DERIVE + cps_www.SCRIPTS_CERT_MIT_EDU_OLD_FAITHFUL_MIT_EDU.type DERIVE + cps_www.SCRIPTS_CERT_MIT_EDU_SX_BLADE_4_MIT_EDU.type DERIVE + cps_www.SCRIPTS_MIT_EDU_BEES_KNEES_MIT_EDU.type DERIVE + cps_www.SCRIPTS_CERT_MIT_EDU_BEES_KNEES_MIT_EDU.type DERIVE [scripts-LVS;Aggregated] @@ -130,4 +148,5 @@ cps_www.graph_title Loadbalanced *->www connections cps_www.graph_vlabel connections / ${graph_period} + cps_www.SCRIPTS_MIT_EDU_BETTER_MOUSETRAP_MIT_EDU.draw AREA cps_www.SCRIPTS_MIT_EDU_BETTER_MOUSETRAP_MIT_EDU.type DERIVE @@ -135,4 +154,5 @@ cps_www.SCRIPTS_MIT_EDU_BETTER_MOUSETRAP_MIT_EDU.max 1000 cps_www.SCRIPTS_MIT_EDU_BETTER_MOUSETRAP_MIT_EDU.min 0 + cps_www.SCRIPTS_MIT_EDU_OLD_FAITHFUL_MIT_EDU.draw STACK cps_www.SCRIPTS_MIT_EDU_OLD_FAITHFUL_MIT_EDU.type DERIVE @@ -140,4 +160,29 @@ cps_www.SCRIPTS_MIT_EDU_OLD_FAITHFUL_MIT_EDU.max 1000 cps_www.SCRIPTS_MIT_EDU_OLD_FAITHFUL_MIT_EDU.min 0 + + cps_www.SCRIPTS_MIT_EDU_SX_BLADE_4_MIT_EDU.draw STACK + cps_www.SCRIPTS_MIT_EDU_SX_BLADE_4_MIT_EDU.type DERIVE + cps_www.SCRIPTS_MIT_EDU_SX_BLADE_4_MIT_EDU.label SCRIPTS -> BEES-KNEES + cps_www.SCRIPTS_MIT_EDU_SX_BLADE_4_MIT_EDU.max 1000 + cps_www.SCRIPTS_MIT_EDU_SX_BLADE_4_MIT_EDU.min 0 + + cps_www.SCRIPTS_VHOSTS_MIT_EDU_BETTER_MOUSETRAP_MIT_EDU.draw STACK + cps_www.SCRIPTS_VHOSTS_MIT_EDU_BETTER_MOUSETRAP_MIT_EDU.type DERIVE + cps_www.SCRIPTS_VHOSTS_MIT_EDU_BETTER_MOUSETRAP_MIT_EDU.label SCRIPTS-VHOSTS -> BETTER-MOUSETRAP + cps_www.SCRIPTS_VHOSTS_MIT_EDU_BETTER_MOUSETRAP_MIT_EDU.max 1000 + cps_www.SCRIPTS_VHOSTS_MIT_EDU_BETTER_MOUSETRAP_MIT_EDU.min 0 + + cps_www.SCRIPTS_VHOSTS_MIT_EDU_OLD_FAITHFUL_MIT_EDU.draw STACK + cps_www.SCRIPTS_VHOSTS_MIT_EDU_OLD_FAITHFUL_MIT_EDU.type DERIVE + cps_www.SCRIPTS_VHOSTS_MIT_EDU_OLD_FAITHFUL_MIT_EDU.label SCRIPTS-VHOSTS -> OLD-FAITHFUL + cps_www.SCRIPTS_VHOSTS_MIT_EDU_OLD_FAITHFUL_MIT_EDU.max 1000 + cps_www.SCRIPTS_VHOSTS_MIT_EDU_OLD_FAITHFUL_MIT_EDU.min 0 + +## cps_www.SCRIPTS_VHOSTS_MIT_EDU_SX_BLADE_4_MIT_EDU.draw STACK +## cps_www.SCRIPTS_VHOSTS_MIT_EDU_SX_BLADE_4_MIT_EDU.type DERIVE +## cps_www.SCRIPTS_VHOSTS_MIT_EDU_SX_BLADE_4_MIT_EDU.label SCRIPTS-VHOSTS -> BEES-KNEES +## cps_www.SCRIPTS_VHOSTS_MIT_EDU_SX_BLADE_4_MIT_EDU.max 1000 +## cps_www.SCRIPTS_VHOSTS_MIT_EDU_SX_BLADE_4_MIT_EDU.min 0 + cps_www.SCRIPTS_CERT_MIT_EDU_BETTER_MOUSETRAP_MIT_EDU.draw STACK cps_www.SCRIPTS_CERT_MIT_EDU_BETTER_MOUSETRAP_MIT_EDU.type DERIVE @@ -145,4 +190,5 @@ cps_www.SCRIPTS_CERT_MIT_EDU_BETTER_MOUSETRAP_MIT_EDU.max 1000 cps_www.SCRIPTS_CERT_MIT_EDU_BETTER_MOUSETRAP_MIT_EDU.min 0 + cps_www.SCRIPTS_CERT_MIT_EDU_OLD_FAITHFUL_MIT_EDU.draw STACK cps_www.SCRIPTS_CERT_MIT_EDU_OLD_FAITHFUL_MIT_EDU.type DERIVE @@ -150,4 +196,10 @@ cps_www.SCRIPTS_CERT_MIT_EDU_OLD_FAITHFUL_MIT_EDU.max 1000 cps_www.SCRIPTS_CERT_MIT_EDU_OLD_FAITHFUL_MIT_EDU.min 0 + + cps_www.SCRIPTS_CERT_MIT_EDU_SX_BLADE_4_MIT_EDU.draw STACK + cps_www.SCRIPTS_CERT_MIT_EDU_SX_BLADE_4_MIT_EDU.type DERIVE + cps_www.SCRIPTS_CERT_MIT_EDU_SX_BLADE_4_MIT_EDU.label SCRIPTS-CERT -> BEES-KNEES + cps_www.SCRIPTS_CERT_MIT_EDU_SX_BLADE_4_MIT_EDU.max 1000 + cps_www.SCRIPTS_CERT_MIT_EDU_SX_BLADE_4_MIT_EDU.min 0 cps_www.SCRIPTS_MIT_EDU_BETTER_MOUSETRAP_MIT_EDU.sum \ @@ -163,4 +215,20 @@ not-backward:cps_www.SCRIPTS_MIT_EDU_OLD_FAITHFUL_MIT_EDU + cps_www.SCRIPTS_MIT_EDU_SX_BLADE_4_MIT_EDU.sum \ + rack-forward:cps_www.SCRIPTS_MIT_EDU_SX_BLADE_4_MIT_EDU \ + rack-backward:cps_www.SCRIPTS_MIT_EDU_SX_BLADE_4_MIT_EDU \ + rack-forward:cps_www.SCRIPTS_MIT_EDU_BEES_KNEES_MIT_EDU + +# cps_www.SCRIPTS_VHOSTS_MIT_EDU_BETTER_MOUSETRAP_MIT_EDU.sum \ +# rack-forward:cps_www.SCRIPTS_VHOSTS_MIT_EDU_BETTER_MOUSETRAP_MIT_EDU +## rack-backward:cps_www.SCRIPTS_VHOSTS_MIT_EDU_BETTER_MOUSETRAP_MIT_EDU + +# cps_www.SCRIPTS_VHOSTS_MIT_EDU_OLD_FAITHFUL_MIT_EDU.sum \ +# rack-forward:cps_www.SCRIPTS_VHOSTS_MIT_EDU_OLD_FAITHFUL_MIT_EDU +## rack-backward:cps_www.SCRIPTS_VHOSTS_MIT_EDU_OLD_FAITHFUL_MIT_EDU + +## cps_www.SCRIPTS_VHOSTS_MIT_EDU_SX_BLADE_4_MIT_EDU.sum \ +## rack-forward:cps_www.SCRIPTS_VHOSTS_MIT_EDU_BEES_KNEES_MIT_EDU + cps_www.SCRIPTS_CERT_MIT_EDU_BETTER_MOUSETRAP_MIT_EDU.sum \ rack-forward:cps_www.SCRIPTS_CERT_MIT_EDU_BETTER_MOUSETRAP_MIT_EDU \ @@ -175,21 +243,17 @@ not-backward:cps_www.SCRIPTS_CERT_MIT_EDU_OLD_FAITHFUL_MIT_EDU + cps_www.SCRIPTS_CERT_MIT_EDU_SX_BLADE_4_MIT_EDU.sum \ + rack-forward:cps_www.SCRIPTS_CERT_MIT_EDU_SX_BLADE_4_MIT_EDU \ + rack-backward:cps_www.SCRIPTS_CERT_MIT_EDU_SX_BLADE_4_MIT_EDU \ + rack-forward:cps_www.SCRIPTS_CERT_MIT_EDU_BEES_KNEES_MIT_EDU + cps_www.graph_order SCRIPTS_MIT_EDU_BETTER_MOUSETRAP_MIT_EDU \ SCRIPTS_MIT_EDU_OLD_FAITHFUL_MIT_EDU \ + SCRIPTS_MIT_EDU_SX_BLADE_4_MIT_EDU \ + SCRIPTS_VHOSTS_MIT_EDU_BETTER_MOUSETRAP_MIT_EDU=rack-forward:cps_www.SCRIPTS_VHOSTS_MIT_EDU_BETTER_MOUSETRAP_MIT_EDU \ + SCRIPTS_VHOSTS_MIT_EDU_OLD_FAITHFUL_MIT_EDU=rack-forward:cps_www.SCRIPTS_VHOSTS_MIT_EDU_OLD_FAITHFUL_MIT_EDU \ SCRIPTS_CERT_MIT_EDU_BETTER_MOUSETRAP_MIT_EDU \ - SCRIPTS_CERT_MIT_EDU_OLD_FAITHFUL_MIT_EDU - -# cps_www.graph_order inputtotal outputtotal - -# snmp_ups_power.update no -# snmp_ups_power.graph_args --base 1000 -l 0 -# snmp_ups_power.graph_category UPS -# snmp_ups_power.graph_title Aggregated output power -# snmp_ups_power.graph_vlabel Watts -# snmp_ups_power.output.label Output power -# snmp_ups_power.graph_order output -# snmp_ups_power.output.sum \ -# ups-5a:snmp_ups_ups-5a_power.outputpower \ -# ups-5b:snmp_ups_ups-5b_power.outputpower + SCRIPTS_CERT_MIT_EDU_OLD_FAITHFUL_MIT_EDU \ + SCRIPTS_CERT_MIT_EDU_SX_BLADE_4_MIT_EDU [linerva.mit.edu;linerva] @@ -201,9 +265,66 @@ use_node_name yes +[xvm-prod-sysvms.mit.edu;console] + address 18.181.0.134 + use_node_name yes + +[xvm-prod-sysvms.mit.edu;remote] + address 18.181.0.188 + use_node_name yes + +[xvm-prod-sysvms.mit.edu;xvm] + address 18.181.0.62 + use_node_name yes + +[sipb-xen.mit.edu;sx-blade-2] + address 18.181.0.165 + use_node_name yes + +[xvm-prod-hosts.mit.edu;citadel-station] + address 18.181.0.221 + use_node_name yes + +[xvm-prod-hosts.mit.edu;aperture-science] + address 18.181.0.222 + use_node_name yes + +[xvm-prod-hosts.mit.edu;shadow-moses] + address 18.181.0.223 + use_node_name yes + +[xvm-prod-hosts.mit.edu;arklay-mansion] + address 18.181.0.224 + use_node_name yes + +[lamp.mit.edu;lamp-www] + address 18.89.2.197 + use_node_name yes + +[lamp.mit.edu;lamp-www2] + address 18.181.0.45 + use_node_name yes + +[lamp.mit.edu;lamp-mp3] + address 18.181.0.45 + port 24949 + [mit.edu;syn] address 18.181.0.65 use_node_name yes -[UPS;new-sipb-ups] +[mit.edu;hodge-podge] + address 18.187.1.128 + use_node_name yes + update no + +[sipb.mit.edu;ronald-ann] + address 18.181.0.23 + use_node_name yes + +[sipb.mit.edu;rosebud2] + address 18.181.0.22 + use_node_name yes + +[UPS;childrens-television-workshop] address 18.181.0.65 use_node_name no @@ -212,2 +333,6 @@ address 18.181.0.65 use_node_name no + +[sipb-tor.mit.edu;sipb-tor] + address 18.187.1.68 + use_node_name yes