summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAlexis de Talhouƫt <alexis.de_talhouet@bell.ca>2017-12-19 12:23:42 +0000
committerGerrit Code Review <gerrit@onap.org>2017-12-19 12:23:42 +0000
commitdacf2683ad7c7e8be7aea131a9014f52b282d51b (patch)
tree0b8d996c4f52720779e8cce3af01337fd0af9559
parentb560911aebad5bace90aa078e7a5d8f0d681fba8 (diff)
parent8f4a0625000ed9763d92c3279d51671ddf966db3 (diff)
Merge "Fix wrong filebeat config in aai" into release-1.1.0
-rw-r--r--kubernetes/aai/templates/aai-resources-deployment.yaml2
-rw-r--r--kubernetes/aai/templates/aai-traversal-deployment.yaml2
-rw-r--r--kubernetes/aai/templates/search-data-service-deployment.yaml4
-rw-r--r--kubernetes/aai/templates/sparky-be-deployment.yaml4
4 files changed, 6 insertions, 6 deletions
diff --git a/kubernetes/aai/templates/aai-resources-deployment.yaml b/kubernetes/aai/templates/aai-resources-deployment.yaml
index 39c014cb5e..3c4183e13d 100644
--- a/kubernetes/aai/templates/aai-resources-deployment.yaml
+++ b/kubernetes/aai/templates/aai-resources-deployment.yaml
@@ -94,7 +94,7 @@ spec:
path: "/dockerdata-nfs/{{ .Values.nsPrefix }}/aai/aai-data/"
- name: filebeat-conf
hostPath:
- path: /dockerdata-nfs/{{ .Values.nsPrefix }}/log/filebeat/log4j/filebeat.yml
+ path: /dockerdata-nfs/{{ .Values.nsPrefix }}/log/filebeat/logback/filebeat.yml
- name: aai-resources-logs
emptyDir: {}
- name: aai-resources-filebeat
diff --git a/kubernetes/aai/templates/aai-traversal-deployment.yaml b/kubernetes/aai/templates/aai-traversal-deployment.yaml
index c4f30f72ec..eb7b0654d8 100644
--- a/kubernetes/aai/templates/aai-traversal-deployment.yaml
+++ b/kubernetes/aai/templates/aai-traversal-deployment.yaml
@@ -96,7 +96,7 @@ spec:
path: "/dockerdata-nfs/{{ .Values.nsPrefix }}/aai/aai-data/"
- name: filebeat-conf
hostPath:
- path: /dockerdata-nfs/{{ .Values.nsPrefix }}/log/filebeat/log4j/filebeat.yml
+ path: /dockerdata-nfs/{{ .Values.nsPrefix }}/log/filebeat/logback/filebeat.yml
- name: aai-traversal-logs
emptyDir: {}
- name: aai-traversal-filebeat
diff --git a/kubernetes/aai/templates/search-data-service-deployment.yaml b/kubernetes/aai/templates/search-data-service-deployment.yaml
index 60fdbb50cd..e1668456ba 100644
--- a/kubernetes/aai/templates/search-data-service-deployment.yaml
+++ b/kubernetes/aai/templates/search-data-service-deployment.yaml
@@ -62,7 +62,7 @@ spec:
path: "/dockerdata-nfs/{{ .Values.nsPrefix }}/aai/search-data-service/appconfig/"
- name: filebeat-conf
hostPath:
- path: /dockerdata-nfs/{{ .Values.nsPrefix }}/log/filebeat/log4j/filebeat.yml
+ path: /dockerdata-nfs/{{ .Values.nsPrefix }}/log/filebeat/logback/filebeat.yml
- name: aai-search-data-service-logs
emptyDir: {}
- name: aai-search-data-service-filebeat
@@ -81,4 +81,4 @@ metadata:
namespace: {{ .Values.nsPrefix }}-aai
data:
{{ (.Files.Glob "resources/search-data-service/conf/logback.xml").AsConfig | indent 2 }}
-#{{ end }} \ No newline at end of file
+#{{ end }}
diff --git a/kubernetes/aai/templates/sparky-be-deployment.yaml b/kubernetes/aai/templates/sparky-be-deployment.yaml
index c60725ee15..484a87f5be 100644
--- a/kubernetes/aai/templates/sparky-be-deployment.yaml
+++ b/kubernetes/aai/templates/sparky-be-deployment.yaml
@@ -62,7 +62,7 @@ spec:
path: "/dockerdata-nfs/{{ .Values.nsPrefix }}/aai/sparky-be/appconfig/"
- name: filebeat-conf
hostPath:
- path: /dockerdata-nfs/{{ .Values.nsPrefix }}/log/filebeat/log4j/filebeat.yml
+ path: /dockerdata-nfs/{{ .Values.nsPrefix }}/log/filebeat/logback/filebeat.yml
- name: aai-sparky-be-logs
emptyDir: {}
- name: aai-sparky-filebeat
@@ -81,4 +81,4 @@ metadata:
namespace: {{ .Values.nsPrefix }}-aai
data:
{{ (.Files.Glob "resources/sparky-be/conf/logback.xml").AsConfig | indent 2 }}
-#{{ end }} \ No newline at end of file
+#{{ end }}