9694 Commits

Author SHA1 Message Date
Paul Gear
302a7d5c73 Tidy mess left by CISCO-AAA-SESSION-MIB bug 2016-01-21 08:54:00 +10:00
Paul Gear
53b5f4e1c8 Fix the same bug in routeros section 2016-01-21 08:52:32 +10:00
Paul Gear
e8c64e98a4 Fix use of CISCO-AAA-SESSION-MIB
It should only be used if OS was discovered.
2016-01-21 08:50:20 +10:00
Daniel Preussker
c11cf53658 Merge pull request #2815 from laf/notifications-update
Added local rss file + tidied up locations of notifications and callback
2016-01-20 20:01:07 +00:00
Daniel Preussker
52bf0fad15 Merge pull request #2789 from laf/issue-2761
Updated active directory auth to support dashboards
2016-01-20 19:57:53 +00:00
Søren Rosiak
34ea4ec32d Merge pull request #2822 from laf/api-ip 2016-01-20 19:34:55 +01:00
laf
59a1050df6 Fixed device ip binary decode 2016-01-20 18:19:15 +00:00
Daniel Preussker
97ca5c7717 Merge pull request #2818 from SaaldjorMike/ircbot-bugs
Minor fixes for the IRC bot's .port command
2016-01-20 18:16:59 +00:00
Mike Rostermund
acc76dbfba Use bits instead of octets for proper bps values when using ircbot's .port cmd 2016-01-20 02:00:37 +01:00
Mike Rostermund
8f34e0e30e Fix SQL statement for .port command in irc bot 2016-01-20 01:58:10 +01:00
Paul Gear
7a19fa2a67 Merge pull request #2817 from laf/mysql-docs
Added docs on using innodb_file_per_table=1 in my.cnf
2016-01-20 10:39:30 +10:00
laf
012c3eab0b Added docs on using innodb_file_per_table=1 in my.cnf 2016-01-20 00:37:22 +00:00
Mike Rostermund
dfc32107b5 Merge pull request #2794 from laf/sensors-cleanup
Updated discovery sensors module directory structure
2016-01-19 23:28:48 +01:00
laf
c6c3858312 Some more scrut fixes 2016-01-19 22:27:04 +00:00
laf
aea5c3f515 Updated missing states sensor dir change 2016-01-19 22:16:48 +00:00
Mike Rostermund
e021cf8f67 Merge pull request #2801 from wiad/issue-2708
Add infoblox devices (Issue 2708)
2016-01-19 23:00:43 +01:00
Paul Gear
b5e67358a0 Merge pull request #2809 from laf/issue-2772
Removed unused code in port poller for non-cisco devices
2016-01-20 07:52:34 +10:00
Neil Lathwood
eb34c1c84e Merge pull request #2814 from paulgear/disable-global-debug-message
Disable debug message about MIB poller
2016-01-19 21:52:06 +00:00
laf
a45259377b Added local rss file + tidied up locations of notifications and callback 2016-01-19 21:50:00 +00:00
Paul Gear
8416f4af3e Disable debug message about MIB poller 2016-01-20 07:40:03 +10:00
Daniel Preussker
4ab1075589 Merge pull request #2798 from laf/issue-1698
Added the lookup of IP if device hostname is a hostname
2016-01-19 14:40:43 +00:00
laf
2dec9c3996 Rebased (sql schema conflict) 2016-01-19 14:33:15 +00:00
laf
302ecb8858 Removed unused code in port poller for non-cisco devices 2016-01-19 11:25:03 +00:00
wiad
45e412f64b Merge branch 'master' of https://github.com:/wiad/librenms into issue-2708 2016-01-19 12:03:48 +01:00
wiad
2883759c93 fix syntax 2016-01-19 12:02:47 +01:00
wiad
71195bcd85 fix syntax 2016-01-19 12:01:44 +01:00
Paul Gear
a340f353c2 Merge pull request #2623 from adaniels21487/issue-1650
Device Components.
2016-01-19 20:38:34 +10:00
wiad
913314f831 fix if statement style 2016-01-19 10:59:13 +01:00
Neil Lathwood
9219af16f8 Merge pull request #2807 from wiad/issue-2806
Try to find rancid file based on both fqdn and short host name
2016-01-19 09:46:19 +00:00
wiad
dda947449a fix if statement style 2016-01-19 10:11:11 +01:00
laf
44dc6b652b Fixed scrut issues 2016-01-19 09:04:53 +00:00
laf
3a8b0b053d Rebased includes/common.php 2016-01-19 09:00:18 +00:00
wiad
582c3984e5 Try to find rancid file based on both fqdn and short host name 2016-01-19 10:00:14 +01:00
wiad
086443b77a Merge branch 'master' of https://github.com:/wiad/librenms into issue-2708
Conflicts:
	includes/definitions.inc.php
2016-01-19 09:51:03 +01:00
wiad
1a8472258b Fixed syntax error in line continuation 2016-01-19 08:03:30 +01:00
Daniel Preussker
ded1fa3e73 Merge pull request #2796 from laf/issue-2091
Added config option to force showing sysName instead of IP
2016-01-19 05:34:49 +00:00
Neil Lathwood
7c39cba569 Merge pull request #2795 from arrmo/master
Add Support for Lenovo EMC (NAS)
2016-01-18 19:05:20 +00:00
arrmo
d9857f8168 Non-HTML version of the file ... :-). 2016-01-18 12:10:50 -06:00
arrmo
73113b888f Pull the latest from recent merge (corrections by Paul Gear) 2016-01-18 11:55:19 -06:00
arrmo
f66c20a675 Make sure full document pulled (MIB-based-polling.md) 2016-01-18 09:12:07 -06:00
arrmo
c14099bfaa Revert changes to MIB-based-polling.md
Pull legacy file, put back in place.
2016-01-18 09:09:31 -06:00
Mike Rostermund
ae4458e482 Merge pull request #2800 from wiad/contrib
I agree to the conditions of the Contributor Agreement
2016-01-18 15:03:02 +01:00
wiad
4a0cc16093 add infoblox 2016-01-18 14:48:39 +01:00
wiad
4f7396be9f I agree to the conditions of the Contributor Agreement contained in doc/General/Contributing.md. 2016-01-18 14:08:49 +01:00
laf
47ff913baa Updated for Scrut fix 2016-01-18 12:54:25 +00:00
wiad
65176c00bd Addes support for infoblox devices 2016-01-18 13:51:39 +01:00
laf
cc25e87bcd Added check for hostname 2016-01-18 00:04:30 +00:00
laf
49adff3895 Added the lookup of IP if device hostname is a hostname 2016-01-17 23:59:51 +00:00
arrmo
2f6800b5e4 Updates based on comments from Pull-Request 2016-01-17 17:08:16 -06:00
arrmo
734f9bc34e Revert "Patch from Paul Gear, for Custom MIB data handling (non-integer)"
This reverts commit d3cddffdc7d47a717813fd8de66b3667581c3be4.
2016-01-17 17:06:30 -06:00