Commit Graph
878 Commits
Author SHA1 Message Date
Tony MurrayandNeil Lathwood 9284bc60ff Update code in includes to be PSR-2 compliant (#4220)
refactor: Update code in /includes to be psr2 compliant #4220
2016-08-28 18:32:58 +01:00
crcroandNeil Lathwood 7634c085c0 Hwg ste2 (#4190)
* misspelled var name

* HWg-group STE2 fully working - tested

* not so noisy definitions.inc.php

* implemented scrutinizer best practices
2016-08-24 14:37:35 +01:00
Aaron Daniels a77536ba4b Merge branch 'master' into issue-4083
Conflicts:
	includes/definitions.inc.php
2016-08-19 07:13:46 +10:00
Søren RosiakandGitHub aabc0eb7ab Merge pull request #4065 from adaniels21487/issue-4062 2016-08-18 22:51:28 +03:00
Daniel PreusskerandGitHub c01eec8f26 Merge pull request #4048 from laf/issue-3982
Added support for Avaya VSP
2016-08-18 05:56:53 +00:00
Aaron Daniels 26f7de97e1 Merge branch 'master' into issue-4062
Conflicts:
	includes/definitions.inc.php
2016-08-18 08:40:36 +10:00
Aaron Daniels 851b13dccd Added OS detection for Cisco Prime Infrastructure
- Added $hardware, $version & $serial
2016-08-17 16:32:05 +10:00
Aaron Daniels 4cfa3910e9 - some models have a space, fix regex 2016-08-17 08:52:52 +10:00
Tony MurrayandGitHub 3c24a672ce Merge pull request #4035 from crcro/hp-blade-c7000
HP BladeSystem C3000/C7000 OA
2016-08-16 08:46:39 -05:00
Tony MurrayandGitHub 6512bff04e Merge pull request #4066 from adaniels21487/issue-4059
Added OS support for the McAfee SIEM Nitro product range
2016-08-15 21:01:03 -05:00
Tony MurrayandGitHub 40c0728295 Merge pull request #4064 from adaniels21487/issue-4061
OS Support for Acano collaboration appliances
2016-08-15 20:48:06 -05:00
Aaron Daniels 388fb9a102 - Added OS support for the McAfee SIEM Nitro product range
- Added Mcafee icon.
- Added product names as features.
- not everything with ACE in the sysDescr is a Cisco ACE!
2016-08-15 17:17:32 +10:00
Aaron Daniels fd5c8fe800 - OS support for Cisco/Tandberg Video Conferencing Endpoints 2016-08-15 17:02:28 +10:00
Aaron Daniels d41117e48b - OS Support for Acano collaboration appliances 2016-08-15 16:52:34 +10:00
Aaron Daniels 405750108f - OS Discovery for Cisco ISE
- Hardware SNS-3945
2016-08-15 16:48:17 +10:00
laf 226202de81 Added support for Avaya VSP 2016-08-12 23:58:34 +01:00
Neil LathwoodandGitHub f9ba459e08 Merge pull request #3992 from vitalisator/raisecom
Add basic device support for Raisecom.
2016-08-11 22:43:49 +01:00
crcro d95cf4ac16 added hardware model, software version, fans and ps sensor states, removed header cpu and memory graphs 2016-08-11 17:49:34 +03:00
Chris A. Evans d97987aba4 Merge branch 'master' into thecityofguanyu/add-calix-e5-support 2016-08-11 09:30:49 -05:00
Neil LathwoodandGitHub e09f5c552c Merge pull request #3800 from murrant/rrd-create-remote
RRD Cleanup: centralize rrd_exists check, utilize data_update() and rrd_name()
2016-08-10 18:44:45 +01:00
Neil LathwoodandGitHub 2c001db8ce Merge pull request #3988 from crcro/brocade-fabos-updates
brocade fabric os enhancement
2016-08-09 21:54:18 +01:00
Tony Murray 68303a96da Merge remote-tracking branch 'upstream/master' into rrd-create-remote 2016-08-08 20:23:15 -05:00
Tony MurrayandGitHub 409e756ca2 Merge pull request #3967 from Rosiak/comware-ver-fix
Comware Version Fix
2016-08-08 15:07:36 -05:00
Tony MurrayandGitHub 57661cf908 Merge pull request #3998 from Rosiak/issue-3995
Fix Dell PowerConnect Discovery
2016-08-08 15:02:48 -05:00
laf 09eb5ca1e9 Fixed ./includes/polling/os/infinity.inc.php for php 53 2016-08-08 20:26:44 +01:00
Chris A. Evans 4f5d8fa6c8 removed includes/polling/os/calix-e5.inc.php 2016-08-08 11:39:34 -05:00
Chris A. Evans 70e1d1927e erge branch 'master' into thecityofguanyu/add-calix-e5-support 2016-08-08 11:37:26 -05:00
Rosiak 057d78aab7 Remove more code 2016-08-08 18:34:30 +02:00
Tony Murray ead28f6acd Merge remote-tracking branch 'upstream/master' into rrd-create-remote 2016-08-07 08:22:32 -05:00
crcro 71e97cd2c3 rewrite of brocade switches models 2016-08-07 04:50:31 +03:00
vitalisator d9e020757d Add basic device support for Raisecom.
- www.raisecom.com
- MIB from raisecom (thx to Mr. Miles)
2016-08-06 19:48:37 +02:00
Rosiak e19a25f4cd Brain Fart 2016-08-04 23:11:10 +02:00
Rosiak 5c26586f89 Comware Version Fix
Be able to discover the version && features on older versions && newer.
2016-08-04 22:34:29 +02:00
Rosiak 932cd02b49 Basic Cisco FXOS Support
For Cisco FXOS Firepower Manager
2016-08-03 17:51:39 +02:00
Tony Murray 97daf3dd54 Merge remote-tracking branch 'upstream/master' into rrd-create-remote 2016-08-01 10:18:28 -05:00
crcro e1211d6c72 enhancement to tplink polling 2016-08-01 06:55:07 +03:00
Neil LathwoodandGitHub 2e960c8aaa Merge pull request #3909 from Rosiak/maipu-support
Basic Maipu Mypower Support
2016-07-31 16:36:54 +01:00
Neil LathwoodandGitHub 0e625217c2 Merge pull request #3899 from Rosiak/cisco-waas
Basic Cisco WAAS/WAVE Support
2016-07-31 16:24:31 +01:00
Rosiak d2b74efa00 Basic Maipu Mypower Support
#3867
2016-07-31 02:23:19 +02:00
Rosiak a6eb16c379 Copy paste too fast 2016-07-28 23:24:25 +02:00
Rosiak 26c2d18fce Basic Cisco WAAS Support 2016-07-28 23:14:30 +02:00
Rosiak 3595b37a20 Detect Cisco ASA-X Firewall Hardware 2016-07-28 22:50:11 +02:00
Ahmed Sajid d7f24c6a5a Remove unwanted characters from poll info
Similar to PR 3883.

Removing carriage return character \r, causing the following error while trying view minigraphs on device list page:

SyntaxError: unterminated string literal

return overlib('<div style=\'background-color: #FFFFFF;\'><div><span class=
This issue has been experienced with S4810 devices.
2016-07-28 16:21:33 -04:00
Tony Murray 2c98fd7426 Merge remote-tracking branch 'upstream/master' into rrd-create-remote 2016-07-26 19:29:11 -05:00
Ahmed Sajid 10cdcfa9b4 Fixed Pulse OS whitespace issue
Due to the newline etc the minigraphs weren't getting displayed correctly.
2016-07-26 16:29:01 -04:00
Rosiak beea32ad08 Comware Temperature Discovery
Basic temp disco, tested on 5900 & 5930.
2016-07-26 19:32:35 +02:00
thecityofguanyu 88ed9feed7 Per laf's request, modified changes to consolidate Calix E5 support into the 'calix' OS group rather than creating a new one.
Changes to be committed:
	modified:   includes/definitions.inc.php
	modified:   includes/discovery/os/calix.inc.php
	renamed:    includes/discovery/sensors/temperatures/calix-e5.inc.php -> includes/discovery/sensors/temperatures/calix.inc.php
	modified:   includes/polling/os/calix.inc.php
	renamed:    mibs/calix-e5/E5-110-AESCOMMON-MIB.mib -> mibs/calix/E5-110-AESCOMMON-MIB.mib
	renamed:    mibs/calix-e5/E5-110-AS-ATM-MIB.mib -> mibs/calix/E5-110-AS-ATM-MIB.mib
	renamed:    mibs/calix-e5/E5-110-IESCOMMON-MIB.mib -> mibs/calix/E5-110-IESCOMMON-MIB.mib
	renamed:    mibs/calix-e5/E5-110-MIB.mib -> mibs/calix/E5-110-MIB.mib
	renamed:    mibs/calix-e5/E5-110-TRAPS-MIB.mib -> mibs/calix/E5-110-TRAPS-MIB.mib
	renamed:    mibs/calix-e5/E5-111 alarm.xls -> mibs/calix/E5-111 alarm.xls
	renamed:    mibs/calix-e5/E5-111-AESCOMMON-MIB.mib -> mibs/calix/E5-111-AESCOMMON-MIB.mib
	renamed:    mibs/calix-e5/E5-111-AS-ATM-MIB.mib -> mibs/calix/E5-111-AS-ATM-MIB.mib
	renamed:    mibs/calix-e5/E5-111-IESCOMMON-MIB.mib -> mibs/calix/E5-111-IESCOMMON-MIB.mib
	renamed:    mibs/calix-e5/E5-111-MIB.mib -> mibs/calix/E5-111-MIB.mib
	renamed:    mibs/calix-e5/E5-111-TRAPS-MIB.mib -> mibs/calix/E5-111-TRAPS-MIB.mib
	renamed:    mibs/calix-e5/E5-120-AS-ATM-MIB.mib -> mibs/calix/E5-120-AS-ATM-MIB.mib
	renamed:    mibs/calix-e5/E5-120-IESCOMMON-MIB.mib -> mibs/calix/E5-120-IESCOMMON-MIB.mib
	renamed:    mibs/calix-e5/E5-120-MIB.mib -> mibs/calix/E5-120-MIB.mib
	renamed:    mibs/calix-e5/E5-120-TRAPS-MIB.mib -> mibs/calix/E5-120-TRAPS-MIB.mib
	renamed:    mibs/calix-e5/E5-121-AS-ATM-MIB.mib -> mibs/calix/E5-121-AS-ATM-MIB.mib
	renamed:    mibs/calix-e5/E5-121-IESCOMMON-MIB.mib -> mibs/calix/E5-121-IESCOMMON-MIB.mib
	renamed:    mibs/calix-e5/E5-121-MIB.mib -> mibs/calix/E5-121-MIB.mib
	renamed:    mibs/calix-e5/E5-121-TRAPS-MIB.mib -> mibs/calix/E5-121-TRAPS-MIB.mib
	renamed:    mibs/calix-e5/HCNUM-TC[rfc2856].mib -> mibs/calix/HCNUM-TC[rfc2856].mib
	renamed:    mibs/calix-e5/MIB_ALARM_E5-110_implementation_table.xls -> mibs/calix/MIB_ALARM_E5-110_implementation_table.xls
	renamed:    mibs/calix-e5/MIB_ALARM_E5-111_implementation_table.xls -> mibs/calix/MIB_ALARM_E5-111_implementation_table.xls
	renamed:    mibs/calix-e5/MIB_ALARM_E5-121_implementation_table.xls -> mibs/calix/MIB_ALARM_E5-121_implementation_table.xls
	renamed:    mibs/calix-e5/RFC-3728.mib -> mibs/calix/RFC-3728.mib
	renamed:    mibs/calix-e5/RFC3705-MIB.mib -> mibs/calix/RFC3705-MIB.mib
2016-07-23 16:01:17 -05:00
Chris A. Evans 75f95caec6 Committer: Chris A. Evans <[email protected]>
On branch thecityofguanyu/add-calix-e5-support
 Changes to be committed:
	modified:   includes/definitions.inc.php
	modified:   includes/discovery/os/calix.inc.php
	new file:   includes/discovery/sensors/temperatures/calix-e5.inc.php
	new file:   includes/polling/os/calix-e5.inc.php
	new file:   mibs/calix-e5/ADSL-LINE-EXT-MIB.mib
	new file:   mibs/calix-e5/ADSL-LINE-MIB.mib
	new file:   mibs/calix-e5/ADSL-TC-MIB.mib
	new file:   mibs/calix-e5/BRIDGE-MIB.mib
	new file:   mibs/calix-e5/E5-110-AESCOMMON-MIB.mib
	new file:   mibs/calix-e5/E5-110-AS-ATM-MIB.mib
	new file:   mibs/calix-e5/E5-110-IESCOMMON-MIB.mib
	new file:   mibs/calix-e5/E5-110-MIB.mib
	new file:   mibs/calix-e5/E5-110-TRAPS-MIB.mib
	new file:   mibs/calix-e5/E5-111 alarm.xls
	new file:   mibs/calix-e5/E5-111-AESCOMMON-MIB.mib
	new file:   mibs/calix-e5/E5-111-AS-ATM-MIB.mib
	new file:   mibs/calix-e5/E5-111-IESCOMMON-MIB.mib
	new file:   mibs/calix-e5/E5-111-MIB.mib
	new file:   mibs/calix-e5/E5-111-TRAPS-MIB.mib
	new file:   mibs/calix-e5/E5-120-AS-ATM-MIB.mib
	new file:   mibs/calix-e5/E5-120-IESCOMMON-MIB.mib
	new file:   mibs/calix-e5/E5-120-MIB.mib
	new file:   mibs/calix-e5/E5-120-TRAPS-MIB.mib
	new file:   mibs/calix-e5/E5-121-AS-ATM-MIB.mib
	new file:   mibs/calix-e5/E5-121-IESCOMMON-MIB.mib
	new file:   mibs/calix-e5/E5-121-MIB.mib
	new file:   mibs/calix-e5/E5-121-TRAPS-MIB.mib
	new file:   mibs/calix-e5/HCNUM-TC[rfc2856].mib
	new file:   mibs/calix-e5/IANA-ADDRESS-FAMILY-NUMBERS-MIB.mib
	new file:   mibs/calix-e5/IANAifType-MIB.mib
	new file:   mibs/calix-e5/IEEE8021-CFMD8-MIB.mib
	new file:   mibs/calix-e5/IF-MIB.mib
	new file:   mibs/calix-e5/LLDP-MIB.mib
	new file:   mibs/calix-e5/MIB_ALARM_E5-110_implementation_table.xls
	new file:   mibs/calix-e5/MIB_ALARM_E5-111_implementation_table.xls
	new file:   mibs/calix-e5/MIB_ALARM_E5-121_implementation_table.xls
	new file:   mibs/calix-e5/P-BRIDGE-MIB.mib
	new file:   mibs/calix-e5/PerfHist-TC-MIB.mib
	new file:   mibs/calix-e5/Q-BRIDGE-MIB.mib
	new file:   mibs/calix-e5/RFC-1212.mib
	new file:   mibs/calix-e5/RFC-1215.mib
	new file:   mibs/calix-e5/RFC-3728.mib
	new file:   mibs/calix-e5/RFC1155-SMI.mib
	new file:   mibs/calix-e5/RFC1213-MIB.mib
	new file:   mibs/calix-e5/RFC3705-MIB.mib
	new file:   mibs/calix-e5/RMON-MIB.mib
	new file:   mibs/calix-e5/RMON2-MIB.mib
	new file:   mibs/calix-e5/SNMP-FRAMEWORK-MIB.mib
	new file:   mibs/calix-e5/SNMPv2-CONF.mib
	new file:   mibs/calix-e5/SNMPv2-MIB.mib
	new file:   mibs/calix-e5/SNMPv2-SMI.mib
	new file:   mibs/calix-e5/SNMPv2-TC.mib
	new file:   mibs/calix-e5/TOKEN-RING-RMON-MIB.mib
2016-07-21 14:28:36 -05:00
Tony Murray a1ab19047e Merge remote-tracking branch 'upstream/master' into rrd-create-remote 2016-07-07 21:28:47 -05:00
Tony Murray 57650e4ffc Remove nfs requirement for distributed poller (with rrdtool 1.5+)
Use data_update instead of rrd_update/rrd_create and influx_update
Centralize rrd file check so we can check against a remote rrdcached server too
Use rrd_name() to generate rrd file names
2016-07-07 21:10:06 -05:00