Skip to content

Commit 03f9708

Browse files
committed
Mert push fork feat/ge branch 'main' of github.com:elastic/elastic-agent into feat/rollback_flow
2 parents 8b75ccd + e629b9e commit 03f9708

27 files changed

+1568
-26
lines changed

NOTICE-fips.txt

Lines changed: 237 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -30135,6 +30135,218 @@ IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
3013530135
CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
3013630136

3013730137

30138+
--------------------------------------------------------------------------------
30139+
Dependency : github.com/aws/aws-sdk-go
30140+
Version: v1.55.7
30141+
Licence type (autodetected): Apache-2.0
30142+
--------------------------------------------------------------------------------
30143+
30144+
Contents of probable licence file $GOMODCACHE/github.com/aws/[email protected]/LICENSE.txt:
30145+
30146+
30147+
Apache License
30148+
Version 2.0, January 2004
30149+
http://www.apache.org/licenses/
30150+
30151+
TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
30152+
30153+
1. Definitions.
30154+
30155+
"License" shall mean the terms and conditions for use, reproduction,
30156+
and distribution as defined by Sections 1 through 9 of this document.
30157+
30158+
"Licensor" shall mean the copyright owner or entity authorized by
30159+
the copyright owner that is granting the License.
30160+
30161+
"Legal Entity" shall mean the union of the acting entity and all
30162+
other entities that control, are controlled by, or are under common
30163+
control with that entity. For the purposes of this definition,
30164+
"control" means (i) the power, direct or indirect, to cause the
30165+
direction or management of such entity, whether by contract or
30166+
otherwise, or (ii) ownership of fifty percent (50%) or more of the
30167+
outstanding shares, or (iii) beneficial ownership of such entity.
30168+
30169+
"You" (or "Your") shall mean an individual or Legal Entity
30170+
exercising permissions granted by this License.
30171+
30172+
"Source" form shall mean the preferred form for making modifications,
30173+
including but not limited to software source code, documentation
30174+
source, and configuration files.
30175+
30176+
"Object" form shall mean any form resulting from mechanical
30177+
transformation or translation of a Source form, including but
30178+
not limited to compiled object code, generated documentation,
30179+
and conversions to other media types.
30180+
30181+
"Work" shall mean the work of authorship, whether in Source or
30182+
Object form, made available under the License, as indicated by a
30183+
copyright notice that is included in or attached to the work
30184+
(an example is provided in the Appendix below).
30185+
30186+
"Derivative Works" shall mean any work, whether in Source or Object
30187+
form, that is based on (or derived from) the Work and for which the
30188+
editorial revisions, annotations, elaborations, or other modifications
30189+
represent, as a whole, an original work of authorship. For the purposes
30190+
of this License, Derivative Works shall not include works that remain
30191+
separable from, or merely link (or bind by name) to the interfaces of,
30192+
the Work and Derivative Works thereof.
30193+
30194+
"Contribution" shall mean any work of authorship, including
30195+
the original version of the Work and any modifications or additions
30196+
to that Work or Derivative Works thereof, that is intentionally
30197+
submitted to Licensor for inclusion in the Work by the copyright owner
30198+
or by an individual or Legal Entity authorized to submit on behalf of
30199+
the copyright owner. For the purposes of this definition, "submitted"
30200+
means any form of electronic, verbal, or written communication sent
30201+
to the Licensor or its representatives, including but not limited to
30202+
communication on electronic mailing lists, source code control systems,
30203+
and issue tracking systems that are managed by, or on behalf of, the
30204+
Licensor for the purpose of discussing and improving the Work, but
30205+
excluding communication that is conspicuously marked or otherwise
30206+
designated in writing by the copyright owner as "Not a Contribution."
30207+
30208+
"Contributor" shall mean Licensor and any individual or Legal Entity
30209+
on behalf of whom a Contribution has been received by Licensor and
30210+
subsequently incorporated within the Work.
30211+
30212+
2. Grant of Copyright License. Subject to the terms and conditions of
30213+
this License, each Contributor hereby grants to You a perpetual,
30214+
worldwide, non-exclusive, no-charge, royalty-free, irrevocable
30215+
copyright license to reproduce, prepare Derivative Works of,
30216+
publicly display, publicly perform, sublicense, and distribute the
30217+
Work and such Derivative Works in Source or Object form.
30218+
30219+
3. Grant of Patent License. Subject to the terms and conditions of
30220+
this License, each Contributor hereby grants to You a perpetual,
30221+
worldwide, non-exclusive, no-charge, royalty-free, irrevocable
30222+
(except as stated in this section) patent license to make, have made,
30223+
use, offer to sell, sell, import, and otherwise transfer the Work,
30224+
where such license applies only to those patent claims licensable
30225+
by such Contributor that are necessarily infringed by their
30226+
Contribution(s) alone or by combination of their Contribution(s)
30227+
with the Work to which such Contribution(s) was submitted. If You
30228+
institute patent litigation against any entity (including a
30229+
cross-claim or counterclaim in a lawsuit) alleging that the Work
30230+
or a Contribution incorporated within the Work constitutes direct
30231+
or contributory patent infringement, then any patent licenses
30232+
granted to You under this License for that Work shall terminate
30233+
as of the date such litigation is filed.
30234+
30235+
4. Redistribution. You may reproduce and distribute copies of the
30236+
Work or Derivative Works thereof in any medium, with or without
30237+
modifications, and in Source or Object form, provided that You
30238+
meet the following conditions:
30239+
30240+
(a) You must give any other recipients of the Work or
30241+
Derivative Works a copy of this License; and
30242+
30243+
(b) You must cause any modified files to carry prominent notices
30244+
stating that You changed the files; and
30245+
30246+
(c) You must retain, in the Source form of any Derivative Works
30247+
that You distribute, all copyright, patent, trademark, and
30248+
attribution notices from the Source form of the Work,
30249+
excluding those notices that do not pertain to any part of
30250+
the Derivative Works; and
30251+
30252+
(d) If the Work includes a "NOTICE" text file as part of its
30253+
distribution, then any Derivative Works that You distribute must
30254+
include a readable copy of the attribution notices contained
30255+
within such NOTICE file, excluding those notices that do not
30256+
pertain to any part of the Derivative Works, in at least one
30257+
of the following places: within a NOTICE text file distributed
30258+
as part of the Derivative Works; within the Source form or
30259+
documentation, if provided along with the Derivative Works; or,
30260+
within a display generated by the Derivative Works, if and
30261+
wherever such third-party notices normally appear. The contents
30262+
of the NOTICE file are for informational purposes only and
30263+
do not modify the License. You may add Your own attribution
30264+
notices within Derivative Works that You distribute, alongside
30265+
or as an addendum to the NOTICE text from the Work, provided
30266+
that such additional attribution notices cannot be construed
30267+
as modifying the License.
30268+
30269+
You may add Your own copyright statement to Your modifications and
30270+
may provide additional or different license terms and conditions
30271+
for use, reproduction, or distribution of Your modifications, or
30272+
for any such Derivative Works as a whole, provided Your use,
30273+
reproduction, and distribution of the Work otherwise complies with
30274+
the conditions stated in this License.
30275+
30276+
5. Submission of Contributions. Unless You explicitly state otherwise,
30277+
any Contribution intentionally submitted for inclusion in the Work
30278+
by You to the Licensor shall be under the terms and conditions of
30279+
this License, without any additional terms or conditions.
30280+
Notwithstanding the above, nothing herein shall supersede or modify
30281+
the terms of any separate license agreement you may have executed
30282+
with Licensor regarding such Contributions.
30283+
30284+
6. Trademarks. This License does not grant permission to use the trade
30285+
names, trademarks, service marks, or product names of the Licensor,
30286+
except as required for reasonable and customary use in describing the
30287+
origin of the Work and reproducing the content of the NOTICE file.
30288+
30289+
7. Disclaimer of Warranty. Unless required by applicable law or
30290+
agreed to in writing, Licensor provides the Work (and each
30291+
Contributor provides its Contributions) on an "AS IS" BASIS,
30292+
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
30293+
implied, including, without limitation, any warranties or conditions
30294+
of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
30295+
PARTICULAR PURPOSE. You are solely responsible for determining the
30296+
appropriateness of using or redistributing the Work and assume any
30297+
risks associated with Your exercise of permissions under this License.
30298+
30299+
8. Limitation of Liability. In no event and under no legal theory,
30300+
whether in tort (including negligence), contract, or otherwise,
30301+
unless required by applicable law (such as deliberate and grossly
30302+
negligent acts) or agreed to in writing, shall any Contributor be
30303+
liable to You for damages, including any direct, indirect, special,
30304+
incidental, or consequential damages of any character arising as a
30305+
result of this License or out of the use or inability to use the
30306+
Work (including but not limited to damages for loss of goodwill,
30307+
work stoppage, computer failure or malfunction, or any and all
30308+
other commercial damages or losses), even if such Contributor
30309+
has been advised of the possibility of such damages.
30310+
30311+
9. Accepting Warranty or Additional Liability. While redistributing
30312+
the Work or Derivative Works thereof, You may choose to offer,
30313+
and charge a fee for, acceptance of support, warranty, indemnity,
30314+
or other liability obligations and/or rights consistent with this
30315+
License. However, in accepting such obligations, You may act only
30316+
on Your own behalf and on Your sole responsibility, not on behalf
30317+
of any other Contributor, and only if You agree to indemnify,
30318+
defend, and hold each Contributor harmless for any liability
30319+
incurred by, or claims asserted against, such Contributor by reason
30320+
of your accepting any such warranty or additional liability.
30321+
30322+
END OF TERMS AND CONDITIONS
30323+
30324+
APPENDIX: How to apply the Apache License to your work.
30325+
30326+
To apply the Apache License to your work, attach the following
30327+
boilerplate notice, with the fields enclosed by brackets "[]"
30328+
replaced with your own identifying information. (Don't include
30329+
the brackets!) The text should be enclosed in the appropriate
30330+
comment syntax for the file format. We also recommend that a
30331+
file or class name and description of purpose be included on the
30332+
same "printed page" as the copyright notice for easier
30333+
identification within third-party archives.
30334+
30335+
Copyright [yyyy] [name of copyright owner]
30336+
30337+
Licensed under the Apache License, Version 2.0 (the "License");
30338+
you may not use this file except in compliance with the License.
30339+
You may obtain a copy of the License at
30340+
30341+
http://www.apache.org/licenses/LICENSE-2.0
30342+
30343+
Unless required by applicable law or agreed to in writing, software
30344+
distributed under the License is distributed on an "AS IS" BASIS,
30345+
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
30346+
See the License for the specific language governing permissions and
30347+
limitations under the License.
30348+
30349+
3013830350
--------------------------------------------------------------------------------
3013930351
Dependency : github.com/aws/aws-sdk-go-v2
3014030352
Version: v1.36.4
@@ -42539,11 +42751,11 @@ Contents of probable licence file $GOMODCACHE/github.com/elastic/[email protected]/LI
4253942751

