diff options
Diffstat (limited to 'clients')
| -rwxr-xr-x | clients/build-linknets.pl | 2 | ||||
| -rwxr-xr-x | clients/fetch-cubemap-munin.sh | 10 | ||||
| -rwxr-xr-x | clients/ping.pl | 3 | ||||
| -rwxr-xr-x | clients/snmpfetch.pl | 7 | ||||
| -rwxr-xr-x | clients/snmpfetchng.pl | 22 |
5 files changed, 26 insertions, 18 deletions
diff --git a/clients/build-linknets.pl b/clients/build-linknets.pl index 0b116dd..015e006 100755 --- a/clients/build-linknets.pl +++ b/clients/build-linknets.pl @@ -10,7 +10,7 @@ use Net::CIDR; my $dbh = nms::db_connect(); -my $coregws = $dbh->prepare("SELECT switch, ip, community, sysname FROM switches WHERE switchtype <> 'ex2200'") +my $coregws = $dbh->prepare("SELECT switch, ip, community, sysname FROM switches WHERE sysname NOT LIKE 'e%' and sysname NOT LIKE 'sw%creativia%' AND sysname NOT LIKE 'sw%crew'") or die "Can't prepare query: $!"; $coregws->execute; diff --git a/clients/fetch-cubemap-munin.sh b/clients/fetch-cubemap-munin.sh new file mode 100755 index 0000000..7dc1526 --- /dev/null +++ b/clients/fetch-cubemap-munin.sh @@ -0,0 +1,10 @@ +#!/bin/bash +#cp -p "/var/cache/munin/www/tg15.gathering.org/seamus.tg15.gathering.org/cubemap-day.png" "/root/tgmanage/examples/tg15/streamstats/cubemap_seamus_-`date +%Y%m%d_%H%M`.png" +#cp -p "/var/cache/munin/www/tg15.gathering.org/maggie.tg15.gathering.org/cubemap-day.png" "/root/tgmanage/examples/tg15/streamstats/cubemap_maggie_-`date +%Y%m%d_%H%M`.png" + +epoch_to=`date +%s` +let "epoch_from = epoch_to - (60 * 60 * 24)" + +wget -qO"/root/tgmanage/examples/tg15/streamstats/cubemap_maggie_detailed_-`date +%Y%m%d_%H%M`.png" "http://munin.tg15.gathering.org/munin-cgi/munin-cgi-graph/tg15.gathering.org/maggie.tg15.gathering.org/cubemap-pinpoint=$epoch_from,$epoch_to.png?&lower_limit=&upper_limit=&size_x=1280&size_y=720" +wget -qO"/root/tgmanage/examples/tg15/streamstats/cubemap_seamus_detailed_-`date +%Y%m%d_%H%M`.png" "http://munin.tg15.gathering.org/munin-cgi/munin-cgi-graph/tg15.gathering.org/seamus.tg15.gathering.org/cubemap-pinpoint=$epoch_from,$epoch_to.png?&lower_limit=&upper_limit=&size_x=1280&size_y=720" + diff --git a/clients/ping.pl b/clients/ping.pl index 3bbdd8a..8d216ef 100755 --- a/clients/ping.pl +++ b/clients/ping.pl @@ -62,7 +62,6 @@ while (1) { $dbh->pg_putcopyend(); $dbh->commit; - if (0) { # ping linknets $ping = Net::Oping->new; $ping->timeout(0.2); @@ -87,7 +86,5 @@ while (1) { $dbh->pg_putcopyend(); $dbh->commit; - } - sleep 1; } diff --git a/clients/snmpfetch.pl b/clients/snmpfetch.pl index ed332a6..a13ef3f 100755 --- a/clients/snmpfetch.pl +++ b/clients/snmpfetch.pl @@ -217,21 +217,22 @@ sub callback { my $ok = 1; if (!defined($in) || $in !~ /^\d+$/) { if (defined($ine)) { - warn $switch->{'sysname'}.":$port: failed reading in"; + warn $switch->{'sysname'}.":$port: failed reading in ($ine)" . (defined($in) ? ": $in" : ""); } $ok = 0; } if (!defined($out) || $out !~ /^\d+$/) { if (defined($oute)) { - warn $switch->{'sysname'}.":$port: failed reading in"; + warn $switch->{'sysname'}.":$port: failed reading out ($oute)" . (defined($out) ? ": $out" : ""); } $ok = 0; } if (!defined($ifdescr)) { + warn $switch->{'sysname'}.":$port: failed reading ifdescr"; $ok = 0; } elsif ($ifdescr =~ m/\./) { # Skip virtual ports - $ok =0; + $ok = 0; } if ($ok) { diff --git a/clients/snmpfetchng.pl b/clients/snmpfetchng.pl index 8b14c60..67fc1c7 100755 --- a/clients/snmpfetchng.pl +++ b/clients/snmpfetchng.pl @@ -86,13 +86,13 @@ sub inner_loop my $s = new SNMP::Session(DestHost => $switch{'mgtip'}, Community => $switch{'community'}, Version => '2'); - my @vars = (); - push @vars, [ "sysName", 0]; - push @vars, [ "sysDescr", 0]; - push @vars, [ "1.3.6.1.4.1.2636.3.1.13.1.7.7.1.0", 0]; - my $varlist = SNMP::VarList->new(@vars); - $s->get($varlist, [ \&ckcall, \%switch ]); - $s->gettable('ifTable',callback => [\&callback, \%switch]); + my @vars = (); + push @vars, [ "sysName", 0]; + push @vars, [ "sysDescr", 0]; + push @vars, [ "1.3.6.1.4.1.2636.3.1.13.1.7.7.1.0", 0]; + my $varlist = SNMP::VarList->new(@vars); + $s->get($varlist, [ \&ckcall, \%switch ]); + $s->gettable('ifXTable',callback => [\&callback, \%switch]); } mylog( "Added " . @switches . " "); SNMP::MainLoop(5); @@ -120,7 +120,7 @@ sub ckcall } $dbh->commit; } -my @values = ('ifDescr','ifSpeed','ifType','ifOperStatus','ifInErrors','ifOutErrors','ifOutOctets','ifInOctets'); +my @values = ('ifName','ifHighSpeed','ifHCOutOctets','ifHCInOctets'); my $query = "INSERT INTO polls2 (switch,time"; foreach my $val (@values) { $query .= ",$val"; @@ -141,9 +141,9 @@ sub callback my %ifs = (); foreach my $key (keys %{$table}) { - my $descr = $table->{$key}->{'ifDescr'}; + my $descr = $table->{$key}->{'ifName'}; - if ($descr =~ m/(ge|xt|xe)-/ && $descr !~ m/\./) { + if ($descr =~ m/(ge|xe|et)-/ && $descr !~ m/\./) { $ifs{$descr} = $table->{$key}; } } @@ -164,7 +164,7 @@ sub callback or die "Couldn't unlock switch"; $dbh->commit; } - +print $query . "\n"; while (1) { inner_loop(); } |