Changes...

4 files changed, 11 insertions, 8 deletions

diff --git a/clients/build-linknets.pl b/clients/build-linknets.pl
index 3dc5913..0b116dd 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 <> 'dlink3100'")
+my $coregws = $dbh->prepare("SELECT switch, ip, community, sysname FROM switches WHERE switchtype <> 'ex2200'")
 	or die "Can't prepare query: $!";
 $coregws->execute;
 
diff --git a/clients/lldpdiscover.pl b/clients/lldpdiscover.pl
index f72314e..2f33bd9 100755
--- a/clients/lldpdiscover.pl
+++ b/clients/lldpdiscover.pl
@@ -37,7 +37,7 @@ while (my $ref = $snmpq->fetchrow_hashref) {
 }
 
 # First, find all machines that lack an LLDP chassis ID.
-my $q = $dbh->prepare("SELECT switch, ip, community FROM switches WHERE lldp_chassis_id IS NULL AND ip <> '127.0.0.1'");
+my $q = $dbh->prepare("SELECT switch, ip, community FROM switches WHERE lldp_chassis_id IS NULL AND ip <> '127.0.0.1' and switchtype <> 'ex2200'");
 $q->execute;
 
 while (my $ref = $q->fetchrow_hashref) {
@@ -58,7 +58,7 @@ while (my $ref = $q->fetchrow_hashref) {
 $dbh->commit;
 
 # Now ask all switches for their LLDP neighbor table.
-$q = $dbh->prepare("SELECT ip, sysname, community FROM switches WHERE lldp_chassis_id IS NOT NULL AND ip <> '127.0.0.1' AND switchtype <> 'dlink3100'");
+$q = $dbh->prepare("SELECT ip, sysname, community FROM switches WHERE lldp_chassis_id IS NOT NULL AND ip <> '127.0.0.1' AND switchtype <> 'ex2200'");
 $q->execute;
 
 while (my $ref = $q->fetchrow_hashref) {
diff --git a/clients/smanagrun.pl b/clients/smanagrun.pl
index 9e3c850..0e2302e 100755
--- a/clients/smanagrun.pl
+++ b/clients/smanagrun.pl
@@ -112,10 +112,10 @@ while (1) {
 			my @data;
 			my @commands = split(/[\r\n\000]+/, $row->{cmd});
 			for my $cmd (@commands) {
-				print "sysname: $sysname cmd: $cmd\n";
 				next unless $cmd =~ /\S/; # ignorer linjer med kun whitespace
-				push @data, "# $cmd";
 				$cmd =~ s/%SYSNAME%/$sysname/g;
+				print "sysname: $sysname cmd: $cmd\n";
+				push @data, "# $cmd";
 				if ($cmd =~ /^#\s*require-version\s+(.*\S)\s*$/) {
 					my $required_version = $1;
 					my $version;
diff --git a/clients/snmpfetch.pl b/clients/snmpfetch.pl
index 6eb9eb5..ed332a6 100755
--- a/clients/snmpfetch.pl
+++ b/clients/snmpfetch.pl
@@ -147,8 +147,8 @@ sub poll_loop {
 			push @vars, ["ifInOctets", $port];
 			push @vars, ["ifOutOctets", $port];
 			push @vars, ["ifInErrors", $port];
-			push @vars, ["ifOutErrors", $port];
 			push @vars, ["ifDescr", $port];
+			push @vars, ["ifOutErrors", $port];
 			push @vars, ["ifOperStatus", $port];
 			my $varlist = SNMP::VarList->new(@vars);
 			$session->get($varlist, [ \&callback, $switch_status, $port ]);
@@ -219,16 +219,19 @@ sub callback {
 		if (defined($ine)) {
 			warn $switch->{'sysname'}.":$port: failed reading in";
 		}
-		$ok = 0;	
+		$ok = 0;
 	}
 	if (!defined($out) || $out !~ /^\d+$/) {
 		if (defined($oute)) {
 			warn $switch->{'sysname'}.":$port: failed reading in";
 		}
-		$ok = 0;	
+		$ok = 0;
 	}
 	if (!defined($ifdescr)) {
 		$ok = 0;
+	} elsif ($ifdescr =~ m/\./) {
+		# Skip virtual ports
+		$ok =0;
 	}
 
 	if ($ok) {