Skip to content

Commit 247aa3c

Browse files
authored
Merge branch 'main' into dependabot/go_modules/main/github.com/godror/godror-0.49.0
2 parents 57500de + 5cd29c3 commit 247aa3c

File tree

7 files changed

+1078
-599
lines changed

7 files changed

+1078
-599
lines changed

CHANGELOG.next.asciidoc

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -487,6 +487,7 @@ otherwise no tag is added. {issue}42208[42208] {pull}42403[42403]
487487
- Allow empty HTTPJSON cursor template value evaluations to be ignored by Fleet health status updates. {pull}45361[45361]
488488
- Reuse OAuth2 clients in HTTP JSON input where possible. {issue}34834[34834] {pull}44976[44976]
489489
- Add support for generalized token authentication to CEL input. {pull}45359[45359]
490+
- Log CEL single object evaluation results as ECS compliant documents where possible. {issue}45254[45254] {pull}45399[45399]
490491

491492
*Auditbeat*
492493

NOTICE.txt

Lines changed: 767 additions & 314 deletions
Large diffs are not rendered by default.

docs/reference/filebeat/filebeat-input-cel.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -115,7 +115,7 @@ After completion of a program’s execution it should return a single object wit
115115
}
116116
```
117117

118-
1. The `events` field must be present, but may be empty or null. If it is not empty, it must only have objects as elements. The field should be an array, but in the case of an error condition in the CEL program it is acceptable to return a single object instead of an array; this will will be wrapped as an array for publication and an error will be logged. If the single object contains a key, "error", the error value will be used to update the status of the input to report to Elastic Agent. This can be used to more rapidly respond to API failures.
118+
1. The `events` field must be present, but may be empty or null. If it is not empty, it must only have objects as elements. The field should be an array, but in the case of an error condition in the CEL program it is acceptable to return a single object instead of an array; this will will be wrapped as an array for publication and an error will be logged. If the single object contains a key, "error", the error value will be used to update the status of the input to report to Elastic Agent. This can be used to more rapidly respond to API failures. It is recommended that the object conforms to ECS field definitions, but this is not enforced.
119119
2. If `cursor` is present it must be either be a single object or an array with the same length as events; each element *i* of the `cursor` will be the details for obtaining the events at and beyond event *i* in the `events` array. If the `cursor` is a single object it is will be the details for obtaining events after the last event in the `events` array and will only be retained on successful publication of all the events in the `events` array.
120120
3. If `rate_limit` is present it must be a map with numeric fields `rate` and `burst`. The `rate_limit` field may also have a string `error` field and other fields which will be logged. If it has an `error` field, the `rate` and `burst` will not be used to set rate limit behavior. The [Limit](https://pkg.go.dev/github.com/elastic/mito@v1.22.0/lib#Limit), and [Okta Rate Limit policy](https://pkg.go.dev/github.com/elastic/mito@v1.22.0/lib#OktaRateLimit) and [Draft Rate Limit policy](https://pkg.go.dev/github.com/elastic/mito@v1.22.0/lib#DraftRateLimit) documentation show how to construct this field.
121121
4. The evaluation is repeated with the new state, after removing the events field, if the "want_more" field is present and true, and a non-zero events array is returned. If the "want_more" field is present after a failed evaluation, it is set to false.

go.mod

Lines changed: 91 additions & 87 deletions
Original file line numberDiff line numberDiff line change
@@ -129,7 +129,7 @@ require (
129129
golang.org/x/net v0.41.0
130130
golang.org/x/oauth2 v0.30.0
131131
golang.org/x/sync v0.15.0
132-
golang.org/x/sys v0.33.0
132+
golang.org/x/sys v0.34.0
133133
golang.org/x/text v0.26.0
134134
golang.org/x/time v0.11.0
135135
golang.org/x/tools v0.33.0
@@ -205,12 +205,12 @@ require (
205205
github.com/meraki/dashboard-api-go/v3 v3.0.9
206206
github.com/microsoft/go-mssqldb v1.9.2
207207
github.com/microsoft/wmi v0.25.1
208-
github.com/open-telemetry/opentelemetry-collector-contrib/exporter/elasticsearchexporter v0.129.0
208+
github.com/open-telemetry/opentelemetry-collector-contrib/exporter/elasticsearchexporter v0.130.0
209209
github.com/otiai10/copy v1.12.0
210210
github.com/pierrec/lz4/v4 v4.1.22
211211
github.com/pkg/xattr v0.4.9
212212
github.com/prometheus/prometheus v0.304.1
213-
github.com/shirou/gopsutil/v4 v4.25.5
213+
github.com/shirou/gopsutil/v4 v4.25.6
214214
github.com/teambition/rrule-go v1.8.2
215215
github.com/tklauser/go-sysconf v0.3.12
216216
github.com/tomnomnom/linkheader v0.0.0-20180905144013-02ca5825eb80
@@ -220,28 +220,30 @@ require (
220220
go.elastic.co/apm/module/apmhttp/v2 v2.6.3
221221
go.elastic.co/apm/v2 v2.7.0
222222
go.mongodb.org/mongo-driver v1.17.4
223-
go.opentelemetry.io/collector/component v1.35.0
224-
go.opentelemetry.io/collector/component/componentstatus v0.129.0
225-
go.opentelemetry.io/collector/config/configtls v1.35.0
226-
go.opentelemetry.io/collector/confmap v1.35.0
227-
go.opentelemetry.io/collector/confmap/provider/fileprovider v1.35.0
228-
go.opentelemetry.io/collector/consumer v1.35.0
229-
go.opentelemetry.io/collector/consumer/consumererror v0.129.0
230-
go.opentelemetry.io/collector/exporter/debugexporter v0.129.0
231-
go.opentelemetry.io/collector/otelcol v0.129.0
232-
go.opentelemetry.io/collector/pdata v1.35.0
233-
go.opentelemetry.io/collector/processor v1.35.0
234-
go.opentelemetry.io/collector/processor/processorhelper v0.129.0
235-
go.opentelemetry.io/collector/receiver v1.35.0
223+
go.opentelemetry.io/collector/component v1.36.0
224+
go.opentelemetry.io/collector/component/componentstatus v0.130.0
225+
go.opentelemetry.io/collector/config/configtls v1.36.0
226+
go.opentelemetry.io/collector/confmap v1.36.0
227+
go.opentelemetry.io/collector/confmap/provider/fileprovider v1.36.0
228+
go.opentelemetry.io/collector/consumer v1.36.0
229+
go.opentelemetry.io/collector/consumer/consumererror v0.130.0
230+
go.opentelemetry.io/collector/exporter/debugexporter v0.130.0
231+
go.opentelemetry.io/collector/otelcol v0.130.0
232+
go.opentelemetry.io/collector/pdata v1.36.0
233+
go.opentelemetry.io/collector/receiver v1.36.0
236234
go.uber.org/mock v0.5.0
237235
golang.org/x/exp v0.0.0-20250506013437-ce4c2cf36ca6
238236
golang.org/x/term v0.32.0
239-
google.golang.org/genproto/googleapis/api v0.0.0-20250519155744-55703ea1f237
237+
google.golang.org/genproto/googleapis/api v0.0.0-20250603155806-513f23925822
240238
gopkg.in/natefinch/lumberjack.v2 v2.2.1
241239
gopkg.in/yaml.v3 v3.0.1
242240
)
243241

244-
require go.opentelemetry.io/otel/sdk/metric v1.36.0
242+
require (
243+
go.opentelemetry.io/collector/processor v1.36.0
244+
go.opentelemetry.io/collector/processor/processorhelper v0.130.0
245+
go.opentelemetry.io/otel/sdk/metric v1.37.0
246+
)
245247

246248
require (
247249
aqwari.net/xml v0.0.0-20210331023308-d9421b293817 // indirect
@@ -289,7 +291,6 @@ require (
289291
github.com/benbjohnson/clock v1.3.0 // indirect
290292
github.com/beorn7/perks v1.0.1 // indirect
291293
github.com/bluekeyes/go-gitdiff v0.7.1 // indirect
292-
github.com/cenkalti/backoff/v4 v4.3.0 // indirect
293294
github.com/cenkalti/backoff/v5 v5.0.2 // indirect
294295
github.com/cespare/xxhash v1.1.0 // indirect
295296
github.com/cilium/ebpf v0.16.0 // indirect
@@ -322,7 +323,7 @@ require (
322323
github.com/go-asn1-ber/asn1-ber v1.5.5 // indirect
323324
github.com/go-jose/go-jose/v4 v4.0.5 // indirect
324325
github.com/go-logfmt/logfmt v0.6.0 // indirect
325-
github.com/go-logr/logr v1.4.2 // indirect
326+
github.com/go-logr/logr v1.4.3 // indirect
326327
github.com/go-logr/stdr v1.2.2 // indirect
327328
github.com/go-openapi/jsonpointer v0.21.0 // indirect
328329
github.com/go-openapi/jsonreference v0.21.0 // indirect
@@ -344,7 +345,7 @@ require (
344345
github.com/google/shlex v0.0.0-20191202100458-e7afc7fbc510 // indirect
345346
github.com/googleapis/enterprise-certificate-proxy v0.3.6 // indirect
346347
github.com/grafana/regexp v0.0.0-20240518133315-a468a5bfb3bc // indirect
347-
github.com/grpc-ecosystem/grpc-gateway/v2 v2.26.3 // indirect
348+
github.com/grpc-ecosystem/grpc-gateway/v2 v2.27.1 // indirect
348349
github.com/hashicorp/cronexpr v1.1.2 // indirect
349350
github.com/hashicorp/errwrap v1.1.0 // indirect
350351
github.com/hashicorp/go-cleanhttp v0.5.2 // indirect
@@ -393,8 +394,8 @@ require (
393394
github.com/morikuni/aec v1.0.0 // indirect
394395
github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 // indirect
395396
github.com/mxk/go-flowrate v0.0.0-20140419014527-cca7078d478f // indirect
396-
github.com/open-telemetry/opentelemetry-collector-contrib/internal/common v0.129.0 // indirect
397-
github.com/open-telemetry/opentelemetry-collector-contrib/internal/coreinternal v0.129.0 // indirect
397+
github.com/open-telemetry/opentelemetry-collector-contrib/internal/common v0.130.0 // indirect
398+
github.com/open-telemetry/opentelemetry-collector-contrib/internal/coreinternal v0.130.0 // indirect
398399
github.com/opencontainers/go-digest v1.0.0 // indirect
399400
github.com/opencontainers/image-spec v1.1.1 // indirect
400401
github.com/pkg/browser v0.0.0-20240102092130-5ac0b6a4141c // indirect
@@ -420,75 +421,78 @@ require (
420421
go.elastic.co/fastjson v1.5.0 // indirect
421422
go.opencensus.io v0.24.0 // indirect
422423
go.opentelemetry.io/auto/sdk v1.1.0 // indirect
423-
go.opentelemetry.io/collector/client v1.35.0 // indirect
424-
go.opentelemetry.io/collector/component/componenttest v0.129.0 // indirect
425-
go.opentelemetry.io/collector/config/configauth v0.129.0 // indirect
426-
go.opentelemetry.io/collector/config/configcompression v1.35.0 // indirect
427-
go.opentelemetry.io/collector/config/confighttp v0.129.0 // indirect
428-
go.opentelemetry.io/collector/config/configmiddleware v0.129.0 // indirect
429-
go.opentelemetry.io/collector/config/configopaque v1.35.0 // indirect
430-
go.opentelemetry.io/collector/config/configretry v1.35.0 // indirect
431-
go.opentelemetry.io/collector/config/configtelemetry v0.129.0 // indirect
432-
go.opentelemetry.io/collector/confmap/xconfmap v0.129.0 // indirect
433-
go.opentelemetry.io/collector/connector v0.129.0 // indirect
434-
go.opentelemetry.io/collector/connector/connectortest v0.129.0 // indirect
435-
go.opentelemetry.io/collector/connector/xconnector v0.129.0 // indirect
436-
go.opentelemetry.io/collector/consumer/consumererror/xconsumererror v0.129.0 // indirect
437-
go.opentelemetry.io/collector/consumer/consumertest v0.129.0 // indirect
438-
go.opentelemetry.io/collector/consumer/xconsumer v0.129.0 // indirect
439-
go.opentelemetry.io/collector/exporter v0.129.0 // indirect
440-
go.opentelemetry.io/collector/exporter/exporterhelper/xexporterhelper v0.129.0 // indirect
441-
go.opentelemetry.io/collector/exporter/exportertest v0.129.0 // indirect
442-
go.opentelemetry.io/collector/exporter/xexporter v0.129.0 // indirect
443-
go.opentelemetry.io/collector/extension v1.35.0 // indirect
444-
go.opentelemetry.io/collector/extension/extensionauth v1.35.0 // indirect
445-
go.opentelemetry.io/collector/extension/extensioncapabilities v0.129.0 // indirect
446-
go.opentelemetry.io/collector/extension/extensionmiddleware v0.129.0 // indirect
447-
go.opentelemetry.io/collector/extension/extensiontest v0.129.0 // indirect
448-
go.opentelemetry.io/collector/extension/xextension v0.129.0 // indirect
449-
go.opentelemetry.io/collector/featuregate v1.35.0 // indirect
450-
go.opentelemetry.io/collector/internal/fanoutconsumer v0.129.0 // indirect
451-
go.opentelemetry.io/collector/internal/telemetry v0.129.0 // indirect
452-
go.opentelemetry.io/collector/pdata/pprofile v0.129.0 // indirect
453-
go.opentelemetry.io/collector/pdata/testdata v0.129.0 // indirect
454-
go.opentelemetry.io/collector/pdata/xpdata v0.129.0 // indirect
455-
go.opentelemetry.io/collector/pipeline v0.129.0 // indirect
456-
go.opentelemetry.io/collector/pipeline/xpipeline v0.129.0 // indirect
457-
go.opentelemetry.io/collector/processor/processortest v0.129.0 // indirect
458-
go.opentelemetry.io/collector/processor/xprocessor v0.129.0 // indirect
459-
go.opentelemetry.io/collector/receiver/receivertest v0.129.0 // indirect
460-
go.opentelemetry.io/collector/receiver/xreceiver v0.129.0 // indirect
461-
go.opentelemetry.io/collector/service v0.129.0 // indirect
462-
go.opentelemetry.io/collector/service/hostcapabilities v0.129.0 // indirect
463-
go.opentelemetry.io/contrib/bridges/otelzap v0.11.0 // indirect
424+
go.opentelemetry.io/collector/client v1.36.0 // indirect
425+
go.opentelemetry.io/collector/component/componenttest v0.130.0 // indirect
426+
go.opentelemetry.io/collector/config/configauth v0.130.0 // indirect
427+
go.opentelemetry.io/collector/config/configcompression v1.36.0 // indirect
428+
go.opentelemetry.io/collector/config/confighttp v0.130.0 // indirect
429+
go.opentelemetry.io/collector/config/configmiddleware v0.130.0 // indirect
430+
go.opentelemetry.io/collector/config/configopaque v1.36.0 // indirect
431+
go.opentelemetry.io/collector/config/configoptional v0.130.0 // indirect
432+
go.opentelemetry.io/collector/config/configretry v1.36.0 // indirect
433+
go.opentelemetry.io/collector/config/configtelemetry v0.130.0 // indirect
434+
go.opentelemetry.io/collector/confmap/xconfmap v0.130.0 // indirect
435+
go.opentelemetry.io/collector/connector v0.130.0 // indirect
436+
go.opentelemetry.io/collector/connector/connectortest v0.130.0 // indirect
437+
go.opentelemetry.io/collector/connector/xconnector v0.130.0 // indirect
438+
go.opentelemetry.io/collector/consumer/consumererror/xconsumererror v0.130.0 // indirect
439+
go.opentelemetry.io/collector/consumer/consumertest v0.130.0 // indirect
440+
go.opentelemetry.io/collector/consumer/xconsumer v0.130.0 // indirect
441+
go.opentelemetry.io/collector/exporter v0.130.0 // indirect
442+
go.opentelemetry.io/collector/exporter/exporterhelper/xexporterhelper v0.130.0 // indirect
443+
go.opentelemetry.io/collector/exporter/exportertest v0.130.0 // indirect
444+
go.opentelemetry.io/collector/exporter/xexporter v0.130.0 // indirect
445+
go.opentelemetry.io/collector/extension v1.36.0 // indirect
446+
go.opentelemetry.io/collector/extension/extensionauth v1.36.0 // indirect
447+
go.opentelemetry.io/collector/extension/extensioncapabilities v0.130.0 // indirect
448+
go.opentelemetry.io/collector/extension/extensionmiddleware v0.130.0 // indirect
449+
go.opentelemetry.io/collector/extension/extensiontest v0.130.0 // indirect
450+
go.opentelemetry.io/collector/extension/xextension v0.130.0 // indirect
451+
go.opentelemetry.io/collector/featuregate v1.36.0 // indirect
452+
go.opentelemetry.io/collector/internal/fanoutconsumer v0.130.0 // indirect
453+
go.opentelemetry.io/collector/internal/telemetry v0.130.0 // indirect
454+
go.opentelemetry.io/collector/pdata/pprofile v0.130.0 // indirect
455+
go.opentelemetry.io/collector/pdata/testdata v0.130.0 // indirect
456+
go.opentelemetry.io/collector/pdata/xpdata v0.130.0 // indirect
457+
go.opentelemetry.io/collector/pipeline v0.130.0 // indirect
458+
go.opentelemetry.io/collector/pipeline/xpipeline v0.130.0 // indirect
459+
go.opentelemetry.io/collector/processor/processortest v0.130.0 // indirect
460+
go.opentelemetry.io/collector/processor/xprocessor v0.130.0 // indirect
461+
go.opentelemetry.io/collector/receiver/receivertest v0.130.0 // indirect
462+
go.opentelemetry.io/collector/receiver/xreceiver v0.130.0 // indirect
463+
go.opentelemetry.io/collector/service v0.130.0 // indirect
464+
go.opentelemetry.io/collector/service/hostcapabilities v0.130.0 // indirect
465+
go.opentelemetry.io/contrib/bridges/otelzap v0.12.0 // indirect
464466
go.opentelemetry.io/contrib/detectors/gcp v1.35.0 // indirect
465467
go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.60.0 // indirect
466-
go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.61.0 // indirect
467-
go.opentelemetry.io/contrib/otelconf v0.16.0 // indirect
468-
go.opentelemetry.io/contrib/propagators/b3 v1.36.0 // indirect
468+
go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.62.0 // indirect
469+
go.opentelemetry.io/contrib/otelconf v0.17.0 // indirect
470+
go.opentelemetry.io/contrib/propagators/b3 v1.37.0 // indirect
469471
go.opentelemetry.io/ebpf-profiler v0.0.0-20250212075250-7bf12d3f962f // indirect
470-
go.opentelemetry.io/otel v1.36.0 // indirect
471-
go.opentelemetry.io/otel/exporters/otlp/otlplog/otlploggrpc v0.12.2 // indirect
472-
go.opentelemetry.io/otel/exporters/otlp/otlplog/otlploghttp v0.12.2 // indirect
473-
go.opentelemetry.io/otel/exporters/otlp/otlpmetric/otlpmetricgrpc v1.36.0 // indirect
474-
go.opentelemetry.io/otel/exporters/otlp/otlpmetric/otlpmetrichttp v1.36.0 // indirect
475-
go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.36.0 // indirect
476-
go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc v1.36.0 // indirect
477-
go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracehttp v1.36.0 // indirect
478-
go.opentelemetry.io/otel/exporters/prometheus v0.58.0 // indirect
479-
go.opentelemetry.io/otel/exporters/stdout/stdoutlog v0.12.2 // indirect
480-
go.opentelemetry.io/otel/exporters/stdout/stdoutmetric v1.36.0 // indirect
481-
go.opentelemetry.io/otel/exporters/stdout/stdouttrace v1.36.0 // indirect
482-
go.opentelemetry.io/otel/log v0.12.2 // indirect
483-
go.opentelemetry.io/otel/metric v1.36.0 // indirect
484-
go.opentelemetry.io/otel/sdk v1.36.0 // indirect
485-
go.opentelemetry.io/otel/sdk/log v0.12.2 // indirect
486-
go.opentelemetry.io/otel/trace v1.36.0 // indirect
487-
go.opentelemetry.io/proto/otlp v1.6.0 // indirect
472+
go.opentelemetry.io/otel v1.37.0 // indirect
473+
go.opentelemetry.io/otel/exporters/otlp/otlplog/otlploggrpc v0.13.0 // indirect
474+
go.opentelemetry.io/otel/exporters/otlp/otlplog/otlploghttp v0.13.0 // indirect
475+
go.opentelemetry.io/otel/exporters/otlp/otlpmetric/otlpmetricgrpc v1.37.0 // indirect
476+
go.opentelemetry.io/otel/exporters/otlp/otlpmetric/otlpmetrichttp v1.37.0 // indirect
477+
go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.37.0 // indirect
478+
go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc v1.37.0 // indirect
479+
go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracehttp v1.37.0 // indirect
480+
go.opentelemetry.io/otel/exporters/prometheus v0.59.0 // indirect
481+
go.opentelemetry.io/otel/exporters/stdout/stdoutlog v0.13.0 // indirect
482+
go.opentelemetry.io/otel/exporters/stdout/stdoutmetric v1.37.0 // indirect
483+
go.opentelemetry.io/otel/exporters/stdout/stdouttrace v1.37.0 // indirect
484+
go.opentelemetry.io/otel/log v0.13.0 // indirect
485+
go.opentelemetry.io/otel/metric v1.37.0 // indirect
486+
go.opentelemetry.io/otel/sdk v1.37.0 // indirect
487+
go.opentelemetry.io/otel/sdk/log v0.13.0 // indirect
488+
go.opentelemetry.io/otel/trace v1.37.0 // indirect
489+
go.opentelemetry.io/proto/otlp v1.7.0 // indirect
488490
go.uber.org/ratelimit v0.3.1 // indirect
491+
go.yaml.in/yaml/v2 v2.4.2 // indirect
492+
go.yaml.in/yaml/v3 v3.0.4 // indirect
489493
golang.org/x/xerrors v0.0.0-20240903120638-7835f813f4da // indirect
490494
gonum.org/v1/gonum v0.16.0 // indirect
491-
google.golang.org/genproto/googleapis/rpc v0.0.0-20250519155744-55703ea1f237 // indirect
495+
google.golang.org/genproto/googleapis/rpc v0.0.0-20250603155806-513f23925822 // indirect
492496
gopkg.in/evanphx/json-patch.v4 v4.12.0 // indirect
493497
k8s.io/klog/v2 v2.130.1 // indirect
494498
k8s.io/kube-openapi v0.0.0-20241105132330-32ad38e42d3f // indirect
@@ -497,7 +501,7 @@ require (
497501
mvdan.cc/garble v0.12.1 // indirect
498502
sigs.k8s.io/json v0.0.0-20241010143419-9aa6b5e7a4b3 // indirect
499503
sigs.k8s.io/structured-merge-diff/v4 v4.4.2 // indirect
500-
sigs.k8s.io/yaml v1.4.0 // indirect
504+
sigs.k8s.io/yaml v1.5.0 // indirect
501505
)
502506

503507
require (

0 commit comments

Comments
 (0)