Commit Graph

3817 Commits

Author SHA1 Message Date
vitalisator
2ecc764c8a trim to 19 characters 2016-08-18 14:35:48 +02:00
vitalisator
6f7c62ce50 DSname too long 2016-08-18 11:26:52 +02:00
vitalisator
f55c7ea53c add the missing array value 2016-08-17 21:06:10 +02:00
Tony Murray
fe784aec83 Merge pull request #4074 from OpcaoTelecom/unbound
Added Unbound graph support
2016-08-17 10:01:48 -05:00
Alan Gregory
9de3d43056 Fix unused variable 2016-08-17 09:38:38 -03:00
Tony Murray
4a152dab7b Fix rrdtool_check_rrd_exists() by removing the broken remote check.
Maybe this can be re-implemented at a later time.
2016-08-16 19:07:01 -05:00
Tony Murray
232fdc2516 Merge pull request #4006 from adaniels21487/issue-3550
Change the IPSLA feature to allow different metrics to be collected…
2016-08-16 08:55:44 -05:00
Tony Murray
3c24a672ce Merge pull request #4035 from crcro/hp-blade-c7000
HP BladeSystem C3000/C7000 OA
2016-08-16 08:46:39 -05:00
crcro
370fab065a fix not set 2016-08-16 09:55:00 +03:00
crcro
2bf54f106b removed useless comments 2016-08-16 05:50:45 +03:00
crcro
b4354b3801 rewrite to use snmp_walk against snmp_get for fewer device queries 2016-08-16 05:48:47 +03:00
Tony Murray
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 Murray
40c0728295 Merge pull request #4064 from adaniels21487/issue-4061
OS Support for Acano collaboration appliances
2016-08-15 20:48:06 -05:00
Tony Murray
a7b584032a Merge pull request #4063 from adaniels21487/issue-4060
OS Discovery for Cisco ISE
2016-08-15 20:45:32 -05:00
Tony Murray
cacd7cd639 Merge pull request #4067 from vladsol/issue-4054
Removed -O parameter from rrdtool command line for rrdtool < 1.5
2016-08-15 19:46:01 -05:00
Vladislav Solovei
ea7e02c66b -O does not exists in RRDTool < 1.4.3 (CentOS 6 uses 1.3.8 by default).
Checking RRD existence with file_exists() if RRDTool ver. < 1.5
2016-08-16 01:20:49 +03:00
Alan Gregory
8c0735d64e Fix parameter order 2016-08-15 18:17:41 -03:00
Alan Gregory
00c5c65d47 Fix array declaration 5.3 compatible 2016-08-15 18:07:36 -03:00
Eldon Koyle
f019a28d8c and a semicolon 2016-08-15 14:53:44 -06:00
Vladislav Solovei
de058b82ca -O does not exists in RRDTool < 1.4.3 (CentOS 6 uses 1.3.8 by default).
Checking RRD existence with file_exists() if RRDTool ver. < 1.5
2016-08-15 23:49:58 +03:00
Alan Gregory
772d7fa28d Added Unbound Support 2016-08-15 17:46:10 -03:00
Eldon Koyle
71625f6aba fix whitespace (spaces, not tabs) 2016-08-15 14:44:19 -06:00
Eldon Koyle
c405c38eff Check against the proper subtype variable, initialize variable 2016-08-15 11:52:21 -06:00
Eldon Koyle
34f503afb8 Use port instead of chassis ID for port matching
Code was improperly using chassis id for port matching.

Fixes #4069 .
2016-08-15 11:40:11 -06:00
Vladislav Solovei
fe948a7aad Removed -O parameter from rrdtool command line.
-O does not exists in RRDTool < 1.4.3 (CentOS 6 uses 1.3.8 by default).
Checking RRD file existence with rrdtool_check_rrd_exists() instead.
2016-08-15 18:32:49 +03:00
Vladislav Solovei
4c324cb5b3 Removed -O parameter from rrdtool command line.
-O does not exists in RRDTool < 1.4.3 (CentOS 6 uses 1.3.8 by default).
Checking RRD file existence with file_exists() instead.
2016-08-15 12:41:32 +03: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
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
crcro
b201e642d8 fix: sensor id for rrd file 2016-08-13 15:42:43 +03:00
crcro
ca1223cf2d added sensors for power usage and temperatures of the blade system 2016-08-13 15:10:45 +03:00
crcro
709e941c77 fixes - PSR-2 style 2016-08-13 03:25:28 +03:00
Tony Murray
f526cb7d8d Ceph: only parse ceph data
Was parsing through all agent data, rather than just ceph data.
2016-08-12 14:33:17 -05:00
Tony Murray
0bc79a3b5f put rrd_name back 2016-08-12 13:50:49 -05:00
Tony Murray
9ac73b8eb2 Fix Ceph
compact() accepts strings naming the variables, not actual variables...
2016-08-12 13:31:11 -05:00
Neil Lathwood
f02b4c9253 Merge pull request #4037 from murrant/fix-ceph-app
Fix ceph filenames
2016-08-12 17:46:45 +01:00
Neil Lathwood
191bed9dd8 Merge pull request #4038 from murrant/proxmox-ceph-fix
Proxmox rrd fix
2016-08-12 17:46:15 +01:00
Tony Murray
1949f2f4ea Proxmox rrd fix
Attempt to fix proxmox rrd naming. Create a separate function to generate it's file names.
2016-08-12 11:05:58 -05:00
Tony Murray
224ebb0c0c Fix ceph filenames 2016-08-12 10:29:27 -05:00
crcro
133a8c8768 rewrite the discovery module based on presence oid 2016-08-12 15:02:58 +03:00
Aaron Daniels
0fbea91be3 - files should have a blank line at the end. 2016-08-12 16:32:40 +10:00
Neil Lathwood
2aaf9559ea Merge pull request #4016 from crcro/ipmi_rewrites
ipmi sensors rewrite based on known hardware id
2016-08-11 23:37:40 +01:00
Aaron Daniels
70a05369fb Merge branch 'master' into issue-3550
Conflicts:
	html/includes/graphs/device/sla.inc.php
	includes/polling/cisco-sla.inc.php

- Use standardised RRD functions
2016-08-12 08:22:40 +10:00
Neil Lathwood
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
Dimitry Kuijpers
e2d3812bcb changed copmact to compact 2016-08-11 13:20:51 +02:00
Neil Lathwood
eaafa3a4d8 Merge pull request #4012 from Rosiak/cisco-asa-state-discovery
Cisco ASA HA State Discovery
2016-08-10 19:25:34 +01:00
Neil Lathwood
cfe6d39250 Merge pull request #3991 from vitalisator/pbn2
move pbn mibs to subdirectory
2016-08-10 19:22:45 +01:00
Neil Lathwood
2424c265a2 Merge pull request #3969 from BSONetwork/master
Adding support for Brocade NOS sensors (Temperature and fanspeed)
2016-08-10 19:17:53 +01:00