xymon: update to 4.3.28

6 files changed, 161 insertions, 137 deletions

diff --git a/abs/core/xymon/PKGBUILD b/abs/core/xymon/PKGBUILD
index c619eaa..e69afd4 100755
--- a/abs/core/xymon/PKGBUILD
+++ b/abs/core/xymon/PKGBUILD
@@ -1,43 +1,45 @@
 pkgbase=xymon
 pkgname=('xymonserver' 'xymonclient')
-pkgver=4.3.17
-pkgrel=24
+pkgver=4.3.28
+pkgrel=1
 pkgdesc="Xymon is a system for monitoring of hosts and networks"
 license=('GPL')
 arch=('i686' 'x86_64')
 url="http://www.xymon.com/"
 source=("https://downloads.sourceforge.net/project/xymon/Xymon/$pkgver/$pkgbase-$pkgver.tar.gz"
-        'hobbitadd.py'
-        'xymon_ghost_check'
-        'graphs.cfg.diff'
-        'xymonserver.cfg.diff'
-        'tasks.d.mv'
-        'clientlaunch.cfg.patch'
-        'hobbitstorage.py'
-        'hbnotes.py'
-        'hobbit-myth-orphan.sh'
-        'analysis.cfg'
+        'alerts.cfg'
         'analysis.cfg.patch'
-        'hbfunc.py'
         'be.png' 'tuner.png' 'tv.png'
-        'hobbit-mem-myth.sh'
+        'clientlaunch.cfg.patch'
+        'client-local.cfg.patch'
+        'graphs.cfg.diff'
+        'hbfunc.py'
+        'hbnotes.py'
         'hobbit_notify.sh'
-        'login_notify.sh'
-        'alerts.cfg'
+        'hobbit-mem-myth.sh'
+        'hobbit-myth-orphan.sh'
         'hobbit_myth_data.py'
+        'hobbitadd.py'
+        'hobbitstorage.py'
+        'hosts.cfg.patch'
+        'log_list.sh'
+        'led_themes.tar.gz'
+        'login_notify.sh'
+        'logrotate-server.xymon'
+        'logrotate-client.xymon'
+        'tasks.d.mv'
+        'xymon_ghost_check'
         'xymon-gputemp.sh'
         'xymon-hddtemp.sh'
         'xymon-smart.sh'
-        'logrotate-server.xymon'
-        'logrotate-client.xymon'
-        'log_list.sh'
-        'client-local.cfg.patch'
-        'led_themes.tar.gz'
+        'xymon-server.include'
+        'xymon-server.gen_light_conf.d'
+        'xymonserver.cfg.diff'
         'xymon-server.rules'
         'xymon-client.rules'
-        'hosts.cfg.patch')
+        )
 depends=('rrdtool' 'fping' 'pcre' 'python2' 'graphviz' 'smartmontools')
