From c6112d9a4349eeabd95b0da722532d0c8d3a6622 Mon Sep 17 00:00:00 2001 From: Tony Murray Date: Mon, 6 Jun 2016 23:45:19 -0500 Subject: [PATCH] Sort many items in defaults.inc.php The main target is the poller and discovery modules --- includes/defaults.inc.php | 262 +++++++++++++++++++------------------- 1 file changed, 131 insertions(+), 131 deletions(-) diff --git a/includes/defaults.inc.php b/includes/defaults.inc.php index 3f01b97680..b1e832799d 100644 --- a/includes/defaults.inc.php +++ b/includes/defaults.inc.php @@ -486,45 +486,45 @@ $config['nfsen_enable'] = 0; // config['location_map']['Under the Sink'] = "Under The Sink, The Office, London, UK"; // Ignores & Allows // Has to be lowercase -$config['bad_if'][] = 'voip-null'; -$config['bad_if'][] = 'virtual-'; -$config['bad_if'][] = 'unrouted'; -$config['bad_if'][] = 'eobc'; -$config['bad_if'][] = 'lp0'; $config['bad_if'][] = '-atm'; -$config['bad_if'][] = 'faith0'; -$config['bad_if'][] = 'container'; -$config['bad_if'][] = 'async'; -$config['bad_if'][] = 'plip'; $config['bad_if'][] = '-physical'; -$config['bad_if'][] = 'container'; -$config['bad_if'][] = 'unrouted'; +$config['bad_if'][] = 'async'; $config['bad_if'][] = 'bluetooth'; +$config['bad_if'][] = 'container'; +$config['bad_if'][] = 'container'; +$config['bad_if'][] = 'eobc'; +$config['bad_if'][] = 'faith0'; $config['bad_if'][] = 'isatap'; -$config['bad_if'][] = 'ras'; +$config['bad_if'][] = 'lp0'; +$config['bad_if'][] = 'plip'; +$config['bad_if'][] = 'pppoe-'; $config['bad_if'][] = 'qos'; +$config['bad_if'][] = 'ras'; $config['bad_if'][] = 'span rp'; $config['bad_if'][] = 'span sp'; $config['bad_if'][] = 'sslvpn'; -$config['bad_if'][] = 'pppoe-'; +$config['bad_if'][] = 'unrouted'; +$config['bad_if'][] = 'unrouted'; +$config['bad_if'][] = 'virtual-'; +$config['bad_if'][] = 'voip-null'; // $config['bad_if'][] = "control plane"; // Example for cisco control plane // Ignore ports based on ifType. Case-sensitive. +$config['bad_iftype'][] = 'aal5'; +$config['bad_iftype'][] = 'atmSubInterface'; +$config['bad_iftype'][] = 'ds0'; +$config['bad_iftype'][] = 'ds1'; +$config['bad_iftype'][] = 'ds3'; +// $config['bad_iftype'][] = 'isdn'; #show signaling traffic +// $config['bad_iftype'][] = 'lapd'; #show signaling traffic +$config['bad_iftype'][] = 'mpls'; +$config['bad_iftype'][] = 'shdsl'; +$config['bad_iftype'][] = 'sonet'; $config['bad_iftype'][] = 'voiceEncap'; $config['bad_iftype'][] = 'voiceFXO'; $config['bad_iftype'][] = 'voiceFXS'; $config['bad_iftype'][] = 'voiceOverAtm'; $config['bad_iftype'][] = 'voiceOverFrameRelay'; $config['bad_iftype'][] = 'voiceOverIp'; -$config['bad_iftype'][] = 'ds0'; -$config['bad_iftype'][] = 'ds1'; -$config['bad_iftype'][] = 'ds3'; -// $config['bad_iftype'][] = "isdn"; #show signaling traffic -// $config['bad_iftype'][] = "lapd"; #show signaling traffic -$config['bad_iftype'][] = 'sonet'; -$config['bad_iftype'][] = 'atmSubInterface'; -$config['bad_iftype'][] = 'aal5'; -$config['bad_iftype'][] = 'shdsl'; -$config['bad_iftype'][] = 'mpls'; $config['bad_if_regexp'][] = '/^ng[0-9]+$/'; $config['bad_if_regexp'][] = '/^sl[0-9]/'; @@ -539,20 +539,20 @@ $config['ignore_mount_network'] = 1; $config['ignore_mount_optical'] = 1; // Ignore mounted optical discs // Per-device interface graph filters -$config['device_traffic_iftype'][] = '/loopback/'; -$config['device_traffic_iftype'][] = '/tunnel/'; -$config['device_traffic_iftype'][] = '/virtual/'; -$config['device_traffic_iftype'][] = '/mpls/'; $config['device_traffic_iftype'][] = '/ieee8023adLag/'; $config['device_traffic_iftype'][] = '/l2vlan/'; +$config['device_traffic_iftype'][] = '/loopback/'; +$config['device_traffic_iftype'][] = '/mpls/'; $config['device_traffic_iftype'][] = '/ppp/'; +$config['device_traffic_iftype'][] = '/tunnel/'; +$config['device_traffic_iftype'][] = '/virtual/'; -$config['device_traffic_descr'][] = '/loopback/'; -$config['device_traffic_descr'][] = '/vlan/'; -$config['device_traffic_descr'][] = '/tunnel/'; $config['device_traffic_descr'][] = '/bond/'; -$config['device_traffic_descr'][] = '/null/'; $config['device_traffic_descr'][] = '/dummy/'; +$config['device_traffic_descr'][] = '/loopback/'; +$config['device_traffic_descr'][] = '/null/'; +$config['device_traffic_descr'][] = '/tunnel/'; +$config['device_traffic_descr'][] = '/vlan/'; // IRC Bot configuration $config['irc_host'] = ''; @@ -599,33 +599,33 @@ $config['auth_ldap_cache_ttl'] = 300; $config['allow_entity_sensor']['amperes'] = 1; $config['allow_entity_sensor']['celsius'] = 1; $config['allow_entity_sensor']['dBm'] = 1; -$config['allow_entity_sensor']['voltsDC'] = 1; -$config['allow_entity_sensor']['voltsAC'] = 1; -$config['allow_entity_sensor']['watts'] = 1; -$config['allow_entity_sensor']['truthvalue'] = 1; $config['allow_entity_sensor']['specialEnum'] = 1; +$config['allow_entity_sensor']['truthvalue'] = 1; +$config['allow_entity_sensor']['voltsAC'] = 1; +$config['allow_entity_sensor']['voltsDC'] = 1; +$config['allow_entity_sensor']['watts'] = 1; // Filesystems +$config['ignore_mount'][] = '/dev'; $config['ignore_mount'][] = '/kern'; $config['ignore_mount'][] = '/mnt/cdrom'; $config['ignore_mount'][] = '/proc'; -$config['ignore_mount'][] = '/dev'; -$config['ignore_mount_string'][] = 'packages'; $config['ignore_mount_string'][] = 'devfs'; +$config['ignore_mount_string'][] = 'MALLOC'; +$config['ignore_mount_string'][] = 'packages'; $config['ignore_mount_string'][] = 'procfs'; $config['ignore_mount_string'][] = 'UMA'; -$config['ignore_mount_string'][] = 'MALLOC'; -$config['ignore_mount_regexp'][] = '/on: \/packages/'; -$config['ignore_mount_regexp'][] = '/on: \/dev/'; -$config['ignore_mount_regexp'][] = '/on: \/proc/'; -$config['ignore_mount_regexp'][] = '/on: \/junos^/'; -$config['ignore_mount_regexp'][] = '/on: \/junos\/dev/'; -$config['ignore_mount_regexp'][] = '/on: \/jail\/dev/'; $config['ignore_mount_regexp'][] = '/^(dev|proc)fs/'; $config['ignore_mount_regexp'][] = '/^\/dev\/md0/'; $config['ignore_mount_regexp'][] = '/^\/var\/dhcpd\/dev,/'; +$config['ignore_mount_regexp'][] = '/on: \/dev/'; +$config['ignore_mount_regexp'][] = '/on: \/jail\/dev/'; +$config['ignore_mount_regexp'][] = '/on: \/junos\/dev/'; +$config['ignore_mount_regexp'][] = '/on: \/junos^/'; +$config['ignore_mount_regexp'][] = '/on: \/packages/'; +$config['ignore_mount_regexp'][] = '/on: \/proc/'; $config['ignore_mount_regexp'][] = '/UMA/'; $config['ignore_mount_removable'] = 1; @@ -634,10 +634,10 @@ $config['ignore_mount_network'] = 1; // Ignore network mounted storage // Syslog Settings // Entries older than this will be removed -$config['syslog_filter'][] = 'last message repeated'; $config['syslog_filter'][] = 'Connection from UDP: ['; -$config['syslog_filter'][] = 'ipSystemStatsTable node ipSystemStatsOutFragOKs not implemented'; $config['syslog_filter'][] = 'diskio.c'; +$config['syslog_filter'][] = 'ipSystemStatsTable node ipSystemStatsOutFragOKs not implemented'; +$config['syslog_filter'][] = 'last message repeated'; // Ignore some crappy stuff from SNMP daemon // Virtualization $config['enable_libvirt'] = 0; @@ -652,114 +652,114 @@ $config['astext'][65332] = 'Cymru FullBogon Feed'; $config['astext'][65333] = 'Cymru Bogon Feed'; // Nicer labels for the SLA types -$config['sla_type_labels']['echo'] = 'ICMP ping'; -$config['sla_type_labels']['pathEcho'] = 'Path ICMP ping'; -$config['sla_type_labels']['fileIO'] = 'File I/O'; -$config['sla_type_labels']['script'] = 'Script'; -$config['sla_type_labels']['udpEcho'] = 'UDP ping'; -$config['sla_type_labels']['tcpConnect'] = 'TCP connect'; -$config['sla_type_labels']['http'] = 'HTTP'; -$config['sla_type_labels']['dns'] = 'DNS'; -$config['sla_type_labels']['jitter'] = 'Jitter'; -$config['sla_type_labels']['dlsw'] = 'DLSW'; $config['sla_type_labels']['dhcp'] = 'DHCP'; -$config['sla_type_labels']['ftp'] = 'FTP'; -$config['sla_type_labels']['voip'] = 'VoIP'; -$config['sla_type_labels']['rtp'] = 'RTP'; -$config['sla_type_labels']['lspGroup'] = 'LSP group'; -$config['sla_type_labels']['icmpjitter'] = 'ICMP jitter'; -$config['sla_type_labels']['lspPing'] = 'LSP ping'; -$config['sla_type_labels']['lspTrace'] = 'LSP trace'; -$config['sla_type_labels']['ethernetPing'] = 'Ethernet ping'; +$config['sla_type_labels']['dlsw'] = 'DLSW'; +$config['sla_type_labels']['dns'] = 'DNS'; +$config['sla_type_labels']['echo'] = 'ICMP ping'; $config['sla_type_labels']['ethernetJitter'] = 'Ethernet jitter'; +$config['sla_type_labels']['ethernetPing'] = 'Ethernet ping'; +$config['sla_type_labels']['fileIO'] = 'File I/O'; +$config['sla_type_labels']['ftp'] = 'FTP'; +$config['sla_type_labels']['http'] = 'HTTP'; +$config['sla_type_labels']['icmpjitter'] = 'ICMP jitter'; +$config['sla_type_labels']['jitter'] = 'Jitter'; +$config['sla_type_labels']['lspGroup'] = 'LSP group'; +$config['sla_type_labels']['lspPing'] = 'LSP ping'; $config['sla_type_labels']['lspPingPseudowire'] = 'LSP Pseudowire ping'; +$config['sla_type_labels']['lspTrace'] = 'LSP trace'; +$config['sla_type_labels']['pathEcho'] = 'Path ICMP ping'; +$config['sla_type_labels']['rtp'] = 'RTP'; +$config['sla_type_labels']['script'] = 'Script'; +$config['sla_type_labels']['tcpConnect'] = 'TCP connect'; +$config['sla_type_labels']['udpEcho'] = 'UDP ping'; +$config['sla_type_labels']['voip'] = 'VoIP'; // Warnings on front page $config['warn']['ifdown'] = true; // Show down interfaces // List of poller modules. Need to be in the array to be // considered for execution. -$config['poller_modules']['unix-agent'] = 0; -$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']['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-sla'] = 1; -$config['poller_modules']['cisco-mac-accounting'] = 1; +$config['poller_modules']['applications'] = 1; +$config['poller_modules']['aruba-controller'] = 1; +$config['poller_modules']['bgp-peers'] = 1; $config['poller_modules']['cipsec-tunnels'] = 1; $config['poller_modules']['cisco-ace-loadbalancer'] = 1; $config['poller_modules']['cisco-ace-serverfarms'] = 1; -$config['poller_modules']['netscaler-vsvr'] = 1; -$config['poller_modules']['aruba-controller'] = 1; -$config['poller_modules']['entity-physical'] = 1; -$config['poller_modules']['applications'] = 1; $config['poller_modules']['cisco-asa-firewall'] = 1; -$config['poller_modules']['mib'] = 0; -$config['poller_modules']['cisco-voice'] = 1; $config['poller_modules']['cisco-cbqos'] = 1; -$config['poller_modules']['stp'] = 1; +$config['poller_modules']['cisco-cef'] = 1; +$config['poller_modules']['cisco-ipsec-flow-monitor'] = 1; +$config['poller_modules']['cisco-mac-accounting'] = 1; $config['poller_modules']['cisco-otv'] = 1; -$config['poller_modules']['services'] = 1; +$config['poller_modules']['cisco-remote-access-monitor'] = 1; +$config['poller_modules']['cisco-sla'] = 1; +$config['poller_modules']['cisco-voice'] = 1; +$config['poller_modules']['entity-physical'] = 1; +$config['poller_modules']['hr-mib'] = 1; +$config['poller_modules']['ipmi'] = 1; +$config['poller_modules']['ipSystemStats'] = 1; +$config['poller_modules']['junose-atm-vp'] = 1; +$config['poller_modules']['mempools'] = 1; +$config['poller_modules']['mib'] = 0; +$config['poller_modules']['netscaler-vsvr'] = 1; +$config['poller_modules']['netstats'] = 1; +$config['poller_modules']['os'] = 1; +$config['poller_modules']['ospf'] = 1; +$config['poller_modules']['ports'] = 1; +$config['poller_modules']['processors'] = 1; +$config['poller_modules']['sensors'] = 1; +$config['poller_modules']['services'] = 1; +$config['poller_modules']['storage'] = 1; +$config['poller_modules']['stp'] = 1; +$config['poller_modules']['toner'] = 1; +$config['poller_modules']['ucd-diskio'] = 1; +$config['poller_modules']['ucd-mib'] = 1; +$config['poller_modules']['unix-agent'] = 0; +$config['poller_modules']['wifi'] = 1; // List of discovery modules. Need to be in this array to be // considered for execution. -$config['discovery_modules']['os'] = 1; -$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']['cisco-vrf-lite'] = 1; -$config['discovery_modules']['ipv4-addresses'] = 1; -$config['discovery_modules']['ipv6-addresses'] = 1; -$config['discovery_modules']['route'] = 0; -$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']['discovery-arp'] = 0; -$config['discovery_modules']['junose-atm-vp'] = 1; -$config['discovery_modules']['bgp-peers'] = 1; -$config['discovery_modules']['vlans'] = 1; -$config['discovery_modules']['cisco-mac-accounting'] = 1; -$config['discovery_modules']['cisco-pw'] = 1; -$config['discovery_modules']['cisco-vrf'] = 1; -//$config['discovery_modules']['cisco-cef'] = 1; -$config['discovery_modules']['cisco-sla'] = 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['discovery_modules']['arp-table'] = 1; +$config['discovery_modules']['bgp-peers'] = 1; $config['discovery_modules']['charge'] = 1; $config['discovery_modules']['cisco-cbqos'] = 0; -$config['discovery_modules']['stp'] = 1; +//$config['discovery_modules']['cisco-cef'] = 1; +$config['discovery_modules']['cisco-mac-accounting'] = 1; $config['discovery_modules']['cisco-otv'] = 1; +$config['discovery_modules']['cisco-pw'] = 1; +$config['discovery_modules']['cisco-sla'] = 1; +$config['discovery_modules']['cisco-vrf'] = 1; +$config['discovery_modules']['cisco-vrf-lite'] = 1; +$config['discovery_modules']['discovery-arp'] = 0; +$config['discovery_modules']['discovery-protocols'] = 1; +$config['discovery_modules']['entity-physical'] = 1; +$config['discovery_modules']['hr-device'] = 1; +$config['discovery_modules']['ipv4-addresses'] = 1; +$config['discovery_modules']['ipv6-addresses'] = 1; +$config['discovery_modules']['junose-atm-vp'] = 1; +$config['discovery_modules']['libvirt-vminfo'] = 1; +$config['discovery_modules']['mempools'] = 1; +$config['discovery_modules']['os'] = 1; +$config['discovery_modules']['ports'] = 1; +$config['discovery_modules']['ports-stack'] = 1; +$config['discovery_modules']['processors'] = 1; +$config['discovery_modules']['route'] = 0; +$config['discovery_modules']['sensors'] = 1; +$config['discovery_modules']['services'] = 1; +$config['discovery_modules']['storage'] = 1; +$config['discovery_modules']['stp'] = 1; +$config['discovery_modules']['toner'] = 1; +$config['discovery_modules']['ucd-diskio'] = 1; +$config['discovery_modules']['vlans'] = 1; +$config['discovery_modules']['vmware-vminfo'] = 1; -$config['modules_compat']['rfc1628']['liebert'] = 1; -$config['modules_compat']['rfc1628']['netmanplus'] = 1; $config['modules_compat']['rfc1628']['deltaups'] = 1; -$config['modules_compat']['rfc1628']['poweralert'] = 1; -$config['modules_compat']['rfc1628']['multimatic'] = 1; -$config['modules_compat']['rfc1628']['webpower'] = 1; $config['modules_compat']['rfc1628']['huaweiups'] = 1; +$config['modules_compat']['rfc1628']['liebert'] = 1; +$config['modules_compat']['rfc1628']['multimatic'] = 1; +$config['modules_compat']['rfc1628']['netmanplus'] = 1; +$config['modules_compat']['rfc1628']['poweralert'] = 1; +$config['modules_compat']['rfc1628']['webpower'] = 1; // Enable daily updates $config['update'] = 1; @@ -781,8 +781,8 @@ $config['alert_log_purge'] = 365; // Date format for PHP date()s $config['dateformat']['long'] = 'r'; // RFC2822 style -$config['dateformat']['compact'] = 'Y-m-d H:i:s'; $config['dateformat']['byminute'] = 'Y-m-d H:i'; +$config['dateformat']['compact'] = 'Y-m-d H:i:s'; $config['dateformat']['time'] = 'H:i:s'; // Date format for MySQL DATE_FORMAT