X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=munin%2Fcubemap_input;h=36ac0b4547590fe0a8fd79c7a2d8727d2ecfaa27;hb=fbcf58a8bd9ba5f4e2e4a874cff01b09c39f8fef;hp=00b6ec37513ed9432a1a6cbf33865250b0e64f8a;hpb=209631aff205c124059b9e4ae7e93c3fb7a4194f;p=cubemap

diff --git a/munin/cubemap_input b/munin/cubemap_input
index 00b6ec3..36ac0b4 100755
--- a/munin/cubemap_input
+++ b/munin/cubemap_input
@@ -4,28 +4,46 @@ use strict;
 use warnings;
 use Munin::Plugin;
 
+need_multigraph();
+
 my $input_stats_filename = $ENV{"cubemap_input_stats"} // "/var/lib/cubemap/cubemap-input.stats";
 
 my $mode = $ARGV[0] // "print";
 if ($mode eq 'config') {
+	print "multigraph cubemap_input\n";
 	print "graph_title Cubemap inputs\n";
 	print "graph_category network\n";
-	print "graph_vlabel viewers\n";
+	print "graph_vlabel bits/sec\n";
+
+	print "multigraph cubemap_input_latency\n";
+	print "graph_title Cubemap input latency\n";
+	print "graph_category network\n";
+	print "graph_vlabel ms\n";
 }
 
 open my $stats, "<", $input_stats_filename
 	or die "$input_stats_filename: $!";
 while (<$stats>) {
 	chomp;
-	my ($url, $bytes_received, $data_bytes_received, $connection_time) =
-		/^(\S+) (\d+) (\d+) (-|\d+)/ or die "Invalid stats format";
+	my ($url, $bytes_received, $data_bytes_received, $connection_time, $metadata_bytes_received, $latency) =
+		/^(\S+) (\d+) (\d+) (-|\d+) (\d+) (-|\d+\.\d+)/ or die "Invalid stats format";
 	my $stream_name = stream_name($url);
 	if ($mode eq 'config') {
+		print "multigraph cubemap_input\n";
 		print "${stream_name}.label Data input bitrate of $url\n";
 		print "${stream_name}.type DERIVE\n";
 		print "${stream_name}.min 0\n";
+		print "multigraph cubemap_input_latency\n";
+		print "${stream_name}.label Encoder-to-reflector latency $url (seconds)\n";
+		print "${stream_name}.type GAUGE\n";
+		print "${stream_name}.min 0\n";
 	} else {
+		print "multigraph cubemap_input\n";
 		printf "${stream_name}.value %d\n", $data_bytes_received * 8;
+		if ($latency ne '-') {
+			print "multigraph cubemap_input_latency\n";
+			printf "${stream_name}.value %f\n", $latency * 1000;
+		}
 	}
 }
 close $stats;