4254042752
--------------------------------------------------------------------------------
4254142753
Dependency : github.com/elastic/mito
42542-
Version: v1.19.0
42754+
Version: v1.20.0
4254342755
Licence type (autodetected): Apache-2.0
4254442756
--------------------------------------------------------------------------------
4254542757

42546-
Contents of probable licence file $GOMODCACHE/github.com/elastic/mito@v1.19.0/LICENSE:
42758+
Contents of probable licence file $GOMODCACHE/github.com/elastic/mito@v1.20.0/LICENSE:
4254742759

4254842760

4254942761
Apache License
@@ -54941,6 +55153,29 @@ Contents of probable licence file $GOMODCACHE/github.com/jaypipes/[email protected]/C
5494155153

5494255154

5494355155

55156+
--------------------------------------------------------------------------------
55157+
Dependency : github.com/jmespath/go-jmespath
55158+
Version: v0.4.0
55159+
Licence type (autodetected): Apache-2.0
55160+
--------------------------------------------------------------------------------
55161+
55162+
Contents of probable licence file $GOMODCACHE/github.com/jmespath/[email protected]/LICENSE:
55163+
55164+
Copyright 2015 James Saryerwinnie
55165+
55166+
Licensed under the Apache License, Version 2.0 (the "License");
55167+
you may not use this file except in compliance with the License.
55168+
You may obtain a copy of the License at
55169+
55170+
http://www.apache.org/licenses/LICENSE-2.0
55171+
55172+
Unless required by applicable law or agreed to in writing, software
55173+
distributed under the License is distributed on an "AS IS" BASIS,
55174+
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
55175+
See the License for the specific language governing permissions and
55176+
limitations under the License.
55177+
55178+
5494455179
--------------------------------------------------------------------------------
5494555180
Dependency : github.com/jonboulle/clockwork
5494655181
Version: v0.5.0

