[Author Prev][Author Next][Thread Prev][Thread Next][Author Index][Thread Index]

[or-cvs] r16789: {torstatus} (ticket:67) Adding in remaining RRD backend (in torstatus/trunk: . geoip)

To: or-cvs@xxxxxxxxxxxxx
Subject: [or-cvs] r16789: {torstatus} (ticket:67) Adding in remaining RRD backend (in torstatus/trunk: . geoip)
From: kasimir@xxxxxxxx
Date: Sun, 7 Sep 2008 20:19:56 -0400 (EDT)
Delivered-to: archiver@xxxxxxxx
Delivered-to: or-cvs-outgoing@xxxxxxxx
Delivered-to: or-cvs@xxxxxxxx
Delivery-date: Sun, 07 Sep 2008 20:19:59 -0400
Reply-to: or-dev@xxxxxxxxxxxxx
Sender: owner-or-cvs@xxxxxxxxxxxxx

Author: kasimir
Date: 2008-09-07 20:19:55 -0400 (Sun, 07 Sep 2008)
New Revision: 16789

Modified:
   torstatus/trunk/geoip/GeoIP.dat
   torstatus/trunk/tns_update.pl
Log:
(ticket:67) Adding in remaining RRD backend

Modified: torstatus/trunk/geoip/GeoIP.dat
===================================================================
(Binary files differ)

