Commit Graph

9675 Commits

Author SHA1 Message Date
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
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
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 d3cddffdc7.
2016-01-17 17:06:30 -06:00
laf
5e37de8b65 Added config option to force showing sysName instead of IP 2016-01-17 22:01:09 +00:00
R. Morris
027586bb8e Merge branch 'master' of https://github.com/arrmo/librenms
Conflicts:
	doc/Extensions/MIB-based-polling.md
2016-01-17 14:50:47 -06:00
Søren Rosiak
e380cc5100 Merge pull request #2793 from laf/issues-2625 2016-01-17 21:46:15 +01:00
R. Morris
5c4ed305ec Grab the most current files. 2016-01-17 14:45:53 -06:00
R. Morris
bc4b26e0df LenovoEMC (NAS) - initial code update. 2016-01-17 14:45:53 -06:00
laf
cfc3728ded Removed Observium text, not needed 2016-01-17 19:56:19 +00:00
laf
e48b48546c Updated overview graphs for QNAP devices 2016-01-17 19:43:33 +00:00
Neil Lathwood
54ca420e68 Merge pull request #2792 from Rosiak/reload-oxidized-node-list
Ability to reload Oxidized node list, when a device is added
2016-01-17 18:36:17 +00:00
Rosiak
4581366bf4 Add WebUI settings 2016-01-17 19:19:56 +01:00
Neil Lathwood
11363653e8 Merge pull request #2728 from jviersel/master
Added username support for libvirt over SSH
2016-01-17 17:20:42 +00:00
Rosiak
c91a7081cc Basic commit 2016-01-17 17:48:44 +01:00
Søren Rosiak
e74a45cdcc Merge pull request #2790 from laf/fix-perf-times 2016-01-17 17:16:52 +01:00
Neil Lathwood
78d0c80694 Merge pull request #2791 from Rosiak/dell-tl-minor-add
Set device_type for PowerVault
2016-01-17 15:53:13 +00:00
Rosiak
207ff3e006 Set device_type for PowerVault 2016-01-17 16:50:45 +01:00
laf
b757f4023b Added missing column to perf_times table 2016-01-17 15:46:33 +00:00
Neil Lathwood
5cfc5fb328 Merge pull request #2785 from paulgear/mib-based-polling-fix-shortname
MIB-based-polling: Fix short name generation
2016-01-17 14:49:04 +00:00
Jurrian van Iersel
a1c5a9dbeb Update libvirt-vminfo.inc.php 2016-01-17 15:42:31 +01:00