NOTICE.txt

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -31531,11 +31531,11 @@ Contents of probable licence file $GOMODCACHE/github.com/aws/aws-msk-iam-sasl-si
3153131531

3153231532
--------------------------------------------------------------------------------
3153331533
Dependency : github.com/aws/aws-sdk-go
31534-
Version: v1.55.6
31534+
Version: v1.55.7
3153531535
Licence type (autodetected): Apache-2.0
3153631536
--------------------------------------------------------------------------------
3153731537

31538-
Contents of probable licence file $GOMODCACHE/github.com/aws/[email protected].6/LICENSE.txt:
31538+
Contents of probable licence file $GOMODCACHE/github.com/aws/[email protected].7/LICENSE.txt:
3153931539

3154031540

3154131541
Apache License
@@ -44692,11 +44692,11 @@ Contents of probable licence file $GOMODCACHE/github.com/elastic/[email protected]/LI
4469244692

4469344693
--------------------------------------------------------------------------------
4469444694
Dependency : github.com/elastic/mito
44695-
Version: v1.19.0
44695+
Version: v1.20.0
4469644696
Licence type (autodetected): Apache-2.0
4469744697
--------------------------------------------------------------------------------
4469844698

44699-
Contents of probable licence file $GOMODCACHE/github.com/elastic/mito@v1.19.0/LICENSE:
44699+
Contents of probable licence file $GOMODCACHE/github.com/elastic/mito@v1.20.0/LICENSE:
4470044700

