summaryrefslogtreecommitdiffstats
path: root/kubernetes/log
diff options
context:
space:
mode:
Diffstat (limited to 'kubernetes/log')
-rw-r--r--kubernetes/log/resources/kibana/conf/kibana.yml3
-rw-r--r--kubernetes/log/resources/logstash/pipeline/onap-pipeline.conf5
-rw-r--r--kubernetes/log/templates/kibana-deployment.yaml2
-rw-r--r--kubernetes/log/templates/logstash-deployment.yaml2
4 files changed, 7 insertions, 5 deletions
diff --git a/kubernetes/log/resources/kibana/conf/kibana.yml b/kubernetes/log/resources/kibana/conf/kibana.yml
index 3bdb2febc7..3b96bd33c2 100644
--- a/kubernetes/log/resources/kibana/conf/kibana.yml
+++ b/kubernetes/log/resources/kibana/conf/kibana.yml
@@ -30,7 +30,8 @@ server.host: "0"
server.name: "Kibana"
# The URL of the Elasticsearch instance to use for all your queries.
-elasticsearch.url: "http://elasticsearch.{{ .Values.nsPrefix }}-log:9200"
+# OOM-427, OOM-441 hardcoded onap workspace to avoid helm upgrade past 2.3
+elasticsearch.url: "http://elasticsearch.onap-log:9200"
#elasticsearch-service.onap-log:9200"
#elasticsearch.url: "http://10.247.47.3:9200"
# When this setting's value is true Kibana uses the hostname specified in the server.host
diff --git a/kubernetes/log/resources/logstash/pipeline/onap-pipeline.conf b/kubernetes/log/resources/logstash/pipeline/onap-pipeline.conf
index 229bcc1466..123ceb5f28 100644
--- a/kubernetes/log/resources/logstash/pipeline/onap-pipeline.conf
+++ b/kubernetes/log/resources/logstash/pipeline/onap-pipeline.conf
@@ -224,7 +224,8 @@ output {
#can specify one or a list of hosts. If sniffing is set, one is enough and others will be auto-discovered
##Also protocol can be specified like ["http://10.247.186.12:9200"]
- hosts => ["http://elasticsearch.{{.Values.nsPrefix}}-log:9200"]
+## OOM-427, OOM-441 hardcoded onap workspace to avoid helm upgrade past 2.3
+ hosts => ["http://elasticsearch.onap-log:9200"]
## This setting asks Elasticsearch for the list of all cluster nodes and adds them to the hosts list. Default is false.
@@ -246,7 +247,7 @@ output {
######### Document configurations #########
- index => "onaplogs-%{+YYYY.MM.dd}"
+ index => "logstash-%{+YYYY.MM.dd}"
document_type => "logs"
## This can be used to associate child documents with a parent using the parent ID.
diff --git a/kubernetes/log/templates/kibana-deployment.yaml b/kubernetes/log/templates/kibana-deployment.yaml
index 57e841554b..2de825e516 100644
--- a/kubernetes/log/templates/kibana-deployment.yaml
+++ b/kubernetes/log/templates/kibana-deployment.yaml
@@ -58,5 +58,5 @@ metadata:
name: kibana-configmap
namespace: {{ .Values.nsPrefix }}-log
data:
-{{ tpl (.Files.Glob "resources/kibana/conf/kibana.yml").AsConfig . | indent 2 }}
+{{ (.Files.Glob "resources/kibana/conf/kibana.yml").AsConfig | indent 2 }}
#{{ end }}
diff --git a/kubernetes/log/templates/logstash-deployment.yaml b/kubernetes/log/templates/logstash-deployment.yaml
index b4732daf9e..47c72c8145 100644
--- a/kubernetes/log/templates/logstash-deployment.yaml
+++ b/kubernetes/log/templates/logstash-deployment.yaml
@@ -68,5 +68,5 @@ metadata:
namespace: {{ .Values.nsPrefix }}-log
data:
{{ (.Files.Glob "resources/logstash/conf/logstash.yml").AsConfig | indent 2 }}
-{{ tpl (.Files.Glob "resources/logstash/pipeline/onap-pipeline.conf").AsConfig . | indent 2 }}
+{{ (.Files.Glob "resources/logstash/pipeline/onap-pipeline.conf").AsConfig | indent 2 }}
#{{ end }}