nicolas/librenms
1
0
Fork 0
mirror of https://github.com/stylersnico/librenms.git synced 2026-07-27 00:25:06 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into devel

Browse Source
This commit is contained in:
Paul Gear
2013-10-28 20:56:59 +10:00
parent d6380ae88b 92bb781d80
commit 000add781f
21 changed files with 117 additions and 104 deletions
Download Patch File Download Diff File Expand all files Collapse all files
CHANGELOG
+1 -3
View File
@@ -1,3 +1 @@
Please check http://www.observium.org/wiki/Changelog for an up to date changelog.
You can also browse the subversion repository commit logs for more granular updates.
See the commit log at https://github.com/librenms/librenms/commits/master for details.
INSTALL.md
+3 -2
View File
@@ -32,7 +32,7 @@ now restart MySQL
aptitude install libapache2-mod-php5 php5-cli php5-mysql php5-gd php5-snmp php-pear snmp graphviz php5-mcrypt apache2 fping imagemagick whois mtr-tiny nmap python-mysqldb snmpd mysql-client php-net-ipv4 php-net-ipv6 rrdtool
cd /opt
git clone https://github.com/libertysys/librenms.git librenms
git clone https://github.com/librenms/librenms.git librenms
cd /opt/librenms
cp config.php.default config.php
vim config.php
@@ -76,7 +76,7 @@ Next, add the following to `/etc/apache2/available-sites/librenms.conf`
<VirtualHost *:80>
DocumentRoot /opt/librenms/html/
ServerName librenms.label-switched.net
ServerName librenms.example.com
CustomLog /opt/librenms/logs/access_log combined
ErrorLog /opt/librenms/logs/error_log
<Directory "/opt/librenms/html/">
@@ -85,6 +85,7 @@ Next, add the following to `/etc/apache2/available-sites/librenms.conf`
</Directory>
</VirtualHost>
Don't forget to change 'example.com' to your domain
Enable the vhost and restart Apache
a2ensite librenms.conf
README.md
+1 -1
View File
@@ -4,7 +4,7 @@ License
Copyright (C) 2006-2012 Adam Armstrong <adama@memetic.org>
Copyright (C) 2013 LibreNMS Group <librenms-project@googlegroups.com>
Copyright (C) 2013 LibreNMS Contributors <librenms-project@googlegroups.com>
This program is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
TODO.md
-2
View File
@@ -1,10 +1,8 @@
Current priorities
------------------
- Test installation and ensure it works
- Identify major functionality gaps
- Integrate community patches
- Get a community wiki up and running
- Update install documentation, change svn -> git
- Get a logo. Replace Observium branding.
addhost.php
+6 -5
View File
@@ -2,14 +2,15 @@
<?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
* @author LibreNMS Group <librenms-project@google.groups.com>
* @copyright (C) 2006 - 2012 Adam Armstrong (as Observium)
* @copyright (C) 2013 LibreNMS Group
*
*/
adduser.php
+6 -5
View File
@@ -2,14 +2,15 @@
<?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
* @author LibreNMS Group <librenms-project@google.groups.com>
* @copyright (C) 2006 - 2012 Adam Armstrong (as Observium)
* @copyright (C) 2013 LibreNMS Group
*
*/
alerts.php
+7 -6
View File
@@ -2,14 +2,15 @@
<?php
/**
* Observium
* LibreNMS
*
* This file is part of Observium.
* This file is part of LibreNMS
*
* @package observium
* @subpackage alerts
* @author Adam Armstrong <adama@memetic.org>
* @copyright (C) 2006 - 2012 Adam Armstrong
* @package librenms
* @subpackage cli
* @author LibreNMS Group <librenms-project@google.groups.com>
* @copyright (C) 2006 - 2012 Adam Armstrong (as Observium)
* @copyright (C) 2013 LibreNMS Group
*
*/
billing-calculate.php
+7 -6
View File
@@ -2,14 +2,15 @@
<?php
/**
* Observium
* LibreNMS
*
* This file is part of Observium.
* This file is part of LibreNMS
*
* @package observium
* @subpackage billing
* @author Adam Armstrong <adama@memetic.org>
* @copyright (C) 2006 - 2012 Adam Armstrong
* @package librenms
* @subpackage cli
* @author LibreNMS Group <librenms-project@google.groups.com>
* @copyright (C) 2006 - 2012 Adam Armstrong (as Observium)
* @copyright (C) 2013 LibreNMS Group
*
*/
check-errors.php
+7 -6
View File
@@ -2,14 +2,15 @@
<?php
/**
* Observium
* LibreNMS
*
* This file is part of Observium.
* This file is part of LibreNMS
*
* @package observium
* @subpackage alerts
* @author Adam Armstrong <adama@memetic.org>
* @copyright (C) 2006 - 2012 Adam Armstrong
* @package librenms
* @subpackage cli
* @author LibreNMS Group <librenms-project@google.groups.com>
* @copyright (C) 2006 - 2012 Adam Armstrong (as Observium)
* @copyright (C) 2013 LibreNMS Group
*
*/
check-services.php
+7 -6
View File
@@ -2,14 +2,15 @@
<?php
/**
* Observium
* LibreNMS
*
* This file is part of Observium.
* This file is part of LibreNMS
*
* @package observium
* @subpackage services
* @author Adam Armstrong <adama@memetic.org>
* @copyright (C) 2006 - 2012 Adam Armstrong
* @package librenms
* @subpackage cli
* @author LibreNMS Group <librenms-project@google.groups.com>
* @copyright (C) 2006 - 2012 Adam Armstrong (as Observium)
* @copyright (C) 2013 LibreNMS Group
*
*/
config.php.default
+4 -4
View File
@@ -6,7 +6,7 @@
$config['db_host'] = "localhost";
$config['db_user'] = "USERNAME";
$config['db_pass'] = "PASSWORD";
$config['db_name'] = "observium";
$config['db_name'] = "librenms";
### Memcached config - We use this to store realtime usage
$config['memcached']['enable'] = FALSE;
@@ -14,14 +14,14 @@ $config['memcached']['host'] = "localhost";
$config['memcached']['port'] = 11211;
### Locations
$config['install_dir'] = "/opt/observium";
$config['install_dir'] = "/opt/librenms";
$config['html_dir'] = $config['install_dir'] . "/html";
$config['rrd_dir'] = $config['install_dir'] . "/rrd";
$config['log_file'] = $config['install_dir'] . "/observium.log";
$config['log_file'] = $config['install_dir'] . "/librenms.log";
### Thie should *only* be set if you want to *force* a particular hostname/port
### It will prevent the web interface being usable form any other hostname
#$config['base_url'] = "http://observium.company.com";
#$config['base_url'] = "http://librenms.company.com";
### 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.
delhost.php
+6 -5
View File
@@ -2,14 +2,15 @@
<?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
* @author LibreNMS Group <librenms-project@google.groups.com>
* @copyright (C) 2006 - 2012 Adam Armstrong (as Observium)
* @copyright (C) 2013 LibreNMS Group
*
*/
discovery.php
+7 -6
View File
@@ -2,14 +2,15 @@
<?php
/**
* Observium
* LibreNMS
*
* This file is part of Observium.
* This file is part of LibreNMS
*
* @package observium
* @subpackage discovery
* @author Adam Armstrong <adama@memetic.org>
* @copyright (C) 2006 - 2012 Adam Armstrong
* @package librenms
* @subpackage cli
* @author LibreNMS Group <librenms-project@google.groups.com>
* @copyright (C) 2006 - 2012 Adam Armstrong (as Observium)
* @copyright (C) 2013 LibreNMS Group
*
*/
generate-iplist.php
+7 -6
View File
@@ -2,14 +2,15 @@
<?php
/**
* Observium
* LibreNMS
*
* This file is part of Observium.
* This file is part of LibreNMS
*
* @package observium
* @subpackage discovery
* @author Adam Armstrong <adama@memetic.org>
* @copyright (C) 2006 - 2012 Adam Armstrong
* @package librenms
* @subpackage cli
* @author LibreNMS Group <librenms-project@google.groups.com>
* @copyright (C) 2006 - 2012 Adam Armstrong (as Observium)
* @copyright (C) 2013 LibreNMS Group
*
*/
irc.php
+7 -6
View File
@@ -2,14 +2,15 @@
<?php
/**
* Observium
* LibreNMS
*
* This file is part of Observium.
* This file is part of LibreNMS
*
* @package observium
* @subpackage ircbot
* @author Adam Armstrong <adama@memetic.org>
* @copyright (C) 2006 - 2012 Adam Armstrong
* @package librenms
* @subpackage cli
* @author LibreNMS Group <librenms-project@google.groups.com>
* @copyright (C) 2006 - 2012 Adam Armstrong (as Observium)
* @copyright (C) 2013 LibreNMS Group
*
*/
poll-billing.php
+7 -6
View File
@@ -2,14 +2,15 @@
<?php
/**
* Observium
* LibreNMS
*
* This file is part of Observium.
* This file is part of LibreNMS
*
* @package observium
* @subpackage billing
* @author Adam Armstrong <adama@memetic.org>
* @copyright (C) 2006 - 2012 Adam Armstrong
* @package librenms
* @subpackage cli
* @author LibreNMS Group <librenms-project@google.groups.com>
* @copyright (C) 2006 - 2012 Adam Armstrong (as Observium)
* @copyright (C) 2013 LibreNMS Group
*
*/
poll-device.php
+7 -6
View File
@@ -2,14 +2,15 @@
<?php
/**
* Observium
* LibreNMS
*
* This file is part of Observium.
* This file is part of LibreNMS
*
* @package observium
* @subpackage poller
* @author Adam Armstrong <adama@memetic.org>
* @copyright (C) 2006 - 2012 Adam Armstrong
* @package librenms
* @subpackage cli
* @author LibreNMS Group <librenms-project@google.groups.com>
* @copyright (C) 2006 - 2012 Adam Armstrong (as Observium)
* @copyright (C) 2013 LibreNMS Group
*
*/
poller.php
+7 -6
View File
@@ -2,14 +2,15 @@
<?php
/**
* Observium
* LibreNMS
*
* This file is part of Observium.
* This file is part of LibreNMS
*
* @package observium
* @subpackage poller
* @author Adam Armstrong <adama@memetic.org>
* @copyright (C) 2006 - 2012 Adam Armstrong
* @package librenms
* @subpackage cli
* @author LibreNMS Group <librenms-project@google.groups.com>
* @copyright (C) 2006 - 2012 Adam Armstrong (as Observium)
* @copyright (C) 2013 LibreNMS Group
*
*/
renamehost.php
+6 -5
View File
@@ -2,14 +2,15 @@
<?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
* @author LibreNMS Group <librenms-project@google.groups.com>
* @copyright (C) 2006 - 2012 Adam Armstrong (as Observium)
* @copyright (C) 2013 LibreNMS Group
*
*/
snmptrap.php
+7 -6
View File
@@ -2,14 +2,15 @@
<?php
/**
* Observium
* LibreNMS
*
* This file is part of Observium.
* This file is part of LibreNMS
*
* @package observium
* @subpackage snmptraps
* @author Adam Armstrong <adama@memetic.org>
* @copyright (C) 2006 - 2012 Adam Armstrong
* @package librenms
* @subpackage cli
* @author LibreNMS Group <librenms-project@google.groups.com>
* @copyright (C) 2006 - 2012 Adam Armstrong (as Observium)
* @copyright (C) 2013 LibreNMS Group
*
*/
syslog.php
+7 -6
View File
@@ -2,14 +2,15 @@
<?php
/**
* Observium
* LibreNMS
*
* This file is part of Observium.
* This file is part of LibreNMS
*
* @package observium
* @subpackage syslog
* @author Adam Armstrong <adama@memetic.org>
* @copyright (C) 2006 - 2012 Adam Armstrong
* @package librenms
* @subpackage cli
* @author LibreNMS Group <librenms-project@google.groups.com>
* @copyright (C) 2006 - 2012 Adam Armstrong (as Observium)
* @copyright (C) 2013 LibreNMS Group
*
*/