METRON-946 Full/Quick dev should default network_host to [ _local_, _site_ ] (mattf-horton) closes apache/incubator-metron#578
Project: http://git-wip-us.apache.org/repos/asf/metron/repo Commit: http://git-wip-us.apache.org/repos/asf/metron/commit/64b66f28 Tree: http://git-wip-us.apache.org/repos/asf/metron/tree/64b66f28 Diff: http://git-wip-us.apache.org/repos/asf/metron/diff/64b66f28 Branch: refs/heads/Metron_0.4.0 Commit: 64b66f28a5410b095c2a64e7e66b9ee9776c4949 Parents: 8532e28 Author: mattf-horton <mfo...@hortonworks.com> Authored: Wed May 10 10:07:02 2017 -0700 Committer: mattf <ma...@apache.org> Committed: Wed May 10 10:07:02 2017 -0700 ---------------------------------------------------------------------- metron-deployment/amazon-ec2/conf/defaults.yml | 3 +- .../inventory/devimage-vagrant/hosts | 52 -------------------- .../inventory/full-dev-platform/group_vars/all | 3 +- .../inventory/quick-dev-platform/group_vars/all | 3 +- .../2.3.3/configuration/elastic-site.xml | 4 +- .../roles/ambari_config/defaults/main.yml | 1 + .../roles/ambari_config/vars/single_node_vm.yml | 2 +- .../roles/ambari_config/vars/small_cluster.yml | 2 +- 8 files changed, 11 insertions(+), 59 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/metron/blob/64b66f28/metron-deployment/amazon-ec2/conf/defaults.yml ---------------------------------------------------------------------- diff --git a/metron-deployment/amazon-ec2/conf/defaults.yml b/metron-deployment/amazon-ec2/conf/defaults.yml index 7a2e350..fd07fd8 100644 --- a/metron-deployment/amazon-ec2/conf/defaults.yml +++ b/metron-deployment/amazon-ec2/conf/defaults.yml @@ -102,5 +102,6 @@ elasticsearch_data_dir: "/data1/elasticsearch,/data2/elasticsearch" install_elasticsearch: True install_solr: False elasticsearch_transport_port: 9300 -elasticsearch_network_interface: eth0 +## The elasticsearch_network_interface must be in the form specified for Elasticsearch, with leading and trailing underscores. +elasticsearch_network_interface: _eth0_ elasticsearch_web_port: 9200 http://git-wip-us.apache.org/repos/asf/metron/blob/64b66f28/metron-deployment/inventory/devimage-vagrant/hosts ---------------------------------------------------------------------- diff --git a/metron-deployment/inventory/devimage-vagrant/hosts b/metron-deployment/inventory/devimage-vagrant/hosts deleted file mode 100644 index 98e8681..0000000 --- a/metron-deployment/inventory/devimage-vagrant/hosts +++ /dev/null @@ -1,52 +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. -# - -[ambari_master] -node1 - -[ambari_slave] -node1 - -[metron_hbase_tables] -node1 - -[metron_kafka_topics] -node1 - -[enrichment] -node1 - -[search] -node1 - -[web] -node1 - -[sensors] -node1 - -[pcap_server] -node1 - -[metron:children] -enrichment -search -web -sensors -metron_kafka_topics -metron_hbase_tables -pcap_server http://git-wip-us.apache.org/repos/asf/metron/blob/64b66f28/metron-deployment/inventory/full-dev-platform/group_vars/all ---------------------------------------------------------------------- diff --git a/metron-deployment/inventory/full-dev-platform/group_vars/all b/metron-deployment/inventory/full-dev-platform/group_vars/all index 7e68cc0..2f097b6 100644 --- a/metron-deployment/inventory/full-dev-platform/group_vars/all +++ b/metron-deployment/inventory/full-dev-platform/group_vars/all @@ -85,5 +85,6 @@ solr_collection_name: Metron solr_number_shards: 1 solr_replication_factor: 1 elasticsearch_transport_port: 9300 -elasticsearch_network_interface: eth1 +## The elasticsearch_network_interface must be in the form specified for Elasticsearch, with leading and trailing underscores. +elasticsearch_network_interface: _eth1_ elasticsearch_web_port: 9200 http://git-wip-us.apache.org/repos/asf/metron/blob/64b66f28/metron-deployment/inventory/quick-dev-platform/group_vars/all ---------------------------------------------------------------------- diff --git a/metron-deployment/inventory/quick-dev-platform/group_vars/all b/metron-deployment/inventory/quick-dev-platform/group_vars/all index 7d0703a..a8bba0e 100644 --- a/metron-deployment/inventory/quick-dev-platform/group_vars/all +++ b/metron-deployment/inventory/quick-dev-platform/group_vars/all @@ -84,5 +84,6 @@ solr_collection_name: Metron solr_number_shards: 1 solr_replication_factor: 1 elasticsearch_transport_port: 9300 -elasticsearch_network_interface: eth1 +## The elasticsearch_network_interface must be in the form specified for Elasticsearch, with leading and trailing underscores. +elasticsearch_network_interface: _eth1_ elasticsearch_web_port: 9200 http://git-wip-us.apache.org/repos/asf/metron/blob/64b66f28/metron-deployment/packaging/ambari/metron-mpack/src/main/resources/common-services/ELASTICSEARCH/2.3.3/configuration/elastic-site.xml ---------------------------------------------------------------------- diff --git a/metron-deployment/packaging/ambari/metron-mpack/src/main/resources/common-services/ELASTICSEARCH/2.3.3/configuration/elastic-site.xml b/metron-deployment/packaging/ambari/metron-mpack/src/main/resources/common-services/ELASTICSEARCH/2.3.3/configuration/elastic-site.xml index 33e01bf..7369f92 100755 --- a/metron-deployment/packaging/ambari/metron-mpack/src/main/resources/common-services/ELASTICSEARCH/2.3.3/configuration/elastic-site.xml +++ b/metron-deployment/packaging/ambari/metron-mpack/src/main/resources/common-services/ELASTICSEARCH/2.3.3/configuration/elastic-site.xml @@ -189,8 +189,8 @@ </property> <property> <name>network_host</name> - <value>[ _local_ ]</value> - <description>Network interface(s) ES will bind to within each node. Use [ _local_ ] for single-node install; change to [ _local_, _site_ ] (including square brackets) for typical cluster install. See https://www.elastic.co/guide/en/elasticsearch/reference/2.3/modules-network.html for ES documentation.</description> + <value>[ _local_, _site_ ]</value> + <description>Network interface(s) ES will bind to within each node. "_site_" or a more specific external address is required for all multi-node clusters, and also recommended for single-node installs to allow access to ES reports from non-local hosts. Always include the square brackets. See https://www.elastic.co/guide/en/elasticsearch/reference/2.3/modules-network.html for ES documentation.</description> </property> <property> <name>network_publish_host</name> http://git-wip-us.apache.org/repos/asf/metron/blob/64b66f28/metron-deployment/roles/ambari_config/defaults/main.yml ---------------------------------------------------------------------- diff --git a/metron-deployment/roles/ambari_config/defaults/main.yml b/metron-deployment/roles/ambari_config/defaults/main.yml index 9ac0342..e0de145 100644 --- a/metron-deployment/roles/ambari_config/defaults/main.yml +++ b/metron-deployment/roles/ambari_config/defaults/main.yml @@ -35,3 +35,4 @@ mapred_map_mem_mb : 1229 mapred_reduce_mem_mb : 1229 topology_classpath: '/etc/hbase/conf:/etc/hadoop/conf' hdp_stack: "2.5" +elasticsearch_network_interface: _site_ http://git-wip-us.apache.org/repos/asf/metron/blob/64b66f28/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 b24c153..3de1af7 100644 --- a/metron-deployment/roles/ambari_config/vars/single_node_vm.yml +++ b/metron-deployment/roles/ambari_config/vars/single_node_vm.yml @@ -97,7 +97,7 @@ configurations: index_number_of_replicas: 0 zen_discovery_ping_unicast_hosts: "[ {{ groups.search | join(', ') }} ]" gateway_recover_after_data_nodes: 1 - network_host: "[ _local_ ]" + network_host: "[ _local_, {{ elasticsearch_network_interface }} ]" masters_also_are_datanodes: "1" required_configurations: http://git-wip-us.apache.org/repos/asf/metron/blob/64b66f28/metron-deployment/roles/ambari_config/vars/small_cluster.yml ---------------------------------------------------------------------- diff --git a/metron-deployment/roles/ambari_config/vars/small_cluster.yml b/metron-deployment/roles/ambari_config/vars/small_cluster.yml index 70c31ea..7803dec 100644 --- a/metron-deployment/roles/ambari_config/vars/small_cluster.yml +++ b/metron-deployment/roles/ambari_config/vars/small_cluster.yml @@ -91,7 +91,7 @@ configurations: index_number_of_replicas: 1 zen_discovery_ping_unicast_hosts: "[ {{ groups.web[0] }}, {{ groups.search | join(', ') }} ]" gateway_recover_after_data_nodes: 1 - network_host: "[ _local_, _{{ elasticsearch_network_interface }}_ ]" + network_host: "[ _local_, {{ elasticsearch_network_interface }} ]" required_configurations: - metron-env: