Fix external network graphs if traffic not goes over red0

diff --git a/config/collectd/collectd.conf b/config/collectd/collectd.conf
index 8a9242f6dec465811377424edea751921aea67c4..01b8a11ecbb79ba9f5fddb7d7558a60ecbb7a707 100644 (file)
--- a/config/collectd/collectd.conf
+++ b/config/collectd/collectd.conf
@@ -27,7 +27,6 @@ LoadPlugin swap
 LoadPlugin syslog
 
 <Plugin interface>
-       Interface "ppp0"
        Interface "lo"
        Interface "ipsec1"
        Interface "ipsec2"

diff --git a/html/cgi-bin/graphs.cgi b/html/cgi-bin/graphs.cgi
index 99d2eca857252c1df2d3890a3004c032d429af10..f2e5ef6550d46a14277cde2d8220d4ffab449278 100644 (file)
--- a/html/cgi-bin/graphs.cgi
+++ b/html/cgi-bin/graphs.cgi
@@ -62,9 +62,9 @@ if ($cgigraphs[1] =~ /disk/){
                  &Graphs::updatediskgraph ("year",$device);}}
 if ($cgigraphs[2] ne "" ) {&Graphs::updatepinggraph("hour",$cgigraphs[1]);&Graphs::updatepinggraph("week",$cgigraphs[1]);&Graphs::updatepinggraph("month",$cgigraphs[1]);&Graphs::updatepinggraph("year",$cgigraphs[1]);}
 if ($cgigraphs[1] =~ /fwhits/) {&Graphs::updatefwhitsgraph("hour");&Graphs::updatefwhitsgraph("week");&Graphs::updatefwhitsgraph("month");&Graphs::updatefwhitsgraph("year");}
-if ($cgigraphs[1] =~ /green/ || $cgigraphs[1] =~ /blue/ || $cgigraphs[1] =~ /ipsec/ || $cgigraphs[1] =~ /orange/ || $cgigraphs[1] =~ /red/ ) {&Graphs::updateifgraph($cgigraphs[1], "hour");&Graphs::updateifgraph($cgigraphs[1], "week");&Graphs::updateifgraph($cgigraphs[1], "month");&Graphs::updateifgraph($cgigraphs[1], "year");}
+if ($cgigraphs[1] =~ /green/ || $cgigraphs[1] =~ /blue/ || $cgigraphs[1] =~ /ipsec/ || $cgigraphs[1] =~ /orange/ || $cgigraphs[1] =~ /ppp/ || $cgigraphs[1] =~ /red/ ) {&Graphs::updateifgraph($cgigraphs[1], "hour");&Graphs::updateifgraph($cgigraphs[1], "week");&Graphs::updateifgraph($cgigraphs[1], "month");&Graphs::updateifgraph($cgigraphs[1], "year");}
 
-if ($cgigraphs[1] =~ /(network|green|blue|orange|red|ipsec)/ || $cgigraphs[2] ne "") {
+if ($cgigraphs[1] =~ /(network|green|blue|orange|red|ppp|ipsec)/ || $cgigraphs[2] ne "") {
        &Header::openpage($Lang::tr{'network traffic graphs'}, 1, '');
 } else {
        &Header::openpage($Lang::tr{'system graphs'}, 1, '');
@@ -72,7 +72,7 @@ if ($cgigraphs[1] =~ /(network|green|blue|orange|red|ipsec)/ || $cgigraphs[2] ne
 
 &Header::openbigbox('100%', 'left');
 
-if ($cgigraphs[1] =~ /(green|blue|orange|red|ipsec|cpu|memory|swap|disk|load|fwhits|processes)/ || $cgigraphs[2] ne "") {
+if ($cgigraphs[1] =~ /(green|blue|orange|red|ppp|ipsec|cpu|memory|swap|disk|load|fwhits|processes)/ || $cgigraphs[2] ne "") {
        my $graph = $cgigraphs[1];
        my $graphname = ucfirst(lc($cgigraphs[1]));
        &Header::openbox('100%', 'center', "$graphname $Lang::tr{'graph'}");
@@ -121,7 +121,7 @@ if ( $cgigraphs[1] eq "cpu" || $cgigraphs[1] eq "load" ) { print "<a href='/cgi-
 elsif ( $cgigraphs[1] eq "memory" || $cgigraphs[1] eq "swap" ) { print "<a href='/cgi-bin/memory.cgi'>"; }
 elsif ( $cgigraphs[1] eq "processes" ) { print "<a href='/cgi-bin/services.cgi'>"; }
 elsif ( $cgigraphs[1] =~ /disk/ ) { print "<a href='/cgi-bin/media.cgi'>"; }
-elsif ( $cgigraphs[1] =~ /red/ || $cgigraphs[1] =~ /ipsec/ ) { print "<a href='/cgi-bin/network.cgi?network=red'>"; }
+elsif ( $cgigraphs[1] =~ /red/ || $cgigraphs[1] =~ /ppp/ || $cgigraphs[1] =~ /ipsec/ ) { print "<a href='/cgi-bin/network.cgi?network=red'>"; }
 elsif ( $cgigraphs[1] =~ /green/ || $cgigraphs[1] =~ /blue/ || $cgigraphs[1] =~ /orange/ ) { print "<a href='/cgi-bin/network.cgi?network=internal'>"; }
 elsif ( $cgigraphs[1] eq "fwhits" || $cgigraphs[2] ne "" ) { print "<a href='/cgi-bin/network.cgi?network=other'>"; }
 print "$Lang::tr{'back'}</a></td></tr></table></div>\n";

diff --git a/html/cgi-bin/network.cgi b/html/cgi-bin/network.cgi
index b191d43e45684bc6000f5cd616fa98857cc960b9..1c34ca769697828c35da450ab724853e0089e1ea 100644 (file)
--- a/html/cgi-bin/network.cgi
+++ b/html/cgi-bin/network.cgi
@@ -51,7 +51,13 @@ $cgiparams[1] = '' unless defined $cgiparams[1];
 
 if ($cgiparams[1] =~ /red/) {
        &Header::openpage($Lang::tr{'network traffic graphs external'}, 1, '');
-       push (@graphs, ($netsettings{'RED_DEV'}));
+       if ($netsettings{'RED_TYPE'} ne 'PPPOE') {
+           if ($netsettings{'RED_DEV'} ne $netsettings{'GREEN_DEV'}) {
+               push (@graphs, ($netsettings{'RED_DEV'}));
+           }
+       } else {
+           push (@graphs, "ppp0");
+       }
        if (-e "/var/log/rrd/collectd/localhost/interface/if_octets-ipsec0.rrd") {push (@graphs, ("ipsec0"));}
 }elsif ($cgiparams[1] =~ /other/) {
        &Header::openpage($Lang::tr{'network traffic graphs others'}, 1, '');