From 741191e0575ae5cce2c8563cbe4f272026bff406 Mon Sep 17 00:00:00 2001 From: Ryan Faircloth <35384120+rfaircloth-splunk@users.noreply.github.com> Date: Mon, 1 Jul 2019 14:05:53 -0400 Subject: [PATCH] Adds copyright and license information (#10) This update Fixes #9 adding copyright and license information --- .circleci/config.yml | 8 ++ .env.template | 8 ++ .gitignore | 8 ++ LICENSE-2.0 | 13 --- LICENSE-BSD2 | 25 ++++++ LICENSE-CC0 | 121 ++++++++++++++++++++++++++++ README.md | 6 ++ clair-whitelist.yml | 8 ++ clair_to_junit_parser.py | 5 ++ demo-with-compose.sh | 5 ++ docker-compose.yml | 8 ++ package/Dockerfile | 8 ++ package/confluent.repo | 8 ++ package/etc/syslog-ng.conf | 8 ++ package/goss.yaml | 8 ++ package/sbin/entrypoint.sh | 6 +- package/sbin/goss.yaml | 8 ++ package/scripts/splunkmetrics.sh | 5 ++ package/scripts/switch_transport.sh | 5 ++ requirements.txt | 8 ++ test-with-compose.sh | 5 ++ tests/Dockerfile | 8 ++ tests/requirements.txt | 8 ++ tests/test_poc.py | 5 ++ 24 files changed, 291 insertions(+), 14 deletions(-) delete mode 100644 LICENSE-2.0 create mode 100644 LICENSE-BSD2 create mode 100644 LICENSE-CC0 diff --git a/.circleci/config.yml b/.circleci/config.yml index 419b1fe..4786b41 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -1,3 +1,11 @@ +#Splunk Connect for Syslog (SC4S) by Splunk, Inc. +# +#To the extent possible under law, the person who associated CC0 with +#Splunk Connect for Syslog (SC4S) has waived all copyright and related or neighboring rights +#to Splunk Connect for Syslog (SC4S). +# +#You should have received a copy of the CC0 legalcode along with this +#work. If not, see . version: 2.1 orbs: diff --git a/.env.template b/.env.template index dd14966..b828de9 100644 --- a/.env.template +++ b/.env.template @@ -1,3 +1,11 @@ +#Splunk Connect for Syslog (SC4S) by Splunk, Inc. +# +#To the extent possible under law, the person who associated CC0 with +#Splunk Connect for Syslog (SC4S) has waived all copyright and related or neighboring rights +#to Splunk Connect for Syslog (SC4S). +# +#You should have received a copy of the CC0 legalcode along with this +#work. If not, see . RH_ORG=xxxx RH_ACTIVATION=xxxxx SPLUNK_HEC_TOKEN=a778f63a-5dff-4e3c-a72c-a03183659e94 diff --git a/.gitignore b/.gitignore index 959e704..e0adc68 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,11 @@ +#Splunk Connect for Syslog (SC4S) by Splunk, Inc. +# +#To the extent possible under law, the person who associated CC0 with +#Splunk Connect for Syslog (SC4S) has waived all copyright and related or neighboring rights +#to Splunk Connect for Syslog (SC4S). +# +#You should have received a copy of the CC0 legalcode along with this +#work. If not, see . # Created by .ignore support plugin (hsz.mobi) ### GitBook template # Node rules: diff --git a/LICENSE-2.0 b/LICENSE-2.0 deleted file mode 100644 index 913f595..0000000 --- a/LICENSE-2.0 +++ /dev/null @@ -1,13 +0,0 @@ -Copyright 2019 Splunk Inc. - -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. \ No newline at end of file diff --git a/LICENSE-BSD2 b/LICENSE-BSD2 new file mode 100644 index 0000000..904f2fe --- /dev/null +++ b/LICENSE-BSD2 @@ -0,0 +1,25 @@ +BSD 2-Clause License + +Copyright (c) 2019, Splunk, Inc +All rights reserved. + +Redistribution and use in source and binary forms, with or without +modification, are permitted provided that the following conditions are met: + +1. Redistributions of source code must retain the above copyright notice, this + list of conditions and the following disclaimer. + +2. Redistributions in binary form must reproduce the above copyright notice, + this list of conditions and the following disclaimer in the documentation + and/or other materials provided with the distribution. + +THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" +AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE +IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE +DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE +FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL +DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR +SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER +CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, +OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE +OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. diff --git a/LICENSE-CC0 b/LICENSE-CC0 new file mode 100644 index 0000000..1625c17 --- /dev/null +++ b/LICENSE-CC0 @@ -0,0 +1,121 @@ +Creative Commons Legal Code + +CC0 1.0 Universal + + CREATIVE COMMONS CORPORATION IS NOT A LAW FIRM AND DOES NOT PROVIDE + LEGAL SERVICES. DISTRIBUTION OF THIS DOCUMENT DOES NOT CREATE AN + ATTORNEY-CLIENT RELATIONSHIP. CREATIVE COMMONS PROVIDES THIS + INFORMATION ON AN "AS-IS" BASIS. CREATIVE COMMONS MAKES NO WARRANTIES + REGARDING THE USE OF THIS DOCUMENT OR THE INFORMATION OR WORKS + PROVIDED HEREUNDER, AND DISCLAIMS LIABILITY FOR DAMAGES RESULTING FROM + THE USE OF THIS DOCUMENT OR THE INFORMATION OR WORKS PROVIDED + HEREUNDER. + +Statement of Purpose + +The laws of most jurisdictions throughout the world automatically confer +exclusive Copyright and Related Rights (defined below) upon the creator +and subsequent owner(s) (each and all, an "owner") of an original work of +authorship and/or a database (each, a "Work"). + +Certain owners wish to permanently relinquish those rights to a Work for +the purpose of contributing to a commons of creative, cultural and +scientific works ("Commons") that the public can reliably and without fear +of later claims of infringement build upon, modify, incorporate in other +works, reuse and redistribute as freely as possible in any form whatsoever +and for any purposes, including without limitation commercial purposes. +These owners may contribute to the Commons to promote the ideal of a free +culture and the further production of creative, cultural and scientific +works, or to gain reputation or greater distribution for their Work in +part through the use and efforts of others. + +For these and/or other purposes and motivations, and without any +expectation of additional consideration or compensation, the person +associating CC0 with a Work (the "Affirmer"), to the extent that he or she +is an owner of Copyright and Related Rights in the Work, voluntarily +elects to apply CC0 to the Work and publicly distribute the Work under its +terms, with knowledge of his or her Copyright and Related Rights in the +Work and the meaning and intended legal effect of CC0 on those rights. + +1. Copyright and Related Rights. A Work made available under CC0 may be +protected by copyright and related or neighboring rights ("Copyright and +Related Rights"). Copyright and Related Rights include, but are not +limited to, the following: + + i. the right to reproduce, adapt, distribute, perform, display, + communicate, and translate a Work; + ii. moral rights retained by the original author(s) and/or performer(s); +iii. publicity and privacy rights pertaining to a person's image or + likeness depicted in a Work; + iv. rights protecting against unfair competition in regards to a Work, + subject to the limitations in paragraph 4(a), below; + v. rights protecting the extraction, dissemination, use and reuse of data + in a Work; + vi. database rights (such as those arising under Directive 96/9/EC of the + European Parliament and of the Council of 11 March 1996 on the legal + protection of databases, and under any national implementation + thereof, including any amended or successor version of such + directive); and +vii. other similar, equivalent or corresponding rights throughout the + world based on applicable law or treaty, and any national + implementations thereof. + +2. Waiver. To the greatest extent permitted by, but not in contravention +of, applicable law, Affirmer hereby overtly, fully, permanently, +irrevocably and unconditionally waives, abandons, and surrenders all of +Affirmer's Copyright and Related Rights and associated claims and causes +of action, whether now known or unknown (including existing as well as +future claims and causes of action), in the Work (i) in all territories +worldwide, (ii) for the maximum duration provided by applicable law or +treaty (including future time extensions), (iii) in any current or future +medium and for any number of copies, and (iv) for any purpose whatsoever, +including without limitation commercial, advertising or promotional +purposes (the "Waiver"). Affirmer makes the Waiver for the benefit of each +member of the public at large and to the detriment of Affirmer's heirs and +successors, fully intending that such Waiver shall not be subject to +revocation, rescission, cancellation, termination, or any other legal or +equitable action to disrupt the quiet enjoyment of the Work by the public +as contemplated by Affirmer's express Statement of Purpose. + +3. Public License Fallback. Should any part of the Waiver for any reason +be judged legally invalid or ineffective under applicable law, then the +Waiver shall be preserved to the maximum extent permitted taking into +account Affirmer's express Statement of Purpose. In addition, to the +extent the Waiver is so judged Affirmer hereby grants to each affected +person a royalty-free, non transferable, non sublicensable, non exclusive, +irrevocable and unconditional license to exercise Affirmer's Copyright and +Related Rights in the Work (i) in all territories worldwide, (ii) for the +maximum duration provided by applicable law or treaty (including future +time extensions), (iii) in any current or future medium and for any number +of copies, and (iv) for any purpose whatsoever, including without +limitation commercial, advertising or promotional purposes (the +"License"). The License shall be deemed effective as of the date CC0 was +applied by Affirmer to the Work. Should any part of the License for any +reason be judged legally invalid or ineffective under applicable law, such +partial invalidity or ineffectiveness shall not invalidate the remainder +of the License, and in such case Affirmer hereby affirms that he or she +will not (i) exercise any of his or her remaining Copyright and Related +Rights in the Work or (ii) assert any associated claims and causes of +action with respect to the Work, in either case contrary to Affirmer's +express Statement of Purpose. + +4. Limitations and Disclaimers. + + a. No trademark or patent rights held by Affirmer are waived, abandoned, + surrendered, licensed or otherwise affected by this document. + b. Affirmer offers the Work as-is and makes no representations or + warranties of any kind concerning the Work, express, implied, + statutory or otherwise, including without limitation warranties of + title, merchantability, fitness for a particular purpose, non + infringement, or the absence of latent or other defects, accuracy, or + the present or absence of errors, whether or not discoverable, all to + the greatest extent permissible under applicable law. + c. Affirmer disclaims responsibility for clearing rights of other persons + that may apply to the Work or any use thereof, including without + limitation any person's Copyright and Related Rights in the Work. + Further, Affirmer disclaims responsibility for obtaining any necessary + consents, permissions or other rights required for any use of the + Work. + d. Affirmer understands and acknowledges that Creative Commons is not a + party to this document and has no duty or obligation with respect to + this CC0 or use of the Work. \ No newline at end of file diff --git a/README.md b/README.md index e61602c..02b59dd 100644 --- a/README.md +++ b/README.md @@ -39,4 +39,10 @@ cp .env.template .env index = main ``` +# License + + +Configuration and documentation licensed subject to [CC0](LICENSE-CC0) + +Code and scripts licensed subject to [BSD-2-Clause](LICENSE-BSD2) \ No newline at end of file diff --git a/clair-whitelist.yml b/clair-whitelist.yml index 036c034..979a352 100644 --- a/clair-whitelist.yml +++ b/clair-whitelist.yml @@ -1,3 +1,11 @@ +#Splunk Connect for Syslog (SC4S) by Splunk, Inc. +# +#To the extent possible under law, the person who associated CC0 with +#Splunk Connect for Syslog (SC4S) has waived all copyright and related or neighboring rights +#to Splunk Connect for Syslog (SC4S). +# +#You should have received a copy of the CC0 legalcode along with this +#work. If not, see . generalwhitelist: RHSA-2019:1619: False Positive RHSA-2018:0654: False Positive diff --git a/clair_to_junit_parser.py b/clair_to_junit_parser.py index e7618cd..7dbc220 100644 --- a/clair_to_junit_parser.py +++ b/clair_to_junit_parser.py @@ -1,3 +1,8 @@ +#Copyright 2019 Splunk, Inc. +# +#Use of this source code is governed by a BSD-2-clause-style +#license that can be found in the LICENSE-BSD2 file or at +#https://opensource.org/licenses/BSD-2-Clause import json from junit_xml import TestSuite, TestCase import os diff --git a/demo-with-compose.sh b/demo-with-compose.sh index a2f3371..86c0fbf 100755 --- a/demo-with-compose.sh +++ b/demo-with-compose.sh @@ -1,4 +1,9 @@ #!/usr/bin/env bash +#Copyright 2019 Splunk, Inc. +# +#Use of this source code is governed by a BSD-2-clause-style +#license that can be found in the LICENSE-BSD2 file or at +#https://opensource.org/licenses/BSD-2-Clause mkdir test-results docker volume create sc4s-tests diff --git a/docker-compose.yml b/docker-compose.yml index 97ce5e8..cf96c95 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -1,3 +1,11 @@ +#Splunk Connect for Syslog (SC4S) by Splunk, Inc. +# +#To the extent possible under law, the person who associated CC0 with +#Splunk Connect for Syslog (SC4S) has waived all copyright and related or neighboring rights +#to Splunk Connect for Syslog (SC4S). +# +#You should have received a copy of the CC0 legalcode along with this +#work. If not, see . version: "3" services: test: diff --git a/package/Dockerfile b/package/Dockerfile index 2c622a1..f3b9f96 100644 --- a/package/Dockerfile +++ b/package/Dockerfile @@ -1,3 +1,11 @@ +#Splunk Connect for Syslog (SC4S) by Splunk, Inc. +# +#To the extent possible under law, the person who associated CC0 with +#Splunk Connect for Syslog (SC4S) has waived all copyright and related or neighboring rights +#to Splunk Connect for Syslog (SC4S). +# +#You should have received a copy of the CC0 legalcode along with this +#work. If not, see . FROM registry.access.redhat.com/rhel7/rhel ARG RH_ORG diff --git a/package/confluent.repo b/package/confluent.repo index 1627e8d..26ecf54 100644 --- a/package/confluent.repo +++ b/package/confluent.repo @@ -1,3 +1,11 @@ +#Splunk Connect for Syslog (SC4S) by Splunk, Inc. +# +#To the extent possible under law, the person who associated CC0 with +#Splunk Connect for Syslog (SC4S) has waived all copyright and related or neighboring rights +#to Splunk Connect for Syslog (SC4S). +# +#You should have received a copy of the CC0 legalcode along with this +#work. If not, see . [Confluent.dist] name=Confluent repository (dist) baseurl=https://packages.confluent.io/rpm/5.2/7 diff --git a/package/etc/syslog-ng.conf b/package/etc/syslog-ng.conf index be2e87a..e96a65c 100755 --- a/package/etc/syslog-ng.conf +++ b/package/etc/syslog-ng.conf @@ -1,4 +1,12 @@ @version:3.22 +#Splunk Connect for Syslog (SC4S) by Splunk, Inc. +# +#To the extent possible under law, the person who associated CC0 with +#Splunk Connect for Syslog (SC4S) has waived all copyright and related or neighboring rights +#to Splunk Connect for Syslog (SC4S). +# +#You should have received a copy of the CC0 legalcode along with this +#work. If not, see . # syslog-ng configuration file. # diff --git a/package/goss.yaml b/package/goss.yaml index 5c1893e..83c913b 100644 --- a/package/goss.yaml +++ b/package/goss.yaml @@ -1,3 +1,11 @@ +#Splunk Connect for Syslog (SC4S) by Splunk, Inc. +# +#To the extent possible under law, the person who associated CC0 with +#Splunk Connect for Syslog (SC4S) has waived all copyright and related or neighboring rights +#to Splunk Connect for Syslog (SC4S). +# +#You should have received a copy of the CC0 legalcode along with this +#work. If not, see . process: syslog-ng: running: true diff --git a/package/sbin/entrypoint.sh b/package/sbin/entrypoint.sh index 7a7b0aa..c9d27f7 100755 --- a/package/sbin/entrypoint.sh +++ b/package/sbin/entrypoint.sh @@ -1,5 +1,9 @@ #!/opt/rh/rh-python36/root/usr/bin/dumb-init /bin/bash - +#Copyright 2019 Splunk, Inc. +# +#Use of this source code is governed by a BSD-2-clause-style +#license that can be found in the LICENSE-BSD2 file or at +#https://opensource.org/licenses/BSD-2-Clause #Run syslog mkdir /opt/syslog-ng/var rm /opt/syslog-ng/var/syslog-ng.ctl || true diff --git a/package/sbin/goss.yaml b/package/sbin/goss.yaml index abd12fb..7d1cd7d 100644 --- a/package/sbin/goss.yaml +++ b/package/sbin/goss.yaml @@ -1,3 +1,11 @@ +#Splunk Connect for Syslog (SC4S) by Splunk, Inc. +# +#To the extent possible under law, the person who associated CC0 with +#Splunk Connect for Syslog (SC4S) has waived all copyright and related or neighboring rights +#to Splunk Connect for Syslog (SC4S). +# +#You should have received a copy of the CC0 legalcode along with this +#work. If not, see . process: syslog-ng: running: true diff --git a/package/scripts/splunkmetrics.sh b/package/scripts/splunkmetrics.sh index d62014d..7017d88 100755 --- a/package/scripts/splunkmetrics.sh +++ b/package/scripts/splunkmetrics.sh @@ -1,4 +1,9 @@ #!/bin/bash +#Copyright 2019 Splunk, Inc. +# +#Use of this source code is governed by a BSD-2-clause-style +#license that can be found in the LICENSE-BSD2 file or at +#https://opensource.org/licenses/BSD-2-Clause sleep 30 while sleep 10 do diff --git a/package/scripts/switch_transport.sh b/package/scripts/switch_transport.sh index 15863c3..f942d44 100755 --- a/package/scripts/switch_transport.sh +++ b/package/scripts/switch_transport.sh @@ -1,4 +1,9 @@ #!/bin/bash +#Copyright 2019 Splunk, Inc. +# +#Use of this source code is governed by a BSD-2-clause-style +#license that can be found in the LICENSE-BSD2 file or at +#https://opensource.org/licenses/BSD-2-Clause # Script to change all filters to use selected transport (UF, HEC, or kafka). # If one or more filters uses a transport different from all the others, they will need to be diff --git a/requirements.txt b/requirements.txt index 866d712..345c370 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,3 +1,11 @@ +#Splunk Connect for Syslog (SC4S) by Splunk, Inc. +# +#To the extent possible under law, the person who associated CC0 with +#Splunk Connect for Syslog (SC4S) has waived all copyright and related or neighboring rights +#to Splunk Connect for Syslog (SC4S). +# +#You should have received a copy of the CC0 legalcode along with this +#work. If not, see . -r ./tests/requirements.txt junit_xml argparse diff --git a/test-with-compose.sh b/test-with-compose.sh index f426220..b1050aa 100755 --- a/test-with-compose.sh +++ b/test-with-compose.sh @@ -1,4 +1,9 @@ #!/usr/bin/env bash +#Copyright 2019 Splunk, Inc. +# +#Use of this source code is governed by a BSD-2-clause-style +#license that can be found in the LICENSE-BSD2 file or at +#https://opensource.org/licenses/BSD-2-Clause mkdir test-results docker volume create sc4s-tests diff --git a/tests/Dockerfile b/tests/Dockerfile index 36fa35e..cb630f3 100644 --- a/tests/Dockerfile +++ b/tests/Dockerfile @@ -1,3 +1,11 @@ +#Splunk Connect for Syslog (SC4S) by Splunk, Inc. +# +#To the extent possible under law, the person who associated CC0 with +#Splunk Connect for Syslog (SC4S) has waived all copyright and related or neighboring rights +#to Splunk Connect for Syslog (SC4S). +# +#You should have received a copy of the CC0 legalcode along with this +#work. If not, see . FROM python:3.7 COPY requirements.txt / diff --git a/tests/requirements.txt b/tests/requirements.txt index 199f49b..cc706aa 100644 --- a/tests/requirements.txt +++ b/tests/requirements.txt @@ -1,3 +1,11 @@ +#Splunk Connect for Syslog (SC4S) by Splunk, Inc. +# +#To the extent possible under law, the person who associated CC0 with +#Splunk Connect for Syslog (SC4S) has waived all copyright and related or neighboring rights +#to Splunk Connect for Syslog (SC4S). +# +#You should have received a copy of the CC0 legalcode along with this +#work. If not, see . pytest jinja2 jinja2-time diff --git a/tests/test_poc.py b/tests/test_poc.py index e04aa01..586d6ba 100644 --- a/tests/test_poc.py +++ b/tests/test_poc.py @@ -1,3 +1,8 @@ +#Copyright 2019 Splunk, Inc. +# +#Use of this source code is governed by a BSD-2-clause-style +#license that can be found in the LICENSE-BSD2 file or at +#https://opensource.org/licenses/BSD-2-Clause import random import socket import urllib.request