diff --git a/INSTALL b/INSTALL index b34eadc04..27919e98f 100644 --- a/INSTALL +++ b/INSTALL @@ -29,7 +29,7 @@ LM-Sensors setup For lm-sensors/net-snmp to put your temperatures in the "Temp" group (as opposed to the "Misc" group, their name needs to start with "temp"; for -Observer to see the interface the name should start with "temp-" (i.e. +ObserverNMS to see the interface the name should start with "temp-" (i.e. temp-CPU, temp-System). You can change this in /etc/sensors.conf - change the label descriptions if necessary, under your specific chipset block. diff --git a/README b/README index 1e1708da9..fc4b00f11 100644 --- a/README +++ b/README @@ -18,7 +18,7 @@ Please see COPYING for usage requirements and restrictions. Introduction ------------ -Observer is an auto-discovering network monitoring system. +ObserverNMS is an auto-discovering network monitoring system. It's designed to be an easily-navigable interface to the health of your network. @@ -30,12 +30,12 @@ Planned Features * Pseudowire (MPLS/L2TP) tracking * In Progress * MPLS IP-VPN tracking * In Progress * 95th and metered usage tracking * In Progress -* Nagios Integration * Too scary for contempation +* Nagios Integration * Too scary for contemplation Installation ------------ -Installation of Observer is currently not for the faint of heart! There is no automated +Installation of ObserverNMS is currently not for the faint of heart! There is no automated install script, so it'll probably take quite a bit of fiddling! Please see http://www.observernms.org. diff --git a/database-schema.sql b/database-schema.sql index f137b639e..c6b2f84df 100644 --- a/database-schema.sql +++ b/database-schema.sql @@ -10,7 +10,7 @@ SET SQL_MODE="NO_AUTO_VALUE_ON_ZERO"; -- --- Database: `observer` +-- Database: `observernms` -- -- -------------------------------------------------------- diff --git a/html/pages/about.php b/html/pages/about.php index dc0ea2116..90a59dce0 100644 --- a/html/pages/about.php +++ b/html/pages/about.php @@ -128,11 +128,11 @@ print_optionbar_end(); ?> Versions - + diff --git a/includes/discovery/temperatures/observer-custom.inc.php b/includes/discovery/temperatures/observernms-custom.inc.php similarity index 92% rename from includes/discovery/temperatures/observer-custom.inc.php rename to includes/discovery/temperatures/observernms-custom.inc.php index 73e422bca..75c0c07c6 100644 --- a/includes/discovery/temperatures/observer-custom.inc.php +++ b/includes/discovery/temperatures/observernms-custom.inc.php @@ -5,7 +5,7 @@ global $valid_temp; if($device['os_group'] == "unix") { # FIXME snmp_walk - # Observer-style temperature + # ObserverNMS-style temperature $oids = shell_exec($config['snmpwalk'] . " -M " . $config['mibdir'] . " -M " . $config['mibdir'] . " -".$device['snmpver']." -m SNMPv2-SMI -Osqn -CI -c ".$device['community']." ".$device['hostname'].":".$device['port']." .1.3.6.1.4.1.2021.7891 | sed s/.1.3.6.1.4.1.2021.7891.// | grep '.1.1 ' | grep -v '.101.' | cut -d'.' -f 1"); $oids = trim($oids); if ($oids) echo("Observer-Style "); @@ -18,7 +18,7 @@ if($device['os_group'] == "unix") $descr_query = $config['snmpget'] . " -M " . $config['mibdir'] . " -".$device['snmpver']." -m SNMPv2-SMI -Osqn -c ".$device['community']." ".$device['hostname'].":".$device['port']." .1.3.6.1.4.1.2021.7891.$oid.2.1 | sed s/.1.3.6.1.4.1.2021.7891.$oid.2.1\ //"; $descr = trim(str_replace("\"", "", shell_exec($descr_query))); $fulloid = ".1.3.6.1.4.1.2021.7891.$oid.101.1"; - discover_temperature($valid_temp, $device, $fulloid, $oid, "observer", $descr, "1", NULL, NULL, NULL); + discover_temperature($valid_temp, $device, $fulloid, $oid, "observernms", $descr, "1", NULL, NULL, NULL); } } } diff --git a/includes/port-descr-parser.inc.php b/includes/port-descr-parser.inc.php index c329ee0b7..7b0723946 100644 --- a/includes/port-descr-parser.inc.php +++ b/includes/port-descr-parser.inc.php @@ -1,7 +1,7 @@ MySQL Error"; +$observernms_link = mysql_pconnect($config['db_host'], $config['db_user'], $config['db_pass']); +if (!$observernms_link) { + echo "

ObserverNMS MySQL Error

"; echo mysql_error(); die; } -$observer_db = mysql_select_db($config['db_name'], $observer_link); +$observernms_db = mysql_select_db($config['db_name'], $observernms_link); # Set some times needed by loads of scripts (it's dynamic, so we do it here!) diff --git a/irc.php b/irc.php index 20c776c52..ebe58c7ff 100755 --- a/irc.php +++ b/irc.php @@ -9,7 +9,7 @@ include("includes/discovery/functions.inc.php"); include_once('Net/SmartIRC.php'); -class observerbot +class observernmsbot { function device_info (&$irc, &$data) @@ -52,7 +52,7 @@ $port = 6667; $nick = "ObserverBOT"; $chan = "#observernms"; -$bot = &new observerbot( ); +$bot = &new observernmsbot( ); $irc = &new Net_SmartIRC( ); $irc->setUseSockets( TRUE );
ObserverNMS$observer_version
ObserverNMS$observernms_version
Apache$apache_version
PHP$php_version
MySQL$mysql_version