Repository: metron
Updated Branches:
  refs/heads/master cf165ff30 -> a9b01d1e3


http://git-wip-us.apache.org/repos/asf/metron/blob/a9b01d1e/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 22ca4c0..e7ac630 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
@@ -277,205 +277,209 @@
           "subsection-name": "subsection-index-settings"
         },
         {
-          "config": "metron-env/parsers",
+          "config": "metron-parsers-env/parsers",
           "subsection-name": "subsection-parsers"
         },
         {
-          "config": "metron-env/parser_error_topic",
+          "config": "metron-parsers-env/parser_error_topic",
           "subsection-name": "subsection-parsers"
         },
         {
-          "config": "metron-env/geoip_url",
+          "config": "metron-enrichment-env/geoip_url",
           "subsection-name": "subsection-enrichment-adapters"
         },
         {
-          "config": "metron-env/enrichment_host_known_hosts",
+          "config": "metron-enrichment-env/enrichment_host_known_hosts",
           "subsection-name": "subsection-enrichment-adapters"
         },
         {
-          "config": "metron-env/enrichment_kafka_start",
+          "config": "metron-enrichment-env/enrichment_kafka_start",
           "subsection-name": "subsection-enrichment-kafka"
         },
         {
-          "config": "metron-env/enrichment_input_topic",
+          "config": "metron-enrichment-env/enrichment_input_topic",
           "subsection-name": "subsection-enrichment-kafka"
         },
         {
-          "config": "metron-env/enrichment_output_topic",
+          "config": "metron-enrichment-env/enrichment_output_topic",
           "subsection-name": "subsection-enrichment-kafka"
         },
         {
-          "config": "metron-env/enrichment_error_topic",
+          "config": "metron-enrichment-env/enrichment_error_topic",
           "subsection-name": "subsection-enrichment-kafka"
         },
         {
-          "config": "metron-env/threatintel_error_topic",
+          "config": "metron-enrichment-env/threatintel_error_topic",
           "subsection-name": "subsection-enrichment-kafka"
         },
         {
-          "config": "metron-env/enrichment_workers",
+          "config": "metron-enrichment-env/enrichment_workers",
           "subsection-name": "subsection-enrichment-storm"
         },
         {
-          "config": "metron-env/enrichment_acker_executors",
+          "config": "metron-enrichment-env/enrichment_acker_executors",
           "subsection-name": "subsection-enrichment-storm"
         },
         {
-          "config": "metron-env/enrichment_topology_worker_childopts",
+          "config": 
"metron-enrichment-env/enrichment_topology_worker_childopts",
           "subsection-name": "subsection-enrichment-storm"
         },
         {
-          "config": "metron-env/enrichment_topology_max_spout_pending",
+          "config": 
"metron-enrichment-env/enrichment_topology_max_spout_pending",
           "subsection-name": "subsection-enrichment-storm"
         },
         {
-          "config": "metron-env/enrichment_join_cache_size",
+          "config": "metron-enrichment-env/enrichment_join_cache_size",
           "subsection-name": "subsection-enrichment-storm"
         },
         {
-          "config": "metron-env/threatintel_join_cache_size",
+          "config": "metron-enrichment-env/threatintel_join_cache_size",
           "subsection-name": "subsection-enrichment-storm"
         },
         {
-          "config": "metron-env/enrichment_kafka_spout_parallelism",
+          "config": "metron-enrichment-env/enrichment_kafka_spout_parallelism",
           "subsection-name": "subsection-enrichment-storm"
         },
         {
-          "config": "metron-env/enrichment_split_parallelism",
+          "config": "metron-enrichment-env/enrichment_split_parallelism",
           "subsection-name": "subsection-enrichment-storm"
         },
         {
-          "config": "metron-env/enrichment_stellar_parallelism",
+          "config": "metron-enrichment-env/enrichment_stellar_parallelism",
           "subsection-name": "subsection-enrichment-storm"
         },
         {
-          "config": "metron-env/enrichment_join_parallelism",
+          "config": "metron-enrichment-env/enrichment_join_parallelism",
           "subsection-name": "subsection-enrichment-storm"
         },
         {
-          "config": "metron-env/threat_intel_split_parallelism",
+          "config": "metron-enrichment-env/threat_intel_split_parallelism",
           "subsection-name": "subsection-enrichment-storm"
         },
         {
-          "config": "metron-env/threat_intel_stellar_parallelism",
+          "config": "metron-enrichment-env/threat_intel_stellar_parallelism",
           "subsection-name": "subsection-enrichment-storm"
         },
         {
-          "config": "metron-env/threat_intel_join_parallelism",
+          "config": "metron-enrichment-env/threat_intel_join_parallelism",
           "subsection-name": "subsection-enrichment-storm"
         },
         {
-          "config": "metron-env/kafka_writer_parallelism",
+          "config": "metron-enrichment-env/kafka_writer_parallelism",
           "subsection-name": "subsection-enrichment-storm"
         },
 
         {
-          "config": "metron-env/indexing_kafka_start",
+          "config": "metron-indexing-env/indexing_kafka_start",
           "subsection-name": "subsection-indexing-kafka"
         },
         {
-          "config": "metron-env/indexing_input_topic",
+          "config": "metron-indexing-env/indexing_input_topic",
           "subsection-name": "subsection-indexing-kafka"
         },
         {
-          "config": "metron-env/indexing_error_topic",
+          "config": "metron-indexing-env/indexing_error_topic",
           "subsection-name": "subsection-indexing-kafka"
         },
         {
-          "config": "metron-env/indexing_workers",
+          "config": "metron-indexing-env/indexing_writer_class_name",
           "subsection-name": "subsection-indexing-storm"
         },
         {
-          "config": "metron-env/indexing_acker_executors",
+          "config": "metron-indexing-env/indexing_workers",
           "subsection-name": "subsection-indexing-storm"
         },
         {
-          "config": "metron-env/indexing_topology_worker_childopts",
+          "config": "metron-indexing-env/indexing_acker_executors",
           "subsection-name": "subsection-indexing-storm"
         },
         {
-          "config": "metron-env/indexing_topology_max_spout_pending",
+          "config": "metron-indexing-env/indexing_topology_worker_childopts",
           "subsection-name": "subsection-indexing-storm"
         },
         {
-          "config": "metron-env/indexing_kafka_spout_parallelism",
+          "config": "metron-indexing-env/indexing_topology_max_spout_pending",
           "subsection-name": "subsection-indexing-storm"
         },
         {
-          "config": "metron-env/indexing_writer_parallelism",
+          "config": "metron-indexing-env/indexing_kafka_spout_parallelism",
           "subsection-name": "subsection-indexing-storm"
         },
         {
-          "config": "metron-env/hdfs_writer_parallelism",
+          "config": "metron-indexing-env/indexing_writer_parallelism",
           "subsection-name": "subsection-indexing-storm"
         },
         {
-          "config": "metron-env/metron_apps_indexed_hdfs_dir",
+          "config": "metron-indexing-env/hdfs_writer_parallelism",
+          "subsection-name": "subsection-indexing-storm"
+        },
+        {
+          "config": "metron-indexing-env/metron_apps_indexed_hdfs_dir",
           "subsection-name": "subsection-indexing-hdfs"
         },
         {
-          "config": "metron-env/bolt_hdfs_rotation_policy",
+          "config": "metron-indexing-env/bolt_hdfs_rotation_policy",
           "subsection-name": "subsection-indexing-hdfs"
         },
         {
-          "config": "metron-env/bolt_hdfs_rotation_policy_units",
+          "config": "metron-indexing-env/bolt_hdfs_rotation_policy_units",
           "subsection-name": "subsection-indexing-hdfs"
         },
         {
-          "config": "metron-env/bolt_hdfs_rotation_policy_count",
+          "config": "metron-indexing-env/bolt_hdfs_rotation_policy_count",
           "subsection-name": "subsection-indexing-hdfs"
         },
 
         {
-          "config": "metron-env/metron_rest_port",
+          "config": "metron-rest-env/metron_rest_port",
           "subsection-name": "subsection-rest"
         },
         {
-          "config": "metron-env/metron_jdbc_url",
+          "config": "metron-rest-env/metron_jdbc_url",
           "subsection-name": "subsection-rest"
         },
         {
-          "config": "metron-env/metron_jdbc_driver",
+          "config": "metron-rest-env/metron_jdbc_driver",
           "subsection-name": "subsection-rest"
         },
         {
-          "config": "metron-env/metron_jdbc_username",
+          "config": "metron-rest-env/metron_jdbc_username",
           "subsection-name": "subsection-rest"
         },
         {
-          "config": "metron-env/metron_jdbc_password",
+          "config": "metron-rest-env/metron_jdbc_password",
           "subsection-name": "subsection-rest"
         },
         {
-          "config": "metron-env/metron_jdbc_platform",
+          "config": "metron-rest-env/metron_jdbc_platform",
           "subsection-name": "subsection-rest"
         },
         {
-          "config": "metron-env/metron_jdbc_client_path",
+          "config": "metron-rest-env/metron_jdbc_client_path",
           "subsection-name": "subsection-rest"
         },
         {
-          "config": "metron-env/metron_default_grok_path",
+          "config": "metron-rest-env/metron_default_grok_path",
           "subsection-name": "subsection-rest"
         },
         {
-          "config": "metron-env/metron_temp_grok_path",
+          "config": "metron-rest-env/metron_temp_grok_path",
           "subsection-name": "subsection-rest"
         },
         {
-          "config": "metron-env/metron_spring_profiles_active",
+          "config": "metron-rest-env/metron_spring_profiles_active",
           "subsection-name": "subsection-rest"
         },
         {
-          "config": "metron-env/metron_jvm_flags",
+          "config": "metron-rest-env/metron_jvm_flags",
           "subsection-name": "subsection-rest"
         },
         {
-          "config": "metron-env/metron_spring_options",
+          "config": "metron-rest-env/metron_spring_options",
           "subsection-name": "subsection-rest"
         },
         {
-          "config": "metron-env/metron_management_ui_port",
+          "config": "metron-management-ui-env/metron_management_ui_port",
           "subsection-name": "subsection-management-ui"
         }
       ]
