Skip to content

Commit 0cb2591

Browse files
gizasgizas
authored
Merge branch 'main' into logshints
2 parents dfb1945 + cb918df commit 0cb2591

File tree

7 files changed

+388
-608
lines changed

7 files changed

+388
-608
lines changed

‎NOTICE.txt

+142-354
Large diffs are not rendered by default.

‎deploy/kubernetes/elastic-agent-standalone-kubernetes.yaml

+8-14
Original file line numberDiff line numberDiff line change
@@ -692,16 +692,18 @@ spec:
692692
# Uncomment if using hints feature
693693
#initContainers:
694694
# - name: k8s-templates-downloader
695-
# image: busybox:1.28
696-
# command: ['sh']
695+
# image: docker.elastic.co/beats/elastic-agent:8.15.0
696+
# command: ['bash']
697697
# args:
698698
# - -c
699699
# - >-
700-
# mkdir -p /etc/elastic-agent/inputs.d &&
701-
# wget -O - https://github.com/elastic/elastic-agent/archive/8.15.tar.gz | tar xz -C /etc/elastic-agent/inputs.d --strip=5 "elastic-agent-8.15/deploy/kubernetes/elastic-agent-standalone/templates.d"
700+
# mkdir -p /usr/share/elastic-agent/state/inputs.d &&
701+
# curl -sL https://github.com/elastic/elastic-agent/archive/8.15.tar.gz | tar xz -C /usr/share/elastic-agent/state/inputs.d --strip=5 "elastic-agent-8.15/deploy/kubernetes/elastic-agent-standalone/templates.d"
702+
# securityContext:
703+
# runAsUser: 0
702704
# volumeMounts:
703-
# - name: external-inputs
704-
# mountPath: /etc/elastic-agent/inputs.d
705+
# - name: elastic-agent-state
706+
# mountPath: /usr/share/elastic-agent/state
705707
containers:
706708
- name: elastic-agent-standalone
707709
image: docker.elastic.co/beats/elastic-agent:8.15.0
@@ -725,8 +727,6 @@ spec:
725727
valueFrom:
726728
fieldRef:
727729
fieldPath: metadata.name
728-
- name: STATE_PATH
729-
value: "/etc/elastic-agent"
730730
# The following ELASTIC_NETINFO:false variable will disable the netinfo.enabled option of add-host-metadata processor. This will remove fields host.ip and host.mac.
731731
# For more info: https://www.elastic.co/guide/en/beats/metricbeat/current/add-host-metadata.html
732732
- name: ELASTIC_NETINFO
@@ -760,9 +760,6 @@ spec:
760760
mountPath: /etc/elastic-agent/agent.yml
761761
readOnly: true
762762
subPath: agent.yml
763-
# Uncomment if using hints feature
764-
#- name: external-inputs
765-
# mountPath: /etc/elastic-agent/inputs.d
766763
- name: proc
767764
mountPath: /hostfs/proc
768765
readOnly: true
@@ -793,9 +790,6 @@ spec:
793790
configMap:
794791
defaultMode: 0640
795792
name: agent-node-datastreams
796-
# Uncomment if using hints feature
797-
#- name: external-inputs
798-
# emptyDir: {}
799793
- name: proc
800794
hostPath:
801795
path: /proc

‎deploy/kubernetes/elastic-agent-standalone/elastic-agent-standalone-daemonset.yaml

