diff options
Diffstat (limited to 'net-analyzer/symon/files')
-rw-r--r-- | net-analyzer/symon/files/symon-init.d | 22 | ||||
-rw-r--r-- | net-analyzer/symon/files/symon-symon.conf.patch | 23 | ||||
-rw-r--r-- | net-analyzer/symon/files/symon-symux.conf.patch | 48 | ||||
-rw-r--r-- | net-analyzer/symon/files/symon-syweb-class_lexer.inc.patch | 13 | ||||
-rw-r--r-- | net-analyzer/symon/files/symon-syweb-setup.inc.patch | 24 | ||||
-rw-r--r-- | net-analyzer/symon/files/symon-syweb-total_firewall.layout.patch | 29 |
6 files changed, 159 insertions, 0 deletions
diff --git a/net-analyzer/symon/files/symon-init.d b/net-analyzer/symon/files/symon-init.d new file mode 100644 index 000000000..4a225c52e --- /dev/null +++ b/net-analyzer/symon/files/symon-init.d @@ -0,0 +1,22 @@ +#!/sbin/runscript +# Copyright 1999-2007 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: + +start() { + ebegin "Starting symon" + start-stop-daemon --start --quiet --exec /usr/sbin/symon -- -u + eend ${?} + ebegin "Starting symux" + start-stop-daemon --start --quiet --exec /usr/sbin/symux + eend ${?} +} + +stop() { + ebegin "Stopping symon" + start-stop-daemon --stop --quiet --pidfile /var/run/symon.pid + eend ${?} + ebegin "Stopping symux" + start-stop-daemon --stop --quiet --pidfile /var/run/symux.pid + eend ${?} +} diff --git a/net-analyzer/symon/files/symon-symon.conf.patch b/net-analyzer/symon/files/symon-symon.conf.patch new file mode 100644 index 000000000..8f5e4cb04 --- /dev/null +++ b/net-analyzer/symon/files/symon-symon.conf.patch @@ -0,0 +1,23 @@ +# convert bsd devices to linux +# mbuf, sensor, and proc still not available in linux + +--- symon/symon/symon.conf.orig 2007-12-31 16:56:38.322746920 +0000 ++++ symon/symon/symon.conf 2007-12-31 16:58:39.625398962 +0000 +@@ -4,12 +4,9 @@ + # Demo configuration for symon. See symon(8) for BNF. + + monitor { cpu(0), mem, +- if(lo0), +-# pf, +-# mbuf, +-# sensor(0), +-# proc(httpd), +-# if(xl0), if(de0), if(wi0), +-# io(wd1), io(wd2), io(wd3), io(cd0) +- io(wd0) ++ if(lo), ++ if(eth0), ++# if(eth1) ++# io(hda), io(hdb), io(hdc), io(hdd) ++ io(sda), io(sdb) + } stream to 127.0.0.1 2100 diff --git a/net-analyzer/symon/files/symon-symux.conf.patch b/net-analyzer/symon/files/symon-symux.conf.patch new file mode 100644 index 000000000..c9f03fa6a --- /dev/null +++ b/net-analyzer/symon/files/symon-symux.conf.patch @@ -0,0 +1,48 @@ +--- symon/symux/symux.conf.orig 2007-12-31 17:01:10.393269670 +0000 ++++ symon/symux/symux.conf 2007-12-31 17:27:24.596336305 +0000 +@@ -7,30 +7,28 @@ + + source 127.0.0.1 { + accept { cpu(0), mem, +- if(lo0), +-# pf, +-# mbuf, +-# sensor(0), +-# proc(httpd), +-# if(xl0), if(de0), if(wi0), +-# io(wd1), io(wd2), io(wd3), io(cd0) +- io(wd0) ++ if(lo), ++ if(eth0), ++ # if(eth1) ++ # io(hda), io(hdb), io(hdc), io(hdd) ++ io(sda), io(sdb) + } + ++ datadir "/var/lib/symon/rrds/localhost" + } + + # an example showing the write directive + # + # source 10.0.0.2 { +-# accept { cpu(0), mem, if(sis0), if(sis1), +-# if(lo0), if(wi0), io(wd0) ++# accept { cpu(0), mem, if(eth0), if(eth1), ++# if(lo), if(hda), io(sda) + # } + # +-# write cpu(0) in "/var/www/symon/rrds/4512/cpu0.rrd" +-# write mem in "/var/www/symon/rrds/4512/mem.rrd" +-# write if(sis0) in "/var/www/symon/rrds/4512/if_sis0.rrd" +-# write if(sis1) in "/var/www/symon/rrds/4512/if_sis1.rrd" +-# write if(lo0) in "/var/www/symon/rrds/if_lo0.rrd" +-# write if(wi0) in "/var/www/symon/rrds/4512/if_wi0.rrd" +-# write io(wd0) in "/var/www/symon/rrds/4512/io_wd0.rrd" ++# write cpu(0) in "/var/lib/symon/rrds/hostname/cpu0.rrd" ++# write mem in "/var/lib/symon/rrds/hostname/mem.rrd" ++# write if(eth0) in "/var/lib/symon/rrds/hostname/if_eth0.rrd" ++# write if(eth1) in "/var/lib/symon/rrds/hostname/if_eth1.rrd" ++# write if(lo) in "/var/lib/symon/rrds/hostname/if_lo.rrd" ++# write io(hda) in "/var/lib/symon/rrds/hostname/io_hda.rrd" ++# write io(sda) in "/var/lib/symon/rrds/hostname/io_sda.rrd" + # } diff --git a/net-analyzer/symon/files/symon-syweb-class_lexer.inc.patch b/net-analyzer/symon/files/symon-syweb-class_lexer.inc.patch new file mode 100644 index 000000000..86989fb24 --- /dev/null +++ b/net-analyzer/symon/files/symon-syweb-class_lexer.inc.patch @@ -0,0 +1,13 @@ +# comment layout test since they aren't installed by default (prevents configtest.php from failing) + +--- syweb/htdocs/syweb/class_lexer.inc.orig 2007-04-30 21:04:45.004493630 +0100 ++++ syweb/htdocs/syweb/class_lexer.inc 2007-04-30 21:04:59.267317747 +0100 +@@ -245,7 +245,7 @@ + function _test() { + global $symon; + +- $this->load('hifn_test.layout'); ++ /* $this->load('hifn_test.layout'); */ + while(!$this->eof) { + $token = $this->next_token(); + } diff --git a/net-analyzer/symon/files/symon-syweb-setup.inc.patch b/net-analyzer/symon/files/symon-syweb-setup.inc.patch new file mode 100644 index 000000000..e88e29624 --- /dev/null +++ b/net-analyzer/symon/files/symon-syweb-setup.inc.patch @@ -0,0 +1,24 @@ +# rename directories to reflect the changes from the ebuild and symux.conf file + +--- syweb/htdocs/syweb/setup.inc.orig 2007-04-28 18:13:18.000000000 +0100 ++++ syweb/htdocs/syweb/setup.inc 2007-04-28 18:14:25.000000000 +0100 +@@ -32,11 +32,18 @@ + $symon['layout_dir']='/var/www/symon'; + */ + +-/* running FreeBSD, apache not chrooted: */ ++/* running FreeBSD, apache not chrooted: + $symon['rrdtool_path']='/usr/local/bin/rrdtool'; + $symon['cache_dir']='/usr/local/www/symon/cache'; + $symon['host_tree']='/usr/local/www/symon/rrds'; + $symon['layout_dir']='/usr/local/www/symon'; ++*/ ++ ++/* running Linux, apache not chrooted: */ ++$symon['rrdtool_path']='/usr/bin/rrdtool'; ++$symon['cache_dir']='/var/www/localhost/htdocs/symon/cache'; ++$symon['host_tree']='/var/lib/symon/rrds'; ++$symon['layout_dir']='/var/www/localhost/htdocs/symon/layouts'; + + $symon['cache_duration']=20; + $symon['isolate_hosts']=1; diff --git a/net-analyzer/symon/files/symon-syweb-total_firewall.layout.patch b/net-analyzer/symon/files/symon-syweb-total_firewall.layout.patch new file mode 100644 index 000000000..23f9b860f --- /dev/null +++ b/net-analyzer/symon/files/symon-syweb-total_firewall.layout.patch @@ -0,0 +1,29 @@ +# convert bsd devices to linux +# rename directories to non-chroot + +--- syweb/symon/total_firewall.layout.orig 2007-04-30 19:13:12.967405846 +0100 ++++ syweb/symon/total_firewall.layout 2007-04-30 19:14:55.872706997 +0100 +@@ -8,15 +8,15 @@ + </div>"; + + group name="interfaces", start=1017942400, end=-1; +-graph rrdfile=/symon/rrds/www/if_de0.rrd, title="external if on dikkeaap"; +-graph rrdfile=/symon/rrds/www/if_xl0.rrd, title="internal if on dikkeaap"; ++graph rrdfile=/var/lib/symon/rrds/www/if_eth0.rrd, title="external if on dikkeaap"; ++graph rrdfile=/var/lib/symon/rrds/www/if_eth1.rrd, title="internal if on dikkeaap"; + + group name="cpu and memory", start=1017942400, end=-1; +-graph rrdfile=/symon/rrds/www/cpu0.rrd, title="cpu(0) on dikkeaap"; +-graph rrdfile=/symon/rrds/www/mem.rrd, title="mem on dikkeaap"; ++graph rrdfile=/var/lib/symon/rrds/www/cpu0.rrd, title="cpu(0) on dikkeaap"; ++graph rrdfile=/var/lib/symon/rrds/www/mem.rrd, title="mem on dikkeaap"; + + group name="disks", start=1017942400, end=-1; +-graph rrdfile=/symon/rrds/www/io_wd0.rrd, title="disk 0 on dikkeaap"; +-graph rrdfile=/symon/rrds/www/io_wd1.rrd, title="disk 1 on dikkeaap"; +-graph rrdfile=/symon/rrds/www/io_wd2.rrd, title="disk 2 on dikkeaap"; +-graph rrdfile=/symon/rrds/www/io_wd3.rrd, title="disk 3 on dikkeaap"; ++graph rrdfile=/var/lib/symon/rrds/www/io_hda.rrd, title="disk 0 on dikkeaap"; ++graph rrdfile=/var/lib/symon/rrds/www/io_hdb.rrd, title="disk 1 on dikkeaap"; ++graph rrdfile=/var/lib/symon/rrds/www/io_hdc.rrd, title="disk 2 on dikkeaap"; ++graph rrdfile=/var/lib/symon/rrds/www/io_hdd.rrd, title="disk 3 on dikkeaap"; |