Merge pull request #408 from phil-davis/master

bandwidthd - rotate log files when output_cdf is enabled

2 files changed, 37 insertions, 7 deletions

diff --git a/config/bandwidthd/bandwidthd.inc b/config/bandwidthd/bandwidthd.inc
index 47a4b1fd..4e0107eb 100644
--- a/config/bandwidthd/bandwidthd.inc
+++ b/config/bandwidthd/bandwidthd.inc
@@ -46,6 +46,8 @@ function bandwidthd_install_deinstall() {
 	exec("rm -f /usr/local/etc/rc.d/bandwidthd*");
 	exec("rm -rf " . PKG_BANDWIDTHD_BASE . "/htdocs");
 	exec("rm -f /usr/local/www/bandwidthd");
+	// Remove the cron job, if it is there
+	install_cron_job("/bin/kill -HUP `cat /var/run/bandwidthd.pid`", false);
 	conf_mount_ro();
 	config_unlock();
 }
@@ -79,7 +81,9 @@ function bandwidthd_install_config() {
 		$recover_cdf = "recover_cdf true\n";
 	$output_cdf = $config['installedpackages']['bandwidthd']['config'][0]['outputcdf'];
 	if($output_cdf)
-		$output_cdf = "output_cdf true\n";
+		$output_cdf_string = "output_cdf true\n";
+	else
+		$output_cdf_string = "";
 	$promiscuous = $config['installedpackages']['bandwidthd']['config'][0]['promiscuous'];
 	if($promiscuous)
 		$promiscuous = "promiscuous true\n";
@@ -180,7 +184,7 @@ $graph_cutoff
 $promiscuous
 
 #Log data to cdf file htdocs/log.cdf
-$output_cdf
+$output_cdf_string
 
 #Read back the cdf file on startup
 $recover_cdf
@@ -297,6 +301,16 @@ EOD;
 	if (!file_exists($bandwidthd_index_file)) {
 		exec("echo \"Please start bandwidthd to populate this directory.\" > " . $bandwidthd_index_file);
 	}
+	
+	if($output_cdf) {
+		// Use cron job to rotate logs every day at 00:01
+		install_cron_job("/bin/kill -HUP `cat /var/run/bandwidthd.pid`", true, "1", "0");
+	}
+	else
+	{
+		// Remove the cron job, if it is there
+		install_cron_job("/bin/kill -HUP `cat /var/run/bandwidthd.pid`", false);
+	}
 	conf_mount_ro();
 	config_unlock();
 	stop_service("bandwidthd");
diff --git a/config/bandwidthd/bandwidthd.xml b/config/bandwidthd/bandwidthd.xml
index f82ac69d..161280cf 100644
--- a/config/bandwidthd/bandwidthd.xml
+++ b/config/bandwidthd/bandwidthd.xml
@@ -96,7 +96,7 @@
 		<field>
 			<fielddescr>Skip intervals</fielddescr>
 			<fieldname>skipintervals</fieldname>
-			<description>Number of intervals (2.5 minute) to skip between graphing. Default 0.</description>
+			<description>Number of intervals to skip between graphing. Default 0. Each interval is 200 seconds = 3 min 20 sec.</description>
 			<type>input</type>
 		</field>
 		<field>
@@ -108,19 +108,20 @@
 		<field>
 			<fielddescr>Promiscuous</fielddescr>
 			<fieldname>promiscuous</fieldname>
-			<description>Put interface in promiscuous mode to score to traffic that may not be routing through the host machine.</description>
+			<description>Put interface in promiscuous mode to see traffic that may not be routing through the host machine.&lt;br&gt;
+			Note: If the interface is connected to a switch then the interface will only see the traffic on its port.</description>
 			<type>checkbox</type>
 		</field>
 		<field>
 			<fielddescr>output_cdf</fielddescr>
 			<fieldname>outputcdf</fieldname>
-			<description>Log data to cdf file htdocs/log.cdf</description>
+			<description>Log data to cdf files log*.cdf</description>
 			<type>checkbox</type>
 		</field>
 		<field>
 			<fielddescr>recover_cdf</fielddescr>
 			<fieldname>recovercdf</fieldname>
-			<description>Read back the cdf file on startup</description>
+			<description>Read back the cdf files on startup</description>
 			<type>checkbox</type>
 		</field>
 		<field>
@@ -139,9 +140,24 @@
 		<field>
 			<fielddescr>Meta Refresh</fielddescr>
 			<fieldname>meta_refresh</fieldname>
-			<description>Set META REFRESH seconds (default 150, use 0 to disable).</description>
+			<description>Sets the interval (seconds) at which the browser graph display refreshes (default 150, use 0 to disable).</description>
 			<type>input</type>
 		</field>
+		<field>
+			<fielddescr>Graph and Log Info</fielddescr>
+			<fieldname>graph_log_info</fieldname>
+			<description>If draw graphs is on, then the daily report and graph html data is regenerated every (skip intervals + 1) * 200 seconds. The data volumes in the report are for the same period as the span of the graph.&lt;br&gt;
+			If output_cdf is on, then a cron job is added to rotate the log files at 00:01 each day. 6 log files are kept for each log frequency (daily, weekly, monthly, yearly). At the respective rotation intervals, the oldest log is deleted, the others are shuffled back and a new log is created.&lt;br&gt;
+			&lt;table cellpadding=1 cellspacing=0 style=&quot;text-align: left;&quot;&gt; &lt;tbody&gt;
+			&lt;tr&gt;&lt;th&gt;  &lt;/th&gt;&lt;th&gt; Data Interval &lt;/th&gt;&lt;th&gt; Graph Span &lt;/th&gt;&lt;th&gt; Log Rotation &lt;/th&gt;&lt;th&gt; Log File Name &lt;/th&gt;&lt;/tr&gt;
+			&lt;tr&gt;&lt;th&gt; Daily &lt;/th&gt;&lt;td&gt; 200 seconds &lt;/td&gt;&lt;td&gt; 2 days &lt;/td&gt;&lt;td&gt; 1 day &lt;/td&gt;&lt;td&gt; log.1.[0-5].cdf &lt;/td&gt;&lt;/tr&gt;
+			&lt;tr&gt;&lt;th&gt; Weekly &lt;/th&gt;&lt;td&gt; 10 minutes &lt;/td&gt;&lt;td&gt; 7 days &lt;/td&gt;&lt;td&gt; 7 days &lt;/td&gt;&lt;td&gt; log.2.[0-5].cdf &lt;/td&gt;&lt;/tr&gt;
+			&lt;tr&gt;&lt;th&gt; Monthly &lt;/th&gt;&lt;td&gt; 1 hour &lt;/td&gt;&lt;td&gt; 35 days &lt;/td&gt;&lt;td&gt; 35 days &lt;/td&gt;&lt;td&gt; log.3.[0-5].cdf &lt;/td&gt;&lt;/tr&gt;
+			&lt;tr&gt;&lt;th&gt; Yearly &lt;/th&gt;&lt;td&gt; 12 hours &lt;/td&gt;&lt;td&gt; 412.5 days &lt;/td&gt;&lt;td&gt; 412.5 days &lt;/td&gt;&lt;td&gt; log.4.[0-5].cdf &lt;/td&gt;&lt;/tr&gt;
+			&lt;/tbody&gt; &lt;/table&gt;
+			</description>
+			<type>info</type>
+		</field>
 	</fields>
 	<custom_php_resync_config_command>
 		bandwidthd_install_config();