You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@metron.apache.org by ni...@apache.org on 2017/11/09 20:23:52 UTC
metron git commit: METRON-1310 Template Delete Action Deletes Search
Indices (nickwallen) closes apache/metron#838
Repository: metron
Updated Branches:
refs/heads/master c225fc49b -> d5b9a96b1
METRON-1310 Template Delete Action Deletes Search Indices (nickwallen) closes apache/metron#838
Project: http://git-wip-us.apache.org/repos/asf/metron/repo
Commit: http://git-wip-us.apache.org/repos/asf/metron/commit/d5b9a96b
Tree: http://git-wip-us.apache.org/repos/asf/metron/tree/d5b9a96b
Diff: http://git-wip-us.apache.org/repos/asf/metron/diff/d5b9a96b
Branch: refs/heads/master
Commit: d5b9a96b11355246a2d93ee56a3ead205741545d
Parents: c225fc4
Author: nickwallen <ni...@nickallen.org>
Authored: Thu Nov 9 15:23:08 2017 -0500
Committer: nickallen <ni...@apache.org>
Committed: Thu Nov 9 15:23:08 2017 -0500
----------------------------------------------------------------------
.../CURRENT/package/files/meta_index.mapping | 46 -------------------
.../CURRENT/package/files/meta_index.template | 47 ++++++++++++++++++++
.../CURRENT/package/scripts/indexing_master.py | 37 ++++++++-------
.../package/scripts/params/params_linux.py | 2 +-
4 files changed, 69 insertions(+), 63 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/metron/blob/d5b9a96b/metron-deployment/packaging/ambari/metron-mpack/src/main/resources/common-services/METRON/CURRENT/package/files/meta_index.mapping
----------------------------------------------------------------------
diff --git a/metron-deployment/packaging/ambari/metron-mpack/src/main/resources/common-services/METRON/CURRENT/package/files/meta_index.mapping b/metron-deployment/packaging/ambari/metron-mpack/src/main/resources/common-services/METRON/CURRENT/package/files/meta_index.mapping
deleted file mode 100644
index 9da0554..0000000
--- a/metron-deployment/packaging/ambari/metron-mpack/src/main/resources/common-services/METRON/CURRENT/package/files/meta_index.mapping
+++ /dev/null
@@ -1,46 +0,0 @@
-{
- "mappings": {
- "metaalert_doc": {
- "_timestamp": {
- "enabled": true
- },
- "dynamic_templates": [
- {
- "alert_template": {
- "path_match": "alert.*",
- "match_mapping_type": "string",
- "mapping": {
- "type": "string",
- "index": "not_analyzed"
- }
- }
- }
- ],
- "properties": {
- "guid": {
- "type": "string",
- "index": "not_analyzed"
- },
- "score": {
- "type": "string",
- "index": "not_analyzed"
- },
- "status": {
- "type": "string",
- "index": "not_analyzed"
- },
- "timestamp": {
- "type": "date",
- "format": "epoch_millis"
- },
- "alert": {
- "type": "nested"
- },
- "source:type": {
- "type": "string",
- "index": "not_analyzed"
- }
- }
- }
- }
-}
http://git-wip-us.apache.org/repos/asf/metron/blob/d5b9a96b/metron-deployment/packaging/ambari/metron-mpack/src/main/resources/common-services/METRON/CURRENT/package/files/meta_index.template
----------------------------------------------------------------------
diff --git a/metron-deployment/packaging/ambari/metron-mpack/src/main/resources/common-services/METRON/CURRENT/package/files/meta_index.template b/metron-deployment/packaging/ambari/metron-mpack/src/main/resources/common-services/METRON/CURRENT/package/files/meta_index.template
new file mode 100644
index 0000000..964a480
--- /dev/null
+++ b/metron-deployment/packaging/ambari/metron-mpack/src/main/resources/common-services/METRON/CURRENT/package/files/meta_index.template
@@ -0,0 +1,47 @@
+{
+ "template": "metaalert_index*",
+ "mappings": {
+ "metaalert_doc": {
+ "_timestamp": {
+ "enabled": true
+ },
+ "dynamic_templates": [
+ {
+ "alert_template": {
+ "path_match": "alert.*",
+ "match_mapping_type": "string",
+ "mapping": {
+ "type": "string",
+ "index": "not_analyzed"
+ }
+ }
+ }
+ ],
+ "properties": {
+ "guid": {
+ "type": "string",
+ "index": "not_analyzed"
+ },
+ "score": {
+ "type": "string",
+ "index": "not_analyzed"
+ },
+ "status": {
+ "type": "string",
+ "index": "not_analyzed"
+ },
+ "timestamp": {
+ "type": "date",
+ "format": "epoch_millis"
+ },
+ "alert": {
+ "type": "nested"
+ },
+ "source:type": {
+ "type": "string",
+ "index": "not_analyzed"
+ }
+ }
+ }
+ }
+}
http://git-wip-us.apache.org/repos/asf/metron/blob/d5b9a96b/metron-deployment/packaging/ambari/metron-mpack/src/main/resources/common-services/METRON/CURRENT/package/scripts/indexing_master.py
----------------------------------------------------------------------
diff --git a/metron-deployment/packaging/ambari/metron-mpack/src/main/resources/common-services/METRON/CURRENT/package/scripts/indexing_master.py b/metron-deployment/packaging/ambari/metron-mpack/src/main/resources/common-services/METRON/CURRENT/package/scripts/indexing_master.py
index ed3e4ff..92077ac 100755
--- a/metron-deployment/packaging/ambari/metron-mpack/src/main/resources/common-services/METRON/CURRENT/package/scripts/indexing_master.py
+++ b/metron-deployment/packaging/ambari/metron-mpack/src/main/resources/common-services/METRON/CURRENT/package/scripts/indexing_master.py
@@ -141,38 +141,43 @@ class Indexing(Script):
File(params.meta_index_path,
mode=0755,
- content=StaticFile('meta_index.mapping')
+ content=StaticFile('meta_index.template')
)
- bro_cmd = ambari_format(
- 'curl -s -XPOST http://{es_http_url}/_template/bro_index -d @{bro_index_path}')
+ bro_cmd = ambari_format('curl -s -XPOST http://{es_http_url}/_template/bro_index -d @{bro_index_path}')
Execute(bro_cmd, logoutput=True)
- snort_cmd = ambari_format(
- 'curl -s -XPOST http://{es_http_url}/_template/snort_index -d @{snort_index_path}')
+
+ snort_cmd = ambari_format('curl -s -XPOST http://{es_http_url}/_template/snort_index -d @{snort_index_path}')
Execute(snort_cmd, logoutput=True)
- yaf_cmd = ambari_format(
- 'curl -s -XPOST http://{es_http_url}/_template/yaf_index -d @{yaf_index_path}')
+
+ yaf_cmd = ambari_format('curl -s -XPOST http://{es_http_url}/_template/yaf_index -d @{yaf_index_path}')
Execute(yaf_cmd, logoutput=True)
- error_cmd = ambari_format(
- 'curl -s -XPOST http://{es_http_url}/_template/error_index -d @{error_index_path}')
- Execute(error_cmd, logoutput=True)
- error_cmd = ambari_format(
- 'curl -s -XPOST http://{es_http_url}/metaalert_index -d @{meta_index_path}')
+
+ error_cmd = ambari_format('curl -s -XPOST http://{es_http_url}/_template/error_index -d @{error_index_path}')
Execute(error_cmd, logoutput=True)
+ meta_cmd = ambari_format('curl -s -XPOST http://{es_http_url}/_template/metaalert_index -d @{meta_index_path}')
+ Execute(meta_cmd, logoutput=True)
+
def elasticsearch_template_delete(self, env):
from params import params
env.set_params(params)
- bro_cmd = ambari_format('curl -s -XDELETE "http://{es_http_url}/bro_index*"')
+ bro_cmd = ambari_format('curl -s -XDELETE "http://{es_http_url}/_template/bro_index"')
Execute(bro_cmd, logoutput=True)
- snort_cmd = ambari_format('curl -s -XDELETE "http://{es_http_url}/snort_index*"')
+
+ snort_cmd = ambari_format('curl -s -XDELETE "http://{es_http_url}/_template/snort_index"')
Execute(snort_cmd, logoutput=True)
- yaf_cmd = ambari_format('curl -s -XDELETE "http://{es_http_url}/yaf_index*"')
+
+ yaf_cmd = ambari_format('curl -s -XDELETE "http://{es_http_url}/_template/yaf_index"')
Execute(yaf_cmd, logoutput=True)
- error_cmd = ambari_format('curl -s -XDELETE "http://{es_http_url}/error_index*"')
+
+ error_cmd = ambari_format('curl -s -XDELETE "http://{es_http_url}/_template/error_index"')
Execute(error_cmd, logoutput=True)
+ meta_cmd = ambari_format('curl -s -XDELETE "http://{es_http_url}/_template/metaalert_index"')
+ Execute(meta_cmd, logoutput=True)
+
def zeppelin_notebook_import(self, env):
from params import params
env.set_params(params)
http://git-wip-us.apache.org/repos/asf/metron/blob/d5b9a96b/metron-deployment/packaging/ambari/metron-mpack/src/main/resources/common-services/METRON/CURRENT/package/scripts/params/params_linux.py
----------------------------------------------------------------------
diff --git a/metron-deployment/packaging/ambari/metron-mpack/src/main/resources/common-services/METRON/CURRENT/package/scripts/params/params_linux.py b/metron-deployment/packaging/ambari/metron-mpack/src/main/resources/common-services/METRON/CURRENT/package/scripts/params/params_linux.py
index fa4c0ab..077a9c1 100755
--- a/metron-deployment/packaging/ambari/metron-mpack/src/main/resources/common-services/METRON/CURRENT/package/scripts/params/params_linux.py
+++ b/metron-deployment/packaging/ambari/metron-mpack/src/main/resources/common-services/METRON/CURRENT/package/scripts/params/params_linux.py
@@ -195,7 +195,7 @@ bro_index_path = tmp_dir + "/bro_index.template"
snort_index_path = tmp_dir + "/snort_index.template"
yaf_index_path = tmp_dir + "/yaf_index.template"
error_index_path = tmp_dir + "/error_index.template"
-meta_index_path = tmp_dir + "/meta_index.mapping"
+meta_index_path = tmp_dir + "/meta_index.template"
# Zeppelin Notebooks
metron_config_zeppelin_path = format("{metron_config_path}/zeppelin")