--- hobbitserver.cfg.orig	2008-01-08 15:25:34.000000000 +0000
+++ hobbitserver.cfg	2008-01-08 16:22:56.000000000 +0000
@@ -105,7 +105,7 @@
 CONNTEST="TRUE"					# Should we 'ping' hosts ?
 IPTEST_2_CLEAR_ON_FAILED_CONN="TRUE"		# If TRUE, then failing network tests go CLEAR if conn-test fails.
 NONETPAGE=""					# Network tests that go YELLOW upon failure
-FPING="/usr/sbin/fping"					# Path and options for the ping program.
+FPING="hobbitping"					# Path and options for the ping program.
 NTPDATE="ntpdate"				# Path to the 'ntpdate' program
 TRACEROUTE="traceroute"                         # How to do traceroute on failing ping tests. Requires "trace" in bb-hosts.
 BBROUTERTEXT="router"				# What to call a failing intermediate network device.
@@ -120,7 +120,9 @@
 # Size of the generated graph images
 RRDHEIGHT="120"
 RRDWIDTH="576"		# The RRD's contain 576 data points, so this is a good value
-
+NCV_storage="*:GAUGE"
+NCV_memmbe="*:GAUGE"
+NCV_memmfe="*:GAUGE"
 # 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 hobbitd_larrd --extra-script
@@ -132,11 +134,11 @@
 #
 # This is also used by the bb-hostsvc.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"
+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,storage=ncv,memmbe=ncv,memmfe=ncv"
 
 # 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"
+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,storage,memmbe,memmfe"
 
 # These two settings can be used to restrict what filesystems are being
 # tracked (i.e. have their utilisation graphed) by Hobbit.
@@ -158,7 +160,7 @@
 HTMLCONTENTTYPE="text/html"                     # You can add charset options here.
 
 # Fonts and texts
-HOBBITLOGO="Hobbit"                             # HTML inserted on all header pages at top-left corner.
+HOBBITLOGO=""                             # HTML inserted on all header pages at top-left corner.
 MKBBLOCAL="<B><I>Pages Hosted Locally</I></B>"
 MKBBREMOTE="<B><I>Remote Status Display</I></B>"
 MKBBSUBLOCAL="<B><I>Subpages Hosted Locally</I></B>"