9647 Commits

Author SHA1 Message Date
913314f831 fix if statement style 2016-01-19 10:59:13 +01:00
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
1a8472258b Fixed syntax error in line continuation 2016-01-19 08:03:30 +01:00
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
7c39cba569 Merge pull request #2795 from arrmo/master
Add Support for Lenovo EMC (NAS)
2016-01-18 19:05:20 +00:00
d9857f8168 Non-HTML version of the file ... :-). 2016-01-18 12:10:50 -06:00
73113b888f Pull the latest from recent merge (corrections by Paul Gear) 2016-01-18 11:55:19 -06:00
f66c20a675 Make sure full document pulled (MIB-based-polling.md) 2016-01-18 09:12:07 -06:00
c14099bfaa Revert changes to MIB-based-polling.md
Pull legacy file, put back in place.
2016-01-18 09:09:31 -06:00
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
4a0cc16093 add infoblox 2016-01-18 14:48:39 +01:00
4f7396be9f I agree to the conditions of the Contributor Agreement contained in doc/General/Contributing.md. 2016-01-18 14:08:49 +01:00
65176c00bd Addes support for infoblox devices 2016-01-18 13:51:39 +01:00
2f6800b5e4 Updates based on comments from Pull-Request 2016-01-17 17:08:16 -06:00
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
laf
5e37de8b65 Added config option to force showing sysName instead of IP 2016-01-17 22:01:09 +00:00
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
e380cc5100 Merge pull request #2793 from laf/issues-2625 2016-01-17 21:46:15 +01:00
5c4ed305ec Grab the most current files. 2016-01-17 14:45:53 -06:00
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
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
4581366bf4 Add WebUI settings 2016-01-17 19:19:56 +01:00
11363653e8 Merge pull request #2728 from jviersel/master
Added username support for libvirt over SSH
2016-01-17 17:20:42 +00:00
c91a7081cc Basic commit 2016-01-17 17:48:44 +01:00
e74a45cdcc Merge pull request #2790 from laf/fix-perf-times 2016-01-17 17:16:52 +01:00
78d0c80694 Merge pull request #2791 from Rosiak/dell-tl-minor-add
Set device_type for PowerVault
2016-01-17 15:53:13 +00:00
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
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
a1c5a9dbeb Update libvirt-vminfo.inc.php 2016-01-17 15:42:31 +01:00
d0f0e055fb Update defaults.inc.php 2016-01-17 15:42:03 +01:00
ad9b2db352 Merge pull request #2784 from paulgear/cisco-aaa-session-mib-mikrotik
Poll ciscoAAASessionMIB for IOS & RouterOS
2016-01-17 13:30:58 +00:00
35ee6569bd Merge pull request #2763 from paulgear/mib-poller-more-data-values
MIB-based polling: attempt to support more SNMP counter types
2016-01-17 13:30:40 +00:00
77dce137ce Merge pull request #2783 from paulgear/fix-graph-array
Clear $graph_array after graph is printed
2016-01-17 13:27:50 +00:00
d7c79749ee Grab the most current files. 2016-01-16 22:46:14 -06:00
2426884bfd LenovoEMC (NAS) - initial code update. 2016-01-16 22:45:42 -06:00
fc6a4b7076 Include shortname in all cases 2016-01-17 14:05:37 +10:00
9e9f5f787f Fix short name generation
Should only replace first occurrence of prefix in the string.
Also only strips the prefix if it saves more than 2 characters.

This fixes a bug where, e.g., 'casnDisconnect' would be shortened to 'asnDisonnet'.
2016-01-17 13:57:34 +10:00
d3cddffdc7 Patch from Paul Gear, for Custom MIB data handling (non-integer) 2016-01-16 21:52:27 -06:00
6baea97717 Poll CISCO-AAA-SESSION-MIB for IOS & RouterOS 2016-01-17 13:32:17 +10:00
a11cc7c021 Add CISCO-AAA-SESSION-MIB from ftp://ftp.cisco.com/pub/mibs/v2/CISCO-AAA-SESSION-MIB.my 2016-01-17 12:35:10 +10:00
771fc342fd Clear $graph_array after graph is printed 2016-01-17 12:13:45 +10:00
a7c0c1b762 Merge pull request #2781 from laf/uptime-fix
Fixes issue with uptime on certain devices
2016-01-16 20:20:50 +00:00
013135ea9d Merge pull request #2777 from SaaldjorMike/oxid-add-grp-sample-cnf
Added group mapping in sample config for Oxidized for groups
2016-01-16 20:14:31 +00:00
laf
2a097dd803 Fix uptime issues for devices that fail with additional uptime snmp queries 2016-01-16 20:02:42 +00:00
9c0854a546 Added group mapping in sample config for Oxidized for groups 2016-01-16 13:58:47 +01:00
6a4dadd176 Merge pull request #2773 from murrant/oxidized-groups-doc
Clarify Oxidized Groups Documentation
2016-01-16 13:55:28 +01:00
fb208bce3c Merge pull request #2774 from Rosiak/issue-2506
Provide more alert rule examples
2016-01-16 16:33:12 +10:00