METRON-1622 Allow user to define global property 'threat.triage.score.field' in Ambari (nickwallen) closes apache/metron#1066
Project: http://git-wip-us.apache.org/repos/asf/metron/repo Commit: http://git-wip-us.apache.org/repos/asf/metron/commit/53d074f8 Tree: http://git-wip-us.apache.org/repos/asf/metron/tree/53d074f8 Diff: http://git-wip-us.apache.org/repos/asf/metron/diff/53d074f8 Branch: refs/heads/feature/METRON-1416-upgrade-solr Commit: 53d074f895e658efca10f046866c33e153010640 Parents: 7427348 Author: nickwallen <[email protected]> Authored: Tue Jun 19 13:35:49 2018 -0400 Committer: nickallen <[email protected]> Committed: Tue Jun 19 13:35:49 2018 -0400 ---------------------------------------------------------------------- .../METRON/CURRENT/configuration/metron-rest-env.xml | 6 ++++++ .../METRON/CURRENT/package/scripts/metron_service.py | 5 +++++ .../METRON/CURRENT/package/scripts/params/params_linux.py | 1 + .../METRON/CURRENT/themes/metron_theme.json | 10 ++++++++++ 4 files changed, 22 insertions(+) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/metron/blob/53d074f8/metron-deployment/packaging/ambari/metron-mpack/src/main/resources/common-services/METRON/CURRENT/configuration/metron-rest-env.xml ---------------------------------------------------------------------- diff --git a/metron-deployment/packaging/ambari/metron-mpack/src/main/resources/common-services/METRON/CURRENT/configuration/metron-rest-env.xml b/metron-deployment/packaging/ambari/metron-mpack/src/main/resources/common-services/METRON/CURRENT/configuration/metron-rest-env.xml index c636fb1..066b527 100644 --- a/metron-deployment/packaging/ambari/metron-mpack/src/main/resources/common-services/METRON/CURRENT/configuration/metron-rest-env.xml +++ b/metron-deployment/packaging/ambari/metron-mpack/src/main/resources/common-services/METRON/CURRENT/configuration/metron-rest-env.xml @@ -162,4 +162,10 @@ <description>The field name where the source type can be found in the search indices. This setting primarily affects the Alerts UI.</description> <value>source:type</value> </property> + <property> + <name>threat_triage_score_field</name> + <display-name>Threat Triage Score Field Name</display-name> + <description>The field name where the threat triage score can be found in the search indices. This setting primarily affects the Alerts UI.</description> + <value>threat:triage:score</value> + </property> </configuration> http://git-wip-us.apache.org/repos/asf/metron/blob/53d074f8/metron-deployment/packaging/ambari/metron-mpack/src/main/resources/common-services/METRON/CURRENT/package/scripts/metron_service.py ---------------------------------------------------------------------- diff --git a/metron-deployment/packaging/ambari/metron-mpack/src/main/resources/common-services/METRON/CURRENT/package/scripts/metron_service.py b/metron-deployment/packaging/ambari/metron-mpack/src/main/resources/common-services/METRON/CURRENT/package/scripts/metron_service.py index 9e6480c..1999992 100644 --- a/metron-deployment/packaging/ambari/metron-mpack/src/main/resources/common-services/METRON/CURRENT/package/scripts/metron_service.py +++ b/metron-deployment/packaging/ambari/metron-mpack/src/main/resources/common-services/METRON/CURRENT/package/scripts/metron_service.py @@ -114,6 +114,11 @@ def build_global_config_patch(params, patch_file): "op": "add", "path": "/source.type.field", "value": "{{source_type_field}}" + }, + { + "op": "add", + "path": "/threat.triage.score.field", + "value": "{{threat_triage_score_field}}" } ] """ http://git-wip-us.apache.org/repos/asf/metron/blob/53d074f8/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 bae00dd..f054c00 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 @@ -255,6 +255,7 @@ metron_sysconfig = config['configurations']['metron-rest-env']['metron_sysconfig user_settings_hbase_table = status_params.user_settings_hbase_table user_settings_hbase_cf = status_params.user_settings_hbase_cf source_type_field = config['configurations']['metron-rest-env']['source_type_field'] +threat_triage_score_field = config['configurations']['metron-rest-env']['threat_triage_score_field'] # Enrichment metron_enrichment_topology = status_params.metron_enrichment_topology http://git-wip-us.apache.org/repos/asf/metron/blob/53d074f8/metron-deployment/packaging/ambari/metron-mpack/src/main/resources/common-services/METRON/CURRENT/themes/metron_theme.json ---------------------------------------------------------------------- diff --git a/metron-deployment/packaging/ambari/metron-mpack/src/main/resources/common-services/METRON/CURRENT/themes/metron_theme.json b/metron-deployment/packaging/ambari/metron-mpack/src/main/resources/common-services/METRON/CURRENT/themes/metron_theme.json index be2c14b..d09f270 100644 --- a/metron-deployment/packaging/ambari/metron-mpack/src/main/resources/common-services/METRON/CURRENT/themes/metron_theme.json +++ b/metron-deployment/packaging/ambari/metron-mpack/src/main/resources/common-services/METRON/CURRENT/themes/metron_theme.json @@ -796,6 +796,10 @@ "subsection-name": "subsection-rest" }, { + "config": "metron-rest-env/threat_triage_score_field", + "subsection-name": "subsection-rest" + }, + { "config": "metron-management-ui-env/metron_management_ui_port", "subsection-name": "subsection-management-ui" }, @@ -843,6 +847,12 @@ } }, { + "config": "metron-rest-env/threat_triage_score_field", + "widget": { + "type": "text-field" + } + }, + { "config": "metron-parsers-env/parsers", "widget": { "type": "text-field"
