X-Git-Url: http://dxcluster.net/gitweb/gitweb.cgi?a=blobdiff_plain;f=cmd%2Fmrtg.pl;h=b2f45af4be0c85631d3ce999e881486478d8df95;hb=3c6b5ea97e035155d995e1c1f203e975ae8a1e22;hp=05d426e26266bf2174a08582b4a98b58154e0cee;hpb=c88a557d27612adc84d786427b15c4f0fb1d6ee4;p=spider.git

diff --git a/cmd/mrtg.pl b/cmd/mrtg.pl
index 05d426e2..b2f45af4 100644
--- a/cmd/mrtg.pl
+++ b/cmd/mrtg.pl
@@ -6,7 +6,9 @@
 #
 # The arguments (keywords) to the mrtg command are these
 #
-# a) content          (you always get the node users and nodes)
+# a) content          (you always get the node users and nodes and data in/out)
+#    proc             - get the processor usage
+#    agw              - include the AGW stats separately 
 #    totalspots       - all spots
 #    hfvhf            - all spots split into HF and VHF
 #    wwv              - two graphs of WWV, one SFI and R other A and K
@@ -36,13 +38,62 @@ $want{nomrtg} = 1 if $want{cfgonly} || $want{test};
 return (1, "MRTG not installed") unless $want{nomrtg} || -e '/usr/bin/mrtg' || -e '/usr/local/bin/mrtg';
 
 my $mc = new Mrtg or return (1, "cannot initialise Mrtg $!");
-			 
+
+# do Data in / out totals
+my $din = $Msg::total_in;
+my $dout = $Msg::total_out;
+unless ($want{agw}) {
+	$din += $AGWMsg::total_in;
+	$dout += $AGWMsg::total_out;
+}
+
+$mc->cfgprint('msg', [], 64000, 
+		 "Cluster Data <font color=#00cc00>in</font> and <font color=#0000ff>out</font> of $main::mycall",
+		 'Bytes / Sec', 'Bytes In', 'Bytes Out') unless $want{dataonly};
+$mc->data('msg', $din, $dout, "Data in and out of $main::mycall") unless $want{cfgonly};
+
+# do AGW stats if they apply
+if ($want{agw}) {
+	$mc->cfgprint('agw', [], 64000, 
+				  "AGW Data <font color=#00cc00>in</font> and <font color=#0000ff>out</font> of $main::mycall",
+				  'Bytes / Sec', 'Bytes In', 'Bytes Out') unless $want{dataonly};
+	$mc->data('agw', $AGWMsg::total_in, $AGWMsg::total_out, "AGW Data in and out of $main::mycall") unless $want{cfgonly};
+}
+
+if (!$main::is_win && ($want{proc} || $want{all})) {
+	$ENV{COLUMNS} = 250;
+	my $secs;
+	my $f = new IO::File "ps aux |";
+#	dbg("$f");
+	if ($f) {
+		while (<$f>) {
+			chomp;
+			my $l = $_;
+#			dbg($l);
+			next unless $l =~ m{cluster\.pl$};
+			next if $l =~ m{bash\s+\-c};
+			my @f = split /\s+/, $l;
+#			dbg("$f[9]");
+			my ($m, $s) = split /:/, $f[9];
+			$secs = ($m * 60) + $s;
+			last;
+		}
+		$f->close;
+	}
+	if ($secs) {
+		$mc->cfgprint('proc', [qw(noo perminute)], 5*60, 
+					  "Processor Usage",
+					  'Proc Secs / min', 'Proc Secs', 'Proc Secs') unless $want{dataonly};
+		$mc->data('proc', $secs, $secs, "Processor Usage") unless $want{cfgonly};
+	}
+}
+
 # do the users and nodes
 my $users = DXChannel::get_all_users();
 my $nodes = DXChannel::get_all_nodes();
 
 $mc->cfgprint('users', [qw(unknaszero gauge)], 500, 
-		 "Users and Nodes on $main::mycall",
+		 "<font color=#00cc00>Users</font> and <font color=#0000ff>Nodes</font> on $main::mycall",
 		 'Users / Nodes', 'Users', 'Nodes') unless $want{dataonly};
 $mc->data('users', $users, $nodes, 'Users / Nodes') unless $want{cfgonly};
 
