AAI HELM code transfer

- Remove kubernetes/aai code from OOM.
- Add oom/aai as submodule of OOM in kubernetes/aai
location.

Change-Id: I7741a0cd4b0ecef174569c9450b09f2f7c211f44
Issue-ID: CIMAN-250
Signed-off-by: Jessica Wagantall <jwagantall@linuxfoundation.org>

21 files changed, 0 insertions, 1641 deletions

diff --git a/kubernetes/aai/charts/aai-elasticsearch/.helmignore b/kubernetes/aai/charts/aai-elasticsearch/.helmignore
deleted file mode 100644
index daebc7da77..0000000000
--- a/kubernetes/aai/charts/aai-elasticsearch/.helmignore
+++ /dev/null
@@ -1,21 +0,0 @@
-# Patterns to ignore when building packages.

-# This supports shell glob matching, relative path matching, and

-# negation (prefixed with !). Only one pattern per line.

-.DS_Store

-# Common VCS dirs

-.git/

-.gitignore

-.bzr/

-.bzrignore

-.hg/

-.hgignore

-.svn/

-# Common backup files

-*.swp

-*.bak

-*.tmp

-*~

-# Various IDEs

-.project

-.idea/

-*.tmproj

diff --git a/kubernetes/aai/charts/aai-elasticsearch/Chart.yaml b/kubernetes/aai/charts/aai-elasticsearch/Chart.yaml
deleted file mode 100644
index fbc7abd0d9..0000000000
--- a/kubernetes/aai/charts/aai-elasticsearch/Chart.yaml
+++ /dev/null
@@ -1,18 +0,0 @@
-# Copyright © 2018 Amdocs, Bell Canada, AT&T
-#
-# Licensed 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.
-
-apiVersion: v1
-description: ONAP AAI elasticsearch
-name: aai-elasticsearch
-version: 4.0.0
diff --git a/kubernetes/aai/charts/aai-elasticsearch/resources/bin/init_sg.sh b/kubernetes/aai/charts/aai-elasticsearch/resources/bin/init_sg.sh
deleted file mode 100644
index e85936570e..0000000000
--- a/kubernetes/aai/charts/aai-elasticsearch/resources/bin/init_sg.sh
+++ /dev/null
@@ -1,11 +0,0 @@
-#!/bin/sh
-
-/usr/share/elasticsearch/plugins/search-guard-6/tools/sgadmin.sh \
-  -cd /usr/share/elasticsearch/config/sg \
-  -ks /usr/share/elasticsearch/config/sg/auth/{{ .Values.config.adminKeyStore }} \
-  -ts /usr/share/elasticsearch/config/sg/auth/{{ .Values.config.trustStore }} \
-  -kspass {{ .Values.config.adminKeyStorePassword }} \
-  -tspass {{ .Values.config.trustStorePassword}} \
-  -nhnv \
-  -icl \
-  -p {{ .Values.service.internalPort2 }}
\ No newline at end of file
diff --git a/kubernetes/aai/charts/aai-elasticsearch/resources/bin/run.sh b/kubernetes/aai/charts/aai-elasticsearch/resources/bin/run.sh
deleted file mode 100644
index a612c74a1c..0000000000
--- a/kubernetes/aai/charts/aai-elasticsearch/resources/bin/run.sh
+++ /dev/null
@@ -1,8 +0,0 @@
-#!/bin/sh
-
-# Wait for ES to start then initialize SearchGuard
-/usr/local/bin/docker-entrypoint.sh eswrapper &
-/usr/share/elasticsearch/bin/wait_until_started.sh
-/usr/share/elasticsearch/bin/init_sg.sh
-
-wait
\ No newline at end of file
diff --git a/kubernetes/aai/charts/aai-elasticsearch/resources/bin/wait_until_started.sh b/kubernetes/aai/charts/aai-elasticsearch/resources/bin/wait_until_started.sh
deleted file mode 100644
index 279253b43d..0000000000
--- a/kubernetes/aai/charts/aai-elasticsearch/resources/bin/wait_until_started.sh
+++ /dev/null
@@ -1,9 +0,0 @@
-#!/bin/sh
-RET=1
-
-while [[ RET -ne 0 ]]; do
-    echo "Waiting for Elasticsearch to become ready before running sgadmin..."
-    curl -XGET -k "https://localhost:{{ .Values.service.internalPort }}/" >/dev/null 2>&1
-    RET=$?
-    sleep 5
-done
\ No newline at end of file
diff --git a/kubernetes/aai/charts/aai-elasticsearch/resources/config/elasticsearch.yml b/kubernetes/aai/charts/aai-elasticsearch/resources/config/elasticsearch.yml
deleted file mode 100644
index 87536e3faa..0000000000
--- a/kubernetes/aai/charts/aai-elasticsearch/resources/config/elasticsearch.yml
+++ /dev/null
@@ -1,397 +0,0 @@
-# Copyright © 2018 Amdocs, Bell Canada, AT&T
-#
-# Licensed 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.
-
-
-##################### Elasticsearch Configuration Example #####################
-
-# This file contains an overview of various configuration settings,
-# targeted at operations staff. Application developers should
-# consult the guide at <http://elasticsearch.org/guide>.
-#
-# The installation procedure is covered at
-# <http://elasticsearch.org/guide/en/elasticsearch/reference/current/setup.html>.
-#
-# Elasticsearch comes with reasonable defaults for most settings,
-# so you can try it out without bothering with configuration.
-#
-# Most of the time, these defaults are just fine for running a production
-# cluster. If you're fine-tuning your cluster, or wondering about the
-# effect of certain configuration option, please _do ask_ on the
-# mailing list or IRC channel [http://elasticsearch.org/community].
-
-# Any element in the configuration can be replaced with environment variables
-# by placing them in ${...} notation. For example:
-#
-# node.rack: ${RACK_ENV_VAR}
-
-# For information on supported formats and syntax for the config file, see
-# <http://elasticsearch.org/guide/en/elasticsearch/reference/current/setup-configuration.html>
-################################### Cluster ###################################
-
-# Cluster name identifies your cluster for auto-discovery. If you're running
-# multiple clusters on the same network, make sure you're using unique names.
-#
-# cluster.name: elasticsearch
-
-cluster.name: ES_AAI
-
-#################################### Node #####################################
-
-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/>,
-# <http://github.com/karmi/elasticsearch-paramedic>,
-# <http://github.com/lukas-vlcek/bigdesk> and
-# <http://mobz.github.com/elasticsearch-head> to inspect the cluster state.
-
-# 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,
-# in this file.
-#
-# Note, that it makes more sense to configure index settings specifically for
-# a certain index, either when creating it or by using the index templates API.
-#
-# See <http://elasticsearch.org/guide/en/elasticsearch/reference/current/index-modules.html> and
-# <http://elasticsearch.org/guide/en/elasticsearch/reference/current/indices-create-index.html>
-# for more information.
-
-# Set the number of shards (splits) of an index (5 by default):
-
-#index.number_of_shards: 5
-
-# Set the number of replicas (additional copies) of an index (1 by default):
-
-#index.number_of_replicas: 1
-
-# These settings directly affect the performance of index and search operations
-# in your cluster. Assuming you have enough machines to hold shards and
-# replicas, the rule of thumb is:
-#
-# 1. Having more *shards* enhances the _indexing_ performance and allows to
-#    _distribute_ a big index across machines.
-# 2. Having more *replicas* enhances the _search_ performance and improves the
-#    cluster _availability_.
-#
-# The "number_of_shards" is a one-time setting for an index.
-#
-# The "number_of_replicas" can be increased or decreased anytime,
-# by using the Index Update Settings API.
-#
-# Elasticsearch takes care about load balancing, relocating, gathering the
-# results from nodes, etc. Experiment with different settings to fine-tune
-# your setup.
-
-# Use the Index Status API (<http://localhost:9200/A/_status>) to inspect
-# the index status.
-
-
-#################################### Paths ####################################
-
-# Path to directory containing configuration (this file and logging.yml):
-#path.conf: /opt/app/elasticsearch/config
-
-# 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
-
-# path.work: /path/to/work
-
-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.
-#
-# plugin.mandatory: mapper-attachments,lang-groovy
-
-
-################################### Memory ####################################
-
-# Elasticsearch performs poorly when JVM starts swapping: you should ensure that
-# it _never_ swaps.
-#
-# Set this property to true to lock the memory: default is true
-
-#bootstrap.memory_lock: true
-
-# Make sure that the ES_MIN_MEM and ES_MAX_MEM environment variables are set
-# to the same value, and that the machine has enough memory to allocate
-# for Elasticsearch, leaving enough memory for the operating system itself.
-#
-# You should also make sure that the Elasticsearch process is allowed to lock
-# the memory, eg. by using `ulimit -l unlimited`.
-
-### Kernel Settings
-
-# Elasticsearch installs system call filters of various flavors depending on the
-# operating system (e.g., seccomp on Linux). These system call filters are
-# installed to prevent the ability to execute system calls related to forking
-# as a defense mechanism against arbitrary code execution attacks on
-# Elasticsearch The system call filter check ensures that if system call
-# filters are enabled, then they were successfully installed. To pass the system
-# call filter check you must either fix any configuration errors on your system
-# that prevented system call filters from installing (check your logs), or at
-# your own risk disable system call filters by setting
-# 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,
-# 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
-# communication. (the range means that if the port is busy, it will automatically
-# 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.
-
-# network.publish_host: 0.0.0.0
-
-# Set both 'bind_host' and 'publish_host':
-# network.host: 192.168.0.1
-
-
-# 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):
-transport.tcp.compress: false
-
-# Set a custom port to listen for HTTP traffic:
-# http.port: 9200
-http.port: {{ .Values.service.internalPort }}
-
-# Set a custom allowed content length:
-# http.max_content_length: 100mb
-http.max_content_length: 100mb
-
-# Disable HTTP completely:
-# http.enabled: false
-http.enabled: true
-
-# This is specifically useful for permitting which front end Kibana Url's are permitted to access elastic search.
-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
-# restarts. Every change to the state (such as adding an index) will be stored
-# in the gateway, and when the cluster starts up for the first time,
-# it will read its state from the gateway.
-# There are several types of gateway implementations. For more information, see
-# <http://elasticsearch.org/guide/en/elasticsearch/reference/current/modules-gateway.html>.
-
-# The default gateway type is the "local" gateway (recommended):
-#
-#gateway.type: local
-#gateway.type: local
-
-# Settings below control how and when to start the initial recovery process on
-# a full cluster restart (to reuse as much local data as possible when using shared
-# gateway).
-
-# 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
-# from previous setting are up (accepts time value):
-#
-#gateway.recover_after_time: 5m
-gateway.recover_after_time: 5m
-
-# Set how many nodes are expected in this cluster. Once these N nodes
-# are up (and recover_after_nodes is met), begin recovery process immediately
-# (without waiting for recover_after_time to expire):
-#
-# gateway.expected_nodes: 2
-gateway.expected_nodes: 2
-
-############################# Recovery Throttling #############################
-
-# These settings allow to control the process of shards allocation between
-# nodes during initial recovery, replica allocation, rebalancing,
-# or when adding and removing nodes.
-
-# Set the number of concurrent recoveries happening on a node:
-#
-# 1. During the initial recovery
-#
-# cluster.routing.allocation.node_initial_primaries_recoveries: 4
-#
-# 2. During adding/removing nodes, rebalancing, etc
-#
-# cluster.routing.allocation.node_concurrent_recoveries: 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:
-#
-# indices.recovery.concurrent_streams: 5
-#indices.recovery.concurrent_streams: 5
-
-################################## Discovery ##################################
-
-# Discovery infrastructure ensures nodes can be found within a cluster
-# and master node is elected. Multicast discovery is the default.
-
-# Set to ensure a node sees N other master eligible nodes to be considered
-# 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>
-
-# Unicast discovery allows to explicitly control which nodes will be used
-# to discover the cluster. It can be used when multicast is not present,
-# or to restrict the cluster communication-wise.
-#
-# 1. Disable multicast discovery (enabled by default):
-# discovery.zen.ping.multicast.enabled: false
-#discovery.zen.ping.multicast.enabled: false
-
-
-# 2. Configure an initial list of master nodes in the cluster
-#    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.
-#
-# For more information, see
-# <http://elasticsearch.org/guide/en/elasticsearch/reference/current/modules-discovery-ec2.html>
-#
-#
-# See <http://elasticsearch.org/tutorials/elasticsearch-on-ec2/>
-# for a step-by-step tutorial.
-
-# GCE discovery allows to use Google Compute Engine API in order to perform discovery.
-#
-# You have to install the cloud-gce plugin for enabling the GCE discovery.
-#
-# For more information, see <https://github.com/elasticsearch/elasticsearch-cloud-gce>.
-
-# Azure discovery allows to use Azure API in order to perform discovery.
-#
-# You have to install the cloud-azure plugin for enabling the Azure discovery.
-#
-# For more information, see <https://github.com/elasticsearch/elasticsearch-cloud-azure>.
-
-################################## Slow Log ##################################
-
-# Shard level query and fetch threshold logging.
-
-#index.search.slowlog.threshold.query.warn: 10s
-#index.search.slowlog.threshold.query.info: 5s
-#index.search.slowlog.threshold.query.debug: 2s
-#index.search.slowlog.threshold.query.trace: 500ms
-
-#index.search.slowlog.threshold.fetch.warn: 1s
-#index.search.slowlog.threshold.fetch.info: 800ms
-#index.search.slowlog.threshold.fetch.debug: 500ms
-#index.search.slowlog.threshold.fetch.trace: 200ms
-
-#index.indexing.slowlog.threshold.index.warn: 10s
-#index.indexing.slowlog.threshold.index.info: 5s
-#index.indexing.slowlog.threshold.index.debug: 2s
-#index.indexing.slowlog.threshold.index.trace: 500ms
-
-################################## GC Logging ################################
-
-#monitor.jvm.gc.young.warn: 1000ms
-#monitor.jvm.gc.young.info: 700ms
-#monitor.jvm.gc.young.debug: 400ms
-
-#monitor.jvm.gc.old.warn: 10s
-#monitor.jvm.gc.old.info: 5s
-#monitor.jvm.gc.old.debug: 2s
-
-#############################################################################################
-###                                     SEARCH GUARD SSL                                      #
-###                                       Configuration                                       #
-###############################################################################################
-######## Start Search Guard Demo Configuration ########
-
-searchguard.enterprise_modules_enabled: false
-
-searchguard.ssl.transport.keystore_filepath: sg/auth/{{ .Values.config.nodeKeyStore }}
-searchguard.ssl.transport.keystore_password: {{ .Values.config.nodeKeyStorePassword }}
-searchguard.ssl.transport.truststore_filepath: sg/auth/{{ .Values.config.trustStore }}
-searchguard.ssl.transport.truststore_password: {{ .Values.config.trustStorePassword }}
-searchguard.ssl.transport.enforce_hostname_verification: false
-
-searchguard.ssl.http.enabled: true
-searchguard.ssl.http.keystore_filepath: sg/auth/{{ .Values.config.nodeKeyStore }}
-searchguard.ssl.http.keystore_password: {{ .Values.config.nodeKeyStorePassword }}
-searchguard.ssl.http.truststore_filepath: sg/auth/{{ .Values.config.trustStore }}
-searchguard.ssl.http.truststore_password: {{ .Values.config.trustStorePassword }}
-
-searchguard.nodes_dn:
-  - CN=esaai
-
-searchguard.authcz.admin_dn:
-  - CN=sgadmin
-
-# x-pack security conflicts with searchguard
-xpack.security.enabled: false
-xpack.ml.enabled: false
-xpack.monitoring.enabled: false
-xpack.watcher.enabled: false
diff --git a/kubernetes/aai/charts/aai-elasticsearch/resources/config/jvm.options b/kubernetes/aai/charts/aai-elasticsearch/resources/config/jvm.options
deleted file mode 100644
index e69d7983c0..0000000000
--- a/kubernetes/aai/charts/aai-elasticsearch/resources/config/jvm.options
+++ /dev/null
@@ -1,117 +0,0 @@
-# Copyright © 2018 Amdocs, AT&T, Bell Canada
-#
-# Licensed 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.
-
-## JVM configuration
-
-################################################################
-## IMPORTANT: JVM heap size
-################################################################
-##
-## You should always set the min and max JVM heap
-## size to the same value. For example, to set
-## the heap to 4 GB, set:
-##
-## -Xms4g
-## -Xmx4g
-##
-## See https://www.elastic.co/guide/en/elasticsearch/reference/current/heap-size.html
-## for more information
-##
-################################################################
-
-# Xms represents the initial size of total heap space
-# Xmx represents the maximum size of total heap space
-
--Xms1g
--Xmx1g
-
-################################################################
-## Expert settings
-################################################################
-##
-## All settings below this section are considered
-## expert settings. Don't tamper with them unless
-## you understand what you are doing
-##
-################################################################
-
-## GC configuration
--XX:+UseConcMarkSweepGC
--XX:CMSInitiatingOccupancyFraction=75
--XX:+UseCMSInitiatingOccupancyOnly
-
-## optimizations
-
-# pre-touch memory pages used by the JVM during initialization
--XX:+AlwaysPreTouch
-
-## basic
-
-# force the server VM
--server
-
-# explicitly set the stack size
--Xss1m
-
-# set to headless, just in case
--Djava.awt.headless=true
-
-# ensure UTF-8 encoding by default (e.g. filenames)
--Dfile.encoding=UTF-8
-
-# use our provided JNA always versus the system one
--Djna.nosys=true
-
-# turn off a JDK optimization that throws away stack traces for common
-# exceptions because stack traces are important for debugging
--XX:-OmitStackTraceInFastThrow
-
-# flags to configure Netty
--Dio.netty.noUnsafe=true
--Dio.netty.noKeySetOptimization=true
--Dio.netty.recycler.maxCapacityPerThread=0
-
-# log4j 2
--Dlog4j.shutdownHookEnabled=false
--Dlog4j2.disable.jmx=true
-
-## heap dumps
-
-# generate a heap dump when an allocation from the Java heap fails
-# 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
-
-## GC logging
-
-#-XX:+PrintGCDetails
-#-XX:+PrintGCTimeStamps
-#-XX:+PrintGCDateStamps
-#-XX:+PrintClassHistogram
-#-XX:+PrintTenuringDistribution
-#-XX:+PrintGCApplicationStoppedTime
-
-# log GC status to a file with time stamps
-# ensure the directory exists
-#-Xloggc:${loggc}
-
-# By default, the GC log file will not rotate.
-# By uncommenting the lines below, the GC log file
-# will be rotated every 128MB at most 32 times.
-#-XX:+UseGCLogFileRotation
-#-XX:NumberOfGCLogFiles=32
-#-XX:GCLogFileSize=128M
diff --git a/kubernetes/aai/charts/aai-elasticsearch/resources/config/log4j2.properties b/kubernetes/aai/charts/aai-elasticsearch/resources/config/log4j2.properties
deleted file mode 100644
index e674865221..0000000000
--- a/kubernetes/aai/charts/aai-elasticsearch/resources/config/log4j2.properties
+++ /dev/null
@@ -1,88 +0,0 @@
-# Copyright © 2018 Amdocs, AT&T, Bell Canada
-#
-# Licensed 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.
-
-status = error
-
-# log action execution errors for easier debugging
-logger.action.name = org.elasticsearch.action
-logger.action.level = INFO
-
-appender.console.type = Console
-appender.console.name = console
-appender.console.layout.type = PatternLayout
-appender.console.layout.pattern = [%d{ISO8601}][%-5p][%-25c{1.}] %marker%m%n
-
-appender.rolling.type = RollingFile
-appender.rolling.name = rolling
-appender.rolling.fileName = ${sys:es.logs.base_path}.log
-appender.rolling.layout.type = PatternLayout
-appender.rolling.layout.pattern = [%d{ISO8601}][%-5p][%-25c{1.}] %marker%.10000m%n
-appender.rolling.filePattern = ${sys:es.logs.base_path}-%d{yyyy-MM-dd}.log
-appender.rolling.policies.type = Policies
-appender.rolling.policies.time.type = TimeBasedTriggeringPolicy
-appender.rolling.policies.time.interval = 1
-appender.rolling.policies.time.modulate = true
-
-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
-# appender.deprecation_rolling.layout.type = PatternLayout
-# appender.deprecation_rolling.layout.pattern = [%d{ISO8601}][%-5p][%-25c{1.}] %marker%.10000m%n
-# appender.deprecation_rolling.filePattern = ${sys:es.logs.base_path}_deprecation-%i.log.gz
-# appender.deprecation_rolling.policies.type = Policies
-# appender.deprecation_rolling.policies.size.type = SizeBasedTriggeringPolicy
-# 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
-appender.index_search_slowlog_rolling.layout.type = PatternLayout
-appender.index_search_slowlog_rolling.layout.pattern = [%d{ISO8601}][%-5p][%-25c] %marker%.10000m%n
-appender.index_search_slowlog_rolling.filePattern = ${sys:es.logs.base_path}_index_search_slowlog-%d{yyyy-MM-dd}.log
-appender.index_search_slowlog_rolling.policies.type = Policies
-appender.index_search_slowlog_rolling.policies.time.type = TimeBasedTriggeringPolicy
-appender.index_search_slowlog_rolling.policies.time.interval = 1
-appender.index_search_slowlog_rolling.policies.time.modulate = true
-
-logger.index_search_slowlog_rolling.name = index.search.slowlog
-logger.index_search_slowlog_rolling.level = trace
-logger.index_search_slowlog_rolling.appenderRef.index_search_slowlog_rolling.ref = index_search_slowlog_rolling
-logger.index_search_slowlog_rolling.additivity = false
-
-appender.index_indexing_slowlog_rolling.type = RollingFile
-appender.index_indexing_slowlog_rolling.name = index_indexing_slowlog_rolling
-appender.index_indexing_slowlog_rolling.fileName = ${sys:es.logs.base_path}_index_indexing_slowlog.log
-appender.index_indexing_slowlog_rolling.layout.type = PatternLayout
-appender.index_indexing_slowlog_rolling.layout.pattern = [%d{ISO8601}][%-5p][%-25c] %marker%.10000m%n
-appender.index_indexing_slowlog_rolling.filePattern = ${sys:es.logs.base_path}_index_indexing_slowlog-%d{yyyy-MM-dd}.log
-appender.index_indexing_slowlog_rolling.policies.type = Policies
-appender.index_indexing_slowlog_rolling.policies.time.type = TimeBasedTriggeringPolicy
-appender.index_indexing_slowlog_rolling.policies.time.interval = 1
-appender.index_indexing_slowlog_rolling.policies.time.modulate = true
-
-logger.index_indexing_slowlog.name = index.indexing.slowlog.index
-logger.index_indexing_slowlog.level = trace
-logger.index_indexing_slowlog.appenderRef.index_indexing_slowlog_rolling.ref = index_indexing_slowlog_rolling
-logger.index_indexing_slowlog.additivity = false
diff --git a/kubernetes/aai/charts/aai-elasticsearch/resources/config/sg/auth/esaai-keystore.jks b/kubernetes/aai/charts/aai-elasticsearch/resources/config/sg/auth/esaai-keystore.jks
deleted file mode 100644
index 21ec9bba97..0000000000
--- a/kubernetes/aai/charts/aai-elasticsearch/resources/config/sg/auth/esaai-keystore.jks
+++ /dev/null
diff --git a/kubernetes/aai/charts/aai-elasticsearch/resources/config/sg/auth/sgadmin-keystore.p12 b/kubernetes/aai/charts/aai-elasticsearch/resources/config/sg/auth/sgadmin-keystore.p12
deleted file mode 100644
index db7cbf401c..0000000000
--- a/kubernetes/aai/charts/aai-elasticsearch/resources/config/sg/auth/sgadmin-keystore.p12
+++ /dev/null
diff --git a/kubernetes/aai/charts/aai-elasticsearch/resources/config/sg/auth/truststore.jks b/kubernetes/aai/charts/aai-elasticsearch/resources/config/sg/auth/truststore.jks
deleted file mode 100644
index b3bd666652..0000000000
--- a/kubernetes/aai/charts/aai-elasticsearch/resources/config/sg/auth/truststore.jks
+++ /dev/null
diff --git a/kubernetes/aai/charts/aai-elasticsearch/resources/config/sg/sg_action_groups.yml b/kubernetes/aai/charts/aai-elasticsearch/resources/config/sg/sg_action_groups.yml
deleted file mode 100644
index be5901a559..0000000000
--- a/kubernetes/aai/charts/aai-elasticsearch/resources/config/sg/sg_action_groups.yml
+++ /dev/null
@@ -1,137 +0,0 @@
-UNLIMITED:
-  readonly: true
-  permissions:
-    - "*"
-
-###### INDEX LEVEL ######
-
-INDICES_ALL:
-  readonly: true
-  permissions:
-    - "indices:*"
-
-# for backward compatibility
-ALL:
-  readonly: true
-  permissions:
-    - INDICES_ALL
-
-MANAGE:
-  readonly: true
-  permissions:
-    - "indices:monitor/*"
-    - "indices:admin/*"
-
-CREATE_INDEX:
-  readonly: true
-  permissions:
-    - "indices:admin/create"
-    - "indices:admin/mapping/put"
-
-MANAGE_ALIASES:
-  readonly: true
-  permissions:
-    - "indices:admin/aliases*"
-
-# for backward compatibility
-MONITOR:
-  readonly: true
-  permissions:
-    - INDICES_MONITOR
-
-INDICES_MONITOR:
-  readonly: true
-  permissions:
-    - "indices:monitor/*"
-
-DATA_ACCESS:
-  readonly: true
-  permissions:
-    - "indices:data/*"
-    - CRUD
-
-WRITE:
-  readonly: true
-  permissions:
-    - "indices:data/write*"
-    - "indices:admin/mapping/put"
-
-READ:
-  readonly: true
-  permissions:
-    - "indices:data/read*"
-    - "indices:admin/mappings/fields/get*"
-
-DELETE:
-  readonly: true
-  permissions:
-    - "indices:data/write/delete*"
-
-CRUD:
-  readonly: true
-  permissions:
-    - READ
-    - WRITE
-
-SEARCH:
-  readonly: true
-  permissions:
-    - "indices:data/read/search*"
-    - "indices:data/read/msearch*"
-    - SUGGEST
-
-SUGGEST:
-  readonly: true
-  permissions:
-    - "indices:data/read/suggest*"
-
-INDEX:
-  readonly: true
-  permissions:
-    - "indices:data/write/index*"
-    - "indices:data/write/update*"
-    - "indices:admin/mapping/put"
-    - "indices:data/write/bulk*"
-
-GET:
-  readonly: true
-  permissions:
-    - "indices:data/read/get*"
-    - "indices:data/read/mget*"
-
-###### CLUSTER LEVEL ######
-
-CLUSTER_ALL:
-  readonly: true
-  permissions:
-    - "cluster:*"
-
-CLUSTER_MONITOR:
-  readonly: true
-  permissions:
-    - "cluster:monitor/*"
-
-CLUSTER_COMPOSITE_OPS_RO:
-  readonly: true
-  permissions:
-    - "indices:data/read/mget"
-    - "indices:data/read/msearch"
-    - "indices:data/read/mtv"
-    - "indices:data/read/coordinate-msearch*"
-    - "indices:admin/aliases/exists*"
-    - "indices:admin/aliases/get*"
-    - "indices:data/read/scroll"
-
-CLUSTER_COMPOSITE_OPS:
-  readonly: true
-  permissions:
-    - "indices:data/write/bulk"
-    - "indices:admin/aliases*"
-    - "indices:data/write/reindex"
-    - CLUSTER_COMPOSITE_OPS_RO
-
-MANAGE_SNAPSHOTS:
-  readonly: true
-  permissions:
-    - "cluster:admin/snapshot/*"
-    - "cluster:admin/repository/*"
\ No newline at end of file
diff --git a/kubernetes/aai/charts/aai-elasticsearch/resources/config/sg/sg_config.yml b/kubernetes/aai/charts/aai-elasticsearch/resources/config/sg/sg_config.yml
deleted file mode 100644
index d0050e095c..0000000000
--- a/kubernetes/aai/charts/aai-elasticsearch/resources/config/sg/sg_config.yml
+++ /dev/null
@@ -1,123 +0,0 @@
-# This is the main Search Guard configuration file where authentication 
-# and authorization is defined.
-# 
-# You need to configure at least one authentication domain in the authc of this file.
-# An authentication domain is responsible for extracting the user credentials from 
-# the request and for validating them against an authentication backend like Active Directory for example. 
-#
-# If more than one authentication domain is configured the first one which succeeds wins. 
-# If all authentication domains fail then the request is unauthenticated.
-# In this case an exception is thrown and/or the HTTP status is set to 401.
-# 
-# After authentication authorization (authz) will be applied. There can be zero or more authorizers which collect
-# the roles from a given backend for the authenticated user.
-#
-# Both, authc and auth can be enabled/disabled separately for REST and TRANSPORT layer. Default is true for both.
-#        http_enabled: true
-#        transport_enabled: true
-#
-# 5.x Migration: "enabled: true/false" will also be respected currently but only to provide backward compatibility.
-#
-# For HTTP it is possible to allow anonymous authentication. If that is the case then the HTTP authenticators try to
-# find user credentials in the HTTP request. If credentials are found then the user gets regularly authenticated.
-# If none can be found the user will be authenticated as an "anonymous" user. This user has always the username "sg_anonymous"
-# and one role named "sg_anonymous_backendrole". 
-# If you enable anonymous authentication all HTTP authenticators will not challenge.
-# 
-#
-# Note: If you define more than one HTTP authenticators make sure to put non-challenging authenticators like "proxy" or "clientcert"
-# first and the challenging one last. 
-# Because it's not possible to challenge a client with two different authentication methods (for example
-# Kerberos and Basic) only one can have the challenge flag set to true. You can cope with this situation
-# by using pre-authentication, e.g. sending a HTTP Basic authentication header in the request.
-#
-# Default value of the challenge flag is true.
-# 
-#
-# HTTP
-#   basic (challenging)
-#   proxy (not challenging, needs xff)
-#   clientcert (not challenging, needs https)
-#   host (not challenging) #DEPRECATED, will be removed in a future version.
-#                           host based authentication is configurable in sg_roles_mapping
-
-# Authc
-#   internal
-#   noop
-
-# Authz
-#   noop
-
-# Some SearchGuard functionality is licensed under Apache-2.0, while other functionality is non-free;
-# see https://github.com/floragunncom/search-guard. The functionality enabled in this configuration
-# file only include those that are licensed under Apache-2.0. Please use care and review SearchGuard's
-# license details before enabling any additional features here.
-
-searchguard:
-  dynamic:
-    # Set filtered_alias_mode to 'disallow' to forbid more than 2 filtered aliases per index
-    # Set filtered_alias_mode to 'warn' to allow more than 2 filtered aliases per index but warns about it (default)
-    # Set filtered_alias_mode to 'nowarn' to allow more than 2 filtered aliases per index silently
-    #filtered_alias_mode: warn
-    http:
-      anonymous_auth_enabled: false
-      xff:
-        enabled: false
-        internalProxies: '192\.168\.0\.10|192\.168\.0\.11' # regex pattern
-        #internalProxies: '.*' # trust all internal proxies, regex pattern
-        remoteIpHeader:  'x-forwarded-for'
-        proxiesHeader:   'x-forwarded-by'
-        #trustedProxies: '.*' # trust all external proxies, regex pattern
-        ###### see https://docs.oracle.com/javase/7/docs/api/java/util/regex/Pattern.html for regex help
-        ###### more information about XFF https://en.wikipedia.org/wiki/X-Forwarded-For
-        ###### and here https://tools.ietf.org/html/rfc7239
-        ###### and https://tomcat.apache.org/tomcat-8.0-doc/config/valve.html#Remote_IP_Valve
-    authc:
-      basic_internal_auth_domain:
-        http_enabled: true
-        transport_enabled: true
-        order: 2
-        http_authenticator:
-          type: basic
-          challenge: true
-        authentication_backend:
-          type: intern
-      proxy_auth_domain:
-        http_enabled: false
-        transport_enabled: false
-        order: 3
-        http_authenticator:
-          type: proxy
-          challenge: false
-          config:
-            user_header: "x-proxy-user"
-            roles_header: "x-proxy-roles"
-        authentication_backend:
-          type: noop
-      jwt_auth_domain:
-        http_enabled: false
-        transport_enabled: false
-        order: 0
-        http_authenticator:
-          type: jwt
-          challenge: false
-          config:
-            signing_key: "base64 encoded HMAC key or public RSA/ECDSA pem key"
-            jwt_header: "Authorization"
-            jwt_url_parameter: null
-            roles_key: null
-            subject_key: null
-        authentication_backend:
-          type: noop
-      clientcert_auth_domain:
-        http_enabled: true
-        transport_enabled: true
-        order: 1
-        http_authenticator:
-          type: clientcert
-          config:
-            username_attribute: cn #optional, if omitted DN becomes username
-          challenge: false
-        authentication_backend:
-          type: noop
-    authz:
\ No newline at end of file
diff --git a/kubernetes/aai/charts/aai-elasticsearch/resources/config/sg/sg_internal_users.yml b/kubernetes/aai/charts/aai-elasticsearch/resources/config/sg/sg_internal_users.yml
deleted file mode 100644
index 942a7164aa..0000000000
--- a/kubernetes/aai/charts/aai-elasticsearch/resources/config/sg/sg_internal_users.yml
+++ /dev/null
@@ -1,45 +0,0 @@
-# This is the internal user database
-# The hash value is a bcrypt hash and can be generated with plugin/tools/hash.sh
-
-#password is: admin
-admin:
-  readonly: true
-  hash: $2a$12$VcCDgh2NDk07JGN0rjGbM.Ad41qVR/YFJcgHp0UGns5JDymv..TOG
-  roles:
-    - admin
-  attributes:
-    #no dots allowed in attribute names
-    attribute1: value1
-    attribute2: value2
-    attribute3: value3
-
-#password is: logstash
-logstash:
-  hash: $2a$12$u1ShR4l4uBS3Uv59Pa2y5.1uQuZBrZtmNfqB3iM/.jL0XoV9sghS2
-  roles:
-    - logstash
-
-#password is: kibanaserver
-kibanaserver:
-  readonly: true
-  hash: $2a$12$4AcgAt3xwOWadA5s5blL6ev39OXDNhmOesEoo33eZtrq2N0YrU3H.
-
-#password is: kibanaro
-kibanaro:
-  hash: $2a$12$JJSXNfTowz7Uu5ttXfeYpeYE0arACvcwlPBStB1F.MI7f0U9Z4DGC
-  roles:
-    - kibanauser
-    - readall
-
-#password is: readall
-readall:
-  hash: $2a$12$ae4ycwzwvLtZxwZ82RmiEunBbIPiAmGZduBAjKN0TXdwQFtCwARz2
-  #password is: readall
-  roles:
-    - readall
-
-#password is: snapshotrestore
-snapshotrestore:
-  hash: $2y$12$DpwmetHKwgYnorbgdvORCenv4NAK8cPUg8AI6pxLCuWf/ALc0.v7W
-  roles:
-    - snapshotrestore
\ No newline at end of file
diff --git a/kubernetes/aai/charts/aai-elasticsearch/resources/config/sg/sg_roles.yml b/kubernetes/aai/charts/aai-elasticsearch/resources/config/sg/sg_roles.yml
deleted file mode 100644
index c918e851f1..0000000000
--- a/kubernetes/aai/charts/aai-elasticsearch/resources/config/sg/sg_roles.yml
+++ /dev/null
@@ -1,262 +0,0 @@
-# Allows everything, but no changes to searchguard configuration index
-sg_all_access:
-  readonly: true
-  cluster:
-    - UNLIMITED
-  indices:
-    '*':
-      '*':
-        - UNLIMITED
-  tenants:
-    admin_tenant: RW
-
-# Read all, but no write permissions
-sg_readall:
-  readonly: true
-  cluster:
-    - CLUSTER_COMPOSITE_OPS_RO
-  indices:
-    '*':
-      '*':
-        - READ
-
-# Read all and monitor, but no write permissions
-sg_readall_and_monitor:
-  cluster:
-    - CLUSTER_MONITOR
-    - CLUSTER_COMPOSITE_OPS_RO
-  indices:
-    '*':
-      '*':
-        - READ
-
-# For users which use kibana, access to indices must be granted separately
-sg_kibana_user:
-  readonly: true
-  cluster:
-    - INDICES_MONITOR
-    - CLUSTER_COMPOSITE_OPS
-  indices:
-    '?kibana':
-      '*':
-        - MANAGE
-        - INDEX
-        - READ
-        - DELETE
-    '?kibana-6':
-      '*':
-        - MANAGE
-        - INDEX
-        - READ
-        - DELETE
-    '?kibana_*':
-      '*':
-        - MANAGE
-        - INDEX
-        - READ
-        - DELETE
-    '?tasks':
-      '*':
-        - INDICES_ALL
-    '?management-beats':
-      '*':
-        - INDICES_ALL
-    '*':
-      '*':
-        - indices:data/read/field_caps*
-        - indices:data/read/xpack/rollup*
-        - indices:admin/mappings/get*
-        - indices:admin/get
-
-# For the kibana server
-sg_kibana_server:
-  readonly: true
-  cluster:
-      - CLUSTER_MONITOR
-      - CLUSTER_COMPOSITE_OPS
-      - cluster:admin/xpack/monitoring*
-      - indices:admin/template*
-      - indices:data/read/scroll*
-  indices:
-    '?kibana':
-      '*':
-        - INDICES_ALL
-    '?kibana-6':
-      '*':
-        - INDICES_ALL
-    '?kibana_*':
-      '*':
-        - INDICES_ALL
-    '?reporting*':
-      '*':
-        - INDICES_ALL
-    '?monitoring*':
-      '*':
-        - INDICES_ALL
-    '?tasks':
-      '*':
-        - INDICES_ALL
-    '?management-beats*':
-      '*':
-        - INDICES_ALL
-    '*':
-      '*':
-        - "indices:admin/aliases*"
-
-# For logstash and beats
-sg_logstash:
-  cluster:
-    - CLUSTER_MONITOR
-    - CLUSTER_COMPOSITE_OPS
-    - indices:admin/template/get
-    - indices:admin/template/put
-  indices:
-    'logstash-*':
-      '*':
-        - CRUD
-        - CREATE_INDEX
-    '*beat*':
-      '*':
-        - CRUD
-        - CREATE_INDEX
-
-# Allows adding and modifying repositories and creating and restoring snapshots
-sg_manage_snapshots:
-  cluster:
-    - MANAGE_SNAPSHOTS
-  indices:
-    '*':
-      '*':
-        - "indices:data/write/index"
-        - "indices:admin/create"
-
-# Allows each user to access own named index
-sg_own_index:
-  cluster:
-    - CLUSTER_COMPOSITE_OPS
-  indices:
-    '${user_name}':
-      '*':
-        - INDICES_ALL
-
-### X-Pack COMPATIBILITY
-sg_xp_monitoring:
-  readonly: true
-  cluster:
-    - cluster:monitor/xpack/info
-    - cluster:monitor/main
-    - cluster:admin/xpack/monitoring/bulk
-  indices:
-    '?monitor*':
-      '*':
-        - INDICES_ALL
-
-sg_xp_alerting:
-  readonly: true
-  cluster:
-    - indices:data/read/scroll
-    - cluster:admin/xpack/watcher*
-    - cluster:monitor/xpack/watcher*
-  indices:
-    '?watches*':
-      '*':
-        - INDICES_ALL
-    '?watcher-history-*':
-      '*':
-        - INDICES_ALL
-    '?triggered_watches':
-      '*':
-        - INDICES_ALL
-    '*':
-      '*':
-        - READ
-        - indices:admin/aliases/get
-
-sg_xp_machine_learning:
-  readonly: true
-  cluster:
-    - cluster:admin/persistent*
-    - cluster:internal/xpack/ml*
-    - indices:data/read/scroll*
-    - cluster:admin/xpack/ml*
-    - cluster:monitor/xpack/ml*
-  indices:
-    '*':
-      '*':
-        - READ
-        - indices:admin/get*
-    '?ml-*':
-      '*':
-        - "*"
-
-### LEGACY ROLES, FOR COMPATIBILITY ONLY
-### WILL BE REMOVED IN SG7, DO NOT USE ANYMORE
-
-sg_readonly_and_monitor:
-  cluster:
-    - CLUSTER_MONITOR
-    - CLUSTER_COMPOSITE_OPS_RO
-  indices:
-    '*':
-      '*':
-        - READ
-
-# Make xpack monitoring work
-sg_monitor:
-  cluster:
-    - cluster:admin/xpack/monitoring/*
-    - cluster:admin/ingest/pipeline/put       
-    - cluster:admin/ingest/pipeline/get
-    - indices:admin/template/get
-    - indices:admin/template/put
-    - CLUSTER_MONITOR
-    - CLUSTER_COMPOSITE_OPS
-  indices:
-    '?monitor*':
-      '*':
-        - INDICES_ALL
-    '?marvel*':
-      '*':
-        - INDICES_ALL
-    '?kibana*':
-      '*':
-        - READ
-    '*':
-      '*':
-        - indices:data/read/field_caps
-
-# Make xpack alerting work
-sg_alerting:
-  cluster:
-    - indices:data/read/scroll
-    - cluster:admin/xpack/watcher/watch/put
-    - cluster:admin/xpack/watcher*
-    - CLUSTER_MONITOR
-    - CLUSTER_COMPOSITE_OPS
-  indices:
-    '?kibana*':
-      '*':
-        - READ
-    '?watches*':
-      '*':
-        - INDICES_ALL
-    '?watcher-history-*':
-      '*':
-        - INDICES_ALL
-    '?triggered_watches':
-      '*':
-        - INDICES_ALL
-    '*':
-      '*':
-        - READ
-
-
-sg_role_test:
-  cluster:
-    - indices:admin/template/get
-    - indices:admin/template/put
-    - CLUSTER_COMPOSITE_OPS
-  indices:
-    '*':
-      '*':
-        - UNLIMITED
diff --git a/kubernetes/aai/charts/aai-elasticsearch/resources/config/sg/sg_roles_mapping.yml b/kubernetes/aai/charts/aai-elasticsearch/resources/config/sg/sg_roles_mapping.yml
deleted file mode 100644
index 970e02763b..0000000000
--- a/kubernetes/aai/charts/aai-elasticsearch/resources/config/sg/sg_roles_mapping.yml
+++ /dev/null
@@ -1,38 +0,0 @@
-# In this file users, backendroles and hosts can be mapped to Search Guard roles.
-# Permissions for Search Guard roles are configured in sg_roles.yml
-
-sg_all_access:
-  readonly: true
-  backendroles:
-    - admin
-
-sg_logstash:
-  backendroles:
-    - logstash
-    
-sg_kibana_server:
-  readonly: true
-  users:
-    - kibanaserver
-    
-sg_kibana_user:
-  backendroles:
-    - kibanauser
-
-sg_readall:
-  readonly: true
-  backendroles:
-    - readall
-
-sg_manage_snapshots:
-  readonly: true
-  backendroles:
-    - snapshotrestore
-
-sg_own_index:
-  users:
-    - '*'
-
-sg_role_test:
-  users:
-    - test
diff --git a/kubernetes/aai/charts/aai-elasticsearch/templates/configmap.yaml b/kubernetes/aai/charts/aai-elasticsearch/templates/configmap.yaml
deleted file mode 100644
index 4be124fc0f..0000000000
--- a/kubernetes/aai/charts/aai-elasticsearch/templates/configmap.yaml
+++ /dev/null
@@ -1,52 +0,0 @@
-# Copyright © 2018 Amdocs, Bell Canada, AT&T
-#
-# Licensed 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.
-
-apiVersion: v1
-kind: ConfigMap
-metadata:
-  name: {{ include "common.fullname" . }}-es-config
-  namespace: {{ include "common.namespace" . }}
-  labels:
-    app: {{ include "common.name" . }}
-    chart: {{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }}
-    release: {{ .Release.Name }}
-    heritage: {{ .Release.Service }}
-data:
-{{ tpl (.Files.Glob "resources/config/*").AsConfig . | indent 2 }}
----
-apiVersion: v1
-kind: ConfigMap
-metadata:
-  name: {{ include "common.fullname" . }}-sg-scripts
-  namespace: {{ include "common.namespace" . }}
-  labels:
-    app: {{ include "common.name" . }}
-    chart: {{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }}
-    release: {{ .Release.Name }}
-    heritage: {{ .Release.Service }}
-data:
-{{ tpl (.Files.Glob "resources/bin/*").AsConfig . | indent 2 }}
----
-apiVersion: v1
-kind: ConfigMap
-metadata:
-  name: {{ include "common.fullname" . }}-sg-config
-  namespace: {{ include "common.namespace" . }}
-  labels:
-    app: {{ include "common.name" . }}
-    chart: {{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }}
-    release: {{ .Release.Name }}
-    heritage: {{ .Release.Service }}
-data:
-{{ tpl (.Files.Glob "resources/config/sg/*").AsConfig . | indent 2 }}
diff --git a/kubernetes/aai/charts/aai-elasticsearch/templates/deployment.yaml b/kubernetes/aai/charts/aai-elasticsearch/templates/deployment.yaml
deleted file mode 100644
index 785693a9ba..0000000000
--- a/kubernetes/aai/charts/aai-elasticsearch/templates/deployment.yaml
+++ /dev/null
@@ -1,144 +0,0 @@
-# Copyright © 2018 Amdocs, Bell Canada, AT&T
-#
-# Licensed 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.
-
-apiVersion: extensions/v1beta1
-kind: Deployment
-metadata:
-  name: {{ include "common.fullname" . }}
-  namespace: {{ include "common.namespace" . }}
-  labels:
-    app: {{ include "common.name" . }}
-    chart: {{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }}
-    release: {{ .Release.Name }}
-    heritage: {{ .Release.Service }}
-spec:
-  replicas: {{ .Values.replicaCount }}
-  selector:
-    matchLabels:
-      app: {{ include "common.name" . }}
-  template:
-    metadata:
-      labels:
-        app: {{ include "common.name" . }}
-        release: {{ .Release.Name }}
-      name: {{ include "common.name" . }}
-    spec:
-      hostname: {{ include "common.name" . }}
-      initContainers:
-      - command:
-        - /bin/sh
-        - -c
-        - |
-          sysctl -w vm.max_map_count=262144
-          mkdir -p /logroot/elasticsearch/logs
-          mkdir -p /logroot/elasticsearch/data
-          chmod -R 777 /logroot/elasticsearch
-          chown -R 1000:1000 /logroot
-        env:
-        - name: NAMESPACE
-          valueFrom:
-            fieldRef:
-              apiVersion: v1
-              fieldPath: metadata.namespace
-        securityContext:
-          privileged: true
-        image: {{ .Values.global.dockerhubRepository | default .Values.dockerhubRepository }}/{{ .Values.global.busyboxImage | default .Values.busyboxImage }}
-        imagePullPolicy: {{ .Values.pullPolicy | default .Values.global.pullPolicy }}
-        name: init-sysctl
-        volumeMounts:
-        - name: elasticsearch-data
-          mountPath: /logroot/
-      containers:
-      - name: {{ include "common.name" . }}
-        image: "{{ include "common.repository" . }}/{{ .Values.image }}"
-        imagePullPolicy: {{ .Values.pullPolicy | default .Values.global.pullPolicy }}
-        ports:
-        - containerPort: {{ .Values.service.internalPort }}
-        - containerPort: {{ .Values.service.internalPort2 }}
-        # disable liveness probe when breakpoints set in debugger
-        # so K8s doesn't restart unresponsive container
-        {{- if eq .Values.liveness.enabled true }}
-        livenessProbe:
-          tcpSocket:
-            port: {{ .Values.service.internalPort }}
-          initialDelaySeconds: {{ .Values.liveness.initialDelaySeconds }}
-          periodSeconds: {{ .Values.liveness.periodSeconds }}
-        {{ end -}}
-        readinessProbe:
-          tcpSocket:
-            port: {{ .Values.service.internalPort }}
-          initialDelaySeconds: {{ .Values.readiness.initialDelaySeconds }}
-          periodSeconds: {{ .Values.readiness.periodSeconds }}
-        volumeMounts:
-          - name: localtime
-            mountPath: /etc/localtime
-            readOnly: true
-          - name: elasticsearch-config
-            subPath: elasticsearch.yml
-            mountPath: /usr/share/elasticsearch/config/elasticsearch.yml
-          - name: elasticsearch-config
-            subPath: jvm.options
-            mountPath: /usr/share/elasticsearch/config/jvm.options
-          - name: elasticsearch-config
-            subPath: log4j2.properties
-            mountPath: /usr/share/elasticsearch/config/log4j2.properties
-          - name: searchguard-scripts
-            subPath: run.sh
-            mountPath: /usr/share/elasticsearch/bin/run.sh
-          - name: searchguard-scripts
-            subPath: wait_until_started.sh
-            mountPath: /usr/share/elasticsearch/bin/wait_until_started.sh
-          - name: searchguard-scripts
-            subPath: init_sg.sh
-            mountPath: /usr/share/elasticsearch/bin/init_sg.sh
-          - name: searchguard-config
-            mountPath: /usr/share/elasticsearch/config/sg
-          - name: searchguard-auth-config
-            mountPath: /usr/share/elasticsearch/config/sg/auth
-          - name: elasticsearch-data
-            mountPath: /usr/share/elasticsearch/data
-        resources:
-{{ include "common.resources" . | indent 12 }}
-      {{- if .Values.nodeSelector }}
-      nodeSelector:
-{{ toYaml .Values.nodeSelector | indent 8 }}
-      {{- end -}}
-      {{- if .Values.affinity }}
-      affinity:
-{{ toYaml .Values.affinity | indent 8 }}
-      {{- end }}
-
-      volumes:
-      - name: localtime
-        hostPath:
-          path: /etc/localtime
-      - name: elasticsearch-config
-        configMap:
-          name: {{ include "common.fullname" . }}-es-config
-      - name: searchguard-scripts
-        configMap:
-          name: {{ include "common.fullname" . }}-sg-scripts
-          defaultMode: 0754
-      - name: searchguard-config
-        configMap:
-          name: {{ include "common.fullname" . }}-sg-config
-      - name: searchguard-auth-config
-        secret:
-          secretName: {{ include "common.fullname" . }}-sg-auth
-      - name: elasticsearch-data
-        hostPath:
-          path: {{ .Values.persistence.mountPath }}/{{ .Release.Name }}/{{ .Values.persistence.mountSubPath }}
-      restartPolicy: {{ .Values.restartPolicy }}
-      imagePullSecrets:
-      - name: "{{ include "common.namespace" . }}-docker-registry-key"
diff --git a/kubernetes/aai/charts/aai-elasticsearch/templates/secrets.yaml b/kubernetes/aai/charts/aai-elasticsearch/templates/secrets.yaml
deleted file mode 100644
index 34b272f086..0000000000
--- a/kubernetes/aai/charts/aai-elasticsearch/templates/secrets.yaml
+++ /dev/null
@@ -1,22 +0,0 @@
-# Copyright © 2018 Amdocs, Bell Canada, AT&T
-#
-# Licensed 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.
-
-apiVersion: v1
-kind: Secret
-metadata:
-  name: {{ include "common.fullname" . }}-sg-auth
-  namespace: {{ include "common.namespace" . }}
-type: Opaque
-data:
-{{ tpl (.Files.Glob "resources/config/sg/auth/*").AsSecrets . | indent 2 }}
\ No newline at end of file
diff --git a/kubernetes/aai/charts/aai-elasticsearch/templates/service.yaml b/kubernetes/aai/charts/aai-elasticsearch/templates/service.yaml
deleted file mode 100644
index d1199125d2..0000000000
--- a/kubernetes/aai/charts/aai-elasticsearch/templates/service.yaml
+++ /dev/null
@@ -1,44 +0,0 @@
-# Copyright © 2018 Amdocs, Bell Canada, AT&T
-#
-# Licensed 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.
-
-apiVersion: v1
-kind: Service
-metadata:
-  name: {{ include "common.servicename" . }}
-  namespace: {{ include "common.namespace" . }}
-  labels:
-    app: {{ include "common.name" . }}
-    chart: {{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }}
-    release: {{ .Release.Name }}
-    heritage: {{ .Release.Service }}
-spec:
-  type: {{ .Values.service.type }}
-  ports:
-  {{if eq .Values.service.type "NodePort" -}}
-  - port: {{ .Values.service.internalPort }}
-    nodePort: {{ .Values.global.nodePortPrefix | default .Values.nodePortPrefix }}{{ .Values.service.nodePort }}
-    name: {{ .Values.service.portName }}
-  - port: {{ .Values.service.internalPort2 }}
-    nodePort: {{ .Values.global.nodePortPrefix | default .Values.nodePortPrefix }}{{ .Values.service.nodePort2 }}
-    name: {{ .Values.service.portName2 }}
-  {{- else -}}
-  - port: {{ .Values.service.internalPort }}
-    name: {{ .Values.service.portName }}
-  - port: {{ .Values.service.internalPort2 }}
-    name: {{ .Values.service.portName2 }}
-  {{- end}}
-  selector:
-    app: {{ include "common.name" . }}
-    release: {{ .Release.Name }}
-  clusterIP: None
diff --git a/kubernetes/aai/charts/aai-elasticsearch/values.yaml b/kubernetes/aai/charts/aai-elasticsearch/values.yaml
deleted file mode 100644
index ea82c99f8b..0000000000
--- a/kubernetes/aai/charts/aai-elasticsearch/values.yaml
+++ /dev/null
@@ -1,105 +0,0 @@
-# Copyright © 2018 Amdocs, Bell Canada, AT&T
-#
-# Licensed 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.
-
-# Default values for elasticsearch.
-# This is a YAML-formatted file.
-# Declare variables to be passed into your templates.
-global: # global defaults
-  nodePortPrefix: 302
-
-# application image
-image: onap/elasticsearch-sg:1.4-STAGING-latest
-pullPolicy: Always
-restartPolicy: Always
-
-flavor: small
-
-# application configuration
-config:
-  tcpPort: 8443
-  nodeKeyStore: esaai-keystore.jks
-  nodeKeyStorePassword: b87b46d3da7d3d4aadfe
-  adminKeyStore: sgadmin-keystore.p12
-  adminKeyStorePassword: 341274302a70ad691e12
-  trustStore: truststore.jks
-  trustStorePassword: b200926e9da205487f63
-
-# default number of instances
-replicaCount: 1
-
-nodeSelector: {}
-
-affinity: {}
-
-# probe configuration parameters
-liveness:
-  initialDelaySeconds: 10
-  periodSeconds: 10
-  # necessary to disable liveness probe when setting breakpoints
-  # in debugger so K8s doesn't restart unresponsive container
-  enabled: true
-
-readiness:
-  initialDelaySeconds: 10
-  periodSeconds: 10
-
-service:
-  type: ClusterIP
-  name: aai-elasticsearch
-  portName: aai-elasticsearch
-  internalPort: 9200
-  portName2: aai-elasticsearch-tcp
-  internalPort2: 8443
-
-ingress:
-  enabled: false
-
-persistence:
-  enabled: true
-
-  ## A manually managed Persistent Volume and Claim
-  ## Requires persistence.enabled: true
-  ## If defined, PVC must be created manually before volume will be bound
-  # existingClaim:
-  volumeReclaimPolicy: Retain
-
-  ## database data Persistent Volume Storage Class
-  ## If defined, storageClassName: <storageClass>
-  ## If set to "-", storageClassName: "", which disables dynamic provisioning
-  ## If undefined (the default) or set to null, no storageClassName spec is
-  ##   set, choosing the default provisioner.  (gp2 on AWS, standard on
-  ##   GKE, AWS & OpenStack)
-  ##
-  ## storageClass: "-"
-  accessMode: ReadWriteMany
-  size: 2Gi
-  mountPath: /dockerdata-nfs
-  mountSubPath: aai/elasticsearch/data
-
-resources:
-  small:
-    limits:
-      cpu: 2
-      memory: 4Gi
-    requests:
-      cpu: 0.5
-      memory: 2Gi
-  large:
-    limits:
-      cpu: 4
-      memory: 8Gi
-    requests:
-      cpu: 1
-      memory: 4Gi
-  unlimited: {}