Skip to content

Commit e578f0c

Browse files
VihasMakwanaVihasMakwana
authored
Merge branch 'main' into fsstat-ignore
2 parents 9129ba8 + 9f744b6 commit e578f0c

38 files changed

Lines changed: 441 additions & 19 deletions

File tree

‎.buildkite/scripts/backport_branch.sh‎

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -133,10 +133,15 @@ updateBackportBranchContents() {
133133
# Update scripts used by mage
134134
local MAGEFILE_SCRIPTS_FOLDER="dev/citools"
135135
local TESTSREPORTER_SCRIPTS_FOLDER="dev/testsreporter"
136+
local COVERAGE_SCRIPTS_FOLDER="dev/coverage"
136137
if git ls-tree -d --name-only main:${MAGEFILE_SCRIPTS_FOLDER} > /dev/null 2>&1 ; then
137138
echo "Copying $MAGEFILE_SCRIPTS_FOLDER from $SOURCE_BRANCH..."
138139
git checkout "$SOURCE_BRANCH" -- "${MAGEFILE_SCRIPTS_FOLDER}"
140+
echo "Copying $TESTSREPORTER_SCRIPTS_FOLDER from $SOURCE_BRANCH..."
139141
git checkout "$SOURCE_BRANCH" -- "${TESTSREPORTER_SCRIPTS_FOLDER}"
142+
echo "Copying $COVERAGE_SCRIPTS_FOLDER from $SOURCE_BRANCH..."
143+
git checkout "$SOURCE_BRANCH" -- "${COVERAGE_SCRIPTS_FOLDER}"
144+
echo "Copying magefile.go from $SOURCE_BRANCH..."
140145
git checkout "$SOURCE_BRANCH" -- "magefile.go"
141146
# Run go mod tidy to update just the dependencies related to magefile and dev scripts
142147
go mod tidy
@@ -173,7 +178,8 @@ updateBackportBranchContents() {
173178

174179
if [ "$DRY_RUN" == "true" ];then
175180
echo "DRY_RUN mode, nothing will be pushed."
176-
git --no-pager diff $SOURCE_BRANCH...$BACKPORT_BRANCH_NAME
181+
# Show just the relevant files diff (go.mod, go.sum, .buildkite, dev and package to be backported)
182+
git --no-pager diff $SOURCE_BRANCH...$BACKPORT_BRANCH_NAME go.mod go.sum .buildkite/ dev/ "packages/${PACKAGE_NAME}"
177183
else
178184
echo "Pushing..."
179185
git push origin $BACKPORT_BRANCH_NAME

‎.github/workflows/updatecli/updatecli.d/bump-latest-8x-snapshot-version.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -29,13 +29,13 @@ sources:
2929
name: Get latest snapshot
3030
kind: json
3131
spec:
32-
file: https://storage.googleapis.com/artifacts-api/snapshots/8.x.json
32+
file: https://storage.googleapis.com/artifacts-api/snapshots/8.19.json
3333
key: .version
3434
latestSnapshotMajorMinor:
3535
name: Get latest snapshort major and minor
3636
kind: json
3737
spec:
38-
file: https://storage.googleapis.com/artifacts-api/snapshots/8.x.json
38+
file: https://storage.googleapis.com/artifacts-api/snapshots/8.19.json
3939
key: .version
4040
transformers:
4141
- findsubmatch:

‎packages/apm/agent/input/template.yml.hbs‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -73,3 +73,4 @@ apm-server:
7373
ttl: {{tail_sampling_ttl}}
7474
policies: {{tail_sampling_policies}}
7575
storage_limit: {{tail_sampling_storage_limit}}
76+
discard_on_write_failure: {{tail_sampling_discard_on_write_failure}}

‎packages/apm/changelog.yml‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,8 @@
1+
- version: 9.1.0-preview-1747764883
2+
changes:
3+
- description: Add integration policy variable `tail_sampling_discard_on_write_failure` to configure `apm-server.sampling.tail.discard_on_write_failure`
4+
type: enhancement
5+
link: https://github.com/elastic/integrations/pull/13950
16
- version: 9.1.0-preview-1744129488
27
changes:
38
- description: Add integration policy variable `tail_sampling_ttl` to configure `apm-server.sampling.tail.ttl`

‎packages/apm/manifest.yml‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
format_version: 3.1.0
22
name: apm
33
title: Elastic APM
4-
version: 9.1.0-preview-1744129488
4+
version: 9.1.0-preview-1747764883
55
description: Monitor, detect, and diagnose complex application performance issues.
66
type: integration
77
categories: ["elastic_stack", "monitoring"]
@@ -175,6 +175,9 @@ policy_templates:
175175
- name: tail_sampling_storage_limit
176176
type: text
177177
default: "0GB"
178+
- name: tail_sampling_discard_on_write_failure
179+
type: bool
180+
default: false
178181
template_path: template.yml.hbs
179182
owner:
180183
type: elastic

‎packages/aws/_dev/build/docs/firewall.md‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@ For example, you could use this integration to view and track when firewall rule
1313
The AWS Network Firewall integration collects two types of data: logs and metrics.
1414

1515
**Logs** help you keep a record of events happening in AWS Network Firewall.
16+
All three types of logs recorded by [AWS Network Firewall](https://docs.aws.amazon.com/network-firewall/latest/developerguide/firewall-logging.html) can be collected by the integration: `Flow`, `Alert` and `TLS` logs.
1617
Logs collected by the AWS Network Firewall integration include the observer name, source and destination IP, port, country, event type, and more. See more details in the [Logs reference](#logs-reference).
1718

1819
**Metrics** give you insight into the state of Network Firewall.

‎packages/aws/changelog.yml‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,9 @@
11
# newer versions go on top
2+
- version: "3.3.3"
3+
changes:
4+
- description: Update README - Document ingested log types of AWS Network Firewall.
5+
type: enhancement
6+
link: https://github.com/elastic/integrations/pull/13978
27
- version: "3.3.2"
38
changes:
49
- description: Update README - EC2 Instance IAM Role for AWS Authentication

‎packages/aws/docs/firewall.md‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@ For example, you could use this integration to view and track when firewall rule
1313
The AWS Network Firewall integration collects two types of data: logs and metrics.
1414

1515
**Logs** help you keep a record of events happening in AWS Network Firewall.
16+
All three types of logs recorded by [AWS Network Firewall](https://docs.aws.amazon.com/network-firewall/latest/developerguide/firewall-logging.html) can be collected by the integration: `Flow`, `Alert` and `TLS` logs.
1617
Logs collected by the AWS Network Firewall integration include the observer name, source and destination IP, port, country, event type, and more. See more details in the [Logs reference](#logs-reference).
1718

1819
**Metrics** give you insight into the state of Network Firewall.

‎packages/aws/manifest.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
format_version: 3.3.2
22
name: aws
33
title: AWS
4-
version: 3.3.2
4+
version: 3.3.3
55
description: Collect logs and metrics from Amazon Web Services (AWS) with Elastic Agent.
66
type: integration
77
categories:

‎packages/cribl/_dev/build/docs/README.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,6 +42,6 @@ The Cribl integration offers users a way to ingest logs from either of Cribl's E
4242

4343
1. Set **Cloud Id** for the Cloud destination or **Bulk API URLs** for the Elasticsearch destination to point to your Elastic cluster.
4444

45-
2. Set **Index or Data Stream** to `logs-cribl-default`.
45+
2. Set **Index or Data Stream** to `logs-cribl-default` for log-type events or to `metrics-cribl-default` for metric-type events.
4646

4747
3. **API key** should be a Base64 encoded Elastic API key, which you can create in Kibana by following the instructions under **Management** > **Stack Management** > **Security** > **API Keys**. If you are using an API key with “Restrict privileges”, be sure to review the Indices privileges to provide at least "auto_configure" and "write" permissions for the logs-* index, which you will be using for these Fleet integration data streams.

0 commit comments

Comments
 (0)