diff --git a/CHANGELOG b/CHANGELOG index 81cd0ce7c9..6004193b0d 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -1,5 +1,5 @@ -For more granular updates check http://twitter.com/observernms or -http://www.observernms.org/websvn/listing.php?repname=observer +For more granular updates check http://twitter.com/observium or +http://www.observium.org/websvn/listing.php?repname=observer Release 0.10.6 diff --git a/INSTALL b/INSTALL index 27919e98f5..175a8c5e6b 100644 --- a/INSTALL +++ b/INSTALL @@ -1,6 +1,6 @@ Unfortunately this documentation hasn't been written yet. -Please see http://www.observernms.org for installation instructions. +Please see http://www.observium.org for installation instructions. Please also contact me via adama@memetic.org if you run in to any issues. @@ -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 -ObserverNMS to see the interface the name should start with "temp-" (i.e. +Observium 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 fc4b00f112..95d4905672 100644 --- a/README +++ b/README @@ -18,7 +18,7 @@ Please see COPYING for usage requirements and restrictions. Introduction ------------ -ObserverNMS is an auto-discovering network monitoring system. +Observium is an auto-discovering network monitoring system. It's designed to be an easily-navigable interface to the health of your network. @@ -35,10 +35,10 @@ Planned Features Installation ------------ -Installation of ObserverNMS is currently not for the faint of heart! There is no automated +Installation of Observium 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. +Please see http://www.observium.org. Please email adama@memetic.org with any feature requests, bug reports or just to tell me that you're using observer! diff --git a/check-errors.php b/check-errors.php index 7fb2625011..a0461d2444 100755 --- a/check-errors.php +++ b/check-errors.php @@ -30,7 +30,7 @@ if($errored) { ## If there are errored ports $i++; } ## Send the alert email - notify($device, "ObserverNMS detected errors on $i interface" . ($i != 1 ? 's' : ''), $msg); + notify($device, "Observium detected errors on $i interface" . ($i != 1 ? 's' : ''), $msg); } ?> diff --git a/config.php.default b/config.php.default index 51dd8e7603..fa0d08386c 100755 --- a/config.php.default +++ b/config.php.default @@ -6,14 +6,14 @@ $config['db_host'] = "localhost"; $config['db_user'] = "USERNAME"; $config['db_pass'] = "PASSWORD"; -$config['db_name'] = "observernms"; +$config['db_name'] = "observium"; ### Locations -$config['install_dir'] = "/opt/observernms"; +$config['install_dir'] = "/opt/observium"; $config['html_dir'] = $config['install_dir'] . "/html"; -$config['rrd_dir'] = "/opt/observernms/rrd"; +$config['rrd_dir'] = "/opt/observium/rrd"; $config['temp_dir'] = "/tmp"; -$config['observer_log'] = $config['install_dir'] . "/observernms.log"; +$config['observer_log'] = $config['install_dir'] . "/observium.log"; ### Enable the below to use rrdcached. be sure rrd_dir is within the rrdcached dir ### and that your web server has permission to talk to rrdcached. @@ -31,7 +31,7 @@ $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=observernms,ou=groups,dc=example,dc=com"; +$config['auth_ldap_group'] = "cn=observium,ou=groups,dc=example,dc=com"; ### Location of executables @@ -49,10 +49,10 @@ $config['branding'] = array( # The default branding. 'default' => array( - 'base_url' => "http://observernms.example.com", + 'base_url' => "http://observium.example.com", 'mydomain' => "example.com", - 'page_title' => "ObserverNMS", - 'title_image' => "images/observer-logo.gif", + 'page_title' => "Observium", +# 'title_image' => "images/observer-logo.gif", 'stylesheet' => "css/styles.css", 'mono_font' => "DejaVuSansMono", 'header_color' => "#133A7B", @@ -62,10 +62,10 @@ $config['branding'] = array( ), # Example branding for a specifc URL. - 'observernms.branding.com' => array( - 'base_url' => "http://observernms.branding.com", + 'observium.branding.com' => array( + 'base_url' => "http://observium.branding.com", 'mydomain' => "branding.com", - 'page_title' => "ObserverNMS", + 'page_title' => "Observium", 'title_image' => "images/observer-logo.gif", 'stylesheet' => "css/styles.css", 'mono_font' => "DejaVuSansMono", @@ -77,8 +77,8 @@ $config['branding'] = array( ); ### E-Mail information. -$config['email_default'] = "observernms@example.com"; -$config['email_from'] = "ObserverNMS "; +$config['email_default'] = "observium@example.com"; +$config['email_from'] = "Observium "; $config['email_headers'] = "From: " . $config['email_from'] . "\r\n"; ### List of networks to allow scanning-based discovery diff --git a/database-schema.sql b/database-schema.sql index c6b2f84df6..6cd6a86c84 100644 --- a/database-schema.sql +++ b/database-schema.sql @@ -10,7 +10,7 @@ SET SQL_MODE="NO_AUTO_VALUE_ON_ZERO"; -- --- Database: `observernms` +-- Database: `observium` -- -- -------------------------------------------------------- diff --git a/database-update.sql b/database-update.sql index a1ca53a5ac..21a8b0c4b8 100644 --- a/database-update.sql +++ b/database-update.sql @@ -28,3 +28,11 @@ DROP TABLE `voltage`; DROP TABLE `current`; ALTER TABLE `sensors` ADD `entPhysicalIndex` VARCHAR( 16 ) NULL; ALTER TABLE `sensors` ADD `entPhysicalIndex_measured` VARCHAR(16) NULL; +ALTER TABLE `processors` DROP INDEX `cpuCPU_id`; +ALTER TABLE `processors` ADD INDEX ( `device_id` ); +ALTER TABLE `ucd_diskio` ADD INDEX ( `device_id` ); +ALTER TABLE `storage` ADD INDEX ( `device_id` ); +ALTER TABLE `mac_accounting` ADD INDEX ( `interface_id` ); +ALTER TABLE `ipv4_addresses` ADD INDEX ( `interface_id` ); +ALTER TABLE `ipv6_addresses` ADD INDEX ( `interface_id` ); +ALTER TABLE `ipv4_mac` ADD INDEX ( `interface_id` ); diff --git a/discovery.php b/discovery.php index a65bdad147..bb8a942a22 100755 --- a/discovery.php +++ b/discovery.php @@ -9,9 +9,9 @@ include("includes/discovery/functions.inc.php"); $start = utime(); $runtime_stats = array(); -### ObserverNMS Device Discovery +### Observium Device Discovery -echo("ObserverNMS v".$config['version']." Discovery\n\n"); +echo("Observium v".$config['version']." Discovery\n\n"); $options = getopt("h:t:i:n:d::a::"); diff --git a/html/images/observium-icon.png b/html/images/observium-icon.png new file mode 100644 index 0000000000..0f9aa5563a Binary files /dev/null and b/html/images/observium-icon.png differ diff --git a/html/images/observium-logo.png b/html/images/observium-logo.png new file mode 100644 index 0000000000..b43c98a845 Binary files /dev/null and b/html/images/observium-logo.png differ diff --git a/html/index.php b/html/index.php index 8466bef139..070fd52b6d 100755 --- a/html/index.php +++ b/html/index.php @@ -112,7 +112,7 @@ function popUp(URL) { $gentime = substr($run, 0, 5); echo '