From dbf212f6520cbac58b818199b1b705c6d992530e Mon Sep 17 00:00:00 2001 From: Adam Amstrong Date: Wed, 9 May 2012 10:01:42 +0000 Subject: [PATCH] phpDocumentator headers. retire static-config. IF YOU ARE READING THIS, REMOVE IT FROM THE BOTTOM YOUR CONFIG.PHP. YES. YOU. git-svn-id: http://www.observium.org/svn/observer/trunk@3150 61d68cd4-352d-0410-923a-c4978735b2b8 --- addhost.php | 16 +- adduser.php | 15 +- alerts.php | 13 + billing-calculate.php | 13 +- check-errors.php | 13 + check-services.php | 13 + config.php.default | 2 - delhost.php | 15 +- discovery.php | 16 +- generate-iplist.php | 13 + html/ajax_listports.php | 13 + html/bandwidth-graph.php | 13 + html/billing-graph.php | 13 + html/data.php | 13 + html/graph-realtime.php | 21 +- html/graph.php | 13 + html/includes/graphs/bgp/prefixes.inc.php | 7 - .../graphs/device/hr_processes.inc.php | 27 +- html/includes/graphs/device/hr_users.inc.php | 29 +- .../graphs/device/ucd_interrupts.inc.php | 4 +- html/includes/graphs/generic_simplex.inc.php | 14 + .../graphs/old_generic_simplex.inc.php | 1 + html/includes/graphs/processor/usage.inc.php | 1 + html/index.php | 13 + html/map.php | 13 + html/netcmd.php | 15 +- html/pdf.php | 13 + includes/definitions.inc.php | 1218 +++++++++++++++++ includes/static-config.php | 1215 +--------------- irc.php | 14 +- poll-billing.php | 13 + poll-device.php | 12 + poller.php | 16 +- renamehost.php | 13 + snmptrap.php | 13 + syslog.php | 4 +- 36 files changed, 1586 insertions(+), 1284 deletions(-) create mode 100644 includes/definitions.inc.php diff --git a/addhost.php b/addhost.php index 1b02ee592e..07a3117771 100755 --- a/addhost.php +++ b/addhost.php @@ -1,21 +1,23 @@ #!/usr/bin/env php + * @copyright (C) 2006 - 2012 Adam Armstrong * - * See COPYING for more details. */ chdir(dirname($argv[0])); include("includes/defaults.inc.php"); include("config.php"); +include("includes/definitions.inc.php"); include("includes/functions.php"); if (isset($argv[1]) && $argv[1]) diff --git a/adduser.php b/adduser.php index 23257cc960..18c41d8dd1 100755 --- a/adduser.php +++ b/adduser.php @@ -1,10 +1,23 @@ #!/usr/bin/env php + * @copyright (C) 2006 - 2012 Adam Armstrong + * + */ + chdir(dirname($argv[0])); include("includes/defaults.inc.php"); include("config.php"); +include("includes/definitions.inc.php"); include("includes/functions.php"); if (file_exists('html/includes/authentication/' . $config['auth_mechanism'] . '.inc.php')) @@ -43,4 +56,4 @@ else echo("Auth module does not allow adding users!\n"); } -?> \ No newline at end of file +?> diff --git a/alerts.php b/alerts.php index 17e882b774..6886d9ccfc 100755 --- a/alerts.php +++ b/alerts.php @@ -1,8 +1,21 @@ #!/usr/bin/env php + * @copyright (C) 2006 - 2012 Adam Armstrong + * + */ + include("includes/defaults.inc.php"); include("config.php"); +include("includes/definitions.inc.php"); include("includes/functions.php"); foreach (dbFetchRows("SELECT *, A.id AS id FROM `alerts` AS A, `devices` AS D WHERE A.device_id = D.device_id AND alerted = '0'") as $alert) diff --git a/billing-calculate.php b/billing-calculate.php index 8b65860e03..d1f21abae7 100755 --- a/billing-calculate.php +++ b/billing-calculate.php @@ -1,12 +1,23 @@ #!/usr/bin/env php + * @copyright (C) 2006 - 2012 Adam Armstrong + * + */ chdir(dirname($argv[0])); include("includes/defaults.inc.php"); include("config.php"); +include("includes/definitions.inc.php"); include("includes/functions.php"); $options = getopt("r"); diff --git a/check-errors.php b/check-errors.php index 34e7078f5c..96849d2dbc 100755 --- a/check-errors.php +++ b/check-errors.php @@ -1,10 +1,23 @@ #!/usr/bin/env php + * @copyright (C) 2006 - 2012 Adam Armstrong + * + */ + chdir(dirname($argv[0])); include("includes/defaults.inc.php"); include("config.php"); +include("includes/definitions.inc.php"); include("includes/functions.php"); include("html/includes/functions.inc.php"); diff --git a/check-services.php b/check-services.php index d3ce5fa961..2f6f33ab6b 100755 --- a/check-services.php +++ b/check-services.php @@ -1,10 +1,23 @@ #!/usr/bin/env php + * @copyright (C) 2006 - 2012 Adam Armstrong + * + */ + chdir(dirname($argv[0])); include("includes/defaults.inc.php"); include("config.php"); +include("includes/definitions.inc.php"); include("includes/functions.php"); foreach (dbFetchRows("SELECT * FROM `devices` AS D, `services` AS S WHERE S.device_id = D.device_id ORDER by D.device_id DESC") as $service) diff --git a/config.php.default b/config.php.default index b066d48582..f55fe3120e 100755 --- a/config.php.default +++ b/config.php.default @@ -38,6 +38,4 @@ $config['auth_mechanism'] = "mysql"; # default, other options: ldap, http-auth $config['nets'][] = "172.22.0.0/16"; $config['nets'][] = "192.168.0.0/24"; -include("includes/static-config.php"); - ?> diff --git a/delhost.php b/delhost.php index f31aefeb64..2c21d01f79 100755 --- a/delhost.php +++ b/delhost.php @@ -1,10 +1,23 @@ #!/usr/bin/env php + * @copyright (C) 2006 - 2012 Adam Armstrong + * + */ + chdir(dirname($argv[0])); include("includes/defaults.inc.php"); include("config.php"); +include("includes/definitions.inc.php"); include("includes/functions.php"); # Remove a host and all related data from the system @@ -24,4 +37,4 @@ if ($argv[1]) echo("Host Removal Tool\nUsage: ./delhost.php \n"); } -?> \ No newline at end of file +?> diff --git a/discovery.php b/discovery.php index 18118e0c1a..c3c129c576 100755 --- a/discovery.php +++ b/discovery.php @@ -1,21 +1,23 @@ #!/usr/bin/env php + * @copyright (C) 2006 - 2012 Adam Armstrong * - * See COPYING for more details. */ chdir(dirname($argv[0])); include("includes/defaults.inc.php"); include("config.php"); +include("includes/definitions.inc.php"); include("includes/functions.php"); include("includes/discovery/functions.inc.php"); diff --git a/generate-iplist.php b/generate-iplist.php index deae608e9b..a4b324fc3b 100755 --- a/generate-iplist.php +++ b/generate-iplist.php @@ -1,8 +1,21 @@ #!/usr/bin/env php + * @copyright (C) 2006 - 2012 Adam Armstrong + * + */ + include("includes/defaults.inc.php"); include("config.php"); +include("includes/definitions.inc.php"); include("includes/functions.php"); $handle = fopen("ips.txt", "w"); diff --git a/html/ajax_listports.php b/html/ajax_listports.php index cf96c43ee8..65abb2302e 100755 --- a/html/ajax_listports.php +++ b/html/ajax_listports.php @@ -1,5 +1,17 @@ + * @copyright (C) 2006 - 2012 Adam Armstrong + * + */ + if ($_GET['debug']) { ini_set('display_errors', 1); @@ -11,6 +23,7 @@ if ($_GET['debug']) include_once("../includes/defaults.inc.php"); include_once("../config.php"); +include_once("../includes/definitions.inc.php"); include_once("includes/functions.inc.php"); include_once("../includes/dbFacile.php"); include_once("../includes/common.php"); diff --git a/html/bandwidth-graph.php b/html/bandwidth-graph.php index ddf71f690c..fa4c296855 100644 --- a/html/bandwidth-graph.php +++ b/html/bandwidth-graph.php @@ -1,5 +1,17 @@ + * @copyright (C) 2006 - 2012 Adam Armstrong + * + */ + ini_set('allow_url_fopen', 0); ini_set('display_errors', 0); @@ -20,6 +32,7 @@ if (strpos($_SERVER['REQUEST_URI'], "debug")) include("../includes/defaults.inc.php"); include("../config.php"); +include("../includes/definitions.inc.php"); include("../includes/functions.php"); include("includes/functions.inc.php"); include("includes/authenticate.inc.php"); diff --git a/html/billing-graph.php b/html/billing-graph.php index ee04d8af88..f142804151 100755 --- a/html/billing-graph.php +++ b/html/billing-graph.php @@ -1,5 +1,17 @@ + * @copyright (C) 2006 - 2012 Adam Armstrong + * + */ + ini_set('allow_url_fopen', 0); ini_set('display_errors', 0); @@ -20,6 +32,7 @@ if (strpos($_SERVER['REQUEST_URI'], "debug")) include("../includes/defaults.inc.php"); include("../config.php"); +include("../includes/definitions.inc.php"); include("../includes/functions.php"); include("includes/functions.inc.php"); include("includes/authenticate.inc.php"); diff --git a/html/data.php b/html/data.php index 999dded6dd..034bc39b05 100644 --- a/html/data.php +++ b/html/data.php @@ -1,9 +1,22 @@ + * @copyright (C) 2006 - 2012 Adam Armstrong + * + */ + ## FIXME - fewer includes! include_once("../includes/defaults.inc.php"); include_once("../config.php"); +include_once("../includes/definitions.inc.php"); include_once("../includes/common.php"); include_once("../includes/dbFacile.php"); include_once("../includes/rewrites.php"); diff --git a/html/graph-realtime.php b/html/graph-realtime.php index e75051fd00..66d80194e5 100755 --- a/html/graph-realtime.php +++ b/html/graph-realtime.php @@ -1,15 +1,22 @@ , Manuel Kasper - and Jonathan Watt . - All rights reserved. - -*/ +/** + * Observium + * + * This file is included with Observium. It was originally part of m0n0wall + * + * @package observium + * @subpackage graphing + * @author T. Lechat , Manuel Kasper , Jonathan Watt + * @copyright 2004-2006 T. Lechat , Manuel Kasper , Jonathan Watt + * @license BSD + * + */ include_once("../includes/defaults.inc.php"); include_once("../config.php"); +include_once("../includes/definitions.inc.php"); + include_once("../includes/common.php"); include_once("../includes/dbFacile.php"); include_once("../includes/rewrites.php"); diff --git a/html/graph.php b/html/graph.php index 62b548b873..af4c8d69f0 100755 --- a/html/graph.php +++ b/html/graph.php @@ -1,5 +1,17 @@ + * @copyright (C) 2006 - 2012 Adam Armstrong + * + */ + function utime() { $time = explode(" ", microtime()); @@ -31,6 +43,7 @@ else include_once("../includes/defaults.inc.php"); include_once("../config.php"); +include_once("../includes/definitions.inc.php"); include_once("../includes/common.php"); include_once("../includes/dbFacile.php"); include_once("../includes/rewrites.php"); diff --git a/html/includes/graphs/bgp/prefixes.inc.php b/html/includes/graphs/bgp/prefixes.inc.php index 462cd5a70c..bf70dd5bb4 100644 --- a/html/includes/graphs/bgp/prefixes.inc.php +++ b/html/includes/graphs/bgp/prefixes.inc.php @@ -15,11 +15,4 @@ $graph_max = 1; $unit_text = "Prefixes"; -if($config['old_graphs']) -{ - include("includes/graphs/old_generic_simplex.inc.php"); -} else { - include("includes/graphs/generic_simplex.inc.php"); -} - ?> diff --git a/html/includes/graphs/device/hr_processes.inc.php b/html/includes/graphs/device/hr_processes.inc.php index 6f0faede23..41502dd8a3 100644 --- a/html/includes/graphs/device/hr_processes.inc.php +++ b/html/includes/graphs/device/hr_processes.inc.php @@ -1,20 +1,25 @@ diff --git a/html/includes/graphs/device/hr_users.inc.php b/html/includes/graphs/device/hr_users.inc.php index 58c889c656..eb75a01cf3 100644 --- a/html/includes/graphs/device/hr_users.inc.php +++ b/html/includes/graphs/device/hr_users.inc.php @@ -1,22 +1,25 @@ diff --git a/html/includes/graphs/device/ucd_interrupts.inc.php b/html/includes/graphs/device/ucd_interrupts.inc.php index e6d151f74b..5c70570b82 100755 --- a/html/includes/graphs/device/ucd_interrupts.inc.php +++ b/html/includes/graphs/device/ucd_interrupts.inc.php @@ -6,7 +6,7 @@ $rrd_filename = $config['rrd_dir'] . "/" . $device['hostname'] . "/ucd_ssRawIn $ds = "value"; -$colour_area = "CC9999"; +$colour_area = "EEBBBB"; $colour_line = "CC0000"; $colour_area_max = "cc9999"; @@ -18,4 +18,4 @@ $unit_text = "Interrupts/s"; include("includes/graphs/generic_simplex.inc.php"); -?> \ No newline at end of file +?> diff --git a/html/includes/graphs/generic_simplex.inc.php b/html/includes/graphs/generic_simplex.inc.php index edaed3897a..d30e1f99d7 100644 --- a/html/includes/graphs/generic_simplex.inc.php +++ b/html/includes/graphs/generic_simplex.inc.php @@ -1,5 +1,13 @@ diff --git a/html/includes/graphs/old_generic_simplex.inc.php b/html/includes/graphs/old_generic_simplex.inc.php index b23d2b25e2..d28b03de46 100644 --- a/html/includes/graphs/old_generic_simplex.inc.php +++ b/html/includes/graphs/old_generic_simplex.inc.php @@ -86,6 +86,7 @@ if ($percentile) if($_GET['previous'] == "yes") { $rrd_options .= " LINE1.25:".$ds."X#666666:'Prev \\\\n'"; + $rrd_options .= " AREA:".$ds."X#99999966:"; } ?> diff --git a/html/includes/graphs/processor/usage.inc.php b/html/includes/graphs/processor/usage.inc.php index 8cfd5140ba..fff084378b 100755 --- a/html/includes/graphs/processor/usage.inc.php +++ b/html/includes/graphs/processor/usage.inc.php @@ -9,6 +9,7 @@ $descr = substr(str_pad(short_hrDeviceDescr($proc['processor_descr']), 28),0,28) $descr = str_replace(":", "\:", $descr); $colour_line = "cc0000"; +$colour_area = "FFBBBB"; $colour_minmax = "c5c5c5"; $graph_max = 1; diff --git a/html/index.php b/html/index.php index c17b5020ad..63891a6d3e 100755 --- a/html/index.php +++ b/html/index.php @@ -1,7 +1,20 @@ + * @copyright (C) 2006 - 2012 Adam Armstrong + * + */ + include("../includes/defaults.inc.php"); include("../config.php"); +include_once("../includes/definitions.inc.php"); include("../includes/functions.php"); include("includes/functions.inc.php"); diff --git a/html/map.php b/html/map.php index 35faea90be..6ca2ac2981 100755 --- a/html/map.php +++ b/html/map.php @@ -1,5 +1,17 @@ + * @copyright (C) 2006 - 2012 Adam Armstrong + * + */ + ini_set('display_errors', 1); ini_set('display_startup_errors', 1); ini_set('log_errors', 1); @@ -9,6 +21,7 @@ $links = 1; include_once("../includes/defaults.inc.php"); include_once("../config.php"); +include_once("../includes/definitions.inc.php"); include_once("../includes/functions.php"); include_once("../includes/dbFacile.php"); include_once("includes/functions.inc.php"); diff --git a/html/netcmd.php b/html/netcmd.php index edd4038abc..fbd3e2fc41 100755 --- a/html/netcmd.php +++ b/html/netcmd.php @@ -1,5 +1,17 @@ + * @copyright (C) 2006 - 2012 Adam Armstrong + * + */ + ini_set('allow_url_fopen', 0); ini_set('display_errors', 0); @@ -13,6 +25,7 @@ if ($_GET[debug]) include("../includes/defaults.inc.php"); include("../config.php"); +include_once("../includes/definitions.inc.php"); include("includes/functions.inc.php"); include("../includes/functions.php"); include("includes/authenticate.inc.php"); @@ -55,4 +68,4 @@ if ($_GET['query'] && $_GET['cmd']) $output = trim($output); echo("
$output
"); -?> \ No newline at end of file +?> diff --git a/html/pdf.php b/html/pdf.php index 94a7ea82d7..a092f66eee 100644 --- a/html/pdf.php +++ b/html/pdf.php @@ -1,5 +1,17 @@ + * @copyright (C) 2006 - 2012 Adam Armstrong + * + */ + if (strpos($_SERVER['REQUEST_URI'], "debug")) { $debug = "1"; @@ -22,6 +34,7 @@ $report = (isset($_GET['report']) ? $_GET['report'] : ""); include("../includes/defaults.inc.php"); include("../config.php"); +include_once("../includes/definitions.inc.php"); include("../includes/functions.php"); include("includes/functions.inc.php"); include("includes/authenticate.inc.php"); diff --git a/includes/definitions.inc.php b/includes/definitions.inc.php new file mode 100644 index 0000000000..c4475365a0 --- /dev/null +++ b/includes/definitions.inc.php @@ -0,0 +1,1218 @@ + $blah) +{ + if (isset($config['os'][$this_os]['group'])) + { + $this_os_group = $config['os'][$this_os]['group']; + if (isset($config['os_group'][$this_os_group])) + { + foreach ($config['os_group'][$this_os_group] as $property => $value) + { + if (!isset($config['os'][$this_os][$property])) + { + $config['os'][$this_os][$property] = $value; + } + } + } + } +} + +### Graph Types + +$config['graph_sections'] = array('general', 'system', 'firewall', 'netstats', 'wireless', 'storage', 'vpdn', 'load balancer'); + +$config['graph_types']['device']['wifi_clients']['section'] = 'wireless'; +$config['graph_types']['device']['wifi_clients']['order'] = '0'; +$config['graph_types']['device']['wifi_clients']['descr'] = 'Wireless Clients'; + +$config['graph_types']['device']['agent']['section'] = 'system'; +$config['graph_types']['device']['agent']['order'] = '0'; +$config['graph_types']['device']['agent']['descr'] = 'Agent Execution Time'; + +$config['graph_types']['device']['cipsec_flow_bits']['section'] = 'firewall'; +$config['graph_types']['device']['cipsec_flow_bits']['order'] = '0'; +$config['graph_types']['device']['cipsec_flow_bits']['descr'] = 'IPSec Tunnel Traffic Volume'; +$config['graph_types']['device']['cipsec_flow_pkts']['section'] = 'firewall'; +$config['graph_types']['device']['cipsec_flow_pkts']['order'] = '0'; +$config['graph_types']['device']['cipsec_flow_pkts']['descr'] = 'IPSec Tunnel Traffic Packets'; +$config['graph_types']['device']['cipsec_flow_stats']['section'] = 'firewall'; +$config['graph_types']['device']['cipsec_flow_stats']['order'] = '0'; +$config['graph_types']['device']['cipsec_flow_stats']['descr'] = 'IPSec Tunnel Statistics'; +$config['graph_types']['device']['cipsec_flow_tunnels']['section'] = 'firewall'; +$config['graph_types']['device']['cipsec_flow_tunnels']['order'] = '0'; +$config['graph_types']['device']['cipsec_flow_tunnels']['descr'] = 'IPSec Active Tunnels'; +$config['graph_types']['device']['cras_sessions']['section'] = 'firewall'; +$config['graph_types']['device']['cras_sessions']['order'] = '0'; +$config['graph_types']['device']['cras_sessions']['descr'] = 'Remote Access Sessions'; +$config['graph_types']['device']['fortigate_sessions']['section'] = 'firewall'; +$config['graph_types']['device']['fortigate_sessions']['order'] = '0'; +$config['graph_types']['device']['fortigate_sessions']['descr'] = 'Active Sessions'; +$config['graph_types']['device']['fortigate_cpu']['section'] = 'system'; +$config['graph_types']['device']['fortigate_cpu']['order'] = '0'; +$config['graph_types']['device']['fortigate_cpu']['descr'] = 'CPU'; +$config['graph_types']['device']['screenos_sessions']['section'] = 'firewall'; +$config['graph_types']['device']['screenos_sessions']['order'] = '0'; +$config['graph_types']['device']['screenos_sessions']['descr'] = 'Active Sessions'; +$config['graph_types']['device']['panos_sessions']['section'] = 'firewall'; +$config['graph_types']['device']['panos_sessions']['order'] = '0'; +$config['graph_types']['device']['panos_sessions']['descr'] = 'Active Sessions'; + +$config['graph_types']['device']['bits']['section'] = 'netstats'; +$config['graph_types']['device']['bits']['order'] = '0'; +$config['graph_types']['device']['bits']['descr'] = 'Total Traffic'; +$config['graph_types']['device']['ipsystemstats_ipv4']['section'] = 'netstats'; +$config['graph_types']['device']['ipsystemstats_ipv4']['order'] = '0'; +$config['graph_types']['device']['ipsystemstats_ipv4']['descr'] = 'IPv4 Packet Statistics'; +$config['graph_types']['device']['ipsystemstats_ipv4_frag']['section'] = 'netstats'; +$config['graph_types']['device']['ipsystemstats_ipv4_frag']['order'] = '0'; +$config['graph_types']['device']['ipsystemstats_ipv4_frag']['descr'] = 'IPv4 Fragmentation Statistics'; +$config['graph_types']['device']['ipsystemstats_ipv6']['section'] = 'netstats'; +$config['graph_types']['device']['ipsystemstats_ipv6']['order'] = '0'; +$config['graph_types']['device']['ipsystemstats_ipv6']['descr'] = 'IPv6 Packet Statistics'; +$config['graph_types']['device']['ipsystemstats_ipv6_frag']['section'] = 'netstats'; +$config['graph_types']['device']['ipsystemstats_ipv6_frag']['order'] = '0'; +$config['graph_types']['device']['ipsystemstats_ipv6_frag']['descr'] = 'IPv6 Fragmentation Statistics'; +$config['graph_types']['device']['netstat_icmp_info']['section'] = 'netstats'; +$config['graph_types']['device']['netstat_icmp_info']['order'] = '0'; +$config['graph_types']['device']['netstat_icmp_info']['descr'] = 'ICMP Informational Statistics'; +$config['graph_types']['device']['netstat_icmp']['section'] = 'netstats'; +$config['graph_types']['device']['netstat_icmp']['order'] = '0'; +$config['graph_types']['device']['netstat_icmp']['descr'] = 'ICMP Statistics'; +$config['graph_types']['device']['netstat_ip']['section'] = 'netstats'; +$config['graph_types']['device']['netstat_ip']['order'] = '0'; +$config['graph_types']['device']['netstat_ip']['descr'] = 'IP Statistics'; +$config['graph_types']['device']['netstat_ip_frag']['section'] = 'netstats'; +$config['graph_types']['device']['netstat_ip_frag']['order'] = '0'; +$config['graph_types']['device']['netstat_ip_frag']['descr'] = 'IP Fragmentation Statistics'; +$config['graph_types']['device']['netstat_snmp']['section'] = 'netstats'; +$config['graph_types']['device']['netstat_snmp']['order'] = '0'; +$config['graph_types']['device']['netstat_snmp']['descr'] = 'SNMP Statistics'; +$config['graph_types']['device']['netstat_snmp_pkt']['section'] = 'netstats'; +$config['graph_types']['device']['netstat_snmp_pkt']['order'] = '0'; +$config['graph_types']['device']['netstat_snmp_pkt']['descr'] = 'SNMP Packet Type Statistics'; + +$config['graph_types']['device']['netstat_tcp']['section'] = 'netstats'; +$config['graph_types']['device']['netstat_tcp']['order'] = '0'; +$config['graph_types']['device']['netstat_tcp']['descr'] = 'TCP Statistics'; +$config['graph_types']['device']['netstat_udp']['section'] = 'netstats'; +$config['graph_types']['device']['netstat_udp']['order'] = '0'; +$config['graph_types']['device']['netstat_udp']['descr'] = 'UDP Statistics'; + +$config['graph_types']['device']['fdb_count']['section'] = 'system'; +$config['graph_types']['device']['fdb_count']['order'] = '0'; +$config['graph_types']['device']['fdb_count']['descr'] = 'MAC Addresses Learnt'; +$config['graph_types']['device']['hr_processes']['section'] = 'system'; +$config['graph_types']['device']['hr_processes']['order'] = '0'; +$config['graph_types']['device']['hr_processes']['descr'] = 'Running Processes'; +$config['graph_types']['device']['hr_users']['section'] = 'system'; +$config['graph_types']['device']['hr_users']['order'] = '0'; +$config['graph_types']['device']['hr_users']['descr'] = 'Users Logged In'; +$config['graph_types']['device']['mempool']['section'] = 'system'; +$config['graph_types']['device']['mempool']['order'] = '0'; +$config['graph_types']['device']['mempool']['descr'] = 'Memory Pool Usage'; +$config['graph_types']['device']['processor']['section'] = 'system'; +$config['graph_types']['device']['processor']['order'] = '0'; +$config['graph_types']['device']['processor']['descr'] = 'Processor Usage'; +$config['graph_types']['device']['storage']['section'] = 'system'; +$config['graph_types']['device']['storage']['order'] = '0'; +$config['graph_types']['device']['storage']['descr'] = 'Filesystem Usage'; +$config['graph_types']['device']['temperature']['section'] = 'system'; +$config['graph_types']['device']['temperature']['order'] = '0'; +$config['graph_types']['device']['temperature']['descr'] = 'temperature'; +$config['graph_types']['device']['ucd_cpu']['section'] = 'system'; +$config['graph_types']['device']['ucd_cpu']['order'] = '0'; +$config['graph_types']['device']['ucd_cpu']['descr'] = 'Detailed Processor Usage'; +$config['graph_types']['device']['ucd_load']['section'] = 'system'; +$config['graph_types']['device']['ucd_load']['order'] = '0'; +$config['graph_types']['device']['ucd_load']['descr'] = 'Load Averages'; +$config['graph_types']['device']['ucd_memory']['section'] = 'system'; +$config['graph_types']['device']['ucd_memory']['order'] = '0'; +$config['graph_types']['device']['ucd_memory']['descr'] = 'Detailed Memory Usage'; +$config['graph_types']['device']['ucd_swap_io']['section'] = 'system'; +$config['graph_types']['device']['ucd_swap_io']['order'] = '0'; +$config['graph_types']['device']['ucd_swap_io']['descr'] = 'Swap I/O Activity'; +$config['graph_types']['device']['ucd_io']['section'] = 'system'; +$config['graph_types']['device']['ucd_io']['order'] = '0'; +$config['graph_types']['device']['ucd_io']['descr'] = 'System I/O Activity'; +$config['graph_types']['device']['ucd_contexts']['section'] = 'system'; +$config['graph_types']['device']['ucd_contexts']['order'] = '0'; +$config['graph_types']['device']['ucd_contexts']['descr'] = 'Context Switches'; +$config['graph_types']['device']['ucd_interrupts']['section'] = 'system'; +$config['graph_types']['device']['ucd_interrupts']['order'] = '0'; +$config['graph_types']['device']['ucd_interrupts']['descr'] = 'Interrupts'; +$config['graph_types']['device']['uptime']['section'] = 'system'; +$config['graph_types']['device']['uptime']['order'] = '0'; +$config['graph_types']['device']['uptime']['descr'] = 'System Uptime'; + +$config['graph_types']['device']['vpdn_sessions_l2tp']['section'] = 'vpdn'; +$config['graph_types']['device']['vpdn_sessions_l2tp']['order'] = '0'; +$config['graph_types']['device']['vpdn_sessions_l2tp']['descr'] = 'VPDN L2TP Sessions'; + +$config['graph_types']['device']['vpdn_tunnels_l2tp']['section'] = 'vpdn'; +$config['graph_types']['device']['vpdn_tunnels_l2tp']['order'] = '0'; +$config['graph_types']['device']['vpdn_tunnels_l2tp']['descr'] = 'VPDN L2TP Tunnels'; + +$config['graph_types']['device']['netscaler_tcp_conn']['section'] = 'load balancer'; +$config['graph_types']['device']['netscaler_tcp_conn']['order'] = '0'; +$config['graph_types']['device']['netscaler_tcp_conn']['descr'] = 'TCP Connections'; + +$config['graph_types']['device']['netscaler_tcp_bits']['section'] = 'load balancer'; +$config['graph_types']['device']['netscaler_tcp_bits']['order'] = '0'; +$config['graph_types']['device']['netscaler_tcp_bits']['descr'] = 'TCP Traffic'; + +$config['graph_types']['device']['netscaler_tcp_pkts']['section'] = 'load balancer'; +$config['graph_types']['device']['netscaler_tcp_pkts']['order'] = '0'; +$config['graph_types']['device']['netscaler_tcp_pkts']['descr'] = 'TCP Packets'; + +$config['graph_descr']['device_smokeping_in_all'] = "This is an aggregate graph of the incoming smokeping tests to this host. The line corresponds to the average RTT. The shaded area around each line denotes the standard deviation."; +$config['graph_descr']['device_processor'] = "This is an aggregate graph of all processors in the system."; + +### Device Types + +$i = 0; +$config['device_types'][$i]['text'] = 'Servers'; +$config['device_types'][$i]['type'] = 'server'; +$config['device_types'][$i]['icon'] = 'server.png'; + +$i++; +$config['device_types'][$i]['text'] = 'Network'; +$config['device_types'][$i]['type'] = 'network'; +$config['device_types'][$i]['icon'] = 'network.png'; + +$i++; +$config['device_types'][$i]['text'] = 'Wireless'; +$config['device_types'][$i]['type'] = 'wireless'; +$config['device_types'][$i]['icon'] = 'wireless.png'; + +$i++; +$config['device_types'][$i]['text'] = 'Firewalls'; +$config['device_types'][$i]['type'] = 'firewall'; +$config['device_types'][$i]['icon'] = 'firewall.png'; + +$i++; +$config['device_types'][$i]['text'] = 'Power'; +$config['device_types'][$i]['type'] = 'power'; +$config['device_types'][$i]['icon'] = 'power.png'; + +$i++; +$config['device_types'][$i]['text'] = 'Environment'; +$config['device_types'][$i]['type'] = 'environment'; +$config['device_types'][$i]['icon'] = 'environment.png'; + +$i++; +$config['device_types'][$i]['text'] = 'Load Balancers'; +$config['device_types'][$i]['type'] = 'loadbalancer'; +$config['device_types'][$i]['icon'] = 'loadbalancer.png'; + +$i++; +$config['device_types'][$i]['text'] = 'Storage'; +$config['device_types'][$i]['type'] = 'storage'; +$config['device_types'][$i]['icon'] = 'storage.png'; + +if (isset($config['enable_printers']) && $config['enable_printers']) +{ + $i++; + $config['device_types'][$i]['text'] = 'Printers'; + $config['device_types'][$i]['type'] = 'printer'; + $config['device_types'][$i]['icon'] = 'printer.png'; +} + +############################## +# No changes below this line # +############################## + +$config['version'] = "0.SVN.ERROR"; + +if (file_exists($config['install_dir'] . '/.svn/entries')) +{ + $svn = File($config['install_dir'] . '/.svn/entries'); + if ((int)$svn[0] < 12) + { + // SVN version < 1.7 + $svn_rev = trim($svn[3]); + list($svn_date) = explode("T", trim($svn[9])); + } else { + // SVN version >= 1.7 + $xml = simplexml_load_string(shell_exec($config['svn'] . ' info --xml')); + if ($xml != false) + { + $svn_rev = $xml->entry->commit->attributes()->revision; + $svn_date = $xml->entry->commit->date; + } + } + list($svn_year, $svn_month, $svn_day) = explode("-", $svn_date); +} +if (!empty($svn_rev)) +{ + $config['version'] = "0." . ($svn_year-2000) . "." . ($svn_month+0) . "." . $svn_rev; +} + +if (isset($config['rrdgraph_def_text'])) +{ + $config['rrdgraph_def_text'] = str_replace(" ", " ", $config['rrdgraph_def_text']); + $config['rrd_opts_array'] = explode(" ", trim($config['rrdgraph_def_text'])); +} + +if (!isset($config['log_file'])) +{ + $config['log_file'] = $config['install_dir'] . "/observium.log"; +} + +if (isset($config['cdp_autocreate'])) +{ + $config['dp_autocreate'] = $config['cdp_autocreate']; +} + +if (!isset($config['mibdir'])) +{ + $config['mibdir'] = $config['install_dir']."/mibs"; +} +$config['mib_dir'] = $config['mibdir']; + +# If we're on SSL, let's properly detect it +if (isset($_SERVER['HTTPS'])) +{ + $config['base_url'] = preg_replace('/^http:/','https:', $config['base_url']); +} + +### Connect to database +$observium_link = mysql_pconnect($config['db_host'], $config['db_user'], $config['db_pass']); +if (!$observium_link) +{ + echo("

