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

Merge branch 'devel' of github.com:librenms/librenms into devel

Browse Source 
Conflicts:
	README.md
	addhost.php
	adduser.php
	alerts.php
	billing-calculate.php
	check-errors.php
	check-services.php
	delhost.php
	discovery.php
	generate-iplist.php
	irc.php
	poll-billing.php
	poll-device.php
	poller.php
	renamehost.php
	snmptrap.php
	syslog.php
This commit is contained in:
Paul Gear
2013-10-29 05:37:15 +10:00
parent 14f707aa2a 1dd703838e
commit 696b0ba670
11 changed files with 75 additions and 64 deletions
Download Patch File Download Diff File Expand all files Collapse all files
README.md
+7 -5
View File
@@ -53,13 +53,15 @@ Contributing
You can participate in the project by:
- Joining the [librenms-project][1] mailing list to post questions and
suggestions.
- Cloning the [repo][2] and filing bug reports and pull requests on github.
- Talking to us on [Twitter][3] or [IRC][4].
- Following [@LibreNMS on Twitter][2].
- Chatting with developers and users on [IRC][3]! We're on the `irc.freenode.net`
server, in the `##LibreNMS` channel.
- Cloning the [repo][4] and filing bug reports and pull requests on github.
- Improving the [wiki][5].
[1]: https://groups.google.com/forum/#!forum/librenms-project "LibreNMS"
[2]: https://github.com/librenms/librenms
[3]: https://twitter.com/librenms
[4]: irc://irc.freenode.net/##librenms
[2]: https://twitter.com/librenms
[3]: irc://irc.freenode.net/##librenms
[4]: https://github.com/librenms/librenms
[5]: https://github.com/librenms/librenms/wiki
html/ajax_listports.php
+7 -6
View File
@@ -1,14 +1,15 @@
<?php
/**
* Observium
* LibreNMS
*
* This file is part of Observium.
* This file is part of LibreNMS
*
* @package observium
* @subpackage ajax
* @author Adam Armstrong <[email protected]>
* @copyright (C) 2006 - 2012 Adam Armstrong
* @package librenms
* @subpackage cli
* @author The LibreNMS Contributors <[email protected]>
* @copyright (C) 2006 - 2012 Adam Armstrong (as Observium)
* @copyright (C) 2013 LibreNMS Contributors
*
*/
html/bandwidth-graph.php
+7 -6
View File
@@ -1,14 +1,15 @@
<?php
/**
* Observium
* LibreNMS
*
* This file is part of Observium.
* This file is part of LibreNMS
*
* @package observium
* @subpackage webinterface
* @author Adam Armstrong <[email protected]>
* @copyright (C) 2006 - 2012 Adam Armstrong
* @package librenms
* @subpackage cli
* @author The LibreNMS Contributors <[email protected]>
* @copyright (C) 2006 - 2012 Adam Armstrong (as Observium)
* @copyright (C) 2013 LibreNMS Contributors
*
*/
html/billing-graph.php
+7 -6
View File
@@ -1,14 +1,15 @@
<?php
/**
* Observium
* LibreNMS
*
* This file is part of Observium.
* This file is part of LibreNMS
*
* @package observium
* @subpackage billing
* @author Adam Armstrong <[email protected]>
* @copyright (C) 2006 - 2012 Adam Armstrong
* @package librenms
* @subpackage cli
* @author The LibreNMS Contributors <[email protected]>
* @copyright (C) 2006 - 2012 Adam Armstrong (as Observium)
* @copyright (C) 2013 LibreNMS Contributors
*
*/
html/data.php
+7 -6
View File
@@ -1,14 +1,15 @@
<?php
/**
* Observium
* LibreNMS
*
* This file is part of Observium.
* This file is part of LibreNMS
*
* @package observium
* @subpackage webinterface
* @author Adam Armstrong <[email protected]>
* @copyright (C) 2006 - 2012 Adam Armstrong
* @package librenms
* @subpackage cli
* @author The LibreNMS Contributors <[email protected]>
* @copyright (C) 2006 - 2012 Adam Armstrong (as Observium)
* @copyright (C) 2013 LibreNMS Contributors
*
*/
html/graph-realtime.php
+3 -3
View File
@@ -1,11 +1,11 @@
<?php
/**
* Observium
* 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 observium
* @package librenms
* @subpackage graphing
* @author T. Lechat <[email protected]>, Manuel Kasper <[email protected]>, Jonathan Watt <[email protected]>
* @copyright 2004-2006 T. Lechat <[email protected]>, Manuel Kasper <[email protected]>, Jonathan Watt <[email protected]>
html/graph.php
+7 -6
View File
@@ -1,14 +1,15 @@
<?php
/**
* Observium
* LibreNMS
*
* This file is part of Observium.
* This file is part of LibreNMS
*
* @package observium
* @subpackage graphing
* @author Adam Armstrong <[email protected]>
* @copyright (C) 2006 - 2012 Adam Armstrong
* @package librenms
* @subpackage cli
* @author The LibreNMS Contributors <[email protected]>
* @copyright (C) 2006 - 2012 Adam Armstrong (as Observium)
* @copyright (C) 2013 LibreNMS Contributors
*
*/
html/index.php
+9 -8
View File
@@ -1,14 +1,15 @@
<?php
/**
* Observium
* LibreNMS
*
* This file is part of Observium.
* This file is part of LibreNMS
*
* @package observium
* @subpackage webinterface
* @author Adam Armstrong <[email protected]>
* @copyright (C) 2006 - 2012 Adam Armstrong
* @package librenms
* @subpackage cli
* @author The LibreNMS Contributors <[email protected]>
* @copyright (C) 2006 - 2012 Adam Armstrong (as Observium)
* @copyright (C) 2013 LibreNMS Contributors
*
*/
@@ -268,9 +269,9 @@ $runtime_end = utime(); $runtime = $runtime_end - $runtime_start;
$gentime = substr($runtime, 0, 5);
echo('<br /> <br /> <br /> <br /> <div id="footer">' . (isset($config['footer']) ? $config['footer'] : ''));
echo('<br />Powered by <a href="http://www.observium.org" target="_blank">Observium ' . $config['version']);
echo('<br />Powered by <a href="http://www.librenms.org" target="_blank">LibreNMS ' . $config['version']);
echo('</a>. Copyright &copy; 2006-'. date("Y"). ' by Adam Armstrong. All rights reserved.');
echo('</a>. Copyright &copy; 2013-'. date("Y"). ' by the LibreNMS Contributors. All rights reserved.');
if ($config['page_gen'])
{
html/map.php
+7 -6
View File
@@ -1,14 +1,15 @@
<?php
/**
* Observium
* LibreNMS
*
* This file is part of Observium.
* This file is part of LibreNMS
*
* @package observium
* @subpackage map
* @author Adam Armstrong <[email protected]>
* @copyright (C) 2006 - 2012 Adam Armstrong
* @package librenms
* @subpackage cli
* @author The LibreNMS Contributors <[email protected]>
* @copyright (C) 2006 - 2012 Adam Armstrong (as Observium)
* @copyright (C) 2013 LibreNMS Contributors
*
*/
html/netcmd.php
+7 -6
View File
@@ -1,14 +1,15 @@
<?php
/**
* Observium
* LibreNMS
*
* This file is part of Observium.
* This file is part of LibreNMS
*
* @package observium
* @subpackage webinterface
* @author Adam Armstrong <[email protected]>
* @copyright (C) 2006 - 2012 Adam Armstrong
* @package librenms
* @subpackage cli
* @author The LibreNMS Contributors <[email protected]>
* @copyright (C) 2006 - 2012 Adam Armstrong (as Observium)
* @copyright (C) 2013 LibreNMS Contributors
*
*/
html/pdf.php
+7 -6
View File
@@ -1,14 +1,15 @@
<?php
/**
* Observium
* LibreNMS
*
* This file is part of Observium.
* This file is part of LibreNMS
*
* @package observium
* @subpackage billing
* @author Adam Armstrong <[email protected]>
* @copyright (C) 2006 - 2012 Adam Armstrong
* @package librenms
* @subpackage cli
* @author The LibreNMS Contributors <[email protected]>
* @copyright (C) 2006 - 2012 Adam Armstrong (as Observium)
* @copyright (C) 2013 LibreNMS Contributors
*
*/