X-Git-Url: http://git.rot13.org/?a=blobdiff_plain;f=gnt-monitor;h=3b43a9555dabcc9a33e5ce8b27aaa9a3ddb84d65;hb=c9dc3e07fe56da7d31ac5be4a08390a76b652a1e;hp=3a1973fa474450371a11c3144a3d9657602dda48;hpb=2719207e7c7f4e0377851b26849e44ab5d90dc9f;p=gnt-info

diff --git a/gnt-monitor b/gnt-monitor
index 3a1973f..3b43a95 100755
--- a/gnt-monitor
+++ b/gnt-monitor
@@ -6,7 +6,7 @@ use POSIX;
 use Time::HiRes qw(time sleep);
 
 my $DEBUG = $ENV{DEBUG} || 0;
-my $INFLUX = $ENV{INFLUX} || 'http://10.80.3.89:8086/write?db=gnt';
+my $INFLUX = $ENV{INFLUX} || 'http://10.80.3.89:8086/write?consistency=any&db=gnt';
 my $INTERVAL = $ENV{INTERVAL} || 1;
 my $DC = $ENV{DC};
 my $RACK = $ENV{RACK};
@@ -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 > 0 && $dt > $INTERVAL;
+sleep $INTERVAL - $dt if $dt > 0 && $dt < $INTERVAL;
 } #/while