From b0297704e5abc8d2a5db4888ee4e829573810b72 Mon Sep 17 00:00:00 2001 From: Adam Amstrong Date: Sat, 17 Jul 2010 20:30:05 +0000 Subject: [PATCH] move more settings to defaults.inc.php, vastly simplify config.php.default. move collectd functions to html/includes/, include them only where needed. git-svn-id: http://www.observium.org/svn/observer/trunk@1390 61d68cd4-352d-0410-923a-c4978735b2b8 --- config.php.default | 187 +----------------- html/collectd-graph.php | 4 + html/images/observium-logo.png | Bin 4838 -> 9847 bytes .../includes}/collectd/config.php | 0 .../includes}/collectd/definitions.local.php | 0 .../includes}/collectd/definitions.php | 0 .../includes}/collectd/functions.php | 0 html/pages/device/collectd.inc.php | 4 + includes/defaults.inc.php | 134 +++++++++---- includes/functions.php | 8 +- includes/port-descr-parser.inc.php | 2 +- includes/static-config.php | 27 +-- 12 files changed, 123 insertions(+), 243 deletions(-) rename {includes => html/includes}/collectd/config.php (100%) rename {includes => html/includes}/collectd/definitions.local.php (100%) rename {includes => html/includes}/collectd/definitions.php (100%) rename {includes => html/includes}/collectd/functions.php (100%) diff --git a/config.php.default b/config.php.default index fa0d08386c..e7c0acf77e 100755 --- a/config.php.default +++ b/config.php.default @@ -11,8 +11,7 @@ $config['db_name'] = "observium"; ### Locations $config['install_dir'] = "/opt/observium"; $config['html_dir'] = $config['install_dir'] . "/html"; -$config['rrd_dir'] = "/opt/observium/rrd"; -$config['temp_dir'] = "/tmp"; +$config['rrd_dir'] = $config['install_dir'] . "/rrd"; $config['observer_log'] = $config['install_dir'] . "/observium.log"; ### Enable the below to use rrdcached. be sure rrd_dir is within the rrdcached dir @@ -20,188 +19,22 @@ $config['observer_log'] = $config['install_dir'] . "/observium.log"; #$config['rrdcached'] = "unix:/var/run/rrdcached.sock"; ### Default community -$config['community'] = "public"; +$config['snmp']['community'][] = "public"; -### Authentication model +### Authentication Model $config['auth_mechanism'] = "mysql"; # default, other options: ldap, http-auth #$config['http_auth_guest'] = "guest"; # remember to configure this user if you use http-auth # LDAP module configuration -$config['auth_ldap_server'] = "ldap.yourserver.com"; -$config['auth_ldap_port'] = 389; -$config['auth_ldap_prefix'] = "uid="; -$config['auth_ldap_suffix'] = ",ou=People,dc=example,dc=com"; -$config['auth_ldap_group'] = "cn=observium,ou=groups,dc=example,dc=com"; - -### Location of executables - -$config['rrdtool'] = "/usr/bin/rrdtool"; -$config['fping'] = "/usr/bin/fping"; -$config['ipcalc'] = "/usr/bin/ipcalc"; -$config['sipcalc'] = "/usr/bin/sipcalc"; -$config['snmpwalk'] = "/usr/bin/snmpwalk"; -$config['snmpget'] = "/usr/bin/snmpget"; -$config['snmpbulkwalk'] = "/usr/bin/snmpbulkwalk"; -$config['snmpset'] = "/usr/bin/snmpset"; - -### Application information. Multi-Tenant aware. -$config['branding'] = array( - - # The default branding. - 'default' => array( - 'base_url' => "http://observium.example.com", - 'mydomain' => "example.com", - 'page_title' => "Observium", -# 'title_image' => "images/observer-logo.gif", - 'stylesheet' => "css/styles.css", - 'mono_font' => "DejaVuSansMono", - 'header_color' => "#133A7B", - 'favicon' => "images/observer-icon.png", - 'page_gen' => 1, - 'footer' => "", - ), - - # Example branding for a specifc URL. - 'observium.branding.com' => array( - 'base_url' => "http://observium.branding.com", - 'mydomain' => "branding.com", - 'page_title' => "Observium", - 'title_image' => "images/observer-logo.gif", - 'stylesheet' => "css/styles.css", - 'mono_font' => "DejaVuSansMono", - 'header_color' => "#133A7B", - 'favicon' => "images/observer-icon.png", - 'page_gen' => 0, - 'footer' => "My Branding Company - Slogan!", - ), -); - -### E-Mail information. -$config['email_default'] = "observium@example.com"; -$config['email_from'] = "Observium "; -$config['email_headers'] = "From: " . $config['email_from'] . "\r\n"; +#$config['auth_ldap_server'] = "ldap.yourserver.com"; +#$config['auth_ldap_port'] = 389; +#$config['auth_ldap_prefix'] = "uid="; +#$config['auth_ldap_suffix'] = ",ou=People,dc=example,dc=com"; +#$config['auth_ldap_group'] = "cn=observium,ou=groups,dc=example,dc=com"; ### List of networks to allow scanning-based discovery -$config['nets'] = array ("89.21.224.0/19", "212.9.12.0/24", "212.9.13.0/24"); - -$config['page_refresh'] = "0"; ## Refresh the page every xx seconds -$config['front_page'] = "pages/front/default.php"; - -$config['login_message'] = "Unauthorised access or use shall render the user liable to criminal and/or civil prosecution."; - -### What should we warn about? -$config['warn']['ifdown'] = false; - -## Should we autocreate hosts we see via discovery protocols? -$config['cdp_autocreate'] = false; -$config['snmp_autodiscovery'] = false; - -### Which interface sections should we show? - -$config['int_customers'] = 1; # Enable Customer Port Parsing -$config['int_transit'] = 1; # Enable Transit Types -$config['int_peering'] = 1; # Enable Peering Types -$config['int_core'] = 1; # Enable Core Port Types -$config['int_l2tp'] = 0; # Enable L2TP Port Types - -$config['show_locations'] = 1; # Enable Locations on menu -$config['show_locations_dropdown'] = 0; # Enable Locations dropdown on menu -$config['show_services'] = 1; # Enable Services on menu - -$config['ports_page_default'] = "details/"; -# Default devices ports page display type. "details/", "graphs/bits/", etc - -#$config['port_descr_parser'] = "includes/port-descr-parser.inc.php"; -## Use parser to parse out ifAlias into type/descr/speed/circuit/notes - -### Which additional features should we enable? - -$config['enable_bgp'] = 1; # Enable BGP session collection and display -$config['enable_syslog'] = 0; # Enable Syslog -$config['enable_billing'] = 0; # Enable Billing -$config['enable_inventory'] = 1; # Enable Inventory -$config['enable_etherlike'] = 1; # Enable Etherlike -$config['enable_port_Xbcmc'] = 1; # Enable ifXEntry broadcast/multicast -$config['enable_pseudowires'] = 1; # Enable Pseudowires -$config['enable_ports_junoseatmvp'] = 0; # Enable JunOSe ATM VC Discovery/Poller -$config['enable_ports_etherlike'] = 0; # Enable Polling EtherLike-MIB (doubles interface processing time) -$config['enable_printers'] = 0; # Enable Printer support - -#$config['rancid_configs'] = '/var/lib/rancid/network/configs/'; -$config['rancid_ignorecomments'] = 0; # Ignore lines starting with # - -#$config['collectd_dir'] = '/var/lib/collectd/rrd'; - -## If a syslog entry contails these strings it is deleted from the database -$config['syslog_filter'] = array("last message repeated", "Connection from UDP: [127.0.0.1]:"); - -$config['syslog_age'] = "1 month"; ## Time to keep syslog for in - ## MySQL DATE_SUB format (eg '1 day', '1 month') - -### Interface name strings to ignore -$config['bad_if'] = array("null", "virtual-", "unrouted", "eobc", "mpls", "sl0", "lp0", "faith0", - "-atm layer", "-atm subif", "-shdsl", "-adsl", "-aal5", "-atm", "container", - "async", "plip", "-physical", "-signalling", "control", "container", "unrouted", - "bri", "-bearer", "bluetooth", "isatap", "ras", "qos", "miniport", "sonet/sdh", - "span rp", "span sp", "sslvpn"); - -$config['bad_if_regexp'] = array("/serial[0-9]:/"); - -$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; - -### Hardcoded ASN descriptions - -# $config['astext'][65333] = "Cymru Bogon Feed"; - -### Default warning settings - -$config['defaults']['temp_limit'] = 60; - -### Style Options - -$list_colour_a = "#ffffff"; -$list_colour_b = "#eeeeee"; - -$list_colour_a_a = "#f9f9f9"; -$list_colour_a_b = "#f0f0f0"; - -$list_colour_b_a = "#f0f0f0"; -$list_colour_b_b = "#e3e3e3"; - -$list_highlight = "#ffcccc"; - -$warn_colour_a = "#ffeeee"; -$warn_colour_b = "#ffcccc"; - -/// Many colour schemes for graphs. Feel free to fiddle! - -#$config['graph_colours'] = array("000066","330066","990066","990066","CC0033","FF0000"); ## Purple to Red -#$config['graph_colours'] = array("006600","336600","996600","996600","CC3300","FF0000"); ## Green to Red -#$config['graph_colours'] = array("002200","004400","006600","008800","00AA00","00CC00"); ## Green -#$config['graph_colours'] = array("220000","440000","660000","880000","AA0000","CC0000"); ## Red -#$config['graph_colours'] = array("001122","002244","003366","004488","0055AA","0066CC"); ## Blue -#$config['graph_colours'] = array("002233","004466","006699","0088CC","0099FF"); ## Sky-Blue -#$config['graph_colours'] = array("110022","330066","440088","6600AA","8800FF"); ## Purple -#$config['graph_colours'] = array("002200","004400","006600","008800","00AA00","00AA00","00CC00"); ## Forest Greens -#$config['graph_colours']['greens'] = array("112200","224400","336600","448800","66AA00","88FF00"); ## Grass Greens -#$config['graph_colours']['greens'] = array("95FFA7","4EFF97","33FF66","336600","224400","112200"); -#$config['graph_colours']['greens'] = array("B7d6A9","8fcb73","50b91d","3ab419","0a8612","034f11"); -#$config['graph_colours']['blues'] = array("b5d7ff","6eb7ff","0064ff","0082ff","0019d5","0016cb","00007d"); ## Cold Blues - -$config['graph_colours']['mixed'] = array("CC0000", "008C00", "4096EE", "73880A", "D01F3C", "36393D", "FF0084"); - -$config['graph_colours']['greens'] = array('B6D14B','91B13C','6D912D','48721E','24520F','003300'); -$config['graph_colours']['pinks'] = array('D0558F','B34773','943A57','792C38','5C1F1E','401F10'); -$config['graph_colours']['blues'] = array('A0A0E5','8080BD','606096','40406F','202048','000033'); -$config['graph_colours']['purples'] = array('CC7CCC','AF63AF','934A93','773177','5B185B','3F003F'); -$config['graph_colours']['default'] = $config['graph_colours']['blues']; +$config['nets'][] = "172.22.0.0/16"; +$config['nets'][] = "192.168.0.0/24"; include("includes/static-config.php"); diff --git a/html/collectd-graph.php b/html/collectd-graph.php index 165518e3c9..99b03c7a1b 100755 --- a/html/collectd-graph.php +++ b/html/collectd-graph.php @@ -27,7 +27,11 @@ if($_GET['debug']) { include("../includes/defaults.inc.php"); include("../config.php"); include("../includes/functions.php"); +require('includes/collectd/config.php'); +require('includes/collectd/functions.php'); +require('includes/collectd/definitions.php'); include("includes/authenticate.inc.php"); + if(!$_SESSION['authenticated']) { echo("not authenticated"); exit; } function makeTextBlock($text, $fontfile, $fontsize, $width) { diff --git a/html/images/observium-logo.png b/html/images/observium-logo.png index b43c98a845a4fdfd436c7f91d82406de5f339052..db2967b414756c863d6d76b0a9d36fc0451b4c32 100644 GIT binary patch literal 9847 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 J^`@Rl{|81|9pC@} diff --git a/includes/collectd/config.php b/html/includes/collectd/config.php similarity index 100% rename from includes/collectd/config.php rename to html/includes/collectd/config.php diff --git a/includes/collectd/definitions.local.php b/html/includes/collectd/definitions.local.php similarity index 100% rename from includes/collectd/definitions.local.php rename to html/includes/collectd/definitions.local.php diff --git a/includes/collectd/definitions.php b/html/includes/collectd/definitions.php similarity index 100% rename from includes/collectd/definitions.php rename to html/includes/collectd/definitions.php diff --git a/includes/collectd/functions.php b/html/includes/collectd/functions.php similarity index 100% rename from includes/collectd/functions.php rename to html/includes/collectd/functions.php diff --git a/html/pages/device/collectd.inc.php b/html/pages/device/collectd.inc.php index f18a059103..7c45dc6b84 100644 --- a/html/pages/device/collectd.inc.php +++ b/html/pages/device/collectd.inc.php @@ -18,6 +18,10 @@ error_reporting(E_ALL | E_NOTICE | E_WARNING); +require('includes/collectd/config.php'); +require('includes/collectd/functions.php'); +require('includes/collectd/definitions.php'); + #require('config.php'); #require('functions.php'); #require('definitions.php'); diff --git a/includes/defaults.inc.php b/includes/defaults.inc.php index 86d0f89b0b..8edaee6647 100644 --- a/includes/defaults.inc.php +++ b/includes/defaults.inc.php @@ -1,43 +1,67 @@ diff --git a/includes/functions.php b/includes/functions.php index 1f85f40c5f..df0acc84db 100755 --- a/includes/functions.php +++ b/includes/functions.php @@ -5,7 +5,7 @@ include_once("Net/IPv4.php"); include_once("Net/IPv6.php"); -## ObserverNMS Includes +## Observium Includes include_once($config['install_dir'] . "/includes/common.php"); include_once($config['install_dir'] . "/includes/rrdtool.inc.php"); @@ -19,12 +19,6 @@ include_once($config['install_dir'] . "/includes/rewrites.php"); include_once($config['install_dir'] . "/includes/snmp.inc.php"); include_once($config['install_dir'] . "/includes/services.inc.php"); -## CollectD - -require('collectd/config.php'); -require('collectd/functions.php'); -require('collectd/definitions.php'); - function mac_clean_to_readable($mac) { $r = substr($mac, 0, 2); diff --git a/includes/port-descr-parser.inc.php b/includes/port-descr-parser.inc.php index 71a95b7f4c..9e7ceab433 100644 --- a/includes/port-descr-parser.inc.php +++ b/includes/port-descr-parser.inc.php @@ -1,7 +1,7 @@ ObserverNMS MySQL Error"; +$observium_link = mysql_pconnect($config['db_host'], $config['db_user'], $config['db_pass']); +if (!$observium_link) { + echo "

Observer MySQL Error

"; echo mysql_error(); die; } -$observernms_db = mysql_select_db($config['db_name'], $observernms_link); +$observium_db = mysql_select_db($config['db_name'], $observium_link); # Set some times needed by loads of scripts (it's dynamic, so we do it here!)