Observer MySQL Error

"); + echo(mysql_error()); + die; +} +$observium_db = mysql_select_db($config['db_name'], $observium_link); + +if ($config['memcached']['enable']) +{ + if (class_exists("Memcached")) + { + $memcache = new Memcached(); + $memcache->addServer($config['memcached']['host'], $config['memcached']['port']); + if ($debug) { print_r($memcache->getStats()); } + } + else + { + echo("WARNING: You have enabled memcached but have not installed the PHP bindings. Disabling memcached support.\n"); + echo("Try 'apt-get install php5-memcached' or 'pecl install memcached'. You will need the php5-dev and libmemcached-dev packages to use pecl.\n\n"); + $config['memcached']['enable'] = 0; + } +} + +# Set some times needed by loads of scripts (it's dynamic, so we do it here!) + +$config['time']['now'] = time(); +$config['time']['fourhour'] = time() - (4 * 60 * 60); +$config['time']['sixhour'] = time() - (6 * 60 * 60); +$config['time']['twelvehour'] = time() - (12 * 60 * 60); +$config['time']['day'] = time() - (24 * 60 * 60); +$config['time']['twoday'] = time() - (2 * 24 * 60 * 60); +$config['time']['week'] = time() - (7 * 24 * 60 * 60); +$config['time']['twoweek'] = time() - (2 * 7 * 24 * 60 * 60); +$config['time']['month'] = time() - (31 * 24 * 60 * 60); +$config['time']['twomonth'] = time() - (2 * 31 * 24 * 60 * 60); +$config['time']['threemonth'] = time() - (3 * 31 * 24 * 60 * 60); +$config['time']['sixmonth'] = time() - (6 * 31 * 24 * 60 * 60); +$config['time']['year'] = time() - (365 * 24 * 60 * 60); +$config['time']['twoyear'] = time() - (2 * 365 * 24 * 60 * 60); + +# IPMI sensor type mappings +$config['ipmi_unit']['Volts'] = 'voltage'; +$config['ipmi_unit']['degrees C'] = 'temperature'; +$config['ipmi_unit']['RPM'] = 'fanspeed'; +$config['ipmi_unit']['Watts'] = 'power'; +$config['ipmi_unit']['discrete'] = ''; + +## INCLUDE THE VMWARE DEFINITION FILE. +require_once("vmware_guestid.inc.php"); + +?> diff --git a/includes/static-config.php b/includes/static-config.php index c4475365a0..46b064123e 100644 --- a/includes/static-config.php +++ b/includes/static-config.php @@ -1,1218 +1,5 @@ $blah) -{ - if (isset($config['os'][$this_os]['group'])) - { - $this_os_group = $config['os'][$this_os]['group']; - if (isset($config['os_group'][$this_os_group])) - { - foreach ($config['os_group'][$this_os_group] as $property => $value) - { - if (!isset($config['os'][$this_os][$property])) - { - $config['os'][$this_os][$property] = $value; - } - } - } - } -} - -### Graph Types - -$config['graph_sections'] = array('general', 'system', 'firewall', 'netstats', 'wireless', 'storage', 'vpdn', 'load balancer'); - -$config['graph_types']['device']['wifi_clients']['section'] = 'wireless'; -$config['graph_types']['device']['wifi_clients']['order'] = '0'; -$config['graph_types']['device']['wifi_clients']['descr'] = 'Wireless Clients'; - -$config['graph_types']['device']['agent']['section'] = 'system'; -$config['graph_types']['device']['agent']['order'] = '0'; -$config['graph_types']['device']['agent']['descr'] = 'Agent Execution Time'; - -$config['graph_types']['device']['cipsec_flow_bits']['section'] = 'firewall'; -$config['graph_types']['device']['cipsec_flow_bits']['order'] = '0'; -$config['graph_types']['device']['cipsec_flow_bits']['descr'] = 'IPSec Tunnel Traffic Volume'; -$config['graph_types']['device']['cipsec_flow_pkts']['section'] = 'firewall'; -$config['graph_types']['device']['cipsec_flow_pkts']['order'] = '0'; -$config['graph_types']['device']['cipsec_flow_pkts']['descr'] = 'IPSec Tunnel Traffic Packets'; -$config['graph_types']['device']['cipsec_flow_stats']['section'] = 'firewall'; -$config['graph_types']['device']['cipsec_flow_stats']['order'] = '0'; -$config['graph_types']['device']['cipsec_flow_stats']['descr'] = 'IPSec Tunnel Statistics'; -$config['graph_types']['device']['cipsec_flow_tunnels']['section'] = 'firewall'; -$config['graph_types']['device']['cipsec_flow_tunnels']['order'] = '0'; -$config['graph_types']['device']['cipsec_flow_tunnels']['descr'] = 'IPSec Active Tunnels'; -$config['graph_types']['device']['cras_sessions']['section'] = 'firewall'; -$config['graph_types']['device']['cras_sessions']['order'] = '0'; -$config['graph_types']['device']['cras_sessions']['descr'] = 'Remote Access Sessions'; -$config['graph_types']['device']['fortigate_sessions']['section'] = 'firewall'; -$config['graph_types']['device']['fortigate_sessions']['order'] = '0'; -$config['graph_types']['device']['fortigate_sessions']['descr'] = 'Active Sessions'; -$config['graph_types']['device']['fortigate_cpu']['section'] = 'system'; -$config['graph_types']['device']['fortigate_cpu']['order'] = '0'; -$config['graph_types']['device']['fortigate_cpu']['descr'] = 'CPU'; -$config['graph_types']['device']['screenos_sessions']['section'] = 'firewall'; -$config['graph_types']['device']['screenos_sessions']['order'] = '0'; -$config['graph_types']['device']['screenos_sessions']['descr'] = 'Active Sessions'; -$config['graph_types']['device']['panos_sessions']['section'] = 'firewall'; -$config['graph_types']['device']['panos_sessions']['order'] = '0'; -$config['graph_types']['device']['panos_sessions']['descr'] = 'Active Sessions'; - -$config['graph_types']['device']['bits']['section'] = 'netstats'; -$config['graph_types']['device']['bits']['order'] = '0'; -$config['graph_types']['device']['bits']['descr'] = 'Total Traffic'; -$config['graph_types']['device']['ipsystemstats_ipv4']['section'] = 'netstats'; -$config['graph_types']['device']['ipsystemstats_ipv4']['order'] = '0'; -$config['graph_types']['device']['ipsystemstats_ipv4']['descr'] = 'IPv4 Packet Statistics'; -$config['graph_types']['device']['ipsystemstats_ipv4_frag']['section'] = 'netstats'; -$config['graph_types']['device']['ipsystemstats_ipv4_frag']['order'] = '0'; -$config['graph_types']['device']['ipsystemstats_ipv4_frag']['descr'] = 'IPv4 Fragmentation Statistics'; -$config['graph_types']['device']['ipsystemstats_ipv6']['section'] = 'netstats'; -$config['graph_types']['device']['ipsystemstats_ipv6']['order'] = '0'; -$config['graph_types']['device']['ipsystemstats_ipv6']['descr'] = 'IPv6 Packet Statistics'; -$config['graph_types']['device']['ipsystemstats_ipv6_frag']['section'] = 'netstats'; -$config['graph_types']['device']['ipsystemstats_ipv6_frag']['order'] = '0'; -$config['graph_types']['device']['ipsystemstats_ipv6_frag']['descr'] = 'IPv6 Fragmentation Statistics'; -$config['graph_types']['device']['netstat_icmp_info']['section'] = 'netstats'; -$config['graph_types']['device']['netstat_icmp_info']['order'] = '0'; -$config['graph_types']['device']['netstat_icmp_info']['descr'] = 'ICMP Informational Statistics'; -$config['graph_types']['device']['netstat_icmp']['section'] = 'netstats'; -$config['graph_types']['device']['netstat_icmp']['order'] = '0'; -$config['graph_types']['device']['netstat_icmp']['descr'] = 'ICMP Statistics'; -$config['graph_types']['device']['netstat_ip']['section'] = 'netstats'; -$config['graph_types']['device']['netstat_ip']['order'] = '0'; -$config['graph_types']['device']['netstat_ip']['descr'] = 'IP Statistics'; -$config['graph_types']['device']['netstat_ip_frag']['section'] = 'netstats'; -$config['graph_types']['device']['netstat_ip_frag']['order'] = '0'; -$config['graph_types']['device']['netstat_ip_frag']['descr'] = 'IP Fragmentation Statistics'; -$config['graph_types']['device']['netstat_snmp']['section'] = 'netstats'; -$config['graph_types']['device']['netstat_snmp']['order'] = '0'; -$config['graph_types']['device']['netstat_snmp']['descr'] = 'SNMP Statistics'; -$config['graph_types']['device']['netstat_snmp_pkt']['section'] = 'netstats'; -$config['graph_types']['device']['netstat_snmp_pkt']['order'] = '0'; -$config['graph_types']['device']['netstat_snmp_pkt']['descr'] = 'SNMP Packet Type Statistics'; - -$config['graph_types']['device']['netstat_tcp']['section'] = 'netstats'; -$config['graph_types']['device']['netstat_tcp']['order'] = '0'; -$config['graph_types']['device']['netstat_tcp']['descr'] = 'TCP Statistics'; -$config['graph_types']['device']['netstat_udp']['section'] = 'netstats'; -$config['graph_types']['device']['netstat_udp']['order'] = '0'; -$config['graph_types']['device']['netstat_udp']['descr'] = 'UDP Statistics'; - -$config['graph_types']['device']['fdb_count']['section'] = 'system'; -$config['graph_types']['device']['fdb_count']['order'] = '0'; -$config['graph_types']['device']['fdb_count']['descr'] = 'MAC Addresses Learnt'; -$config['graph_types']['device']['hr_processes']['section'] = 'system'; -$config['graph_types']['device']['hr_processes']['order'] = '0'; -$config['graph_types']['device']['hr_processes']['descr'] = 'Running Processes'; -$config['graph_types']['device']['hr_users']['section'] = 'system'; -$config['graph_types']['device']['hr_users']['order'] = '0'; -$config['graph_types']['device']['hr_users']['descr'] = 'Users Logged In'; -$config['graph_types']['device']['mempool']['section'] = 'system'; -$config['graph_types']['device']['mempool']['order'] = '0'; -$config['graph_types']['device']['mempool']['descr'] = 'Memory Pool Usage'; -$config['graph_types']['device']['processor']['section'] = 'system'; -$config['graph_types']['device']['processor']['order'] = '0'; -$config['graph_types']['device']['processor']['descr'] = 'Processor Usage'; -$config['graph_types']['device']['storage']['section'] = 'system'; -$config['graph_types']['device']['storage']['order'] = '0'; -$config['graph_types']['device']['storage']['descr'] = 'Filesystem Usage'; -$config['graph_types']['device']['temperature']['section'] = 'system'; -$config['graph_types']['device']['temperature']['order'] = '0'; -$config['graph_types']['device']['temperature']['descr'] = 'temperature'; -$config['graph_types']['device']['ucd_cpu']['section'] = 'system'; -$config['graph_types']['device']['ucd_cpu']['order'] = '0'; -$config['graph_types']['device']['ucd_cpu']['descr'] = 'Detailed Processor Usage'; -$config['graph_types']['device']['ucd_load']['section'] = 'system'; -$config['graph_types']['device']['ucd_load']['order'] = '0'; -$config['graph_types']['device']['ucd_load']['descr'] = 'Load Averages'; -$config['graph_types']['device']['ucd_memory']['section'] = 'system'; -$config['graph_types']['device']['ucd_memory']['order'] = '0'; -$config['graph_types']['device']['ucd_memory']['descr'] = 'Detailed Memory Usage'; -$config['graph_types']['device']['ucd_swap_io']['section'] = 'system'; -$config['graph_types']['device']['ucd_swap_io']['order'] = '0'; -$config['graph_types']['device']['ucd_swap_io']['descr'] = 'Swap I/O Activity'; -$config['graph_types']['device']['ucd_io']['section'] = 'system'; -$config['graph_types']['device']['ucd_io']['order'] = '0'; -$config['graph_types']['device']['ucd_io']['descr'] = 'System I/O Activity'; -$config['graph_types']['device']['ucd_contexts']['section'] = 'system'; -$config['graph_types']['device']['ucd_contexts']['order'] = '0'; -$config['graph_types']['device']['ucd_contexts']['descr'] = 'Context Switches'; -$config['graph_types']['device']['ucd_interrupts']['section'] = 'system'; -$config['graph_types']['device']['ucd_interrupts']['order'] = '0'; -$config['graph_types']['device']['ucd_interrupts']['descr'] = 'Interrupts'; -$config['graph_types']['device']['uptime']['section'] = 'system'; -$config['graph_types']['device']['uptime']['order'] = '0'; -$config['graph_types']['device']['uptime']['descr'] = 'System Uptime'; - -$config['graph_types']['device']['vpdn_sessions_l2tp']['section'] = 'vpdn'; -$config['graph_types']['device']['vpdn_sessions_l2tp']['order'] = '0'; -$config['graph_types']['device']['vpdn_sessions_l2tp']['descr'] = 'VPDN L2TP Sessions'; - -$config['graph_types']['device']['vpdn_tunnels_l2tp']['section'] = 'vpdn'; -$config['graph_types']['device']['vpdn_tunnels_l2tp']['order'] = '0'; -$config['graph_types']['device']['vpdn_tunnels_l2tp']['descr'] = 'VPDN L2TP Tunnels'; - -$config['graph_types']['device']['netscaler_tcp_conn']['section'] = 'load balancer'; -$config['graph_types']['device']['netscaler_tcp_conn']['order'] = '0'; -$config['graph_types']['device']['netscaler_tcp_conn']['descr'] = 'TCP Connections'; - -$config['graph_types']['device']['netscaler_tcp_bits']['section'] = 'load balancer'; -$config['graph_types']['device']['netscaler_tcp_bits']['order'] = '0'; -$config['graph_types']['device']['netscaler_tcp_bits']['descr'] = 'TCP Traffic'; - -$config['graph_types']['device']['netscaler_tcp_pkts']['section'] = 'load balancer'; -$config['graph_types']['device']['netscaler_tcp_pkts']['order'] = '0'; -$config['graph_types']['device']['netscaler_tcp_pkts']['descr'] = 'TCP Packets'; - -$config['graph_descr']['device_smokeping_in_all'] = "This is an aggregate graph of the incoming smokeping tests to this host. The line corresponds to the average RTT. The shaded area around each line denotes the standard deviation."; -$config['graph_descr']['device_processor'] = "This is an aggregate graph of all processors in the system."; - -### Device Types - -$i = 0; -$config['device_types'][$i]['text'] = 'Servers'; -$config['device_types'][$i]['type'] = 'server'; -$config['device_types'][$i]['icon'] = 'server.png'; - -$i++; -$config['device_types'][$i]['text'] = 'Network'; -$config['device_types'][$i]['type'] = 'network'; -$config['device_types'][$i]['icon'] = 'network.png'; - -$i++; -$config['device_types'][$i]['text'] = 'Wireless'; -$config['device_types'][$i]['type'] = 'wireless'; -$config['device_types'][$i]['icon'] = 'wireless.png'; - -$i++; -$config['device_types'][$i]['text'] = 'Firewalls'; -$config['device_types'][$i]['type'] = 'firewall'; -$config['device_types'][$i]['icon'] = 'firewall.png'; - -$i++; -$config['device_types'][$i]['text'] = 'Power'; -$config['device_types'][$i]['type'] = 'power'; -$config['device_types'][$i]['icon'] = 'power.png'; - -$i++; -$config['device_types'][$i]['text'] = 'Environment'; -$config['device_types'][$i]['type'] = 'environment'; -$config['device_types'][$i]['icon'] = 'environment.png'; - -$i++; -$config['device_types'][$i]['text'] = 'Load Balancers'; -$config['device_types'][$i]['type'] = 'loadbalancer'; -$config['device_types'][$i]['icon'] = 'loadbalancer.png'; - -$i++; -$config['device_types'][$i]['text'] = 'Storage'; -$config['device_types'][$i]['type'] = 'storage'; -$config['device_types'][$i]['icon'] = 'storage.png'; - -if (isset($config['enable_printers']) && $config['enable_printers']) -{ - $i++; - $config['device_types'][$i]['text'] = 'Printers'; - $config['device_types'][$i]['type'] = 'printer'; - $config['device_types'][$i]['icon'] = 'printer.png'; -} - -############################## -# No changes below this line # -############################## - -$config['version'] = "0.SVN.ERROR"; - -if (file_exists($config['install_dir'] . '/.svn/entries')) -{ - $svn = File($config['install_dir'] . '/.svn/entries'); - if ((int)$svn[0] < 12) - { - // SVN version < 1.7 - $svn_rev = trim($svn[3]); - list($svn_date) = explode("T", trim($svn[9])); - } else { - // SVN version >= 1.7 - $xml = simplexml_load_string(shell_exec($config['svn'] . ' info --xml')); - if ($xml != false) - { - $svn_rev = $xml->entry->commit->attributes()->revision; - $svn_date = $xml->entry->commit->date; - } - } - list($svn_year, $svn_month, $svn_day) = explode("-", $svn_date); -} -if (!empty($svn_rev)) -{ - $config['version'] = "0." . ($svn_year-2000) . "." . ($svn_month+0) . "." . $svn_rev; -} - -if (isset($config['rrdgraph_def_text'])) -{ - $config['rrdgraph_def_text'] = str_replace(" ", " ", $config['rrdgraph_def_text']); - $config['rrd_opts_array'] = explode(" ", trim($config['rrdgraph_def_text'])); -} - -if (!isset($config['log_file'])) -{ - $config['log_file'] = $config['install_dir'] . "/observium.log"; -} - -if (isset($config['cdp_autocreate'])) -{ - $config['dp_autocreate'] = $config['cdp_autocreate']; -} - -if (!isset($config['mibdir'])) -{ - $config['mibdir'] = $config['install_dir']."/mibs"; -} -$config['mib_dir'] = $config['mibdir']; - -# If we're on SSL, let's properly detect it -if (isset($_SERVER['HTTPS'])) -{ - $config['base_url'] = preg_replace('/^http:/','https:', $config['base_url']); -} - -### Connect to database -$observium_link = mysql_pconnect($config['db_host'], $config['db_user'], $config['db_pass']); -if (!$observium_link) -{ - echo("

