X-Git-Url: http://git.rot13.org/?a=blobdiff_plain;f=gnt-monitor;h=3f1dacc5288136f3a8d9cb0fa295b9816efd9d6d;hb=911e007b09c7af97fb501540fedcd8bf3a64d734;hp=a50d4c1e7f86e6f3bacc4c89110f5288fc05666a;hpb=180777828fbe7177c70d58c7935abcba50eede7f;p=gnt-info

diff --git a/gnt-monitor b/gnt-monitor
index a50d4c1..3f1dacc 100755
--- a/gnt-monitor
+++ b/gnt-monitor
@@ -168,27 +168,29 @@ foreach my $instance ( keys %$stat ) {
 
 	next if $skip->{$instance};
 
-	print $fh qq{cpu,node=$node,instance=$instance$location cpu=$stat->{$instance}->{cpu},ticks=$stat->{$instance}->{ticks} $t\n};
+	print $fh qq{ganeti_cpu,node=$node,instance=$instance$location cpu=$stat->{$instance}->{cpu},ticks=$stat->{$instance}->{ticks} $t\n};
 
 	foreach my $disk ( @{ $stat->{$instance}->{disk} } ) {
-		print $fh qq{disk,node=$node,instance=$instance$location },dump4influx( $disk ), " $t\n";
+		print $fh qq{ganeti_disk,node=$node,instance=$instance$location },dump4influx( $disk ), " $t\n";
 	}
 
 	foreach my $nic ( @{ $stat->{$instance}->{nic} } ) {
 		my $vlan = delete $nic->{vlan};
-		print $fh qq{nic,node=$node,instance=$instance,vlan=${vlan}$location },dump4influx( $nic ), " $t\n";
+		$vlan = 0 unless defined $vlan;
+		print $fh qq{ganeti_nic,node=$node,instance=$instance,vlan=${vlan}$location },dump4influx( $nic ), " $t\n";
 	}
 
 }
 
 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: $? $!";
 }
 
-sleep $INTERVAL - (time() - $begin_t);
+my $dt = time() - $begin_t;
+sleep $INTERVAL - $dt if $dt > 0 && $dt < $INTERVAL;
 } #/while