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 2017/02/09 14:02:16 UTC
[2/2] incubator-metron git commit: METRON-707: Correct ansible to
execute threat intel bulk loading via the flat file script closes
apache/incubator-metron#446
METRON-707: Correct ansible to execute threat intel bulk loading via the flat file script closes apache/incubator-metron#446
Project: http://git-wip-us.apache.org/repos/asf/incubator-metron/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-metron/commit/1d632646
Tree: http://git-wip-us.apache.org/repos/asf/incubator-metron/tree/1d632646
Diff: http://git-wip-us.apache.org/repos/asf/incubator-metron/diff/1d632646
Branch: refs/heads/Metron_0.3.1
Commit: 1d632646e87720ea0695e85e6d4b72fdeeea95dc
Parents: c5bbf5a
Author: cstella <ce...@gmail.com>
Authored: Thu Feb 9 09:00:29 2017 -0500
Committer: cstella <ce...@gmail.com>
Committed: Thu Feb 9 09:00:29 2017 -0500
----------------------------------------------------------------------
metron-deployment/roles/metron_streaming/defaults/main.yml | 2 +-
metron-deployment/roles/metron_streaming/tasks/threat_intel.yml | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-metron/blob/1d632646/metron-deployment/roles/metron_streaming/defaults/main.yml
----------------------------------------------------------------------
diff --git a/metron-deployment/roles/metron_streaming/defaults/main.yml b/metron-deployment/roles/metron_streaming/defaults/main.yml
index 5cab9e4..b9b34fe 100644
--- a/metron-deployment/roles/metron_streaming/defaults/main.yml
+++ b/metron-deployment/roles/metron_streaming/defaults/main.yml
@@ -67,7 +67,7 @@ pcap_hdfs_path: "/apps/metron/pcap"
geo_hdfs_path: "/apps/metron/geo/default"
threat_intel_bulk_load: True
-threat_intel_bin: "{{ metron_directory }}/bin/threatintel_bulk_load.sh"
+threat_intel_bin: "{{ metron_directory }}/bin/flatfile_loader.sh"
threat_intel_work_dir: /tmp/ti_bulk
threat_intel_csv_filename: "threat_ip.csv"
threat_intel_csv_filepath: "{{ threat_intel_csv_filename }}"
http://git-wip-us.apache.org/repos/asf/incubator-metron/blob/1d632646/metron-deployment/roles/metron_streaming/tasks/threat_intel.yml
----------------------------------------------------------------------
diff --git a/metron-deployment/roles/metron_streaming/tasks/threat_intel.yml b/metron-deployment/roles/metron_streaming/tasks/threat_intel.yml
index f1b7534..a1aa237 100644
--- a/metron-deployment/roles/metron_streaming/tasks/threat_intel.yml
+++ b/metron-deployment/roles/metron_streaming/tasks/threat_intel.yml
@@ -37,7 +37,7 @@
command: "hdfs dfs -put -f {{ threat_intel_work_dir }}/{{ threat_intel_csv_filename }} ."
- name: Run Threat Intel Bulk Load
- shell: "{{ threat_intel_bin }} -f t --table {{threatintel_hbase_table}} -e {{ threat_intel_work_dir }}/extractor.json -i /user/root && touch {{ threat_intel_work_dir }}/loaded"
+ shell: "{{ threat_intel_bin }} -c t -t {{threatintel_hbase_table}} -e {{ threat_intel_work_dir }}/extractor.json -i /user/root -m MR && touch {{ threat_intel_work_dir }}/loaded"
args:
creates: "{{ threat_intel_work_dir }}/loaded"