GitHub user ajayydv opened a pull request:
https://github.com/apache/incubator-metron/pull/161
Develop
You can merge this pull request into a Git repository by running:
$ git pull https://github.com/DomenicPuzio/incubator-metron develop
Alternatively you can review and apply these changes as the patch at:
https://github.com/apache/incubator-metron/pull/161.patch
To close this pull request, make a commit to your master/trunk branch
with (at least) the following in the commit message:
This closes #161
----
commit c7e1b7d7f90ce3e9be7def020813bb93e9da7a25
Author: bve416 <[email protected]>
Date: 2016-06-07T15:06:37Z
Merge branch 'METRON-176' of
https://github.com/DomenicPuzio/incubator-metron into develop
commit 152e312bce8a3dc8625a86392b6bdbfae67aa491
Author: bve416 <[email protected]>
Date: 2016-06-07T15:14:52Z
added windowssyslog template
commit d829f122a5c93b94f88eacb833887aafee2c65ff
Author: Phil Austin <[email protected]>
Date: 2016-06-07T17:10:10Z
changed batch sizes when writing to ES
commit 0008951a639e0a7980606b942851a1efc49fb584
Author: Phil Austin <[email protected]>
Date: 2016-06-07T17:13:00Z
Merge branch 'develop' of https://github.com/DomenicPuzio/incubator-metron
into develop
commit c05d260c3d6d2dffa641e87b2beed183fa77058e
Author: MorganEmery <[email protected]>
Date: 2016-06-07T18:25:39Z
fix pipe error
commit 865ad8ca9874bbe2183138623add5b6537cf8a2c
Author: MorganEmery <[email protected]>
Date: 2016-06-07T18:37:25Z
Merge branch 'bluecoat-cim' of
https://github.com/DomenicPuzio/incubator-metron into bluecoat-cim
commit 9515fc52f381f267125e0641b12e86f0fad93503
Author: JonathanRider <[email protected]>
Date: 2016-06-07T19:52:53Z
Fixed pattern file for unixsyslog5424 to accept no ms
commit 5d5bc5961553c5eb47cff9fb3230b06e9ae7c5f3
Author: JonathanRider <[email protected]>
Date: 2016-06-07T20:02:45Z
Unixsyslog5424 converts timestamps correctly if there is no milliseconds
commit e8de27e1c76ef6a2fc6bf898fae4674e4cb87b17
Author: JonathanRider <[email protected]>
Date: 2016-06-07T20:03:19Z
Merge branch 'syslog5424' of
https://github.com/DomenicPuzio/incubator-metron into develop
commit 0cd0abe285871839ae9b074ee7eef87ca3d2a540
Author: MorganEmery <[email protected]>
Date: 2016-06-07T20:18:04Z
int tests passing
commit df2f168c4a85faac93152e5b3ee038b8aa5e4490
Author: MorganEmery <[email protected]>
Date: 2016-06-07T20:19:09Z
clean up imports
commit 82feef0d788552f553c42e4a05b3a178e2746d55
Author: Morgan Emery <[email protected]>
Date: 2016-06-07T20:25:30Z
Merge pull request #5 from DomenicPuzio/bluecoat-cim
Bluecoat cim
commit d0aab074d1489ac515221dc53b20a6467f45f22c
Author: DomenicPuzio <[email protected]>
Date: 2016-06-07T20:44:01Z
[METRON-157] Making changes to CEF parser to handle malformed data
commit 1c8ed658f36e466d97ea5ed544a41f5bf8663872
Author: JonathanRider <[email protected]>
Date: 2016-06-07T20:51:28Z
[METRON-175] fixed grok pattern for rfc3164
commit d5d379ea13575cdeecb010f11f5aa1e9701fc66a
Author: JonathanRider <[email protected]>
Date: 2016-06-07T20:51:47Z
Merge branch 'metron-175' of
https://github.com/DomenicPuzio/incubator-metron into develop
commit a673d631696c660758ce50784ea4eee2ff28f2f1
Author: bve416 <[email protected]>
Date: 2016-06-07T21:38:33Z
[METRON-176] added additinal patterns in regex file
commit a56369d728e8ac93f6d7b2cc1f7bad9452de1e7a
Author: bve416 <[email protected]>
Date: 2016-06-07T21:39:03Z
Merge branch 'METRON-176' of
https://github.com/DomenicPuzio/incubator-metron into develop
commit 49f279d38cad7678d6c2e609941121ec25dab313
Author: bve416 <[email protected]>
Date: 2016-06-07T22:01:33Z
[METRON-161] added if statement to prevent index out of bounds exception
commit 82a0719f290d4a278443256642347c8b7e293620
Author: bve416 <[email protected]>
Date: 2016-06-07T22:01:50Z
Merge branch 'METRON-161' of
https://github.com/DomenicPuzio/incubator-metron into develop
commit d1716fbfb318845ecdd4d7d632a9f1ef51cb9aa2
Author: Phil Austin <[email protected]>
Date: 2016-06-08T14:31:35Z
[METRON-201] added additional aliases to some sources
commit e650033c242ebca6d5b223195246d271aba93284
Author: Phil Austin <[email protected]>
Date: 2016-06-08T14:33:56Z
fixed bluecoat_proxy merge conflicts
commit ff2e0282c2874c6c647871492de762ba633587c5
Author: Phil Austin <[email protected]>
Date: 2016-06-08T14:36:55Z
Merge branch 'develop' of https://github.com/DomenicPuzio/incubator-metron
into develop
commit 8bdc8ebeb7e5050d1e9046096f739123a181dcfd
Author: JonathanRider <[email protected]>
Date: 2016-06-08T14:59:30Z
[METRON-185]Updated McAfee Firewall to handle N/A as a possible ip address
commit e6973b135ada1ba5b53ad46cd63a0e87b70a438d
Author: Phil Austin <[email protected]>
Date: 2016-06-08T15:00:36Z
[METRON-201] updated alias groups to show up on top of list
commit 085f7e0a1b991b973b72b8d6c8aec32f44f1439f
Author: Phil Austin <[email protected]>
Date: 2016-06-08T15:01:02Z
Merge branch 'METRON-201' into develop
commit 17d494a80a5674c948201ca30e3a17d6ddb81c96
Author: JonathanRider <[email protected]>
Date: 2016-06-08T15:05:07Z
Merge branch 'metron-185' of
https://github.com/DomenicPuzio/incubator-metron into develop
commit 750f7e9fddfd48bf1d65382131c5dfaea835bbf8
Author: Phil Austin <[email protected]>
Date: 2016-06-08T15:06:30Z
added group aliases to templates
commit 00545edc16d755c2d68a930b5993cb528efb8407
Author: Phil Austin <[email protected]>
Date: 2016-06-08T15:07:27Z
Merge branch 'capone-templates' into develop
commit 39363cc02d435b02fa868f572a2b49959357a2b0
Author: Phil Austin <[email protected]>
Date: 2016-06-08T15:14:14Z
[METRON-201] added active directory template
commit ab6f796230b3c4739f1fa378f56c93357949eb84
Author: Phil Austin <[email protected]>
Date: 2016-06-08T15:15:06Z
Merge branch 'METRON-201' into develop
----
---
If your project is set up for it, you can reply to this email and have your
reply appear on GitHub as well. If your project does not have this feature
enabled and wishes so, or if the feature is enabled but not working, please
contact infrastructure at [email protected] or file a JIRA ticket
with INFRA.
---
