refactor: Updated a lot of references to LibreNMS - copyright still left intact (#4339)

This commit is contained in:
Neil Lathwood
2016-09-08 14:12:23 +01:00
committed by Tony Murray
parent 1ffebeac69
commit 7dec670494
39 changed files with 86 additions and 117 deletions

View File

@@ -2,13 +2,12 @@
<?php
/**
* Observium
* LibreNMS
*
* This file is part of Observium.
* This file is part of LibreNMS.
*
* @package observium
* @package LibreNMS
* @subpackage cli
* @author Adam Armstrong <adama@memetic.org>
* @copyright (C) 2006 - 2012 Adam Armstrong
*/

View File

@@ -2,13 +2,12 @@
<?php
/*
* Observium
* LibreNMS
*
* This file is part of Observium.
* This file is part of LibreNMS.
*
* @package observium
* @package LibreNMS
* @subpackage cli
* @author Adam Armstrong <adama@memetic.org>
* @copyright (C) 2006 - 2012 Adam Armstrong
*
*/

View File

@@ -2,13 +2,12 @@
<?php
/**
* Observium
* LibreNMS
*
* This file is part of Observium.
* This file is part of LibreNMS.
*
* @package observium
* @package LibreNMS
* @subpackage billing
* @author Adam Armstrong <adama@memetic.org>
* @copyright (C) 2006 - 2012 Adam Armstrong
*/

View File

@@ -2,13 +2,12 @@
<?php
/*
* Observium
* LibreNMS
*
* This file is part of Observium.
* This file is part of LibreNMS.
*
* @package observium
* @package LibreNMS
* @subpackage discovery
* @author Adam Armstrong <adama@memetic.org>
* @copyright (C) 2006 - 2012 Adam Armstrong
*/

View File

@@ -2,13 +2,12 @@
<?php
/**
* Observium
* LibreNMS
*
* This file is part of Observium.
* This file is part of LibreNMS.
*
* @package observium
* @package LibreNMS
* @subpackage cli
* @author Adam Armstrong <adama@memetic.org>
* @copyright (C) 2006 - 2012 Adam Armstrong
*/

View File

@@ -2,13 +2,12 @@
<?php
/**
* Observium
* LibreNMS
*
* This file is part of Observium.
* This file is part of LibreNMS.
*
* @package observium
* @package LibreNMS
* @subpackage discovery
* @author Adam Armstrong <adama@memetic.org>
* @copyright (C) 2006 - 2012 Adam Armstrong
*/

View File

@@ -7,7 +7,6 @@
*
* @package librenms
* @subpackage ajax
* @author Adam Armstrong <adama@memetic.org>
* @copyright (C) 2006 - 2012 Adam Armstrong
*/

View File

@@ -7,7 +7,6 @@
*
* @package librenms
* @subpackage webinterface
* @author Adam Armstrong <adama@memetic.org>
* @copyright (C) 2006 - 2012 Adam Armstrong
*/

View File

@@ -7,7 +7,6 @@
*
* @package librenms
* @subpackage billing
* @author Adam Armstrong <adama@memetic.org>
* @copyright (C) 2006 - 2012 Adam Armstrong
*/

View File

@@ -7,7 +7,6 @@
*
* @package librenms
* @subpackage webinterface
* @author Adam Armstrong <adama@memetic.org>
* @copyright (C) 2006 - 2012 Adam Armstrong
*/

View File

@@ -3,7 +3,7 @@
/**
* LibreNMS
*
* This file is included with Observium. It was originally part of m0n0wall <http://www.m0n0.ch/wall/>
* This file is included with LibreNMS. It was originally part of m0n0wall <http://www.m0n0.ch/wall/>
*
* @package librenms
* @subpackage graphing

View File

@@ -7,7 +7,6 @@
*
* @package librenms
* @subpackage graphing
* @author Adam Armstrong <adama@memetic.org>
* @copyright (C) 2006 - 2012 Adam Armstrong
*/

View File

@@ -7,7 +7,6 @@
*
* @package librenms
* @subpackage webinterface
* @author Adam Armstrong <adama@memetic.org>
* @copyright (C) 2006 - 2012 Adam Armstrong
*
*/

View File

@@ -7,7 +7,6 @@
*
* @package librenms
* @subpackage webinterface
* @author Adam Armstrong <adama@memetic.org>
* @copyright (C) 2006 - 2012 Adam Armstrong
*/

View File

@@ -7,7 +7,6 @@
*
* @package librenms
* @subpackage map
* @author Adam Armstrong <adama@memetic.org>
* @copyright (C) 2006 - 2012 Adam Armstrong
*
*/

View File

@@ -2,8 +2,6 @@
$css = <<<EOF
<!-- Observium PDF Billing Report Stylesheet //-->
<style>
.right {

View File

@@ -123,7 +123,7 @@ function genGraphs($bill_id, $imgtype, $from, $to, $bittype = 'Quota')
$res .= '&x=1190&y=250';
$res .= '&from='.$from.'&to='.$to;
if (!bill_permitted($bill_id)) {
$res = 'images/observium-logo.png';
$res = 'images/librenms_logo.png';
}
return $res;

View File

@@ -1,7 +1,7 @@
<?php
/**
* Observium Network Management and Monitoring System
* LibreNMS Network Management and Monitoring System
* Copyright (C) 2006-2011, Observium Developers - http://www.observium.org
*
* This program is free software: you can redistribute it and/or modify
@@ -11,9 +11,8 @@
*
* See COPYING for more details.
*
* @package observium
* @package LibreNMS
* @subpackage config
* @author Adam Armstrong <adama@memetic.org>
* @copyright (C) 2006 - 2012 Adam Armstrong
* @license http://gnu.org/copyleft/gpl.html GNU GPL
*/

View File

@@ -1,6 +1,6 @@
<?php
//
// Observium module to do device discovery by ARP table contents.
// LibreNMS module to do device discovery by ARP table contents.
//
// Needs to be run after the ARP table discovery, because it uses the
// data gathered by the ARP table discovery module. Keeps a cache of

View File

@@ -1,7 +1,7 @@
<?php
/*
* Observium Network Management and Monitoring System
* LibreNMS Network Management and Monitoring System
* Copyright (C) 2006-2011, Observium Developers - http://www.observium.org
*
* This program is free software: you can redistribute it and/or modify

View File

@@ -1,6 +1,6 @@
<?php
// root@alpha:/home/observium/dev# snmpwalk -v2c -c // -M mibs -m +NS-ROOT-MIB netscaler.test nsCPUTable
// root@alpha:/home/dev# snmpwalk -v2c -c // -M mibs -m +NS-ROOT-MIB netscaler.test nsCPUTable
// NS-ROOT-MIB::nsCPUname."cpu0" = STRING: "cpu0"
// NS-ROOT-MIB::nsCPUusage."cpu0" = Gauge32: 0
if ($device['os'] == 'netscaler') {

View File

@@ -1,13 +1,12 @@
<?php
/*
* Observium
* LibreNMS
*
* This file is part of Observium.
* This file is part of LibreNMS.
*
* @package observium
* @package LibreNMS
* @subpackage discovery
* @author Adam Armstrong <adama@memetic.org>
* @copyright (C) 2006 - 2012 Adam Armstrong
*/

View File

@@ -1,13 +1,12 @@
<?php
/**
* Observium
* LibreNMS
*
* This file is part of Observium.
* This file is part of LibreNMS.
*
* @package observium
* @package LibreNMS
* @subpackage discovery
* @author Adam Armstrong <adama@memetic.org>
* @copyright (C) 2006 - 2012 Adam Armstrong
*/

View File

@@ -19,7 +19,7 @@ if ($device['os_group'] == 'unix') {
$descr_query = $config['snmpget'].' -M '.$config['mibdir'].' -m SNMPv2-SMI -Osqn '.snmp_gen_auth($device).' '.$device['transport'].':'.$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_sensor($valid['sensor'], 'temperature', $device, $fulloid, $oid, 'observium', $descr, '1', '1', null, null, null, null, $current);
discover_sensor($valid['sensor'], 'temperature', $device, $fulloid, $oid, 'librenms', $descr, '1', '1', null, null, null, null, $current);
}
}
}//end if

