Commit Graph

7521 Commits

Author SHA1 Message Date
Daniel Preussker
9844abb771 Merge pull request #1724 from tuxis-ie/fix-agent-apps
Fix agent apps
2015-08-20 12:53:26 +00:00
Mark Schouten
47c87cb7c6 Fix typos (Sorry about that)
Replace if($debug){..} with d_echo
2015-08-20 13:26:18 +02:00
Mark Schouten
30e47b382c Do not include the applications, but enable them in the database. The application poller will run them. Also, reduce code-duplication. 2015-08-20 12:36:37 +02:00
Mark Schouten
e2f5a1fdf0 Make app-recognition more efficient 2015-08-20 12:25:47 +02:00
Paul Gear
e7a5d22363 Merge pull request #1722 from laf/install-docs-1
Updates to install docs
2015-08-20 08:39:10 +10:00
laf
545d01a304 Updates to install docs 2015-08-19 22:29:00 +00:00
Neil Lathwood
7e2c88acb1 Merge pull request #1718 from laf/changelog
Updated changelog 18 August 2015
2015-08-18 18:39:49 +01:00
laf
aff036a1fe Updated changelog 18 August 2015 2015-08-18 17:25:07 +00:00
Neil Lathwood
9293b308fd Merge pull request #1716 from librenms/f0o-ldap-docs
Added php-ldap requirement to ldap-docs
2015-08-18 18:07:29 +01:00
Daniel Preussker
fdf1610fca Merge pull request #1665 from laf/issue-381
Simple graylog integration
2015-08-18 17:07:21 +00:00
Daniel Preussker
290f9d0d18 Added php-ldap requirement to ldap-docs 2015-08-18 17:06:28 +00:00
laf
92de079199 Removed ; 2015-08-18 16:52:25 +00:00
laf
d23e93f44a Made source clickable 2015-08-18 16:46:33 +00:00
Daniel Preussker
443d19b640 Merge pull request #1713 from SaaldjorMike/map-border
Added borders between elements on availability map.
2015-08-18 16:41:45 +00:00
Mike Rostermund
51942a5174 Added borders between elements on availability map. 2015-08-18 18:40:02 +02:00
Daniel Preussker
f9dda92eaf Merge pull request #1714 from SaaldjorMike/new-agreement
I agree to the conditions of the Contributor Agreement contained in d…
2015-08-18 16:28:25 +00:00
Mike Rostermund
9409131f6f I agree to the conditions of the Contributor Agreement contained in doc/General/Contributing.md 2015-08-18 18:27:03 +02:00
Neil Lathwood
ab16aeb4f9 Merge pull request #1710 from librenms/f0o-mysql-host-logic
Fix MySQL-Agent Host Logic
2015-08-18 16:13:07 +01:00
Daniel Preussker
95ab21504c Fix MySQL Host Logic 2015-08-18 15:11:06 +00:00
Daniel Preussker
71dccb0e88 Merge pull request #1709 from paulgear/master
Updated contributor agreement
2015-08-18 12:46:39 +00:00
Neil Lathwood
a4e65be200 Merge pull request #1708 from vitalisator/vis-4.7.0
update VIS to ver. 4.7.0
2015-08-18 12:23:02 +01:00
Paul Gear
63f367683e I agree to the conditions of the Contributor Agreement contained in doc/General/Contributing.md. 2015-08-18 21:18:20 +10:00
vitalisator
e603881113 update VIS to ver. 4.7.0
closes issue #1707
2015-08-18 13:12:58 +02:00
Neil Lathwood
9dc7a89f99 Merge pull request #1706 from jimmycleuren/master 2015-08-17 20:39:34 +01:00
Jimmy Cleuren
58aef811a1 I agree to the conditions of the Contributor Agreement contained in doc/General/Contributing.md. 2015-08-17 21:21:45 +02:00
Daniel Preussker
650895b5a6 Merge pull request #1705 from vitalisator/issue-1702
add LLDP discovery support on PBN devices
2015-08-17 18:57:28 +00:00
vitalisator
009cfdf13f ource of MIBs is www.pbnglobal.com 2015-08-17 20:44:52 +02:00
vitalisator
5fea54ca6a add NMS-LLDP-MIB discovery for PBN devices 2015-08-17 18:12:49 +02:00
Neil Lathwood
84a0b8f676 Merge pull request #1701 from vitalisator/revert-1614-issue-1566
Revert "PBN devices support CDP but does not output like Cisco so usi…
2015-08-17 12:09:07 +01:00
laf
c5c80235ee Make url from source 2015-08-17 10:55:44 +00:00
laf
995b02b176 Added devices graylog page - had to force as .gitignore excludes this! 2015-08-17 10:48:29 +00:00
laf
8f5ef6d281 Updated to use ip for source as well 2015-08-17 10:46:40 +00:00
vitalisator
744134167d add needed MIB Files 2015-08-17 00:08:43 +02:00
Vitali Kari
33cadbd620 Revert "PBN devices support CDP but does not output like Cisco so using a dif…" 2015-08-16 23:51:41 +02:00
Neil Lathwood
2e4662f2d9 Merge pull request #1696 from jimmycleuren/issue-1695
Correct DSM upgrade status OID
2015-08-16 12:25:47 +01:00
laf
85c8e1487f updated sql file # 2015-08-16 11:12:24 +00:00
Søren Rosiak
10cca8d208 Merge pull request #1700 from laf/db-fix 2015-08-15 19:44:19 +02:00
laf
446add9dd6 changed connection around 2015-08-15 17:37:20 +00:00
laf
a8f0d91aae Fixed the connection settings being incorrect 2015-08-15 17:33:41 +00:00
Neil Lathwood
3745ffdc1c Merge pull request #1697 from laf/build-fix 2015-08-15 12:42:33 +01:00
laf
f4f2c652ac Fix missing parameter for mysqli_select_db 2015-08-15 09:55:53 +00:00
Jimmy Cleuren
f69189f87d Merge remote-tracking branch 'librenms/master' into issue-1695 2015-08-15 10:11:25 +02:00
Jimmy Cleuren
2d1228adb2 Correct DSM upgrade status OID 2015-08-15 10:09:10 +02:00
Daniel Preussker
e1787a423a Merge pull request #1691 from Rosiak/issue-1670
Fix #1670
2015-08-15 09:46:54 +02:00
Rosiak
543a67851c Fix #1670
- Convert column to bigint to support 4 byte ASN
2015-08-14 20:54:56 +02:00
Neil Lathwood
bd732d8751 Merge pull request #1690 from Tawmu/master
Authors Agreement
2015-08-14 15:39:07 +01:00
Tom Ferguson
dad22b4bd4 Authors Agreement
I agree to the conditions of the Contributor Agreement contained in
doc/General/Contributing.md.
2015-08-14 15:24:59 +01:00
Neil Lathwood
0737722cb8 Merge pull request #1667 from miken32/master
changes needed to run under a web server subdirectory
2015-08-14 15:05:29 +01:00
Michael Newton
cde6da72fb I agree to the conditions of the Contributor Agreement contained in doc/General/Contributing.md. 2015-08-13 16:19:45 -07:00
Neil Lathwood
a0afc0e279 Merge pull request #1685 from f0o/issue-1630
Reformated eventlog messages to represent the state of the trigger
2015-08-13 22:07:35 +01:00