mirror of
https://github.com/librenms/librenms.git
synced 2024-09-21 10:28:13 +00:00
THIS. IS. OBSERVIUM. also some indexes on sql tables.
git-svn-id: http://www.observium.org/svn/observer/trunk@1373 61d68cd4-352d-0410-923a-c4978735b2b8
This commit is contained in:
parent
e9ebab6c81
commit
e0944c233e
@ -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
|
||||
|
||||
|
4
INSTALL
4
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.
|
||||
|
||||
|
6
README
6
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!
|
||||
|
@ -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);
|
||||
}
|
||||
|
||||
?>
|
||||
|
@ -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 <observernms@example.com>";
|
||||
$config['email_default'] = "observium@example.com";
|
||||
$config['email_from'] = "Observium <observium@example.com>";
|
||||
$config['email_headers'] = "From: " . $config['email_from'] . "\r\n";
|
||||
|
||||
### List of networks to allow scanning-based discovery
|
||||
|
@ -10,7 +10,7 @@
|
||||
SET SQL_MODE="NO_AUTO_VALUE_ON_ZERO";
|
||||
|
||||
--
|
||||
-- Database: `observernms`
|
||||
-- Database: `observium`
|
||||
--
|
||||
|
||||
-- --------------------------------------------------------
|
||||
|
@ -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` );
|
||||
|
@ -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::");
|
||||
|
||||
|
BIN
html/images/observium-icon.png
Normal file
BIN
html/images/observium-icon.png
Normal file
Binary file not shown.
After Width: | Height: | Size: 1.8 KiB |
BIN
html/images/observium-logo.png
Normal file
BIN
html/images/observium-logo.png
Normal file
Binary file not shown.
After Width: | Height: | Size: 4.7 KiB |
@ -112,7 +112,7 @@ function popUp(URL) {
|
||||
$gentime = substr($run, 0, 5);
|
||||
|
||||
echo '<br /> <div id="footer">' . (isset($config['footer']) ? $config['footer'] : '');
|
||||
echo '<br />Powered by <a href="http://www.observernms.org" target="_blank">ObserverNMS ' . $config['version'];
|
||||
echo '<br />Powered by <a href="http://www.observium.org" target="_blank">Observium ' . $config['version'];
|
||||
|
||||
if (file_exists('.svn/entries'))
|
||||
{
|
||||
|
@ -1,10 +1,10 @@
|
||||
<div style="margin: 10px;">
|
||||
<h3>ObserverNMS <?php echo($config['version']);?></h3>
|
||||
<h3>Observium <?php echo($config['version']);?></h3>
|
||||
|
||||
<div style="float: right; padding: 0px; width: 49%">
|
||||
<?php print_optionbar_start(NULL); ?>
|
||||
<h3>License</h3>
|
||||
<pre>ObserverNMS Network Management and Monitoring System
|
||||
<pre>Observium Network Management and Monitoring System
|
||||
Copyright (C) 2006-2010 Adam Armstrong
|
||||
|
||||
This program is free software: you can redistribute it and/or modify
|
||||
@ -128,11 +128,11 @@ print_optionbar_end(); ?>
|
||||
|
||||
<?php
|
||||
|
||||
$observernms_version = $config['version'];
|
||||
$Observium_version = $config['version'];
|
||||
if (file_exists('.svn/entries'))
|
||||
{
|
||||
$svn = File('.svn/entries');
|
||||
$observernms_version .='-SVN r' . trim($svn[3]);
|
||||
$Observium_version .='-SVN r' . trim($svn[3]);
|
||||
unset($svn);
|
||||
}
|
||||
|
||||
@ -152,7 +152,7 @@ print_optionbar_start(NULL);
|
||||
echo("
|
||||
<h3>Versions</h3>
|
||||
<table width=100% cellpadding=3 cellspacing=0 border=0>
|
||||
<tr valign=top><td width=150><b>ObserverNMS</b></td><td>$observernms_version</td></tr>
|
||||
<tr valign=top><td width=150><b>Observium</b></td><td>$Observium_version</td></tr>
|
||||
<tr valign=top><td><b>Apache</b></td><td>$apache_version</td></tr>
|
||||
<tr valign=top><td><b>PHP</b></td><td>$php_version</td></tr>
|
||||
<tr valign=top><td><b>MySQL</b></td><td>$mysql_version</td></tr>
|
||||
@ -163,14 +163,14 @@ print_optionbar_end();
|
||||
|
||||
?>
|
||||
|
||||
<h5>ObserverNMS is an autodiscovering PHP/MySQL based network monitoring system.</h5>
|
||||
<h5>Observium is an autodiscovering PHP/MySQL based network monitoring system.</h5>
|
||||
|
||||
<p><a href="http://www.observernms.org">Website</a> |
|
||||
<a href="http://www.observernms.org/wiki/">Support Wiki</a> |
|
||||
<a href="http://www.observernms.org/forum/">Forum</a> |
|
||||
<a href="http://www.observernms.org/bugs/">Bugtracker</a> |
|
||||
<a href="http://www.observernms.org/pmwiki.php/Main/MailingLists">Mailing List</a> |
|
||||
<a href="http://twitter.com/observernms">Twitter</a> |
|
||||
<p><a href="http://www.observium.org">Website</a> |
|
||||
<a href="http://www.observium.org/wiki/">Support Wiki</a> |
|
||||
<a href="http://www.observium.org/forum/">Forum</a> |
|
||||
<a href="http://www.observium.org/bugs/">Bugtracker</a> |
|
||||
<a href="http://www.observium.org/pmwiki.php/Main/MailingLists">Mailing List</a> |
|
||||
<a href="http://twitter.com/Observium">Twitter</a> |
|
||||
<a href="http://www.facebook.com/pages/Observer/128354461353">Facebook</a></p>
|
||||
|
||||
|
||||
|
@ -6,7 +6,9 @@
|
||||
|
||||
unset ($port_ifAlias);
|
||||
|
||||
# echo("parser!");
|
||||
echo("parser!");
|
||||
|
||||
echo($this_port['ifAlias']);
|
||||
|
||||
list($type,$descr) = preg_split("/[\:\[\]\{\}\(\)]/", $this_port['ifAlias']);
|
||||
list(,$circuit) = preg_split("/[\{\}]/", $this_port['ifAlias']);
|
||||
@ -21,7 +23,9 @@
|
||||
$port_ifAlias['speed'] = $speed;
|
||||
$port_ifAlias['notes'] = $notes;
|
||||
|
||||
# if($debug) {
|
||||
print_r($port_ifAlias);
|
||||
# }
|
||||
|
||||
}
|
||||
|
||||
|
8
irc.php
8
irc.php
@ -9,7 +9,7 @@ include("includes/discovery/functions.inc.php");
|
||||
include_once('Net/SmartIRC.php');
|
||||
|
||||
|
||||
class observernmsbot
|
||||
class observiumbot
|
||||
{
|
||||
|
||||
function device_info (&$irc, &$data)
|
||||
@ -50,9 +50,9 @@ class observernmsbot
|
||||
$host = "chat.eu.freenode.net";
|
||||
$port = 6667;
|
||||
$nick = "ObserverBOT";
|
||||
$chan = "#observernms";
|
||||
$chan = "#observium";
|
||||
|
||||
$bot = &new observernmsbot( );
|
||||
$bot = &new observiumbot( );
|
||||
$irc = &new Net_SmartIRC( );
|
||||
$irc->setUseSockets( TRUE );
|
||||
|
||||
@ -60,7 +60,7 @@ $irc->registerActionhandler( SMARTIRC_TYPE_CHANNEL, '!device', $bot, 'device_inf
|
||||
$irc->registerActionhandler( SMARTIRC_TYPE_CHANNEL, '!port', $bot, 'port_info' );
|
||||
|
||||
$irc->connect( $host, $port );
|
||||
$irc->login( $nick, 'ObserverNMS Bot', 0, $nick );
|
||||
$irc->login( $nick, 'Observium Bot', 0, $nick );
|
||||
$irc->join( array( $chan ) );
|
||||
$irc->listen( );
|
||||
$irc->disconnect( );
|
||||
|
@ -1,14 +1,14 @@
|
||||
#!/usr/bin/php
|
||||
<?php
|
||||
|
||||
### ObserverNMS Device Poller
|
||||
### Observium Device Poller
|
||||
|
||||
include("includes/defaults.inc.php");
|
||||
include("config.php");
|
||||
include("includes/functions.php");
|
||||
|
||||
$poller_start = utime();
|
||||
echo("ObserverNMS Poller v".$config['version']."\n\n");
|
||||
echo("Observium Poller v".$config['version']."\n\n");
|
||||
|
||||
$options = getopt("h:t:i:n:d::a::");
|
||||
|
||||
@ -261,7 +261,7 @@ $poller_end = utime(); $poller_run = $poller_end - $poller_start; $poller_time =
|
||||
|
||||
$string = $argv[0] . " $doing " . date("F j, Y, G:i") . " - $polled_devices devices polled in $poller_time secs";
|
||||
if ($debug) echo("$string\n");
|
||||
shell_exec("echo '".$string."' >> ".$config['install_dir']."/observernms.log"); # FIXME EWW
|
||||
shell_exec("echo '".$string."' >> ".$config['install_dir']."/observium.log"); # FIXME EWW
|
||||
|
||||
|
||||
?>
|
||||
|
@ -9,9 +9,9 @@ include("includes/discovery/functions.inc.php");
|
||||
|
||||
$start = utime();
|
||||
|
||||
### ObserverNMS Device Discovery
|
||||
### Observium Device Discovery
|
||||
|
||||
echo("ObserverNMS v".$config['version']." Discovery\n\n");
|
||||
echo("Observium v".$config['version']." Discovery\n\n");
|
||||
|
||||
if($argv[1] == "--device" && $argv[2]) {
|
||||
$where = "AND `device_id` = '".$argv[2]."'";
|
||||
|
@ -9,9 +9,9 @@ $debug =1;
|
||||
|
||||
$poller_start = utime();
|
||||
|
||||
### ObserverNMS Device Polling Test
|
||||
### Observium Device Polling Test
|
||||
|
||||
echo("ObserverNMS v".$config['version']." Discovery\n\n");
|
||||
echo("Observium v".$config['version']." Discovery\n\n");
|
||||
|
||||
if($argv[1] == "--device" && $argv[2]) {
|
||||
$where = "AND `device_id` = '".$argv[2]."'";
|
||||
|
@ -8,7 +8,7 @@ include("includes/functions.php");
|
||||
$ports = mysql_result(mysql_query("SELECT count(*) FROM ports"),0);
|
||||
$devices = mysql_result(mysql_query("SELECT count(*) FROM devices"),0);
|
||||
|
||||
$dataHandle = fopen("http://www.observernms.org/latest.php?i=$ports&d=$devices&v=".$config['version'], r);
|
||||
$dataHandle = fopen("http://www.observium.org/latest.php?i=$ports&d=$devices&v=".$config['version'], r);
|
||||
|
||||
if($dataHandle)
|
||||
{
|
||||
|
Loading…
Reference in New Issue
Block a user