You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@metron.apache.org by ly...@apache.org on 2016/10/10 16:51:41 UTC
incubator-metron git commit: METRON-480 Kibana 4.5+ Requires
http.cors.enabled set to false on ES closes apache/incubator-metron#288
Repository: incubator-metron
Updated Branches:
refs/heads/master f7554f921 -> a2a5a3d8a
METRON-480 Kibana 4.5+ Requires http.cors.enabled set to false on ES closes apache/incubator-metron#288
Project: http://git-wip-us.apache.org/repos/asf/incubator-metron/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-metron/commit/a2a5a3d8
Tree: http://git-wip-us.apache.org/repos/asf/incubator-metron/tree/a2a5a3d8
Diff: http://git-wip-us.apache.org/repos/asf/incubator-metron/diff/a2a5a3d8
Branch: refs/heads/master
Commit: a2a5a3d8a66d77be07fe435ed597417c4950fe69
Parents: f7554f9
Author: dlyle65535 <dl...@gmail.com>
Authored: Mon Oct 10 12:50:18 2016 -0400
Committer: David Lyle <dl...@gmail.com>
Committed: Mon Oct 10 12:50:18 2016 -0400
----------------------------------------------------------------------
.../ELASTICSEARCH/2.3.3/configuration/elastic-site.xml | 10 +++++++++-
.../ELASTICSEARCH/2.3.3/package/scripts/params.py | 1 +
.../2.3.3/package/templates/elasticsearch.master.yaml.j2 | 2 +-
.../2.3.3/package/templates/elasticsearch.slave.yaml.j2 | 2 +-
4 files changed, 12 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-metron/blob/a2a5a3d8/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 fb3a443..3e7b6a5 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
@@ -47,7 +47,15 @@
<name>path_data</name>
<value>"/opt/lmm/es_data"</value>
<description>Path to directory where to store index data allocated for this node. e.g. "/mnt/first", "/mnt/second"</description>
- </property>
+ </property>
+ <property>
+ <name>http_cors_enabled</name>
+ <value>"false"</value>
+ <description>Enable or disable cross-origin resource sharing, i.e. whether a browser on another origin can do requests to Elasticsearch. Defaults to false.</description>
+ <value-attributes>
+ <type>string</type>
+ </value-attributes>
+ </property>
<!-- Discovery -->
<property>
<name>transport_tcp_port</name>
http://git-wip-us.apache.org/repos/asf/incubator-metron/blob/a2a5a3d8/metron-deployment/packaging/ambari/metron-mpack/src/main/resources/common-services/ELASTICSEARCH/2.3.3/package/scripts/params.py
----------------------------------------------------------------------
diff --git a/metron-deployment/packaging/ambari/metron-mpack/src/main/resources/common-services/ELASTICSEARCH/2.3.3/package/scripts/params.py b/metron-deployment/packaging/ambari/metron-mpack/src/main/resources/common-services/ELASTICSEARCH/2.3.3/package/scripts/params.py
index 30e88ea..8b890d4 100755
--- a/metron-deployment/packaging/ambari/metron-mpack/src/main/resources/common-services/ELASTICSEARCH/2.3.3/package/scripts/params.py
+++ b/metron-deployment/packaging/ambari/metron-mpack/src/main/resources/common-services/ELASTICSEARCH/2.3.3/package/scripts/params.py
@@ -45,6 +45,7 @@ cluster_name = config['configurations']['elastic-site']['cluster_name']
zen_discovery_ping_unicast_hosts = config['configurations']['elastic-site']['zen_discovery_ping_unicast_hosts']
path_data = config['configurations']['elastic-site']['path_data']
+http_cors_enabled = config['configurations']['elastic-site']['http_cors_enabled']
http_port = config['configurations']['elastic-site']['http_port']
transport_tcp_port = config['configurations']['elastic-site']['transport_tcp_port']
http://git-wip-us.apache.org/repos/asf/incubator-metron/blob/a2a5a3d8/metron-deployment/packaging/ambari/metron-mpack/src/main/resources/common-services/ELASTICSEARCH/2.3.3/package/templates/elasticsearch.master.yaml.j2
----------------------------------------------------------------------
diff --git a/metron-deployment/packaging/ambari/metron-mpack/src/main/resources/common-services/ELASTICSEARCH/2.3.3/package/templates/elasticsearch.master.yaml.j2 b/metron-deployment/packaging/ambari/metron-mpack/src/main/resources/common-services/ELASTICSEARCH/2.3.3/package/templates/elasticsearch.master.yaml.j2
index a9de018..8d92f1b 100755
--- a/metron-deployment/packaging/ambari/metron-mpack/src/main/resources/common-services/ELASTICSEARCH/2.3.3/package/templates/elasticsearch.master.yaml.j2
+++ b/metron-deployment/packaging/ambari/metron-mpack/src/main/resources/common-services/ELASTICSEARCH/2.3.3/package/templates/elasticsearch.master.yaml.j2
@@ -39,7 +39,7 @@ node:
path:
data: {{path_data}}
-http.cors.enabled: true
+http.cors.enabled: {{http_cors_enabled}}
port: {{http_port}}
http://git-wip-us.apache.org/repos/asf/incubator-metron/blob/a2a5a3d8/metron-deployment/packaging/ambari/metron-mpack/src/main/resources/common-services/ELASTICSEARCH/2.3.3/package/templates/elasticsearch.slave.yaml.j2
----------------------------------------------------------------------
diff --git a/metron-deployment/packaging/ambari/metron-mpack/src/main/resources/common-services/ELASTICSEARCH/2.3.3/package/templates/elasticsearch.slave.yaml.j2 b/metron-deployment/packaging/ambari/metron-mpack/src/main/resources/common-services/ELASTICSEARCH/2.3.3/package/templates/elasticsearch.slave.yaml.j2
index e88fc5f..58ce3d3 100755
--- a/metron-deployment/packaging/ambari/metron-mpack/src/main/resources/common-services/ELASTICSEARCH/2.3.3/package/templates/elasticsearch.slave.yaml.j2
+++ b/metron-deployment/packaging/ambari/metron-mpack/src/main/resources/common-services/ELASTICSEARCH/2.3.3/package/templates/elasticsearch.slave.yaml.j2
@@ -39,7 +39,7 @@ node:
path:
data: {{path_data}}
-http.cors.enabled: true
+http.cors.enabled: {{http_cors_enabled}}
port: {{http_port}}