diff options
| author |   Matthias Runge <mrunge@redhat.com> | 2019-12-17 14:42:39 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@opnfv.org> | 2019-12-17 14:42:39 +0000 |
| commit | aaefdd5faa4433a016785effc662cea060d46862 (patch) | |
| tree | 9d5e9a24ec7e4a731e51ecc97ceca3a8eedc4734 /docker/barometer-collectd-experimental | |
| parent | 4d100488be83a24e9e5b80b38c39681e9b1df970 (diff) | |
| parent | 4abee7e46d1602f796f8aebed0a51da9476d0832 (diff) | |
Merge "Updates/Fix on Legal/License Headers"
Diffstat (limited to 'docker/barometer-collectd-experimental')
4 files changed, 24 insertions, 6 deletions
diff --git a/docker/barometer-collectd-experimental/Dockerfile b/docker/barometer-collectd-experimental/Dockerfile index e505d2e2..cf94df2f 100644 --- a/docker/barometer-collectd-experimental/Dockerfile +++ b/docker/barometer-collectd-experimental/Dockerfile @@ -1,3 +1,18 @@ +# Copyright 2017-2019 Intel Corporation and OPNFV. 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. +# + FROM centos:7 RUN yum update -y && \ yum install -y which sudo git && \ diff --git a/docker/barometer-collectd-experimental/collectd_apply_pull_request.sh b/docker/barometer-collectd-experimental/collectd_apply_pull_request.sh index ed337112..831aba37 100755 --- a/docker/barometer-collectd-experimental/collectd_apply_pull_request.sh +++ b/docker/barometer-collectd-experimental/collectd_apply_pull_request.sh @@ -1,17 +1,18 @@ #! /bin/bash -# Copyright 2019 OPNFV +# Copyright 2019 Intel Corporation and OPNFV. 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 +# 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. +# # This files contains list of pull requests to be applied on top # of master branch before building collectd included in docker diff --git a/docker/barometer-collectd-experimental/experimental-configs/logparser.conf b/docker/barometer-collectd-experimental/experimental-configs/logparser.conf index 3802768b..1f1a725b 100644 --- a/docker/barometer-collectd-experimental/experimental-configs/logparser.conf +++ b/docker/barometer-collectd-experimental/experimental-configs/logparser.conf @@ -1,16 +1,17 @@ -# Copyright 2019 OPNFV +# Copyright 2019 Intel Corporation and OPNFV. 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 +# 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. +# LoadPlugin logparser diff --git a/docker/barometer-collectd-experimental/run_collectd.sh b/docker/barometer-collectd-experimental/run_collectd.sh index b45711e1..5920248a 100644 --- a/docker/barometer-collectd-experimental/run_collectd.sh +++ b/docker/barometer-collectd-experimental/run_collectd.sh @@ -1,15 +1,16 @@ #!/bin/bash -# Copyright 2019 OPNFV +# Copyright 2016-2019 Intel Corporation and OPNFV. 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 +# 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. +# /opt/collectd/sbin/collectd -f |