From 1ec4eaadbb2a7156a793b931ba6e66728db3cb03 Mon Sep 17 00:00:00 2001 From: Adam Amstrong Date: Thu, 5 May 2011 10:28:36 +0000 Subject: [PATCH] set executable. move poller/discovery modules to defaults. git-svn-id: http://www.observium.org/svn/observer/trunk@2244 61d68cd4-352d-0410-923a-c4978735b2b8 --- includes/defaults.inc.php | 58 ++++++++++++++++++++++++++++++ includes/static-config.php | 58 ------------------------------ upgrade-scripts/fix-sensor-rrd.php | 0 3 files changed, 58 insertions(+), 58 deletions(-) mode change 100644 => 100755 upgrade-scripts/fix-sensor-rrd.php diff --git a/includes/defaults.inc.php b/includes/defaults.inc.php index c144110ca..adc261183 100644 --- a/includes/defaults.inc.php +++ b/includes/defaults.inc.php @@ -249,4 +249,62 @@ $config['astext'][65333] = "Cymru Bogon Feed"; ### What should we warn about? $config['warn']['ifdown'] = false; +## List of poller modules. Need to be in the array to be +## considered for execution. + +$config['poller_modules']['system'] = 1; +$config['poller_modules']['os'] = 1; +$config['poller_modules']['ipmi'] = 1; +$config['poller_modules']['sensors'] = 1; +$config['poller_modules']['processors'] = 1; +$config['poller_modules']['mempools'] = 1; +$config['poller_modules']['storage'] = 1; +$config['poller_modules']['netstats'] = 1; +$config['poller_modules']['hr-mib'] = 1; +$config['poller_modules']['ucd-mib'] = 1; +$config['poller_modules']['ipSystemStats'] = 1; +$config['poller_modules']['ports'] = 1; +$config['poller_modules']['bgp-peers'] = 1; +$config['poller_modules']['junose-atm-vp'] = 1; +$config['poller_modules']['toner'] = 1; +$config['poller_modules']['ucd-diskio'] = 1; +$config['poller_modules']['applications'] = 1; +$config['poller_modules']['wifi'] = 1; +$config['poller_modules']['ospf'] = 1; +$config['poller_modules']['cisco-ipsec-flow-monitor'] = 1; +$config['poller_modules']['cisco-remote-access-monitor'] = 1; +$config['poller_modules']['cisco-cef'] = 1; +$config['poller_modules']['cisco-mac-accounting'] = 1; + + #include("includes/polling/altiga-ssl.inc.php"); + +## List of discovery modules. Need to be in this array to be +## considered for execution. + +$config['discovery_modules']['ports'] = 1; +$config['discovery_modules']['ports-stack'] = 1; +$config['discovery_modules']['entity-physical'] = 1; +$config['discovery_modules']['processors'] = 1; +$config['discovery_modules']['mempools'] = 1; +$config['discovery_modules']['ipv4-addresses'] = 1; +$config['discovery_modules']['ipv6-addresses'] = 1; +$config['discovery_modules']['sensors'] = 1; +$config['discovery_modules']['storage'] = 1; +$config['discovery_modules']['hr-device'] = 1; +$config['discovery_modules']['discovery-protocols'] = 1; +$config['discovery_modules']['arp-table'] = 1; +$config['discovery_modules']['junose-atm-vp'] = 1; +$config['discovery_modules']['bgp-peers'] = 1; +$config['discovery_modules']['q-bridge-mib'] = 1; +$config['discovery_modules']['cisco-vlans'] = 1; +$config['discovery_modules']['cisco-mac-accounting'] = 1; +$config['discovery_modules']['cisco-pw'] = 1; +$config['discovery_modules']['cisco-vrf'] = 1; +$config['discovery_modules']['vmware-vminfo'] = 1; +$config['discovery_modules']['libvirt-vminfo'] = 1; +$config['discovery_modules']['toner'] = 1; +$config['discovery_modules']['ucd-diskio'] = 1; +$config['discovery_modules']['services'] = 1; + + ?> diff --git a/includes/static-config.php b/includes/static-config.php index 50b5346aa..f7fa85ebc 100644 --- a/includes/static-config.php +++ b/includes/static-config.php @@ -6,64 +6,6 @@ # YES, THAT MEANS YOU # ######################################################### - -## List of poller modules. Need to be in the array to be -## considered for execution. - -$config['poller_modules']['system'] = 1; -$config['poller_modules']['os'] = 1; -$config['poller_modules']['ipmi'] = 1; -$config['poller_modules']['sensors'] = 1; -$config['poller_modules']['processors'] = 1; -$config['poller_modules']['mempools'] = 1; -$config['poller_modules']['storage'] = 1; -$config['poller_modules']['netstats'] = 1; -$config['poller_modules']['hr-mib'] = 1; -$config['poller_modules']['ucd-mib'] = 1; -$config['poller_modules']['ipSystemStats'] = 1; -$config['poller_modules']['ports'] = 1; -$config['poller_modules']['bgp-peers'] = 1; -$config['poller_modules']['junose-atm-vp'] = 1; -$config['poller_modules']['toner'] = 1; -$config['poller_modules']['ucd-diskio'] = 1; -$config['poller_modules']['applications'] = 1; -$config['poller_modules']['wifi'] = 1; -$config['poller_modules']['ospf'] = 1; -$config['poller_modules']['cisco-ipsec-flow-monitor'] = 1; -$config['poller_modules']['cisco-remote-access-monitor'] = 1; -$config['poller_modules']['cisco-cef'] = 1; -$config['poller_modules']['cisco-mac-accounting'] = 1; - - #include("includes/polling/altiga-ssl.inc.php"); - -## List of discovery modules. Need to be in this array to be -## considered for execution. - -$config['discovery_modules']['ports'] = 1; -$config['discovery_modules']['ports-stack'] = 1; -$config['discovery_modules']['entity-physical'] = 1; -$config['discovery_modules']['processors'] = 1; -$config['discovery_modules']['mempools'] = 1; -$config['discovery_modules']['ipv4-addresses'] = 1; -$config['discovery_modules']['ipv6-addresses'] = 1; -$config['discovery_modules']['sensors'] = 1; -$config['discovery_modules']['storage'] = 1; -$config['discovery_modules']['hr-device'] = 1; -$config['discovery_modules']['discovery-protocols'] = 1; -$config['discovery_modules']['arp-table'] = 1; -$config['discovery_modules']['junose-atm-vp'] = 1; -$config['discovery_modules']['bgp-peers'] = 1; -$config['discovery_modules']['q-bridge-mib'] = 1; -$config['discovery_modules']['cisco-vlans'] = 1; -$config['discovery_modules']['cisco-mac-accounting'] = 1; -$config['discovery_modules']['cisco-pw'] = 1; -$config['discovery_modules']['cisco-vrf'] = 1; -$config['discovery_modules']['vmware-vminfo'] = 1; -$config['discovery_modules']['libvirt-vminfo'] = 1; -$config['discovery_modules']['toner'] = 1; -$config['discovery_modules']['ucd-diskio'] = 1; -$config['discovery_modules']['services'] = 1; - $config['os']['default']['over'][0]['graph'] = "device_processor"; $config['os']['default']['over'][0]['text'] = "Processor Usage"; $config['os']['default']['over'][1]['graph'] = "device_mempool"; diff --git a/upgrade-scripts/fix-sensor-rrd.php b/upgrade-scripts/fix-sensor-rrd.php old mode 100644 new mode 100755