Observer MySQL Error

"); - echo(mysql_error()); - die; -} -$observium_db = mysql_select_db($config['db_name'], $observium_link); - -if ($config['memcached']['enable']) -{ - if (class_exists("Memcached")) - { - $memcache = new Memcached(); - $memcache->addServer($config['memcached']['host'], $config['memcached']['port']); - if ($debug) { print_r($memcache->getStats()); } - } - else - { - echo("WARNING: You have enabled memcached but have not installed the PHP bindings. Disabling memcached support.\n"); - echo("Try 'apt-get install php5-memcached' or 'pecl install memcached'. You will need the php5-dev and libmemcached-dev packages to use pecl.\n\n"); - $config['memcached']['enable'] = 0; - } -} - -# Set some times needed by loads of scripts (it's dynamic, so we do it here!) - -$config['time']['now'] = time(); -$config['time']['fourhour'] = time() - (4 * 60 * 60); -$config['time']['sixhour'] = time() - (6 * 60 * 60); -$config['time']['twelvehour'] = time() - (12 * 60 * 60); -$config['time']['day'] = time() - (24 * 60 * 60); -$config['time']['twoday'] = time() - (2 * 24 * 60 * 60); -$config['time']['week'] = time() - (7 * 24 * 60 * 60); -$config['time']['twoweek'] = time() - (2 * 7 * 24 * 60 * 60); -$config['time']['month'] = time() - (31 * 24 * 60 * 60); -$config['time']['twomonth'] = time() - (2 * 31 * 24 * 60 * 60); -$config['time']['threemonth'] = time() - (3 * 31 * 24 * 60 * 60); -$config['time']['sixmonth'] = time() - (6 * 31 * 24 * 60 * 60); -$config['time']['year'] = time() - (365 * 24 * 60 * 60); -$config['time']['twoyear'] = time() - (2 * 365 * 24 * 60 * 60); - -# IPMI sensor type mappings -$config['ipmi_unit']['Volts'] = 'voltage'; -$config['ipmi_unit']['degrees C'] = 'temperature'; -$config['ipmi_unit']['RPM'] = 'fanspeed'; -$config['ipmi_unit']['Watts'] = 'power'; -$config['ipmi_unit']['discrete'] = ''; - -## INCLUDE THE VMWARE DEFINITION FILE. -require_once("vmware_guestid.inc.php"); +echo("Please remove static-config.inc.php from the bottom of your config.php"); ?> diff --git a/irc.php b/irc.php index 390067b5e1..6413c0e209 100755 --- a/irc.php +++ b/irc.php @@ -1,7 +1,18 @@ #!/usr/bin/env php - + * @copyright (C) 2006 - 2012 Adam Armstrong + * + */ + chdir(dirname($argv[0])); # Disable annoying messages... well... all messages actually :) @@ -9,6 +20,7 @@ error_reporting(0); include_once("includes/defaults.inc.php"); include_once("config.php"); +include("includes/definitions.inc.php"); include_once("includes/functions.php"); include_once("includes/discovery/functions.inc.php"); include_once('Net/SmartIRC.php'); diff --git a/poll-billing.php b/poll-billing.php index d4dca22719..bac05c94e8 100755 --- a/poll-billing.php +++ b/poll-billing.php @@ -1,10 +1,23 @@ #!/usr/bin/env php + * @copyright (C) 2006 - 2012 Adam Armstrong + * + */ + chdir(dirname($argv[0])); include("includes/defaults.inc.php"); include("config.php"); +include("includes/definitions.inc.php"); include("includes/functions.php"); $iter = "0"; diff --git a/poll-device.php b/poll-device.php index 88612cf05e..6ddda40565 100755 --- a/poll-device.php +++ b/poll-device.php @@ -1,6 +1,18 @@ #!/usr/bin/env php + * @copyright (C) 2006 - 2012 Adam Armstrong + * + */ + echo("\nPLEASE USE 'poller.php' INSTEAD!\n"); include("poller.php"); diff --git a/poller.php b/poller.php index fa553eb4ac..5cd05480cc 100755 --- a/poller.php +++ b/poller.php @@ -1,21 +1,23 @@ #!/usr/bin/env php + * @copyright (C) 2006 - 2012 Adam Armstrong * - * See COPYING for more details. */ chdir(dirname($argv[0])); include("includes/defaults.inc.php"); include("config.php"); +include("includes/definitions.inc.php"); include("includes/functions.php"); include("includes/polling/functions.inc.php"); diff --git a/renamehost.php b/renamehost.php index da9012f634..1178be36ae 100755 --- a/renamehost.php +++ b/renamehost.php @@ -1,10 +1,23 @@ #!/usr/bin/env php + * @copyright (C) 2006 - 2012 Adam Armstrong + * + */ + chdir(dirname($argv[0])); include("includes/defaults.inc.php"); include("config.php"); +include("includes/definitions.inc.php"); include("includes/functions.php"); # Remove a host and all related data from the system diff --git a/snmptrap.php b/snmptrap.php index 11838011d2..4ebefd5a6f 100755 --- a/snmptrap.php +++ b/snmptrap.php @@ -1,6 +1,18 @@ #!/usr/bin/env php + * @copyright (C) 2006 - 2012 Adam Armstrong + * + */ + ini_set('display_errors', 1); ini_set('display_startup_errors', 1); ini_set('log_errors', 1); @@ -8,6 +20,7 @@ ini_set('error_reporting', E_ALL); include("includes/defaults.inc.php"); include("config.php"); +include("includes/definitions.inc.php"); include("includes/functions.php"); $entry = explode(",", $argv[1]); diff --git a/syslog.php b/syslog.php index 2333d71047..5ef8c5b10b 100755 --- a/syslog.php +++ b/syslog.php @@ -9,13 +9,13 @@ * @package observium * @subpackage syslog * @author Adam Armstrong - * @copyright (C) 2006 - 2011 Adam Armstrong - * @license http://gnu.org/copyleft/gpl.html GNU GPL + * @copyright (C) 2006 - 2012 Adam Armstrong * */ include("includes/defaults.inc.php"); include("config.php"); +include("includes/definitions.inc.php"); include("includes/syslog.php"); include("includes/dbFacile.php"); include("includes/common.php");