12045 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
crcro	ca1223cf2d	added sensors for power usage and temperatures of the blade system	2016-08-13 15:10:45 +03:00
crcro	50cf4f1b7f	spacing fixes for css files	2016-08-13 05:15:45 +03:00
crcro	ccc88911f8	-fixed select position/size ... -extra style for text on labels for readibility -PSR-2 style -added classes for all styles	2016-08-13 05:12:05 +03:00
crcro	709e941c77	fixes - PSR-2 style	2016-08-13 03:25:28 +03:00
crcro	e575271126	added linux os distro icon, fixed formatting	2016-08-13 03:20:55 +03:00
laf	11d91215cb	Added predicated usage to bills, basic at present	2016-08-13 01:11:20 +01:00
laf	226202de81	Added support for Avaya VSP	2016-08-12 23:58:34 +01:00
Tony Murray	503260f8a4	Merge pull request #4045 from laf/issue-4000 ... Added support for nets-exclude in snmp-scan	2016-08-12 16:02:56 -05:00
Neil Lathwood	f8d63c60e0	Merge pull request #4042 from murrant/glob-rrd_name ... Fix rrd_name escaping * used with glob()	2016-08-12 22:00:47 +01:00
Neil Lathwood	641db73c9c	Merge pull request #4047 from murrant/ceph_rrd ... Ceph: only parse ceph data	2016-08-12 21:59:32 +01:00
laf	b673432058	Added support for nets-exclude in snmp-scan	2016-08-12 21:39:53 +01:00
laf	d2f1defc32	Changed swos detection + more dsm support	2016-08-12 21:03:22 +01:00
crcro	655363082c	rewrite of availability-map	2016-08-12 22:51:29 +03:00
Tony Murray	5db9256baf	Fix rrd_name escaping * used with glob() ... Thanks tuxis-ie for finding the issue and fix.	2016-08-12 14:42:57 -05: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	c16fedd201	Merge pull request #4041 from murrant/ceph_rrd ... put rrd_name back	2016-08-12 13:52:04 -05:00
Tony Murray	0bc79a3b5f	put rrd_name back	2016-08-12 13:50:49 -05:00
Neil Lathwood	8eced98439	Merge pull request #4039 from murrant/ceph_rrd ... Fix Ceph	2016-08-12 19:38:32 +01: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	4c060a430a	- Made module generic, not cisco specific.	2016-08-12 17:21:55 +10:00
Aaron Daniels	4c34541285	- Modified to use standardised RRD functions	2016-08-12 16:53:20 +10:00
Aaron Daniels	27eb389409	Merge branch 'master' into issue-3999	2016-08-12 16:34:13 +10: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
crcro	1281ae4bd3	ipmiSensorName	2016-08-12 00:53:25 +03: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
Neil Lathwood	a7a151e3b0	Merge pull request #3864 from thecityofguanyu/thecityofguanyu/add-calix-e5-support ... thecityofguanyu/add-calix-e5-support	2016-08-11 22:39:47 +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	9d4895da7d	Changes to be committed: ... renamed: E5-110-AESCOMMON-MIB.mib -> E5-110-AESCOMMON-MIB renamed: E5-110-AS-ATM-MIB.mib -> E5-110-AS-ATM-MIB renamed: E5-110-IESCOMMON-MIB.mib -> E5-110-IESCOMMON-MIB renamed: E5-110-MIB.mib -> E5-110-MIB renamed: E5-110-TRAPS-MIB.mib -> E5-110-TRAPS-MIB deleted: E5-111 alarm.xls renamed: E5-111-AESCOMMON-MIB.mib -> E5-111-AESCOMMON-MIB renamed: E5-111-AS-ATM-MIB.mib -> E5-111-AS-ATM-MIB renamed: E5-111-IESCOMMON-MIB.mib -> E5-111-IESCOMMON-MIB renamed: E5-111-MIB.mib -> E5-111-MIB renamed: E5-111-TRAPS-MIB.mib -> E5-111-TRAPS-MIB renamed: E5-120-AS-ATM-MIB.mib -> E5-120-AS-ATM-MIB renamed: E5-120-IESCOMMON-MIB.mib -> E5-120-IESCOMMON-MIB renamed: E5-120-MIB.mib -> E5-120-MIB renamed: E5-120-TRAPS-MIB.mib -> E5-120-TRAPS-MIB renamed: E5-121-AS-ATM-MIB.mib -> E5-121-AS-ATM-MIB renamed: E5-121-IESCOMMON-MIB.mib -> E5-121-IESCOMMON-MIB renamed: E5-121-MIB.mib -> E5-121-MIB renamed: E5-121-TRAPS-MIB.mib -> E5-121-TRAPS-MIB renamed: HCNUM-TC[rfc2856].mib -> HCNUM-TC[rfc2856] deleted: MIB_ALARM_E5-110_implementation_table.xls deleted: MIB_ALARM_E5-111_implementation_table.xls deleted: MIB_ALARM_E5-121_implementation_table.xls : renamed: RFC-3728.mib -> RFC-3728 renamed: RFC3705-MIB.mib -> RFC3705-MIB	2016-08-11 09:38:50 -05:00
Chris A. Evans	d97987aba4	Merge branch 'master' into thecityofguanyu/add-calix-e5-support	2016-08-11 09:30:49 -05:00
Neil Lathwood	e5f89ba2a9	Merge pull request #4034 from murrant/checkboxes ... Use checkboxes that can be checked in the github templates	2016-08-11 15:18:58 +01:00
Tony Murray	50ff91b129	Use checkboxes that can be checked in the github templates ... Are you ok with the line returns being removed? less scrolling	2016-08-11 09:14:44 -05:00
Neil Lathwood	ff80580cd0	Merge pull request #4033 from murrant/updating-doc ... Update the updating docs	2016-08-11 15:13:16 +01:00
Neil Lathwood	b36f8e8440	Merge pull request #4032 from gitdimi/master ... changed copmact to compact	2016-08-11 15:07:15 +01:00
Tony Murray	50588e3818	Update the updating docs	2016-08-11 09:07:13 -05:00
Dimitry Kuijpers	e2d3812bcb	changed copmact to compact	2016-08-11 13:20:51 +02:00
Neil Lathwood	bb3f610b8a	Merge pull request #4031 from adaniels21487/issue-4028 ... BUGFIX: Added influxdb options to check-services.php	2016-08-11 11:03:59 +01:00
Aaron Daniels	5028039b48	- Added influxdb options to check-services.php ... - Confirmed to coding standards	2016-08-11 17:08:44 +10:00
vitalisator	17629c5997	leave just important files for start	2016-08-11 08:49:20 +02:00
Tony Murray	516e49b6d3	Merge pull request #4027 from murrant/psr2-config ... Add php_code_sniffer config file	2016-08-10 15:21:05 -05:00
Tony Murray	0553fb6b5a	Add php_code_sniffer config file	2016-08-10 15:16:21 -05:00
Neil Lathwood	d14214cd8b	Merge pull request #4026 from Rosiak/issue-4008 ... Device Page UI Changes	2016-08-10 20:48:07 +01:00
Rosiak	7fecb5169b	Device Page UI Changes ... #4008	2016-08-10 21:46:06 +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