Merge branch 'master' into feature/METRON-1416-upgrade-solr
Project: http://git-wip-us.apache.org/repos/asf/metron/repo Commit: http://git-wip-us.apache.org/repos/asf/metron/commit/1006d9d6 Tree: http://git-wip-us.apache.org/repos/asf/metron/tree/1006d9d6 Diff: http://git-wip-us.apache.org/repos/asf/metron/diff/1006d9d6 Branch: refs/heads/master Commit: 1006d9d6e473d56d5ada2e7ff3011b98f047ec7c Parents: 8cc8aab b48ab93 Author: Michael Miklavcic <michael.miklav...@gmail.com> Authored: Tue Feb 27 14:43:31 2018 -0700 Committer: Michael Miklavcic <michael.miklav...@gmail.com> Committed: Tue Feb 27 14:43:31 2018 -0700 ---------------------------------------------------------------------- Upgrading.md | 18 + metron-deployment/amazon-ec2/README.md | 25 +- .../metron/rest/controller/KafkaController.java | 1 + .../metron/rest/service/KafkaService.java | 9 + .../rest/service/impl/KafkaServiceImpl.java | 33 +- .../rest/service/impl/KafkaServiceImplTest.java | 10 + .../apache/metron/common/utils/JSONUtils.java | 7 + .../dao/ElasticsearchMetaAlertDao.java | 15 +- .../apache/metron/indexing/dao/IndexDao.java | 23 +- .../indexing/dao/update/PatchRequest.java | 7 +- .../paloalto/BasicPaloAltoFirewallParser.java | 333 +++++++++---- .../BasicPaloAltoFirewallParserTest.java | 493 ++++++++++++++++++- .../logData/PaloAltoFirewallParserTest.txt | 2 - site/_includes/footer.html | 3 +- site/community/index.md | 4 + site/index.html | 30 ++ 16 files changed, 853 insertions(+), 160 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/metron/blob/1006d9d6/metron-platform/metron-common/src/main/java/org/apache/metron/common/utils/JSONUtils.java ----------------------------------------------------------------------
