mirror/librenms-librenms
1
0
Fork 0
mirror of https://github.com/librenms/librenms.git synced 2024-10-07 16:52:45 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Updates

Browse Source 
git-svn-id: http://www.observium.org/svn/observer/trunk@501 61d68cd4-352d-0410-923a-c4978735b2b8
This commit is contained in:
Adam Amstrong
2009-11-03 20:03:26 +00:00
parent 5a6b6dcf3e
commit e55c2286f1
7 changed files with 14 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
060-to-current.sql
View File

@@ -1,15 +1,3 @@
ALTER TABLE `interfaces` ADD `pagpOperationMode` VARCHAR( 32 ) NULL;
ALTER TABLE `interfaces` ADD `pagpPortState` VARCHAR( 16 ) NULL;
ALTER TABLE `interfaces` ADD `pagpPartnerDeviceId` VARCHAR( 48 ) NULL;
ALTER TABLE `interfaces` ADD `pagpPartnerLearnMethod` VARCHAR( 16 ) NULL;
ALTER TABLE `interfaces` ADD `pagpPartnerIfIndex` INT NULL;
ALTER TABLE `interfaces` ADD `pagpPartnerGroupIfIndex` INT NULL;
ALTER TABLE `interfaces` ADD `pagpPartnerDeviceName` VARCHAR( 128 ) NULL;
ALTER TABLE `interfaces` ADD `pagpEthcOperationMode` VARCHAR( 16 ) NULL;
ALTER TABLE `interfaces` ADD `pagpDeviceId` VARCHAR( 48 ) NULL;
ALTER TABLE `interfaces` ADD `pagpGroupIfIndex` INT NULL;
ALTER TABLE `interfaces` ADD `portName` VARCHAR( 128 ) NULL DEFAULT NULL AFTER `ifName`;
ALTER TABLE `interfaces` ADD `ifHighSpeed` INT ( 11 ) NULL DEFAULT NULL AFTER `ifSpeed`;
ALTER TABLE `mac_accounting` ADD `cipMacHCSwitchedBytes_input` bigint(20) default NULL; ALTER TABLE `mac_accounting` ADD `cipMacHCSwitchedBytes_input` bigint(20) default NULL;
ALTER TABLE `mac_accounting` ADD `cipMacHCSwitchedBytes_input_prev` bigint(20) default NULL; ALTER TABLE `mac_accounting` ADD `cipMacHCSwitchedBytes_input_prev` bigint(20) default NULL;
ALTER TABLE `mac_accounting` ADD `cipMacHCSwitchedBytes_input_delta` bigint(20) default NULL; ALTER TABLE `mac_accounting` ADD `cipMacHCSwitchedBytes_input_delta` bigint(20) default NULL;

8
CHANGELOG
View File

@@ -1,3 +1,11 @@
Release 0.7 ( Pre-Release )
Changed netstats (icmp, udp, tcp, snmp, ip) stats collection
Implemented new includes-based graphing system
Replaced interfaces polling code
Removed or replaced a lot of old and unused code.
Release 0.6.0 ( 28th August 2009 ) Release 0.6.0 ( 28th August 2009 )
Changed IPv6 database structure and discovery *** DATABASE CHANGE *** Changed IPv6 database structure and discovery *** DATABASE CHANGE ***

2
addhost.php
View File

@@ -25,6 +25,6 @@ if($argv[1] && $argv[2] && $argv[3]) {
} else { echo("Already got host $host\n"); } } else { echo("Already got host $host\n"); }
} else { echo("Could not ping $host\n"); } } else { echo("Could not ping $host\n"); }
} else { echo("Could not resolve $host\n"); } } else { echo("Could not resolve $host\n"); }
} else { echo("Add Host Tool\nUsage: ./addhost.php <hostname> <community> <snmpversion> <port>\n"); } } else { echo("Add Host Tool\nUsage: ./addhost.php <hostname> <community> <snmpversion v1|v2c> <port>\n"); }
?> ?>

1
check-errors.php
View File

@@ -30,6 +30,7 @@ if($errored) { ## If there are errored interfaces
} }
## Send the alert email ## Send the alert email
mail($config['email_default'], "Observer detected errors on $i interfaces", $msg, $config['email_headers']); mail($config['email_default'], "Observer detected errors on $i interfaces", $msg, $config['email_headers']);
echo($msg);
} }
?> ?>

3
html/includes/graphs/multi_bits.inc.php
View File

@@ -1,8 +1,9 @@
<?php <?php
if($_GET['if']) { $interfaces = $_GET['if']; } if($_GET['port']) { $interfaces = $_GET['port']; }
if($_GET['interfaces']) { $interfaces = $_GET['interfaces']; } if($_GET['interfaces']) { $interfaces = $_GET['interfaces']; }
$i = 1; $i = 1;
foreach(explode(",", $interfaces) as $ifid) { foreach(explode(",", $interfaces) as $ifid) {
$query = mysql_query("SELECT `ifIndex`, `hostname` FROM `interfaces` AS I, devices as D WHERE I.interface_id = '" . $ifid . "' AND I.device_id = D.device_id"); $query = mysql_query("SELECT `ifIndex`, `hostname` FROM `interfaces` AS I, devices as D WHERE I.interface_id = '" . $ifid . "' AND I.device_id = D.device_id");

2
html/pages/device/graphs.inc.php
View File

@@ -144,7 +144,7 @@ while($device = mysql_fetch_array($device_query)) {
$graph_type = "device_users"; include ("includes/print-device-graph.php"); $graph_type = "device_users"; include ("includes/print-device-graph.php");
echo("<br />"); echo("<br />");
echo("<div class=graphhead>Running Processes</div>"); echo("<div class=graphhead>Running Processes</div>");
$graph_type = "device_procs"; include ("includes/print-device-graph.php"); $graph_type = "device_processes"; include ("includes/print-device-graph.php");
echo("<br />"); echo("<br />");
break; break;

2
html/pages/iftype.php
View File

@@ -51,7 +51,7 @@ echo("<table cellpadding=7 cellspacing=0 class=devicetable width=100%>");
if(file_exists($config['rrd_dir'] . "/" . $interface['hostname'] . "/" . $interface['ifIndex'] . ".rrd")) { if(file_exists($config['rrd_dir'] . "/" . $interface['hostname'] . "/" . $interface['ifIndex'] . ".rrd")) {
$graph_type = "bits"; $graph_type = "port_bits";
include("includes/print-interface-graphs.inc.php"); include("includes/print-interface-graphs.inc.php");
} }