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/07/15 15:05:19 UTC
incubator-metron git commit: METRON-279 Removed duplicative roles;
metron-kafka and metron-hbase (nickwallen via cestella) closes
apache/incubator-metron#181
Repository: incubator-metron
Updated Branches:
refs/heads/master a116a95f2 -> 2b0f1228d
METRON-279 Removed duplicative roles; metron-kafka and metron-hbase (nickwallen via cestella) closes apache/incubator-metron#181
Project: http://git-wip-us.apache.org/repos/asf/incubator-metron/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-metron/commit/2b0f1228
Tree: http://git-wip-us.apache.org/repos/asf/incubator-metron/tree/2b0f1228
Diff: http://git-wip-us.apache.org/repos/asf/incubator-metron/diff/2b0f1228
Branch: refs/heads/master
Commit: 2b0f1228d7bb0956e88bcf6d38b7e3a5ce2c1276
Parents: a116a95
Author: nickwallen <ni...@nickallen.org>
Authored: Fri Jul 15 11:05:10 2016 -0400
Committer: cstella <ce...@gmail.com>
Committed: Fri Jul 15 11:05:10 2016 -0400
----------------------------------------------------------------------
.../roles/metron-hbase/defaults/main.yml | 22 --------------
.../roles/metron-hbase/meta/main.yml | 19 -------------
.../roles/metron-hbase/tasks/main.yml | 24 ----------------
.../roles/metron-kafka/defaults/main.yml | 26 -----------------
.../roles/metron-kafka/meta/main.yml | 19 -------------
.../roles/metron-kafka/tasks/main.yml | 30 --------------------
.../roles/metron_kafka_topics/defaults/main.yml | 12 ++++----
7 files changed, 7 insertions(+), 145 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-metron/blob/2b0f1228/metron-deployment/roles/metron-hbase/defaults/main.yml
----------------------------------------------------------------------
diff --git a/metron-deployment/roles/metron-hbase/defaults/main.yml b/metron-deployment/roles/metron-hbase/defaults/main.yml
deleted file mode 100644
index 9d40d1b..0000000
--- a/metron-deployment/roles/metron-hbase/defaults/main.yml
+++ /dev/null
@@ -1,22 +0,0 @@
-#
-# 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_tables_to_create:
- - pcap
- - access_tracker
- - threatintel
- - enrichment
http://git-wip-us.apache.org/repos/asf/incubator-metron/blob/2b0f1228/metron-deployment/roles/metron-hbase/meta/main.yml
----------------------------------------------------------------------
diff --git a/metron-deployment/roles/metron-hbase/meta/main.yml b/metron-deployment/roles/metron-hbase/meta/main.yml
deleted file mode 100644
index c3d807b..0000000
--- a/metron-deployment/roles/metron-hbase/meta/main.yml
+++ /dev/null
@@ -1,19 +0,0 @@
-#
-# 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.
-#
----
-dependencies:
- - ambari_gather_facts
http://git-wip-us.apache.org/repos/asf/incubator-metron/blob/2b0f1228/metron-deployment/roles/metron-hbase/tasks/main.yml
----------------------------------------------------------------------
diff --git a/metron-deployment/roles/metron-hbase/tasks/main.yml b/metron-deployment/roles/metron-hbase/tasks/main.yml
deleted file mode 100644
index cc86c09..0000000
--- a/metron-deployment/roles/metron-hbase/tasks/main.yml
+++ /dev/null
@@ -1,24 +0,0 @@
-#
-# 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.
-#
----
-# must run on hadoop host
-- name: Create the HBase tables required for Metron
- shell: echo "create '{{ item }}','t'" | hbase shell -n
- with_items: "{{ hbase_tables_to_create }}"
- register: out
- failed_when: out.rc != 0 and ("Table already exists" not in out.stdout)
- changed_when: ("Table already exists" not in out.stdout)
http://git-wip-us.apache.org/repos/asf/incubator-metron/blob/2b0f1228/metron-deployment/roles/metron-kafka/defaults/main.yml
----------------------------------------------------------------------
diff --git a/metron-deployment/roles/metron-kafka/defaults/main.yml b/metron-deployment/roles/metron-kafka/defaults/main.yml
deleted file mode 100644
index d108d0f..0000000
--- a/metron-deployment/roles/metron-kafka/defaults/main.yml
+++ /dev/null
@@ -1,26 +0,0 @@
-#
-# 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.
-#
----
-kafka_home: /usr/hdp/current/kafka-broker/
-topics_to_create:
- - { topic: "pcap", num_partitions: 1, replication_factor: 1, retention_gb: 10 }
- - { topic: "bro", num_partitions: 1, replication_factor: 1, retention_gb: 10 }
- - { topic: "yaf", num_partitions: 1, replication_factor: 1, retention_gb: 10 }
- - { topic: "parser_invalid", num_partitions: 1, replication_factor: 1, retention_gb: 10 }
- - { topic: "parser_error", num_partitions: 1, replication_factor: 1, retention_gb: 10 }
- - { topic: "snort", num_partitions: 1, replication_factor: 1, retention_gb: 10 }
- - { topic: "enrichments", num_partitions: 1, replication_factor: 1, retention_gb: 10 }
http://git-wip-us.apache.org/repos/asf/incubator-metron/blob/2b0f1228/metron-deployment/roles/metron-kafka/meta/main.yml
----------------------------------------------------------------------
diff --git a/metron-deployment/roles/metron-kafka/meta/main.yml b/metron-deployment/roles/metron-kafka/meta/main.yml
deleted file mode 100644
index c3d807b..0000000
--- a/metron-deployment/roles/metron-kafka/meta/main.yml
+++ /dev/null
@@ -1,19 +0,0 @@
-#
-# 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.
-#
----
-dependencies:
- - ambari_gather_facts
http://git-wip-us.apache.org/repos/asf/incubator-metron/blob/2b0f1228/metron-deployment/roles/metron-kafka/tasks/main.yml
----------------------------------------------------------------------
diff --git a/metron-deployment/roles/metron-kafka/tasks/main.yml b/metron-deployment/roles/metron-kafka/tasks/main.yml
deleted file mode 100644
index 8d3cb0a..0000000
--- a/metron-deployment/roles/metron-kafka/tasks/main.yml
+++ /dev/null
@@ -1,30 +0,0 @@
-#
-# 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.
-#
----
-- name: Create the Kafka topics required for Metron
- shell: >
- {{ kafka_home }}/bin/kafka-topics.sh \
- --zookeeper {{ zookeeper_url }} \
- --create \
- --topic {{ item.topic }} \
- --partitions {{ item.num_partitions }} \
- --replication-factor {{ item.replication_factor }} \
- --config retention.bytes={{ item.retention_gb * 1024 * 1024 * 1024 }}
- with_items: "{{ topics_to_create }}"
- register: out
- failed_when: out.rc != 0 and ("already exists" not in out.stderr)
- changed_when: ("already exists" not in out.stderr)
http://git-wip-us.apache.org/repos/asf/incubator-metron/blob/2b0f1228/metron-deployment/roles/metron_kafka_topics/defaults/main.yml
----------------------------------------------------------------------
diff --git a/metron-deployment/roles/metron_kafka_topics/defaults/main.yml b/metron-deployment/roles/metron_kafka_topics/defaults/main.yml
index 4e83a67..aac9a06 100644
--- a/metron-deployment/roles/metron_kafka_topics/defaults/main.yml
+++ b/metron-deployment/roles/metron_kafka_topics/defaults/main.yml
@@ -17,8 +17,10 @@
---
kafka_home: /usr/hdp/current/kafka-broker/
topics_to_create:
- - { topic: "pcap", num_partitions: 1, replication_factor: 1, retention_gb: 10 }
- - { topic: "bro", num_partitions: 1, replication_factor: 1, retention_gb: 10 }
- - { topic: "yaf", num_partitions: 1, replication_factor: 1, retention_gb: 10 }
- - { topic: "snort", num_partitions: 1, replication_factor: 1, retention_gb: 10 }
- - { topic: "enrichments", num_partitions: 1, replication_factor: 1, retention_gb: 10 }
+ - { topic: "pcap", num_partitions: 1, replication_factor: 1, retention_gb: 10 }
+ - { topic: "bro", num_partitions: 1, replication_factor: 1, retention_gb: 10 }
+ - { topic: "yaf", num_partitions: 1, replication_factor: 1, retention_gb: 10 }
+ - { topic: "snort", num_partitions: 1, replication_factor: 1, retention_gb: 10 }
+ - { topic: "enrichments", num_partitions: 1, replication_factor: 1, retention_gb: 10 }
+ - { topic: "parser_invalid", num_partitions: 1, replication_factor: 1, retention_gb: 10 }
+ - { topic: "parser_error", num_partitions: 1, replication_factor: 1, retention_gb: 10 }