summaryrefslogtreecommitdiffstats
path: root/roles/openshift_logging_elasticsearch
diff options
context:
space:
mode:
authorewolinetz <ewolinet@redhat.com>2017-05-15 10:12:50 -0500
committerewolinetz <ewolinet@redhat.com>2017-05-22 10:42:54 -0500
commit186d744cee0bda007e196358da5fe5e94187e0d3 (patch)
tree149dcdc2ff243915032fdaf599c8b9b50be75b01 /roles/openshift_logging_elasticsearch
parent27cd17a5b41c1cc93dbd84c12f571aa176f99ed2 (diff)
downloadopenshift-186d744cee0bda007e196358da5fe5e94187e0d3.tar.gz
openshift-186d744cee0bda007e196358da5fe5e94187e0d3.tar.bz2
openshift-186d744cee0bda007e196358da5fe5e94187e0d3.tar.xz
openshift-186d744cee0bda007e196358da5fe5e94187e0d3.zip
Adding some missing changes
Diffstat (limited to 'roles/openshift_logging_elasticsearch')
-rw-r--r--roles/openshift_logging_elasticsearch/templates/elasticsearch.yml.j24
1 files changed, 3 insertions, 1 deletions
diff --git a/roles/openshift_logging_elasticsearch/templates/elasticsearch.yml.j2 b/roles/openshift_logging_elasticsearch/templates/elasticsearch.yml.j2
index 340c6d7e6..2aaa44190 100644
--- a/roles/openshift_logging_elasticsearch/templates/elasticsearch.yml.j2
+++ b/roles/openshift_logging_elasticsearch/templates/elasticsearch.yml.j2
@@ -8,7 +8,6 @@ script:
index:
number_of_shards: 1
number_of_replicas: 0
- auto_expand_replicas: 0-2
unassigned.node_left.delayed_timeout: 2m
translog:
flush_threshold_size: 256mb
@@ -29,6 +28,7 @@ cloud:
discovery:
type: kubernetes
zen.ping.multicast.enabled: false
+ zen.minimum_master_nodes: {{es_min_masters}}
gateway:
expected_master_nodes: ${NODE_QUORUM}
@@ -37,6 +37,8 @@ gateway:
recover_after_time: ${RECOVER_AFTER_TIME}
io.fabric8.elasticsearch.authentication.users: ["system.logging.kibana", "system.logging.fluentd", "system.logging.curator", "system.admin"]
+io.fabric8.elasticsearch.kibana.mapping.app: /usr/share/elasticsearch/index_patterns/com.redhat.viaq-openshift.index-pattern.json
+io.fabric8.elasticsearch.kibana.mapping.ops: /usr/share/elasticsearch/index_patterns/com.redhat.viaq-openshift.index-pattern.json
openshift.config:
use_common_data_model: true