Fixed back link for processes graphs

Added collectd config to core10

git-svn-id: http://svn.ipfire.org/svn/ipfire/branches/2.1/trunk@1275 ea5c0bd1-69bd-2848-81d8-4f18e57aeed8

diff --git a/config/rootfiles/core/10/files b/config/rootfiles/core/10/files
index b0d7b593c8d0e4a631b4ecb83eec4a7ae2b4fbcd..f236d40391c3c454164d0c6a4fca381ec27e9b00 100644 (file)
--- a/config/rootfiles/core/10/files
+++ b/config/rootfiles/core/10/files
@@ -1,3 +1,4 @@
+etc/collectd.conf
 etc/init.d/collectd
 usr/local/bin/wirelessctrl
 srv/web/ipfire/cgi-bin/optionsfw.cgi

diff --git a/html/cgi-bin/graphs.cgi b/html/cgi-bin/graphs.cgi
index 3c1961e59127c96a8c639b1ac1ed80d749d1dec8..1ecc9c62c1c5afabcf0ebc753b93247c1034f5d7 100644 (file)
--- a/html/cgi-bin/graphs.cgi
+++ b/html/cgi-bin/graphs.cgi
@@ -118,6 +118,7 @@ if ($cgigraphs[1] =~ /(green|blue|orange|red|ipsec|lq|cpu|memory|swap|disk|load|
 print "<div align='center'><table width='80%'><tr><td align='center'>";
 if ( $cgigraphs[1] eq "cpu" || $cgigraphs[1] eq "load" ) { print "<a href='/cgi-bin/system.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] =~ /green/ || $cgigraphs[1] =~ /blue/ || $cgigraphs[1] =~ /orange/ ) { print "<a href='/cgi-bin/network.cgi?network=internal'>"; }