Skip to content

Commit 779d9af

Browse files
teresaromeroteresaromero
authored
Merge branch 'main' into fix-duplicate-tags-obs-infraobs
2 parents e36c854 + dbaf700 commit 779d9af

231 files changed

Lines changed: 13057 additions & 1070 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/pipeline.schedule-daily.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ steps:
3434
env:
3535
SERVERLESS: "false"
3636
FORCE_CHECK_ALL: "true"
37-
STACK_VERSION: 8.19.10-SNAPSHOT
37+
STACK_VERSION: 8.19.11-SNAPSHOT
3838
PUBLISH_COVERAGE_REPORTS: "true"
3939
depends_on:
4040
- step: "check"
@@ -48,7 +48,7 @@ steps:
4848
env:
4949
SERVERLESS: "false"
5050
FORCE_CHECK_ALL: "true"
51-
STACK_VERSION: 8.19.10-SNAPSHOT
51+
STACK_VERSION: 8.19.11-SNAPSHOT
5252
STACK_LOGSDB_ENABLED: "true"
5353
PUBLISH_COVERAGE_REPORTS: "false"
5454
depends_on:

‎.buildkite/pipeline.schedule-weekly.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ steps:
2121
env:
2222
SERVERLESS: "false"
2323
FORCE_CHECK_ALL: "true"
24-
STACK_VERSION: 8.19.10-SNAPSHOT
24+
STACK_VERSION: 8.19.11-SNAPSHOT
2525
PUBLISH_COVERAGE_REPORTS: "false"
2626
ELASTIC_PACKAGE_DISABLE_ELASTIC_AGENT_WOLFI: "true"
2727
depends_on:

‎.buildkite/scripts/packages/security_detection_engine.sh‎

Lines changed: 57 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -6,9 +6,48 @@ if [[ "${BUILDKITE_PULL_REQUEST}" == "false" ]]; then
66
exit 0
77
fi
88

