You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@metron.apache.org by ly...@apache.org on 2016/09/05 00:34:35 UTC
incubator-metron git commit: Revert "METRON-400 Deploy Probes to
running Docker Container closes apache/incubator-metron#238" committed in
error.
Repository: incubator-metron
Updated Branches:
refs/heads/master 5ac442431 -> 8e8f9e05c
Revert "METRON-400 Deploy Probes to running Docker Container closes apache/incubator-metron#238" committed in error.
This reverts commit 5ac442431d567a1d4c45a22f3103f0e0d01d951d.
Project: http://git-wip-us.apache.org/repos/asf/incubator-metron/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-metron/commit/8e8f9e05
Tree: http://git-wip-us.apache.org/repos/asf/incubator-metron/tree/8e8f9e05
Diff: http://git-wip-us.apache.org/repos/asf/incubator-metron/diff/8e8f9e05
Branch: refs/heads/master
Commit: 8e8f9e05c13395185ff45bc84465b0d964ec95da
Parents: 5ac4424
Author: David Lyle <dl...@gmail.com>
Authored: Sun Sep 4 20:33:18 2016 -0400
Committer: David Lyle <dl...@gmail.com>
Committed: Sun Sep 4 20:33:18 2016 -0400
----------------------------------------------------------------------
.../playbooks/docker_probe_install.yml | 63 --------------------
metron-deployment/roles/bro/meta/main.yml | 1 +
.../roles/bro/tasks/dependencies.yml | 2 -
.../roles/sensor-test-mode/tasks/snort.yml | 2 +
.../roles/sensor-test-mode/tasks/yaf.yml | 1 +
metron-deployment/roles/snort/meta/main.yml | 1 +
metron-deployment/roles/yaf/meta/main.yml | 1 +
metron-deployment/roles/yaf/tasks/yaf.yml | 2 +-
8 files changed, 7 insertions(+), 66 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-metron/blob/8e8f9e05/metron-deployment/playbooks/docker_probe_install.yml
----------------------------------------------------------------------
diff --git a/metron-deployment/playbooks/docker_probe_install.yml b/metron-deployment/playbooks/docker_probe_install.yml
deleted file mode 100644
index b23e72a..0000000
--- a/metron-deployment/playbooks/docker_probe_install.yml
+++ /dev/null
@@ -1,63 +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.
-#
----
-#
-# sensors
-#
-- hosts: localhost
- tasks:
- - name: add container to inventory
- add_host:
- name: amb-server
- ansible_connection: docker
- groups: sensors
- changed_when: false
- tags: add-host
-
-- hosts: sensors
- vars:
- metron_version: 0.2.0BETA
- metron_directory: /usr/metron/{{ metron_version }}
- bro_version: "2.4.1"
- fixbuf_version: "1.7.1"
- yaf_version: "2.8.0"
- daq_version: "2.0.6-1"
- pycapa_repo: "https://github.com/OpenSOC/pycapa.git"
- pycapa_home: "/opt/pycapa"
- snort_version: "2.9.8.0-1"
- snort_alert_csv_path: "/var/log/snort/alert.csv"
- threat_intel_bulk_load: False
- sensor_test_mode: True
- install_pycapa: False
- install_bro: True
- install_snort: True
- install_yaf: True
- install_pcap_replay: True
- sniff_interface: eth0
- pcap_replay_interface: "{{ sniff_interface }}"
- pcapservice_port: 8081
- kafka_broker_url: amb4.service.consul:6667
- connection: docker
- roles:
- - { role: bro, tags: ['bro'] }
- - { role: flume, tags: ['snort','flume'] }
- - { role: snort, tags: ['snort'] }
- - { role: yaf, tags: ['yaf'] }
- - { role: pcap_replay, tags: ['pcap-replay'] }
- - { role: sensor-test-mode, tags: ['sensor-test-mode'] }
- tags:
- - sensors
http://git-wip-us.apache.org/repos/asf/incubator-metron/blob/8e8f9e05/metron-deployment/roles/bro/meta/main.yml
----------------------------------------------------------------------
diff --git a/metron-deployment/roles/bro/meta/main.yml b/metron-deployment/roles/bro/meta/main.yml
index df226e7..9c9286f 100644
--- a/metron-deployment/roles/bro/meta/main.yml
+++ b/metron-deployment/roles/bro/meta/main.yml
@@ -17,6 +17,7 @@
---
dependencies:
- libselinux-python
+ - ambari_gather_facts
- build-tools
- kafka-client
- librdkafka
http://git-wip-us.apache.org/repos/asf/incubator-metron/blob/8e8f9e05/metron-deployment/roles/bro/tasks/dependencies.yml
----------------------------------------------------------------------
diff --git a/metron-deployment/roles/bro/tasks/dependencies.yml b/metron-deployment/roles/bro/tasks/dependencies.yml
index fa20b71..431e861 100644
--- a/metron-deployment/roles/bro/tasks/dependencies.yml
+++ b/metron-deployment/roles/bro/tasks/dependencies.yml
@@ -31,8 +31,6 @@
- swig
- zlib-devel
- perl
- - crontabs
- - net-tools
register: result
until: result.rc == 0
retries: 5
http://git-wip-us.apache.org/repos/asf/incubator-metron/blob/8e8f9e05/metron-deployment/roles/sensor-test-mode/tasks/snort.yml
----------------------------------------------------------------------
diff --git a/metron-deployment/roles/sensor-test-mode/tasks/snort.yml b/metron-deployment/roles/sensor-test-mode/tasks/snort.yml
index 3b1af5f..a9785c0 100644
--- a/metron-deployment/roles/sensor-test-mode/tasks/snort.yml
+++ b/metron-deployment/roles/sensor-test-mode/tasks/snort.yml
@@ -19,11 +19,13 @@
# configure snort to alert on every packet
#
- name: Configure snort to use a set of test rules
+ become: True
lineinfile:
dest: /etc/snort/snort.conf
line: "include $RULE_PATH/test.rules"
- name: Create a snort alert for testing that alerts on every packet
+ become: True
lineinfile:
dest: /etc/snort/rules/test.rules
line: "alert tcp any any -> any any (msg:'snort test alert'; sid:999158; )"
http://git-wip-us.apache.org/repos/asf/incubator-metron/blob/8e8f9e05/metron-deployment/roles/sensor-test-mode/tasks/yaf.yml
----------------------------------------------------------------------
diff --git a/metron-deployment/roles/sensor-test-mode/tasks/yaf.yml b/metron-deployment/roles/sensor-test-mode/tasks/yaf.yml
index c867d60..1206e23 100644
--- a/metron-deployment/roles/sensor-test-mode/tasks/yaf.yml
+++ b/metron-deployment/roles/sensor-test-mode/tasks/yaf.yml
@@ -19,6 +19,7 @@
# configure yaf to generate a flow record for every packet
#
- name: Stop running instances of yaf
+ become: True
service: name=yaf state=stopped
- name: Configure yaf to generate a flow record for every network packet
http://git-wip-us.apache.org/repos/asf/incubator-metron/blob/8e8f9e05/metron-deployment/roles/snort/meta/main.yml
----------------------------------------------------------------------
diff --git a/metron-deployment/roles/snort/meta/main.yml b/metron-deployment/roles/snort/meta/main.yml
index ebca8ed..f742973 100644
--- a/metron-deployment/roles/snort/meta/main.yml
+++ b/metron-deployment/roles/snort/meta/main.yml
@@ -16,6 +16,7 @@
#
---
dependencies:
+ - ambari_gather_facts
- epel
- libselinux-python
- build-tools
http://git-wip-us.apache.org/repos/asf/incubator-metron/blob/8e8f9e05/metron-deployment/roles/yaf/meta/main.yml
----------------------------------------------------------------------
diff --git a/metron-deployment/roles/yaf/meta/main.yml b/metron-deployment/roles/yaf/meta/main.yml
index 768bcac..ff366b8 100644
--- a/metron-deployment/roles/yaf/meta/main.yml
+++ b/metron-deployment/roles/yaf/meta/main.yml
@@ -16,6 +16,7 @@
#
---
dependencies:
+ - ambari_gather_facts
- build-tools
- java_jdk
- libselinux-python
http://git-wip-us.apache.org/repos/asf/incubator-metron/blob/8e8f9e05/metron-deployment/roles/yaf/tasks/yaf.yml
----------------------------------------------------------------------
diff --git a/metron-deployment/roles/yaf/tasks/yaf.yml b/metron-deployment/roles/yaf/tasks/yaf.yml
index 7ee361e..9a9787b 100644
--- a/metron-deployment/roles/yaf/tasks/yaf.yml
+++ b/metron-deployment/roles/yaf/tasks/yaf.yml
@@ -50,5 +50,5 @@
template: src=yaf dest=/etc/init.d/yaf mode=0755
- name: Register the service with systemd
- shell: systemctl enable yaf
+ shell: systemctl enable pcap-replay
when: ansible_distribution == "CentOS" and ansible_distribution_major_version == "7"