Commit Graph

10256 Commits

Author SHA1 Message Date
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
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
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
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
Ultra2D
99cd9f96cf Proper tags and facilities; additional example 2016-03-04 15:18:24 +01:00
Ultra2D
2b6439d502 Missing trailing delimiter in original code 2016-03-04 13:45:48 +01:00
Ultra2D
24d7926ea6 Fix build failure 2016-03-04 13:10:07 +01:00
Neil Lathwood
ec857ebfa5 Merge pull request #3162 from Ultra2D/whitespace
Tabs to spaces
2016-03-04 11:32:18 +00:00
Ultra2D
70ad24157f PHPunit tests for Linux syslog parsing 2016-03-04 12:32:06 +01:00
Neil Lathwood
891f11665c Merge pull request #3158 from jmacul2/master
Update AUTHORS.md
2016-03-04 11:29:26 +00:00
Neil Lathwood
9812c402ce Merge pull request #3160 from Rosiak/ironware-state
Basic Ironware State Support
2016-03-04 11:28:59 +00:00
Neil Lathwood
a91475dfde Merge pull request #3163 from Andreser/patch-1
Update RRDTune.md
2016-03-04 11:26:15 +00:00
Andreser
e34a80a047 Update RRDTune.md
It seems script folder changed to "scripts" so I'm also changing it in the docs.
2016-03-04 08:24:59 -03:00
Ultra2D
9773b3bade Tabs to spaces 2016-03-04 11:30:11 +01:00
Ultra2D
4c5701531f Merge branch 'master' into issue-3035 2016-03-04 09:13:15 +01:00
Rosiak
5a4334daa5 Small fix 2016-03-04 06:49:04 +01:00
Jay McEntire
0818c6ae99 whitespace fix 2016-03-03 16:51:40 -07:00
Jay McEntire
a77c9d234c Menu UI for map groups. 2016-03-03 16:43:13 -07:00
Tony Murray
e2d2c6aa38 Merge pull request #3154 from laf/syslog-test
Updated syslogTest to work with php 5.3
2016-03-03 15:55:46 -06:00
laf
f395cbdefe Updated to work with php 5.3 2016-03-03 21:21:28 +00:00
Neil Lathwood
da2ca8ed25 Merge pull request #3152 from laf/travis-fix
Fixed .travis.yml
2016-03-03 20:22:06 +00:00
Neil Lathwood
24003e5681 Merge pull request #3150 from laf/test-fix
Couple of small fixes
2016-03-03 20:08:22 +00:00
Neil Lathwood
695baede4e Merge pull request #3121 from Rosiak/juniper-state
Juniper State Support
2016-03-03 20:07:34 +00:00