commit 7000a7c8ad6acdbfbaed54c81b030f9b7ad190b1
author Maciej Wereski <m.wereski@partner.samsung.com> Thu Dec 16 12:24:06 2021 +0100
committer Sylvain Desbureaux <sylvain.desbureaux@orange.com> Thu Jan 06 08:37:37 2022 +0000
tree 2e1bf5e0d5dd7ff581e14d63c94f3652eb56bef9
parent 0d2cf1aee02c84d5ff262b4ac1d414fdadf5432b

[DCAEGEN2] Use common.log template

Until now DCAEGEN2 used its own templates instead of common ones. This
change switches filebeat sidecar generation to common.log templates.
Other ONAP components already use it. Filebeat is depreceated and with
use of common templates it is possible to disable it globally.

This patch also changes ConfigMap usage from per component ConfigMap to
one ConfigMap for all of DCAEGEN2 components. This is done to simplify
generated file as there are no differences between per component
ConfigMaps.

Issue-ID: OOM-1
Signed-off-by: Maciej Wereski <m.wereski@partner.samsung.com>
Change-Id: I87ffe4890b9a4d79edfe0669750dbf21b4a7b340

kubernetes/dcaegen2-services/values.yaml

diff --git a/kubernetes/dcaegen2-services/values.yaml b/kubernetes/dcaegen2-services/values.yaml
index eb0b9cc..7db369c 100644
--- a/kubernetes/dcaegen2-services/values.yaml
+++ b/kubernetes/dcaegen2-services/values.yaml
@@ -14,43 +14,73 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
+global:
+  centralizedLoggingEnabled: true
+
+#################################################################
+# Filebeat Configuration Defaults.
+#
+#################################################################
+filebeatConfig:
+  logstashServiceName: log-ls
+  logstashPort: 5044
+
 # Control deployment of DCAE microservices at ONAP installation time
 
 dcae-bbs-eventprocessor-ms:
   enabled: false
+  logConfigMapNamePrefix: '{{ include "common.release" . }}-dcaegen2-services'
 dcae-datafile-collector:
   enabled: false
+  logConfigMapNamePrefix: '{{ include "common.release" . }}-dcaegen2-services'
 dcae-datalake-admin-ui:
   enabled: false
+  logConfigMapNamePrefix: '{{ include "common.release" . }}-dcaegen2-services'
 dcae-datalake-des:
   enabled: false
+  logConfigMapNamePrefix: '{{ include "common.release" . }}-dcaegen2-services'
 dcae-datalake-feeder:
   enabled: false
+  logConfigMapNamePrefix: '{{ include "common.release" . }}-dcaegen2-services'
 dcae-heartbeat:
   enabled: false
+  logConfigMapNamePrefix: '{{ include "common.release" . }}-dcaegen2-services'
 dcae-hv-ves-collector:
   enabled: true
+  logConfigMapNamePrefix: '{{ include "common.release" . }}-dcaegen2-services'
 dcae-kpi-ms:
   enabled: false
+  logConfigMapNamePrefix: '{{ include "common.release" . }}-dcaegen2-services'
 dcae-ms-healthcheck:
   enabled: true
+  logConfigMapNamePrefix: '{{ include "common.release" . }}-dcaegen2-services'
 dcae-pm-mapper:
   enabled: false
+  logConfigMapNamePrefix: '{{ include "common.release" . }}-dcaegen2-services'
 dcae-pmsh:
   enabled: false
+  logConfigMapNamePrefix: '{{ include "common.release" . }}-dcaegen2-services'
 dcae-prh:
   enabled: true
+  logConfigMapNamePrefix: '{{ include "common.release" . }}-dcaegen2-services'
 dcae-restconf-collector:
   enabled: false
+  logConfigMapNamePrefix: '{{ include "common.release" . }}-dcaegen2-services'
 dcae-slice-analysis-ms:
   enabled: false
+  logConfigMapNamePrefix: '{{ include "common.release" . }}-dcaegen2-services'
 dcae-snmptrap-collector:
   enabled: false
+  logConfigMapNamePrefix: '{{ include "common.release" . }}-dcaegen2-services'
 dcae-son-handler:
   enabled: false
+  logConfigMapNamePrefix: '{{ include "common.release" . }}-dcaegen2-services'
 dcae-tcagen2:
   enabled: true
+  logConfigMapNamePrefix: '{{ include "common.release" . }}-dcaegen2-services'
 dcae-ves-collector:
   enabled: true
+  logConfigMapNamePrefix: '{{ include "common.release" . }}-dcaegen2-services'
 dcae-ves-mapper:
   enabled: false
+  logConfigMapNamePrefix: '{{ include "common.release" . }}-dcaegen2-services'