11620 Commits

Author SHA1 Message Date
Neil Lathwood
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
Neil Lathwood
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 Lathwood
7cc3c75993 Merge pull request #4018 from crcro/ubuntu-icon
ubuntu os icon
2016-08-10 08:09:59 +01:00
Tony Murray
46cd3b13f1 Merge pull request #4017 from crcro/generic-v3-multiline-fix
generic_v3_multiline fix
2016-08-09 22:56:20 -05:00
crcro
f3a6d6e12a ubuntu os icon 2016-08-10 06:12:03 +03:00
crcro
a296a27adf duplicate description field when area was used 2016-08-10 04:28:08 +03:00
Neil Lathwood
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
Neil Lathwood
0a2966dc5b Merge pull request #4010 from murrant/generic-v3-graph
generic_v3_multiline: extra colon breaks the graph
2016-08-09 22:18:52 +01:00
Neil Lathwood
2c001db8ce Merge pull request #3988 from crcro/brocade-fabos-updates
brocade fabric os enhancement
2016-08-09 21:54:18 +01:00
Tony Murray
3d945d2bbe Merge pull request #3938 from laf/issue-3877
Update BGP Discover + Polling and WebUI
2016-08-09 15:50:21 -05:00
Neil Lathwood
633c4c4723 Merge pull request #4013 from murrant/fix-4001
Fix addHost force_add logic
2016-08-09 21:33:18 +01:00
Tony Murray
eadeeb9409 Fix addHost force_add logic
Use boolean where we can
Fixes #4001
2016-08-09 15:13:42 -05:00
Tony Murray
0105d8cac7 Delete distro script, it has moved to librenms-agent snmp directory. 2016-08-09 14:32:07 -05:00
Tony Murray
97877e38ec Remove the var_dump of the poller stats update array
It doesn't add any useful info and takes up several lines
2016-08-09 14:06:01 -05:00
Tony Murray
21ad9c2a8b generic_v3_multiline: extra colin breaks the graph 2016-08-09 14:03:16 -05:00
Tony Murray
78723db9ea rrdtool.inc.php: Remove unused functions
Always force -O with create
Mark rrdtool() as internal
A little PSR-2 and whitespace cleanup
2016-08-09 09:31:45 -05:00
Neil Lathwood
d0d84503f1 Merge pull request #3994 from florianbeer/debug
Debug
2016-08-09 10:13:54 +01:00
Neil Lathwood
430526cd92 Merge pull request #4007 from murrant/powerconnect5324
Detect PowerConnect 5324 as powerconnect os
2016-08-09 10:08:53 +01:00
Tony Murray
7c7c615951 Detect PowerConnect 5324 as powerconnect os 2016-08-08 23:09:33 -05:00
Tony Murray
1182cb3f6d One more lint error 2016-08-08 22:46:58 -05:00
Tony Murray
aa859fe5c4 Fix php lint error 2016-08-08 20:33:41 -05:00
Tony Murray
68303a96da Merge remote-tracking branch 'upstream/master' into rrd-create-remote 2016-08-08 20:23:15 -05:00
Florian Beer
a50bb344ed This probably can be deleted since it was wrong 2016-08-09 02:57:45 +02:00
Neil Lathwood
b93a060458 Merge pull request #3997 from murrant/exceptions
addHost: Use Exceptions
2016-08-08 22:03:08 +01:00
Tony Murray
5643d3710d Actually add the exceptions 2016-08-08 15:47:35 -05:00
Tony Murray
322b79f717 Merge remote-tracking branch 'upstream/master' into exceptions 2016-08-08 15:43:47 -05:00
Tony Murray
409e756ca2 Merge pull request #3967 from Rosiak/comware-ver-fix
Comware Version Fix
2016-08-08 15:07:36 -05:00
Tony Murray
c97ef9651e Merge pull request #3989 from crcro/apps-fix
fixes for general apps page
2016-08-08 15:04:58 -05:00
Tony Murray
57661cf908 Merge pull request #3998 from Rosiak/issue-3995
Fix Dell PowerConnect Discovery
2016-08-08 15:02:48 -05:00
Tony Murray
741ff6cd18 Merge pull request #4004 from laf/php-lint
Added php lint checking for travis
2016-08-08 15:01:38 -05:00
laf
09eb5ca1e9 Fixed ./includes/polling/os/infinity.inc.php for php 53 2016-08-08 20:26:44 +01:00
laf
34feda8613 Fixed ./includes/polling/applications/rrdcached.inc.php for php 53 2016-08-08 20:20:18 +01:00
laf
bcd2476f32 Updated travis + added build icons 2016-08-08 20:13:33 +01:00
Neil Lathwood
c2efdcf248 Merge pull request #3996 from vitalisator/fix-syslog
Fix a bug in syslog
2016-08-08 20:06:00 +01:00
laf
544fd95a63 Updated to support php 5.3 2016-08-08 20:03:40 +01:00
laf
ec4535dae7 Added php lint checking for travis 2016-08-08 19:53:04 +01:00
Rosiak
057d78aab7 Remove more code 2016-08-08 18:34:30 +02:00
vitalisator
b438e94771 reduction, thx an @murrant 2016-08-08 17:36:19 +02:00
Tony Murray
1482e6e0a9 Update docs 2016-08-07 20:28:53 -05:00
Rosiak
d65364c8ef Fix Dell PowerConnect Discovery
#3995
2016-08-07 23:40:12 +02:00
Tony Murray
f3fc6f2906 Use Exceptions
Use exceptions for addHost()
Gets rid of silly mixed return and only returns the device_id.  Throwing an exception if we run into any issues.
Slightly modifies api add host output again to include device_id
2016-08-07 12:16:40 -05:00
vitalisator
330910b4e3 Fix a bug in syslog
since PR #3812 syslog writes to wrong device id in syslog table.
this happens on all devices where inet_pton() returns false.
2016-08-07 17:47:25 +02:00
Florian Beer
84f695e372 Fix: Failed opening file for inclusion 2016-08-07 15:39:30 +02:00
Florian Beer
22ef18793b Fix: Use of undefined constant yes - assumed 'yes' 2016-08-07 15:39:03 +02:00
Tony Murray
ead28f6acd Merge remote-tracking branch 'upstream/master' into rrd-create-remote 2016-08-07 08:22:32 -05:00
Tony Murray
837e360d5f Always send rrd create 2016-08-06 23:53:26 -05:00
crcro
a2e7726cd0 fixes for general apps page 2016-08-07 06:24:34 +03:00
crcro
71e97cd2c3 rewrite of brocade switches models 2016-08-07 04:50:31 +03:00
Neil Lathwood
f1268848b0 Merge pull request #3984 from laf/issue-3981
Fixed syntax issue
2016-08-06 20:40:25 +01:00
laf
89b9f57ce0 Fixed syntax issue 2016-08-06 20:39:53 +01:00