+8-14
Original file line numberDiff line numberDiff line change
@@ -28,16 +28,18 @@ spec:
2828
# Uncomment if using hints feature
2929
#initContainers:
3030
# - name: k8s-templates-downloader
31-
# image: busybox:1.28
32-
# command: ['sh']
31+
# image: docker.elastic.co/beats/elastic-agent:%VERSION%
32+
# command: ['bash']
3333
# args:
3434
# - -c
3535
# - >-
36-
# mkdir -p /etc/elastic-agent/inputs.d &&
37-
# wget -O - https://github.com/elastic/elastic-agent/archive/%BRANCH%.tar.gz | tar xz -C /etc/elastic-agent/inputs.d --strip=5 "elastic-agent-%BRANCH%/deploy/kubernetes/elastic-agent-standalone/templates.d"
36+
# mkdir -p /usr/share/elastic-agent/state/inputs.d &&
37+
# curl -sL https://github.com/elastic/elastic-agent/archive/%BRANCH%.tar.gz | tar xz -C /usr/share/elastic-agent/state/inputs.d --strip=5 "elastic-agent-%BRANCH%/deploy/kubernetes/elastic-agent-standalone/templates.d"
38+
# securityContext:
39+
# runAsUser: 0
3840
# volumeMounts:
39-
# - name: external-inputs
40-
# mountPath: /etc/elastic-agent/inputs.d
41+
# - name: elastic-agent-state
42+
# mountPath: /usr/share/elastic-agent/state
4143
containers:
4244
- name: elastic-agent-standalone
4345
image: docker.elastic.co/beats/elastic-agent:%VERSION%
@@ -61,8 +63,6 @@ spec:
6163
valueFrom:
6264
fieldRef:
6365
fieldPath: metadata.name
64-
- name: STATE_PATH
65-
value: "/etc/elastic-agent"
6666
# The following ELASTIC_NETINFO:false variable will disable the netinfo.enabled option of add-host-metadata processor. This will remove fields host.ip and host.mac.
6767
# For more info: https://www.elastic.co/guide/en/beats/metricbeat/current/add-host-metadata.html
6868
- name: ELASTIC_NETINFO
@@ -96,9 +96,6 @@ spec:
9696
mountPath: /etc/elastic-agent/agent.yml
9797
readOnly: true
9898
subPath: agent.yml
99-
# Uncomment if using hints feature
100-
#- name: external-inputs
101-
# mountPath: /etc/elastic-agent/inputs.d
10299
- name: proc
103100
mountPath: /hostfs/proc
104101
readOnly: true
@@ -129,9 +126,6 @@ spec:
129126
configMap:
130127
defaultMode: 0640
131128
name: agent-node-datastreams
132-
# Uncomment if using hints feature
133-
#- name: external-inputs
134-
# emptyDir: {}
135129
- name: proc
136130
hostPath:
137131
path: /proc

‎go.mod

