12031 Commits

Author SHA1 Message Date
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
c16fedd201 Merge pull request #4041 from murrant/ceph_rrd
put rrd_name back
2016-08-12 13:52:04 -05:00
0bc79a3b5f put rrd_name back 2016-08-12 13:50:49 -05:00
8eced98439 Merge pull request #4039 from murrant/ceph_rrd
Fix Ceph
2016-08-12 19:38:32 +01:00
9ac73b8eb2 Fix Ceph
compact() accepts strings naming the variables, not actual variables...
2016-08-12 13:31:11 -05:00
f02b4c9253 Merge pull request #4037 from murrant/fix-ceph-app
Fix ceph filenames
2016-08-12 17:46:45 +01:00
191bed9dd8 Merge pull request #4038 from murrant/proxmox-ceph-fix
Proxmox rrd fix
2016-08-12 17:46:15 +01:00
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
224ebb0c0c Fix ceph filenames 2016-08-12 10:29:27 -05:00
133a8c8768 rewrite the discovery module based on presence oid 2016-08-12 15:02:58 +03:00
4c060a430a - Made module generic, not cisco specific. 2016-08-12 17:21:55 +10:00
4c34541285 - Modified to use standardised RRD functions 2016-08-12 16:53:20 +10:00
27eb389409 Merge branch 'master' into issue-3999 2016-08-12 16:34:13 +10:00
0fbea91be3 - files should have a blank line at the end. 2016-08-12 16:32:40 +10:00
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
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
1281ae4bd3 ipmiSensorName 2016-08-12 00:53:25 +03:00
f9ba459e08 Merge pull request #3992 from vitalisator/raisecom
Add basic device support for Raisecom.
2016-08-11 22:43:49 +01:00
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
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
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
d97987aba4 Merge branch 'master' into thecityofguanyu/add-calix-e5-support 2016-08-11 09:30:49 -05:00
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
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
ff80580cd0 Merge pull request #4033 from murrant/updating-doc
Update the updating docs
2016-08-11 15:13:16 +01:00
b36f8e8440 Merge pull request #4032 from gitdimi/master
changed copmact to compact
2016-08-11 15:07:15 +01:00
50588e3818 Update the updating docs 2016-08-11 09:07:13 -05:00
e2d3812bcb changed copmact to compact 2016-08-11 13:20:51 +02:00
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
5028039b48 - Added influxdb options to check-services.php
- Confirmed to coding standards
2016-08-11 17:08:44 +10:00
17629c5997 leave just important files for start 2016-08-11 08:49:20 +02:00
516e49b6d3 Merge pull request #4027 from murrant/psr2-config
Add php_code_sniffer config file
2016-08-10 15:21:05 -05:00
0553fb6b5a Add php_code_sniffer config file 2016-08-10 15:16:21 -05:00
d14214cd8b Merge pull request #4026 from Rosiak/issue-4008
Device Page UI Changes
2016-08-10 20:48:07 +01:00
7fecb5169b Device Page UI Changes
#4008
2016-08-10 21:46:06 +02:00
eaafa3a4d8 Merge pull request #4012 from Rosiak/cisco-asa-state-discovery
Cisco ASA HA State Discovery
2016-08-10 19:25:34 +01:00
cfe6d39250 Merge pull request #3991 from vitalisator/pbn2
move pbn mibs to subdirectory
2016-08-10 19:22:45 +01:00
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
0436de5722 Merge pull request #4014 from murrant/del-distro-script
Delete distro script, it has moved to librenms-agent snmp directory.
2016-08-10 19:05:01 +01:00
laf
428ef0ac26 Added docs to utilise distro script 2016-08-10 19:04:34 +01:00
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
bc16925f25 Last fix
Don’t add states for non ha setups.
2016-08-10 18:27:42 +02:00
35d7456c1a Fixing AUTHORS.md conflict 2016-08-10 14:23:22 +02:00
7cc3c75993 Merge pull request #4018 from crcro/ubuntu-icon
ubuntu os icon
2016-08-10 08:09:59 +01:00
46cd3b13f1 Merge pull request #4017 from crcro/generic-v3-multiline-fix
generic_v3_multiline fix
2016-08-09 22:56:20 -05:00
f3a6d6e12a ubuntu os icon 2016-08-10 06:12:03 +03:00
96ed9c072c run rename only for ipmi type sensors, added the power usage sensors, updated rewrite for known hosts 2016-08-10 04:55:30 +03:00
a296a27adf duplicate description field when area was used 2016-08-10 04:28:08 +03:00
d5b499bae3 ipmi sensors rewrite based on known hardware id 2016-08-10 00:20:51 +03:00
9bcc31ca6e Merge pull request #4011 from murrant/remove-poller-update
Remove the var_dump of the poller stats update array
2016-08-09 22:19:06 +01:00