From dc826eb5db404d714d1217dd6f8484a5073ff3be Mon Sep 17 00:00:00 2001 From: Pavel Zorin Date: Wed, 17 Apr 2024 09:29:01 +0200 Subject: [PATCH 1/3] Added an empty ironbank target to agentbeat (#39004) --- x-pack/agentbeat/magefile.go | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/x-pack/agentbeat/magefile.go b/x-pack/agentbeat/magefile.go index 571f87f74455..874c79bf7a30 100644 --- a/x-pack/agentbeat/magefile.go +++ b/x-pack/agentbeat/magefile.go @@ -134,6 +134,14 @@ func TestPackages() error { return devtools.TestPackages() } +// Package packages the Beat for IronBank distribution. +// +// Use SNAPSHOT=true to build snapshots. +func Ironbank() error { + fmt.Println(">> Ironbank: this module is not subscribed to the IronBank releases.") + return nil +} + // Update is an alias for running fields, dashboards, config. func Update() { callForEachBeat("update") From 5bc43ff59e65d23fc1f712e93b8b08f2f45fbf9e Mon Sep 17 00:00:00 2001 From: ShourieG <105607378+ShourieG@users.noreply.github.com> Date: Wed, 17 Apr 2024 14:13:02 +0530 Subject: [PATCH 2/3] [filebeat][websocket] - Updated Input title to align with existing inputs (#39006) * Updated input title to align with existing inputs --- CHANGELOG.next.asciidoc | 1 + x-pack/filebeat/docs/inputs/input-websocket.asciidoc | 4 ++++ 2 files changed, 5 insertions(+) diff --git a/CHANGELOG.next.asciidoc b/CHANGELOG.next.asciidoc index bd82b306d17c..16af0b1a6526 100644 --- a/CHANGELOG.next.asciidoc +++ b/CHANGELOG.next.asciidoc @@ -133,6 +133,7 @@ https://github.com/elastic/beats/compare/v8.8.1\...main[Check the HEAD diff] - [threatintel] MISP splitting fix for empty responses {issue}38739[38739] {pull}38917[38917] - Prevent GCP Pub/Sub input blockage by increasing default value of `max_outstanding_messages` {issue}35029[35029] {pull}38985[38985] - Fix config validation for CEL and HTTPJSON inputs when using password grant authentication and `client.id` or `client.secret` are not present. {pull}38962[38962] +- Updated Websocket input title to align with existing inputs {pull}39006[39006] *Heartbeat* diff --git a/x-pack/filebeat/docs/inputs/input-websocket.asciidoc b/x-pack/filebeat/docs/inputs/input-websocket.asciidoc index 8ee2da2b42ad..9e08060a22b5 100644 --- a/x-pack/filebeat/docs/inputs/input-websocket.asciidoc +++ b/x-pack/filebeat/docs/inputs/input-websocket.asciidoc @@ -8,6 +8,10 @@ === Websocket Input experimental[] +++++ +Websocket +++++ + The `websocket` input reads messages from a websocket server or api endpoint. This input uses the `CEL engine` and the `mito` library interally to parse and process the messages. Having support for `CEL` allows you to parse and process the messages in a more flexible way. It has many similarities with the `cel` input as to how the `CEL` programs are written but deviates in the way the messages are read and processed. The `websocket` input is a `streaming` input and can only be used to read messages from a websocket server or api endpoint. This input supports: From 1ade6d21421fb5f750bcc70f7d141ae228132eea Mon Sep 17 00:00:00 2001 From: Pavel Zorin Date: Wed, 17 Apr 2024 12:51:54 +0200 Subject: [PATCH 3/3] Fix msitools installation for packaging pipeline (#39005) * Test packaging * Moved msitool to earlier install phase * Moved msitool to earlier install phase * fix: run within the withBeatsEnv context * Cleanup * Inline the msitool script * Removed arm docker build step from agentbeat --------- Co-authored-by: Victor Martinez --- .ci/packaging.groovy | 16 +++++++++++----- 1 file changed, 11 insertions(+), 5 deletions(-) diff --git a/.ci/packaging.groovy b/.ci/packaging.groovy index 480fce0df70d..ea8f8f7daefe 100644 --- a/.ci/packaging.groovy +++ b/.ci/packaging.groovy @@ -222,7 +222,6 @@ def generateSteps() { 'heartbeat', 'metricbeat', 'packetbeat', - 'x-pack/agentbeat', 'x-pack/auditbeat', 'x-pack/dockerlogbeat', 'x-pack/filebeat', @@ -282,9 +281,6 @@ def generateLinuxStep(beat) { withEnv(["HOME=${env.WORKSPACE}", "PLATFORMS=${linuxPlatforms()}", "BEATS_FOLDER=${beat}"]) { withGithubNotify(context: "Packaging Linux ${beat}") { deleteDir() - if (beat.equals('x-pack/agentbeat') || beat.equals('x-pack/osquerybeat')) { - sh(label: 'install msitools', script: '.buildkite/scripts/install-msitools.sh') - } release('snapshot') dir("${BASE_DIR}"){ pushCIDockerImages(arch: 'amd64') @@ -382,6 +378,16 @@ def release(type){ withEnv([ "DEV=${!type.equals('staging')}" ]) { + dir("${BASE_DIR}"){ + if (env.BEATS_FOLDER.equals('x-pack/agentbeat') || env.BEATS_FOLDER.equals('x-pack/osquerybeat')) { + // sh(label: 'install msitools', script: '.buildkite/scripts/install-msitools.sh') + sh '''#!/usr/bin/env bash + set -euo pipefail + sudo apt-get update -y + DEBIAN_FRONTEND=noninteractive sudo apt-get install --no-install-recommends --yes msitools + ''' + } + } dockerLogin(secret: "${DOCKERELASTIC_SECRET}", registry: "${DOCKER_REGISTRY}") dir("${env.BEATS_FOLDER}") { sh(label: "mage package ${type} ${env.BEATS_FOLDER} ${env.PLATFORMS}", script: 'mage package') @@ -451,4 +457,4 @@ def notifyStatus(def args = [:]) { to: "${env.NOTIFY_TO}", subject: subject, body: "Build: (<${env.RUN_DISPLAY_URL}|here>).\n ${body}") -} +} \ No newline at end of file