Skip to content

Commit adb5f1f

Browse files
gpop63gpop63
committed
Merge remote-tracking branch 'upstream/main' into add_aws_alert_rule_templates
2 parents 28d6878 + a6cca0a commit adb5f1f

File tree

613 files changed

+55784
-3213
lines changed

Some content is hidden

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

613 files changed

+55784
-3213
lines changed

‎.buildkite/hooks/pre-command‎

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -110,11 +110,6 @@ if [[ "${BUILDKITE_PIPELINE_SLUG}" =~ ^(integrations|integrations-test-stack)$ ]
110110
BUILDKITE_API_TOKEN=$(retry 5 vault kv get -field buildkite_token "${BUILDKITE_API_TOKEN_PATH}")
111111
export BUILDKITE_API_TOKEN
112112
fi
113-
114-
if [[ "${BUILDKITE_STEP_KEY}" =~ ^test-integrations- ]]; then
115-
BUILDKITE_API_TOKEN=$(retry 5 vault kv get -field buildkite_token "${BUILDKITE_API_TOKEN_PATH}")
116-
export BUILDKITE_API_TOKEN
117-
fi
118113
fi
119114

120115
if [[ "${BUILDKITE_PIPELINE_SLUG}" == "integrations-serverless" ]]; then

‎.github/CODEOWNERS‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -89,6 +89,7 @@
8989
/packages/aws_cloudtrail_otel @elastic/obs-infraobs-integrations
9090
/packages/aws_logs @elastic/obs-ds-hosted-services
9191
/packages/aws_mq @elastic/obs-infraobs-integrations
92+
/packages/aws_securityhub @elastic/security-service-integrations
9293
/packages/aws_bedrock_agentcore @elastic/obs-infraobs-integrations
9394
/packages/aws_vpcflow_otel @elastic/obs-infraobs-integrations
9495
/packages/awsfargate @elastic/obs-infraobs-integrations
@@ -260,6 +261,8 @@
260261
/packages/gcp_metrics @elastic/obs-ds-hosted-services
261262
/packages/gcp_pubsub @elastic/security-service-integrations
262263
/packages/gcp_vertexai @elastic/obs-infraobs-integrations
264+
/packages/gcp_audit_otel @elastic/obs-infraobs-integrations
265+
/packages/gcp_vpcflow_otel @elastic/obs-infraobs-integrations
263266
/packages/gigamon @elastic/security-service-integrations
264267
/packages/github @elastic/security-service-integrations
265268
/packages/gitlab @elastic/security-service-integrations

‎.github/ISSUE_TEMPLATE/integration_bug.yml‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -48,6 +48,7 @@ body:
4848
- AWS Cost and Usage Report (CUR 2.0) [aws_billing]
4949
- AWS ELB OpenTelemetry Assets [aws_elb_otel]
5050
- AWS Fargate (for ECS clusters) [awsfargate]
51+
- AWS Security Hub [aws_securityhub]
5152
- AWS VPC Flow Logs OpenTelemetry Assets [aws_vpcflow_otel]
5253
- AWS [aws]
5354
- Azure AI Foundry [azure_ai_foundry]
@@ -182,8 +183,10 @@ body:
182183
- Fortinet FortiMail [fortinet_fortimail]
183184
- Fortinet FortiManager Logs [fortinet_fortimanager]
184185
- Fortinet FortiProxy [fortinet_fortiproxy]
186+
- GCP Audit Logs OpenTelemetry Assets [gcp_audit_otel]
185187
- GCP Metrics Input [gcp_metrics]
186188
- GCP Vertex AI [gcp_vertexai]
189+
- GCP VPC Flow Logs OpenTelemetry Assets [gcp_vpcflow_otel]
187190
- Gigamon [gigamon]
188191
- GitHub [github]
189192
- GitLab [gitlab]

‎.github/ISSUE_TEMPLATE/integration_feature_request.yml‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -48,6 +48,7 @@ body:
4848
- AWS Cost and Usage Report (CUR 2.0) [aws_billing]
4949
- AWS ELB OpenTelemetry Assets [aws_elb_otel]
5050
- AWS Fargate (for ECS clusters) [awsfargate]
51+
- AWS Security Hub [aws_securityhub]
5152
- AWS VPC Flow Logs OpenTelemetry Assets [aws_vpcflow_otel]
5253
- AWS [aws]
5354
- Azure AI Foundry [azure_ai_foundry]
@@ -182,8 +183,10 @@ body:
182183
- Fortinet FortiMail [fortinet_fortimail]
183184
- Fortinet FortiManager Logs [fortinet_fortimanager]
184185
- Fortinet FortiProxy [fortinet_fortiproxy]
186+
- GCP Audit Logs OpenTelemetry Assets [gcp_audit_otel]
185187
- GCP Metrics Input [gcp_metrics]
186188
- GCP Vertex AI [gcp_vertexai]
189+
- GCP VPC Flow Logs OpenTelemetry Assets [gcp_vpcflow_otel]
187190
- Gigamon [gigamon]
188191
- GitHub [github]
189192
- GitLab [gitlab]

‎.github/workflows/bump-elastic-stack-version.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ jobs:
2525
- uses: actions/checkout@v6
2626

2727
- name: Install Updatecli in the runner
28-
uses: updatecli/updatecli-action@9a21b6911fe58865c8346d4fde3470010f49bf31 #v2.97.0
28+
uses: updatecli/updatecli-action@b846825b298f5351abd80f94c4f9eab63a38a804 #v2.98.0
2929

3030
- name: Select diff action
3131
if: ${{ github.event_name == 'pull_request' }}

‎docs/ci_pipelines.md‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -76,12 +76,12 @@ More details about this CI pipeline:
7676
In the following table, there are some examples:
7777

7878
| STACK_VERSION env | Kibana Condition Package | Released | Elastic stack run |
79-
| :---: | :---: | :---: | :---: |
80-
| "" | `^7.16.0 || ^8.0.0` | Yes | `7.16.0` |
81-
| "" | `^8.12.0` | Yes | `8.12.0` |
82-
| "" | `^8.14.1` | Yes | `8.14.1` |
83-
| "" | `^8.15.0` | No | `8.15.0-SNAPSHOT` |
84-
| `8.14.0` | `^8.13.0` | Yes | `8.14.0` |
79+
| :---: | :---: | :---: | :---: |
80+
| "" | `^7.16.0 \|\| ^8.0.0` | Yes | `7.16.0` |
81+
| "" | `^8.12.0` | Yes | `8.12.0` |
82+
| "" | `^8.14.1` | Yes | `8.14.1` |
83+
| "" | `^8.15.0` | No | `8.15.0-SNAPSHOT` |
84+
| `8.14.0` | `^8.13.0` | Yes | `8.14.0` |
8585

8686
If the STACK_VERSION environment variable is defined, just the packages supporting that stack version are tested. For instance:
8787

‎docs/extend/elastic-package.md‎

Lines changed: 0 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -247,25 +247,6 @@ Use this command to add, remove, and manage multiple config profiles.
247247
Individual user profiles appear in ~/.elastic-package/stack and contain all the config files needed by the "stack" subcommand. Once a new profile is created, it can be specified with the -p flag, or the ELASTIC_PACKAGE_PROFILE environment variable. User profiles are not overwritten on an upgrade of elastic-stack and can be freely modified to allow for different stack configs.
248248

249249

250-
### `elastic-package promote` [_elastic_package_promote]
251-
252-
*Context: global*
253-
254-
Use this command to move packages between the {{package-registry}} snapshot, staging, and production stages.
255-
256-
This command is intended primarily for use by administrators.
257-
258-
It allows for selecting packages for promotion and opens new pull requests to review changes. However, please be aware that the tool checks out an in-memory Git repository and switches over branches (snapshot, staging and production), so it may take longer to promote a larger number of packages.
259-
260-
261-
### `elastic-package publish` [_elastic_package_publish]
262-
263-
*Context: package*
264-
265-
Use this command to publish a new package revision.
266-
267-
The command checks if the package has already been published (whether it’s present in the snapshot/staging/production branch or open as pull request). If the package revision hasn’t been published, it will open a new pull request.
268-
269250
### `elastic-package report` [_elastic_package_report]
270251

271252
*Context: package*

‎packages/akamai/changelog.yml‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,12 @@
11
# newer versions go on top
2+
- version: "3.1.0"
3+
changes:
4+
- description: Add recovery_interval parameter to control lookback period during recovery mode.
5+
type: enhancement
6+
link: https://github.com/elastic/integrations/pull/16568
7+
- description: Handle 400 status code with invalid timestamp error switching to recovery mode.
8+
type: bugfix
9+
link: https://github.com/elastic/integrations/pull/16568
210
- version: "3.0.2"
311
changes:
412
- description: Fix the issue of populating tags and terminate the pipeline on agent failures.

‎packages/akamai/data_stream/siem/agent/stream/cel.yml.hbs‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,7 @@ state:
2424
access_token: {{access_token}}
2525
client_secret: {{client_secret}}
2626
initial_interval: {{initial_interval}}
27+
recovery_interval: {{recovery_interval}}
2728
event_limit: {{event_limit}}
2829

2930
redact:
@@ -37,7 +38,7 @@ program: |-
3738
(
3839
state.?cursor.recovery_mode.orValue(false) ?
3940
{
40-
"from": int(now - duration("12h")),
41+
"from": int(now - duration(state.recovery_interval)),
4142
"to": int(now - duration("1m")),
4243
}
4344
: state.?cursor.last_offset.hasValue() ?
@@ -112,7 +113,7 @@ program: |-
112113
"want_more": lines.size() >= int(state.event_limit),
113114
}
114115
)
115-
: (resp.StatusCode == 416) ?
116+
: (resp.StatusCode == 416 || (resp.StatusCode == 400 && size(resp.Body) != 0 && bytes(resp.Body).decode_json().as(errorBody, has(errorBody.detail) && errorBody.detail.to_lower().contains("invalid timestamp")))) ?
116117
{
117118
"events": [
118119
{

‎packages/akamai/data_stream/siem/manifest.yml‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -69,6 +69,14 @@ streams:
6969
show_user: true
7070
default: 12h
7171
description: Initial interval to poll for events. Default is the maximum allowed value of 12 hours. Supported units for this parameter are h/m/s.
72+
- name: recovery_interval
73+
type: text
74+
title: Recovery Interval
75+
multi: false
76+
required: true
77+
show_user: false
78+
default: 12h
79+
description: Lookback period for data retrieval when the integration enters recovery mode. Default and maximum allowed value is 12 hours. Supported units for this parameter are h/m/s.
7280
- name: event_limit
7381
type: integer
7482
multi: false

0 commit comments

Comments
 (0)