Skip to content

Commit a74bbcf

Browse files
mergify[bot]khushijain21swiatekm
authored
[9.1] (backport #9257) [beatreceivers] Integrate beatsauthextension (#9971)
* [beatreceivers] Integrate beatsauthextension (#9257) * [beatreceivers] Integrate beatsauthextension * add test cases * final tests and this works * update * remove agent.port * mage otel:readme * address review comments * check is ssl.TLS is non-nil * address review comments * remove port * make notice for beatsauth * update beatsauthextension * beatsauth final test * final fix * add beatsauthextension test * Address comments * fix test * fix test * change comment * update beatsauthextension * Update internal/pkg/otel/translate/otelconfig.go Co-authored-by: Craig MacKenzie <craig.mackenzie@elastic.co> * fix ci * add a test that a unique extension is created per output * fix ci * add comment * add better test * fix test --------- Co-authored-by: Craig MacKenzie <craig.mackenzie@elastic.co> (cherry picked from commit 779fafd) # Conflicts: # internal/pkg/otel/README.md # internal/pkg/otel/manager/manager.go # internal/pkg/otel/manager/manager_test.go # internal/pkg/otel/translate/otelconfig.go # internal/pkg/otel/translate/otelconfig_test.go * fix conflicts * add logger --------- Co-authored-by: Khushi Jain <khushi.jain@elastic.co> Co-authored-by: Mikołaj Świątek <mail@mikolajswiatek.com>
1 parent 2c264fe commit a74bbcf

File tree

10 files changed

+936
-100
lines changed

10 files changed

+936
-100
lines changed

NOTICE-fips.txt

Lines changed: 211 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3152,6 +3152,217 @@ Contents of probable licence file $GOMODCACHE/github.com/elastic/opentelemetry-c
31523152
limitations under the License.
31533153

31543154

3155+
--------------------------------------------------------------------------------
3156+
Dependency : github.com/elastic/opentelemetry-collector-components/extension/beatsauthextension
3157+
Version: v0.2.0
3158+
Licence type (autodetected): Apache-2.0
3159+
--------------------------------------------------------------------------------
3160+
3161+
Contents of probable licence file $GOMODCACHE/github.com/elastic/opentelemetry-collector-components/extension/beatsauthextension@v0.2.0/LICENSE:
3162+
3163+
Apache License
3164+
Version 2.0, January 2004
3165+
http://www.apache.org/licenses/
3166+
3167+
TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
3168+
3169+
1. Definitions.
3170+
3171+
"License" shall mean the terms and conditions for use, reproduction,
3172+
and distribution as defined by Sections 1 through 9 of this document.
3173+
3174+
"Licensor" shall mean the copyright owner or entity authorized by
3175+
the copyright owner that is granting the License.
3176+
3177+
"Legal Entity" shall mean the union of the acting entity and all
3178+
other entities that control, are controlled by, or are under common
3179+
control with that entity. For the purposes of this definition,
3180+
"control" means (i) the power, direct or indirect, to cause the
3181+
direction or management of such entity, whether by contract or
3182+
otherwise, or (ii) ownership of fifty percent (50%) or more of the
3183+
outstanding shares, or (iii) beneficial ownership of such entity.
3184+
3185+
"You" (or "Your") shall mean an individual or Legal Entity
3186+
exercising permissions granted by this License.
3187+
3188+
"Source" form shall mean the preferred form for making modifications,
3189+
including but not limited to software source code, documentation
3190+
source, and configuration files.
3191+
3192+
"Object" form shall mean any form resulting from mechanical
3193+
transformation or translation of a Source form, including but
3194+
not limited to compiled object code, generated documentation,
3195+
and conversions to other media types.
3196+
3197+
"Work" shall mean the work of authorship, whether in Source or
3198+
Object form, made available under the License, as indicated by a
3199+
copyright notice that is included in or attached to the work
3200+
(an example is provided in the Appendix below).
3201+
3202+
"Derivative Works" shall mean any work, whether in Source or Object
3203+
form, that is based on (or derived from) the Work and for which the
3204+
editorial revisions, annotations, elaborations, or other modifications
3205+
represent, as a whole, an original work of authorship. For the purposes
3206+
of this License, Derivative Works shall not include works that remain
3207+
separable from, or merely link (or bind by name) to the interfaces of,
3208+
the Work and Derivative Works thereof.
3209+
3210+
"Contribution" shall mean any work of authorship, including
3211+
the original version of the Work and any modifications or additions
3212+
to that Work or Derivative Works thereof, that is intentionally
3213+
submitted to Licensor for inclusion in the Work by the copyright owner
3214+
or by an individual or Legal Entity authorized to submit on behalf of
3215+
the copyright owner. For the purposes of this definition, "submitted"
3216+
means any form of electronic, verbal, or written communication sent
3217+
to the Licensor or its representatives, including but not limited to
3218+
communication on electronic mailing lists, source code control systems,
3219+
and issue tracking systems that are managed by, or on behalf of, the
3220+
Licensor for the purpose of discussing and improving the Work, but
3221+
excluding communication that is conspicuously marked or otherwise
3222+
designated in writing by the copyright owner as "Not a Contribution."
3223+
3224+
"Contributor" shall mean Licensor and any individual or Legal Entity
3225+
on behalf of whom a Contribution has been received by Licensor and
3226+
subsequently incorporated within the Work.
3227+
3228+
2. Grant of Copyright License. Subject to the terms and conditions of
3229+
this License, each Contributor hereby grants to You a perpetual,
3230+
worldwide, non-exclusive, no-charge, royalty-free, irrevocable
3231+
copyright license to reproduce, prepare Derivative Works of,
3232+
publicly display, publicly perform, sublicense, and distribute the
3233+
Work and such Derivative Works in Source or Object form.
3234+
3235+
3. Grant of Patent License. Subject to the terms and conditions of
3236+
this License, each Contributor hereby grants to You a perpetual,
3237+
worldwide, non-exclusive, no-charge, royalty-free, irrevocable
3238+
(except as stated in this section) patent license to make, have made,
3239+
use, offer to sell, sell, import, and otherwise transfer the Work,
3240+
where such license applies only to those patent claims licensable
3241+
by such Contributor that are necessarily infringed by their
3242+
Contribution(s) alone or by combination of their Contribution(s)
3243+
with the Work to which such Contribution(s) was submitted. If You
3244+
institute patent litigation against any entity (including a
3245+
cross-claim or counterclaim in a lawsuit) alleging that the Work
3246+
or a Contribution incorporated within the Work constitutes direct
3247+
or contributory patent infringement, then any patent licenses
3248+
granted to You under this License for that Work shall terminate
3249+
as of the date such litigation is filed.
3250+
3251+
4. Redistribution. You may reproduce and distribute copies of the
3252+
Work or Derivative Works thereof in any medium, with or without
3253+
modifications, and in Source or Object form, provided that You
3254+
meet the following conditions:
3255+
3256+
(a) You must give any other recipients of the Work or
3257+
Derivative Works a copy of this License; and
3258+
3259+
(b) You must cause any modified files to carry prominent notices
3260+
stating that You changed the files; and
3261+
3262+
(c) You must retain, in the Source form of any Derivative Works
3263+
that You distribute, all copyright, patent, trademark, and
3264+
attribution notices from the Source form of the Work,
3265+
excluding those notices that do not pertain to any part of
3266+
the Derivative Works; and
3267+
3268+
(d) If the Work includes a "NOTICE" text file as part of its
3269+
distribution, then any Derivative Works that You distribute must
3270+
include a readable copy of the attribution notices contained
3271+
within such NOTICE file, excluding those notices that do not
3272+
pertain to any part of the Derivative Works, in at least one
3273+
of the following places: within a NOTICE text file distributed
3274+
as part of the Derivative Works; within the Source form or
3275+
documentation, if provided along with the Derivative Works; or,
3276+
within a display generated by the Derivative Works, if and
3277+
wherever such third-party notices normally appear. The contents
3278+
of the NOTICE file are for informational purposes only and
3279+
do not modify the License. You may add Your own attribution
3280+
notices within Derivative Works that You distribute, alongside
3281+
or as an addendum to the NOTICE text from the Work, provided
3282+
that such additional attribution notices cannot be construed
3283+
as modifying the License.
3284+
3285+
You may add Your own copyright statement to Your modifications and
3286+
may provide additional or different license terms and conditions
3287+
for use, reproduction, or distribution of Your modifications, or
3288+
for any such Derivative Works as a whole, provided Your use,
3289+
reproduction, and distribution of the Work otherwise complies with
3290+
the conditions stated in this License.
3291+
3292+
5. Submission of Contributions. Unless You explicitly state otherwise,
3293+
any Contribution intentionally submitted for inclusion in the Work
3294+
by You to the Licensor shall be under the terms and conditions of
3295+
this License, without any additional terms or conditions.
3296+
Notwithstanding the above, nothing herein shall supersede or modify
3297+
the terms of any separate license agreement you may have executed
3298+
with Licensor regarding such Contributions.
3299+
3300+
6. Trademarks. This License does not grant permission to use the trade
3301+
names, trademarks, service marks, or product names of the Licensor,
3302+
except as required for reasonable and customary use in describing the
3303+
origin of the Work and reproducing the content of the NOTICE file.
3304+
3305+
7. Disclaimer of Warranty. Unless required by applicable law or
3306+
agreed to in writing, Licensor provides the Work (and each
3307+
Contributor provides its Contributions) on an "AS IS" BASIS,
3308+
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
3309+
implied, including, without limitation, any warranties or conditions
3310+
of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
3311+
PARTICULAR PURPOSE. You are solely responsible for determining the
3312+
appropriateness of using or redistributing the Work and assume any
3313+
risks associated with Your exercise of permissions under this License.
3314+
3315+
8. Limitation of Liability. In no event and under no legal theory,
3316+
whether in tort (including negligence), contract, or otherwise,
3317+
unless required by applicable law (such as deliberate and grossly
3318+
negligent acts) or agreed to in writing, shall any Contributor be
3319+
liable to You for damages, including any direct, indirect, special,
3320+
incidental, or consequential damages of any character arising as a
3321+
result of this License or out of the use or inability to use the
3322+
Work (including but not limited to damages for loss of goodwill,
3323+
work stoppage, computer failure or malfunction, or any and all
3324+
other commercial damages or losses), even if such Contributor
3325+
has been advised of the possibility of such damages.
3326+
3327+
9. Accepting Warranty or Additional Liability. While redistributing
3328+
the Work or Derivative Works thereof, You may choose to offer,
3329+
and charge a fee for, acceptance of support, warranty, indemnity,
3330+
or other liability obligations and/or rights consistent with this
3331+
License. However, in accepting such obligations, You may act only
3332+
on Your own behalf and on Your sole responsibility, not on behalf
3333+
of any other Contributor, and only if You agree to indemnify,
3334+
defend, and hold each Contributor harmless for any liability
3335+
incurred by, or claims asserted against, such Contributor by reason
3336+
of your accepting any such warranty or additional liability.
3337+
3338+
END OF TERMS AND CONDITIONS
3339+
3340+
APPENDIX: How to apply the Apache License to your work.
3341+
3342+
To apply the Apache License to your work, attach the following
3343+
boilerplate notice, with the fields enclosed by brackets "[]"
3344+
replaced with your own identifying information. (Don't include
3345+
the brackets!) The text should be enclosed in the appropriate
3346+
comment syntax for the file format. We also recommend that a
3347+
file or class name and description of purpose be included on the
3348+
same "printed page" as the copyright notice for easier
3349+
identification within third-party archives.
3350+
3351+
Copyright 2018 Elasticsearch BV
3352+
3353+
Licensed under the Apache License, Version 2.0 (the "License");
3354+
you may not use this file except in compliance with the License.
3355+
You may obtain a copy of the License at
3356+
3357+
http://www.apache.org/licenses/LICENSE-2.0
3358+
3359+
Unless required by applicable law or agreed to in writing, software
3360+
distributed under the License is distributed on an "AS IS" BASIS,
3361+
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
3362+
See the License for the specific language governing permissions and
3363+
limitations under the License.
3364+
3365+
31553366
--------------------------------------------------------------------------------
31563367
Dependency : github.com/elastic/opentelemetry-collector-components/processor/elasticinframetricsprocessor
31573368
Version: v0.16.0

0 commit comments

Comments
 (0)