View File

@@ -16,8 +16,8 @@ require 'includes/discovery/vlans/cisco-vtp.inc.php';
foreach ($device['vlans'] as $domain_id => $vlans) {
foreach ($vlans as $vlan_id => $vlan) {
// Pull Tables for this VLAN
// /usr/bin/snmpbulkwalk -v2c -c kglk5g3l454@988 -OQUs -m BRIDGE-MIB -M /opt/observium/mibs/ udp:sw2.ahf:161 dot1dStpPortEntry
// /usr/bin/snmpbulkwalk -v2c -c kglk5g3l454@988 -OQUs -m BRIDGE-MIB -M /opt/observium/mibs/ udp:sw2.ahf:161 dot1dBasePortEntry
// /usr/bin/snmpbulkwalk -v2c -c kglk5g3l454@988 -OQUs -m BRIDGE-MIB -M /opt/librenms/mibs/ udp:sw2.ahf:161 dot1dStpPortEntry
// /usr/bin/snmpbulkwalk -v2c -c kglk5g3l454@988 -OQUs -m BRIDGE-MIB -M /opt/librenms/mibs/ udp:sw2.ahf:161 dot1dBasePortEntry
// FIXME - do this only when vlan type == ethernet?
if (is_numeric($vlan_id) && ($vlan_id < 1002 || $vlan_id > 1105)) {
// Ignore reserved VLAN IDs

View File

@@ -1,13 +1,12 @@
<?php
/**
* Observium
* LibreNMS
*
* This file is part of Observium.
* This file is part of LibreNMS.
*
* @package observium
* @package LibreNMS
* @subpackage functions
* @author Adam Armstrong <adama@memetic.org>
* @copyright (C) 2006 - 2012 Adam Armstrong
*
*/

View File

@@ -1,6 +1,6 @@
<?php
// alpha:/home/observium/dev# snmpbulkwalk -v2c -c XXXXX -M mibs -m CISCO-IPSEC-FLOW-MONITOR-MIB cisco.3925 cipSecGlobalStats
// alpha:/home/dev# snmpbulkwalk -v2c -c XXXXX -M mibs -m CISCO-IPSEC-FLOW-MONITOR-MIB cisco.3925 cipSecGlobalStats
// CISCO-IPSEC-FLOW-MONITOR-MIB::cipSecGlobalActiveTunnels.0 = Gauge32: 10
// CISCO-IPSEC-FLOW-MONITOR-MIB::cipSecGlobalPreviousTunnels.0 = Counter32: 677 Phase-2 Tunnels
// CISCO-IPSEC-FLOW-MONITOR-MIB::cipSecGlobalInOctets.0 = Counter32: 2063116135 Octets

View File

@@ -1,7 +1,7 @@
<?php
/*
* Observium Network Management and Monitoring System
* LibreNMS Network Management and Monitoring System
* Copyright (C) 2006-2011, Observium Developers - http://www.observium.org
*
* This program is free software: you can redistribute it and/or modify

View File

@@ -1,35 +1,35 @@
<?php
// NS-ROOT-MIB::vsvrName."observium" = STRING: "observium"
// NS-ROOT-MIB::vsvrIpAddress."observium" = IpAddress: 195.78.84.141
// NS-ROOT-MIB::vsvrPort."observium" = INTEGER: 80
// NS-ROOT-MIB::vsvrType."observium" = INTEGER: http(0)
// NS-ROOT-MIB::vsvrState."observium" = INTEGER: up(7)
// NS-ROOT-MIB::vsvrCurClntConnections."observium" = Gauge32: 18
// NS-ROOT-MIB::vsvrCurSrvrConnections."observium" = Gauge32: 0
// NS-ROOT-MIB::vsvrSurgeCount."observium" = Counter32: 0
// NS-ROOT-MIB::vsvrTotalRequests."observium" = Counter64: 64532
// NS-ROOT-MIB::vsvrTotalRequestBytes."observium" = Counter64: 22223153
// NS-ROOT-MIB::vsvrTotalResponses."observium" = Counter64: 64496
// NS-ROOT-MIB::vsvrTotalResponseBytes."observium" = Counter64: 1048603453
// NS-ROOT-MIB::vsvrTotalPktsRecvd."observium" = Counter64: 629637
// NS-ROOT-MIB::vsvrTotalPktsSent."observium" = Counter64: 936237
// NS-ROOT-MIB::vsvrTotalSynsRecvd."observium" = Counter64: 43130
// NS-ROOT-MIB::vsvrCurServicesDown."observium" = Gauge32: 0
// NS-ROOT-MIB::vsvrCurServicesUnKnown."observium" = Gauge32: 0
// NS-ROOT-MIB::vsvrCurServicesOutOfSvc."observium" = Gauge32: 0
// NS-ROOT-MIB::vsvrCurServicesTransToOutOfSvc."observium" = Gauge32: 0
// NS-ROOT-MIB::vsvrCurServicesUp."observium" = Gauge32: 0
// NS-ROOT-MIB::vsvrTotMiss."observium" = Counter64: 0
// NS-ROOT-MIB::vsvrRequestRate."observium" = STRING: "0"
// NS-ROOT-MIB::vsvrRxBytesRate."observium" = STRING: "248"
// NS-ROOT-MIB::vsvrTxBytesRate."observium" = STRING: "188"
// NS-ROOT-MIB::vsvrSynfloodRate."observium" = STRING: "0"
// NS-ROOT-MIB::vsvrIp6Address."observium" = STRING: 0:0:0:0:0:0:0:0
// NS-ROOT-MIB::vsvrTotHits."observium" = Counter64: 64537
// NS-ROOT-MIB::vsvrTotSpillOvers."observium" = Counter32: 0
// NS-ROOT-MIB::vsvrTotalClients."observium" = Counter64: 43023
// NS-ROOT-MIB::vsvrClientConnOpenRate."observium" = STRING: "0"
// NS-ROOT-MIB::vsvrName."librenms" = STRING: "librenms"
// NS-ROOT-MIB::vsvrIpAddress."librenms" = IpAddress: 195.78.84.141
// NS-ROOT-MIB::vsvrPort."librenms" = INTEGER: 80
// NS-ROOT-MIB::vsvrType."librenms" = INTEGER: http(0)
// NS-ROOT-MIB::vsvrState."librenms" = INTEGER: up(7)
// NS-ROOT-MIB::vsvrCurClntConnections."librenms" = Gauge32: 18
// NS-ROOT-MIB::vsvrCurSrvrConnections."librenms" = Gauge32: 0
// NS-ROOT-MIB::vsvrSurgeCount."librenms" = Counter32: 0
// NS-ROOT-MIB::vsvrTotalRequests."librenms" = Counter64: 64532
// NS-ROOT-MIB::vsvrTotalRequestBytes."librenms" = Counter64: 22223153
// NS-ROOT-MIB::vsvrTotalResponses."librenms" = Counter64: 64496
// NS-ROOT-MIB::vsvrTotalResponseBytes."librenms" = Counter64: 1048603453
// NS-ROOT-MIB::vsvrTotalPktsRecvd."librenms" = Counter64: 629637
// NS-ROOT-MIB::vsvrTotalPktsSent."librenms" = Counter64: 936237
// NS-ROOT-MIB::vsvrTotalSynsRecvd."librenms" = Counter64: 43130
// NS-ROOT-MIB::vsvrCurServicesDown."librenms" = Gauge32: 0
// NS-ROOT-MIB::vsvrCurServicesUnKnown."librenms" = Gauge32: 0
// NS-ROOT-MIB::vsvrCurServicesOutOfSvc."librenms" = Gauge32: 0
// NS-ROOT-MIB::vsvrCurServicesTransToOutOfSvc."librenms" = Gauge32: 0
// NS-ROOT-MIB::vsvrCurServicesUp."librenms" = Gauge32: 0
// NS-ROOT-MIB::vsvrTotMiss."librenms" = Counter64: 0
// NS-ROOT-MIB::vsvrRequestRate."librenms" = STRING: "0"
// NS-ROOT-MIB::vsvrRxBytesRate."librenms" = STRING: "248"
// NS-ROOT-MIB::vsvrTxBytesRate."librenms" = STRING: "188"
// NS-ROOT-MIB::vsvrSynfloodRate."librenms" = STRING: "0"
// NS-ROOT-MIB::vsvrIp6Address."librenms" = STRING: 0:0:0:0:0:0:0:0
// NS-ROOT-MIB::vsvrTotHits."librenms" = Counter64: 64537
// NS-ROOT-MIB::vsvrTotSpillOvers."librenms" = Counter32: 0
// NS-ROOT-MIB::vsvrTotalClients."librenms" = Counter64: 43023
// NS-ROOT-MIB::vsvrClientConnOpenRate."librenms" = STRING: "0"
if ($device['os'] == 'netscaler') {
$oids_gauge = array(
'vsvrCurClntConnections',

View File

@@ -1,7 +1,7 @@
<?php
/*
* Observium Network Management and Monitoring System
* LibreNMS Network Management and Monitoring System
* Copyright (C) 2006-2011, Observium Developers - http://www.observium.org
*
* This program is free software: you can redistribute it and/or modify

View File

@@ -1,6 +1,5 @@
<?php
// Very basic parser to parse classic Observium-type schemes.
// Parser should populate $port_ifAlias array with type, descr, circuit, speed and notes
unset($port_ifAlias);

View File

@@ -21,7 +21,6 @@
* @link http://librenms.org
* @copyright (C) 2006 - 2012 Adam Armstrong
* @copyright 2016 Tony Murray
* @author Adam Armstrong <adama@memetic.org>
* @author Tony Murray <murraytony@gmail.com>
*/

View File

@@ -4,7 +4,7 @@
// 1 UNKNOWN
/*
* Observium Network Management and Monitoring System
* LibreNMS Network Management and Monitoring System
* Copyright (C) 2006-2012, Observium Developers - http://www.observium.org
*
* This program is free software: you can redistribute it and/or modify

View File

@@ -2,13 +2,12 @@
<?php
/*
* Observium
* LibreNMS
*
* This file is part of Observium.
* This file is part of LibreNMS.
*
* @package observium
* @package LibreNMS
* @subpackage billing
* @author Adam Armstrong <adama@memetic.org>
* @copyright (C) 2006 - 2012 Adam Armstrong
*/

View File

@@ -11,15 +11,11 @@
that should run simultaneously. If no argument is given it will assume
a default of 16 threads.
Read more: http://postman.memetic.org/pipermail/observium/2012-November/001303.html
Ubuntu Linux: apt-get install python-mysqldb
FreeBSD: cd /usr/ports/*/py-MySQLdb && make install clean
Tested on: Python 2.7.3 / PHP 5.3.10-1ubuntu3.4 / Ubuntu 12.04 LTS
GitHub: https://github.com/Atrato/observium-poller-wrapper
License: To the extent possible under law, Job Snijders has waived all
copyright and related or neighboring rights to this script.
This script has been put into the Public Domain. This work is

View File

@@ -2,13 +2,12 @@
<?php
/**
* Observium
* LibreNMS
*
* This file is part of Observium.
* This file is part of LibreNMS.
*
* @package observium
* @package LibreNMS
* @subpackage poller
* @author Adam Armstrong <adama@memetic.org>
* @copyright (C) 2006 - 2012 Adam Armstrong
*/

View File

@@ -2,13 +2,12 @@
<?php
/*
* Observium
* LibreNMS
*
* This file is part of Observium.
* This file is part of LibreNMS.
*
* @package observium
* @package LibreNMS
* @subpackage cli
* @author Adam Armstrong <adama@memetic.org>
* @copyright (C) 2006 - 2012 Adam Armstrong
*/

View File

@@ -2,13 +2,12 @@
<?php
/**
* Observium
* LibreNMS
*
* This file is part of Observium.
* This file is part of LibreNMS.
*
* @package observium
* @package LibreNMS
* @subpackage snmptraps
* @author Adam Armstrong <adama@memetic.org>
* @copyright (C) 2006 - 2012 Adam Armstrong
*/

View File

@@ -2,13 +2,12 @@
<?php
/**
* Observium
* LibreNMS
*
* This file is part of Observium.
* This file is part of LibreNMS.
*
* @package observium
* @package LibreNMS
* @subpackage syslog
* @author Adam Armstrong <adama@memetic.org>
* @copyright (C) 2006 - 2012 Adam Armstrong
*
*/