From 23d0d37087b1d1f1092a2e365569f3f2dfd6175a Mon Sep 17 00:00:00 2001
From: Jordi Sanfeliu <jordi@fibranet.cat>
Date: Mon, 7 Jan 2013 18:11:17 +0100
Subject: [PATCH] initial support of 'traffacct' graph

---
 monitorix      | 25 +++++++++++++------------
 monitorix.conf |  9 ++++-----
 2 files changed, 17 insertions(+), 17 deletions(-)

diff --git a/monitorix b/monitorix
index a22e8cc..99530eb 100755
--- a/monitorix
+++ b/monitorix
@@ -49,7 +49,7 @@ $SIG{'HUP' } = 'HUP_handler';
 $SIG{'ALRM'} = 'ALRM_handler';
 
 use constant VERSION	=> "2.9.9";
-use constant RELDATE	=> "31-Dec-2012";
+use constant RELDATE	=> "01-Jan-2013";
 
 my @suppsys = ("Linux", "FreeBSD", "OpenBSD", "NetBSD");
 my %config;
@@ -165,7 +165,6 @@ sub create_index {
 	my $n;
 	my $gname;
 	my $theme = $config{theme};
-	my %multihost = %{$config{multihost}};
 	my $bgcolor;
 	my $table_back_color;
 	my $title_back_color;
@@ -232,18 +231,20 @@ EOF
 
 	print(OUT "        <td bgcolor='$bgcolor'>\n");
 	print(OUT "          <select name='mode' size='1'>\n");
-	print(OUT "            <option value='localhost'>Local Host</option>\n");
+	print(OUT "            <optgroup label='Local Host'>\n");
+	print(OUT "            <option value='localhost'>localhost</option>\n");
+	print(OUT "            </optgroup>\n");
 
-	if(scalar(my @remotehost_list = split(',', $multihost{remotehost_list})) && lc($multihost{enabled}) eq "y") {
+	if(scalar(my @remotehost_list = split(',', $config{multihost}->{remotehost_list})) && lc($config{multihost}->{enabled}) eq "y") {
 		print(OUT "            <optgroup label='Multihost'>\n");
-		print(OUT "            <option value='multihost.all'>All Hosts</option>\n");
+		print(OUT "            <option value='multihost.all'>All</option>\n");
 		for($n = 0; $n < scalar(@remotehost_list); $n++) {
 			print(OUT "              <option value='multihost.$n'>" . trim($remotehost_list[$n]) . "</option>\n");
                               }
 		print(OUT "            </optgroup>\n");
 
-		if(lc($multihost{groups}) eq "y" ) {
-			my @remotegroup_list = split(',', $multihost{remotegroup_list});
+		if(lc($config{multihost}->{groups}) eq "y" ) {
+			my @remotegroup_list = split(',', $config{multihost}->{remotegroup_list});
 			print(OUT "            <optgroup label='Multihost-Groups'>\n");
 			print(OUT "            <option value='multihost.group'>All Groups</option>\n");
 			for($n = 0; $n < scalar(@remotegroup_list); $n++) {
@@ -253,11 +254,11 @@ EOF
 		}
 	}
 
-	if(scalar(my @pc_list = split(',', $config{pc_list})) && lc($config{graph_enable}->{pc}) eq "y") {
-		print(OUT "            <optgroup label='LAN PCs'>\n");
-		print(OUT "              <option value='pc.all'>All LAN PCs</option>\n");
-		for($n = 0; $n < scalar(@pc_list); $n++) {
-			print(OUT "              <option value='pc.$n'>" . trim($pc_list[$n]) . "</option>\n");
+	if(scalar(my @tfl = split(',', $config{traffacct}->{list})) && lc($config{traffacct}->{enabled}) eq "y") {
+		print(OUT "            <optgroup label='Traffic Accounting'>\n");
+		print(OUT "              <option value='traffacct.all'>All</option>\n");
+		for($n = 0; $n < scalar(@tfl); $n++) {
+			print(OUT "              <option value='traffacct.$n'>" . trim($tfl[$n]) . "</option>\n");
                               }
 		print(OUT "            </optgroup>\n");
 	}
diff --git a/monitorix.conf b/monitorix.conf
index 3115245..4e34a70 100644
--- a/monitorix.conf
+++ b/monitorix.conf
@@ -78,7 +78,6 @@ alert_rootfs_script = /path/to/script.sh
 	fail2ban	= n
 	icecast		= n
 	int		= y
-	pc		= n
 </graph_enable>
 
 
@@ -400,9 +399,10 @@ alert_rootfs_script = /path/to/script.sh
 </int>
 
 
-# PC LAN Internet traffic accounting
+# TRAFFACCT graph
 # -----------------------------------------------------------------------------
-<pc>
+<traffacct>
+	enabled = n
 	max = 10
 	graphs_per_row = 2
 	enable_monthly_reports = n
@@ -417,13 +417,12 @@ alert_rootfs_script = /path/to/script.sh
 	</desc>
 	rigid = 0
 	limit = 100
-</pc>
+</traffacct>
 
 
 # Multihost
 # -----------------------------------------------------------------------------
 <multihost>
-	enabled = n
 	footer_url = y
 	graphs_per_row = 2
 	remotehost_list = server 1, server 2, server 3