Neil Lathwood
03b8cc0c1b
Merge pull request #3189 from khobbits/patch-2
...
Stop double escaping port notes
2016-03-08 14:32:14 +00:00
Robert (KHobbits)
6e4eb4cf43
Stop double escaping port notes
2016-03-08 12:14:27 +00:00
David Bell
a33d16dafa
Corrected inserting ' into overide syslocation string
2016-03-08 11:18:33 +00:00
pblasquez
02ca54b9a5
Update Configuration.md
2016-03-07 19:03:17 -08:00
Neil Lathwood
fdd9ab0a05
Merge pull request #3184 from richardlawley/overlib-tweak
...
Overlib Style Tweak
2016-03-08 00:33:19 +00:00
Paul Gear
16f7f92780
Merge pull request #3185 from geordish/fix-rrd-graphs
...
Fix rrd graphs
2016-03-08 09:16:57 +10:00
Eldon Koyle
621ea93831
Fix minor doc bug and update example
2016-03-07 16:15:38 -07:00
Eldon Koyle
94a182a396
Revert "Don't escape single quotes in alert templates so that we can compare strings in if statements"
...
This reverts commit 124afc2054 .
2016-03-07 16:12:57 -07:00
David Bell
96c9a9ad60
Update generic_multi_seperated.inc.php
...
This fixes the syntax of the area statement.
Was previously producing
AREA:outbits1_neg#c0a060:STACK
Should be producing
AREA:outbits1_neg#c0a060::STACK
(Blank legend item)
2016-03-07 21:45:56 +00:00
David Bell
6aa8d1d741
Merge pull request #1 from librenms/master
...
syncing with master
2016-03-07 21:42:20 +00:00
Richard Lawley
b250b862d1
Overlib Style Tweak
2016-03-07 21:25:01 +00:00
Richard Lawley
2455feb1c9
Scrut fix + Notification
2016-03-07 18:41:51 +00:00
Richard
042ddaa6fe
Remove duplicate data from bill_data and add PK to prevent recurrence
2016-03-07 18:31:12 +00:00
Richard
dc0f695796
Add optional cleanup task for old bill_data
2016-03-07 18:31:12 +00:00
Richard
19e9cda8d0
Replace port_in/out_measurements with latest values only
2016-03-07 18:31:12 +00:00
Neil Lathwood
65a75c77e4
Merge pull request #3157 from bitcoredotorg/patch-3
...
Clean up centos install docs
2016-03-07 17:51:53 +00:00
bitcoredotorg
463cec398e
Update Installation-(RHEL-CentOS).md
2016-03-07 08:50:38 -05:00
Ultra2D
322053c827
API access when using LDAP authentication
2016-03-07 14:07:51 +01:00
David Bell
d2db4a4af2
Corrected aggregate graph on smokeping page
2016-03-07 11:40:47 +00:00
Neil Lathwood
5e57a026e9
Merge pull request #3142 from xbeaudouin/pktj
...
Gandi Packet Journey support.
2016-03-07 10:15:13 +00:00
Xavier Beaudouin
597204d764
Update the discovery of pktj as @murrant suggested.
2016-03-07 10:22:49 +01:00
Neil Lathwood
fbe7fb077f
Merge pull request #3169 from murrant/roomalert4e
...
Add support for Avtech RoomAlert 4E
2016-03-06 21:11:17 +00:00
Neil Lathwood
a1cf6ac00f
Merge pull request #3122 from marcodc/patch-2
...
Update Acknowledgement.md
2016-03-06 21:09:48 +00:00
Neil Lathwood
d066935775
Merge pull request #3111 from marcodc/patch-1
...
malaysia map - malaysia.js
2016-03-06 21:09:29 +00:00
Neil Lathwood
03d8345b47
Merge pull request #3176 from laf/changelog
...
Updated Changelog 06.03.16
201603
2016-03-06 20:59:57 +00:00
laf
0eb1645fee
Updated Changelog 06.03.16
2016-03-06 20:59:15 +00:00
Neil Lathwood
0a50264473
Merge pull request #3174 from vitalisator/fix-map
2016-03-05 17:00:35 +00:00
Tony Murray
13260ce152
Move avtech_add_sensor function to includes/discovery/functions.php
...
allow type to be specified
else if -> elseif
2016-03-05 08:33:14 -06:00
vitalisator
6b583c447c
fix maps
2016-03-05 15:32:59 +01:00
Neil Lathwood
beb4091b66
Merge pull request #3170 from ekoyle/snmp_trap_doc
...
Add doc stub for SNMP trap handling
2016-03-05 11:34:20 +00:00
Neil Lathwood
29066cfcbc
Merge pull request #3173 from Ultra2D/syslog-linux-openvpn
...
Syslog Linux OpenVPN pattern does not match example, remove it
2016-03-05 11:34:04 +00:00
Neil Lathwood
ab67f7870c
Merge pull request #3171 from Ultra2D/syslog-trim
...
Syslog trim whitespace
2016-03-05 11:26:09 +00:00
Neil Lathwood
fe17aa8604
Merge pull request #3172 from Ultra2D/issue-3041
...
Issue 3041
2016-03-05 11:24:35 +00:00
Ultra2D
d74c37ab0e
Syslog Linux OpenVPN pattern does not match example, remove it
2016-03-05 12:23:43 +01:00
Ultra2D
f97f9c824b
Added syslog Procurve unit testing
2016-03-05 11:59:49 +01:00
Ultra2D
fb34fb7ab5
Syslog trim whitespace
2016-03-05 11:06:29 +01:00
Ultra2D
621d3be05c
Merge branch 'master' into issue-3041
2016-03-05 10:05:46 +01:00
Neil Lathwood
4aa9d30cba
Merge pull request #3167 from ekoyle/rsyslog_docs
2016-03-05 01:47:57 +00:00
laf
f0fb602046
Added support for os in oxidized groups
2016-03-05 00:48:51 +00:00
Eldon Koyle
86330d051e
Add doc stub for SNMP trap handling
2016-03-04 17:13:03 -07:00
Eldon Koyle
c803e24fb1
Minor formatting tweaks
2016-03-04 16:35:05 -07:00
Neil Lathwood
7ea7bd4c92
Merge pull request #3036 from Ultra2D/issue-3035
...
Linux syslog processing cleanup
2016-03-04 23:34:00 +00:00
Neil Lathwood
8d8d689e2a
Merge pull request #3018 from jmacul2/mapgroups
...
Initial adds for map group functionality.
2016-03-04 23:30:54 +00:00
Eldon Koyle
a549902aca
Basic outline for using rsyslog instead of syslog-ng
2016-03-04 16:29:02 -07:00
Tony Murray
555fdb5bfc
Clean up avtech by making a helper function so it is easier to add devices.
...
Add support for RoomAlert 4E
fixes #3166
2016-03-04 17:28:54 -06:00
Ultra2D
25e88f743c
Remove dovecot match because of invalid pattern
2016-03-04 17:43:05 +01:00
Daniel Preussker
46bee4021f
Changed else if to elseif
2016-03-04 16:25:51 +00:00
Ultra2D
f969317863
Human readable program, and append event ID to message
2016-03-04 16:14:47 +01:00
Ultra2D
488f7f44c4
array_walk does not work like that, apparently input is trimmed later on
2016-03-04 15:51:49 +01:00
Daniel Preussker
29eea12b08
Scrut fixes
2016-03-04 14:36:47 +00:00