+72-66
Original file line numberDiff line numberDiff line change
@@ -41,11 +41,6 @@ require (
4141
github.com/mitchellh/hashstructure v1.1.0
4242
github.com/mitchellh/mapstructure v1.5.1-0.20231216201459-8508981c8b6c
4343
github.com/oklog/ulid v1.3.1
44-
github.com/open-telemetry/opentelemetry-collector-contrib/exporter/fileexporter v0.98.0
45-
github.com/open-telemetry/opentelemetry-collector-contrib/processor/attributesprocessor v0.98.0
46-
github.com/open-telemetry/opentelemetry-collector-contrib/processor/resourceprocessor v0.98.0
47-
github.com/open-telemetry/opentelemetry-collector-contrib/processor/transformprocessor v0.98.0
48-
github.com/open-telemetry/opentelemetry-collector-contrib/receiver/filelogreceiver v0.98.0
4944
github.com/otiai10/copy v1.14.0
5045
github.com/pierrre/gotestcover v0.0.0-20160517101806-924dca7d15f0
5146
github.com/pkg/errors v0.9.1
@@ -62,24 +57,6 @@ require (
6257
go.elastic.co/apm/module/apmgorilla v1.15.0
6358
go.elastic.co/ecszap v1.0.1
6459
go.elastic.co/go-licence-detector v0.5.0
65-
go.opentelemetry.io/collector/component v0.99.0
66-
go.opentelemetry.io/collector/confmap v0.99.0
67-
go.opentelemetry.io/collector/confmap/converter/expandconverter v0.99.0
68-
go.opentelemetry.io/collector/confmap/provider/envprovider v0.99.0
69-
go.opentelemetry.io/collector/confmap/provider/fileprovider v0.99.0
70-
go.opentelemetry.io/collector/confmap/provider/httpprovider v0.99.0
71-
go.opentelemetry.io/collector/confmap/provider/httpsprovider v0.99.0
72-
go.opentelemetry.io/collector/confmap/provider/yamlprovider v0.99.0
73-
go.opentelemetry.io/collector/exporter v0.99.0
74-
go.opentelemetry.io/collector/exporter/debugexporter v0.99.0
75-
go.opentelemetry.io/collector/exporter/otlpexporter v0.99.0
76-
go.opentelemetry.io/collector/featuregate v1.6.0
77-
go.opentelemetry.io/collector/otelcol v0.99.0
78-
go.opentelemetry.io/collector/processor v0.99.0
79-
go.opentelemetry.io/collector/processor/batchprocessor v0.99.0
80-
go.opentelemetry.io/collector/processor/memorylimiterprocessor v0.99.0
81-
go.opentelemetry.io/collector/receiver v0.99.0
82-
go.opentelemetry.io/collector/receiver/otlpreceiver v0.99.0
8360
go.uber.org/zap v1.27.0
8461
golang.org/x/crypto v0.22.0
8562
golang.org/x/exp v0.0.0-20240409090435-93d18d7e34b8
@@ -104,6 +81,35 @@ require (
10481
k8s.io/utils v0.0.0-20221128185143-99ec85e7a448
10582
)
10683

84+
require (
85+
// open telemetry dependencies
86+
// pinned to v0.97.0 due to issue with ports binding which causes our tests to fail
87+
// Do NOT upgrade the version beyond 0.97.0 until https://github.com/open-telemetry/opentelemetry-collector/issues/10031 is fixed!
88+
github.com/open-telemetry/opentelemetry-collector-contrib/exporter/fileexporter v0.97.0
89+
github.com/open-telemetry/opentelemetry-collector-contrib/processor/attributesprocessor v0.97.0
90+
github.com/open-telemetry/opentelemetry-collector-contrib/processor/resourceprocessor v0.97.0
91+
github.com/open-telemetry/opentelemetry-collector-contrib/processor/transformprocessor v0.97.0
92+
github.com/open-telemetry/opentelemetry-collector-contrib/receiver/filelogreceiver v0.97.0
93+
go.opentelemetry.io/collector/component v0.97.0
94+
go.opentelemetry.io/collector/confmap v0.99.0
95+
go.opentelemetry.io/collector/confmap/converter/expandconverter v0.97.0
96+
go.opentelemetry.io/collector/confmap/provider/envprovider v0.97.0
97+
go.opentelemetry.io/collector/confmap/provider/fileprovider v0.97.0
98+
go.opentelemetry.io/collector/confmap/provider/httpprovider v0.97.0
99+
go.opentelemetry.io/collector/confmap/provider/httpsprovider v0.97.0
100+
go.opentelemetry.io/collector/confmap/provider/yamlprovider v0.97.0
101+
go.opentelemetry.io/collector/exporter v0.97.0
102+
go.opentelemetry.io/collector/exporter/debugexporter v0.97.0
103+
go.opentelemetry.io/collector/exporter/otlpexporter v0.97.0
104+
go.opentelemetry.io/collector/featuregate v1.6.0
105+
go.opentelemetry.io/collector/otelcol v0.97.0
106+
go.opentelemetry.io/collector/processor v0.97.0
107+
go.opentelemetry.io/collector/processor/batchprocessor v0.97.0
108+
go.opentelemetry.io/collector/processor/memorylimiterprocessor v0.97.0
109+
go.opentelemetry.io/collector/receiver v0.97.0
110+
go.opentelemetry.io/collector/receiver/otlpreceiver v0.97.0
111+
)
112+
107113
require (
108114
github.com/Jeffail/gabs/v2 v2.6.0 // indirect
109115
github.com/StackExchange/wmi v1.2.1 // indirect
@@ -178,12 +184,12 @@ require (
178184
github.com/mostynb/go-grpc-compression v1.2.2 // indirect
179185
github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 // indirect
180186
github.com/onsi/ginkgo/v2 v2.9.0 // indirect
181-
github.com/open-telemetry/opentelemetry-collector-contrib/internal/coreinternal v0.98.0 // indirect
182-
github.com/open-telemetry/opentelemetry-collector-contrib/internal/filter v0.98.0 // indirect
183-
github.com/open-telemetry/opentelemetry-collector-contrib/internal/sharedcomponent v0.98.0 // indirect
184-
github.com/open-telemetry/opentelemetry-collector-contrib/pkg/ottl v0.98.0 // indirect
185-
github.com/open-telemetry/opentelemetry-collector-contrib/pkg/pdatautil v0.98.0 // indirect
186-
github.com/open-telemetry/opentelemetry-collector-contrib/pkg/stanza v0.98.0 // indirect
187+
github.com/open-telemetry/opentelemetry-collector-contrib/internal/coreinternal v0.97.0 // indirect
188+
github.com/open-telemetry/opentelemetry-collector-contrib/internal/filter v0.97.0 // indirect
189+
github.com/open-telemetry/opentelemetry-collector-contrib/internal/sharedcomponent v0.97.0 // indirect
190+
github.com/open-telemetry/opentelemetry-collector-contrib/pkg/ottl v0.97.0 // indirect
191+
github.com/open-telemetry/opentelemetry-collector-contrib/pkg/pdatautil v0.97.0 // indirect
192+
github.com/open-telemetry/opentelemetry-collector-contrib/pkg/stanza v0.97.0 // indirect
187193
github.com/opencontainers/go-digest v1.0.0 // indirect
188194
github.com/opencontainers/image-spec v1.1.0 // indirect
189195
github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2 // indirect
@@ -209,43 +215,43 @@ require (
209215
go.elastic.co/apm/v2 v2.0.0 // indirect
210216
go.elastic.co/fastjson v1.1.0 // indirect
211217
go.opencensus.io v0.24.0 // indirect
212-
go.opentelemetry.io/collector v0.99.0 // indirect
213-
go.opentelemetry.io/collector/config/configauth v0.99.0 // indirect
214-
go.opentelemetry.io/collector/config/configcompression v1.6.0 // indirect
215-
go.opentelemetry.io/collector/config/configgrpc v0.99.0 // indirect
216-
go.opentelemetry.io/collector/config/confighttp v0.99.0 // indirect
217-
go.opentelemetry.io/collector/config/confignet v0.99.0 // indirect
218-
go.opentelemetry.io/collector/config/configopaque v1.6.0 // indirect
219-
go.opentelemetry.io/collector/config/configretry v0.99.0 // indirect
220-
go.opentelemetry.io/collector/config/configtelemetry v0.99.0 // indirect
221-
go.opentelemetry.io/collector/config/configtls v0.99.0 // indirect
222-
go.opentelemetry.io/collector/config/internal v0.99.0 // indirect
223-
go.opentelemetry.io/collector/connector v0.99.0 // indirect
224-
go.opentelemetry.io/collector/consumer v0.99.0 // indirect
225-
go.opentelemetry.io/collector/extension v0.99.0 // indirect
226-
go.opentelemetry.io/collector/extension/auth v0.99.0 // indirect
227-
go.opentelemetry.io/collector/pdata v1.6.0 // indirect
228-
go.opentelemetry.io/collector/semconv v0.99.0 // indirect
229-
go.opentelemetry.io/collector/service v0.99.0 // indirect
230-
go.opentelemetry.io/contrib/config v0.5.0 // indirect
231-
go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.50.0 // indirect
232-
go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.50.0 // indirect
233-
go.opentelemetry.io/contrib/propagators/b3 v1.25.0 // indirect
234-
go.opentelemetry.io/otel v1.25.0 // indirect
235-
go.opentelemetry.io/otel/bridge/opencensus v1.25.0 // indirect
236-
go.opentelemetry.io/otel/exporters/otlp/otlpmetric/otlpmetricgrpc v1.25.0 // indirect
237-
go.opentelemetry.io/otel/exporters/otlp/otlpmetric/otlpmetrichttp v1.25.0 // indirect
238-
go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.25.0 // indirect
239-
go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc v1.25.0 // indirect
240-
go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracehttp v1.25.0 // indirect
241-
go.opentelemetry.io/otel/exporters/prometheus v0.47.0 // indirect
242-
go.opentelemetry.io/otel/exporters/stdout/stdoutmetric v1.25.0 // indirect
243-
go.opentelemetry.io/otel/exporters/stdout/stdouttrace v1.25.0 // indirect
244-
go.opentelemetry.io/otel/metric v1.25.0 // indirect
245-
go.opentelemetry.io/otel/sdk v1.25.0 // indirect
246-
go.opentelemetry.io/otel/sdk/metric v1.25.0 // indirect
247-
go.opentelemetry.io/otel/trace v1.25.0 // indirect
248-
go.opentelemetry.io/proto/otlp v1.2.0 // indirect
218+
go.opentelemetry.io/collector v0.97.0 // indirect
219+
go.opentelemetry.io/collector/config/configauth v0.97.0 // indirect
220+
go.opentelemetry.io/collector/config/configcompression v1.4.0 // indirect
221+
go.opentelemetry.io/collector/config/configgrpc v0.97.0 // indirect
222+
go.opentelemetry.io/collector/config/confighttp v0.97.0 // indirect
223+
go.opentelemetry.io/collector/config/confignet v0.97.0 // indirect
224+
go.opentelemetry.io/collector/config/configopaque v1.4.0 // indirect
225+
go.opentelemetry.io/collector/config/configretry v0.97.0 // indirect
226+
go.opentelemetry.io/collector/config/configtelemetry v0.97.0 // indirect
227+
go.opentelemetry.io/collector/config/configtls v0.97.0 // indirect
228+
go.opentelemetry.io/collector/config/internal v0.97.0 // indirect
229+
go.opentelemetry.io/collector/connector v0.97.0 // indirect
230+
go.opentelemetry.io/collector/consumer v0.97.0 // indirect
231+
go.opentelemetry.io/collector/extension v0.97.0 // indirect
232+
go.opentelemetry.io/collector/extension/auth v0.97.0 // indirect
233+
go.opentelemetry.io/collector/pdata v1.4.0 // indirect
234+
go.opentelemetry.io/collector/semconv v0.97.0 // indirect
235+
go.opentelemetry.io/collector/service v0.97.0 // indirect
236+
go.opentelemetry.io/contrib/config v0.4.0 // indirect
237+
go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.49.0 // indirect
238+
go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.49.0 // indirect
239+
go.opentelemetry.io/contrib/propagators/b3 v1.24.0 // indirect
240+
go.opentelemetry.io/otel v1.24.0 // indirect
241+
go.opentelemetry.io/otel/bridge/opencensus v1.24.0 // indirect
242+
go.opentelemetry.io/otel/exporters/otlp/otlpmetric/otlpmetricgrpc v1.24.0 // indirect
243+
go.opentelemetry.io/otel/exporters/otlp/otlpmetric/otlpmetrichttp v1.24.0 // indirect
244+
go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.24.0 // indirect
245+
go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc v1.24.0 // indirect
246+
go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracehttp v1.24.0 // indirect
247+
go.opentelemetry.io/otel/exporters/prometheus v0.46.0 // indirect
248+
go.opentelemetry.io/otel/exporters/stdout/stdoutmetric v1.24.0 // indirect
249+
go.opentelemetry.io/otel/exporters/stdout/stdouttrace v1.24.0 // indirect
250+
go.opentelemetry.io/otel/metric v1.24.0 // indirect
251+
go.opentelemetry.io/otel/sdk v1.24.0 // indirect
252+
go.opentelemetry.io/otel/sdk/metric v1.24.0 // indirect
253+
go.opentelemetry.io/otel/trace v1.24.0 // indirect
254+
go.opentelemetry.io/proto/otlp v1.1.0 // indirect
249255
go.uber.org/multierr v1.11.0 // indirect
250256
golang.org/x/mod v0.17.0 // indirect
251257
golang.org/x/net v0.24.0 // indirect

0 commit comments

Comments
 (0)