Merge branch 'main' into issue-262-new-lambda-dataset

Author: agithomas

.buildkite/hooks/pre-exit

@@ -4,23 +4,15 @@ source .buildkite/scripts/common.sh
 
 set -euo pipefail
 
-if [[ "$BUILDKITE_PIPELINE_SLUG" =~ ^(integrations|integrations-test-stack)$ ]]; then
-    # FIXME: update condition depending on the pipeline steps triggered
-    if [[ "$BUILDKITE_STEP_KEY" =~ ^test-integrations- ]]; then
-
-        # Ensure that kind cluster is deleted
-        delete_kind_cluster
-
-        # Ensure elastic stack is stopped
-        if [ -f "${ELASTIC_PACKAGE_BIN}" ]; then
-            echo "--- Take down the Elastic stack"
-            ${ELASTIC_PACKAGE_BIN} stack down -v
-        fi
-    fi
+if [[ "$BUILDKITE_PIPELINE_SLUG" == "integrations-backport" && "$BUILDKITE_STEP_KEY" == "create-backport-branch" ]]; then
+  cd "${WORKSPACE}"
+  git config remote.origin.url "https://github.com/elastic/integrations.git"
 fi
 
-if [[ "$BUILDKITE_PIPELINE_SLUG" == "integrations-serverless" ]]; then
-    if [[ "$BUILDKITE_STEP_KEY" == "test-integrations-serverless-project" ]]; then
+if [[ "$BUILDKITE_PIPELINE_SLUG" =~ ^(integrations|integrations-test-stack|integrations-serverless)$ ]]; then
+    # it should match "^test-integration-" steps created in the integrations and integrations-test-stack pipelines (e.g. test-integration-apache or test-integration-aws)
+    # as well as the step ID "test-integrations-serverless-project" from the "integrations-serverless" pipeline
+    if [[ "$BUILDKITE_STEP_KEY" =~ ^test-integrations- ]]; then
 
         # Ensure that kind cluster is deleted
         delete_kind_cluster
@@ -30,13 +22,13 @@ if [[ "$BUILDKITE_PIPELINE_SLUG" == "integrations-serverless" ]]; then
             echo "--- Take down the Elastic stack"
             ${ELASTIC_PACKAGE_BIN} stack down -v
         fi
+
+        echo "+++ :bookmark: Documentation to access logs"
+        inline_link "https://docs.elastic.dev/ingest-dev-docs/elastic-packages/ecosystem-ci-pipelines#private-logs"
     fi
 fi
 
+echo "--- Cleaning up"
 unset_secrets
 cleanup
 
-if [[ "$BUILDKITE_PIPELINE_SLUG" == "integrations-backport" && "$BUILDKITE_STEP_KEY" == "create-backport-branch" ]]; then
-  cd "${WORKSPACE}"
-  git config remote.origin.url "https://github.com/elastic/integrations.git"
-fi

.buildkite/scripts/common.sh

@@ -1109,3 +1109,19 @@ get_comment_with_pattern() {
 
     echo "${comment_id}"
 }
+
+## Buildkite output
+# https://buildkite.com/docs/pipelines/configure/links-and-images-in-log-output#links
+inline_link() {
+    local url="$1"
+    local text="${2:-""}"
+    local link=""
+
+    link=$(printf "url='%s'" "$url")
+
+    if [[ "${text}" != "" ]]; then
+        link=$(printf "%s;content='%s'" "$link" "$text")
+    fi
+
+    printf '\033]1339;%s\a\n' "$link"
+}

.github/workflows/block-paths.yml

@@ -4,6 +4,11 @@
     - description: Add AWS lambda logs dataset.
       type: enhancement
       link: https://github.com/elastic/integrations/pull/14070
+- version: "3.5.1"
+  changes:
+    - description: Change Redshift terraform node type because `dc2.large` is deprecated and leads to system tests fails.
+      type: enhancement
+      link: https://github.com/elastic/integrations/pull/14169
 - version: "3.5.0"
   changes:
     - description: Add the `external_id` field to data streams collecting data from S3.