@@ -51,7 +102,7 @@ if ($want{totalusers} || $want{all}) {
 	$nodes = Route::Node::count();
 	$users = Route::User::count();
 	$mc->cfgprint('totalusers', [qw(unknaszero gauge)], 10000, 
-			'Total Users and Nodes in the Visible Cluster Network',
+			'Total <font color=#00cc00>Users</font> and <font color=#0000ff>Nodes</font> in the Visible Cluster Network',
 			 'Users / Nodes', 'Users', 'Nodes') unless $want{dataonly};
 	$mc->data('totalusers', $users, $nodes, 'Total Users and Nodes in the Visible Cluster Network') unless $want{cfgonly};
 }
@@ -59,32 +110,31 @@ if ($want{totalusers} || $want{all}) {
 # do the total spots
 if ($want{totalspots} || $want{all}) {
 	$mc->cfgprint('totalspots',  [qw(unknaszero gauge noi)], 1000, 'Total Spots',
-			 'Spots', 'Spots', 'Spots') unless $want{dataonly};
+			 'Spots / min', 'Spots', 'Spots') unless $want{dataonly};
 	$mc->data('totalspots', $Spot::totalspots, $Spot::totalspots, 'Total Spots') unless $want{cfgonly};
 	$Spot::totalspots = 0;
 }
 
 # do the HF and VHF spots
 if ($want{hfvhf} || $want{all}) {
-	$mc->cfgprint('hfspots', [qw(unknaszero gauge)], 1000, 'HF and VHF+ Spots',
-			 'Spots', 'HF', 'VHF') unless $want{dataonly};
+	$mc->cfgprint('hfspots', [qw(unknaszero gauge)], 1000, '<font color=#00cc00>HF</font> and <font color=#0000ff>VHF+</font> Spots',
+			 'Spots / min', 'HF', 'VHF') unless $want{dataonly};
 	$mc->data('hfspots', $Spot::hfspots, $Spot::vhfspots, 'HF and VHF+ Spots') unless $want{cfgonly};
 	$Spot::hfspots = $Spot::vhfspots = 0;
 }
 
 # wwv stuff
 if ($want{wwv} || $want{all}) {
-	$mc->cfgprint('wwvsfi', [qw(gauge)], 1000, 'WWV SFI and R',
-			 'SFI / R', 'SFI', 'R') unless $want{dataonly};
-	$mc->data('wwvsfi', ($Geomag::r || $WCY::r), ($Geomag::sfi || $WCY::sfi), 'WWV SFI and R') unless $want{cfgonly};
-	$mc->cfgprint('wwvka', [qw(gauge)], 1000, 'WWV A and K',
+	$mc->cfgprint('wwvsfi', [qw(gauge)], 1000, 'WWV <font color=#00cc00>SFI</font> and <font color=#0000ff>R</font>', 'SFI / R', 'SFI', 'R') unless $want{dataonly};
+	$mc->data('wwvsfi', ($Geomag::sfi || $WCY::sfi), ($Geomag::r || $WCY::r), 'WWV SFI and R') unless $want{cfgonly};
+	$mc->cfgprint('wwvka', [qw(gauge)], 1000, 'WWV <font color=#00cc00>A</font> and <font color=#0000ff>K</font>',
 			 'A / K', 'A', 'K') unless $want{dataonly};
 	$mc->data('wwvka', $Geomag::a, $Geomag::k, 'WWV A and K') unless $want{cfgonly};
 }
 
 # WCY stuff
 if ($want{wcy} || $want{all}) {
-	$mc->cfgprint('wcyka', [qw(gauge)], 1000, 'WCY A and K',
+	$mc->cfgprint('wcyka', [qw(gauge)], 1000, 'WCY <font color=#00cc00>A</font> and <font color=#0000ff>K</font>',
 			 'A / K', 'A', 'K') unless $want{dataonly};
 	$mc->data('wcyka', $WCY::a, $WCY::k, 'WCY A and K') unless $want{cfgonly};
 }