commit 7a506d25b71e9cc9d55dfb96470e73118a2f5655
author Zack Williams <zdw@opennetworking.org> Mon Sep 24 17:00:13 2018 -0700
committer Zack Williams <zdw@opennetworking.org> Fri Oct 19 07:41:56 2018 -0700
tree 5c4655c6776ddb621303c03d09a9fbe58d7bc232
parent 45dbc06c7807f9c645a68f83bc38e97dd24557a6

[SEBA-156] ONOS logs to kafka -> elasticstack

Updated versions of logging components, push to stable

Update ONOS to v1.13.5

Change-Id: Ie0a442cca805dc7804a84aa4c7bbbd03acf4bb60

onos/templates/deployment.yaml

diff --git a/onos/templates/deployment.yaml b/onos/templates/deployment.yaml
index ce4c963..415ecff 100644
--- a/onos/templates/deployment.yaml
+++ b/onos/templates/deployment.yaml
@@ -1,5 +1,4 @@
 ---
-
 # Copyright 2018-present Open Networking Foundation
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
@@ -67,12 +66,34 @@
           resources:
 {{ toYaml .Values.resources | indent 12 }}
           volumeMounts:
-            - name: onos-logs-cfg
-              mountPath: /root/onos/apache-karaf-3.0.8/etc/org.ops4j.pax.logging.cfg
-              subPath: org.ops4j.pax.logging.cfg
             - name: node-key
               mountPath: /root/vtn
               readOnly: true
+            - name: onos-logs-cfg
+              mountPath: /root/onos/apache-karaf-3.0.8/etc/org.ops4j.pax.logging.cfg
+              subPath: org.ops4j.pax.logging.cfg
+            - name: onos-logs
+              mountPath: /root/onos/apache-karaf-3.0.8/data/log
+{{- if .Values.log_agent.enabled }}
+        - name: {{ .Chart.Name }}-log-agent
+          image: "{{ .Values.global.registry }}{{ .Values.images.log_agent.repository }}:{{ .Values.images.log_agent.tag }}"
+          imagePullPolicy: {{ .Values.images.log_agent.pullPolicy }}
+          args: [ "-c", "/conf/filebeat.yml", "-e" ]
+          env:
+            - name: POD_NAMESPACE
+              valueFrom:
+                fieldRef:
+                  fieldPath: metadata.namespace
+            - name: NODE_NAME
+              valueFrom:
+                fieldRef:
+                  fieldPath: spec.nodeName
+          volumeMounts:
+            - name: onos-logs
+              mountPath: /onos_logs
+            - name: log-agent-configmap-volume
+              mountPath: /conf
+{{- end }}
       volumes:
         - name: node-key
           secret:
@@ -85,7 +106,17 @@
             items:
               - key: logCfg
                 path: org.ops4j.pax.logging.cfg
-    {{- with .Values.nodeSelector }}
+        - name: onos-logs
+          emptyDir: {}
+{{- if .Values.log_agent.enabled }}
+        - name: log-agent-configmap-volume
+          configMap:
+            name: log-agent-configmap
+            items:
+              - key: config
+                path: filebeat.yml
+{{- end }}
+{{- with .Values.nodeSelector }}
       nodeSelector:
 {{ toYaml . | indent 8 }}
     {{- end }}
@@ -97,3 +128,6 @@
       tolerations:
 {{ toYaml . | indent 8 }}
     {{- end }}
+{{- if .Values.log_agent.enabled }}
+{{- include "onos.log-agent-configmap" . }}
+{{- end }}