summaryrefslogtreecommitdiffstats
path: root/roles
diff options
context:
space:
mode:
authorOpenShift Bot <eparis+openshiftbot@redhat.com>2017-03-24 09:11:27 -0500
committerGitHub <noreply@github.com>2017-03-24 09:11:27 -0500
commit2d1f47412ecadf337045b51e7d0288ba9bca9a96 (patch)
treec6c7470cee618909f6cfd9828a151a13d99164ea /roles
parent8e26f8cf9594693702fd1e545b47116cbbff34f0 (diff)
parentc4fcf9ef11b4dfc27f8f1e509719864f0ef2d019 (diff)
downloadopenshift-2d1f47412ecadf337045b51e7d0288ba9bca9a96.tar.gz
openshift-2d1f47412ecadf337045b51e7d0288ba9bca9a96.tar.bz2
openshift-2d1f47412ecadf337045b51e7d0288ba9bca9a96.tar.xz
openshift-2d1f47412ecadf337045b51e7d0288ba9bca9a96.zip
Merge pull request #3730 from richm/bug-1434300
Merged by openshift-bot
Diffstat (limited to 'roles')
-rw-r--r--roles/openshift_logging/templates/elasticsearch.yml.j22
1 files changed, 2 insertions, 0 deletions
diff --git a/roles/openshift_logging/templates/elasticsearch.yml.j2 b/roles/openshift_logging/templates/elasticsearch.yml.j2
index 3b9558685..07e8c0c98 100644
--- a/roles/openshift_logging/templates/elasticsearch.yml.j2
+++ b/roles/openshift_logging/templates/elasticsearch.yml.j2
@@ -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