Skip to content

Commit 42101c8

Browse files
VihasMakwanaVihasMakwana
authored
Merge branch 'main' into metricbeat-process-multierr
2 parents 091fff8 + 7263696 commit 42101c8

44 files changed

Lines changed: 1782 additions & 413 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎.buildkite/aws-tests-pipeline.yml‎

Lines changed: 64 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,64 @@
1+
# yaml-language-server: $schema=https://raw.githubusercontent.com/buildkite/pipeline-schema/main/schema.json
2+
3+
env:
4+
AWS_ARM_INSTANCE_TYPE: "m6g.xlarge"
5+
AWS_IMAGE_UBUNTU_ARM_64: "platform-ingest-beats-ubuntu-2204-aarch64"
6+
7+
# TEST_TAGS should be reviewed and updated: https://github.com/elastic/ingest-dev/issues/3476
8+
TEST_TAGS: "aws"
9+
MODULE: "aws"
10+
11+
# Other deps
12+
ASDF_TERRAFORM_VERSION: 1.0.2
13+
ASDF_MAGE_VERSION: 1.15.0
14+
15+
# Unit tests
16+
RACE_DETECTOR: "true"
17+
TEST_COVERAGE: "true"
18+
19+
steps:
20+
- label: ":ubuntu: x-pack/filebeat: AWS Tests"
21+
key: "x-pack-filebeat-extended-cloud-test"
22+
skip: "skipping as it was on Jenkins: elastic/ingest-dev#3467"
23+
# Related issue: https://github.com/elastic/ingest-dev/issues/3467
24+
env:
25+
MODULE_DIR: "x-pack/filebeat/input/awss3/_meta/terraform"
26+
command: |
27+
set -euo pipefail
28+
source .buildkite/scripts/initCloudEnv.sh
29+
echo "~~~ Running tests"
30+
cd x-pack/filebeat
31+
mage build test goIntegTest
32+
agents:
33+
provider: "aws"
34+
imagePrefix: "${AWS_IMAGE_UBUNTU_ARM_64}"
35+
instanceType: "${AWS_ARM_INSTANCE_TYPE}"
36+
artifact_paths:
37+
- "x-pack/filebeat/build/*.xml"
38+
- "x-pack/filebeat/build/*.json"
39+
notify:
40+
- github_commit_status:
41+
context: "x-pack/filebeat: AWS Tests"
42+
43+
- label: ":ubuntu: x-pack/metricbeat: AWS Tests"
44+
key: "x-pack-metricbeat-extended-cloud-test"
45+
env:
46+
MODULE_DIR: "x-pack/metricbeat/module/aws"
47+
command: |
48+
set -euo pipefail
49+
source .buildkite/scripts/initCloudEnv.sh
50+
echo "~~~ Running tests"
51+
cd x-pack/metricbeat
52+
mage build test goIntegTest
53+
agents:
54+
provider: "aws"
55+
imagePrefix: "${AWS_IMAGE_UBUNTU_ARM_64}"
56+
instanceType: "${AWS_ARM_INSTANCE_TYPE}"
57+
artifact_paths:
58+
- "x-pack/metricbeat/build/*.xml"
59+
- "x-pack/metricbeat/build/*.json"
60+
notify:
61+
- github_commit_status:
62+
context: "x-pack/metricbeat: AWS Tests"
63+
64+

‎.github/dependabot.yml‎