4470144701

4470244702
Apache License

deploy/helm/elastic-agent/README.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -63,6 +63,7 @@ The chart built-in [kubernetes integration](https://docs.elastic.co/integrations
6363
| Key | Type | Default | Description |
6464
|-----|------|---------|-------------|
6565
| kubernetes.enabled | bool | `true` | enable Kubernetes integration. |
66+
| kubernetes.onboardingID | string | `""` | Specify the onboarding ID for a quick start flow. |
6667
| kubernetes.output | string | `"default"` | name of the output used in kubernetes integration. Note that this output needs to be defined in [outputs](#1-outputs) |
6768
| kubernetes.namespace | string | `"default"` | kubernetes namespace |
6869
| kubernetes.hints.enabled | bool | `false` | enable [elastic-agent autodiscovery](https://www.elastic.co/guide/en/fleet/current/elastic-agent-kubernetes-autodiscovery.html) feature |
Lines changed: 57 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,57 @@
1+
# Example: Kubernetes Integration with default chart values and onboarding-id
2+
3+
In this example we install the built-in `kubernetes` integration with the default built-in values and an onboarding-id for quick-start flows .
4+
5+
## Prerequisites:
6+
1. Build the dependencies of the Helm chart
7+
```console
8+
helm repo add prometheus-community https://prometheus-community.github.io/helm-charts
9+
helm dependency build ../../
10+
```
11+
2. A k8s secret that contains the connection details to an Elasticsearch cluster such as the URL and the API key ([Kibana - Creating API Keys](https://www.elastic.co/guide/en/kibana/current/api-keys.html)):
12+
```console
13+
kubectl create secret generic es-api-secret \
14+
--from-literal=api_key=... \
15+
--from-literal=url=...
16+
```
17+
18+
3. `kubernetes` integration assets installed through Kibana ([Kibana - Install and uninstall Elastic Agent integration assets](https://www.elastic.co/guide/en/fleet/current/install-uninstall-integration-assets.html))
19+
20+
## Run:
21+
22+
#### Public image registry:
23+
```console
24+
helm install elastic-agent ../../ \
25+
--set kubernetes.onboardingID: "my-onboarding-id"
26+
--set kubernetes.enabled: true \
27+
--set agent.unprivileged: true \
28+
--set outputs.default.type=ESSecretAuthAPI \
29+
--set outputs.default.secretName=es-api-secret
30+
```
31+
32+
33+
#### Private image registry:
34+
Create secret with the contents of docker auth config
35+
```
36+
kubectl create secret generic regcred --from-file=.dockerconfigjson=<your home folder here>/.docker/config.json --type=kubernetes.io/dockerconfigjson
37+
```
38+
39+
Install elastic-agent
40+
```console
41+
helm install elastic-agent ../../ \
42+
--set kubernetes.onboardingID: "my-onboarding-id"
43+
--set kubernetes.enabled: true \
44+
--set agent.unprivileged: true \
45+
--set 'agent.imagePullSecrets[0].name=regcred' \
46+
--set outputs.default.type=ESSecretAuthAPI \
47+
--set outputs.default.secretName=es-api-secret
48+
```
49+
50+
## Validate:
51+
52+
1. `kube-state metrics` is installed with this command `kubectl get deployments -n kube-system kube-state-metrics`.
53+
2. The Kibana `kubernetes`-related dashboards should start showing up the respective info.
54+
55+
## Note:
56+
57+
1. If you want to disable kube-state-metrics installation with the elastic-agent Helm chart, you can set `kube-state-metrics.enabled=false` in the Helm chart. The helm chart will use the value of `kubernetes.state.host` to configure the elastic-agent input.
Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
kubernetes:
2+
onboardingID: "my-onboarding-id"
3+
enabled: true
4+
5+
agent:
6+
unprivileged: true

0 commit comments

Comments
 (0)