X-Git-Url: http://git.rot13.org/?a=blobdiff_plain;f=gnt-monitor;h=3f1dacc5288136f3a8d9cb0fa295b9816efd9d6d;hb=ac0b6f6f9fa61b843ba9f24475fa277cf2176a14;hp=079948db706048d68c22fe022f087bcd3fb43ae9;hpb=3190489cd088a8aaa9cbc22f40d2a0092f56f5d7;p=gnt-info

diff --git a/gnt-monitor b/gnt-monitor
index 079948d..3f1dacc 100755
--- a/gnt-monitor
+++ b/gnt-monitor
@@ -176,6 +176,7 @@ foreach my $instance ( keys %$stat ) {
 
 	foreach my $nic ( @{ $stat->{$instance}->{nic} } ) {
 		my $vlan = delete $nic->{vlan};
+		$vlan = 0 unless defined $vlan;
 		print $fh qq{ganeti_nic,node=$node,instance=$instance,vlan=${vlan}$location },dump4influx( $nic ), " $t\n";
 	}
 
@@ -183,13 +184,13 @@ foreach my $instance ( keys %$stat ) {
 
 close($fh);
 
-if ( system( 'curl', '-XPOST', $INFLUX, '--data-binary', '@/dev/shm/gnt-monitor.influx' ) == 0 ) {
+if ( system( 'curl', '-s', '-XPOST', $INFLUX, '--data-binary', '@/dev/shm/gnt-monitor.influx' ) == 0 ) {
 } else {
 	rename '/dev/shm/gnt-monitor.influx', '/dev/shm/gnt-monitor.influx.bug.' . scalar glob '/dev/shm/gnt-monitor.influx.bug.*';
 	warn "curl failed: $? $!";
 }
 
 my $dt = time() - $begin_t;
-sleep $INTERVAL - $dt if $dt > $INTERVAL;
+sleep $INTERVAL - $dt if $dt > 0 && $dt < $INTERVAL;
 } #/while