packages/aws/changelog.yml

@@ -19,7 +19,7 @@ resource "aws_redshift_cluster" "test_cluster" {
   database_name       = "mydb"
   master_username     = "exampleuser"
   master_password     = "Mustbe8characters"
-  node_type           = "dc2.large"
+  node_type           = "ra3.large"
   cluster_type        = "single-node"
   skip_final_snapshot = "true"
 }

packages/aws/data_stream/redshift/_dev/deploy/tf/main.tf

@@ -1,3 +1,8 @@
+- version: "1.2.2"
+  changes:
+    - description: Fix the incorrect aggregation used in the Model Usage panel of the Amazon Bedrock Overview dashboard.
+      type: bugfix
+      link: https://github.com/elastic/integrations/pull/14123
 - version: "1.2.1"
   changes:
     - description: Fix handling of S3/SQS worker count configuration.

packages/aws_bedrock/changelog.yml

@@ -2916,9 +2916,8 @@
         "version": 2
     },
     "coreMigrationVersion": "8.8.0",
-    "created_at": "2025-02-14T10:00:25.551Z",
+    "created_at": "2025-06-03T09:45:24.964Z",
     "id": "aws_bedrock-14fd745a-d3c1-4ebe-bd25-00b465336cde",
-    "managed": false,
     "references": [
         {
             "id": "metrics-*",
@@ -3037,6 +3036,5 @@
         }
     ],
     "type": "dashboard",
-    "typeMigrationVersion": "10.2.0",
-    "updated_by": "u_mGBROF_q5bmFCATbLXAcCwKa0k8JvONAwSruelyKA5E_0"
+    "typeMigrationVersion": "10.2.0"
 }

packages/aws_bedrock/kibana/dashboard/aws_bedrock-14fd745a-d3c1-4ebe-bd25-00b465336cde.json

@@ -451,6 +451,7 @@
                             "adHocDataViews": {},
                             "datasourceStates": {
                                 "formBased": {
+                                    "currentIndexPatternId": "metrics-*",
                                     "layers": {
                                         "94286ada-c213-4185-8d61-6285ea6d56c0": {
                                             "columnOrder": [
@@ -486,8 +487,8 @@
                                                 "d568367b-f431-4305-b905-dfcd9c1db633": {
                                                     "dataType": "number",
                                                     "isBucketed": false,
-                                                    "label": "Median of aws_bedrock.runtime.invocations",
-                                                    "operationType": "median",
+                                                    "label": "Sum of aws_bedrock.runtime.invocations",
+                                                    "operationType": "sum",
                                                     "params": {
                                                         "emptyAsNull": true
                                                     },
@@ -497,6 +498,7 @@
                                             },
                                             "ignoreGlobalFilters": false,
                                             "incompleteColumns": {},
+                                            "indexPatternId": "metrics-*",
                                             "sampling": 1
                                         }
                                     }
@@ -2752,9 +2754,8 @@
         "version": 2
     },
     "coreMigrationVersion": "8.8.0",
-    "created_at": "2025-02-14T07:39:37.082Z",
+    "created_at": "2025-06-03T09:57:05.155Z",
     "id": "aws_bedrock-2a19b571-251b-487b-84b2-abd887efb8a4",
-    "managed": true,
     "references": [
         {
             "id": "metrics-*",
@@ -2858,5 +2859,6 @@
         }
     ],
     "type": "dashboard",
-    "typeMigrationVersion": "10.2.0"
+    "typeMigrationVersion": "10.2.0",
+    "updated_by": "u_mGBROF_q5bmFCATbLXAcCwKa0k8JvONAwSruelyKA5E_0"
 }

packages/aws_bedrock/kibana/dashboard/aws_bedrock-2a19b571-251b-487b-84b2-abd887efb8a4.json

@@ -3,7 +3,7 @@ name: aws_bedrock
 title: Amazon Bedrock
 description: Collect Amazon Bedrock model invocation logs and runtime metrics with Elastic Agent.
 type: integration
-version: "1.2.1"
+version: "1.2.2"
 categories:
   - aws
   - cloud