@@ -512,232 +516,231 @@
         }
       },
       {
-        "config": "metron-env/parsers",
+        "config": "metron-parsers-env/parsers",
         "widget": {
           "type": "text-field"
         }
       },
       {
-        "config": "metron-env/parser_error_topic",
+        "config": "metron-parsers-env/parser_error_topic",
         "widget": {
           "type": "text-field"
         }
       },
 
-
       {
-        "config": "metron-env/enrichment_workers",
+        "config": "metron-enrichment-env/geoip_url",
         "widget": {
           "type": "text-field"
         }
       },
       {
-        "config": "metron-env/geoip_url",
+        "config": "metron-enrichment-env/enrichment_host_known_hosts",
         "widget": {
           "type": "text-field"
         }
       },
       {
-        "config": "metron-env/enrichment_acker_executors",
+        "config": "metron-enrichment-env/enrichment_kafka_start",
         "widget": {
-          "type": "text-field"
+          "type": "combo"
         }
       },
       {
-        "config": "metron-env/enrichment_topology_worker_childopts",
+        "config": "metron-enrichment-env/enrichment_input_topic",
         "widget": {
           "type": "text-field"
         }
       },
       {
-        "config": "metron-env/enrichment_topology_max_spout_pending",
+        "config": "metron-enrichment-env/enrichment_output_topic",
         "widget": {
           "type": "text-field"
         }
       },
       {
-        "config": "metron-env/enrichment_kafka_start",
+        "config": "metron-enrichment-env/enrichment_error_topic",
         "widget": {
-          "type": "combo"
+          "type": "text-field"
         }
       },
       {
-        "config": "metron-env/enrichment_input_topic",
+        "config": "metron-enrichment-env/threatintel_error_topic",
         "widget": {
           "type": "text-field"
         }
       },
       {
-        "config": "metron-env/enrichment_output_topic",
+        "config": "metron-enrichment-env/enrichment_workers",
         "widget": {
           "type": "text-field"
         }
       },
       {
-        "config": "metron-env/enrichment_error_topic",
+        "config": "metron-enrichment-env/enrichment_acker_executors",
         "widget": {
           "type": "text-field"
         }
       },
       {
-        "config": "metron-env/threatintel_error_topic",
+        "config": "metron-enrichment-env/enrichment_topology_worker_childopts",
         "widget": {
           "type": "text-field"
         }
       },
       {
-        "config": "metron-env/enrichment_join_cache_size",
+        "config": 
"metron-enrichment-env/enrichment_topology_max_spout_pending",
         "widget": {
           "type": "text-field"
         }
       },
       {
-        "config": "metron-env/threatintel_join_cache_size",
+        "config": "metron-enrichment-env/enrichment_join_cache_size",
         "widget": {
           "type": "text-field"
         }
       },
       {
-        "config": "metron-env/enrichment_host_known_hosts",
+        "config": "metron-enrichment-env/threatintel_join_cache_size",
         "widget": {
           "type": "text-field"
         }
       },
       {
-        "config": "metron-env/enrichment_kafka_spout_parallelism",
+        "config": "metron-enrichment-env/enrichment_kafka_spout_parallelism",
         "widget": {
           "type": "text-field"
         }
       },
       {
-        "config": "metron-env/enrichment_split_parallelism",
+        "config": "metron-enrichment-env/enrichment_split_parallelism",
         "widget": {
           "type": "text-field"
         }
       },
       {
-        "config": "metron-env/enrichment_stellar_parallelism",
+        "config": "metron-enrichment-env/enrichment_stellar_parallelism",
         "widget": {
           "type": "text-field"
         }
       },
       {
-        "config": "metron-env/enrichment_join_parallelism",
+        "config": "metron-enrichment-env/enrichment_join_parallelism",
         "widget": {
           "type": "text-field"
         }
       },
       {
-        "config": "metron-env/threat_intel_split_parallelism",
+        "config": "metron-enrichment-env/threat_intel_split_parallelism",
         "widget": {
           "type": "text-field"
         }
       },
       {
-        "config": "metron-env/threat_intel_stellar_parallelism",
+        "config": "metron-enrichment-env/threat_intel_stellar_parallelism",
         "widget": {
           "type": "text-field"
         }
       },
       {
-        "config": "metron-env/threat_intel_join_parallelism",
+        "config": "metron-enrichment-env/threat_intel_join_parallelism",
         "widget": {
           "type": "text-field"
         }
       },
       {
-        "config": "metron-env/kafka_writer_parallelism",
+        "config": "metron-enrichment-env/kafka_writer_parallelism",
         "widget": {
           "type": "text-field"
         }
       },
 
       {
-        "config": "metron-env/indexing_workers",
+        "config": "metron-indexing-env/indexing_kafka_start",
         "widget": {
-          "type": "text-field"
+          "type": "combo"
         }
       },
       {
-        "config": "metron-env/indexing_acker_executors",
+        "config": "metron-indexing-env/indexing_input_topic",
         "widget": {
           "type": "text-field"
         }
       },
       {
-        "config": "metron-env/indexing_topology_worker_childopts",
+        "config": "metron-indexing-env/indexing_error_topic",
         "widget": {
           "type": "text-field"
         }
       },
       {
-        "config": "metron-env/indexing_topology_max_spout_pending",
+        "config": "metron-indexing-env/indexing_writer_class_name",
         "widget": {
           "type": "text-field"
         }
       },
       {
-        "config": "metron-env/indexing_kafka_start",
+        "config": "metron-indexing-env/indexing_workers",
         "widget": {
-          "type": "combo"
+          "type": "text-field"
         }
       },
       {
-        "config": "metron-env/indexing_input_topic",
+        "config": "metron-indexing-env/indexing_acker_executors",
         "widget": {
           "type": "text-field"
         }
       },
       {
-        "config": "metron-env/indexing_error_topic",
+        "config": "metron-indexing-env/indexing_topology_worker_childopts",
         "widget": {
           "type": "text-field"
         }
       },
       {
-        "config": "metron-env/bolt_hdfs_rotation_policy",
+        "config": "metron-indexing-env/indexing_topology_max_spout_pending",
         "widget": {
           "type": "text-field"
         }
       },
       {
-        "config": "metron-env/bolt_hdfs_rotation_policy_units",
+        "config": "metron-indexing-env/indexing_kafka_spout_parallelism",
         "widget": {
-          "type": "combo"
+          "type": "text-field"
         }
       },
       {
-        "config": "metron-env/bolt_hdfs_rotation_policy_count",
+        "config": "metron-indexing-env/indexing_writer_parallelism",
         "widget": {
           "type": "text-field"
         }
       },
       {
-        "config": "metron-env/indexing_error_topic",
+        "config": "metron-indexing-env/hdfs_writer_parallelism",
         "widget": {
           "type": "text-field"
         }
       },
       {
-        "config": "metron-env/indexing_kafka_spout_parallelism",
+        "config": "metron-indexing-env/metron_apps_indexed_hdfs_dir",
         "widget": {
           "type": "text-field"
         }
       },
       {
-        "config": "metron-env/indexing_writer_parallelism",
+        "config": "metron-indexing-env/bolt_hdfs_rotation_policy",
         "widget": {
           "type": "text-field"
         }
       },
       {
-        "config": "metron-env/hdfs_writer_parallelism",
+        "config": "metron-indexing-env/bolt_hdfs_rotation_policy_units",
         "widget": {
-          "type": "text-field"
+          "type": "combo"
         }
       },
       {
-        "config": "metron-env/metron_apps_indexed_hdfs_dir",
+        "config": "metron-indexing-env/bolt_hdfs_rotation_policy_count",
         "widget": {
           "type": "text-field"
         }
@@ -745,79 +748,79 @@
 
 
       {
-        "config": "metron-env/metron_rest_port",
+        "config": "metron-rest-env/metron_rest_port",
         "widget": {
           "type": "text-field"
         }
       },
       {
-        "config": "metron-env/metron_jdbc_url",
+        "config": "metron-rest-env/metron_jdbc_url",
         "widget": {
           "type": "text-field"
         }
       },
       {
-        "config": "metron-env/metron_jdbc_driver",
+        "config": "metron-rest-env/metron_jdbc_driver",
         "widget": {
           "type": "text-field"
         }
       },
       {
-        "config": "metron-env/metron_jdbc_username",
+        "config": "metron-rest-env/metron_jdbc_username",
         "widget": {
           "type": "text-field"
         }
       },
       {
-        "config": "metron-env/metron_jdbc_password",
+        "config": "metron-rest-env/metron_jdbc_password",
         "widget": {
           "type": "password"
         }
       },
       {
-        "config": "metron-env/metron_jdbc_platform",
+        "config": "metron-rest-env/metron_jdbc_platform",
         "widget": {
           "type": "text-field"
         }
       },
       {
-        "config": "metron-env/metron_jdbc_client_path",
+        "config": "metron-rest-env/metron_jdbc_client_path",
         "widget": {
           "type": "text-field"
         }
       },
       {
-        "config": "metron-env/metron_default_grok_path",
+        "config": "metron-rest-env/metron_default_grok_path",
         "widget": {
           "type": "text-field"
         }
       },
       {
-        "config": "metron-env/metron_temp_grok_path",
+        "config": "metron-rest-env/metron_temp_grok_path",
         "widget": {
           "type": "text-field"
         }
       },
       {
-        "config": "metron-env/metron_spring_profiles_active",
+        "config": "metron-rest-env/metron_spring_profiles_active",
         "widget": {
           "type": "text-field"
         }
       },
       {
-        "config": "metron-env/metron_jvm_flags",
+        "config": "metron-rest-env/metron_jvm_flags",
         "widget": {
           "type": "text-field"
         }
       },
       {
-        "config": "metron-env/metron_spring_options",
+        "config": "metron-rest-env/metron_spring_options",
         "widget": {
           "type": "text-field"
         }
       },
       {
-        "config": "metron-env/metron_management_ui_port",
+        "config": "metron-management-ui-env/metron_management_ui_port",
         "widget": {
           "type": "text-field"
         }

http://git-wip-us.apache.org/repos/asf/metron/blob/a9b01d1e/metron-deployment/roles/ambari_config/vars/single_node_vm.yml
----------------------------------------------------------------------
diff --git a/metron-deployment/roles/ambari_config/vars/single_node_vm.yml 
b/metron-deployment/roles/ambari_config/vars/single_node_vm.yml
index 6a36fac..482fafd 100644
--- a/metron-deployment/roles/ambari_config/vars/single_node_vm.yml
+++ b/metron-deployment/roles/ambari_config/vars/single_node_vm.yml
@@ -90,9 +90,10 @@ configurations:
   - kafka-broker:
       log.dirs: '{{ kafka_log_dirs }}'
       delete.topic.enable: "true"
-  - metron-env:
-      parsers: "bro,snort"
+  - metron-rest-env:
       metron_spring_profiles_active: "dev"
+  - metron-parsers-env:
+      parsers: "bro,snort"
   - elastic-site:
       index_number_of_shards: 1
       index_number_of_replicas: 0
@@ -106,6 +107,7 @@ required_configurations:
       storm_rest_addr: "http://{{ groups.ambari_slave[0] }}:8744"
       es_hosts: "{{ groups.search | join(',') }}"
       zeppelin_server_url: "{{ groups.zeppelin[0] }}:9995"
+  - metron-rest-env:
       metron_jdbc_driver: "org.h2.Driver"
       metron_jdbc_url: "jdbc:h2:file:~/metrondb"
       metron_jdbc_username: "root"

Reply via email to