Modified: torstatus/trunk/tns_update.pl
===================================================================
--- torstatus/trunk/tns_update.pl	2008-09-06 09:15:26 UTC (rev 16788)
+++ torstatus/trunk/tns_update.pl	2008-09-08 00:19:55 UTC (rev 16789)
@@ -105,8 +105,8 @@
 {
 
 # Don't die on errors
-#eval
-#{
+eval
+{
 
 # Find the initial time
 my $start_time = time();
@@ -444,7 +444,7 @@
 	{
 		# Format for storing the data:
 		# "time:NUM"
-		my $time = str2time("$1 $2");
+		my $time = str2time("$1 $2","GMT");
 		my $increment = $3;
 		# Find and split the numbers
 		my @nums = reverse(split(/,/,$4));
@@ -455,7 +455,7 @@
 		{
 			my $numtime = $time - $offset;
 			push @readhistory, "$numtime:$num";
-			$offset -= $increment;
+			$offset += $increment;
 		}
 		$currentRouter{'read'} = join(' ',@readhistory);
 
@@ -481,7 +481,7 @@
 	{
 		# Format for storing the data:
 		# "time:NUM"
-		my $time = str2time("$1 $2");
+		my $time = str2time("$1 $2","GMT");
 		my $increment = $3;
 		# Find and split the numbers
 		my @nums = reverse(split(/,/,$4));
@@ -492,7 +492,7 @@
 		{
 			my $numtime = $time - $offset;
 			push @writehistory, "$numtime:$num";
-			$offset -= $increment;
+			$offset += $increment;
 		}
 		$currentRouter{'write'} = join(' ',@writehistory);
 		
@@ -576,7 +576,7 @@
 			{
 				# Format for storing the data:
 				# "time:NUM"
-				my $time = str2time("$1 $2");
+				my $time = str2time("$1 $2","GMT");
 				my $increment = $3;
 				# Find and split the numbers
 				my @nums = reverse(split(/,/,$4));
@@ -587,7 +587,7 @@
 				{
 					my $numtime = $time - $offset;
 					push @readhistory, "$numtime:$num";
-					$offset -= $increment;
+					$offset += $increment;
 				}
 				$currentRouter{'read'} = join(' ',@readhistory);
 			
@@ -612,7 +612,7 @@
 			{
 				# Format for storing the data:
 				# "time:NUM"
-				my $time = str2time("$1 $2");
+				my $time = str2time("$1 $2","GMT");
 				my $increment = $3;
 				# Find and split the numbers
 				my @nums = reverse(split(/,/,$4));
@@ -623,7 +623,7 @@
 				{
 					my $numtime = $time - $offset;
 					push @writehistory, "$numtime:$num";
-					$offset -= $increment;
+					$offset += $increment;
 				}
 				$currentRouter{'write'} = join(' ',@writehistory);
 				
@@ -878,7 +878,7 @@
 $dbh->disconnect();
 close($torSocket);
 
-#};
+};
 if ($@) {
 	print "The TorStatus database was not updated properly.  An error has occured.  I will continue to try to update, however.\n";
 }
@@ -912,26 +912,30 @@
 
 	# Determine whether a bandwidth history file for this router exists
 	my $bwfile = $config{'TNS_Path'} . "bandwidthhistory/$fingerprint.rrd";
-	my $graphfile = $config{'TNS_Path'} . "web/bandwidthgraph/$fingerprint.png";
+	my $graphfile = $config{'TNS_Path'} . "web/bandwidthgraph/$fingerprint";
+	
 	unless (-e $bwfile)
 	{
 		# Create the bandwidth history file
 		# There will be two datasources, read and write
 		#open (my $create_file, ">", $bwfile);
 		#close ($create_file);
-		RRDs::create(
+		my $hbtime = $inc * 2;
+		my $err = RRDs::create(
 			$bwfile,
-			"--start", "1167634800", # start on Jan 1, 2007
-			"--step", "100", #$inc,
+			"--start=1167634800", # start on Jan 1, 2007
+			"--step=$inc",
 			# Add read, write history values
-			"DS:rh:COUNTER:" . $inc . ":U:U",
-			"DS:wh:COUNTER:" . $inc . ":U:U", 
+			"DS:read:GAUGE:$hbtime:U:U",
+			"DS:write:GAUGE:$hbtime:U:U", 
 			# Add RRAs
-			"RRA:AVERAGE:0.5:10:3600",
-			"RRA:AVERAGE:0.5:90:1200",
-			"RRA:AVERAGE:0.5:360:1200",
-			"RRA:AVERAGE:0.5:8640:600"
+			"RRA:AVERAGE:0.5:1:96",
+			"RRA:AVERAGE:0.5:16:42",
+			"RRA:AVERAGE:0.5:96:31",
+			"RRA:AVERAGE:0.5:288:31",
+			"RRA:AVERAGE:0.5:1152:31"
 		);
+		print "RRDs::create error: $err\n" if $err and $err != 1;
 	}
 	# Add the known bandwidth data into the RRD database
 	# Put the bandwidth into a hash to match the rh and wh
@@ -941,7 +945,8 @@
 	foreach my $rhitem (@readarray)
 	{
 		my @rh = split(":",$rhitem);
-		$bandwidth{$rh[0]} = $rh[1] . ":U"; # By default assume 
+		my $rhb = $rh[1]/$inc/1024;
+		$bandwidth{$rh[0]} = $rhb . ":U"; # By default assume 
 						    # no write history
 	}
 	foreach my $whitem (@writearray)
@@ -951,28 +956,84 @@
 		{
 			$bandwidth{$wh[0]} = "U:U";
 		}
-		$bandwidth{$wh[0]} =~ s/\:U/\:$wh[1]/;
+		my $whb = $wh[1]/$inc/1024;
+		$bandwidth{$wh[0]} =~ s/\:U/\:$whb/;
 	}
+	my $lastrow = RRDs::last($bwfile) or 1167634800;
+	
 	# Update the RRD database
-	foreach my $time (sort (keys %bandwidth))
+	foreach my $time (sort { $a <=> $b } (keys %bandwidth))
 	{
-		RRDs::update(
-			$bwfile,
-			$time . ":" . $bandwidth{$time}
-		);
-		my $err = RRDs::error;
-	#	print "RRDs::update error: $err\n" if $err;
+		if ($time > $lastrow)
+		{
+			RRDs::update(
+				$bwfile,
+				$time . ":" . $bandwidth{$time}
+			);
+			my $err = RRDs::error;
+			print "RRDs::update error: $err\n" if $err;
+		}
 	}
 	# Create a new RRD graph for the router
 	RRDs::graph(
-		$graphfile,
-		"--title=Daily Bandwidth for $name",
+		$graphfile . "_y.png",
+		"--title=Past Year's Bandwidth for $name",
 		"--vertical-label=Bandwidth (KBps)",
+		"--height=130",
+		"--lower-limit=0",
+		"--start=end-1y", "--end=now",
+		"DEF:read=$bwfile:read:AVERAGE",
+		"DEF:write=$bwfile:write:AVERAGE",
+		"AREA:read#1111FF:Read History",
+		"LINE2:write#FF8800:Write History"
+	);
+	RRDs::graph(
+		$graphfile . "_3m.png",
+		"--title=Past Three Month's Bandwidth for $name",
+		"--vertical-label=Bandwidth (KBps)",
+		"--height=130",
+		"--lower-limit=0",
+		"--start=end-3m", "--end=now",
+		"DEF:read=$bwfile:read:AVERAGE",
+		"DEF:write=$bwfile:write:AVERAGE",
+		"AREA:read#1111FF:Read History",
+		"LINE2:write#FF8800:Write History"
+	);
+	RRDs::graph(
+		$graphfile . "_m.png",
+		"--title=Past Month's Bandwidth for $name",
+		"--vertical-label=Bandwidth (KBps)",
+		"--height=130",
+		"--lower-limit=0",
+		"--start=end-1m", "--end=now",
+		"DEF:read=$bwfile:read:AVERAGE",
+		"DEF:write=$bwfile:write:AVERAGE",
+		"AREA:read#1111FF:Read History",
+		"LINE2:write#FF8800:Write History"
+	);
+	RRDs::graph(
+		$graphfile . "_w.png",
+		"--title=Past Week's Bandwidth for $name",
+		"--vertical-label=Bandwidth (KBps)",
+		"--height=130",
+		"--lower-limit=0",
+		"--start=end-1w", "--end=now",
+		"DEF:read=$bwfile:read:AVERAGE",
+		"DEF:write=$bwfile:write:AVERAGE",
+		"AREA:read#1111FF:Read History",
+		"LINE2:write#FF8800:Write History"
+	);
+	RRDs::graph(
+		$graphfile . "_d.png",
+		"--title=Past Day's Bandwidth for $name",
+		"--vertical-label=Bandwidth (KBps)",
+		"--height=130",
+		"--lower-limit=0",
 		"--start=end-1d", "--end=now",
-		"DEF:rh=$bwfile:rh:AVERAGE",
-		"DEF:wh=$bwfile:wh:AVERAGE",
-		"LINE1:rh#FF0000:Read History",
-		"LINE1:wh#FFFF00:Write History"
+		"DEF:read=$bwfile:read:AVERAGE",
+		"DEF:write=$bwfile:write:AVERAGE",
+		"AREA:read#1111FF:Read History",
+		"LINE2:write#FF8800:Write History"
 	);
 
 }

Prev by Author: [or-cvs] r16754: {torstatus} (ticket:109) Fixing up INSTALL file instead of adding instal (in torstatus/trunk: . geoip)
Next by Author: [or-cvs] r16792: {torstatus} (ticket:67) Removing such frquent updates to the RRD (torstatus/trunk)
Previous by thread: [or-cvs] r16788: {website} Mainetance/polish translation update. (in website/trunk: docs/pl pl)
Next by thread: [or-cvs] r16790: {torflow} Improved error handling. (torflow/branches/gsoc2008)
Index(es):
- Author
- Thread