net-analyzer/symon: Prettify the configuration files, add resources for MP machines...

svn path=/sunrise/; revision=5856

diff --git a/net-analyzer/symon/ChangeLog b/net-analyzer/symon/ChangeLog
index 21e502a91839c210759b6486d94c0965dc836eeb..d58eb0543ac35017295b5d80c8cf0ce542635ccc 100644 (file)
--- a/net-analyzer/symon/ChangeLog
+++ b/net-analyzer/symon/ChangeLog
@@ -2,6 +2,11 @@
 # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+  18 Mar 2008; Tiago Cunha (tcunha) <me@tiagocunha.org>
+  files/symon-symon.conf.patch, files/symon-symux.conf.patch:
+  Prettify the configuration files, add resources for MP machines, while there
+  insert missing comments to document the patch purpose
+
   18 Mar 2008; Tiago Cunha (tcunha) <me@tiagocunha.org>
   files/symon-syweb-class_lexer.inc.patch,
   files/symon-syweb-setup.inc.patch,

diff --git a/net-analyzer/symon/Manifest b/net-analyzer/symon/Manifest
index f32682b32dc80ac1a205456b371c9b766a72730f..7e7b31057f2f5b27d62c842e96b9d3f68ad0af97 100644 (file)
--- a/net-analyzer/symon/Manifest
+++ b/net-analyzer/symon/Manifest
@@ -1,6 +1,6 @@
 AUX symon-init.d 384 RMD160 779f0410c9ef4ec7ff83a8c4bd80949edd9ee5df SHA1 a60201406a2072a24458fc4ab6ef7af1a35e1c86 SHA256 13b9d627df34708ae4f436a8d10729c809f71d05ecd9f593a47cd6bf161eff28
-AUX symon-symon.conf.patch 610 RMD160 edc2d9ff502ebab575ebb63454b789e306a4ad01 SHA1 49cfe13a2b179781dfb2ccf8f0f037fcc2da0d2f SHA256 8a3c1e03bf5f5456e230556acd16490ca96cb3de1104983012db7d8738bdc560
-AUX symon-symux.conf.patch 1599 RMD160 5131d2679001db3cb440817ec3e000be6f59184e SHA1 fbb36356ea952778d24ec78ad19f0db4b95d808a SHA256 dec14b8c29e183900a74b20eb69f9ad4c20f5988cbcea4175de1728fff18b75d
+AUX symon-symon.conf.patch 669 RMD160 b0f53dfbf6eaba2c292e6e9f9f91625f26498683 SHA1 5523fbc4db46114197c3e020c74c72822b93e545 SHA256 603b471778ec84f2ebbb57b5718a8624fb748ca5c6dde36f4943156acf9a2b10
+AUX symon-symux.conf.patch 1858 RMD160 8882ef430e763791a47be90a1460f85550cc3e8b SHA1 0734a88eb4e4da0e91909c2120ebd7cf349e025c SHA256 d8e12296c32a302d0dda1c2d9f20782a6bdb1b87a65795e90775418bbc3a5f54
 AUX symon-syweb-class_lexer.inc.patch 461 RMD160 b52dba8c8c43b4a7ed53d163855846351ed1b845 SHA1 40b749f3d80ff933e96f2de9ed59444f85ddf8fa SHA256 04ec1b000065f36064bcec46e2355da493ec2b051100cb418f8b63929d1fe9fd
 AUX symon-syweb-setup.inc.patch 909 RMD160 c90bb6131830f53cbfbd105cebced4611af2599b SHA1 2a18d08e7942204fac90585c5785da0fcaddeb8a SHA256 91d06d8258a0312bbe5be803b6094177f037910029c118d81ded3f259aebd977
 AUX symon-syweb-total_firewall.layout.patch 1673 RMD160 63e130338b7d48dc2debc4c205b955b60fc94c4d SHA1 ff5e7ee658f7a48df7c54a2a8923bc456a4834f3 SHA256 c2572d99370b76787685f20ad82158c182baa4840a5f9409efb2c0537a79a901
@@ -8,5 +8,5 @@ AUX symux-init.d 378 RMD160 438f3ee87579117db71fa346cd333cc4740b8a35 SHA1 bc5edf
 DIST symon-2.78.tar.gz 102400 RMD160 40ca61ce68778de54d5a1b541d6c640dd7fb479c SHA1 bbe7f2b58e3ed0e42f3b1da97ea4051d2c1cee34 SHA256 cda07388156e66a665c6d53dca4fdce3e210ee6a28c44e64d240715a572b39ac
 DIST syweb-0.57.tar.gz 40960 RMD160 a59c24402344c3d2ae44c4ff586c469289a5e6e8 SHA1 05762c6b472e161d7bae56b603e4eb8595323738 SHA256 d1a5bbec892488f5bbc1ef5b52fd512097421f4e6be8742ad18838d11f42d502
 EBUILD symon-2.78-r2.ebuild 3192 RMD160 717a35df898b054b56011ad187fb3152bf307549 SHA1 34407ea101b3cef94459c85e5448515d855523b5 SHA256 8bafb6f057626d6373ab7af7ce5b79eba61a1155cc852ea14b96f6df565a455e
