You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@metron.apache.org by ce...@apache.org on 2016/02/22 18:33:40 UTC
[1/4] incubator-metron git commit: METRON-41 Integrate Apache Rat to
Audit Source Code Licensing (nickwallen via cestella) closes
apache/incubator-metron#27
Repository: incubator-metron
Updated Branches:
refs/heads/master bab4d3e81 -> 2c793e099
http://git-wip-us.apache.org/repos/asf/incubator-metron/blob/244a5359/metron-ui/Vagrantfile
----------------------------------------------------------------------
diff --git a/metron-ui/Vagrantfile b/metron-ui/Vagrantfile
index a2e5f99..fb150c1 100644
--- a/metron-ui/Vagrantfile
+++ b/metron-ui/Vagrantfile
@@ -1,3 +1,20 @@
+#
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements. See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership. The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License. You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
# -*- mode: ruby -*-
# vi: set ft=ruby :
http://git-wip-us.apache.org/repos/asf/incubator-metron/blob/244a5359/metron-ui/examples/pcap-panel/pcap-parse.html
----------------------------------------------------------------------
diff --git a/metron-ui/examples/pcap-panel/pcap-parse.html b/metron-ui/examples/pcap-panel/pcap-parse.html
index 0e25dd8..e6b3fe0 100644
--- a/metron-ui/examples/pcap-panel/pcap-parse.html
+++ b/metron-ui/examples/pcap-panel/pcap-parse.html
@@ -1,7 +1,24 @@
+<!--
+Licensed to the Apache Software Foundation (ASF) under one
+or more contributor license agreements. See the NOTICE file
+distributed with this work for additional information
+regarding copyright ownership. The ASF licenses this file
+to you under the Apache License, Version 2.0 (the
+"License"); you may not use this file except in compliance
+with the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+ -->
<html>
<head>
- <script type="text/javascript" language="javascript" src="../../lib/public/vendor/jquery/jquery-1.8.0.js"></script>
- <script type="text/javascript" language="javascript" src="../../seed/es/demo_packets.json"></script>
+ <script type="text/javascript" language="javascript" src="../../lib/public/vendor/jquery/jquery-1.8.0.js"></script>
+ <script type="text/javascript" language="javascript" src="../../seed/es/demo_packets.json"></script>
<style>
table {
@@ -113,7 +130,7 @@
$.each( jsonObject.pdml.packet, function ( index ) {
print_packet_row( index );
});
-
+
//console.log('jsonObject.pdml.packet.length = ', jsonObject.pdml.packet.length);
@@ -128,7 +145,7 @@
<table style="">
<tr>
<th>No.</th>
- <th>Time</th>
+ <th>Time</th>
<th>Source</th>
<th>Destination</th>
<th>Protocol</th>
@@ -137,4 +154,4 @@
</tr>
</table>
</body>
-</html>
\ No newline at end of file
+</html>
http://git-wip-us.apache.org/repos/asf/incubator-metron/blob/244a5359/metron-ui/examples/server/nginx.conf
----------------------------------------------------------------------
diff --git a/metron-ui/examples/server/nginx.conf b/metron-ui/examples/server/nginx.conf
index f6b6102..effe31f 100644
--- a/metron-ui/examples/server/nginx.conf
+++ b/metron-ui/examples/server/nginx.conf
@@ -1,3 +1,20 @@
+#
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements. See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership. The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License. You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
# Example Metron configuration for nginx
upstream metron {
http://git-wip-us.apache.org/repos/asf/incubator-metron/blob/244a5359/metron-ui/index.js
----------------------------------------------------------------------
diff --git a/metron-ui/index.js b/metron-ui/index.js
index c855ced..38842d5 100644
--- a/metron-ui/index.js
+++ b/metron-ui/index.js
@@ -1 +1,19 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
module.exports = require('./lib/metron-ui');
http://git-wip-us.apache.org/repos/asf/incubator-metron/blob/244a5359/metron-ui/lib/metron-ui.js
----------------------------------------------------------------------
diff --git a/metron-ui/lib/metron-ui.js b/metron-ui/lib/metron-ui.js
index f740523..c11d7a8 100644
--- a/metron-ui/lib/metron-ui.js
+++ b/metron-ui/lib/metron-ui.js
@@ -1,3 +1,21 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
var _ = require('lodash');
var http = require('http');
var path = require('path');
http://git-wip-us.apache.org/repos/asf/incubator-metron/blob/244a5359/metron-ui/lib/modules/es-proxy.js
----------------------------------------------------------------------
diff --git a/metron-ui/lib/modules/es-proxy.js b/metron-ui/lib/modules/es-proxy.js
index 264b7b5..b9b5a63 100644
--- a/metron-ui/lib/modules/es-proxy.js
+++ b/metron-ui/lib/modules/es-proxy.js
@@ -1,3 +1,21 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
exports = module.exports = function(config) {
var httpProxy = require('http-proxy');
var proxy = httpProxy.createProxy();
http://git-wip-us.apache.org/repos/asf/incubator-metron/blob/244a5359/metron-ui/lib/modules/login.js
----------------------------------------------------------------------
diff --git a/metron-ui/lib/modules/login.js b/metron-ui/lib/modules/login.js
index 538af3e..7fa2c7b 100644
--- a/metron-ui/lib/modules/login.js
+++ b/metron-ui/lib/modules/login.js
@@ -1,3 +1,21 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
exports = module.exports = function(app, config) {
var passport = require('passport');
@@ -29,4 +47,4 @@ exports = module.exports = function(app, config) {
req.logout();
res.redirect('/login');
});
-};
\ No newline at end of file
+};
http://git-wip-us.apache.org/repos/asf/incubator-metron/blob/244a5359/metron-ui/lib/modules/pcap.js
----------------------------------------------------------------------
diff --git a/metron-ui/lib/modules/pcap.js b/metron-ui/lib/modules/pcap.js
index c6091a3..5b0a7fc 100644
--- a/metron-ui/lib/modules/pcap.js
+++ b/metron-ui/lib/modules/pcap.js
@@ -1,3 +1,21 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
function readRawBytes(size, transit) {
var buffer = new Buffer(size);
var bytesRead = 0;
http://git-wip-us.apache.org/repos/asf/incubator-metron/blob/244a5359/metron-ui/lib/views/alerts.jade
----------------------------------------------------------------------
diff --git a/metron-ui/lib/views/alerts.jade b/metron-ui/lib/views/alerts.jade
index adfe44f..0f75033 100644
--- a/metron-ui/lib/views/alerts.jade
+++ b/metron-ui/lib/views/alerts.jade
@@ -1,3 +1,21 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
doctype html
html
head
@@ -58,5 +76,4 @@ html
th Last Alert
tbody
//
- <div ng-cloak ng-view></div>
-
+ <div ng-cloak ng-view></div>
http://git-wip-us.apache.org/repos/asf/incubator-metron/blob/244a5359/metron-ui/lib/views/index.jade
----------------------------------------------------------------------
diff --git a/metron-ui/lib/views/index.jade b/metron-ui/lib/views/index.jade
index ed7b9f7..67525e5 100644
--- a/metron-ui/lib/views/index.jade
+++ b/metron-ui/lib/views/index.jade
@@ -1,3 +1,21 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
doctype html
html
head
@@ -40,4 +58,3 @@ html
| {{dashboard.current.title}}
ul.nav.pull-right(ng-controller='dashLoader', ng-init='init()', ng-include='\'app/partials/dashLoader.html\'')
div(ng-cloak='ng-cloak', ng-view='ng-view')
-
http://git-wip-us.apache.org/repos/asf/incubator-metron/blob/244a5359/metron-ui/lib/views/login.jade
----------------------------------------------------------------------
diff --git a/metron-ui/lib/views/login.jade b/metron-ui/lib/views/login.jade
index 6e75959..d76ca9b 100644
--- a/metron-ui/lib/views/login.jade
+++ b/metron-ui/lib/views/login.jade
@@ -1,3 +1,21 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
doctype html
html
head
@@ -27,12 +45,12 @@ html
legend Login
if flash.error
.alert.alert-error=flash.error
- div(class="#{flash.error ? 'control-group error' : 'control-group'}")
+ div(class="#{flash.error ? 'control-group error' : 'control-group'}")
label.control-label(for='inputEmail') Email
.controls
input#inputEmail(type='text', name='email', placeholder='Email')
- div(class="#{flash.error ? 'control-group error' : 'control-group'}")
+ div(class="#{flash.error ? 'control-group error' : 'control-group'}")
label.control-label(for='inputPassword') Password
.controls
input#inputPassword(type='password', name='password', placeholder='Password')
@@ -40,4 +58,4 @@ html
.controls
button.btn(type='submit') Sign in
//
- <div ng-cloak ng-view></div>
+ <div ng-cloak ng-view></div>
http://git-wip-us.apache.org/repos/asf/incubator-metron/blob/244a5359/metron-ui/script/es_fetch
----------------------------------------------------------------------
diff --git a/metron-ui/script/es_fetch b/metron-ui/script/es_fetch
index 59e3027..54c2c5a 100755
--- a/metron-ui/script/es_fetch
+++ b/metron-ui/script/es_fetch
@@ -1,5 +1,23 @@
#!/usr/bin/env node
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
/*
* fetch.js
* A small utility to fetch records from Elasticsearch and save as JSON
http://git-wip-us.apache.org/repos/asf/incubator-metron/blob/244a5359/metron-ui/script/es_gen.js
----------------------------------------------------------------------
diff --git a/metron-ui/script/es_gen.js b/metron-ui/script/es_gen.js
index 785eaa5..2da17fa 100755
--- a/metron-ui/script/es_gen.js
+++ b/metron-ui/script/es_gen.js
@@ -1,12 +1,29 @@
#!/usr/bin/env node
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
/*
* es_gen.js
* A small utility that generates json seed data for Elasticsearch
*
*/
-
var _ = require('lodash');
var Chance = require('chance');
var fs = require('fs');
http://git-wip-us.apache.org/repos/asf/incubator-metron/blob/244a5359/metron-ui/script/es_seed
----------------------------------------------------------------------
diff --git a/metron-ui/script/es_seed b/metron-ui/script/es_seed
index 92e3db8..3fd1ea8 100755
--- a/metron-ui/script/es_seed
+++ b/metron-ui/script/es_seed
@@ -1,4 +1,22 @@
#!/usr/bin/env sh
+#
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements. See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership. The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License. You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+
# Delete all existing indices.
curl -XDELETE 'http://localhost:9200/_all/'
http://git-wip-us.apache.org/repos/asf/incubator-metron/blob/244a5359/metron-ui/script/generate_alert
----------------------------------------------------------------------
diff --git a/metron-ui/script/generate_alert b/metron-ui/script/generate_alert
index ebfaae7..74d3228 100755
--- a/metron-ui/script/generate_alert
+++ b/metron-ui/script/generate_alert
@@ -1,5 +1,23 @@
#!/usr/bin/env node
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
// Script to generate sample alerts
var kafka = require('../lib/modules/kafka')
http://git-wip-us.apache.org/repos/asf/incubator-metron/blob/244a5359/metron-ui/script/ldap_seed
----------------------------------------------------------------------
diff --git a/metron-ui/script/ldap_seed b/metron-ui/script/ldap_seed
index 1318067..b64fd54 100755
--- a/metron-ui/script/ldap_seed
+++ b/metron-ui/script/ldap_seed
@@ -1,4 +1,21 @@
#!/usr/bin/env sh
+#
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements. See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership. The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License. You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
cd /vagrant/seed/ldap
sudo ldapadd -h localhost -p 389 -D 'cn=admin,dc=metron,dc=dev' -w metron -f content.ldif
http://git-wip-us.apache.org/repos/asf/incubator-metron/blob/244a5359/metron-ui/script/migrate
----------------------------------------------------------------------
diff --git a/metron-ui/script/migrate b/metron-ui/script/migrate
index 3a0c781..ac41f13 100755
--- a/metron-ui/script/migrate
+++ b/metron-ui/script/migrate
@@ -1,3 +1,20 @@
#!/usr/bin/env sh
+#
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements. See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership. The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License. You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
./node_modules/db-migrate/bin/db-migrate $@
http://git-wip-us.apache.org/repos/asf/incubator-metron/blob/244a5359/metron-ui/script/parse
----------------------------------------------------------------------
diff --git a/metron-ui/script/parse b/metron-ui/script/parse
index 860bb02..1aab1fe 100755
--- a/metron-ui/script/parse
+++ b/metron-ui/script/parse
@@ -1,5 +1,23 @@
#!/usr/bin/env node
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
var spawn = require('child_process').spawn
, sax = require('sax')
, saxpath = require('saxpath')
http://git-wip-us.apache.org/repos/asf/incubator-metron/blob/244a5359/metron-ui/script/provision
----------------------------------------------------------------------
diff --git a/metron-ui/script/provision b/metron-ui/script/provision
index 70224a4..22ffc52 100755
--- a/metron-ui/script/provision
+++ b/metron-ui/script/provision
@@ -1,4 +1,21 @@
#!/usr/bin/env sh
+#
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements. See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership. The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License. You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
# This file is meant to be executed inside the Vagrant development VM
http://git-wip-us.apache.org/repos/asf/incubator-metron/blob/244a5359/metron-ui/test/metron-ui-test.js
----------------------------------------------------------------------
diff --git a/metron-ui/test/metron-ui-test.js b/metron-ui/test/metron-ui-test.js
index 6118a92..4fd90fe 100644
--- a/metron-ui/test/metron-ui-test.js
+++ b/metron-ui/test/metron-ui-test.js
@@ -1,3 +1,21 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
/* global assert:true */
var assert = require('chai').assert
http://git-wip-us.apache.org/repos/asf/incubator-metron/blob/244a5359/metron-ui/test/session-test.js
----------------------------------------------------------------------
diff --git a/metron-ui/test/session-test.js b/metron-ui/test/session-test.js
index feae4fa..f78a8b7 100644
--- a/metron-ui/test/session-test.js
+++ b/metron-ui/test/session-test.js
@@ -1,3 +1,20 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
/*global assert: true*/
if (!process.env.IN_TRAVIS) {
http://git-wip-us.apache.org/repos/asf/incubator-metron/blob/244a5359/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
new file mode 100644
index 0000000..b2343fc
--- /dev/null
+++ b/pom.xml
@@ -0,0 +1,60 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ Licensed to the Apache Software
+ Foundation (ASF) under one or more contributor license agreements. See the
+ NOTICE file distributed with this work for additional information regarding
+ copyright ownership. The ASF licenses this file to You under the Apache License,
+ Version 2.0 (the "License"); you may not use this file except in compliance
+ with the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software distributed
+ under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES
+ OR CONDITIONS OF ANY KIND, either express or implied. See the License for
+ the specific language governing permissions and limitations under the License.
+ -->
+<!--
+ This exists soley to simplify the execution of apache-rat over the entire
+ code base of Metron.
+ -->
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+ <modelVersion>4.0.0</modelVersion>
+ <groupId>org.apache.metron</groupId>
+ <artifactId>Metron</artifactId>
+ <version>0.1BETA</version>
+ <packaging>pom</packaging>
+ <name>Metron</name>
+ <description>Performs release auditing for Metron.</description>
+ <url>https://metron.incubator.apache.org/</url>
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.rat</groupId>
+ <artifactId>apache-rat-plugin</artifactId>
+ <version>0.11</version>
+ <configuration>
+ <excludes>
+ <exclude>**/README.md</exclude>
+ <exclude>**/VERSION</exclude>
+ <exclude>**/*.json</exclude>
+ <exclude>**/*.log</exclude>
+ <exclude>**/*.ldif</exclude>
+ <exclude>**/*.template</exclude>
+ <exclude>**/.*</exclude>
+ <exclude>**/.*/**</exclude>
+ <exclude>**/*.seed</exclude>
+ <exclude>**/ansible.cfg</exclude>
+ <exclude>site/**</exclude>
+ <exclude>metron-ui/lib/public/**</exclude>
+ <exclude>**/src/main/resources/patterns/**</exclude>
+ <exclude>**/src/main/resources/SampleInput/**</exclude>
+ <exclude>**/dependency-reduced-pom.xml</exclude>
+ <exclude>**/files/opensoc-ui</exclude>
+ </excludes>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+</project>
[4/4] incubator-metron git commit: Merging keys from
https://dist.apache.org/repos/dist/release/incubator/metron/KEYS into the
keys file here.
Posted by ce...@apache.org.
Merging keys from https://dist.apache.org/repos/dist/release/incubator/metron/KEYS into the keys file here.
Project: http://git-wip-us.apache.org/repos/asf/incubator-metron/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-metron/commit/2c793e09
Tree: http://git-wip-us.apache.org/repos/asf/incubator-metron/tree/2c793e09
Diff: http://git-wip-us.apache.org/repos/asf/incubator-metron/diff/2c793e09
Branch: refs/heads/master
Commit: 2c793e099eaae65301632deb9fe9fa1b57594eca
Parents: 244a535
Author: cstella <ce...@gmail.com>
Authored: Mon Feb 22 12:33:25 2016 -0500
Committer: cstella <ce...@gmail.com>
Committed: Mon Feb 22 12:33:25 2016 -0500
----------------------------------------------------------------------
KEYS | 798 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
1 file changed, 798 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-metron/blob/2c793e09/KEYS
----------------------------------------------------------------------
diff --git a/KEYS b/KEYS
index fbaf4fc..c11bcb9 100644
--- a/KEYS
+++ b/KEYS
@@ -69,3 +69,801 @@ Tmk0OCM3VjJkX+6o+skjpstyNsFeeLxXmRA/o/dnGl9RPMC9JLjI2yOPY8ij59IG
DJTwlKI1r7tCTi9aqBUdelijsQqb/jq9XHaDEmMpptA=
=1pMs
-----END PGP PUBLIC KEY BLOCK-----
+pub 4096R/2BFF0BA7 2011-10-21
+ Key fingerprint = 9A77 8304 A52A 5D5D E56E 1491 C8DC 274C 2BFF 0BA7
+uid Billie Jordan Rinaldi (CODE SIGNING KEY) <bi...@apache.org>
+sub 4096R/07ADBA87 2011-10-21
+
+-----BEGIN PGP PUBLIC KEY BLOCK-----
+Version: GnuPG v2.0.19 (FreeBSD)
+
+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
+HD4UEBPia4z3fRNd5wOQm8a2Xp7cbTM=
+=PIT6
+-----END PGP PUBLIC KEY BLOCK-----
+pub 1024D/B876884A 2007-12-24
+ Key fingerprint = 03CC 5FFA 61AA AD3C 8FF2 5E92 70F0 9CC6 B876 884A
+uid Chris Mattmann (CODE SIGNING KEY) <ma...@apache.org>
+sub 2048g/D3B4F350 2007-12-24
+
+-----BEGIN PGP PUBLIC KEY BLOCK-----
+Version: GnuPG v2.0.19 (FreeBSD)
+
+mQGiBEdvL9QRBACuaV06by+pxZHXIxBsfAFYJk7XJgsqR23m5ClCDPusMeaI4XGB
+eU8Nw4iVwgG3p5VLWLXeMIm/KPz3pmxiNyEP/dHoDxOPR+hAqlP5v03D1iK19H7q
+46BIecIwo8q0ei70fBLvMQN+apIFlvYDqVCTm1lxoCQafagqd9p2JtTf+wCg70yM
+nGtrejB+ZTTcb08f7SAHsLED/11vIdcxViN3u+3klhbb99bd/g9KvCU/I/7+MDx1
+3zrSvJV2b2wrxabUJ1Oxsb4/4BXq8A1FyhC1h/d2PsawqiY0GZ02cucbzEmdXH51
+UnrRLM9/txtZ2b7V6YkDmPf0k6rD0SjqAAy1ERekEVUOxnY4sPGmJoyac4j9+pO9
+1vH/A/9LRoJlPTfv/mFYty6/Egckhv48YoRUBo1dNh6IPQY0oVpAFbcXc3GiTyCu
+5iQp7utxP7hoJTUM2Hn5tF9D7IniRC9wsrcW8Gi/f82O4HlmyV4+Tt75nWx018oI
+ObGmwitT27EkOnFcQc9F+Q53nKr+a22SBbpfffF9Xdbkw7V73bQ3Q2hyaXMgTWF0
+dG1hbm4gKENPREUgU0lHTklORyBLRVkpIDxtYXR0bWFubkBhcGFjaGUub3JnPohg
+BBMRAgAgBQJHby/UAhsDBgsJCAcDAgQVAggDBBYCAwECHgECF4AACgkQcPCcxrh2
+iEr8KwCffMIKMu3TBrGZVu1BPLbMBhjsrl8AoI15rg+tzYZZmZJD6tDS40klTsVA
+uQINBEdvL9QQCAClHjwXMu38iDR3nvbYkWmcz5rfBFvDm/KVQGLnnY96C1r890Ir
+cHxAlSpbGb6qPi5n27v87LoS2bYEitqCUUwB7AQLOgqmLvqMJ4qp5HUfTQ/wH9Br
+wK2LX1oGFJXH14lbZ7xW36n9A/JtXHY8vGz3GuDvKYqbdOCFo8fBLwotdFOHhNYy
+bBYS1G4gtmemXwzH8kcuoIW6LuoRNxluHi1tJGFC1F1uBoxKir7F7BC38DDNvhak
+dSJpm3WxFkEEkIUyIERVGVRoFzLlk72W0R3kZVvnXbtgPklTg/2Sy13Gb+MzTBYt
+5TF841neM/kHdgt45EgBhchHN3Ys3ljabihbAAMFB/4ke4Xe573V78UR/WTMUzfw
+pIysMUzEjNKqOfnAoNnR4WDDca4MwIUl62QqGTRrWZxTD8fAGYxc+m0qmygGKtYq
+LUYB5N/pLGu1sg2j23G8aBKthiCCE+jOr3uebU/j0BTzN/BwXCqIGogELFlPC5Tj
+Hr6c8LpkRFIOjVfuYB2TV4o2RfSFzrSFHCbrU82ojxhYSwyqDGAdD6EGtbbqaEMX
+tGZzHaMVm2gDeV9W2veurxOulgndNg2+FXvgUlOa+KZ2J2DxNBcJv1uBtDAWDyR9
+dTgTbK62ZnSjsnRYbgf0HdA+kW9n9XBMEHwgYk0q+doOWUOQFqC84TgrrhyDd1XZ
+iEkEGBECAAkFAkdvL9QCGwwACgkQcPCcxrh2iEplXwCgraY3ELlDStqpJDSUzVsN
+rGuNiwsAoKz92ycEjcMnoLnX8AaPADdo1m/P
+=zEfO
+-----END PGP PUBLIC KEY BLOCK-----
+pub 4096R/3D0C92B9 2010-02-23
+ Key fingerprint = 4766 0BC9 8BC4 33F0 1E5C 9058 1209 E7F1 3D0C 92B9
+uid Owen O'Malley (Code signing) <om...@apache.org>
+uid Owen O'Malley <om...@apache.org>
+sub 4096R/4D654583 2010-02-23
+
+-----BEGIN PGP PUBLIC KEY BLOCK-----
+Version: GnuPG v2.0.19 (FreeBSD)
+
+mQINBEuDfIYBEACqHN0qz+qyglzZVDBqOADk6ljBO09TqplCdLtXUoYyTr7tHBFq
+1tPoBEqiQ5esfk/8Wf/QDnEz0EjWdpekfFxjrW2uIqMHXvSFGMm4bW6ubm7hDw0V
+ZKaZbwT4nx/wgrweoKMRK9HJoJ+PLUvX3kGcZU1WXYU51au1SaCl757uy4hlWOQS
+Mr3Xl8lgbW/OtfDEj/uwO4RZ6apfNx0/4Z8EhKwYOFzkF72hnLWDE7roFcNr03w2
+tT2n6fkWx4vuHJABzznGJHpsdUO7uQnAamIFPu6Ji4wpldhHksyV8aGNIReJQD9F
+zKl2Mm+U1wgrmEn103HHzGsBNTDdP41JD8usJ7WaOrAVkeoaw4Tv4nBP6X3FUF/a
+oTvhry3zPJolIp5PNYiNFX+Pay8yiskL1GbBCBBvzK4FpKOq8rA8y8G0JznnxwX0
+ZbtxZW6y1/M1d5s3oSBYOWndszhK+CQv92LSVdlIckU95i+hgMR74mD6TQ+k7AdF
+Vt0zCdnMa9ADZrptN9+4CurIwhXiH8Gh89Z8uQG3iH3+NpQuEnUqwWGVYNNS/LoQ
+rNuHp174HohkUpKECN3am1ZwpLaz4W+c27eLQBKvFlzii+u4PkIWOAl5fHhfxwvC
+G7RcJI/JO2VPcYF3hEdtN0eqTEvuaY3b/Texc8i5mM7oqQ7BT7HXgqmVgQARAQAB
+tCJPd2VuIE8nTWFsbGV5IDxvbWFsbGV5QGFwYWNoZS5vcmc+iEYEEBECAAYFAkyX
+oRIACgkQ4ip0amjjJ8FaLwCfZDlzXk076Cbhpp83Ert0gJ++nBMAoIfYU59OeeBn
+m4Ai2wLvjr0cGjvPiEYEEBECAAYFAkyaRZYACgkQQXT1Qzsc5s/3YQCZAf3KK0A7
+ptYPA6gOKoF1SYboF/gAnicfSnQcpVpvbtCpfKHmnn/IsvipiEYEEBECAAYFAkya
+ltsACgkQ/xWarXTw6DmVOQCggVs6rrv4c2WWXjutWaDBY0or07cAoMVfFnlmDbMg
+hjWaPjE8vHxzBD5qiEYEEBECAAYFAkydFZgACgkQ269pvqcjnVnRRQCdFM095N1A
+IavRQQ+dPsh6g9P2c1QAn2GA6TDaf+RJIFwjAkL+tXamMUZ3iEYEEBECAAYFAkyd
+KnAACgkQT7lVhUMY9mkMgACaA5fcqzj5v7zgyTPyCua6qNEbXMQAnAwLxfTFnNdI
+iUc7D+Ze4YO7L00xiEYEEBECAAYFAkydk5EACgkQ6VL0WSmesyxwjACgjPkcGbtY
+uzfGK+mzhdLSQrN9mZYAn0HW3yW/15JCO0tjVKZ9A2/zpvlOiEYEEBECAAYFAkyh
+C10ACgkQXkPKua7Hfq+aigCeImOGyTqFr+QifxVzx57fgfFAbX8AoMb4TNeysXfS
+UV4orGA9l7k9njyOiIAEEBECAEAFAkzTeLE5HEx1Y2lhbm8gUmVzZW5kZSAoQ29k
+ZSBTaWduaW5nIEtleSkgPGxyZXNlbmRlQGFwYWNoZS5vcmc+AAoJEPOfGH3vtV3x
+ZlcAn109OW6wYzQBPAYJfp/pGXwszRZCAJ92uzJqPNIiZPcXAhiFOiXYTAO1T4jK
+BBARAgCKBQJM0rRDHxxKaW0gSmFnaWVsc2tpIDxqaW1AYXBhY2hlLm9yZz4gHEpp
+bSBKYWdpZWxza2kgPGppbUBqYWd1TkVULmNvbT4fHEppbSBKYWdpZWxza2kgPGpp
+bUBqaW1qYWcuY29tPiIcSmltIEphZ2llbHNraSA8amltakBjb3ZhbGVudC5uZXQ+
+AAoJEIs6YB8IyXXl1gcAn1RysWyH6RK++8sJ4bQdEULqCje0AKCYLePOk/Eipc62
+bL0gvsACFF0qDokBHAQQAQIABgUCTJpxxAAKCRDfD1u8MM0JliLbCACS62aPoX8U
+P44mhkyG+UfDtRHCB1w1qGmmwSzOSlMn7Rb3OTnkkOrQ3Oq8YXSXAmO9r1jamG35
+l6O6VGOYvTb60oVL/LWLqWT/mSbHvuIX8mv8pv9C9LRl4cdTCMfTcTI2OF/IrCr9
+FfBb2NmehyCU+HxHfsHCLetgqxm9t8axX+UYOqzb5BiObQO7dY4TzPcOKFH1NNcF
+63VU/2wZN0aZf8su6eUYheWK3qnPbj6E6nSrkgAzpvNrpQnKVHXQeHb/SSxJ4hqi
+fXi+4pzBB0skhyDSTMUQYiP1pUsJxkfzEav7NYbbVshFOiFEH/FT0eivuwLi5n0i
+GcIGa/RwF0mAiQIcBBABAgAGBQJMmpajAAoJEMWTKX3eNP6ge+YP/iAmZLm3G1KR
+8QKTMfyP+Kv7/p7KmyOxaBTdM7aCegr+F8s6tc6/gO6GHGT0kDvyDCUDe1+/WFRZ
+3FQgXBojoRR8rG7flCkGmQYKW4oUjsL3o/RPayG7E33pWqQMyeZwiKHJ/rWSMYD0
+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
+N/F2Z8nYYqc7eUUg2wv3WNnqBEc60W+k0tzI9uZGWvmmLk26WnDGzyOckfQmBT4W
+49Awfs2JLaT0nsmPWJd7VAt5Q76W6M8GpnT5BM1ew2AAzZRKNU6hjMNyHNnCDqWb
+DKR7OyMKATJVA1r8aoJHl9WvMQzsSkgCjfNvVi1K9gUJxlWaFHmGaJi+KhmQ7Qgh
+iBUmEMsdcfwVD4kCWgQQAQIARAUCTNK42D0cQW50b2luZSBMZXZ5LUxhbWJlcnQg
+KENPREUgU0lHTklORyBLRVkpIDxhbnRvaW5lQGFwYWNoZS5vcmc+AAoJEF762f6C
+p/vNY8cP/1grsGTGy5kCP/Srgw0eDcbRAHAIxljSUWwZ7GFy+OQmSghyMjDmp85L
+Ch7BBpbeCvyI+nUbcVqnrmUje+7v9bKPxUoNxmC9jx7zzop6PM2yj9U/2/77PA/O
+ZyIosXJvvwexS1plPzWS/Nh/9J84GEpUMYbgMT1OgUSbjUvQEJOKrevkYIq+GOS3
+68HoWHLm9W2iWGf/6+V4D+msVSEohfdHz4goxzh//Gf9q8Kh4Rri9MDbqM5rtQ3w
+1CB2JBZtH3UI0Jwd1IgMqIsyusL/cBh6OIIisA22XkM+WvXc/ZBgO5IZ71WawNhD
+1/3T4NxAE+yGQCEJru/TBaIU00nT9EmkbcBEfuj5BJUFoZXbWYObcGHoOr0qU5ZN
+PnY8W3JY3DYh16T/7pKsBzpBRaWxoXMmkNje+bs1Td6EV1WNjpkgyu338pp9nyS3
+nyTtoCrYMOwkLFKRDsAUZoQ7vWz+TVysTJOr/EgSG9BmHBLkmn9xZYuWysVvJIiC
+DR3FQ1G75KIFNDgxYaLKKgDJE2MIio7uEotbpBRBNDQjOtgUyDIhyIxUPZVRRo+m
+nabPm0ybehtY6IGZsbu2ODOOYMpGJGa7CG/zi6RWrfrC5om6SEmQXcf5AxixsHQ6
+P3+9lnead1tHJPx+txgB4WSuIRl52qNxsHQH6muivlSl5rc1ZTHtiQJ9BBABAgBn
+BQJM0r4VIRxEYW4gUG9pcmllciA8cG9pcmllckBhcGFjaGUub3JnPiAcRGFuIFBv
+aXJpZXIgPHBvaXJpZXJAcG9ib3guY29tPh0cRGFuIFBvaXJpZXIgPGRhbkBwb2ly
+aWVyLnVzPgAKCRCc+isBYrKWP4CAEADBx5wFHrSPqqZ9DNTrDJ0m5Zhj2FHm5Cvd
+oblqPtkVkoPKmLOu4Revju5znTwNkieknlwyfi5ft7brIk++OSzS5mhSe9YUljXE
+GjQVeoVDFZMbQyyGBTFrhGosHMVL0oZIy5zOpxVFQCgiFZ4N2PVuMw6jAUqy/t/6
+2xDqD+PUNszdQKV3sVMFTpKbI68D5d2BTrFob+D+PA3mnitPMuwTVWQBsb8k8XJi
+UwdSWP/IyxmOoYGTzO7CAx5MifR0Bh/WPcQIlvMpmZEk8ahn8Kv0YJXkTCKEm3eQ
+9bOPz2TbJ9g637UycbepIueSs2EeOMSCS7U96K7C+rOh1f2KFT7vGGNkKhyVahDF
+daZ2sYhcQolk8Jlss0YisqUpzvwOBIrnG9OzHcUFjgmyFaoeqMdRyx7zPMOH2CSz
+oRDwCadMTrubzEeVidmLM/pkdiRiJlF+poJKPHg3WQpJhv4BSie4IUznmaPN9aej
++eWSYnNtrArl+yFQQF5sXCDsbRKQFSFNvKCCe9KeQhC0j77qFF6KXDfbiQuLkcP3
+pxCPavcKs+56cLLeC1p5s/JQdBXZenb91nIQdcaAQSRxrEi4syPvzsx1FGW5fLEn
+BU3FIdjURPBkQjx4BSfk97IrA3uMj0jFLNEu7DReb62RZRYoRoFT/SuyfgWFwWMG
+utpjQSwKfYkCkwQQAQIAfQUCTNK0KDUcSmltIEphZ2llbHNraSAoUmVsZWFzZSBT
+aWduaW5nIEtleSkgPGppbUBhcGFjaGUub3JnPiAcSmltIEphZ2llbHNraSA8amlt
+QGphZ3VORVQuY29tPh8cSmltIEphZ2llbHNraSA8amltQGppbWphZy5jb20+AAoJ
+EDTqduZ5FIWoSZYQAMQZgxpABfRCEePA7LIbT4UYseHecMyJR0HabvHdrDszpiW1
++K02vMP7zhGKKj5pu5qcDgSpKTq07WkxhLCpzTo6ooMf9il/Tt2eNz7nUUobig7r
+rt9dMAG00DDFhBtxY4TjbmeGNiMyHkvptZ+15U1CnVMCGht0eo7PhqkPQ+HLagOy
+ceQ5FRT66hI/LxDDAK5v/c0H4yLPqo8ZSYU1sZb3M5qOY1TtuDqsOSZLBy21YGJD
+18OQEebFbUn/3abcGX/gv4V4aE4Jr/ILVfQ3e0wwp/0SSy1fn0T4S2EpPJK2+RJH
+vMh6nY5Jf8kHK3qj8ixUFcSowNh4mlj6u7S5UNVsreZIkWkKa/boRsCrTYvTMbl8
+P5kB9OEziOw+xyg5xOsVBzs34e7gUoHwr7x5XpFzhzQp0ToRxZOsjgkkkTfwyCxC
+bWY2Jo49EUmTA+x86QYRB8fADn69pkaCY2Ye04pv3mruk542Vt1OCwMjcrFrOmJu
+ss4JSH4Qxskbxz2DHd+pLFmvzfC9nzCkW2AKN6idTlO14kKqLzJMyTHgpycBX8l/
+uxVKsKU4CHpzjt0aNYCmX1TZHiyzLAoIQuHDIvf7wTxvKpE+gvIlUo0wnGQnrR19
+8qQUUrUldM0NCxhUdHkLtpi82qLHN1RF2gSUrrhU6MNSMCZo+GD6D/yfZqK3iQKp
+BBABAgCTBQJM0uOyIBxTYW5kZXIgVGVtbWUgPHNhbmRlckB0ZW1tZS5uZXQ+IhxT
+YW5kZXIgVGVtbWUgPHNjdGVtbWVAYXBhY2hlLm9yZz4dHFNhbmRlciBUZW1tZSA8
+c2FuZGVyQG1lLmNvbT4qHFNhbmRlciBUZW1tZSA8c2N0ZW1tZUBrZXlzaW50aGVj
+bG91ZC5jb20+AAoJEJu4Y7D1G7iKFCwQALD6D/gF/rUxUPVM8xCbnrz/crOESWyK
+oWsTHSxZ0HL4wi5Syd4W+Xi61jsc09xN970rcVxCpZBK/143pVUGKQj/tb8g5kmm
+VOU3vpgNj3xllCViCrW4CaEoPvg4VDgpmSr10vNq6tlLa5HKzLaaJc3msDX5laiG
+y451IK/4kE3F1k71v/XU2l35JWIhqM/qRHvbb5VMCD+uH9LZnbea91BvlDkQhDtF
+gXJL8SkSdDa12+oNdm5fWqlec1Kw30avY+q1KNYyS5hCV8BqdWckmtJO+RabT6nD
+ccs7Sewt1BIPop0dde11K8JNtLBYUUnwTpVnvNtPtlWJpbIZmyeZxiZecnBL5Cso
+9nt8PwmyDr2SklRU6B3VYpgNQ+M93cGNO2j/r5d3OjFxO6ZyHIyf1ihmjwxcA2pS
+VuPOCIZf48OpPVKuKSUwu6hmWaB0+S+nXx56ZTCPnnb5Ovi+44M/zI341L8/NPXr
+wvF29z67tWw3kga1/pVQlrRLrhniBCfOKPShSHqv02o5QLX5aQl6LRpYtuzU5Ia1
+7lFgD5GCFc8OqCYgGoPCAeJzSQBp/2xLzon3M0oSNXanvCw4ZOPbDLJA4JubArT2
+ojrfYDnLAWWUbQ766mfkwWzCcSCedbagL/hGkFL6wK3+j2K/KyJVFyBC833k+wdP
+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
+kwPsfOkGEQfHwA5+vaZGgmNmHtOKb95q7pOeNlbdTgsDI3KxazpibrLOCUh+EMbJ
+G8c9gx3fqSxZr83wvZ8wpFtgCjeonU5TteJCqi8yTMkx4KcnAV/Jf7sVSrClOAh6
+c47dGjWApl9U2R4ssywKCELhwyL3+8E8byqRPoLyJVKNMJxkJ60dffKkFFK1JXTN
+DQsYVHR5C7aYvNqixzdURdoElK64VOjDUjAmaPhg+g/8n2ait4kCqQQQAQIAkwUC
+TNLjsiAcU2FuZGVyIFRlbW1lIDxzYW5kZXJAdGVtbWUubmV0PiIcU2FuZGVyIFRl
+bW1lIDxzY3RlbW1lQGFwYWNoZS5vcmc+HRxTYW5kZXIgVGVtbWUgPHNhbmRlckBt
+ZS5jb20+KhxTYW5kZXIgVGVtbWUgPHNjdGVtbWVAa2V5c2ludGhlY2xvdWQuY29t
+PgAKCRCbuGOw9Ru4ihQsEACw+g/4Bf61MVD1TPMQm568/3KzhElsiqFrEx0sWdBy
++MIuUsneFvl4utY7HNPcTfe9K3FcQqWQSv9eN6VVBikI/7W/IOZJplTlN76YDY98
+ZZQlYgq1uAmhKD74OFQ4KZkq9dLzaurZS2uRysy2miXN5rA1+ZWohsuOdSCv+JBN
+xdZO9b/11Npd+SViIajP6kR722+VTAg/rh/S2Z23mvdQb5Q5EIQ7RYFyS/EpEnQ2
+tdvqDXZuX1qpXnNSsN9Gr2PqtSjWMkuYQlfAanVnJJrSTvkWm0+pw3HLO0nsLdQS
+D6KdHXXtdSvCTbSwWFFJ8E6VZ7zbT7ZViaWyGZsnmcYmXnJwS+QrKPZ7fD8Jsg69
+kpJUVOgd1WKYDUPjPd3BjTto/6+XdzoxcTumchyMn9YoZo8MXANqUlbjzgiGX+PD
+qT1SriklMLuoZlmgdPkvp18eemUwj552+Tr4vuODP8yN+NS/PzT168Lxdvc+u7Vs
+N5IGtf6VUJa0S64Z4gQnzij0oUh6r9NqOUC1+WkJei0aWLbs1OSGte5RYA+RghXP
+DqgmIBqDwgHic0kAaf9sS86J9zNKEjV2p7wsOGTj2wyyQOCbmwK09qI632A5ywFl
+lG0O+upn5MFswnEgnnW2oC/4RpBS+sCt/o9ivysiVRcgQvN95PsHTyuiXQGzZLCt
+AokCHAQQAQIABgUCTdKhJwAKCRCvWOgihyL4vfOaD/wO2i1sCFJLgTj2jyg3IKlK
+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
+daM2CBmwLsXiMVBmxmGEGg==
+=cDbo
+-----END PGP PUBLIC KEY BLOCK-----
+pub 2048R/C36C5F0F 2011-11-01
+ Key fingerprint = 6AE7 0A2A 38F4 66A5 D683 F939 255A DF56 C36C 5F0F
+uid Vinod Kumar Vavilapalli (I am also known as @tshooter.) <vi...@apache.org>
+sub 2048R/DE206A91 2011-11-01
+
+-----BEGIN PGP PUBLIC KEY BLOCK-----
+Version: GnuPG v2.0.19 (FreeBSD)
+
+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
+AiA08+hW7GN6cBU3ahHYy/AO7iZiAZK+
+=LPUs
+-----END PGP PUBLIC KEY BLOCK-----
[3/4] incubator-metron git commit: METRON-41 Integrate Apache Rat to
Audit Source Code Licensing (nickwallen via cestella) closes
apache/incubator-metron#27
Posted by ce...@apache.org.
METRON-41 Integrate Apache Rat to Audit Source Code Licensing (nickwallen via cestella) closes apache/incubator-metron#27
Project: http://git-wip-us.apache.org/repos/asf/incubator-metron/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-metron/commit/244a5359
Tree: http://git-wip-us.apache.org/repos/asf/incubator-metron/tree/244a5359
Diff: http://git-wip-us.apache.org/repos/asf/incubator-metron/diff/244a5359
Branch: refs/heads/master
Commit: 244a5359b2333e4e5ab81dc64098affb2beed26f
Parents: bab4d3e
Author: nickwallen <ni...@nickallen.org>
Authored: Mon Feb 22 12:33:03 2016 -0500
Committer: cstella <ce...@gmail.com>
Committed: Mon Feb 22 12:33:03 2016 -0500
----------------------------------------------------------------------
bro-plugin-kafka/CHANGES | 17 ++
bro-plugin-kafka/CMakeLists.txt | 18 ++
bro-plugin-kafka/src/kafka.bif | 17 ++
bro-plugin-kafka/tests/btest.cfg | 17 ++
bro-plugin-kafka/tests/kafka/show-plugin.bro | 17 ++
.../inventory/metron_example/group_vars/all | 18 ++
deployment/inventory/metron_example/hosts | 20 +-
.../inventory/singlenode-vagrant/group_vars/all | 18 ++
deployment/inventory/singlenode-vagrant/hosts | 19 +-
.../elasticsearch/files/elasticsearch.repo | 20 +-
deployment/roles/pcap_replay/files/pcap-replay | 18 ++
deployment/roles/snort/files/snort.conf | 32 +--
metron-streaming/Metron-Alerts/README.md | 104 +++++++
.../Metron-Alerts/pom.xml.versionsBackup | 99 -------
metron-streaming/Metron-Alerts/readme.md | 104 -------
.../resources/config/AllAlertAdapterTest.config | 19 +-
.../Metron-Common/pom.xml.versionsBackup | 131 ---------
.../org/apache/metron/ise/parser/ISEParser.jj | 4 +-
.../config/BasicTldExtractorTest.config | 18 ++
.../Metron-DataLoads/pom.xml.versionsBackup | 97 -------
.../src/main/assembly/assembly.xml | 13 +
metron-streaming/Metron-DataServices/README.md | 17 +-
.../Metron-DataServices/conf/config.properties | 20 +-
.../main/resources/config-definition-hbase.xml | 28 +-
.../resources/hbase-config-default.properties | 19 +-
.../src/main/resources/log4j.xml | 38 ++-
.../src/main/resources/webroot/logged_in.jsp | 28 +-
.../src/main/resources/webroot/login_failed.jsp | 26 +-
.../src/main/resources/webroot/login_old.jsp | 31 ++-
.../src/main/resources/webroot/withsocket.jsp | 64 +++--
.../src/main/resources/webroot/withsocket2.jsp | 50 ++--
.../src/main/resources/webroot/withsocket3.jsp | 64 +++--
.../Metron-EnrichmentAdapters/README.md | 125 +++++++++
.../pom.xml.versionsBackup | 136 ----------
.../Metron-EnrichmentAdapters/readme.md | 125 ---------
.../Metron-FlumeConfigs/SampleFlumeConf.rtf | 43 ---
metron-streaming/Metron-Indexing/README.md | 61 +++++
.../Metron-Indexing/pom.xml.versionsBackup | 91 -------
metron-streaming/Metron-Indexing/readme.md | 61 -----
.../Metron-MessageParsers/README.md | 82 ++++++
.../pom.xml.versionsBackup | 74 -----
.../Metron-MessageParsers/readme.md | 82 ------
.../config/BasicFireEyeParserTest.config | 18 ++
.../resources/config/BasicIseParserTest.config | 18 ++
.../config/BasicLancopeParserTest.config | 18 ++
.../BasicPaloAltoFirewallParserTest.config | 18 ++
.../config/BasicSourcefireParserTest.config | 18 ++
.../test/resources/config/BroParserTest.config | 18 ++
.../resources/config/GrokAsaParserTest.config | 18 ++
.../Metron-Pcap_Service/pom.xml.versionsBackup | 268 -------------------
.../main/resources/config-definition-hbase.xml | 28 +-
metron-streaming/Metron-Topologies/README.md | 39 +++
.../Metron-Topologies/pom.xml.versionsBackup | 190 -------------
metron-streaming/Metron-Topologies/readme.md | 39 ---
.../etc/whitelists/known_hosts.conf | 19 +-
.../resources/TopologyConfigs_old/lancope.conf | 20 +-
metron-streaming/README.md | 30 +++
metron-streaming/pom.xml | 44 +--
metron-streaming/pom.xml.versionsBackup | 104 -------
metron-streaming/readme.md | 13 -
metron-ui/Gruntfile.js | 18 ++
metron-ui/Makefile | 18 +-
metron-ui/Vagrantfile | 17 ++
metron-ui/examples/pcap-panel/pcap-parse.html | 27 +-
metron-ui/examples/server/nginx.conf | 17 ++
metron-ui/index.js | 18 ++
metron-ui/lib/metron-ui.js | 18 ++
metron-ui/lib/modules/es-proxy.js | 18 ++
metron-ui/lib/modules/login.js | 20 +-
metron-ui/lib/modules/pcap.js | 18 ++
metron-ui/lib/views/alerts.jade | 21 +-
metron-ui/lib/views/index.jade | 19 +-
metron-ui/lib/views/login.jade | 24 +-
metron-ui/script/es_fetch | 18 ++
metron-ui/script/es_gen.js | 19 +-
metron-ui/script/es_seed | 18 ++
metron-ui/script/generate_alert | 18 ++
metron-ui/script/ldap_seed | 17 ++
metron-ui/script/migrate | 17 ++
metron-ui/script/parse | 18 ++
metron-ui/script/provision | 17 ++
metron-ui/test/metron-ui-test.js | 18 ++
metron-ui/test/session-test.js | 17 ++
pom.xml | 60 +++++
84 files changed, 1669 insertions(+), 1826 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-metron/blob/244a5359/bro-plugin-kafka/CHANGES
----------------------------------------------------------------------
diff --git a/bro-plugin-kafka/CHANGES b/bro-plugin-kafka/CHANGES
index e69de29..3df60b0 100644
--- a/bro-plugin-kafka/CHANGES
+++ b/bro-plugin-kafka/CHANGES
@@ -0,0 +1,17 @@
+#
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements. See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership. The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License. You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
http://git-wip-us.apache.org/repos/asf/incubator-metron/blob/244a5359/bro-plugin-kafka/CMakeLists.txt
----------------------------------------------------------------------
diff --git a/bro-plugin-kafka/CMakeLists.txt b/bro-plugin-kafka/CMakeLists.txt
index 27bf7f3..f578eb2 100644
--- a/bro-plugin-kafka/CMakeLists.txt
+++ b/bro-plugin-kafka/CMakeLists.txt
@@ -1,3 +1,21 @@
+#
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements. See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership. The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License. You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+
cmake_minimum_required(VERSION 2.8)
project(Plugin)
include(BroPlugin)
http://git-wip-us.apache.org/repos/asf/incubator-metron/blob/244a5359/bro-plugin-kafka/src/kafka.bif
----------------------------------------------------------------------
diff --git a/bro-plugin-kafka/src/kafka.bif b/bro-plugin-kafka/src/kafka.bif
index fef24b8..a95937f 100644
--- a/bro-plugin-kafka/src/kafka.bif
+++ b/bro-plugin-kafka/src/kafka.bif
@@ -1,3 +1,20 @@
+#
+# Licensed to the Apache Software Foundation (ASF) under one or more
+# contributor license agreements. See the NOTICE file distributed with
+# this work for additional information regarding copyright ownership.
+# The ASF licenses this file to You under the Apache License, Version 2.0
+# (the "License"); you may not use this file except in compliance with
+# the License. You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+
module Kafka;
const kafka_broker_list: string;
http://git-wip-us.apache.org/repos/asf/incubator-metron/blob/244a5359/bro-plugin-kafka/tests/btest.cfg
----------------------------------------------------------------------
diff --git a/bro-plugin-kafka/tests/btest.cfg b/bro-plugin-kafka/tests/btest.cfg
index 0578397..e42fefd 100644
--- a/bro-plugin-kafka/tests/btest.cfg
+++ b/bro-plugin-kafka/tests/btest.cfg
@@ -1,3 +1,20 @@
+#
+# Licensed to the Apache Software Foundation (ASF) under one or more
+# contributor license agreements. See the NOTICE file distributed with
+# this work for additional information regarding copyright ownership.
+# The ASF licenses this file to You under the Apache License, Version 2.0
+# (the "License"); you may not use this file except in compliance with
+# the License. You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+
[btest]
TestDirs = kafka
TmpDir = %(testbase)s/.tmp
http://git-wip-us.apache.org/repos/asf/incubator-metron/blob/244a5359/bro-plugin-kafka/tests/kafka/show-plugin.bro
----------------------------------------------------------------------
diff --git a/bro-plugin-kafka/tests/kafka/show-plugin.bro b/bro-plugin-kafka/tests/kafka/show-plugin.bro
index aef2c26..b305382 100644
--- a/bro-plugin-kafka/tests/kafka/show-plugin.bro
+++ b/bro-plugin-kafka/tests/kafka/show-plugin.bro
@@ -1,2 +1,19 @@
+#
+# Licensed to the Apache Software Foundation (ASF) under one or more
+# contributor license agreements. See the NOTICE file distributed with
+# this work for additional information regarding copyright ownership.
+# The ASF licenses this file to You under the Apache License, Version 2.0
+# (the "License"); you may not use this file except in compliance with
+# the License. You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+
# @TEST-EXEC: bro -NN Metron::Kafka >output
# @TEST-EXEC: btest-diff output
http://git-wip-us.apache.org/repos/asf/incubator-metron/blob/244a5359/deployment/inventory/metron_example/group_vars/all
----------------------------------------------------------------------
diff --git a/deployment/inventory/metron_example/group_vars/all b/deployment/inventory/metron_example/group_vars/all
index c6e7aab..a8b5bff 100644
--- a/deployment/inventory/metron_example/group_vars/all
+++ b/deployment/inventory/metron_example/group_vars/all
@@ -1,3 +1,21 @@
+#
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements. See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership. The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License. You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+
# metron variables
metron_version: 0.1BETA
java_home: /usr/jdk64/jdk1.8.0_40
http://git-wip-us.apache.org/repos/asf/incubator-metron/blob/244a5359/deployment/inventory/metron_example/hosts
----------------------------------------------------------------------
diff --git a/deployment/inventory/metron_example/hosts b/deployment/inventory/metron_example/hosts
index 92160bc..2aa75cc 100644
--- a/deployment/inventory/metron_example/hosts
+++ b/deployment/inventory/metron_example/hosts
@@ -1,3 +1,21 @@
+#
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements. See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership. The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License. You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+
[ambari_master]
host
@@ -17,4 +35,4 @@ host ansible_ssh_private_key_file=path_to_key_file ansible_ssh_user=user
host ansible_ssh_private_key_file=path_to_key_file ansible_ssh_user=user
[sensors]
-host ansible_ssh_private_key_file=path_to_key_file ansible_ssh_user=user
\ No newline at end of file
+host ansible_ssh_private_key_file=path_to_key_file ansible_ssh_user=user
http://git-wip-us.apache.org/repos/asf/incubator-metron/blob/244a5359/deployment/inventory/singlenode-vagrant/group_vars/all
----------------------------------------------------------------------
diff --git a/deployment/inventory/singlenode-vagrant/group_vars/all b/deployment/inventory/singlenode-vagrant/group_vars/all
index 0135acc..79f2d07 100644
--- a/deployment/inventory/singlenode-vagrant/group_vars/all
+++ b/deployment/inventory/singlenode-vagrant/group_vars/all
@@ -1,3 +1,21 @@
+#
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements. See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership. The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License. You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+
# metron variables
metron_version: 0.1BETA
java_home: /usr/jdk64/jdk1.8.0_40
http://git-wip-us.apache.org/repos/asf/incubator-metron/blob/244a5359/deployment/inventory/singlenode-vagrant/hosts
----------------------------------------------------------------------
diff --git a/deployment/inventory/singlenode-vagrant/hosts b/deployment/inventory/singlenode-vagrant/hosts
index 379bdd7..cc31bb1 100644
--- a/deployment/inventory/singlenode-vagrant/hosts
+++ b/deployment/inventory/singlenode-vagrant/hosts
@@ -1,3 +1,20 @@
+#
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements. See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership. The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License. You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
[ambari_master]
node1
@@ -17,4 +34,4 @@ node1
node1
[sensors]
-node1
\ No newline at end of file
+node1
http://git-wip-us.apache.org/repos/asf/incubator-metron/blob/244a5359/deployment/roles/elasticsearch/files/elasticsearch.repo
----------------------------------------------------------------------
diff --git a/deployment/roles/elasticsearch/files/elasticsearch.repo b/deployment/roles/elasticsearch/files/elasticsearch.repo
index ed299b4..e0e4d27 100644
--- a/deployment/roles/elasticsearch/files/elasticsearch.repo
+++ b/deployment/roles/elasticsearch/files/elasticsearch.repo
@@ -1,6 +1,24 @@
+#
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements. See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership. The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License. You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+
[elasticsearch-1.7]
name=Elasticsearch repository for 1.7.x packages
baseurl=http://packages.elastic.co/elasticsearch/1.7/centos
gpgcheck=1
gpgkey=http://packages.elastic.co/GPG-KEY-elasticsearch
-enabled=1
\ No newline at end of file
+enabled=1
http://git-wip-us.apache.org/repos/asf/incubator-metron/blob/244a5359/deployment/roles/pcap_replay/files/pcap-replay
----------------------------------------------------------------------
diff --git a/deployment/roles/pcap_replay/files/pcap-replay b/deployment/roles/pcap_replay/files/pcap-replay
index 074406d..912b7dc 100644
--- a/deployment/roles/pcap_replay/files/pcap-replay
+++ b/deployment/roles/pcap_replay/files/pcap-replay
@@ -1,8 +1,26 @@
#!/usr/bin/env bash
+#
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements. See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership. The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License. You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
# pcap replay daemon
# chkconfig: 345 20 80
# description: Replays packet capture data stored in libpcap format
# processname: pcap-replay
+#
DAEMON_PATH="/opt/pcap-replay"
PCAPIN=`ls $DAEMON_PATH/*.pcap 2> /dev/null`
http://git-wip-us.apache.org/repos/asf/incubator-metron/blob/244a5359/deployment/roles/snort/files/snort.conf
----------------------------------------------------------------------
diff --git a/deployment/roles/snort/files/snort.conf b/deployment/roles/snort/files/snort.conf
index 35757c3..260d0a4 100644
--- a/deployment/roles/snort/files/snort.conf
+++ b/deployment/roles/snort/files/snort.conf
@@ -1,26 +1,20 @@
-#--------------------------------------------------
-# VRT Rule Packages Snort.conf
#
-# For more information visit us at:
-# http://www.snort.org Snort Website
-# http://vrt-blog.snort.org/ Sourcefire VRT Blog
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements. See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership. The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License. You may obtain a copy of the License at
#
-# Mailing list Contact: snort-sigs@lists.sourceforge.net
-# False Positive reports: fp@sourcefire.com
-# Snort bugs: bugs@snort.org
+# http://www.apache.org/licenses/LICENSE-2.0
#
-# Compatible with Snort Versions:
-# VERSIONS : 2.9.6.2
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
#
-# Snort build options:
-# OPTIONS : --enable-gre --enable-mpls --enable-targetbased --enable-ppm --enable-perfprofiling --enable-zlib --enable-active-response --enable-normalizer --enable-reload --enable-react --enable-flexresp3
-#
-# Additional information:
-# This configuration file enables active response, to run snort in
-# test mode -T you are required to supply an interface -i <interface>
-# or test mode will fail to fully validate the configuration and
-# exit with a FATAL error
-#--------------------------------------------------
###################################################
# This file contains a sample snort configuration.
http://git-wip-us.apache.org/repos/asf/incubator-metron/blob/244a5359/metron-streaming/Metron-Alerts/README.md
----------------------------------------------------------------------
diff --git a/metron-streaming/Metron-Alerts/README.md b/metron-streaming/Metron-Alerts/README.md
new file mode 100644
index 0000000..2b87d50
--- /dev/null
+++ b/metron-streaming/Metron-Alerts/README.md
@@ -0,0 +1,104 @@
+#Metron-Alerts
+
+##Module Description
+
+This module enables telemetry alerts. It splits the mssage stream into two streams. The original message is emitted on the "message" stream. The corresponding alert is emitted on the "alerts" stream. The two are tied together through the alerts UUID.
+
+##Message Format
+
+Assuming the original message (with enrichments enabled) has the following format:
+
+```json
+{
+"message":
+{"ip_src_addr": xxxx,
+"ip_dst_addr": xxxx,
+"ip_src_port": xxxx,
+"ip_dst_port": xxxx,
+"protocol": xxxx,
+"timestamp": xxxx.
+"original_string": xxxx,
+"additional-field 1": xxxx,
+},
+"enrichment" : {"geo": xxxx, "whois": xxxx, "hosts": xxxxx, "CIF": "xxxxx"}
+
+}
+```
+
+The telemetry message will be tagged with a UUID alert tag like so:
+
+```json
+{
+"message":
+{"ip_src_addr": xxxx,
+"ip_dst_addr": xxxx,
+"ip_src_port": xxxx,
+"ip_dst_port": xxxx,
+"protocol": xxxx,
+"timestamp": xxxx,
+"original_string": xxxx,
+"additional-field 1": xxxx,
+},
+"enrichment" : {"geo": xxxx, "whois": xxxx, "hosts": xxxxx, "CIF": "xxxxx"},
+"alerts": [UUID1, UUID2, UUID3, etc]
+
+}
+```
+
+The alert will be fired on the "alerts" stream and can be customized to have any format as long as it includes the required mandatory fields. The mandatory fields are:
+
+* timestamp (epoch): The time from the message that triggered the alert
+* description: A human friendly string representation of the alert
+* alert_id: The UUID generated for the alert. This uniquely identifies an alert
+
+There are other standard but not mandatory fields that can be leveraged by metron-ui and other alert consumers:
+
+* designated_host: The IP address that corresponds to an asset. Ex. The IP address of the company device associated with the alert.
+* enrichment: A copy of the enrichment data from the message that triggered the alert
+* priority: The priority of the alert. Mustb e set to one of HIGH, MED or LOW
+
+An example of an alert with all mandatory and standard fields would look like so:
+
+```json
+{
+"timestamp": xxxx,
+"alert_id": UUID,
+"description": xxxx,
+"designated_host": xxxx,
+"enrichment": { "geo": xxxx, "whois": xxxx, "cif": xxxx },
+"priority": "MED"
+}
+```
+
+##Alerts Bolt
+
+The bolt can be extended with a variety of alerts adapters. The ability to stack alerts is currently in beta, but is not currently advisable. We advice to only have one alerts bolt per topology. The adapters are rules-based adapters which fire alerts when rules are a match. Currently only Java adapters are provided, but there are future plans to provide Grok-Based adapters as well.
+
+The signature of the Alerts bolt is as follows:
+
+```
+TelemetryAlertsBolt alerts_bolt = new TelemetryAlertsBolt()
+.withIdentifier(alerts_identifier).withMaxCacheSize(1000)
+.withMaxTimeRetain(3600).withAlertsAdapter(alerts_adapter)
+.withMetricConfiguration(config);
+```
+Identifier - JSON key where the alert is attached
+TimeRetain & MaxCacheSize - Caching parameters for the bolt
+MetricConfiguration - export custom bolt metrics to graphite (if not null)
+AlertsAdapter - pick the appropriate adapter for generating the alerts
+
+### Java Adapters
+
+Java adapters are designed for high volume topologies, but are not easily extensible. The adapters provided are:
+
+* org.apache.metron.alerts.adapters.AllAlertsAdapter - will tag every single message with the static alert (appropriate for topologies like Sourcefire, etc, where every single message is an alert)
+* org.apache.metron.alerts.adapters.HbaseWhiteAndBlacklistAdapter - will read white and blacklists from HBase and fire alerts if source or dest IP are not on the whitelist or if any IP is on the blacklist
+* org.apache.metron.alerts.adapters.CIFAlertsAdapter - will alert on messages that have results in enrichment.cif.
+* org.apache.metron.alerts.adpaters.KeywordsAlertAdapter - will alert on messages that contain any of a list of keywords
+###Grok Adapters
+
+Grok alerts adapters for Metron are still under devleopment
+
+###Stacking Alert Adapters
+
+The functionality to stack alerts adapters is still under development
http://git-wip-us.apache.org/repos/asf/incubator-metron/blob/244a5359/metron-streaming/Metron-Alerts/pom.xml.versionsBackup
----------------------------------------------------------------------
diff --git a/metron-streaming/Metron-Alerts/pom.xml.versionsBackup b/metron-streaming/Metron-Alerts/pom.xml.versionsBackup
deleted file mode 100644
index 3530449..0000000
--- a/metron-streaming/Metron-Alerts/pom.xml.versionsBackup
+++ /dev/null
@@ -1,99 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?><!-- Licensed to the Apache Software
- Foundation (ASF) under one or more contributor license agreements. See the
- NOTICE file distributed with this work for additional information regarding
- copyright ownership. The ASF licenses this file to You under the Apache License,
- Version 2.0 (the "License"); you may not use this file except in compliance
- with the License. You may obtain a copy of the License at http://www.apache.org/licenses/LICENSE-2.0
- Unless required by applicable law or agreed to in writing, software distributed
- under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES
- OR CONDITIONS OF ANY KIND, either express or implied. See the License for
- the specific language governing permissions and limitations under the License. -->
-
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
- <modelVersion>4.0.0</modelVersion>
- <parent>
- <groupId>com.opensoc</groupId>
- <artifactId>OpenSOC-Streaming</artifactId>
- <version>0.0.1-SNAPSHOT</version>
- </parent>
- <artifactId>OpenSOC-Alerts</artifactId>
- <name>OpenSOC-Alerts</name>
- <description>Taggers for alerts</description>
- <properties>
- <json.simple.version>1.1.1</json.simple.version>
-
- <storm.version>0.9.2-incubating</storm.version>
- <kafka.version>0.8.0</kafka.version>
- <metrics.version>3.0.2</metrics.version>
- <commons.config.version>1.10</commons.config.version>
- <opensoc.common.version>0.0.1-SNAPSHOT</opensoc.common.version>
- </properties>
- <dependencies>
- <dependency>
- <groupId>com.opensoc</groupId>
- <artifactId>OpenSOC-Common</artifactId>
- <version>${opensoc.common.version}</version>
- </dependency>
- <dependency>
- <groupId>com.googlecode.json-simple</groupId>
- <artifactId>json-simple</artifactId>
- <version>${json.simple.version}</version>
- </dependency>
-
- <dependency>
- <groupId>org.apache.storm</groupId>
- <artifactId>storm-core</artifactId>
- <version>${storm.version}</version>
- <scope>provided</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.kafka</groupId>
- <artifactId>kafka_2.9.2</artifactId>
- <version>0.8.0</version>
- <scope>provided</scope>
- <exclusions>
- <exclusion>
- <groupId>com.sun.jmx</groupId>
- <artifactId>jmxri</artifactId>
- </exclusion>
- <exclusion>
- <groupId>com.sun.jdmk</groupId>
- <artifactId>jmxtools</artifactId>
- </exclusion>
- <exclusion>
- <groupId>javax.jms</groupId>
- <artifactId>jms</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
- <dependency>
- <groupId>com.codahale.metrics</groupId>
- <artifactId>metrics-core</artifactId>
- <version>${metrics.version}</version>
- </dependency>
- <dependency>
- <groupId>com.codahale.metrics</groupId>
- <artifactId>metrics-graphite</artifactId>
- <version>${metrics.version}</version>
- </dependency>
- <dependency>
- <groupId>commons-configuration</groupId>
- <artifactId>commons-configuration</artifactId>
- <version>${commons.config.version}</version>
- </dependency>
- <dependency>
- <groupId>commons-validator</groupId>
- <artifactId>commons-validator</artifactId>
- <version>1.4.0</version>
- </dependency>
-
- </dependencies>
- <build>
- <resources>
- <resource>
- <directory>src/main/resources</directory>
- </resource>
- </resources>
- </build>
-</project>
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/incubator-metron/blob/244a5359/metron-streaming/Metron-Alerts/readme.md
----------------------------------------------------------------------
diff --git a/metron-streaming/Metron-Alerts/readme.md b/metron-streaming/Metron-Alerts/readme.md
deleted file mode 100644
index 2b87d50..0000000
--- a/metron-streaming/Metron-Alerts/readme.md
+++ /dev/null
@@ -1,104 +0,0 @@
-#Metron-Alerts
-
-##Module Description
-
-This module enables telemetry alerts. It splits the mssage stream into two streams. The original message is emitted on the "message" stream. The corresponding alert is emitted on the "alerts" stream. The two are tied together through the alerts UUID.
-
-##Message Format
-
-Assuming the original message (with enrichments enabled) has the following format:
-
-```json
-{
-"message":
-{"ip_src_addr": xxxx,
-"ip_dst_addr": xxxx,
-"ip_src_port": xxxx,
-"ip_dst_port": xxxx,
-"protocol": xxxx,
-"timestamp": xxxx.
-"original_string": xxxx,
-"additional-field 1": xxxx,
-},
-"enrichment" : {"geo": xxxx, "whois": xxxx, "hosts": xxxxx, "CIF": "xxxxx"}
-
-}
-```
-
-The telemetry message will be tagged with a UUID alert tag like so:
-
-```json
-{
-"message":
-{"ip_src_addr": xxxx,
-"ip_dst_addr": xxxx,
-"ip_src_port": xxxx,
-"ip_dst_port": xxxx,
-"protocol": xxxx,
-"timestamp": xxxx,
-"original_string": xxxx,
-"additional-field 1": xxxx,
-},
-"enrichment" : {"geo": xxxx, "whois": xxxx, "hosts": xxxxx, "CIF": "xxxxx"},
-"alerts": [UUID1, UUID2, UUID3, etc]
-
-}
-```
-
-The alert will be fired on the "alerts" stream and can be customized to have any format as long as it includes the required mandatory fields. The mandatory fields are:
-
-* timestamp (epoch): The time from the message that triggered the alert
-* description: A human friendly string representation of the alert
-* alert_id: The UUID generated for the alert. This uniquely identifies an alert
-
-There are other standard but not mandatory fields that can be leveraged by metron-ui and other alert consumers:
-
-* designated_host: The IP address that corresponds to an asset. Ex. The IP address of the company device associated with the alert.
-* enrichment: A copy of the enrichment data from the message that triggered the alert
-* priority: The priority of the alert. Mustb e set to one of HIGH, MED or LOW
-
-An example of an alert with all mandatory and standard fields would look like so:
-
-```json
-{
-"timestamp": xxxx,
-"alert_id": UUID,
-"description": xxxx,
-"designated_host": xxxx,
-"enrichment": { "geo": xxxx, "whois": xxxx, "cif": xxxx },
-"priority": "MED"
-}
-```
-
-##Alerts Bolt
-
-The bolt can be extended with a variety of alerts adapters. The ability to stack alerts is currently in beta, but is not currently advisable. We advice to only have one alerts bolt per topology. The adapters are rules-based adapters which fire alerts when rules are a match. Currently only Java adapters are provided, but there are future plans to provide Grok-Based adapters as well.
-
-The signature of the Alerts bolt is as follows:
-
-```
-TelemetryAlertsBolt alerts_bolt = new TelemetryAlertsBolt()
-.withIdentifier(alerts_identifier).withMaxCacheSize(1000)
-.withMaxTimeRetain(3600).withAlertsAdapter(alerts_adapter)
-.withMetricConfiguration(config);
-```
-Identifier - JSON key where the alert is attached
-TimeRetain & MaxCacheSize - Caching parameters for the bolt
-MetricConfiguration - export custom bolt metrics to graphite (if not null)
-AlertsAdapter - pick the appropriate adapter for generating the alerts
-
-### Java Adapters
-
-Java adapters are designed for high volume topologies, but are not easily extensible. The adapters provided are:
-
-* org.apache.metron.alerts.adapters.AllAlertsAdapter - will tag every single message with the static alert (appropriate for topologies like Sourcefire, etc, where every single message is an alert)
-* org.apache.metron.alerts.adapters.HbaseWhiteAndBlacklistAdapter - will read white and blacklists from HBase and fire alerts if source or dest IP are not on the whitelist or if any IP is on the blacklist
-* org.apache.metron.alerts.adapters.CIFAlertsAdapter - will alert on messages that have results in enrichment.cif.
-* org.apache.metron.alerts.adpaters.KeywordsAlertAdapter - will alert on messages that contain any of a list of keywords
-###Grok Adapters
-
-Grok alerts adapters for Metron are still under devleopment
-
-###Stacking Alert Adapters
-
-The functionality to stack alerts adapters is still under development
http://git-wip-us.apache.org/repos/asf/incubator-metron/blob/244a5359/metron-streaming/Metron-Alerts/src/test/resources/config/AllAlertAdapterTest.config
----------------------------------------------------------------------
diff --git a/metron-streaming/Metron-Alerts/src/test/resources/config/AllAlertAdapterTest.config b/metron-streaming/Metron-Alerts/src/test/resources/config/AllAlertAdapterTest.config
index fe7d109..11c545c 100644
--- a/metron-streaming/Metron-Alerts/src/test/resources/config/AllAlertAdapterTest.config
+++ b/metron-streaming/Metron-Alerts/src/test/resources/config/AllAlertAdapterTest.config
@@ -1,3 +1,20 @@
+#
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements. See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership. The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License. You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
#Alerts Bolt
bolt.alerts.adapter=org.apache.metron.alerts.adapters.AllAlertAdapter
org.apache.metron.alerts.adapters.AllAlertAdapter.whitelist_table_name = ip_whitelist
@@ -5,4 +22,4 @@ org.apache.metron.alerts.adapters.AllAlertAdapter.blacklist_table_name = ip_blac
org.apache.metron.alerts.adapters.AllAlertAdapter.quorum=zkpr1,zkpr2,zkpr3
org.apache.metron.alerts.adapters.AllAlertAdapter.port=2181
org.apache.metron.alerts.adapters.AllAlertAdapter._MAX_CACHE_SIZE_OBJECTS_NUM=3600
-org.apache.metron.alerts.adapters.AllAlertAdapter._MAX_TIME_RETAIN_MINUTES=1000
\ No newline at end of file
+org.apache.metron.alerts.adapters.AllAlertAdapter._MAX_TIME_RETAIN_MINUTES=1000
http://git-wip-us.apache.org/repos/asf/incubator-metron/blob/244a5359/metron-streaming/Metron-Common/pom.xml.versionsBackup
----------------------------------------------------------------------
diff --git a/metron-streaming/Metron-Common/pom.xml.versionsBackup b/metron-streaming/Metron-Common/pom.xml.versionsBackup
deleted file mode 100644
index 8ead949..0000000
--- a/metron-streaming/Metron-Common/pom.xml.versionsBackup
+++ /dev/null
@@ -1,131 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?><!-- Licensed to the Apache Software
- Foundation (ASF) under one or more contributor license agreements. See the
- NOTICE file distributed with this work for additional information regarding
- copyright ownership. The ASF licenses this file to You under the Apache License,
- Version 2.0 (the "License"); you may not use this file except in compliance
- with the License. You may obtain a copy of the License at http://www.apache.org/licenses/LICENSE-2.0
- Unless required by applicable law or agreed to in writing, software distributed
- under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES
- OR CONDITIONS OF ANY KIND, either express or implied. See the License for
- the specific language governing permissions and limitations under the License. -->
-
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
- <modelVersion>4.0.0</modelVersion>
- <parent>
- <groupId>com.opensoc</groupId>
- <artifactId>OpenSOC-Streaming</artifactId>
- <version>0.0.1-SNAPSHOT</version>
- </parent>
- <artifactId>OpenSOC-Common</artifactId>
- <name>OpenSOC-Common</name>
- <description>Components common to all enrichments</description>
- <properties>
- <json.simple.version>1.1.1</json.simple.version>
-
- <storm.version>0.9.2-incubating</storm.version>
- <kafka.version>0.8.0</kafka.version>
- <metrics.version>3.0.2</metrics.version>
- <commons.config.version>1.10</commons.config.version>
- <hbase.version>0.98.5-hadoop2</hbase.version>
- </properties>
- <repositories>
- <repository>
- <id>Kraken-Repo</id>
- <name>Kraken Repository</name>
- <url>http://download.krakenapps.org</url>
- </repository>
- </repositories>
- <dependencies>
- <dependency>
- <groupId>com.googlecode.json-simple</groupId>
- <artifactId>json-simple</artifactId>
- <version>${json.simple.version}</version>
- </dependency>
-
- <dependency>
- <groupId>org.apache.storm</groupId>
- <artifactId>storm-core</artifactId>
- <version>${storm.version}</version>
- <scope>provided</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.kafka</groupId>
- <artifactId>kafka_2.9.2</artifactId>
- <version>0.8.0</version>
- <scope>provided</scope>
- <exclusions>
- <exclusion>
- <groupId>com.sun.jmx</groupId>
- <artifactId>jmxri</artifactId>
- </exclusion>
- <exclusion>
- <groupId>com.sun.jdmk</groupId>
- <artifactId>jmxtools</artifactId>
- </exclusion>
- <exclusion>
- <groupId>javax.jms</groupId>
- <artifactId>jms</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
- <dependency>
- <groupId>com.codahale.metrics</groupId>
- <artifactId>metrics-core</artifactId>
- <version>${metrics.version}</version>
- </dependency>
- <dependency>
- <groupId>com.codahale.metrics</groupId>
- <artifactId>metrics-graphite</artifactId>
- <version>${metrics.version}</version>
- </dependency>
- <dependency>
- <groupId>commons-configuration</groupId>
- <artifactId>commons-configuration</artifactId>
- <version>${commons.config.version}</version>
- </dependency>
- <dependency>
- <groupId>org.krakenapps</groupId>
- <artifactId>kraken-pcap</artifactId>
- <version>1.5.0</version>
- </dependency>
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <version>3.8.2</version>
- </dependency>
- <dependency>
- <groupId>org.apache.hbase</groupId>
- <artifactId>hbase-client</artifactId>
- <version>${hbase.version}</version>
- </dependency>
- </dependencies>
-
- <reporting>
- <plugins>
- <!-- Normally, dependency report takes time, skip it -->
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-project-info-reports-plugin</artifactId>
- <version>2.7</version>
-
- <configuration>
- <dependencyLocationsEnabled>false</dependencyLocationsEnabled>
- </configuration>
- </plugin>
- <plugin>
- <groupId>org.codehaus.mojo</groupId>
- <artifactId>emma-maven-plugin</artifactId>
- <version>1.0-alpha-3</version>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-pmd-plugin</artifactId>
- <configuration>
- <targetJdk>1.7</targetJdk>
- </configuration>
- </plugin>
- </plugins>
- </reporting>
-
-</project>
http://git-wip-us.apache.org/repos/asf/incubator-metron/blob/244a5359/metron-streaming/Metron-Common/src/main/java/org/apache/metron/ise/parser/ISEParser.jj
----------------------------------------------------------------------
diff --git a/metron-streaming/Metron-Common/src/main/java/org/apache/metron/ise/parser/ISEParser.jj b/metron-streaming/Metron-Common/src/main/java/org/apache/metron/ise/parser/ISEParser.jj
index 86edd1f..6071922 100644
--- a/metron-streaming/Metron-Common/src/main/java/org/apache/metron/ise/parser/ISEParser.jj
+++ b/metron-streaming/Metron-Common/src/main/java/org/apache/metron/ise/parser/ISEParser.jj
@@ -2,8 +2,8 @@ options{ CHOICE_AMBIGUITY_CHECK = 3; OTHER_AMBIGUITY_CHECK = 2; //DEBUG_P
//DEBUG_LOOKAHEAD=true
//DEBUG_TOKEN_MANAGER=true
ERROR_REPORTING = true; JAVA_UNICODE_ESCAPE = true; UNICODE_INPUT = true; IGNORE_CASE = true; SUPPORT_CLASS_VISIBILITY_PUBLIC = false; FORCE_LA_CHECK = true; CACHE_TOKENS = true; SANITY_CHECK = true; STATIC = false; //KEEP_LINE_COLUMN=true;
-}PARSER_BEGIN(ISEParser)package org.apache.metron.ise.parser;import java.io.*;import java.util.*;import org.json.simple.*;/**
-* Basic ISE data parser generated by JavaCC.
+}PARSER_BEGIN(ISEParser)/** * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information * regarding copyright ownership. The ASF licenses this file * to you under the Apache License, Version 2.0 (the * "License"); you may not use this file except in compliance * with the License. You may obtain a copy of the License at * * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. */package org.apache.metron.ise.parser;import java.io.*;import java.util.*;import org.json.simple.*;/**
+* Basic ISE data parser generated by JavaCC.
*/public class ISEParser implements Serializable{ private boolean nativeNumbers = false; public ISEParser() { //do nothing
} public ISEParser(String input) { this (new StringReader(input)); } /**
* Parses a ISE String into a JSON object {@code Map}.
http://git-wip-us.apache.org/repos/asf/incubator-metron/blob/244a5359/metron-streaming/Metron-Common/src/test/resources/config/BasicTldExtractorTest.config
----------------------------------------------------------------------
diff --git a/metron-streaming/Metron-Common/src/test/resources/config/BasicTldExtractorTest.config b/metron-streaming/Metron-Common/src/test/resources/config/BasicTldExtractorTest.config
index 6b3dc05..317add3 100644
--- a/metron-streaming/Metron-Common/src/test/resources/config/BasicTldExtractorTest.config
+++ b/metron-streaming/Metron-Common/src/test/resources/config/BasicTldExtractorTest.config
@@ -1,2 +1,20 @@
+#
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements. See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership. The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License. You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+
#BasicTldExtractorConfig
logFile=effective_tld_names.dat
http://git-wip-us.apache.org/repos/asf/incubator-metron/blob/244a5359/metron-streaming/Metron-DataLoads/pom.xml.versionsBackup
----------------------------------------------------------------------
diff --git a/metron-streaming/Metron-DataLoads/pom.xml.versionsBackup b/metron-streaming/Metron-DataLoads/pom.xml.versionsBackup
deleted file mode 100644
index a122057..0000000
--- a/metron-streaming/Metron-DataLoads/pom.xml.versionsBackup
+++ /dev/null
@@ -1,97 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?><!--
- Licensed to the Apache Software Foundation (ASF) under one or more
- contributor license agreements. See the NOTICE file distributed with
- this work for additional information regarding copyright ownership.
- The ASF licenses this file to You under the Apache License, Version 2.0
- (the "License"); you may not use this file except in compliance with
- the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
--->
-
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
- <modelVersion>4.0.0</modelVersion>
- <parent>
- <groupId>com.opensoc</groupId>
- <artifactId>OpenSOC-Streaming</artifactId>
- <version>0.0.1-SNAPSHOT</version>
- </parent>
- <artifactId>OpenSOC-DataLoads</artifactId>
- <properties>
- <opensoc.common.version>0.0.1-SNAPSHOT</opensoc.common.version>
- <storm.version>0.9.1-incubating</storm.version>
- <hbase.version>0.98.0-hadoop2</hbase.version>
- </properties>
- <dependencies>
- <dependency>
- <groupId>com.opensoc</groupId>
- <artifactId>OpenSOC-Common</artifactId>
- <version>${opensoc.common.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.storm</groupId>
- <artifactId>storm-core</artifactId>
- <version>${storm.version}</version>
- <scope>provided</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.hbase</groupId>
- <artifactId>hbase-client</artifactId>
- <version>${hbase.version}</version>
- </dependency>
- </dependencies>
- <build>
- <sourceDirectory>src</sourceDirectory>
- <resources>
- <resource>
- <directory>src</directory>
- <excludes>
- <exclude>**/*.java</exclude>
- </excludes>
- </resource>
- </resources>
- <plugins>
- <plugin>
- <artifactId>maven-compiler-plugin</artifactId>
- <version>3.1</version>
- <configuration>
- <source>1.7</source>
- <target>1.7</target>
- </configuration>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-shade-plugin</artifactId>
- <version>2.3</version>
- <executions>
- <execution>
- <phase>package</phase>
- <goals>
- <goal>shade</goal>
- </goals>
- <configuration>
- <artifactSet>
- <excludes>
- <exclude>classworlds:classworlds</exclude>
- <exclude>junit:junit</exclude>
- <exclude>jmock:*</exclude>
- <exclude>*:xml-apis</exclude>
- <exclude>org.apache.maven:lib:tests</exclude>
- <exclude>log4j:log4j:jar:</exclude>
- <exclude>*:hbase:*</exclude>
- </excludes>
- </artifactSet>
- </configuration>
- </execution>
- </executions>
- </plugin>
- </plugins>
- </build>
-
-</project>
http://git-wip-us.apache.org/repos/asf/incubator-metron/blob/244a5359/metron-streaming/Metron-DataLoads/src/main/assembly/assembly.xml
----------------------------------------------------------------------
diff --git a/metron-streaming/Metron-DataLoads/src/main/assembly/assembly.xml b/metron-streaming/Metron-DataLoads/src/main/assembly/assembly.xml
index 44d7216..19c5464 100644
--- a/metron-streaming/Metron-DataLoads/src/main/assembly/assembly.xml
+++ b/metron-streaming/Metron-DataLoads/src/main/assembly/assembly.xml
@@ -1,3 +1,16 @@
+<!--
+ Licensed to the Apache Software
+ Foundation (ASF) under one or more contributor license agreements. See the
+ NOTICE file distributed with this work for additional information regarding
+ copyright ownership. The ASF licenses this file to You under the Apache License,
+ Version 2.0 (the "License"); you may not use this file except in compliance
+ with the License. You may obtain a copy of the License at http://www.apache.org/licenses/LICENSE-2.0
+ Unless required by applicable law or agreed to in writing, software distributed
+ under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES
+ OR CONDITIONS OF ANY KIND, either express or implied. See the License for
+ the specific language governing permissions and limitations under the License.
+ -->
+
<assembly>
<id>archive</id>
<formats>
http://git-wip-us.apache.org/repos/asf/incubator-metron/blob/244a5359/metron-streaming/Metron-DataServices/README.md
----------------------------------------------------------------------
diff --git a/metron-streaming/Metron-DataServices/README.md b/metron-streaming/Metron-DataServices/README.md
index e845566..7ee5355 100644
--- a/metron-streaming/Metron-DataServices/README.md
+++ b/metron-streaming/Metron-DataServices/README.md
@@ -1 +1,16 @@
-README
+<!--
+Licensed to the Apache Software Foundation (ASF) under one or more
+contributor license agreements. See the NOTICE file distributed with
+this work for additional information regarding copyright ownership.
+The ASF licenses this file to You under the Apache License, Version 2.0
+(the "License"); you may not use this file except in compliance with
+the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+ -->
http://git-wip-us.apache.org/repos/asf/incubator-metron/blob/244a5359/metron-streaming/Metron-DataServices/conf/config.properties
----------------------------------------------------------------------
diff --git a/metron-streaming/Metron-DataServices/conf/config.properties b/metron-streaming/Metron-DataServices/conf/config.properties
index 7c060fb..6a40a71 100644
--- a/metron-streaming/Metron-DataServices/conf/config.properties
+++ b/metron-streaming/Metron-DataServices/conf/config.properties
@@ -1,5 +1,22 @@
+#
+# Licensed to the Apache Software Foundation (ASF) under one or more
+# contributor license agreements. See the NOTICE file distributed with
+# this work for additional information regarding copyright ownership.
+# The ASF licenses this file to You under the Apache License, Version 2.0
+# (the "License"); you may not use this file except in compliance with
+# the License. You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+
# sample config file for the Alerts/Proxy service. Fill in
-# the settings below with values appropriate to your environment.
+# the settings below with values appropriate to your environment.
alertsServiceImpl=elasticsearch
ldapUrl=ldap://ec2-54-88-217-194.compute-1.amazonaws.com
@@ -18,4 +35,3 @@ keystorePassword=password
authTokenAlias=authTokenKey
authTokenMaxAge=10000
alerts.cache.expiration.interval=360000
-
http://git-wip-us.apache.org/repos/asf/incubator-metron/blob/244a5359/metron-streaming/Metron-DataServices/src/main/resources/config-definition-hbase.xml
----------------------------------------------------------------------
diff --git a/metron-streaming/Metron-DataServices/src/main/resources/config-definition-hbase.xml b/metron-streaming/Metron-DataServices/src/main/resources/config-definition-hbase.xml
index efe05e8..5d092bf 100644
--- a/metron-streaming/Metron-DataServices/src/main/resources/config-definition-hbase.xml
+++ b/metron-streaming/Metron-DataServices/src/main/resources/config-definition-hbase.xml
@@ -1,3 +1,19 @@
+<!--
+Licensed to the Apache Software Foundation (ASF) under one or more
+contributor license agreements. See the NOTICE file distributed with
+this work for additional information regarding copyright ownership.
+The ASF licenses this file to You under the Apache License, Version 2.0
+(the "License"); you may not use this file except in compliance with
+the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+-->
<?xml version="1.0" encoding="ISO-8859-1" ?>
<configuration>
@@ -15,20 +31,20 @@
</lookups>
</header>
<override>
- <!-- 1. properties from 'hbae-config.properties' are loaded first;
+ <!-- 1. properties from 'hbae-config.properties' are loaded first;
if a property is not present in this file, then it will search in the files in the order they are defined here.
2. 'refreshDelay' indicates the minimum delay in milliseconds between checks to see if the underlying file is changed.
- 3. 'config-optional' indicates this file is not required -->
-
+ 3. 'config-optional' indicates this file is not required -->
+
<properties fileName="${expr:System.getProperty('configPath')+'/hbase-config.properties'}" config-optional="true">
<reloadingStrategy refreshDelay="${expr:System.getProperty('configRefreshDelay')}"
config-class="org.apache.commons.configuration.reloading.FileChangedReloadingStrategy"/>
</properties>
-
+
<properties fileName="hbase-config-default.properties" config-optional="true">
<!-- <reloadingStrategy refreshDelay="${expr:System.getProperty('defaultConfigRefreshDelay')}"
config-class="org.apache.commons.configuration.reloading.FileChangedReloadingStrategy"/>
--> </properties>
-
+
</override>
-</configuration>
\ No newline at end of file
+</configuration>
http://git-wip-us.apache.org/repos/asf/incubator-metron/blob/244a5359/metron-streaming/Metron-DataServices/src/main/resources/hbase-config-default.properties
----------------------------------------------------------------------
diff --git a/metron-streaming/Metron-DataServices/src/main/resources/hbase-config-default.properties b/metron-streaming/Metron-DataServices/src/main/resources/hbase-config-default.properties
index 4ee56b6..5ddf676 100644
--- a/metron-streaming/Metron-DataServices/src/main/resources/hbase-config-default.properties
+++ b/metron-streaming/Metron-DataServices/src/main/resources/hbase-config-default.properties
@@ -1,3 +1,20 @@
+#
+# Licensed to the Apache Software Foundation (ASF) under one or more
+# contributor license agreements. See the NOTICE file distributed with
+# this work for additional information regarding copyright ownership.
+# The ASF licenses this file to You under the Apache License, Version 2.0
+# (the "License"); you may not use this file except in compliance with
+# the License. You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+
#hbase zoo keeper configuration
hbase.zookeeper.quorum=zkpr1,zkpr2,zkpr3
hbase.zookeeper.clientPort=2181
@@ -25,7 +42,7 @@ hbase.hconnection.retries.number=3
#configuration for including pcaps in the reverse traffic
pcaps.include.reverse.traffic = false
-#maximum table row size in KB or MB
+#maximum table row size in KB or MB
hbase.table.row.size.unit = KB
hbase.table.max.row.size = 70
http://git-wip-us.apache.org/repos/asf/incubator-metron/blob/244a5359/metron-streaming/Metron-DataServices/src/main/resources/log4j.xml
----------------------------------------------------------------------
diff --git a/metron-streaming/Metron-DataServices/src/main/resources/log4j.xml b/metron-streaming/Metron-DataServices/src/main/resources/log4j.xml
index 834b3b3..6096374 100644
--- a/metron-streaming/Metron-DataServices/src/main/resources/log4j.xml
+++ b/metron-streaming/Metron-DataServices/src/main/resources/log4j.xml
@@ -1,17 +1,33 @@
+<!--
+ Licensed to the Apache Software Foundation (ASF) under one or more
+ contributor license agreements. See the NOTICE file distributed with
+ this work for additional information regarding copyright ownership.
+ The ASF licenses this file to You under the Apache License, Version 2.0
+ (the "License"); you may not use this file except in compliance with
+ the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+ -->
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE log4j:configuration SYSTEM "log4j.dtd">
<log4j:configuration xmlns:log4j="http://jakarta.apache.org/log4j/">
- <appender name="console" class="org.apache.log4j.ConsoleAppender">
- <param name="Target" value="System.out"/>
- <layout class="org.apache.log4j.PatternLayout">
- <param name="ConversionPattern" value="%-5p %c{1} - %m%n"/>
- </layout>
- </appender>
+ <appender name="console" class="org.apache.log4j.ConsoleAppender">
+ <param name="Target" value="System.out"/>
+ <layout class="org.apache.log4j.PatternLayout">
+ <param name="ConversionPattern" value="%-5p %c{1} - %m%n"/>
+ </layout>
+ </appender>
- <root>
- <priority value ="info" />
- <appender-ref ref="console" />
+ <root>
+ <priority value ="info" />
+ <appender-ref ref="console" />
</root>
-
-</log4j:configuration>
\ No newline at end of file
+
+</log4j:configuration>
http://git-wip-us.apache.org/repos/asf/incubator-metron/blob/244a5359/metron-streaming/Metron-DataServices/src/main/resources/webroot/logged_in.jsp
----------------------------------------------------------------------
diff --git a/metron-streaming/Metron-DataServices/src/main/resources/webroot/logged_in.jsp b/metron-streaming/Metron-DataServices/src/main/resources/webroot/logged_in.jsp
index 98b1159..52fa9ae 100644
--- a/metron-streaming/Metron-DataServices/src/main/resources/webroot/logged_in.jsp
+++ b/metron-streaming/Metron-DataServices/src/main/resources/webroot/logged_in.jsp
@@ -1,14 +1,30 @@
+<%--
+Licensed to the Apache Software Foundation (ASF) under one or more
+contributor license agreements. See the NOTICE file distributed with
+this work for additional information regarding copyright ownership.
+The ASF licenses this file to You under the Apache License, Version 2.0
+(the "License"); you may not use this file except in compliance with
+the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+ --%>
<%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core"%>
<html>
-
+
<head>
<title>Login</title>
</head>
-
+
<body>
<h3>Logged In!</h3>
-
+
<ul>
<c:forEach var="currentCookie" items="${cookie}">
<li>
@@ -16,7 +32,7 @@
</li>
</c:forEach>
</ul>
-
+
</body>
-
-</html>
\ No newline at end of file
+
+</html>
http://git-wip-us.apache.org/repos/asf/incubator-metron/blob/244a5359/metron-streaming/Metron-DataServices/src/main/resources/webroot/login_failed.jsp
----------------------------------------------------------------------
diff --git a/metron-streaming/Metron-DataServices/src/main/resources/webroot/login_failed.jsp b/metron-streaming/Metron-DataServices/src/main/resources/webroot/login_failed.jsp
index 457726f..510bf90 100644
--- a/metron-streaming/Metron-DataServices/src/main/resources/webroot/login_failed.jsp
+++ b/metron-streaming/Metron-DataServices/src/main/resources/webroot/login_failed.jsp
@@ -1,14 +1,30 @@
+<%--
+Licensed to the Apache Software Foundation (ASF) under one or more
+contributor license agreements. See the NOTICE file distributed with
+this work for additional information regarding copyright ownership.
+The ASF licenses this file to You under the Apache License, Version 2.0
+(the "License"); you may not use this file except in compliance with
+the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+ --%>
<%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core"%>
<html>
-
+
<head>
<title>Login</title>
</head>
-
+
<body>
<h3>Fail!!!!</h3>
-
+
</body>
-
-</html>
\ No newline at end of file
+
+</html>
http://git-wip-us.apache.org/repos/asf/incubator-metron/blob/244a5359/metron-streaming/Metron-DataServices/src/main/resources/webroot/login_old.jsp
----------------------------------------------------------------------
diff --git a/metron-streaming/Metron-DataServices/src/main/resources/webroot/login_old.jsp b/metron-streaming/Metron-DataServices/src/main/resources/webroot/login_old.jsp
index dbe6e48..4b3017f 100644
--- a/metron-streaming/Metron-DataServices/src/main/resources/webroot/login_old.jsp
+++ b/metron-streaming/Metron-DataServices/src/main/resources/webroot/login_old.jsp
@@ -1,21 +1,38 @@
+<%--
+Licensed to the Apache Software Foundation (ASF) under one or more
+contributor license agreements. See the NOTICE file distributed with
+this work for additional information regarding copyright ownership.
+The ASF licenses this file to You under the Apache License, Version 2.0
+(the "License"); you may not use this file except in compliance with
+the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+ --%>
+
<html>
-
+
<head>
<title>Login</title>
</head>
-
+
<body>
<h3>Login:</h3>
-
+
<form action="/login" method="POST">
-
+
<label for="userName">Username:</label><input type="text" name="userName" id="userName"></input>
<br />
<label for="password">Password:</label><input type="password" name="password" id="password" ></input>
<br />
<button name="login">Login</button>
</form>
-
+
</body>
-
-</html>
\ No newline at end of file
+
+</html>
http://git-wip-us.apache.org/repos/asf/incubator-metron/blob/244a5359/metron-streaming/Metron-DataServices/src/main/resources/webroot/withsocket.jsp
----------------------------------------------------------------------
diff --git a/metron-streaming/Metron-DataServices/src/main/resources/webroot/withsocket.jsp b/metron-streaming/Metron-DataServices/src/main/resources/webroot/withsocket.jsp
index 0530eaa..bd71bfa 100644
--- a/metron-streaming/Metron-DataServices/src/main/resources/webroot/withsocket.jsp
+++ b/metron-streaming/Metron-DataServices/src/main/resources/webroot/withsocket.jsp
@@ -1,33 +1,49 @@
+<%--
+Licensed to the Apache Software Foundation (ASF) under one or more
+contributor license agreements. See the NOTICE file distributed with
+this work for additional information regarding copyright ownership.
+The ASF licenses this file to You under the Apache License, Version 2.0
+(the "License"); you may not use this file except in compliance with
+the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+ --%>
<%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core"%>
<html>
-
+
<head>
<title>Do something with WebSockets</title>
-
- <script src="//code.jquery.com/jquery-1.11.0.min.js"></script>
+
+ <script src="//code.jquery.com/jquery-1.11.0.min.js"></script>
<script type="text/javascript">
$(document).ready(function() {
-
+
var exampleSocket = null;
var groupId = null;
-
+
$("#startBtn").click(
function() {
exampleSocket = new WebSocket("wss://localhost:8443/ws/messages");
if( exampleSocket != null )
{
-
+
exampleSocket.onmessage = function (event)
{
-
+
var msg = event.data;
- var index = msg.search( "groupId:" );
+ var index = msg.search( "groupId:" );
if( index >= 0 )
{
console.log( "groupId message" );
// this is our groupId from the server, save it for future use
-
+
groupId = msg.substring( index + 8 ).trim();
console.log( "groupId: " + groupId );
}
@@ -35,49 +51,49 @@
{
// console.log( "alert message" );
// this is an alert message, just render it...
-
+
// console.log( event.data );
$('#msgList').append( '<li>' + msg + '</li>' );
}
}
-
+
exampleSocket.onopen = function() {
console.log( "exampleSocket is open.")
console.log( "sending startMessages signal" );
- exampleSocket.send( "startMessages" );
+ exampleSocket.send( "startMessages" );
}
}
else
{
alert( "exampleSocket is null!" );
}
-
- }
+
+ }
)
-
+
$("#stopBtn").click(
function() {
exampleSocket.send( "stopMessages");
}
)
-
+
})
-
+
</script>
</head>
-
+
<body>
<h3>Get some data with a WebSocket</h3>
-
+
<button id="startBtn">Start</button> <span style="min-width:140px;"></span> <button id="stopBtn">Stop</button>
<div id="msgArea" style="background-color:#F8F8F8;color:red;min-height:100px; min-width:400px;">
<ul id="msgList" >
-
+
</ul>
-
+
</div>
-
+
<div id="debug">
<ul>
<c:forEach var="req" items="${header}">
@@ -96,5 +112,5 @@
</ul>
</div>
</body>
-
-</html>
\ No newline at end of file
+
+</html>
http://git-wip-us.apache.org/repos/asf/incubator-metron/blob/244a5359/metron-streaming/Metron-DataServices/src/main/resources/webroot/withsocket2.jsp
----------------------------------------------------------------------
diff --git a/metron-streaming/Metron-DataServices/src/main/resources/webroot/withsocket2.jsp b/metron-streaming/Metron-DataServices/src/main/resources/webroot/withsocket2.jsp
index 7ea83ba..f533c6a 100644
--- a/metron-streaming/Metron-DataServices/src/main/resources/webroot/withsocket2.jsp
+++ b/metron-streaming/Metron-DataServices/src/main/resources/webroot/withsocket2.jsp
@@ -1,11 +1,27 @@
+<%--
+Licensed to the Apache Software Foundation (ASF) under one or more
+contributor license agreements. See the NOTICE file distributed with
+this work for additional information regarding copyright ownership.
+The ASF licenses this file to You under the Apache License, Version 2.0
+(the "License"); you may not use this file except in compliance with
+the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+ --%>
<%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core"%>
<html>
-
+
<head>
<title>Do something with WebSockets</title>
-
- <script src="//code.jquery.com/jquery-1.11.0.min.js"></script>
+
+ <script src="//code.jquery.com/jquery-1.11.0.min.js"></script>
<script type="text/javascript">
$(document).ready(function(){
$("#startBtn").click(
@@ -13,44 +29,44 @@
var exampleSocket = new WebSocket("wss://localhost:8443/ws/messages");
if( exampleSocket != null )
{
-
+
exampleSocket.onmessage = function (event)
{
-
+
// console.log( event.data );
$('#msgList').append( '<li>' + event.data + '</li>' );
}
-
+
exampleSocket.onopen = function() {
console.log( "exampleSocket is open.")
console.log( "sending startMessages signal" );
- exampleSocket.send( "startMessages" );
+ exampleSocket.send( "startMessages" );
}
}
else
{
alert( "exampleSocket is null!" );
}
-
- }
+
+ }
)
})
-
+
</script>
</head>
-
+
<body>
<h3>Get some data with a WebSocket</h3>
-
+
<button id="startBtn">Start</button>
<div id="msgArea" style="background-color:#F8F8F8;color:red;min-height:100px; min-width:400px;">
<ul id="msgList" >
-
+
</ul>
-
+
</div>
-
+
<div id="debug">
<ul>
<c:forEach var="req" items="${header}">
@@ -69,5 +85,5 @@
</ul>
</div>
</body>
-
-</html>
\ No newline at end of file
+
+</html>
http://git-wip-us.apache.org/repos/asf/incubator-metron/blob/244a5359/metron-streaming/Metron-DataServices/src/main/resources/webroot/withsocket3.jsp
----------------------------------------------------------------------
diff --git a/metron-streaming/Metron-DataServices/src/main/resources/webroot/withsocket3.jsp b/metron-streaming/Metron-DataServices/src/main/resources/webroot/withsocket3.jsp
index 05c929c..7ca1a9b 100644
--- a/metron-streaming/Metron-DataServices/src/main/resources/webroot/withsocket3.jsp
+++ b/metron-streaming/Metron-DataServices/src/main/resources/webroot/withsocket3.jsp
@@ -1,33 +1,49 @@
+<%--
+Licensed to the Apache Software Foundation (ASF) under one or more
+contributor license agreements. See the NOTICE file distributed with
+this work for additional information regarding copyright ownership.
+The ASF licenses this file to You under the Apache License, Version 2.0
+(the "License"); you may not use this file except in compliance with
+the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+ --%>
<%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core"%>
<html>
-
+
<head>
<title>Do something with WebSockets</title>
-
- <script src="//code.jquery.com/jquery-1.11.0.min.js"></script>
+
+ <script src="//code.jquery.com/jquery-1.11.0.min.js"></script>
<script type="text/javascript">
$(document).ready(function() {
-
+
var exampleSocket = null;
var groupId = null;
-
+
$("#startBtn").click(
function() {
exampleSocket = new WebSocket("wss://localhost:8443/ws/messages");
if( exampleSocket != null )
{
-
+
exampleSocket.onmessage = function (event)
{
-
+
var msg = event.data;
- var index = msg.search( "groupId:" );
+ var index = msg.search( "groupId:" );
if( index >= 0 )
{
console.log( "groupId message" );
// this is our groupId from the server, save it for future use
-
+
groupId = msg.substring( index + 8 ).trim();
console.log( "groupId: " + groupId );
}
@@ -35,49 +51,49 @@
{
// console.log( "alert message" );
// this is an alert message, just render it...
-
+
// console.log( event.data );
$('#msgList').append( '<li>' + msg + '</li>' );
}
}
-
+
exampleSocket.onopen = function() {
console.log( "exampleSocket is open.")
console.log( "sending startMessages signal" );
- exampleSocket.send( "startMessages:abc123" );
+ exampleSocket.send( "startMessages:abc123" );
}
}
else
{
alert( "exampleSocket is null!" );
}
-
- }
+
+ }
)
-
+
$("#stopBtn").click(
function() {
exampleSocket.send( "stopMessages");
}
)
-
+
})
-
+
</script>
</head>
-
+
<body>
<h3>Get some data with a WebSocket</h3>
-
+
<button id="startBtn">Start</button> <span style="min-width:140px;"></span> <button id="stopBtn">Stop</button>
<div id="msgArea" style="background-color:#F8F8F8;color:red;min-height:100px; min-width:400px;">
<ul id="msgList" >
-
+
</ul>
-
+
</div>
-
+
<div id="debug">
<ul>
<c:forEach var="req" items="${header}">
@@ -96,5 +112,5 @@
</ul>
</div>
</body>
-
-</html>
\ No newline at end of file
+
+</html>
http://git-wip-us.apache.org/repos/asf/incubator-metron/blob/244a5359/metron-streaming/Metron-EnrichmentAdapters/README.md
----------------------------------------------------------------------
diff --git a/metron-streaming/Metron-EnrichmentAdapters/README.md b/metron-streaming/Metron-EnrichmentAdapters/README.md
new file mode 100644
index 0000000..01c4caa
--- /dev/null
+++ b/metron-streaming/Metron-EnrichmentAdapters/README.md
@@ -0,0 +1,125 @@
+#Metron-Enrichments
+
+##Module Description
+
+This module enables enrichment of message metafields with additional information from various enrichment sources. Currently there is only a limited number of enrichments available, but this is an extensible framework that can be extended with additional enrichments. Enrichments currently available are geo, whois, hosts, and CIF.
+
+##Message Format
+
+Enrichment bolts are designed to go after the parser bolts. Parser bolts will parse the telemetry, taking it from its native format and producing a standard JSON that would look like so:
+
+```json
+{
+"message":
+{"ip_src_addr": xxxx,
+"ip_dst_addr": xxxx,
+"ip_src_port": xxxx,
+"ip_dst_port": xxxx,
+"protocol": xxxx,
+"additional-field 1": xxx,
+}
+
+}
+```
+
+A single enrichment bolt would enrich the message and produce a JSON enrichment and attach it to the message. Enrichments are stackable so multiple enrichments can be attached sequentially after a single parser bolt. Stacked enrichments would produce messages under the "enrichment" tag and attach it to the message like so:
+
+```json
+{
+"message":
+{"ip_src_addr": xxxx,
+"ip_dst_addr": xxxx,
+"ip_src_port": xxxx,
+"ip_dst_port": xxxx,
+"protocol": xxxx,
+"additional-field 1": xxxx,
+},
+"enrichment" : {"geo": xxxx, "whois": xxxx, "hosts": xxxxx, "CIF": "xxxxx"}
+
+}
+```
+
+##Enrichment Sources
+
+Each enrichment has to have an anrichment source which can serve as a lookup table for enriching relevant message fields. In order to minimize the use of additional platforms and tools we primarily try to rely on HBase as much as possible to store the enrichment information for lookup by key. In order to use Hbase we have to pre-process the enrichment feeds for bulk-loading into HBase with specific key format optimized for retrieval as well as utilize caches within the enrichment bolts to be able to provide enrichments real-time. Our wiki contains information on how to setup the environment, pre-process feeds, and plug in the enrichment sources.
+
+##Enrichment Bolt
+
+The enrichment bolt is designed to be extensible to be re-used for all kinds of enrichment processes. The bolt signature for declaration in a storm topology is as follows:
+
+
+
+```
+GenericEnrichmentBolt geo_enrichment = new GenericEnrichmentBolt()
+.withEnrichmentTag(
+config.getString("bolt.enrichment.geo.enrichment_tag"))
+.withAdapter(geo_adapter)
+.withMaxTimeRetain(
+config.getInt("bolt.enrichment.geo.MAX_TIME_RETAIN_MINUTES"))
+.withMaxCacheSize(
+config.getInt("bolt.enrichment.geo.MAX_CACHE_SIZE_OBJECTS_NUM"))
+.withKeys(geo_keys).withMetricConfiguration(config);
+
+```
+
+EnrichmentTag - Name of the enrichment (geo, whois, hosts, etc)
+Keys - Keys which this enrichment is able to enrich (hosts field for hosts enrichment, source_ip, dest_ip, for geo enrichment, etc)
+MaxTimeToRetain & MaxCacheSize - define the caching policy of the enrichment bolt
+Adapter - which adapter to use with the enrichment bolt instance
+
+###Geo Adapter
+Geo adapter is able to do geo enrichment on hosts and destination IPs. The open source verison of the geo adapter uses the free Geo feeds from MaxMind. The format of these feeds does not easily lend itself to a no-sql DB so this adapter is designed to work with mySql. But it is extensible enough to be made work with a variety of other back ends.
+
+The signature of a geo adapter is as follows;
+
+```
+GeoMysqlAdapter geo_adapter = new GeoMysqlAdapter(
+config.getString("mysql.ip"), config.getInt("mysql.port"),
+config.getString("mysql.username"),
+config.getString("mysql.password"),
+config.getString("bolt.enrichment.geo.adapter.table"));
+
+```
+
+###Hosts Adapter
+The hosts adapter is designed to enrich message format with the static host information that can be read from a standard text file. This adapter is intended for use with a network crawling script that can identify all customer assets and place them in a text file. For example, this script would identify all workstations, printers, appliantces, etc. Then if any of these assets are seen in the telemetry messages flowing through the adapter this enrichment would fire and the relevant known information about a host would be attached. We are currently working on porting this adapter to work with HBase, but this work is not ready yet. The known hosts file is located under the /etc/whitelists config directory of Metron.
+
+The signature of the hosts adapter is as follows:
+
+```
+Map<String, JSONObject> known_hosts = SettingsLoader
+.loadKnownHosts(hosts_path);
+
+HostFromPropertiesFileAdapter host_adapter = new HostFromPropertiesFileAdapter(
+known_hosts);
+
+```
+* The source and dest ips refer to the name of the message JSON key where the host information is located
+
+###Whois Adapter
+Whois adapter enriches the host name with additional whois information obtained from our proprietary Cisco feed. The enricher itself is provided in this open source distribution, but the feed is not. You have to have your own feed in order to use it. Alternatively, you can contact us for providing you with this feed, but we would have to charge you a fee (we can't distribute it for free). The implemetation of the whois enrichment we provide works with HBase
+
+The signature of the whois adapter is as follows:
+
+```
+
+EnrichmentAdapter whois_adapter = new WhoisHBaseAdapter(
+config.getString("bolt.enrichment.whois.hbase.table.name"),
+config.getString("kafka.zk.list"),
+config.getString("kafka.zk.port"));
+```
+
+###CIF Adapter
+CIF adapter is designed to take in CIF feeds and cross-reference them against every message processed by Storm. If there is a hit then the relevant information is attached to the message.
+
+The signature of the CIF adapter is as follows:
+
+```
+CIFHbaseAdapter = new CIFHbaseAdapter(config
+.getString("kafka.zk.list"), config
+.getString("kafka.zk.port"), config
+.getString("bolt.enrichment.cif.tablename")))
+```
+
+##Stacking Enrichments
+Enrichments can be stacked. By default each enrichment bolt listens on the "message" stream. In order to create and stack enrichment bolts create a new bolt and instantiate the appropariate adapter. You can look at our sample topologies to see how enrichments can be stacked
[2/4] incubator-metron git commit: METRON-41 Integrate Apache Rat to
Audit Source Code Licensing (nickwallen via cestella) closes
apache/incubator-metron#27
Posted by ce...@apache.org.
http://git-wip-us.apache.org/repos/asf/incubator-metron/blob/244a5359/metron-streaming/Metron-EnrichmentAdapters/pom.xml.versionsBackup
----------------------------------------------------------------------
diff --git a/metron-streaming/Metron-EnrichmentAdapters/pom.xml.versionsBackup b/metron-streaming/Metron-EnrichmentAdapters/pom.xml.versionsBackup
deleted file mode 100644
index 6c54dfc..0000000
--- a/metron-streaming/Metron-EnrichmentAdapters/pom.xml.versionsBackup
+++ /dev/null
@@ -1,136 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?><!-- Licensed to the Apache Software
- Foundation (ASF) under one or more contributor license agreements. See the
- NOTICE file distributed with this work for additional information regarding
- copyright ownership. The ASF licenses this file to You under the Apache License,
- Version 2.0 (the "License"); you may not use this file except in compliance
- with the License. You may obtain a copy of the License at http://www.apache.org/licenses/LICENSE-2.0
- Unless required by applicable law or agreed to in writing, software distributed
- under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES
- OR CONDITIONS OF ANY KIND, either express or implied. See the License for
- the specific language governing permissions and limitations under the License. -->
-
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
- <modelVersion>4.0.0</modelVersion>
- <parent>
- <groupId>com.opensoc</groupId>
- <artifactId>OpenSOC-Streaming</artifactId>
- <version>0.0.1-SNAPSHOT</version>
- </parent>
- <artifactId>OpenSOC-EnrichmentAdapters</artifactId>
-
- <properties>
- <opensoc.common.version>0.0.1-SNAPSHOT</opensoc.common.version>
- <mysql.version>5.1.31</mysql.version>
- <slf4j.version>1.7.7</slf4j.version>
- <hbase.client.version>0.96.1-hadoop2</hbase.client.version>
- <storm.hdfs.version>0.1.2</storm.hdfs.version>
- <hadoop.version>2.2.0</hadoop.version>
- <storm.version>0.9.1-incubating</storm.version>
- <guava.version>17.0</guava.version>
- </properties>
- <dependencies>
- <dependency>
- <groupId>com.opensoc</groupId>
- <artifactId>OpenSOC-Common</artifactId>
- <version>${opensoc.common.version}</version>
- </dependency>
- <dependency>
- <groupId>org.slf4j</groupId>
- <artifactId>slf4j-api</artifactId>
- <version>${slf4j.version}</version>
- <scope>provided</scope>
- </dependency>
- <dependency>
- <groupId>mysql</groupId>
- <artifactId>mysql-connector-java</artifactId>
- <version>${mysql.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.hbase</groupId>
- <artifactId>hbase-client</artifactId>
- <version>${hbase.client.version}</version>
- <exclusions>
- <exclusion>
- <groupId>org.slf4j</groupId>
- <artifactId>slf4j-log4j12</artifactId>
- </exclusion>
- <exclusion>
- <groupId>log4j</groupId>
- <artifactId>log4j</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
- <dependency>
- <groupId>org.apache.hadoop</groupId>
- <artifactId>hadoop-hdfs</artifactId>
- <version>${hadoop.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.storm</groupId>
- <artifactId>storm-core</artifactId>
- <version>${storm.version}</version>
- <scope>provided</scope>
- </dependency>
- <dependency>
- <groupId>com.google.guava</groupId>
- <artifactId>guava</artifactId>
- <version>${guava.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.hadoop</groupId>
- <artifactId>hadoop-common</artifactId>
- <version>${hadoop.version}</version>
- </dependency>
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <version>3.8.2</version>
- </dependency>
- <dependency>
- <groupId>commons-validator</groupId>
- <artifactId>commons-validator</artifactId>
- <version>1.4.0</version>
- </dependency>
-
-
- </dependencies>
- <reporting>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-surefire-plugin</artifactId>
- <configuration>
- <systemProperties>
- <property>
- <name>mode</name>
- <value>local</value>
- </property>
- </systemProperties>
- </configuration>
- </plugin>
- <!-- Normally, dependency report takes time, skip it -->
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-project-info-reports-plugin</artifactId>
- <version>2.7</version>
-
- <configuration>
- <dependencyLocationsEnabled>false</dependencyLocationsEnabled>
- </configuration>
- </plugin>
- <plugin>
- <groupId>org.codehaus.mojo</groupId>
- <artifactId>emma-maven-plugin</artifactId>
- <version>1.0-alpha-3</version>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-pmd-plugin</artifactId>
- <configuration>
- <targetJdk>1.7</targetJdk>
- </configuration>
- </plugin>
- </plugins>
- </reporting>
-</project>
http://git-wip-us.apache.org/repos/asf/incubator-metron/blob/244a5359/metron-streaming/Metron-EnrichmentAdapters/readme.md
----------------------------------------------------------------------
diff --git a/metron-streaming/Metron-EnrichmentAdapters/readme.md b/metron-streaming/Metron-EnrichmentAdapters/readme.md
deleted file mode 100644
index 5ae1f5b..0000000
--- a/metron-streaming/Metron-EnrichmentAdapters/readme.md
+++ /dev/null
@@ -1,125 +0,0 @@
-#Metron-Enrichments
-
-##Module Description
-
-This module enables enrichment of message metafields with additional information from various enrichment sources. Currently there is only a limited number of enrichments available, but this is an extensible framework that can be extended with additional enrichments. Enrichments currently available are geo, whois, hosts, and CIF.
-
-##Message Format
-
-Enrichment bolts are designed to go after the parser bolts. Parser bolts will parse the telemetry, taking it from its native format and producing a standard JSON that would look like so:
-
-```json
-{
-"message":
-{"ip_src_addr": xxxx,
-"ip_dst_addr": xxxx,
-"ip_src_port": xxxx,
-"ip_dst_port": xxxx,
-"protocol": xxxx,
-"additional-field 1": xxx,
-}
-
-}
-```
-
-A single enrichment bolt would enrich the message and produce a JSON enrichment and attach it to the message. Enrichments are stackable so multiple enrichments can be attached sequentially after a single parser bolt. Stacked enrichments would produce messages under the "enrichment" tag and attach it to the message like so:
-
-```json
-{
-"message":
-{"ip_src_addr": xxxx,
-"ip_dst_addr": xxxx,
-"ip_src_port": xxxx,
-"ip_dst_port": xxxx,
-"protocol": xxxx,
-"additional-field 1": xxxx,
-},
-"enrichment" : {"geo": xxxx, "whois": xxxx, "hosts": xxxxx, "CIF": "xxxxx"}
-
-}
-```
-
-##Enrichment Sources
-
-Each enrichment has to have an anrichment source which can serve as a lookup table for enriching relevant message fields. In order to minimize the use of additional platforms and tools we primarily try to rely on HBase as much as possible to store the enrichment information for lookup by key. In order to use Hbase we have to pre-process the enrichment feeds for bulk-loading into HBase with specific key format optimized for retrieval as well as utilize caches within the enrichment bolts to be able to provide enrichments real-time. Our wiki contains information on how to setup the environment, pre-process feeds, and plug in the enrichment sources.
-
-##Enrichment Bolt
-
-The enrichment bolt is designed to be extensible to be re-used for all kinds of enrichment processes. The bolt signature for declaration in a storm topology is as follows:
-
-
-
-```
-GenericEnrichmentBolt geo_enrichment = new GenericEnrichmentBolt()
-.withEnrichmentTag(
-config.getString("bolt.enrichment.geo.enrichment_tag"))
-.withAdapter(geo_adapter)
-.withMaxTimeRetain(
-config.getInt("bolt.enrichment.geo.MAX_TIME_RETAIN_MINUTES"))
-.withMaxCacheSize(
-config.getInt("bolt.enrichment.geo.MAX_CACHE_SIZE_OBJECTS_NUM"))
-.withKeys(geo_keys).withMetricConfiguration(config);
-
-```
-
-EnrichmentTag - Name of the enrichment (geo, whois, hosts, etc)
-Keys - Keys which this enrichment is able to enrich (hosts field for hosts enrichment, source_ip, dest_ip, for geo enrichment, etc)
-MaxTimeToRetain & MaxCacheSize - define the caching policy of the enrichment bolt
-Adapter - which adapter to use with the enrichment bolt instance
-
-###Geo Adapter
-Geo adapter is able to do geo enrichment on hosts and destination IPs. The open source verison of the geo adapter uses the free Geo feeds from MaxMind. The format of these feeds does not easily lend itself to a no-sql DB so this adapter is designed to work with mySql. But it is extensible enough to be made work with a variety of other back ends.
-
-The signature of a geo adapter is as follows;
-
-```
-GeoMysqlAdapter geo_adapter = new GeoMysqlAdapter(
-config.getString("mysql.ip"), config.getInt("mysql.port"),
-config.getString("mysql.username"),
-config.getString("mysql.password"),
-config.getString("bolt.enrichment.geo.adapter.table"));
-
-```
-
-###Hosts Adapter
-The hosts adapter is designed to enrich message format with the static host information that can be read from a standard text file. This adapter is intended for use with a network crawling script that can identify all customer assets and place them in a text file. For example, this script would identify all workstations, printers, appliantces, etc. Then if any of these assets are seen in the telemetry messages flowing through the adapter this enrichment would fire and the relevant known information about a host would be attached. We are currently working on porting this adapter to work with HBase, but this work is not ready yet. The known hosts file is located under the /etc/whitelists config directory of Metron.
-
-The signature of the hosts adapter is as follows:
-
-```
-Map<String, JSONObject> known_hosts = SettingsLoader
-.loadKnownHosts(hosts_path);
-
-HostFromPropertiesFileAdapter host_adapter = new HostFromPropertiesFileAdapter(
-known_hosts);
-
-```
-* The source and dest ips refer to the name of the message JSON key where the host information is located
-
-###Whois Adapter
-Whois adapter enriches the host name with additional whois information obtained from our proprietary Cisco feed. The enricher itself is provided in this open source distribution, but the feed is not. You have to have your own feed in order to use it. Alternatively, you can contact us for providing you with this feed, but we would have to charge you a fee (we can't distribute it for free). The implemetation of the whois enrichment we provide works with HBase
-
-The signature of the whois adapter is as follows:
-
-```
-
-EnrichmentAdapter whois_adapter = new WhoisHBaseAdapter(
-config.getString("bolt.enrichment.whois.hbase.table.name"),
-config.getString("kafka.zk.list"),
-config.getString("kafka.zk.port"));
-```
-
-###CIF Adapter
-CIF adapter is designed to take in CIF feeds and cross-reference them against every message processed by Storm. If there is a hit then the relevant information is attached to the message.
-
-The signature of the CIF adapter is as follows:
-
-```
-CIFHbaseAdapter = new CIFHbaseAdapter(config
-.getString("kafka.zk.list"), config
-.getString("kafka.zk.port"), config
-.getString("bolt.enrichment.cif.tablename")))
-```
-
-##Stacking Enrichments
-Enrichments can be stacked. By default each enrichment bolt listens on the "message" stream. In order to create and stack enrichment bolts create a new bolt and instantiate the appropariate adapter. You can look at our sample topologies to see how enrichments can be stacked
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/incubator-metron/blob/244a5359/metron-streaming/Metron-FlumeConfigs/SampleFlumeConf.rtf
----------------------------------------------------------------------
diff --git a/metron-streaming/Metron-FlumeConfigs/SampleFlumeConf.rtf b/metron-streaming/Metron-FlumeConfigs/SampleFlumeConf.rtf
deleted file mode 100644
index 728f08a..0000000
--- a/metron-streaming/Metron-FlumeConfigs/SampleFlumeConf.rtf
+++ /dev/null
@@ -1,43 +0,0 @@
-{\rtf1\ansi\ansicpg1252\cocoartf1265\cocoasubrtf210
-{\fonttbl\f0\fnil\fcharset0 Menlo-Regular;}
-{\colortbl;\red255\green255\blue255;}
-\margl1440\margr1440\vieww10800\viewh8400\viewkind0
-\pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\pardirnatural
-
-\f0\fs22 \cf0 \CocoaLigature0 #agent section\
-flumesf1.sources = s\
-flumesf1.channels = c\
-flumesf1.sinks = r\
-\
-#source section\
-flumesf1.sources.s.type = syslogUdp\
-flumesf1.sources.s.port = 21001\
-flumesf1.sources.s.host = 0.0.0.0\
-flumesf1.sources.s.channels = c\
-\
-flumesf1.sinks.r.type = org.apache.flume.plugins.KafkaSink\
-\
-flumesf1.sinks.r.metadata.broker.list=dn01:9092,dn02:9092,dn03:9092,dn04:9092,dn08:9092,dn09:9092,dn10:9092\
-\
-#flumesf1.sinks.r.partition.key=0\
-#flumesf1.sinks.r.partitioner.class=org.apache.flume.plugins.SinglePartition\
-flumesf1.sinks.r.serializer.class=kafka.serializer.StringEncoder\
-flumesf1.sinks.r.request.required.acks=0\
-flumesf1.sinks.r.max.message.size=1000000\
-flumesf1.sinks.r.flumesf1.type=sync\
-flumesf1.sinks.r.custom.encoding=UTF-8\
-flumesf1.sinks.r.custom.topic.name=sourcefire_raw\
-\
-\
-\
-flumesf1.sinks.a.type = file_roll\
-flumesf1.sinks.a.channel = c\
-flumesf1.sinks.a.sink.directory = /tmp/flumesf1/\
-\
-\
-#Specify the channel the sink should use\
-flumesf1.sinks.r.channel = c\
-\
-# Each channel's type is defined.\
-flumesf1.channels.c.type = memory\
-flumesf1.channels.c.capacity = 1000}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/incubator-metron/blob/244a5359/metron-streaming/Metron-Indexing/README.md
----------------------------------------------------------------------
diff --git a/metron-streaming/Metron-Indexing/README.md b/metron-streaming/Metron-Indexing/README.md
new file mode 100644
index 0000000..50d32e4
--- /dev/null
+++ b/metron-streaming/Metron-Indexing/README.md
@@ -0,0 +1,61 @@
+#Metron-Indexing
+
+##Module Description
+
+This module provides the indexing capability to Metron components. The primary indexing engine for now is Elastic Search, but Solr may be supported at some point in the future as well. There are three types of messages that are commonly indexed in Metron topologies: messages, alerts, and errors. Messages are telemetry messages parsed by the parser bolt. Alerts are alerts generated by the alerts bolt. Errors are an optional feature where each Metron bolt in addition to outputting errors in the log file will also index them for immediate analysis.
+
+###Index bolt
+
+The signature of the index bolt is as follows:
+
+```
+TelemetryIndexingBolt indexing_bolt = new TelemetryIndexingBolt()
+.withIndexIP(config.getString("es.ip"))
+.withIndexPort(config.getInt("es.port"))
+.withClusterName(config.getString("es.clustername"))
+.withIndexName(
+config.getString("bolt.error.indexing.indexname"))
+.withDocumentName(
+config.getString("bolt.error.indexing.documentname"))
+.withBulk(config.getInt("bolt.error.indexing.bulk"))
+.withIndexAdapter(adapter)
+.withMetricConfiguration(config);
+
+```
+
+###IndexAdapters
+
+*org.apache.metron.indexing.adapters.ESBaseBulkAdapter - bulk ingest messages into Elastic Search
+*org.apache.metron.indexing.adapters.ESBaseBulkRotatingAdapter - does everything adapter above does, but is able to rotate the index names based on size
+*org.apache.metron.indexing.adapters.ESTimedBulkRotatingAdapter - does everything adapter above does, but is able to rotate the index names based on size and time
+*org.apache.metron.indexing.adapters.SolrAdapter - currently under development
+
+/etc/ directory contains all environment-related configs
+
+##Sample Input and Generator Spout
+
+The sample input for topologies provided in this release was checked in here:
+
+```
+https://github.com/apache/incubator-metron-streaming/tree/master/Metron-Topologies/src/main/resources/SampleInput
+```
+
+We provide a generator spout that is able to drive these topologies. In production we run with the kafka spout, but for documentation on that please reference the Storm project documentation
+
+The generator spout comes with the following signature:
+
+```
+GenericInternalTestSpout testSpout = new GenericInternalTestSpout()
+.withFilename(test_file_path).withRepeating(
+config.getBoolean("spout.test.parallelism.repeat"));
+```
+
+* the repeat variable defines if the generator spout will loop through the input or stop once it gets to the end of file
+
+###Additional Storm Bolts
+In addition to custom bolts developed for Metron we utilize standard bolts and spouts included with the Storm release. We will not provide documentation for these spouts and bolts since they are provided as part of Storm. These spouts bolts are:
+
+* KafkaSpout
+* KafkaBolt
+* HDFSBolt
+* HBaseBolt
http://git-wip-us.apache.org/repos/asf/incubator-metron/blob/244a5359/metron-streaming/Metron-Indexing/pom.xml.versionsBackup
----------------------------------------------------------------------
diff --git a/metron-streaming/Metron-Indexing/pom.xml.versionsBackup b/metron-streaming/Metron-Indexing/pom.xml.versionsBackup
deleted file mode 100644
index 11bf51e..0000000
--- a/metron-streaming/Metron-Indexing/pom.xml.versionsBackup
+++ /dev/null
@@ -1,91 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?><!-- Licensed to the Apache Software
- Foundation (ASF) under one or more contributor license agreements. See the
- NOTICE file distributed with this work for additional information regarding
- copyright ownership. The ASF licenses this file to You under the Apache License,
- Version 2.0 (the "License"); you may not use this file except in compliance
- with the License. You may obtain a copy of the License at http://www.apache.org/licenses/LICENSE-2.0
- Unless required by applicable law or agreed to in writing, software distributed
- under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES
- OR CONDITIONS OF ANY KIND, either express or implied. See the License for
- the specific language governing permissions and limitations under the License. -->
-
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
- <modelVersion>4.0.0</modelVersion>
- <parent>
- <groupId>com.opensoc</groupId>
- <artifactId>OpenSOC-Streaming</artifactId>
- <version>0.0.1-SNAPSHOT</version>
- </parent>
- <artifactId>OpenSOC-Indexing</artifactId>
- <properties>
- <opensoc.common.version>0.0.1-SNAPSHOT</opensoc.common.version>
- <storm.version>0.9.1-incubating</storm.version>
- <elastic.search.version>1.2.1</elastic.search.version>
- <http.client.version>4.3.4</http.client.version>
- <jsonsimple.version>1.1.1</jsonsimple.version>
- </properties>
- <dependencies>
-
- <dependency>
- <groupId>com.opensoc</groupId>
- <artifactId>OpenSOC-Common</artifactId>
- <version>${opensoc.common.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.storm</groupId>
- <artifactId>storm-core</artifactId>
- <version>${storm.version}</version>
- <scope>provided</scope>
- </dependency>
- <dependency>
- <groupId>org.elasticsearch</groupId>
- <artifactId>elasticsearch</artifactId>
- <version>${elastic.search.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.httpcomponents</groupId>
- <artifactId>httpclient</artifactId>
- <version>${http.client.version}</version>
- </dependency>
- <dependency>
- <groupId>com.googlecode.json-simple</groupId>
- <artifactId>json-simple</artifactId>
- <version>${jsonsimple.version}</version>
- </dependency>
-
- <dependency>
- <groupId>commons-configuration</groupId>
- <artifactId>commons-configuration</artifactId>
- <version>1.9</version>
- <scope>provided</scope>
- </dependency>
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <version>3.8.2</version>
- </dependency>
-
- </dependencies>
-<reporting>
- <plugins>
- <!-- Normally, dependency report takes time, skip it -->
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-project-info-reports-plugin</artifactId>
- <version>2.7</version>
-
- <configuration>
- <dependencyLocationsEnabled>false</dependencyLocationsEnabled>
- </configuration>
- </plugin>
-
- <plugin>
- <groupId>org.codehaus.mojo</groupId>
- <artifactId>emma-maven-plugin</artifactId>
- <version>1.0-alpha-3</version>
- <inherited>true</inherited>
- </plugin>
- </plugins>
- </reporting>
-</project>
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/incubator-metron/blob/244a5359/metron-streaming/Metron-Indexing/readme.md
----------------------------------------------------------------------
diff --git a/metron-streaming/Metron-Indexing/readme.md b/metron-streaming/Metron-Indexing/readme.md
deleted file mode 100644
index 4e81abd..0000000
--- a/metron-streaming/Metron-Indexing/readme.md
+++ /dev/null
@@ -1,61 +0,0 @@
-#Metron-Indexing
-
-##Module Description
-
-This module provides the indexing capability to Metron components. The primary indexing engine for now is Elastic Search, but Solr may be supported at some point in the future as well. There are three types of messages that are commonly indexed in Metron topologies: messages, alerts, and errors. Messages are telemetry messages parsed by the parser bolt. Alerts are alerts generated by the alerts bolt. Errors are an optional feature where each Metron bolt in addition to outputting errors in the log file will also index them for immediate analysis.
-
-###Index bolt
-
-The signature of the index bolt is as follows:
-
-```
-TelemetryIndexingBolt indexing_bolt = new TelemetryIndexingBolt()
-.withIndexIP(config.getString("es.ip"))
-.withIndexPort(config.getInt("es.port"))
-.withClusterName(config.getString("es.clustername"))
-.withIndexName(
-config.getString("bolt.error.indexing.indexname"))
-.withDocumentName(
-config.getString("bolt.error.indexing.documentname"))
-.withBulk(config.getInt("bolt.error.indexing.bulk"))
-.withIndexAdapter(adapter)
-.withMetricConfiguration(config);
-
-```
-
-###IndexAdapters
-
-*org.apache.metron.indexing.adapters.ESBaseBulkAdapter - bulk ingest messages into Elastic Search
-*org.apache.metron.indexing.adapters.ESBaseBulkRotatingAdapter - does everything adapter above does, but is able to rotate the index names based on size
-*org.apache.metron.indexing.adapters.ESTimedBulkRotatingAdapter - does everything adapter above does, but is able to rotate the index names based on size and time
-*org.apache.metron.indexing.adapters.SolrAdapter - currently under development
-
-/etc/ directory contains all environment-related configs
-
-##Sample Input and Generator Spout
-
-The sample input for topologies provided in this release was checked in here:
-
-```
-https://github.com/apache/incubator-metron-streaming/tree/master/Metron-Topologies/src/main/resources/SampleInput
-```
-
-We provide a generator spout that is able to drive these topologies. In production we run with the kafka spout, but for documentation on that please reference the Storm project documentation
-
-The generator spout comes with the following signature:
-
-```
-GenericInternalTestSpout testSpout = new GenericInternalTestSpout()
-.withFilename(test_file_path).withRepeating(
-config.getBoolean("spout.test.parallelism.repeat"));
-```
-
-* the repeat variable defines if the generator spout will loop through the input or stop once it gets to the end of file
-
-###Additional Storm Bolts
-In addition to custom bolts developed for Metron we utilize standard bolts and spouts included with the Storm release. We will not provide documentation for these spouts and bolts since they are provided as part of Storm. These spouts bolts are:
-
-* KafkaSpout
-* KafkaBolt
-* HDFSBolt
-* HBaseBolt
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/incubator-metron/blob/244a5359/metron-streaming/Metron-MessageParsers/README.md
----------------------------------------------------------------------
diff --git a/metron-streaming/Metron-MessageParsers/README.md b/metron-streaming/Metron-MessageParsers/README.md
new file mode 100644
index 0000000..509f02e
--- /dev/null
+++ b/metron-streaming/Metron-MessageParsers/README.md
@@ -0,0 +1,82 @@
+#Metron-Parsers
+
+##Module Description
+
+This module provides a list of parsers that can be used with the Metron framework. There are two types of parsers. First type is a Java parser. This kind of parser is optimized for speed and performance and is built for use with higher velicity topologies. These parsers are not easily modifiable and in order to make changes to them the entire topology need to be recompiled. The second type of parser provided with the system is a Grok parser. This type of parser is primarily designed for lower-velocity topologies or for quickly standing up a parser for a new telemetry before a permanent Java parser can be written for it.
+
+##Message Format
+
+All Metron messages follow a specific format in order to ingest a message. If a message does not conform to this format it will be dropped and put onto an error queue for further examination. The message must be of a JSON format and must have a JSON tag message like so:
+
+```
+{"message" : message content}
+
+```
+
+Where appropriate there is also a standardization around the 5-tuple JSON fields. This is done so the topology correlation engine further down stream can correlate messages from different topologies by these fields. We are currently working on expanding the message standardization beyond these fields, but this feature is not yet availabe. The standard field names are as follows:
+
+* ip_src_addr: layer 3 source IP
+* ip_dst_addr: layer 3 dest IP
+* ip_src_port: layer 4 source port
+* ip_dst_port: layer 4 dest port
+* protocol: layer 4 protocol
+* timestamp (epoch)
+* original_string: A human friendly string representation of the message
+
+The timestamp and original_string fields are madatory. The remaining standard fields are optional. If any of the optional fields are not applicable then the field should be left out of the JSON.
+
+So putting it all together a typical Metron message with all 5-tuple fields present would look like the following:
+
+```json
+{
+"message":
+{"ip_src_addr": xxxx,
+"ip_dst_addr": xxxx,
+"ip_src_port": xxxx,
+"ip_dst_port": xxxx,
+"protocol": xxxx,
+"original_string": xxx,
+"additional-field 1": xxx,
+}
+
+}
+```
+
+##Parser Bolt
+
+The Metron parser bolt is a standard bolt, which can be extended with multiple Java and Grok parser adapter for parsing different topology messages. The bolt signature for declaration in a storm topology is as follows:
+
+```
+AbstractParserBolt parser_bolt = new TelemetryParserBolt()
+.withMessageParser(parser)
+.withMessageFilter(new GenericMessageFilter())
+.withMetricConfig(config);
+
+```
+
+Metric Config - optional argument for exporting custom metrics to graphite. If set to null no metrics will be exported. If set, then a list of metrics defined in the metrics.conf file of each topology will define will metrics are exported and how often.
+
+Message Filter - a filter defining which messages can be dropped. This feature is only present in the Java paerer adapters
+
+Message Parser - defines the parser adapter to be used for a topology
+
+##Parser Adapters
+
+Parser adapters are loaded dynamically in each Metron topology. They are defined in topology.conf in the configuration item bolt.parser.adapter
+
+###Java Parser Adapters
+Java parser adapters are indended for higher-velocity topologies and are not easily changed or extended. As the adoption of Metron continues we plan on extending our library of Java adapters to process more log formats. As of this moment the Java adapters included with Metron are:
+
+* org.apache.metron.parsing.parsers.BasicIseParser : Parse ISE messages
+* org.apache.metron.parsing.parsers.BasicBroParser : Parse Bro messages
+* org.apache.metron.parsing.parsers.BasicSourcefireParser : Parse Sourcefire messages
+* org.apache.metron.parsing.parsers.BasicLancopeParser : Parse Lancope messages
+
+###Grok Parser Adapters
+Grok parser adapters are designed primarly for someone who is not a Java coder for quickly standing up a parser adapter for lower velocity topologies. Grok relies on Regex for message parsing, which is much slower than purpose-built Java parsers, but is more extensible. Grok parsers are defined via a config file and the topplogy does not need to be recombiled in order to make changes to them. An example of a Grok perser is:
+
+* org.apache.metron.parsing.parsers.GrokSourcefireParser
+
+For more information on the Grok project please refer to the following link:
+
+https://github.com/thekrakken/java-grok
http://git-wip-us.apache.org/repos/asf/incubator-metron/blob/244a5359/metron-streaming/Metron-MessageParsers/pom.xml.versionsBackup
----------------------------------------------------------------------
diff --git a/metron-streaming/Metron-MessageParsers/pom.xml.versionsBackup b/metron-streaming/Metron-MessageParsers/pom.xml.versionsBackup
deleted file mode 100644
index ef2d97d..0000000
--- a/metron-streaming/Metron-MessageParsers/pom.xml.versionsBackup
+++ /dev/null
@@ -1,74 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?><!--
- Licensed to the Apache Software Foundation (ASF) under one or more
- contributor license agreements. See the NOTICE file distributed with
- this work for additional information regarding copyright ownership.
- The ASF licenses this file to You under the Apache License, Version 2.0
- (the "License"); you may not use this file except in compliance with
- the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
--->
-
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
- <modelVersion>4.0.0</modelVersion>
- <parent>
- <groupId>com.opensoc</groupId>
- <artifactId>OpenSOC-Streaming</artifactId>
- <version>0.0.1-SNAPSHOT</version>
- </parent>
- <artifactId>OpenSOC-MessageParsers</artifactId>
- <properties>
- <opensoc.common.version>0.0.1-SNAPSHOT</opensoc.common.version>
- <storm.version>0.9.1-incubating</storm.version>
- </properties>
- <dependencies>
- <dependency>
- <groupId>com.opensoc</groupId>
- <artifactId>OpenSOC-Common</artifactId>
- <version>${opensoc.common.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.storm</groupId>
- <artifactId>storm-core</artifactId>
- <version>${storm.version}</version>
- <scope>provided</scope>
- </dependency>
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <version>3.8.2</version>
- </dependency>
- </dependencies>
-<reporting>
- <plugins>
- <!-- Normally, dependency report takes time, skip it -->
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-project-info-reports-plugin</artifactId>
- <version>2.7</version>
-
- <configuration>
- <dependencyLocationsEnabled>false</dependencyLocationsEnabled>
- </configuration>
- </plugin>
- <plugin>
- <groupId>org.codehaus.mojo</groupId>
- <artifactId>emma-maven-plugin</artifactId>
- <version>1.0-alpha-3</version>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-pmd-plugin</artifactId>
- <configuration>
- <targetJdk>1.7</targetJdk>
- </configuration>
- </plugin>
- </plugins>
- </reporting>
-</project>
http://git-wip-us.apache.org/repos/asf/incubator-metron/blob/244a5359/metron-streaming/Metron-MessageParsers/readme.md
----------------------------------------------------------------------
diff --git a/metron-streaming/Metron-MessageParsers/readme.md b/metron-streaming/Metron-MessageParsers/readme.md
deleted file mode 100644
index 509f02e..0000000
--- a/metron-streaming/Metron-MessageParsers/readme.md
+++ /dev/null
@@ -1,82 +0,0 @@
-#Metron-Parsers
-
-##Module Description
-
-This module provides a list of parsers that can be used with the Metron framework. There are two types of parsers. First type is a Java parser. This kind of parser is optimized for speed and performance and is built for use with higher velicity topologies. These parsers are not easily modifiable and in order to make changes to them the entire topology need to be recompiled. The second type of parser provided with the system is a Grok parser. This type of parser is primarily designed for lower-velocity topologies or for quickly standing up a parser for a new telemetry before a permanent Java parser can be written for it.
-
-##Message Format
-
-All Metron messages follow a specific format in order to ingest a message. If a message does not conform to this format it will be dropped and put onto an error queue for further examination. The message must be of a JSON format and must have a JSON tag message like so:
-
-```
-{"message" : message content}
-
-```
-
-Where appropriate there is also a standardization around the 5-tuple JSON fields. This is done so the topology correlation engine further down stream can correlate messages from different topologies by these fields. We are currently working on expanding the message standardization beyond these fields, but this feature is not yet availabe. The standard field names are as follows:
-
-* ip_src_addr: layer 3 source IP
-* ip_dst_addr: layer 3 dest IP
-* ip_src_port: layer 4 source port
-* ip_dst_port: layer 4 dest port
-* protocol: layer 4 protocol
-* timestamp (epoch)
-* original_string: A human friendly string representation of the message
-
-The timestamp and original_string fields are madatory. The remaining standard fields are optional. If any of the optional fields are not applicable then the field should be left out of the JSON.
-
-So putting it all together a typical Metron message with all 5-tuple fields present would look like the following:
-
-```json
-{
-"message":
-{"ip_src_addr": xxxx,
-"ip_dst_addr": xxxx,
-"ip_src_port": xxxx,
-"ip_dst_port": xxxx,
-"protocol": xxxx,
-"original_string": xxx,
-"additional-field 1": xxx,
-}
-
-}
-```
-
-##Parser Bolt
-
-The Metron parser bolt is a standard bolt, which can be extended with multiple Java and Grok parser adapter for parsing different topology messages. The bolt signature for declaration in a storm topology is as follows:
-
-```
-AbstractParserBolt parser_bolt = new TelemetryParserBolt()
-.withMessageParser(parser)
-.withMessageFilter(new GenericMessageFilter())
-.withMetricConfig(config);
-
-```
-
-Metric Config - optional argument for exporting custom metrics to graphite. If set to null no metrics will be exported. If set, then a list of metrics defined in the metrics.conf file of each topology will define will metrics are exported and how often.
-
-Message Filter - a filter defining which messages can be dropped. This feature is only present in the Java paerer adapters
-
-Message Parser - defines the parser adapter to be used for a topology
-
-##Parser Adapters
-
-Parser adapters are loaded dynamically in each Metron topology. They are defined in topology.conf in the configuration item bolt.parser.adapter
-
-###Java Parser Adapters
-Java parser adapters are indended for higher-velocity topologies and are not easily changed or extended. As the adoption of Metron continues we plan on extending our library of Java adapters to process more log formats. As of this moment the Java adapters included with Metron are:
-
-* org.apache.metron.parsing.parsers.BasicIseParser : Parse ISE messages
-* org.apache.metron.parsing.parsers.BasicBroParser : Parse Bro messages
-* org.apache.metron.parsing.parsers.BasicSourcefireParser : Parse Sourcefire messages
-* org.apache.metron.parsing.parsers.BasicLancopeParser : Parse Lancope messages
-
-###Grok Parser Adapters
-Grok parser adapters are designed primarly for someone who is not a Java coder for quickly standing up a parser adapter for lower velocity topologies. Grok relies on Regex for message parsing, which is much slower than purpose-built Java parsers, but is more extensible. Grok parsers are defined via a config file and the topplogy does not need to be recombiled in order to make changes to them. An example of a Grok perser is:
-
-* org.apache.metron.parsing.parsers.GrokSourcefireParser
-
-For more information on the Grok project please refer to the following link:
-
-https://github.com/thekrakken/java-grok
http://git-wip-us.apache.org/repos/asf/incubator-metron/blob/244a5359/metron-streaming/Metron-MessageParsers/src/test/resources/config/BasicFireEyeParserTest.config
----------------------------------------------------------------------
diff --git a/metron-streaming/Metron-MessageParsers/src/test/resources/config/BasicFireEyeParserTest.config b/metron-streaming/Metron-MessageParsers/src/test/resources/config/BasicFireEyeParserTest.config
index 8073cec..4b4c648 100644
--- a/metron-streaming/Metron-MessageParsers/src/test/resources/config/BasicFireEyeParserTest.config
+++ b/metron-streaming/Metron-MessageParsers/src/test/resources/config/BasicFireEyeParserTest.config
@@ -1,2 +1,20 @@
+#
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements. See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership. The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License. You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+
#BasicFireEyeParserTestConfig
logFile=src/test/resources/FireEyeParserTest.log
http://git-wip-us.apache.org/repos/asf/incubator-metron/blob/244a5359/metron-streaming/Metron-MessageParsers/src/test/resources/config/BasicIseParserTest.config
----------------------------------------------------------------------
diff --git a/metron-streaming/Metron-MessageParsers/src/test/resources/config/BasicIseParserTest.config b/metron-streaming/Metron-MessageParsers/src/test/resources/config/BasicIseParserTest.config
index ac158a5..d57dace 100644
--- a/metron-streaming/Metron-MessageParsers/src/test/resources/config/BasicIseParserTest.config
+++ b/metron-streaming/Metron-MessageParsers/src/test/resources/config/BasicIseParserTest.config
@@ -1,2 +1,20 @@
+#
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements. See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership. The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License. You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+
#IseParserTestConfig
logFile=src/test/resources/IseParserTest.log
http://git-wip-us.apache.org/repos/asf/incubator-metron/blob/244a5359/metron-streaming/Metron-MessageParsers/src/test/resources/config/BasicLancopeParserTest.config
----------------------------------------------------------------------
diff --git a/metron-streaming/Metron-MessageParsers/src/test/resources/config/BasicLancopeParserTest.config b/metron-streaming/Metron-MessageParsers/src/test/resources/config/BasicLancopeParserTest.config
index edafc56..bd32770 100644
--- a/metron-streaming/Metron-MessageParsers/src/test/resources/config/BasicLancopeParserTest.config
+++ b/metron-streaming/Metron-MessageParsers/src/test/resources/config/BasicLancopeParserTest.config
@@ -1,2 +1,20 @@
+#
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements. See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership. The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License. You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+
#LancopeParserTestConfig
logFile=src/test/resources/LancopeParserTest.log
http://git-wip-us.apache.org/repos/asf/incubator-metron/blob/244a5359/metron-streaming/Metron-MessageParsers/src/test/resources/config/BasicPaloAltoFirewallParserTest.config
----------------------------------------------------------------------
diff --git a/metron-streaming/Metron-MessageParsers/src/test/resources/config/BasicPaloAltoFirewallParserTest.config b/metron-streaming/Metron-MessageParsers/src/test/resources/config/BasicPaloAltoFirewallParserTest.config
index 613c314..61b649e 100644
--- a/metron-streaming/Metron-MessageParsers/src/test/resources/config/BasicPaloAltoFirewallParserTest.config
+++ b/metron-streaming/Metron-MessageParsers/src/test/resources/config/BasicPaloAltoFirewallParserTest.config
@@ -1,2 +1,20 @@
+#
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements. See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership. The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License. You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+
#BasicFireEyeParserTestConfig
logFile=src/test/resources/PaloAltoFirewallParserTest.log
http://git-wip-us.apache.org/repos/asf/incubator-metron/blob/244a5359/metron-streaming/Metron-MessageParsers/src/test/resources/config/BasicSourcefireParserTest.config
----------------------------------------------------------------------
diff --git a/metron-streaming/Metron-MessageParsers/src/test/resources/config/BasicSourcefireParserTest.config b/metron-streaming/Metron-MessageParsers/src/test/resources/config/BasicSourcefireParserTest.config
index 556a54c..685b0fd 100644
--- a/metron-streaming/Metron-MessageParsers/src/test/resources/config/BasicSourcefireParserTest.config
+++ b/metron-streaming/Metron-MessageParsers/src/test/resources/config/BasicSourcefireParserTest.config
@@ -1,2 +1,20 @@
+#
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements. See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership. The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License. You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+
#BasicSourceFileParserTestConfig
logFile=src/test/resources/SourceFireTest.log
http://git-wip-us.apache.org/repos/asf/incubator-metron/blob/244a5359/metron-streaming/Metron-MessageParsers/src/test/resources/config/BroParserTest.config
----------------------------------------------------------------------
diff --git a/metron-streaming/Metron-MessageParsers/src/test/resources/config/BroParserTest.config b/metron-streaming/Metron-MessageParsers/src/test/resources/config/BroParserTest.config
index c50743c..0dcfc71 100644
--- a/metron-streaming/Metron-MessageParsers/src/test/resources/config/BroParserTest.config
+++ b/metron-streaming/Metron-MessageParsers/src/test/resources/config/BroParserTest.config
@@ -1,2 +1,20 @@
+#
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements. See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership. The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License. You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+
#BroParserTestConfig
logFile=src/test/resources/BroParserTest.log
http://git-wip-us.apache.org/repos/asf/incubator-metron/blob/244a5359/metron-streaming/Metron-MessageParsers/src/test/resources/config/GrokAsaParserTest.config
----------------------------------------------------------------------
diff --git a/metron-streaming/Metron-MessageParsers/src/test/resources/config/GrokAsaParserTest.config b/metron-streaming/Metron-MessageParsers/src/test/resources/config/GrokAsaParserTest.config
index 2f41210..9dbc3b6 100644
--- a/metron-streaming/Metron-MessageParsers/src/test/resources/config/GrokAsaParserTest.config
+++ b/metron-streaming/Metron-MessageParsers/src/test/resources/config/GrokAsaParserTest.config
@@ -1,2 +1,20 @@
+#
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements. See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership. The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License. You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+
#GrokParserTestConfig
logFile=src/test/resources/GrokParserTest.log
http://git-wip-us.apache.org/repos/asf/incubator-metron/blob/244a5359/metron-streaming/Metron-Pcap_Service/pom.xml.versionsBackup
----------------------------------------------------------------------
diff --git a/metron-streaming/Metron-Pcap_Service/pom.xml.versionsBackup b/metron-streaming/Metron-Pcap_Service/pom.xml.versionsBackup
deleted file mode 100644
index a400fe2..0000000
--- a/metron-streaming/Metron-Pcap_Service/pom.xml.versionsBackup
+++ /dev/null
@@ -1,268 +0,0 @@
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
- <modelVersion>4.0.0</modelVersion>
- <parent>
- <groupId>com.opensoc</groupId>
- <artifactId>OpenSOC-Streaming</artifactId>
- <version>0.4BETA</version>
- </parent>
- <artifactId>OpenSOC-Pcap_Service</artifactId>
- <description>OpenSOC Pcap_Service</description>
- <properties>
- <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
- <flume.version>1.4.0.2.0.6.0-76</flume.version>
- <hadoop.version>2.2.0.2.0.6.0-76</hadoop.version>
- <maven.compiler.source>${jdk.version}</maven.compiler.source>
- <maven.compiler.target>${jdk.version}</maven.compiler.target>
-
- <storm.version>0.9.2-incubating</storm.version>
- <kafka.version>0.8.0</kafka.version>
- <slf4j.version>1.7.5</slf4j.version>
- <zookeeper.version>3.4.5.2.0.6.0-76</zookeeper.version>
- <logger.version>1.2.15</logger.version>
-
- <storm-kafka.version>0.9.2-incubating</storm-kafka.version>
- <storm-hdfs.version>0.0.7-SNAPSHOT</storm-hdfs.version>
- <storm-hbase.version>0.0.5-SNAPSHOT</storm-hbase.version>
-
- <spring.integration.version>3.0.0.RELEASE</spring.integration.version>
- <spring.version>3.2.6.RELEASE</spring.version>
- <commons-fileupload.version>1.2.2</commons-fileupload.version>
- <commons-io.version>2.4</commons-io.version>
- <commons-configuration.version>1.10</commons-configuration.version>
- <commons-lang.version>2.6</commons-lang.version>
- <commons-collections.version>3.2.1</commons-collections.version>
- <commons-beanutils.version>1.8.3</commons-beanutils.version>
- <commons-jexl.version>2.1.1</commons-jexl.version>
-
-
- <junit.version>4.11</junit.version>
- <hamcrest.version>1.3</hamcrest.version>
- <mockito.version>1.9.5</mockito.version>
- <elastic-search.version>1.3.0</elastic-search.version>
- </properties>
- <dependencies>
- <dependency>
- <groupId>org.jboss.resteasy</groupId>
- <artifactId>jaxrs-api</artifactId>
- <version>3.0.4.Final</version>
- </dependency>
- <dependency>
- <groupId>com.opensoc</groupId>
- <artifactId>OpenSOC-Common</artifactId>
- <version>${parent.version}</version>
- </dependency>
-
- <dependency>
- <groupId>commons-beanutils</groupId>
- <artifactId>commons-beanutils</artifactId>
- <version>${commons-beanutils.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.commons</groupId>
- <artifactId>commons-jexl</artifactId>
- <version>${commons-jexl.version}</version>
- </dependency>
-
- <dependency>
- <artifactId>commons-configuration</artifactId>
- <groupId>commons-configuration</groupId>
- <version>${commons-configuration.version}</version>
- <exclusions>
- <exclusion>
- <groupId>org.slf4j</groupId>
- <artifactId>slf4j-api</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <version>${junit.version}</version>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.powermock</groupId>
- <artifactId>powermock-api-mockito</artifactId>
- <version>1.5</version>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.powermock</groupId>
- <artifactId>powermock-core</artifactId>
- <version>1.5</version>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.powermock</groupId>
- <artifactId>powermock-module-junit4</artifactId>
- <version>1.5</version>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>joda-time</groupId>
- <artifactId>joda-time</artifactId>
- <version>2.3</version>
- </dependency>
- <dependency>
- <groupId>org.apache.hbase</groupId>
- <artifactId>hbase-client</artifactId>
- <version>${global_hbase_version}</version>
- <scope>provided</scope>
- <exclusions>
- <exclusion>
- <groupId>org.slf4j</groupId>
- <artifactId>slf4j-log4j12</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
- <dependency>
- <groupId>org.apache.hbase</groupId>
- <artifactId>hbase-testing-util</artifactId>
- <version>${global_hbase_version}</version>
- <scope>provided</scope>
- <exclusions>
- <exclusion>
- <groupId>org.slf4j</groupId>
- <artifactId>slf4j-log4j12</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
- <dependency>
- <groupId>org.apache.hadoop</groupId>
- <artifactId>hadoop-common</artifactId>
- <version>${global_hadoop_version}</version>
- <scope>provided</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.hadoop</groupId>
- <artifactId>hadoop-hdfs</artifactId>
- <version>${global_hadoop_version}</version>
- <scope>provided</scope>
- </dependency>
-
- <dependency>
- <groupId>org.springframework.integration</groupId>
- <artifactId>spring-integration-http</artifactId>
- <version>${spring.integration.version}</version>
- </dependency>
- <dependency>
- <groupId>org.springframework</groupId>
- <artifactId>spring-webmvc</artifactId>
- <version>${spring.version}</version>
- </dependency>
- <dependency>
- <groupId>log4j</groupId>
- <artifactId>log4j</artifactId>
- <version>${logger.version}</version>
- <exclusions>
- <exclusion>
- <groupId>com.sun.jmx</groupId>
- <artifactId>jmxri</artifactId>
- </exclusion>
- <exclusion>
- <groupId>com.sun.jdmk</groupId>
- <artifactId>jmxtools</artifactId>
- </exclusion>
- <exclusion>
- <groupId>javax.jms</groupId>
- <artifactId>jms</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
-
-
-
-
-
- <dependency>
- <groupId>org.jboss.resteasy</groupId>
- <artifactId>resteasy-jaxrs</artifactId>
- <version>3.0.1.Final</version>
- <exclusions>
- <exclusion>
- <groupId>org.slf4j</groupId>
- <artifactId>slf4j-simple</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
- <dependency>
- <groupId>org.jboss.resteasy</groupId>
- <artifactId>resteasy-jaxb-provider</artifactId>
- <version>3.0.1.Final</version>
- <scope>compile</scope>
- </dependency>
- <dependency>
- <groupId>org.jboss.resteasy</groupId>
- <artifactId>async-http-servlet-3.0</artifactId>
- <version>3.0.1.Final</version>
- <scope>compile</scope>
- </dependency>
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- <dependency>
- <groupId>org.eclipse.jetty</groupId>
- <artifactId>jetty-server</artifactId>
- <version>9.3.0.M0</version>
- </dependency>
- <dependency>
- <groupId>org.eclipse.jetty</groupId>
- <artifactId>jetty-servlet</artifactId>
- <version>9.3.0.M0</version>
- </dependency>
- <dependency>
- <groupId>org.slf4j</groupId>
- <artifactId>slf4j-simple</artifactId>
- <version>${global_slf4j_version}</version>
- </dependency>
- <dependency>
- <groupId>org.slf4j</groupId>
- <artifactId>slf4j-api</artifactId>
- <version>${global_slf4j_version}</version>
- </dependency>
- <dependency>
- <groupId>org.slf4j</groupId>
- <artifactId>slf4j-log4j12</artifactId>
- <version>${global_slf4j_version}</version>
- </dependency>
- </dependencies>
-
- <build>
- <plugins>
- <plugin>
- <artifactId>maven-assembly-plugin</artifactId>
- <configuration>
- <archive>
- <manifest>
- <mainClass>com.opensoc.pcapservice.rest.PcapService</mainClass>
- </manifest>
- </archive>
- <descriptorRefs>
- <descriptorRef>jar-with-dependencies</descriptorRef>
- </descriptorRefs>
- </configuration>
- <executions>
- <execution>
- <id>make-assembly</id> <!-- this is used for inheritance merges -->
- <phase>package</phase> <!-- bind to the packaging phase -->
- <goals>
- <goal>single</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
- </plugins>
- </build>
-</project>
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/incubator-metron/blob/244a5359/metron-streaming/Metron-Pcap_Service/src/main/resources/config-definition-hbase.xml
----------------------------------------------------------------------
diff --git a/metron-streaming/Metron-Pcap_Service/src/main/resources/config-definition-hbase.xml b/metron-streaming/Metron-Pcap_Service/src/main/resources/config-definition-hbase.xml
index efe05e8..98ece42 100644
--- a/metron-streaming/Metron-Pcap_Service/src/main/resources/config-definition-hbase.xml
+++ b/metron-streaming/Metron-Pcap_Service/src/main/resources/config-definition-hbase.xml
@@ -1,5 +1,21 @@
<?xml version="1.0" encoding="ISO-8859-1" ?>
+<!--
+Licensed to the Apache Software Foundation (ASF) under one
+or more contributor license agreements. See the NOTICE file
+distributed with this work for additional information
+regarding copyright ownership. The ASF licenses this file
+to you under the Apache License, Version 2.0 (the
+"License"); you may not use this file except in compliance
+with the License. You may obtain a copy of the License at
+ http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+-->
<configuration>
<header>
<result delimiterParsingDisabled="true" forceReloadCheck="true"></result>
@@ -15,20 +31,20 @@
</lookups>
</header>
<override>
- <!-- 1. properties from 'hbae-config.properties' are loaded first;
+ <!-- 1. properties from 'hbae-config.properties' are loaded first;
if a property is not present in this file, then it will search in the files in the order they are defined here.
2. 'refreshDelay' indicates the minimum delay in milliseconds between checks to see if the underlying file is changed.
- 3. 'config-optional' indicates this file is not required -->
-
+ 3. 'config-optional' indicates this file is not required -->
+
<properties fileName="${expr:System.getProperty('configPath')+'/hbase-config.properties'}" config-optional="true">
<reloadingStrategy refreshDelay="${expr:System.getProperty('configRefreshDelay')}"
config-class="org.apache.commons.configuration.reloading.FileChangedReloadingStrategy"/>
</properties>
-
+
<properties fileName="hbase-config-default.properties" config-optional="true">
<!-- <reloadingStrategy refreshDelay="${expr:System.getProperty('defaultConfigRefreshDelay')}"
config-class="org.apache.commons.configuration.reloading.FileChangedReloadingStrategy"/>
--> </properties>
-
+
</override>
-</configuration>
\ No newline at end of file
+</configuration>
http://git-wip-us.apache.org/repos/asf/incubator-metron/blob/244a5359/metron-streaming/Metron-Topologies/README.md
----------------------------------------------------------------------
diff --git a/metron-streaming/Metron-Topologies/README.md b/metron-streaming/Metron-Topologies/README.md
new file mode 100644
index 0000000..f19d910
--- /dev/null
+++ b/metron-streaming/Metron-Topologies/README.md
@@ -0,0 +1,39 @@
+#Metron-Topologies
+
+#Module Description
+
+This module provides example topologies that show how to drive Metron modules and components. The sample topologies provided are to process PCAP, Ise, Lancope, and Bro telemetries
+
+##Launching Topologies
+
+We use Storm Flux to launch topologies, which are each described in a YAML file.
+
+```
+storm jar target/Metron-Topologies-0.1BETA.jar org.apache.storm.flux.Flux --local src/main/resources/Metron_Configs/topologies/bro/local.yaml --filter src/main/resources/Metron_Configs/etc/env/config.properties
+
+storm jar target/Metron-Topologies-0.1BETA.jar org.apache.storm.flux.Flux --remote src/main/resources/Metron_Configs/topologies/bro/remote.yaml --filter src/main/resources/Metron_Configs/etc/env/config.properties
+```
+
+Note that if you use `--local` it will run the topology in local mode, using test data. If you use `--remote` it will attempt to connect to and deploy to Storm Nimbus.
+
+Each topology's YAML files are responsible for either connecting to a real spout or enabling their own testing spout. This is the primary reason different `local.yaml` and `remote.yaml` files are provided for each topology.
+
+##Topology Configs
+
+The sample topologies provided use a specific directory structure. The example directory structure was checked in here:
+
+```
+https://github.com/apache/incubator-metron/tree/master/metron-streaming/Metron-Topologies/src/main/resources/Metron_Configs
+```
+
+Each topology has a `local.yaml` and a `remote.yaml` file to support local mode and remote mode, respectively.
+
+These topology configurations have variables that can be replaced by the `--filter` option to Flux. These variables are in `src/main/resources/OpenSOC_Configs/etc/env/config.properties`, and apply to:
+
+- Kafka
+- Elasticsearch
+- MySQL
+- Metrics
+- Bolt acks/emits/fails
+- Host enrichment
+- HDFS
http://git-wip-us.apache.org/repos/asf/incubator-metron/blob/244a5359/metron-streaming/Metron-Topologies/pom.xml.versionsBackup
----------------------------------------------------------------------
diff --git a/metron-streaming/Metron-Topologies/pom.xml.versionsBackup b/metron-streaming/Metron-Topologies/pom.xml.versionsBackup
deleted file mode 100644
index 98ada2d..0000000
--- a/metron-streaming/Metron-Topologies/pom.xml.versionsBackup
+++ /dev/null
@@ -1,190 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?><!-- Licensed to the Apache Software
- Foundation (ASF) under one or more contributor license agreements. See the
- NOTICE file distributed with this work for additional information regarding
- copyright ownership. The ASF licenses this file to You under the Apache License,
- Version 2.0 (the "License"); you may not use this file except in compliance
- with the License. You may obtain a copy of the License at http://www.apache.org/licenses/LICENSE-2.0
- Unless required by applicable law or agreed to in writing, software distributed
- under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES
- OR CONDITIONS OF ANY KIND, either express or implied. See the License for
- the specific language governing permissions and limitations under the License. -->
-
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
- <modelVersion>4.0.0</modelVersion>
- <parent>
- <groupId>com.opensoc</groupId>
- <artifactId>OpenSOC-Streaming</artifactId>
- <version>0.0.1-SNAPSHOT</version>
- </parent>
- <artifactId>OpenSOC-Topologies</artifactId>
- <description>OpenSOC Topologies</description>
-
- <properties>
- <opensoc.common.version>0.0.1-SNAPSHOT</opensoc.common.version>
- <opensoc.alerts.version>0.0.1-SNAPSHOT</opensoc.alerts.version>
- <enrichment.geo.version>0.0.1-SNAPSHOT</enrichment.geo.version>
- <enrichment.whois.version>0.0.1-SNAPSHOT</enrichment.whois.version>
- <geo.enrichment.version>0.0.1-SNAPSHOT</geo.enrichment.version>
- <parsers.version>0.0.1-SNAPSHOT</parsers.version>
- <indexing.version>0.0.1-SNAPSHOT</indexing.version>
- <storm.version>0.9.2-incubating</storm.version>
- <storm.hdfs.version>0.9.1.2.1.1.0-385</storm.hdfs.version>
- <hadoop.version>2.2.0</hadoop.version>
- <cli.version>20040117.000000</cli.version>
- <kafka.storm.version>0.9.2-incubating</kafka.storm.version>
- <cif.enrichment.version>0.0.1-SNAPSHOT</cif.enrichment.version>
- <lancope.enrichment.version>0.0.1-SNAPSHOT</lancope.enrichment.version>
- <commons.config.version>1.10</commons.config.version>
- </properties>
- <dependencies>
- <dependency>
- <groupId>com.opensoc</groupId>
- <artifactId>OpenSOC-Common</artifactId>
- <version>${opensoc.common.version}</version>
- </dependency>
- <dependency>
- <groupId>com.opensoc</groupId>
- <artifactId>OpenSOC-Alerts</artifactId>
- <version>${opensoc.alerts.version}</version>
- </dependency>
- <dependency>
- <groupId>com.opensoc</groupId>
- <artifactId>OpenSOC-EnrichmentAdapters</artifactId>
- <version>${enrichment.geo.version}</version>
- </dependency>
- <dependency>
- <groupId>com.opensoc</groupId>
- <artifactId>OpenSOC-MessageParsers</artifactId>
- <version>${parsers.version}</version>
- </dependency>
- <dependency>
- <groupId>com.opensoc</groupId>
- <artifactId>OpenSOC-Indexing</artifactId>
- <version>${indexing.version}</version>
- </dependency>
-
- <dependency>
- <groupId>org.apache.hadoop</groupId>
- <artifactId>hadoop-client</artifactId>
- <version>${hadoop.version}</version>
- <exclusions>
- <exclusion>
- <groupId>org.slf4j</groupId>
- <artifactId>slf4j-log4j12</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
- <dependency>
- <groupId>org.apache.hadoop</groupId>
- <artifactId>hadoop-hdfs</artifactId>
- <version>${hadoop.version}</version>
- <exclusions>
- <exclusion>
- <groupId>org.slf4j</groupId>
- <artifactId>slf4j-log4j12</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
- <dependency>
- <groupId>org.apache.kafka</groupId>
- <artifactId>kafka_2.8.2</artifactId>
- <version>0.8.1</version>
- <exclusions>
- <!--exclusion> <groupId>org.apache.zookeeper</groupId> <artifactId>zookeeper</artifactId>
- </exclusion -->
- <exclusion>
- <groupId>log4j</groupId>
- <artifactId>log4j</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
- <dependency>
- <groupId>org.apache.storm</groupId>
- <artifactId>storm-core</artifactId>
- <version>${storm.version}</version>
- <scope>provided</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.storm</groupId>
- <artifactId>storm-kafka</artifactId>
- <version>${storm.version}</version>
-
- </dependency>
- <dependency>
- <groupId>org.apache.storm</groupId>
- <artifactId>storm</artifactId>
- <version>${storm.version}</version>
- <type>pom</type>
- <scope>provided</scope>
- </dependency>
-<dependency>
- <groupId>com.github.ptgoetz</groupId>
- <artifactId>storm-hbase</artifactId>
- <version>0.1.2</version>
-</dependency>
- <dependency>
- <groupId>com.github.ptgoetz</groupId>
- <artifactId>storm-hdfs</artifactId>
- <version>0.1.2</version>
- </dependency>
- <dependency>
- <groupId>commons-configuration</groupId>
- <artifactId>commons-configuration</artifactId>
- <version>${commons.config.version}</version>
- </dependency>
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <version>3.8.2</version>
- </dependency>
- </dependencies>
- <build>
- <resources>
- <resource>
- <directory>src/main/resources</directory>
- </resource>
- </resources>
- <plugins>
-
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-shade-plugin</artifactId>
- <version>1.4</version>
- <configuration>
- <createDependencyReducedPom>true</createDependencyReducedPom>
- </configuration>
- <executions>
- <execution>
- <phase>package</phase>
- <goals>
- <goal>shade</goal>
- </goals>
- <configuration>
- <artifactSet>
- <excludes>
- <exclude>storm:storm-core:*</exclude>
- <exclude>storm:storm-lib:*</exclude>
- <exclude>*slf4j*</exclude>
- </excludes>
- </artifactSet>
-
- <transformers>
- <transformer
- implementation="org.apache.maven.plugins.shade.resource.DontIncludeResourceTransformer">
- <resource>.yaml</resource>
- </transformer>
- <transformer
- implementation="org.apache.maven.plugins.shade.resource.ServicesResourceTransformer" />
- <transformer
- implementation="org.apache.maven.plugins.shade.resource.ManifestResourceTransformer">
- <mainClass></mainClass>
- </transformer>
- </transformers>
- </configuration>
- </execution>
- </executions>
- </plugin>
- </plugins>
- </build>
-</project>
http://git-wip-us.apache.org/repos/asf/incubator-metron/blob/244a5359/metron-streaming/Metron-Topologies/readme.md
----------------------------------------------------------------------
diff --git a/metron-streaming/Metron-Topologies/readme.md b/metron-streaming/Metron-Topologies/readme.md
deleted file mode 100644
index f19d910..0000000
--- a/metron-streaming/Metron-Topologies/readme.md
+++ /dev/null
@@ -1,39 +0,0 @@
-#Metron-Topologies
-
-#Module Description
-
-This module provides example topologies that show how to drive Metron modules and components. The sample topologies provided are to process PCAP, Ise, Lancope, and Bro telemetries
-
-##Launching Topologies
-
-We use Storm Flux to launch topologies, which are each described in a YAML file.
-
-```
-storm jar target/Metron-Topologies-0.1BETA.jar org.apache.storm.flux.Flux --local src/main/resources/Metron_Configs/topologies/bro/local.yaml --filter src/main/resources/Metron_Configs/etc/env/config.properties
-
-storm jar target/Metron-Topologies-0.1BETA.jar org.apache.storm.flux.Flux --remote src/main/resources/Metron_Configs/topologies/bro/remote.yaml --filter src/main/resources/Metron_Configs/etc/env/config.properties
-```
-
-Note that if you use `--local` it will run the topology in local mode, using test data. If you use `--remote` it will attempt to connect to and deploy to Storm Nimbus.
-
-Each topology's YAML files are responsible for either connecting to a real spout or enabling their own testing spout. This is the primary reason different `local.yaml` and `remote.yaml` files are provided for each topology.
-
-##Topology Configs
-
-The sample topologies provided use a specific directory structure. The example directory structure was checked in here:
-
-```
-https://github.com/apache/incubator-metron/tree/master/metron-streaming/Metron-Topologies/src/main/resources/Metron_Configs
-```
-
-Each topology has a `local.yaml` and a `remote.yaml` file to support local mode and remote mode, respectively.
-
-These topology configurations have variables that can be replaced by the `--filter` option to Flux. These variables are in `src/main/resources/OpenSOC_Configs/etc/env/config.properties`, and apply to:
-
-- Kafka
-- Elasticsearch
-- MySQL
-- Metrics
-- Bolt acks/emits/fails
-- Host enrichment
-- HDFS
http://git-wip-us.apache.org/repos/asf/incubator-metron/blob/244a5359/metron-streaming/Metron-Topologies/src/main/resources/Metron_Configs/etc/whitelists/known_hosts.conf
----------------------------------------------------------------------
diff --git a/metron-streaming/Metron-Topologies/src/main/resources/Metron_Configs/etc/whitelists/known_hosts.conf b/metron-streaming/Metron-Topologies/src/main/resources/Metron_Configs/etc/whitelists/known_hosts.conf
index d20b050..d5b9a33 100644
--- a/metron-streaming/Metron-Topologies/src/main/resources/Metron_Configs/etc/whitelists/known_hosts.conf
+++ b/metron-streaming/Metron-Topologies/src/main/resources/Metron_Configs/etc/whitelists/known_hosts.conf
@@ -1,4 +1,21 @@
+#
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements. See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership. The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License. You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
10.1.128.236={"local":"YES", "type":"webserver", "asset_value" : "important"}
10.1.128.237={"local":"UNKNOWN", "type":"unknown", "asset_value" : "important"}
10.60.10.254={"local":"YES", "type":"printer", "asset_value" : "important"}
-10.0.2.15={"local":"YES", "type":"webserver", "asset_value" : "important"}
\ No newline at end of file
+10.0.2.15={"local":"YES", "type":"webserver", "asset_value" : "important"}
http://git-wip-us.apache.org/repos/asf/incubator-metron/blob/244a5359/metron-streaming/Metron-Topologies/src/main/resources/TopologyConfigs_old/lancope.conf
----------------------------------------------------------------------
diff --git a/metron-streaming/Metron-Topologies/src/main/resources/TopologyConfigs_old/lancope.conf b/metron-streaming/Metron-Topologies/src/main/resources/TopologyConfigs_old/lancope.conf
index c0487d2..454c7da 100644
--- a/metron-streaming/Metron-Topologies/src/main/resources/TopologyConfigs_old/lancope.conf
+++ b/metron-streaming/Metron-Topologies/src/main/resources/TopologyConfigs_old/lancope.conf
@@ -1,3 +1,21 @@
+#
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements. See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership. The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License. You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+
include = env/env_preprod.conf
include = env/metrics.conf
@@ -87,4 +105,4 @@ bolt.hdfs.fs.url=hdfs://nn1:8020
#Kafka Bolt
bolt.kafka.num.tasks=1
bolt.kafka.parallelism.hint=1
-bolt.kafka.topic=test_out
\ No newline at end of file
+bolt.kafka.topic=test_out
http://git-wip-us.apache.org/repos/asf/incubator-metron/blob/244a5359/metron-streaming/README.md
----------------------------------------------------------------------
diff --git a/metron-streaming/README.md b/metron-streaming/README.md
new file mode 100644
index 0000000..4b4df69
--- /dev/null
+++ b/metron-streaming/README.md
@@ -0,0 +1,30 @@
+<!--
+Licensed to the Apache Software Foundation (ASF) under one or more
+contributor license agreements. See the NOTICE file distributed with
+this work for additional information regarding copyright ownership.
+The ASF licenses this file to You under the Apache License, Version 2.0
+(the "License"); you may not use this file except in compliance with
+the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+ -->
+
+# Current Build
+
+The latest build of Metron-Streaming is 0.1BETA.
+
+We are still in the process of merging/porting additional features from our production code base into this open source release. This release will be followed by a number of additional beta releases until the port is complete. We will also work on getting additional documentation and user/developer guides to the community as soon as we can. At this time we offer no support for the beta software, but will try to respond to requests as promptly as we can.
+
+# Metron-Streaming
+
+Extensible set of Storm topologies and topology attributes for streaming, enriching, indexing, and storing telemetry in Hadoop. General information on Metron is available at https://metron.incubator.apache.org/
+
+# Documentation
+
+Please see documentation within each individual module for description and usage instructions. Sample topologies are provided under Metron_Topologies to get you started with the framework. We pre-assume knowledge of Hadoop, Storm, Kafka, and HBase.
http://git-wip-us.apache.org/repos/asf/incubator-metron/blob/244a5359/metron-streaming/pom.xml
----------------------------------------------------------------------
diff --git a/metron-streaming/pom.xml b/metron-streaming/pom.xml
index 1b7cdd6..47ab2cb 100644
--- a/metron-streaming/pom.xml
+++ b/metron-streaming/pom.xml
@@ -1,15 +1,15 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!--
- Licensed to the Apache Software
- Foundation (ASF) under one or more contributor license agreements. See the
- NOTICE file distributed with this work for additional information regarding
- copyright ownership. The ASF licenses this file to You under the Apache License,
- Version 2.0 (the "License"); you may not use this file except in compliance
- with the License. You may obtain a copy of the License at http://www.apache.org/licenses/LICENSE-2.0
- Unless required by applicable law or agreed to in writing, software distributed
- under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES
- OR CONDITIONS OF ANY KIND, either express or implied. See the License for
- the specific language governing permissions and limitations under the License.
+<!--
+ Licensed to the Apache Software
+ Foundation (ASF) under one or more contributor license agreements. See the
+ NOTICE file distributed with this work for additional information regarding
+ copyright ownership. The ASF licenses this file to You under the Apache License,
+ Version 2.0 (the "License"); you may not use this file except in compliance
+ with the License. You may obtain a copy of the License at http://www.apache.org/licenses/LICENSE-2.0
+ Unless required by applicable law or agreed to in writing, software distributed
+ under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES
+ OR CONDITIONS OF ANY KIND, either express or implied. See the License for
+ the specific language governing permissions and limitations under the License.
-->
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
@@ -60,8 +60,6 @@
</properties>
</developer>
</developers>
-
-
<modules>
<module>Metron-Common</module>
<module>Metron-EnrichmentAdapters</module>
@@ -80,7 +78,6 @@
<scope>test</scope>
</dependency>
</dependencies>
-
<build>
<plugins>
<plugin>
@@ -123,9 +120,23 @@
<aggregate>true</aggregate>
</configuration>
</plugin>
+ <plugin>
+ <groupId>org.apache.rat</groupId>
+ <artifactId>apache-rat-plugin</artifactId>
+ <version>0.11</version>
+ <configuration>
+ <excludes>
+ <exclude>**/README.md</exclude>
+ <exclude>**/*.json</exclude>
+ <exclude>**/*.log</exclude>
+ <exclude>**/src/main/resources/patterns/**</exclude>
+ <exclude>**/src/main/resources/SampleInput/**</exclude>
+ <exclude>**/dependency-reduced-pom.xml</exclude>
+ </excludes>
+ </configuration>
+ </plugin>
</plugins>
</build>
-
<reporting>
<plugins>
<plugin>
@@ -147,12 +158,10 @@
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-project-info-reports-plugin</artifactId>
<version>2.7</version>
-
<configuration>
<dependencyLocationsEnabled>false</dependencyLocationsEnabled>
</configuration>
</plugin>
-
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-pmd-plugin</artifactId>
@@ -170,7 +179,6 @@
</plugins>
</reporting>
<repositories>
-
<repository>
<id>clojars.org</id>
<url>http://clojars.org/repo</url>
http://git-wip-us.apache.org/repos/asf/incubator-metron/blob/244a5359/metron-streaming/pom.xml.versionsBackup
----------------------------------------------------------------------
diff --git a/metron-streaming/pom.xml.versionsBackup b/metron-streaming/pom.xml.versionsBackup
deleted file mode 100644
index 7302ae6..0000000
--- a/metron-streaming/pom.xml.versionsBackup
+++ /dev/null
@@ -1,104 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?><!-- Licensed to the Apache Software
- Foundation (ASF) under one or more contributor license agreements. See the
- NOTICE file distributed with this work for additional information regarding
- copyright ownership. The ASF licenses this file to You under the Apache License,
- Version 2.0 (the "License"); you may not use this file except in compliance
- with the License. You may obtain a copy of the License at http://www.apache.org/licenses/LICENSE-2.0
- Unless required by applicable law or agreed to in writing, software distributed
- under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES
- OR CONDITIONS OF ANY KIND, either express or implied. See the License for
- the specific language governing permissions and limitations under the License. -->
-
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
- <modelVersion>4.0.0</modelVersion>
- <groupId>com.opensoc</groupId>
- <artifactId>OpenSOC-Streaming</artifactId>
- <version>BETA_0.2</version>
- <packaging>pom</packaging>
- <name>OpenSOC-Streaming</name>
- <description>Stream analytics for OpenSOC</description>
- <url>www.getopensoc.com</url>
- <properties>
- <twitter>@ProjectOpenSOC</twitter>
- <global_version>BETA_0.2</global_version>
- </properties>
- <licenses>
- <license>
- <name>The Apache Software License, Version 2.0</name>
- <url>http://www.apache.org/licenses/LICENSE-2.0.txt</url>
- <distribution>repo</distribution>
- </license>
- </licenses>
- <developers>
- <developer>
- <id>jsirota</id>
- <name>James Sirota</name>
- <email>jsirota@cisco.com</email>
- <properties>
- <twitter>@JamesSirota</twitter>
- <blog>medium.com/@JamesSirota</blog>
- </properties>
- </developer>
- </developers>
-
- <modules>
- <module>OpenSOC-Common</module>
- <module>OpenSOC-EnrichmentAdapters</module>
- <module>OpenSOC-MessageParsers</module>
- <module>OpenSOC-Indexing</module>
- <module>OpenSOC-Alerts</module>
- <module>OpenSOC-DataLoads</module>
- <module>OpenSOC-Topologies</module>
- </modules>
- <dependencies>
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <version>3.8.2</version>
- </dependency>
- </dependencies>
- <build>
-
- </build>
- <reporting>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-surefire-plugin</artifactId>
- <configuration>
- <systemProperties>
- <property>
- <name>mode</name>
- <value>local</value>
- </property>
- </systemProperties>
- </configuration>
- </plugin>
- <!-- Normally, dependency report takes time, skip it -->
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-project-info-reports-plugin</artifactId>
- <version>2.7</version>
-
- <configuration>
- <dependencyLocationsEnabled>false</dependencyLocationsEnabled>
- </configuration>
- </plugin>
-
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-pmd-plugin</artifactId>
- <configuration>
- <targetJdk>1.7</targetJdk>
- </configuration>
- </plugin>
- <plugin>
- <groupId>org.codehaus.mojo</groupId>
- <artifactId>emma-maven-plugin</artifactId>
- <version>1.0-alpha-3</version>
- <inherited>true</inherited>
- </plugin>
- </plugins>
- </reporting>
-</project>
http://git-wip-us.apache.org/repos/asf/incubator-metron/blob/244a5359/metron-streaming/readme.md
----------------------------------------------------------------------
diff --git a/metron-streaming/readme.md b/metron-streaming/readme.md
deleted file mode 100644
index 5236f18..0000000
--- a/metron-streaming/readme.md
+++ /dev/null
@@ -1,13 +0,0 @@
-#Current Build
-
-The latest build of Metron-Streaming is 0.1BETA.
-
-We are still in the process of merging/porting additional features from our production code base into this open source release. This release will be followed by a number of additional beta releases until the port is complete. We will also work on getting additional documentation and user/developer guides to the community as soon as we can. At this time we offer no support for the beta software, but will try to respond to requests as promptly as we can.
-
-# Metron-Streaming
-
-Extensible set of Storm topologies and topology attributes for streaming, enriching, indexing, and storing telemetry in Hadoop. General information on Metron is available at https://metron.incubator.apache.org/
-
-# Documentation
-
-Please see documentation within each individual module for description and usage instructions. Sample topologies are provided under Metron_Topologies to get you started with the framework. We pre-assume knowledge of Hadoop, Storm, Kafka, and HBase.
http://git-wip-us.apache.org/repos/asf/incubator-metron/blob/244a5359/metron-ui/Gruntfile.js
----------------------------------------------------------------------
diff --git a/metron-ui/Gruntfile.js b/metron-ui/Gruntfile.js
index 568611f..b443c3c 100644
--- a/metron-ui/Gruntfile.js
+++ b/metron-ui/Gruntfile.js
@@ -1,3 +1,21 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
module.exports = function (grunt) {
grunt.initConfig({
// copies frontend assets from bower_components into project
http://git-wip-us.apache.org/repos/asf/incubator-metron/blob/244a5359/metron-ui/Makefile
----------------------------------------------------------------------
diff --git a/metron-ui/Makefile b/metron-ui/Makefile
index e268401..c22c51c 100644
--- a/metron-ui/Makefile
+++ b/metron-ui/Makefile
@@ -1,3 +1,20 @@
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements. See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership. The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License. You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+
testcmd=./node_modules/istanbul/lib/cli.js cover \
./node_modules/mocha/bin/_mocha -- --check-leaks -R spec
@@ -26,4 +43,3 @@ seed:
clean:
rm -rf ./node_modules ./coverage
-