summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorosgn422w <gervais-martial.ngueko@intl.att.com>2020-09-26 11:38:01 +0200
committerosgn422w <gervais-martial.ngueko@intl.att.com>2020-09-26 11:38:01 +0200
commit87d267d898a2942f29d031a30ba497e00bdb05ea (patch)
tree1f5709c690407d914145af9b35a2bb6e455f7166
parent665d5264749669a72bda8b27324daae02dd21769 (diff)
[CLAMP] upgrade for java11
upgrade elk version to move to java 11 for CLAMP dashboard part. Issue-ID: CLAMP-934 Change-Id: I5b6a8064f17ab0bdd7c5fa1feb8813848d9753cc Signed-off-by: osgn422w <gervais-martial.ngueko@intl.att.com>
-rw-r--r--kubernetes/clamp/components/clamp-dash-es/values.yaml2
-rw-r--r--kubernetes/clamp/components/clamp-dash-kibana/values.yaml2
-rw-r--r--kubernetes/clamp/components/clamp-dash-logstash/resources/config/pipeline.conf3
-rw-r--r--kubernetes/clamp/components/clamp-dash-logstash/values.yaml2
4 files changed, 6 insertions, 3 deletions
diff --git a/kubernetes/clamp/components/clamp-dash-es/values.yaml b/kubernetes/clamp/components/clamp-dash-es/values.yaml
index a4ff555e83..04580a0354 100644
--- a/kubernetes/clamp/components/clamp-dash-es/values.yaml
+++ b/kubernetes/clamp/components/clamp-dash-es/values.yaml
@@ -70,7 +70,7 @@ busyboxImage: library/busybox:latest
# application image
repository: nexus3.onap.org:10001
-image: onap/clamp-dashboard-elasticsearch:5.0.3
+image: onap/clamp-dashboard-elasticsearch:5.0.4
pullPolicy: Always
# flag to enable debugging - application support required
diff --git a/kubernetes/clamp/components/clamp-dash-kibana/values.yaml b/kubernetes/clamp/components/clamp-dash-kibana/values.yaml
index 73cf1bdff7..37dae0ffb1 100644
--- a/kubernetes/clamp/components/clamp-dash-kibana/values.yaml
+++ b/kubernetes/clamp/components/clamp-dash-kibana/values.yaml
@@ -71,7 +71,7 @@ busyboxImage: library/busybox:latest
# application image
repository: nexus3.onap.org:10001
-image: onap/clamp-dashboard-kibana:5.0.3
+image: onap/clamp-dashboard-kibana:5.0.4
pullPolicy: Always
# flag to enable debugging - application support required
diff --git a/kubernetes/clamp/components/clamp-dash-logstash/resources/config/pipeline.conf b/kubernetes/clamp/components/clamp-dash-logstash/resources/config/pipeline.conf
index 2364e5548a..87c8f06e42 100644
--- a/kubernetes/clamp/components/clamp-dash-logstash/resources/config/pipeline.conf
+++ b/kubernetes/clamp/components/clamp-dash-logstash/resources/config/pipeline.conf
@@ -221,6 +221,7 @@ output {
if "error" in [tags] {
elasticsearch {
+ ilm_enabled => false
codec => "json"
{{- if .Values.global.aafEnabled }}
cacert => "{{ .Values.certInitializer.credsPath }}/{{ .Values.certInitializer.clamp_ca_certs_pem }}"
@@ -237,6 +238,7 @@ output {
} else if "event-cl-aggs" in [tags] {
elasticsearch {
+ ilm_enabled => false
codec => "json"
hosts => ["${elasticsearch_base_url}"]
{{- if .Values.global.aafEnabled }}
@@ -255,6 +257,7 @@ output {
} else {
elasticsearch {
+ ilm_enabled => false
codec => "json"
hosts => ["${elasticsearch_base_url}"]
{{- if .Values.global.aafEnabled }}
diff --git a/kubernetes/clamp/components/clamp-dash-logstash/values.yaml b/kubernetes/clamp/components/clamp-dash-logstash/values.yaml
index 8bccbcb92e..2b3c9f1712 100644
--- a/kubernetes/clamp/components/clamp-dash-logstash/values.yaml
+++ b/kubernetes/clamp/components/clamp-dash-logstash/values.yaml
@@ -67,7 +67,7 @@ flavor: small
# application image
repository: nexus3.onap.org:10001
-image: onap/clamp-dashboard-logstash:5.0.3
+image: onap/clamp-dashboard-logstash:5.0.4
pullPolicy: Always
# flag to enable debugging - application support required