-MISC ChangeLog 4056 RMD160 e43462d39491e3a8a9f50544da7c564553c28fe3 SHA1 baa34d68a96237946ad4eae45cd85830aaa1d23b SHA256 7470c551249b77bf4ceb477b1782a1377ec1cda07d10fd576dda2f85d1d1bacc
+MISC ChangeLog 4310 RMD160 c705e7a47f9f1d16e902cbe2080d9d54b192c589 SHA1 b48c32b2f7d97f4886ba251ca249346ed1d009e5 SHA256 b7e96a391396f02560c5b4fecc8e05a61dd965714c9d0890e95887e40bef0f20
 MISC metadata.xml 170 RMD160 645927a396fdc21cdeb089fe42c5397332420ea6 SHA1 ac7f48a14fec325926f9ce1be8fbf1f311b4f2e4 SHA256 d797a2ec6f9dc516c9f9c1a758ee87ad3e8c43101b5dc76c2f872d5bd4639b42

diff --git a/net-analyzer/symon/files/symon-symon.conf.patch b/net-analyzer/symon/files/symon-symon.conf.patch
index 8f5e4cb04fcd986f81c2555170d7ab85bd493d8b..12a006835fb82c46de33045a947b48108436ae8a 100644 (file)
--- a/net-analyzer/symon/files/symon-symon.conf.patch
+++ b/net-analyzer/symon/files/symon-symon.conf.patch
@@ -1,12 +1,13 @@
-# convert bsd devices to linux
-# mbuf, sensor, and proc still not available in linux
+# Convert BSD devices to Linux.
+# mbuf, pf, proc, and sensor are 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 @@
+--- symon/symon/symon.conf.orig        2008-03-18 03:46:17.173140738 +0000
++++ symon/symon/symon.conf     2008-03-18 04:49:07.463331989 +0000
+@@ -3,13 +3,14 @@
+ #
  # Demo configuration for symon. See symon(8) for BNF.
  
- monitor { cpu(0),  mem,
+-monitor { cpu(0),  mem,
 -        if(lo0),
 -#       pf,
 -#         mbuf,
@@ -15,9 +16,14 @@
 -#         if(xl0), if(de0), if(wi0),
 -#       io(wd1), io(wd2), io(wd3), io(cd0)
 -        io(wd0)
++monitor {
++      cpu(0),
++      cpu(1),
++#     cpu(2),
++      mem,
 +      if(lo),
 +      if(eth0),
-+#     if(eth1)
-+#     io(hda), io(hdb), io(hdc), io(hdd)
++#     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
index c9f03fa6ab442e9ffc8097afeb1950cffcd794af..c6a0208550516d567228a54feccd95f9fc1a5864 100644 (file)
--- a/net-analyzer/symon/files/symon-symux.conf.patch
+++ b/net-analyzer/symon/files/symon-symux.conf.patch
@@ -1,9 +1,14 @@
---- 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 @@
+# Convert BSD devices to Linux.
+# mbuf, pf, proc, and sensor are not available in Linux.
+# Rename RRDs directories since it makes more sense in a non-syweb environment.
+
+--- symon/symux/symux.conf.orig        2008-03-18 03:51:21.083141917 +0000
++++ symon/symux/symux.conf     2008-03-18 04:49:17.643141246 +0000
+@@ -6,31 +6,36 @@
+ mux 127.0.0.1 2100
  
  source 127.0.0.1 {
-       accept { cpu(0),  mem,
+-      accept { cpu(0),  mem,
 -               if(lo0),
 -#              pf,
 -#              mbuf,
@@ -12,13 +17,18 @@
 -#              if(xl0), if(de0), if(wi0),
 -#              io(wd1), io(wd2), io(wd3), io(cd0)
 -               io(wd0)
++      accept {
++              cpu(0), 
++              cpu(1),
++#             cpu(2),
++              mem,
 +              if(lo),
 +              if(eth0),
-+              # if(eth1)
-+              # io(hda), io(hdb), io(hdc), io(hdd)
++#             if(eth1),
++#             io(hda), io(hdb), io(hdc), io(hdd),
 +              io(sda), io(sdb)
        }
- 
+-
 +      datadir "/var/lib/symon/rrds/localhost"
  }
  
@@ -27,8 +37,12 @@
  # 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)
++#     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"