Lines changed: 9 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -35,18 +35,23 @@ updates:
3535
- dependency-name: github.com/elastic/go-seccomp-bpf
3636
- dependency-name: github.com/elastic/toutoumomoma
3737
- dependency-name: github.com/elastic/ebpfevents
38+
# Team:Team:obs-ds-hosted-services, Team:obs-infraobs-integrations
39+
# Azure SDK dependencies
40+
- dependency-name: github.com/Azure/azure-sdk-for-go/*
41+
- dependency-name: github.com/Azure/azure-event-hubs-go/*
42+
- dependency-name: github.com/Azure/azure-storage-blob-go/*
43+
- dependency-name: github.com/Azure/go-autorest/*
44+
# GCP SDK dependencies
45+
- dependency-name: cloud.google.com/go/*
3846
groups:
3947
# Cloud providers' SDK dependencies
4048
azure-sdks:
4149
patterns:
42-
- "github.com/Azure/azure-sdk-for-go/*"
43-
- "github.com/Azure/azure-event-hubs-go/*"
50+
- "github.com/Azure/azure-*-go"
4451
- "github.com/Azure/go-autorest/*"
45-
- "github.com/Azure/azure-storage-blob-go/*"
4652
gcp-sdks:
4753
patterns:
4854
- "cloud.google.com/go/*"
49-
- "google.golang.org/*"
5055
ignore:
5156
# Skip github.com/elastic/mito because it requires documentation updates.
5257
- dependency-name: github.com/elastic/mito

‎CHANGELOG.asciidoc‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -142,6 +142,7 @@ https://github.com/elastic/beats/compare/v8.13.4\...v8.14.0[View commits]
142142
- Fix concurrency/error handling bugs in the AWS S3 input that could drop data and prevent ingestion of large buckets. {pull}39131[39131]
143143
- Fix EntraID query handling. {issue}39419[39419] {pull}39420[39420]
144144
- Expand ID patterns in request trace logger for HTTP Endpoint. {pull}39656[39656]
145+
- Fix awscloudwarch input: set startTime to `0` for the first iteration of retrieving log events from CloudWatch. {pull}40079[40079]
145146

146147
*Heartbeat*
147148

‎CHANGELOG.next.asciidoc‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -44,8 +44,10 @@ https://github.com/elastic/beats/compare/v8.8.1\...main[Check the HEAD diff]
4444
- Update Salesforce module to use new Salesforce input. {pull}37509[37509]
4545
- Tag events that come from a filestream in "take over" mode. {pull}39828[39828]
4646
- Fix high IO and handling of a corrupted registry log file. {pull}35893[35893]
47+
- Enable file ingestion to report detailed status to Elastic Agent {pull}40075[40075]
4748
- Filebeat, when running with Elastic-Agent, reports status for Filestream input. {pull}40121[40121]
4849
- Implement Elastic Agent status and health reporting for Winlog Filebeat input. {pull}40163[40163]
50+
- Fix filestream's registry GC: registry entries will never be removed if clean_inactive is set to "-1". {pull}40258[40258]
4951

5052
*Heartbeat*
5153

@@ -55,6 +57,7 @@ https://github.com/elastic/beats/compare/v8.8.1\...main[Check the HEAD diff]
5557
- Setting period for counter cache for Prometheus remote_write at least to 60sec {pull}38553[38553]
5658
- Add support of Graphite series 1.1.0+ tagging extension for statsd module. {pull}39619[39619]
5759
- Remove fallback to the node limit for the `kubernetes.pod.cpu.usage.limit.pct` and `kubernetes.pod.memory.usage.limit.pct` metrics calculation
60+
- Add support for Kibana status metricset in v8 format {pull}40275[40275]
5861

5962
*Osquerybeat*
6063

@@ -178,6 +181,7 @@ https://github.com/elastic/beats/compare/v8.8.1\...main[Check the HEAD diff]
178181
- Fix behavior of pagetypeinfo metrics {pull}39985[39985]
179182
- Fix query logic for temp and non-temp tablespaces in Oracle module. {issue}38051[38051] {pull}39787[39787]
180183
- Set GCP metrics config period to the default (60s) when the value is below the minimum allowed period. {issue}30434[30434] {pull}40020[40020]
184+
- Add GCP 'instance_id' resource label in ECS cloud fields. {issue}40033[40033] {pull}40062[40062]
181185
- Fix missing metrics from CloudWatch when include_linked_accounts set to false. {issue}40071[40071] {pull}40135[40135]
182186
- Update beat module with apm-server monitoring metrics fields {pull}40127[40127]
183187

@@ -319,6 +323,7 @@ https://github.com/elastic/beats/compare/v8.8.1\...main[Check the HEAD diff]
319323

320324
- Added status to monitor run log report.
321325
- Upgrade node to latest LTS v18.20.3. {pull}40038[40038]
326+
- Add journey duration to synthetics browser events. {pull}40230[40230]
322327

323328
*Metricbeat*
324329

0 commit comments

Comments
 (0)