Merge "[DCAEGEN2] Use common.log template"

diff --combined kubernetes/dcaegen2-services/components/dcae-restconf-collector/values.yaml
index 6668a85,a4d8ecb..47b8046
--- 1/kubernetes/dcaegen2-services/components/dcae-restconf-collector/values.yaml
--- 2/kubernetes/dcaegen2-services/components/dcae-restconf-collector/values.yaml
+++ b/kubernetes/dcaegen2-services/components/dcae-restconf-collector/values.yaml
@@@ -1,6 -1,6 +1,6 @@@
  # ================================ LICENSE_START =============================
  # ============================================================================
 -# Copyright (c) 2021 AT&T Intellectual Property. All rights reserved.
 +# Copyright (c) 2021-2022 AT&T Intellectual Property. All rights reserved.
  # ============================================================================
  # Licensed under the Apache License, Version 2.0 (the "License");
  # you may not use this file except in compliance with the License.
@@@ -21,6 -21,7 +21,7 @@@
  global:
    nodePortPrefix: 302
    nodePortPrefixExt: 304
+   centralizedLoggingEnabled: false
  
  #################################################################
  # Filebeat Configuration Defaults.
@@@ -50,12 -51,15 +51,15 @@@ consulLoaderImage: onap/org.onap.dcaege
  # Application Configuration Defaults.
  #################################################################
  # Application Image
 -image: onap/org.onap.dcaegen2.collectors.restconfcollector:1.2.5
 +image: onap/org.onap.dcaegen2.collectors.restconfcollector:1.2.6
  pullPolicy: Always
  
  # Log directory where logging sidecar should look for log files
- # if absent, no sidecar will be deployed
- # logDirectory: /opt/app/restconfcollector/logs
+ # if path is set to null sidecar won't be deployed in spite of
+ # global.centralizedLoggingEnabled setting.
+ log:
+   path: null # /opt/app/restconfcollector/logs
+ logConfigMapNamePrefix: '{{ include "common.fullname" . }}'
  
  # Directory where TLS certs should be stored
  # if absent, no certs will be retrieved and stored

diff --combined kubernetes/dcaegen2-services/components/dcae-ves-collector/values.yaml
index fa0253a,e65a293..ec70cf5
--- 1/kubernetes/dcaegen2-services/components/dcae-ves-collector/values.yaml
--- 2/kubernetes/dcaegen2-services/components/dcae-ves-collector/values.yaml
+++ b/kubernetes/dcaegen2-services/components/dcae-ves-collector/values.yaml
@@@ -2,7 -2,6 +2,7 @@@
  # ================================================================================
  # Copyright (c) 2021 J. F. Lucas. All rights reserved.
  # Copyright (c) 2021 Nokia.  All rights reserved.
 +# Copyright (c) 2022 AT&T Intellectual Property. All rights reserved.
  # ================================================================================
  # Licensed under the Apache License, Version 2.0 (the "License");
  # you may not use this file except in compliance with the License.
@@@ -23,6 -22,7 +23,7 @@@
  global:
    nodePortPrefix: 302
    nodePortPrefixExt: 304
+   centralizedLoggingEnabled: true
  
  #################################################################
  # Filebeat configuration defaults.
@@@ -42,12 -42,15 +43,15 @@@ certPostProcessorImage: onap/org.onap.o
  # Application configuration defaults.
  #################################################################
  # application image
 -image: onap/org.onap.dcaegen2.collectors.ves.vescollector:1.10.1
 +image: onap/org.onap.dcaegen2.collectors.ves.vescollector:1.10.2
  pullPolicy: Always
  
  # log directory where logging sidecar should look for log files
- # if absent, no sidecar will be deployed
- logDirectory: /opt/app/VESCollector/logs
+ # if path is set to null sidecar won't be deployed in spite of
+ # global.centralizedLoggingEnabled setting.
+ log:
+   path: /opt/app/VESCollector/logs
+ logConfigMapNamePrefix: '{{ include "common.fullname" . }}'
  
  # directory where TLS certs should be stored
  # if absent, no certs will be retrieved and stored

diff --combined kubernetes/dcaegen2-services/components/dcae-ves-mapper/values.yaml
index fd2ceed,82826bc..b29c108
--- 1/kubernetes/dcaegen2-services/components/dcae-ves-mapper/values.yaml
--- 2/kubernetes/dcaegen2-services/components/dcae-ves-mapper/values.yaml
+++ b/kubernetes/dcaegen2-services/components/dcae-ves-mapper/values.yaml
@@@ -1,6 -1,6 +1,6 @@@
  # ================================ LICENSE_START =============================
  # ============================================================================
 -# Copyright (c) 2021 AT&T Intellectual Property. All rights reserved.
 +# Copyright (c) 2021-2022 AT&T Intellectual Property. All rights reserved.
  # ============================================================================
  # Licensed under the Apache License, Version 2.0 (the "License");
  # you may not use this file except in compliance with the License.
@@@ -21,6 -21,7 +21,7 @@@
  global:
    nodePortPrefix: 302
    nodePortPrefixExt: 304
+   centralizedLoggingEnabled: true
  
  #################################################################
  # Filebeat Configuration Defaults.
@@@ -39,12 -40,15 +40,15 @@@ consulLoaderImage: onap/org.onap.dcaege
  # Application Configuration Defaults.
  #################################################################
  # Application Image
 -image: onap/org.onap.dcaegen2.services.mapper.vesadapter.universalvesadaptor:1.3.0
 +image: onap/org.onap.dcaegen2.services.mapper.vesadapter.universalvesadaptor:1.3.1
  pullPolicy: Always
  
  # Log directory where logging sidecar should look for log files
- # if absent, no sidecar will be deployed
- logDirectory: /opt/app/VESAdapter/logs
+ # if path is set to null sidecar won't be deployed in spite of
+ # global.centralizedLoggingEnabled setting.
+ log:
+   path: /opt/app/VESAdapter/logs
+ logConfigMapNamePrefix: '{{ include "common.fullname" . }}'
  
  # Directory where TLS certs should be stored
  # if absent, no certs will be retrieved and stored