diff options
| author |   Mandeep Khinda <Mandeep.Khinda@amdocs.com> | 2018-09-05 14:10:38 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@onap.org> | 2018-09-05 14:10:38 +0000 |
| commit | 956424b3398fd8ff5125fe0461ab13506a3a0278 (patch) | |
| tree | ab4f64461f70640a26afc16b2e5e0a813e4f4cd0 /kubernetes/multicloud/resources | |
| parent | cd4d4eb1c282dda543530feeed6265ace99c6b64 (diff) | |
| parent | 376ba1e04bd9f223d543749a6136cfc6a7caa8fd (diff) | |
Merge "License addition for oof,multicloud,esr"
Diffstat (limited to 'kubernetes/multicloud/resources')
| -rw-r--r-- | kubernetes/multicloud/resources/config/log/filebeat/filebeat.yml | 13 | ||||
| -rw-r--r-- | kubernetes/multicloud/resources/config/log/framework/log.yml | 15 |
2 files changed, 27 insertions, 1 deletions
diff --git a/kubernetes/multicloud/resources/config/log/filebeat/filebeat.yml b/kubernetes/multicloud/resources/config/log/filebeat/filebeat.yml index a6dd579b4b..aa82aa71b9 100644 --- a/kubernetes/multicloud/resources/config/log/filebeat/filebeat.yml +++ b/kubernetes/multicloud/resources/config/log/filebeat/filebeat.yml @@ -1,3 +1,16 @@ +# Copyright © 2018 AT&T, Amdocs, Bell Canada 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. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. filebeat.prospectors: #it is mandatory, in our case it's log - input_type: log diff --git a/kubernetes/multicloud/resources/config/log/framework/log.yml b/kubernetes/multicloud/resources/config/log/framework/log.yml index f54887144a..6c89ff3272 100644 --- a/kubernetes/multicloud/resources/config/log/framework/log.yml +++ b/kubernetes/multicloud/resources/config/log/framework/log.yml @@ -1,3 +1,16 @@ +# Copyright © 2018 AT&T, Amdocs, Bell Canada 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. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. version: 1 disable_existing_loggers: False @@ -21,4 +34,4 @@ formatters: format: "%(asctime)s|||||%(name)s||%(thread)s||%(funcName)s||%(levelname)s||%(message)s||||%(mdc)s \t" mdcfmt: "{requestID} {invocationID} {serviceName} {serviceIP}" datefmt: "%Y-%m-%d %H:%M:%S" - (): onaplogging.mdcformatter.MDCFormatter
\ No newline at end of file + (): onaplogging.mdcformatter.MDCFormatter |