-install=xymon.install
+install=xymon-server.install
 
 build() {
     cd ${srcdir}/xymon-$pkgver
@@ -128,9 +130,20 @@ package_xymonserver(){
     echo "myth_mtc;The <b>myth_mtc</b> column shows the status of the MythTV maintenance script.;" >> $COLDOC
     echo "orphan;The <b>orphan</b> column shows the status of the find_orphans.py script.;" >> $COLDOC
 
+    #move cgiwrap to same partiton as hobbit-cgi and hobbit-seccgi
+    #because pacman is not able to install hardlinks accross partitions
+    mv ${pkgdir}/home/xymon/server/bin/cgiwrap ${pkgdir}/data/srv/httpd/htdocs/xymon/
+
+    #install conf files for lighttpd
+    mkdir -p ${pkgdir}/etc/lighttpd
+    install -D -m 644 ${srcdir}/xymon-server.include ${pkgdir}/etc/lighttpd/
+    #gen_light_conf
+    install -D -m 744 ${srcdir}/xymon-server.gen_light_conf.d ${pkgdir}/etc/gen_light_conf.d/xymon-server.conf
+
     #fix permissions
     chmod 755 ${pkgdir}/data/srv/httpd/htdocs/
     chmod 775 ${pkgdir}/data/srv/httpd/htdocs/xymon/
+    chmod 755 ${pkgdir}/data/srv/httpd/htdocs/xymon/cgiwrap
     chmod 775 ${pkgdir}/data/srv/httpd/htdocs/xymon/notes/
     chmod 775 ${pkgdir}/data/srv/httpd/htdocs/xymon/gifs/
     chmod 775 ${pkgdir}/data/srv/httpd/htdocs/xymon/snap/
@@ -162,35 +175,36 @@ package_xymonclient(){
     cd -
     }
 
-md5sums=('d8d119a777e7b7204d1292fb27314312'
-         'a0fbb9cbeb3600a40943e6205790f22f'
-         'c60b0d59bb39505ee3d62c6dd65429c5'
-         '92bd5e8279c688fd854d514443bc733c'
-         'f0fca78520f434918bd1be717d165073'
-         'a19c8c546dcd95049476bb19f9d4e3ae'
-         'c9a31ea9ae131fb351db913e922c25aa'
-         'b2f98ac0df013332deedc1efae0a270d'
-         'df77d1de72157d23a301a72288fbf7e5'
-         '2a509d81ee1655130ce40bf970719e0a'
-         '4d594fba346b56e479d180162a0db44c'
+md5sums=('14501ab2cfce9a332c1590543dfcbd0f'
+         '9af2ad60ac4c3cb653754618f603e311'
          '77fd7ab6ebbe72d14092ee53c5958f97'
-         '80d9cfac86c6d96836e6f406e35e7cf5'
          'd210c43fb9ee9ad6cd7648e0c2e0efea'
          '0c808fa12672289f86b0651545381308'
          '0469d775db9fdd18ea95dd41937ada82'
-         '0757294eec13771f8e63da23cf066796'
+         'c9a31ea9ae131fb351db913e922c25aa'
+         '31ac5c1f6dcc9408b64c4107b325a9a6'
+         '92bd5e8279c688fd854d514443bc733c'
+         '80d9cfac86c6d96836e6f406e35e7cf5'
+         'df77d1de72157d23a301a72288fbf7e5'
          'b1d5592fa92ef71303621964e84c2b9e'
-         '22d4c9065fd959efe82f121dcb511305'
-         '9af2ad60ac4c3cb653754618f603e311'
+         '0757294eec13771f8e63da23cf066796'
+         '2a509d81ee1655130ce40bf970719e0a'
          '313b11e7a22c3c08fb2afaadbfb46d87'
+         'a0fbb9cbeb3600a40943e6205790f22f'
+         'b2f98ac0df013332deedc1efae0a270d'
+         '606f535a49f32b35802ed9d46bd7d068'
+         '98e9242ae346f729b14cb195786571f2'
+         'c7178bbf384bbe86c318b60fef6faf10'
+         '22d4c9065fd959efe82f121dcb511305'
+         'b4e8641e97e6b689dbc634af785e6799'
+         'e2844513e2c92e8b5084818f3b2a478d'
+         'a19c8c546dcd95049476bb19f9d4e3ae'
+         'c60b0d59bb39505ee3d62c6dd65429c5'
          '6452d891d88bb46d07bcf7790a523ad0'
          'b49e7de696c1a0678ad198bab926266c'
          'e071c387deac6b896b20db19903b7794'
-         'b4e8641e97e6b689dbc634af785e6799'
-         'e2844513e2c92e8b5084818f3b2a478d'
-         '98e9242ae346f729b14cb195786571f2'
-         '31ac5c1f6dcc9408b64c4107b325a9a6'
-         'c7178bbf384bbe86c318b60fef6faf10'
+         '1a00c0b9b9b1a37f1513fa8489ce9d31'
+         '3d1f311f0142f41d763276302a7ce396'
+         'c75c434ba9c39a914e7693004b580554'
          'e9dbff011e57861266d27dfdf465a4b3'
-         'cdfbca43dbae4ce0ca72dd002ec22af1'
-         '606f535a49f32b35802ed9d46bd7d068')
+         'cdfbca43dbae4ce0ca72dd002ec22af1')
diff --git a/abs/core/xymon/xymon-server.gen_light_conf.d b/abs/core/xymon/xymon-server.gen_light_conf.d
new file mode 100644
index 0000000..6b558ce
--- /dev/null
+++ b/abs/core/xymon/xymon-server.gen_light_conf.d
@@ -0,0 +1,2 @@
+include "/etc/lighttpd/xymon-server.include"
+
diff --git a/abs/core/xymon/xymon-server.include b/abs/core/xymon/xymon-server.include
new file mode 100644
index 0000000..b3e15e0
--- /dev/null
+++ b/abs/core/xymon/xymon-server.include
@@ -0,0 +1,4 @@
+$HTTP["url"] =~ "^/xymon/hobbit-" {
+    cgi.assign = ( "" => "" )
+    }
+
diff --git a/abs/core/xymon/xymon-server.install b/abs/core/xymon/xymon-server.install
new file mode 100644
index 0000000..0eec8f1
--- /dev/null
+++ b/abs/core/xymon/xymon-server.install
@@ -0,0 +1,85 @@
+post_install() {
+    . /etc/systemconfig
+    if  [ ! -f   /home/xymon/server/ext/ignoreclient.py ]
+    then
+        echo "#this is a list of hosts to ignore" >  /home/xymon/server/ext/ignoreclient.py
+        echo ignorehosts=\"\'ignoreme1\',\'ignoreme2\'\" >> /home/xymon/server/ext/ignoreclient.py
+    fi
+
+    if  [ ! -f  /data/srv/httpd/htdocs/failed_func_hosts ]
+    then
+        touch /data/srv/httpd/htdocs/failed_func_hosts
+    fi
+    chown nobody:nobody /data/srv/httpd/htdocs/failed_func_hosts
+    chmod 777 /data/srv/httpd/htdocs/failed_func_hosts
+
+    sed -i -e "s/localhost/$hostname/" /home/xymon/server/etc/hosts.cfg
+    sed -i -e "s/\# bbd/\# bbd func/" /home/xymon/server/etc/hosts.cfg
+    sed -i -e "s/localhost/$hostname/" /home/xymon/server/etc/xymonserver.cfg
+
+    #fix permissions
+    chown -R nobody:nobody /home/xymon
+    chown -R nobody:nobody /data/srv/httpd/htdocs/xymon
+    
+    chown -R nobody:http /data/srv/httpd/htdocs/xymon/snap
+    chown -R nobody:http /data/srv/httpd/htdocs/xymon/rep
+    chmod -R 775   /data/srv/httpd/htdocs/xymon/rep
+    chmod -R 775   /data/srv/httpd/htdocs/xymon/snap
+
+    chmod g+s /data/srv/httpd/htdocs/xymon/notes/
+    setfacl -d -m g::rw /data/srv/httpd/htdocs/xymon/notes/
+    setfacl -d -m u:nobody:rwx /data/srv/httpd/htdocs/xymon/notes/
+
+    file="/data/srv/httpd/htdocs/xymon/gifs/network.png"
+    if [ -f $file ]
+    then
+        setfacl -m u:nobody:rw $file
+    fi
+    
+    setfacl -d -m u:nobody:rwx /data/srv/httpd/htdocs/xymon/gifs/
+
+    chmod g+s /home/xymon/etc
+    setfacl -d -m g::rw /home/xymon/etc/
+    setfacl -d -m u::rw /home/xymon/etc/
+    setfacl -d -m u:nobody:rwx /home/xymon/etc/
+    
+    file="/home/xymon/etc/mythdot"
+    if [ -f $file ]
+    then
+        setfacl -m u:nobody:rw $file
+    fi
+ 
+    chown -R nobody /var/log/hobbit
+
+    chown root /home/xymon/server/bin/xymonping
+    chmod +s /home/xymon/server/bin/xymonping
+
+    #remove old mtc log files
+    rm -f /var/log/hobbit/mtc
+    rm -f /var/log/hobbit/mtc.1*
+
+    echo "Generate lighttpd include..."
+    gen_light_include.py
+    echo "Forcing a re-read of lighttpd's configuration file..."
+    sv hup /service/lighttpd
+}
+
+post_upgrade() {
+    post_install $1
+}
+
+post_remove() {
+    rm -f /data/srv/httpd/htdocs/xymon/index.html
+    echo "Generate lighttpd include..."
+    gen_light_include.py
+    echo "Forcing a re-read of lighttpd's configuration file..."
+    sv hup /service/lighttpd
+}
+
+pre_remove() {
+    /bin/true
+}
+op=$1
+shift
+$op $*
+# vim: ft=sh ts=2
diff --git a/abs/core/xymon/xymon.install b/abs/core/xymon/xymon.install
deleted file mode 100755
index 4461df4..0000000
--- a/abs/core/xymon/xymon.install
+++ /dev/null
@@ -1,81 +0,0 @@
-post_install() {
-	. /etc/systemconfig
-	if  [ ! -f   /home/xymon/server/ext/ignoreclient.py ]
-	then
-		echo "#this is a list of hosts to ignore" >  /home/xymon/server/ext/ignoreclient.py
-		echo ignorehosts=\"\'ignoreme1\',\'ignoreme2\'\" >> /home/xymon/server/ext/ignoreclient.py
-	fi
-
-	if  [ ! -f  /data/srv/httpd/htdocs/failed_func_hosts ]
-	then
-		touch /data/srv/httpd/htdocs/failed_func_hosts
-	fi
-	chown nobody:nobody /data/srv/httpd/htdocs/failed_func_hosts
-	chmod 777 /data/srv/httpd/htdocs/failed_func_hosts
-
-
-	sed -i -e "s/localhost/$hostname/" /home/xymon/server/etc/hosts.cfg
-	sed -i -e "s/\# bbd/\# bbd func/" /home/xymon/server/etc/hosts.cfg
-	sed -i -e "s/localhost/$hostname/" /home/xymon/server/etc/xymonserver.cfg
-
-	#fix permissions
-	chown -R nobody:nobody /home/xymon
-	chown -R nobody:nobody /data/srv/httpd/htdocs/xymon
-	
-        chown -R nobody:http /data/srv/httpd/htdocs/xymon/snap
-	chown -R nobody:http /data/srv/httpd/htdocs/xymon/rep
-        chmod -R 775   /data/srv/httpd/htdocs/xymon/rep
-	chmod -R 775   /data/srv/httpd/htdocs/xymon/snap
-
-        chmod g+s /data/srv/httpd/htdocs/xymon/notes/
-        setfacl -d -m g::rw /data/srv/httpd/htdocs/xymon/notes/
-        setfacl -d -m u:nobody:rwx /data/srv/httpd/htdocs/xymon/notes/
-
-	file="/data/srv/httpd/htdocs/xymon/gifs/network.png"
-	if [ -f $file ]
-	then
-           setfacl -m u:nobody:rw $file
-        fi
-	
-
-	setfacl -d -m u:nobody:rwx /data/srv/httpd/htdocs/xymon/gifs/
-
-	chmod g+s /home/xymon/etc
-        setfacl -d -m g::rw /home/xymon/etc/
-        setfacl -d -m u::rw /home/xymon/etc/
-        setfacl -d -m u:nobody:rwx /home/xymon/etc/
-  	
-	file="/home/xymon/etc/mythdot"
-        if [ -f $file ]
-        then
-           setfacl -m u:nobody:rw $file
-        fi
- 
-
-	chown -R nobody /var/log/hobbit
-
-	chown root /home/xymon/server/bin/xymonping
-	chmod +s /home/xymon/server/bin/xymonping
-
-	#remove old mtc log files
-	rm -f /var/log/hobbit/mtc
-	rm -f /var/log/hobbit/mtc.1*
-
-
-}
-
-post_upgrade() {
-  post_install $1
-}
-
-post_remove() {
- rm -f /data/srv/httpd/htdocs/xymon/index.html
-}
-
-pre_remove() {
-	/bin/true
-}
-op=$1
-shift
-$op $*
-# vim: ft=sh ts=2
diff --git a/abs/core/xymon/xymonserver.cfg.diff b/abs/core/xymon/xymonserver.cfg.diff
index 48631dc..f017432 100755
--- a/abs/core/xymon/xymonserver.cfg.diff
+++ b/abs/core/xymon/xymonserver.cfg.diff
@@ -1,6 +1,6 @@
---- xymonserver.cfg.orig	2015-03-04 21:28:58.618598840 +0000
-+++ xymonserver.cfg	2015-03-04 21:31:55.352569106 +0000
-@@ -145,6 +145,12 @@
+--- xymonserver.cfg.orig	2017-01-19 16:57:57.745304289 +0000
++++ xymonserver.cfg	2017-01-19 17:02:08.323770694 +0000
+@@ -150,6 +150,12 @@
  RRDHEIGHT="120"
  RRDWIDTH="576"		# The RRD's contain 576 data points, so this is a good value
  
@@ -13,19 +13,19 @@
  # TEST2RRD defines the status- and data-messages you want to collect RRD data
  # about. You will normally not need to modify this, unless you have added a
  # script to pick up RRD data from custom tests (the xymond_rrd --extra-script
-@@ -156,11 +162,13 @@
+@@ -169,11 +175,13 @@
  #
- # This is also used by the svcstatus.cgi script to determine if the detailed
+ # TEST2RRD and GRAPHS_* are used by the svcstatus.cgi script to determine if the detailed
  # status view of a test should include a graph.
--TEST2RRD="cpu=la,disk,inode,qtree,memory,$PINGCOLUMN=tcp,http=tcp,dns=tcp,dig=tcp,time=ntpstat,vmstat,iostat,netstat,temperature,apache,bind,sendmail,mailq,nmailq=mailq,socks,bea,iishealth,citrix,bbgen,bbtest,bbproxy,hobbitd,files,procs=processes,ports,clock,lines,ops,stats,cifs,JVM,JMS,HitCache,Session,JDBCConn,ExecQueue,JTA,TblSpace,RollBack,MemReq,InvObj,snapmirr,snaplist,snapshot,if_load=devmon,temp=devmon,paging,mdc,mdchitpct,cics,dsa,getvis,maxuser,nparts,xymongen,xymonnet,xymonproxy,xymond"
-+#TEST2RRD="cpu=la,disk,inode,qtree,memory,$PINGCOLUMN=tcp,http=tcp,dns=tcp,dig=tcp,time=ntpstat,vmstat,iostat,netstat,temperature,apache,bind,sendmail,mailq,nmailq=mailq,socks,bea,iishealth,citrix,bbgen,bbtest,bbproxy,hobbitd,files,procs=processes,ports,clock,lines,ops,stats,cifs,JVM,JMS,HitCache,Session,JDBCConn,ExecQueue,JTA,TblSpace,RollBack,MemReq,InvObj,snapmirr,snaplist,snapshot,if_load=devmon,temp=devmon,paging,mdc,mdchitpct,cics,dsa,getvis,maxuser,nparts,xymongen,xymonnet,xymonproxy,xymond"
-+TEST2RRD="cpu=la,disk,inode,qtree,memory,$PINGCOLUMN=tcp,http=tcp,dns=tcp,dig=tcp,time=ntpstat,vmstat,iostat,netstat,temperature,apache,bind,sendmail,mailq,nmailq=mailq,socks,bea,iishealth,citrix,bbgen,bbtest,bbproxy,hobbitd,files,procs=processes,ports,clock,lines,ops,stats,cifs,JVM,JMS,HitCache,Session,JDBCConn,ExecQueue,JTA,TblSpace,RollBack,MemReq,InvObj,snapmirr,snaplist,snapshot,if_load=devmon,temp=devmon,paging,mdc,mdchitpct,cics,dsa,getvis,maxuser,nparts,xymongen,xymonnet,xymonproxy,xymond,storage=ncv,memmbe=ncv,memmfe=ncv,gputemp=ncv,hddtemp=ncv,smart"
+-TEST2RRD="cpu=la,disk,inode,qtree,memory,$PINGCOLUMN=tcp,http=tcp,dns=tcp,dig=tcp,time=ntpstat,vmstat,iostat,netstat,temperature,apache,bind,sendmail,mailq,nmailq=mailq,socks,bea,iishealth,citrix,bbgen,bbtest,bbproxy,hobbitd,files,procs=processes,ports,clock,lines,deltalines,ops,stats,cifs,JVM,JMS,HitCache,Session,JDBCConn,ExecQueue,JTA,TblSpace,RollBack,MemReq,InvObj,snapmirr,snaplist,snapshot,if_load=devmon,temp=devmon,paging,mdc,mdchitpct,cics,dsa,getvis,maxuser,nparts,xymongen,xymonnet,xymonproxy,xymond"
++#TEST2RRD="cpu=la,disk,inode,qtree,memory,$PINGCOLUMN=tcp,http=tcp,dns=tcp,dig=tcp,time=ntpstat,vmstat,iostat,netstat,temperature,apache,bind,sendmail,mailq,nmailq=mailq,socks,bea,iishealth,citrix,bbgen,bbtest,bbproxy,hobbitd,files,procs=processes,ports,clock,lines,deltalines,ops,stats,cifs,JVM,JMS,HitCache,Session,JDBCConn,ExecQueue,JTA,TblSpace,RollBack,MemReq,InvObj,snapmirr,snaplist,snapshot,if_load=devmon,temp=devmon,paging,mdc,mdchitpct,cics,dsa,getvis,maxuser,nparts,xymongen,xymonnet,xymonproxy,xymond"
++TEST2RRD="cpu=la,disk,inode,qtree,memory,$PINGCOLUMN=tcp,http=tcp,dns=tcp,dig=tcp,time=ntpstat,vmstat,iostat,netstat,temperature,apache,bind,sendmail,mailq,nmailq=mailq,socks,bea,iishealth,citrix,bbgen,bbtest,bbproxy,hobbitd,files,procs=processes,ports,clock,lines,deltalines,ops,stats,cifs,JVM,JMS,HitCache,Session,JDBCConn,ExecQueue,JTA,TblSpace,RollBack,MemReq,InvObj,snapmirr,snaplist,snapshot,if_load=devmon,temp=devmon,paging,mdc,mdchitpct,cics,dsa,getvis,maxuser,nparts,xymongen,xymonnet,xymonproxy,xymond,storage=ncv,memmbe=ncv,memmfe=ncv,gputemp=ncv,hddtemp=ncv,smart"
  
  # This defines which RRD files to include on the "trends" column webpage,
  # and the order in which they appear.
--GRAPHS="la,disk,inode,qtree,files,processes,memory,users,vmstat,iostat,tcp.http,tcp,ncv,netstat,ifstat,mrtg::1,ports,temperature,ntpstat,apache,bind,sendmail,mailq,socks,bea,iishealth,citrix,bbgen,bbtest,bbproxy,hobbitd,clock,lines,ops,stats,cifs,JVM,JMS,HitCache,Session,JDBCConn,ExecQueue,JTA,TblSpace,RollBack,MemReq,InvObj,snapmirr,snaplist,snapshot,devmon::1,if_load::1,temp,paging,mdc,mdchitpct,cics,dsa,getvis,maxuser,nparts,xymongen,xymonnet,xymonproxy,xymond"
-+#GRAPHS="la,disk,inode,qtree,files,processes,memory,users,vmstat,iostat,tcp.http,tcp,ncv,netstat,ifstat,mrtg::1,ports,temperature,ntpstat,apache,bind,sendmail,mailq,socks,bea,iishealth,citrix,bbgen,bbtest,bbproxy,hobbitd,clock,lines,ops,stats,cifs,JVM,JMS,HitCache,Session,JDBCConn,ExecQueue,JTA,TblSpace,RollBack,MemReq,InvObj,snapmirr,snaplist,snapshot,devmon::1,if_load::1,temp,paging,mdc,mdchitpct,cics,dsa,getvis,maxuser,nparts,xymongen,xymonnet,xymonproxy,xymond"
-+GRAPHS="la,disk,inode,qtree,files,processes,memory,users,vmstat,iostat,tcp.http,tcp,ncv,netstat,ifstat,mrtg::1,ports,temperature,ntpstat,apache,bind,sendmail,mailq,socks,bea,iishealth,citrix,bbgen,bbtest,bbproxy,hobbitd,clock,lines,ops,stats,cifs,JVM,JMS,HitCache,Session,JDBCConn,ExecQueue,JTA,TblSpace,RollBack,MemReq,InvObj,snapmirr,snaplist,snapshot,devmon::1,if_load::1,temp,paging,mdc,mdchitpct,cics,dsa,getvis,maxuser,nparts,xymongen,xymonnet,xymonproxy,xymond,storage,memmbe,memmfe,gputemp,hddtemp"
+-GRAPHS="la,disk,inode,qtree,files,processes,memory,users,vmstat,iostat,tcp.http,tcp,ncv,netstat,ifstat,mrtg::1,ports,temperature,ntpstat,apache,bind,sendmail,mailq,socks,bea,iishealth,citrix,bbgen,bbtest,bbproxy,hobbitd,clock,lines,deltalines,ops,stats,cifs,JVM,JMS,HitCache,Session,JDBCConn,ExecQueue,JTA,TblSpace,RollBack,MemReq,InvObj,snapmirr,snaplist,snapshot,devmon::1,if_load::1,temp,paging,mdc,mdchitpct,cics,dsa,getvis,maxuser,nparts,xymongen,xymonnet,xymonproxy,xymond"
++#GRAPHS="la,disk,inode,qtree,files,processes,memory,users,vmstat,iostat,tcp.http,tcp,ncv,netstat,ifstat,mrtg::1,ports,temperature,ntpstat,apache,bind,sendmail,mailq,socks,bea,iishealth,citrix,bbgen,bbtest,bbproxy,hobbitd,clock,lines,deltalines,ops,stats,cifs,JVM,JMS,HitCache,Session,JDBCConn,ExecQueue,JTA,TblSpace,RollBack,MemReq,InvObj,snapmirr,snaplist,snapshot,devmon::1,if_load::1,temp,paging,mdc,mdchitpct,cics,dsa,getvis,maxuser,nparts,xymongen,xymonnet,xymonproxy,xymond"
++GRAPHS="la,disk,inode,qtree,files,processes,memory,users,vmstat,iostat,tcp.http,tcp,ncv,netstat,ifstat,mrtg::1,ports,temperature,ntpstat,apache,bind,sendmail,mailq,socks,bea,iishealth,citrix,bbgen,bbtest,bbproxy,hobbitd,clock,lines,deltalines,ops,stats,cifs,JVM,JMS,HitCache,Session,JDBCConn,ExecQueue,JTA,TblSpace,RollBack,MemReq,InvObj,snapmirr,snaplist,snapshot,devmon::1,if_load::1,temp,paging,mdc,mdchitpct,cics,dsa,getvis,maxuser,nparts,xymongen,xymonnet,xymonproxy,xymond,storage,memmbe,memmfe,gputemp,hddtemp"
  
  # These two settings can be used to restrict what filesystems are being
  # tracked (i.e. have their utilisation graphed) by Xymon.