9-
# Fetch active Kibana versions
10-
ACTIVE_KIBANA_VERSIONS=$(curl -sL https://raw.githubusercontent.com/elastic/kibana/main/versions.json | yq '.versions[].version' | xargs)
11-
echo "Active Kibana versions: $ACTIVE_KIBANA_VERSIONS"
9+
# Use Release API to get released and supported Elastic Stack versions
10+
PAST_RELEASES_URL="https://ela.st/past-stack-releases"
11+
PAST_VERSIONS=$(curl -sL $PAST_RELEASES_URL | jq -r '
12+
.releases
13+
| map(
14+
select(
15+
.is_end_of_support == false
16+
and .is_retired == false
17+
and (.version | test("^\\d+\\.\\d+\\.\\d+$"))
18+
)
19+
)
20+
| group_by(
21+
.version
22+
| capture("^(?<maj>\\d+)\\.(?<min>\\d+)")
23+
| "\(.maj).\(.min)"
24+
)
25+
| map(
26+
max_by(
27+
.version
28+
| split(".")
29+
| map(tonumber)
30+
)
31+
)
32+
| .[].version'
33+
)
34+
35+
FUTURE_RELEASES_URL="https://ela.st/future-stack-releases"
36+
FUTURE_VERSIONS=$(curl -sL $FUTURE_RELEASES_URL | jq -r '
37+
.releases[]
38+
| select(.active_release == true)
39+
| select(
40+
.snapshots
41+
| to_entries
42+
| any(.value.date_removed > (now | strftime("%Y-%m-%d %H:%M:%S")))
43+
)
44+
| "\(.version)-SNAPSHOT"
45+
'
46+
)
47+
48+
ACTIVE_VERSIONS="$(echo -e "${PAST_VERSIONS}\n${FUTURE_VERSIONS}" | sort -V | xargs)"
49+
50+
echo "Active Elastic Stack versions: $ACTIVE_VERSIONS"
1251

1352
# Extract version spec from the manifest
1453
KIBANA_REQ=$(yq .conditions.kibana.version ./packages/security_detection_engine/manifest.yml)
@@ -34,16 +73,27 @@ func main() {
3473
panic(err)
3574
}
3675
37-
for _, s := range strings.Split(os.Args[2], " ") {
38-
if v, _ := semver.NewVersion(s); c.Check(v) {
39-
fmt.Println(s + "-SNAPSHOT")
76+
for _, s := range strings.Split(os.Args[2], " ") {
77+
checkVersion := s
78+
79+
if strings.HasSuffix(s, "-SNAPSHOT") {
80+
checkVersion = strings.TrimSuffix(s, "-SNAPSHOT")
81+
}
82+
83+
v, err := semver.NewVersion(checkVersion)
84+
if err != nil {
85+
continue
86+
}
87+
88+
if c.Check(v) {
89+
fmt.Println(s)
4090
}
4191
}
4292
}
4393
GO
4494

4595
# Capture the "returned" array in STACK_VERSIONS
46-
read -r -a STACK_VERSIONS <<< "$(go run "${SEMVER_FILTER_PATH}" "${KIBANA_REQ}" "${ACTIVE_KIBANA_VERSIONS}" | xargs)"
96+
read -r -a STACK_VERSIONS <<< "$(go run "${SEMVER_FILTER_PATH}" "${KIBANA_REQ}" "${ACTIVE_VERSIONS}" | xargs)"
4797

4898
if [[ ! -n "${STACK_VERSIONS+x}" ]]; then
4999
echo "There are no active versions satisfying the constraint ${KIBANA_REQ}."

‎.github/CODEOWNERS‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -92,6 +92,7 @@
9292
/packages/aws_securityhub @elastic/security-service-integrations
9393
/packages/aws_bedrock_agentcore @elastic/obs-infraobs-integrations
9494
/packages/aws_vpcflow_otel @elastic/obs-infraobs-integrations
95+
/packages/aws_waf_otel @elastic/obs-infraobs-integrations
9596
/packages/awsfargate @elastic/obs-infraobs-integrations
9697
/packages/awsfirehose @elastic/obs-ds-hosted-services
9798
/packages/azure @elastic/obs-infraobs-integrations @elastic/obs-ds-hosted-services @elastic/security-service-integrations
@@ -210,6 +211,7 @@
210211
/packages/elastic_security @elastic/security-service-integrations
211212
/packages/elasticsearch @elastic/stack-monitoring
212213
/packages/aws_elb_otel @elastic/obs-infraobs-integrations
214+
/packages/ece @elastic/stack-monitoring
213215
/packages/endace @elastic/integration-experience @elastic/sec-linux-platform
214216
/packages/endace/data_stream/flow @elastic/sec-linux-platform
215217
/packages/endace/data_stream/log @elastic/integration-experience

‎.github/ISSUE_TEMPLATE/integration_bug.yml‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -153,6 +153,7 @@ body:
153153
- EclecticIQ [ti_eclecticiq]
154154
- Elastic Agent [elastic_agent]
155155
- Elastic APM [apm]
156+
- Elastic Cloud Enterprise [ece]
156157
- Elastic Connectors [elastic_connectors]
157158
- Elastic Package Registry [elastic_package_registry]
158159
- Elastic Security [elastic_security]

‎.github/ISSUE_TEMPLATE/integration_feature_request.yml‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -153,6 +153,7 @@ body:
153153
- EclecticIQ [ti_eclecticiq]
154154
- Elastic Agent [elastic_agent]
155155
- Elastic APM [apm]
156+
- Elastic Cloud Enterprise [ece]
156157
- Elastic Connectors [elastic_connectors]
157158
- Elastic Package Registry [elastic_package_registry]
158159
- Elastic Security [elastic_security]

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

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -90,3 +90,21 @@ For more details about enabling logs for AgentCore, check the [Amazon Bedrock Ag
9090

9191
{{event "runtime_application_logs"}}
9292
{{fields "runtime_application_logs"}}
93+
94+
### Memory Application Logs
95+
96+
Amazon Bedrock AgentCore Memory application logs provide detailed insights into memory operations, including data storage, retrieval, and updates performed by your agents. These logs help you monitor memory usage, track changes to stored knowledge, and troubleshoot issues related to agent memory management.
97+
98+
For more details about enabling logs for AgentCore Memory, see the [Amazon Bedrock AgentCore Observability Guide](https://docs.aws.amazon.com/bedrock-agentcore/latest/devguide/observability-view.html).
99+
100+
{{event "memory_application_logs"}}
101+
{{fields "memory_application_logs"}}
102+
103+
### Gateway Application Logs
104+
105+
Amazon Bedrock AgentCore Gateway application logs provide detailed insights into API requests, message routing, and interaction between agents and external systems. These logs help you monitor gateway operations, troubleshoot connectivity issues, and understand the flow of agent communications.
106+
107+
For more details about enabling logs for the AgentCore Gateway, see the [Amazon Bedrock AgentCore Observability Guide](https://docs.aws.amazon.com/bedrock-agentcore/latest/devguide/observability-view.html).
108+
109+
{{event "gateway_application_logs"}}
110+
{{fields "gateway_application_logs"}}

‎packages/aws_bedrock_agentcore/changelog.yml‎

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,14 @@
11
# newer versions go on top
2+
- version: "0.7.0"
3+
changes:
4+
- description: Add `gateway_application_logs` logs data stream.
5+
type: enhancement
6+
link: https://github.com/elastic/integrations/pull/16587
7+
- version: "0.6.0"
8+
changes:
9+
- description: Add `memory_application_logs` logs data stream.
10+
type: enhancement
11+
link: https://github.com/elastic/integrations/pull/16588
212
- version: "0.5.0"
313
changes:
414
- description: Add `runtime_application_logs` data stream.

‎packages/aws_bedrock_agentcore/data_stream/gateway_application_logs/_dev/test/pipeline/test-aws-bedrock-agentcore-gateway.log‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
{"resource_arn":"arn:aws:bedrock-agentcore:us-west-2:845123678901:gateway/ordermanager-gw-abc12def34","event_timestamp":1768432156789,"body":{"isError":false,"log":"Processing request for tool DocumentRetrieval___fetch_order_details from target XYZPROD001","id":"7"},"account_id":"845123678901","request_id":"a1b2c3d4-5678-9012-ef34-567890abcdef","trace_id":"8e45f912abcd3456ef7890123456abcd","span_id":"9f8e7d6c5b4a3210","resource":{"attributes":{"service.name":"ordermanager-gw-abc12def34","cloud.resource_id":"arn:aws:bedrock-agentcore:us-west-2:845123678901:gateway/ordermanager-gw-abc12def34","cloud.platform":"aws_bedrock_agentcore"}},"attributes":{"aws.request.id":"a1b2c3d4-5678-9012-ef34-567890abcdef","aws.account.id":"845123678901","aws.resource.type":"AWS::BedrockAgentCore::Gateway"},"timeUnixNano":1768432156789123456,"severityNumber":9,"severityText":"INFO","traceId":"8e45f912abcd3456ef7890123456abcd","spanId":"9f8e7d6c5b4a3210"}

‎packages/aws_bedrock_agentcore/data_stream/gateway_application_logs/_dev/test/pipeline/test-aws-bedrock-agentcore-gateway.log-expected.json‎

Lines changed: 61 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,61 @@
1+
{
2+
"expected": [
3+
{
4+
"@timestamp": "2026-01-14T23:09:16.789Z",
5+
"aws": {
6+
"bedrock_agentcore": {
7+
"gateway": {
8+
"operation_name": "invoke_gateway",
9+
"payload_object": {
10+
"id": "7",
11+
"isError": false,
12+
"log": "Processing request for tool DocumentRetrieval___fetch_order_details from target XYZPROD001"
13+
},
14+
"provider_name": "aws_bedrock_agentcore",
15+
"request_id": "a1b2c3d4-5678-9012-ef34-567890abcdef",
16+
"resource_arn": "arn:aws:bedrock-agentcore:us-west-2:845123678901:gateway/ordermanager-gw-abc12def34",
17+
"severity_number": 9,
18+
"target": "XYZPROD001",
19+
"tool": {
20+
"name": "DocumentRetrieval___fetch_order_details"
21+
}
22+
}
23+
}
24+
},
25+
"cloud": {
26+
"account": {
27+
"id": "845123678901"
28+
},
29+
"provider": "aws",
30+
"service": {
31+
"name": "bedrock-agentcore"
32+
}
33+
},
34+
"ecs": {
35+
"version": "8.11.0"
36+
},
37+
"event": {
38+
"action": "DocumentRetrieval___fetch_order_details",
39+
"original": "{\"resource_arn\":\"arn:aws:bedrock-agentcore:us-west-2:845123678901:gateway/ordermanager-gw-abc12def34\",\"event_timestamp\":1768432156789,\"body\":{\"isError\":false,\"log\":\"Processing request for tool DocumentRetrieval___fetch_order_details from target XYZPROD001\",\"id\":\"7\"},\"account_id\":\"845123678901\",\"request_id\":\"a1b2c3d4-5678-9012-ef34-567890abcdef\",\"trace_id\":\"8e45f912abcd3456ef7890123456abcd\",\"span_id\":\"9f8e7d6c5b4a3210\",\"resource\":{\"attributes\":{\"service.name\":\"ordermanager-gw-abc12def34\",\"cloud.resource_id\":\"arn:aws:bedrock-agentcore:us-west-2:845123678901:gateway/ordermanager-gw-abc12def34\",\"cloud.platform\":\"aws_bedrock_agentcore\"}},\"attributes\":{\"aws.request.id\":\"a1b2c3d4-5678-9012-ef34-567890abcdef\",\"aws.account.id\":\"845123678901\",\"aws.resource.type\":\"AWS::BedrockAgentCore::Gateway\"},\"timeUnixNano\":1768432156789123456,\"severityNumber\":9,\"severityText\":\"INFO\",\"traceId\":\"8e45f912abcd3456ef7890123456abcd\",\"spanId\":\"9f8e7d6c5b4a3210\"}",
40+
"outcome": "success"
41+
},
42+
"log": {
43+
"level": "INFO"
44+
},
45+
"message": "Processing request for tool DocumentRetrieval___fetch_order_details from target XYZPROD001",
46+
"service": {
47+
"name": "ordermanager-gw-abc12def34"
48+
},
49+
"span": {
50+
"id": "9f8e7d6c5b4a3210"
51+
},
52+
"tags": [
53+
"preserve_original_event",
54+
"preserve_duplicate_custom_fields"
55+
],
56+
"trace": {
57+
"id": "8e45f912abcd3456ef7890123456abcd"
58+
}
59+
}
60+
]
61+
}

0 commit comments

Comments
 (0)