summaryrefslogtreecommitdiffstats
path: root/kubernetes/aai/components/aai-elasticsearch
diff options
context:
space:
mode:
Diffstat (limited to 'kubernetes/aai/components/aai-elasticsearch')
-rw-r--r--kubernetes/aai/components/aai-elasticsearch/resources/config/elasticsearch.yml34
-rw-r--r--kubernetes/aai/components/aai-elasticsearch/resources/config/jvm.options7
-rw-r--r--kubernetes/aai/components/aai-elasticsearch/resources/config/log4j2.properties7
-rw-r--r--kubernetes/aai/components/aai-elasticsearch/templates/configmap.yaml2
-rw-r--r--kubernetes/aai/components/aai-elasticsearch/templates/deployment.yaml2
-rw-r--r--kubernetes/aai/components/aai-elasticsearch/templates/service.yaml2
6 files changed, 43 insertions, 11 deletions
diff --git a/kubernetes/aai/components/aai-elasticsearch/resources/config/elasticsearch.yml b/kubernetes/aai/components/aai-elasticsearch/resources/config/elasticsearch.yml
index ae12344635..1cbe3c4a69 100644
--- a/kubernetes/aai/components/aai-elasticsearch/resources/config/elasticsearch.yml
+++ b/kubernetes/aai/components/aai-elasticsearch/resources/config/elasticsearch.yml
@@ -1,3 +1,4 @@
+{{/*
# Copyright © 2018 Amdocs, Bell Canada, AT&T
#
# Licensed under the Apache License, Version 2.0 (the "License");
@@ -43,7 +44,7 @@
# multiple clusters on the same network, make sure you're using unique names.
#
# cluster.name: elasticsearch
-
+*/}}
cluster.name: ES_AAI
#################################### Node #####################################
@@ -52,7 +53,7 @@ node.name: ES_ONAP
node.master: true
node.data: true
-
+{{/*
# Use the Cluster Health API [http://localhost:9200/_cluster/health], the
# Node Info API [http://localhost:9200/_nodes] or GUI tools
# such as <http://www.elasticsearch.org/overview/marvel/>,
@@ -62,10 +63,10 @@ node.data: true
# By default, multiple nodes are allowed to start from the same installation location
# to disable it, set the following:
-
+*/}}
node.max_local_storage_nodes: 1
-
+{{/*
#################################### Index ####################################
# You can set a number of options (such as shard/replica options, mapping
# or analyzer definitions, translog settings, ...) for indices globally,
@@ -115,7 +116,7 @@ node.max_local_storage_nodes: 1
# Path to directory where to store index data allocated for this node.
# Use swm auto link to redirect the data directory if necessary.
-
+*/}}
path.data: /usr/share/elasticsearch/data
# path.data: /path/to/data1,/path/to/data2
@@ -126,7 +127,7 @@ path.logs: /usr/share/elasticsearch/logs
#path.plugins: /opt/app/elasticsearch/plugins
-
+{{/*
#################################### Plugin ###################################
# If a plugin listed here is not installed for current node, the node will not start.
@@ -164,15 +165,16 @@ path.logs: /usr/share/elasticsearch/logs
# bootstrap.system_call_filter to false.
# See: https://www.elastic.co/guide/en/elasticsearch/reference/current/system-call-filter-check.html
#
-# seccomp is found in Linux kernels: 2.6.37–2.6.39, 3.0–3.19, 4.0–4.9,
+# seccomp is found in Linux kernels: 2.6.37�2.6.39, 3.0�3.19, 4.0�4.9,
# 4.10-rc+HEAD
#
# The default setting is to disable the filters assuming an older kernel
# version where seccomp is not available.
# See: https://discuss.elastic.co/t/elasticsearch-warn-unable-to-install-syscall-filter/42819
-
+*/}}
bootstrap.system_call_filter: false
+{{/*
############################## Network And HTTP ###############################
# Elasticsearch, by default, binds itself to the 0.0.0.0 address, and listens
# on port [9200-9300] for HTTP traffic and on port [9300-9400] for node-to-node
@@ -180,8 +182,10 @@ bootstrap.system_call_filter: false
# try the next port).
# Set the bind address specifically (IPv4 or IPv6):
+*/}}
network.bind_host: 0.0.0.0
+{{/*
# Set the address other nodes will use to communicate with this node. If not
# set, it is automatically derived. It must point to an actual IP address.
@@ -192,6 +196,7 @@ network.bind_host: 0.0.0.0
# Set a custom port for the node to node communication (9300 by default):
+*/}}
transport.tcp.port: {{ .Values.service.internalPort2 }}
# Enable compression for all communication between nodes (disabled by default):
@@ -214,6 +219,7 @@ http.cors.enabled: false
http.cors.allow-origin: "/.*/"
http.cors.allow-headers: X-Requested-With, Content-Type, Content-Length
http.cors.allow-credentials: false
+{{/*
################################### Gateway ###################################
# The gateway allows for persisting the cluster state between full cluster
@@ -235,6 +241,7 @@ http.cors.allow-credentials: false
# Allow recovery process after N nodes in a cluster are up:
#
# gateway.recover_after_nodes: 1
+*/}}
gateway.recover_after_nodes: 1
# Set the timeout to initiate the recovery process, once the N nodes
@@ -250,6 +257,7 @@ gateway.recover_after_time: 5m
# gateway.expected_nodes: 2
gateway.expected_nodes: 2
+{{/*
############################# Recovery Throttling #############################
# These settings allow to control the process of shards allocation between
@@ -268,8 +276,10 @@ gateway.expected_nodes: 2
# Set to throttle throughput when recovering (eg. 100mb, by default 20mb):
# indices.recovery.max_bytes_per_sec: 20mb
+*/}}
indices.recovery.max_bytes_per_sec: 20mb
+{{/*
# Set to limit the number of open concurrent streams when
# recovering a shard from a peer:
#
@@ -285,15 +295,19 @@ indices.recovery.max_bytes_per_sec: 20mb
# operational within the cluster. Its recommended to set it to a higher value
# than 1 when running more than 2 nodes in the cluster.
#
+*/}}
discovery.zen.minimum_master_nodes: 1
+{{/*
# Set the time to wait for ping responses from other nodes when discovering.
# Set this option to a higher value on a slow or congested network
# to minimize discovery failures:
#
# discovery.zen.ping_timeout: 3s
+*/}}
discovery.zen.ping_timeout: 3s
+{{/*
# For more information, see
# <http://elasticsearch.org/guide/en/elasticsearch/reference/current/modules-discovery-zen.html>
@@ -310,8 +324,11 @@ discovery.zen.ping_timeout: 3s
# to perform discovery when new nodes (master or data) are started:
#
# discovery.zen.ping.unicast.hosts: ["host1", "host2:port"]
+
+*/}}
discovery.zen.ping.unicast.hosts: ["0.0.0.0"]
+{{/*
# EC2 discovery allows to use AWS EC2 API in order to perform discovery.
#
# You have to install the cloud-aws plugin for enabling the EC2 discovery.
@@ -366,6 +383,7 @@ discovery.zen.ping.unicast.hosts: ["0.0.0.0"]
# x-pack security conflicts with searchguard
+*/}}
xpack.security.enabled: false
xpack.ml.enabled: false
xpack.monitoring.enabled: false
diff --git a/kubernetes/aai/components/aai-elasticsearch/resources/config/jvm.options b/kubernetes/aai/components/aai-elasticsearch/resources/config/jvm.options
index e69d7983c0..db4d2f0779 100644
--- a/kubernetes/aai/components/aai-elasticsearch/resources/config/jvm.options
+++ b/kubernetes/aai/components/aai-elasticsearch/resources/config/jvm.options
@@ -1,3 +1,4 @@
+{{/*
# Copyright © 2018 Amdocs, AT&T, Bell Canada
#
# Licensed under the Apache License, Version 2.0 (the "License");
@@ -32,10 +33,11 @@
# Xms represents the initial size of total heap space
# Xmx represents the maximum size of total heap space
-
+*/}}
-Xms1g
-Xmx1g
+{{/*
################################################################
## Expert settings
################################################################
@@ -47,6 +49,7 @@
################################################################
## GC configuration
+*/}}
-XX:+UseConcMarkSweepGC
-XX:CMSInitiatingOccupancyFraction=75
-XX:+UseCMSInitiatingOccupancyOnly
@@ -92,6 +95,7 @@
# heap dumps are created in the working directory of the JVM
-XX:+HeapDumpOnOutOfMemoryError
+{{/*
# specify an alternative path for heap dumps
# ensure the directory exists and has sufficient space
#-XX:HeapDumpPath=/heap/dump/path
@@ -115,3 +119,4 @@
#-XX:+UseGCLogFileRotation
#-XX:NumberOfGCLogFiles=32
#-XX:GCLogFileSize=128M
+*/}} \ No newline at end of file
diff --git a/kubernetes/aai/components/aai-elasticsearch/resources/config/log4j2.properties b/kubernetes/aai/components/aai-elasticsearch/resources/config/log4j2.properties
index e674865221..86200c6c10 100644
--- a/kubernetes/aai/components/aai-elasticsearch/resources/config/log4j2.properties
+++ b/kubernetes/aai/components/aai-elasticsearch/resources/config/log4j2.properties
@@ -1,3 +1,4 @@
+{{/*
# Copyright © 2018 Amdocs, AT&T, Bell Canada
#
# Licensed under the Apache License, Version 2.0 (the "License");
@@ -11,6 +12,7 @@
# 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.
+*/}}
status = error
@@ -38,6 +40,7 @@ rootLogger.level = info
rootLogger.appenderRef.console.ref = console
rootLogger.appenderRef.rolling.ref = rolling
+{{/*
# appender.deprecation_rolling.type = RollingFile
# appender.deprecation_rolling.name = deprecation_rolling
# appender.deprecation_rolling.fileName = ${sys:es.logs.base_path}_deprecation.log
@@ -49,12 +52,12 @@ rootLogger.appenderRef.rolling.ref = rolling
# appender.deprecation_rolling.policies.size.size = 1GB
# appender.deprecation_rolling.strategy.type = DefaultRolloverStrategy
# appender.deprecation_rolling.strategy.max = 4
-
+
# logger.deprecation.name = org.elasticsearch.deprecation
# logger.deprecation.level = warn
# logger.deprecation.appenderRef.deprecation_rolling.ref = deprecation_rolling
# logger.deprecation.additivity = false
-
+*/}}
appender.index_search_slowlog_rolling.type = RollingFile
appender.index_search_slowlog_rolling.name = index_search_slowlog_rolling
appender.index_search_slowlog_rolling.fileName = ${sys:es.logs.base_path}_index_search_slowlog.log
diff --git a/kubernetes/aai/components/aai-elasticsearch/templates/configmap.yaml b/kubernetes/aai/components/aai-elasticsearch/templates/configmap.yaml
index b3af5da60b..63775038f4 100644
--- a/kubernetes/aai/components/aai-elasticsearch/templates/configmap.yaml
+++ b/kubernetes/aai/components/aai-elasticsearch/templates/configmap.yaml
@@ -1,3 +1,4 @@
+{{/*
# Copyright © 2018 Amdocs, Bell Canada, AT&T
#
# Licensed under the Apache License, Version 2.0 (the "License");
@@ -11,6 +12,7 @@
# 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.
+*/}}
apiVersion: v1
kind: ConfigMap
diff --git a/kubernetes/aai/components/aai-elasticsearch/templates/deployment.yaml b/kubernetes/aai/components/aai-elasticsearch/templates/deployment.yaml
index 135d3f8a57..3a92d97ff7 100644
--- a/kubernetes/aai/components/aai-elasticsearch/templates/deployment.yaml
+++ b/kubernetes/aai/components/aai-elasticsearch/templates/deployment.yaml
@@ -1,3 +1,4 @@
+{{/*
# Copyright © 2018 Amdocs, Bell Canada, AT&T
# Modifications Copyright © 2020 Orange
#
@@ -12,6 +13,7 @@
# 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.
+*/}}
apiVersion: apps/v1
kind: Deployment
diff --git a/kubernetes/aai/components/aai-elasticsearch/templates/service.yaml b/kubernetes/aai/components/aai-elasticsearch/templates/service.yaml
index 68d767b380..66dfd493dd 100644
--- a/kubernetes/aai/components/aai-elasticsearch/templates/service.yaml
+++ b/kubernetes/aai/components/aai-elasticsearch/templates/service.yaml
@@ -1,3 +1,4 @@
+{{/*
# Copyright © 2018 Amdocs, Bell Canada, AT&T
#
# Licensed under the Apache License, Version 2.0 (the "License");
@@ -11,6 +12,7 @@
# 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.
+*/}}
apiVersion: v1
kind: Service