From 8e418a6141ce1a0bc084d3c78715e0c8f866feac Mon Sep 17 00:00:00 2001 From: Andrew Cholakian Date: Wed, 12 Oct 2022 12:03:53 -0500 Subject: [PATCH 1/6] [Heartbeat] Only support elasticsearch output for synthetics integration Heartbeat should only support the elasticsearch output due to the requirement that we connect back to ES to retrieve prior state, as well as the complex and exacting nature of our schema. --- internal/spec/heartbeat.yml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/internal/spec/heartbeat.yml b/internal/spec/heartbeat.yml index ecb373cf791..640cbfa1c91 100644 --- a/internal/spec/heartbeat.yml +++ b/internal/spec/heartbeat.yml @@ -20,5 +20,4 @@ rules: - inputs - output - keystore -when: length(${inputs}) > 0 and hasKey(${output}, 'elasticsearch', 'redis', - 'kafka', 'logstash') +when: length(${inputs}) > 0 and hasKey(${output}, 'elasticsearch') # Heartbeat only supports ES From 0873f192b4c82a53b5c47f1b6a517b2c67341de1 Mon Sep 17 00:00:00 2001 From: Andrew Cholakian Date: Fri, 14 Oct 2022 15:43:12 -0500 Subject: [PATCH 2/6] Add buildspec --- internal/pkg/agent/program/supported.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/internal/pkg/agent/program/supported.go b/internal/pkg/agent/program/supported.go index 52685137b97..ed17610fcb5 100644 --- a/internal/pkg/agent/program/supported.go +++ b/internal/pkg/agent/program/supported.go @@ -27,7 +27,7 @@ func init() { // internal/spec/metricbeat.yml // internal/spec/osquerybeat.yml // internal/spec/packetbeat.yml - unpacked := packer.MustUnpack("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") + unpacked := packer.MustUnpack("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") SupportedMap = make(map[string]Spec) for f, v := range unpacked { From 24ac8e38ffb626fb07d9c5ac02271ffc08854573 Mon Sep 17 00:00:00 2001 From: Andrew Cholakian Date: Fri, 14 Oct 2022 15:44:40 -0500 Subject: [PATCH 3/6] Add changelog --- CHANGELOG.next.asciidoc | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG.next.asciidoc b/CHANGELOG.next.asciidoc index f8033809cb4..9528052cda6 100644 --- a/CHANGELOG.next.asciidoc +++ b/CHANGELOG.next.asciidoc @@ -19,6 +19,7 @@ - The `/processes/` endpoint proxies to the subprocess's monitoring endpoint, instead of querying its `/stats` endpoint {pull-beats}[28165] - Remove username/password for fleet-server authentication. {pull-beats}[29458] - Upgrade to Go 1.18. Certificates signed with SHA-1 are now rejected. See the Go 1.18 https://tip.golang.org/doc/go1.18#sha1[release notes] for details. {pull}832[832] +- Synthetics (beta) integration no longer supports output to Logstash, only Elasticsearch ==== Bugfixes - Fix rename *ConfigChange to *PolicyChange to align on changes in the UI. {pull-beats}[20779] From 19179bfcb997eef3225c4de5cd472914e80cf6cd Mon Sep 17 00:00:00 2001 From: Craig MacKenzie Date: Wed, 19 Oct 2022 10:24:15 -0400 Subject: [PATCH 4/6] Remove test that configures heartbeat+logstash --- internal/pkg/agent/program/program_test.go | 2 +- .../testdata/logstash_config-heartbeat.yml | 29 ------------------- 2 files changed, 1 insertion(+), 30 deletions(-) delete mode 100644 internal/pkg/agent/program/testdata/logstash_config-heartbeat.yml diff --git a/internal/pkg/agent/program/program_test.go b/internal/pkg/agent/program/program_test.go index a318d23e02a..cd095d3e481 100644 --- a/internal/pkg/agent/program/program_test.go +++ b/internal/pkg/agent/program/program_test.go @@ -393,7 +393,7 @@ func TestConfiguration(t *testing.T) { }, "logstash_config": { programs: map[string][]string{ - "default": {"filebeat", "fleet-server", "heartbeat", "metricbeat", "endpoint", "packetbeat"}, + "default": {"filebeat", "fleet-server", "metricbeat", "endpoint", "packetbeat"}, "elasticsearch": {"filebeat"}, }, }, diff --git a/internal/pkg/agent/program/testdata/logstash_config-heartbeat.yml b/internal/pkg/agent/program/testdata/logstash_config-heartbeat.yml deleted file mode 100644 index fbddfbe022e..00000000000 --- a/internal/pkg/agent/program/testdata/logstash_config-heartbeat.yml +++ /dev/null @@ -1,29 +0,0 @@ -inputs: -- type: synthetics/http - id: unique-http-id - name: my-http - schedule: '*/5 * * * * * *' - host: "http://localhost:80/service/status" - timeout: 16s - wait: 1s - data_stream.namespace: default - processors: - - add_fields: - target: 'elastic_agent' - fields: - id: agent-id - version: 8.0.0 - snapshot: false - - add_fields: - target: 'agent' - fields: - id: agent-id -output: - logstash: - ssl.certificate: abcert - ssl.key: abckey - hosts: - - 127.0.0.1:5044 - ssl.certificate_authorities: - - abc1 - - abc2 From df9bf19217898e4f91cd47f7a9eda51ffe924893 Mon Sep 17 00:00:00 2001 From: Andrew Cholakian Date: Wed, 19 Oct 2022 15:07:29 -0500 Subject: [PATCH 5/6] Update changelog/fragments/1665780486-heartbeat-es-output-only.yaml Co-authored-by: Craig MacKenzie --- changelog/fragments/1665780486-heartbeat-es-output-only.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/changelog/fragments/1665780486-heartbeat-es-output-only.yaml b/changelog/fragments/1665780486-heartbeat-es-output-only.yaml index 225edae13c9..762c8c9008a 100644 --- a/changelog/fragments/1665780486-heartbeat-es-output-only.yaml +++ b/changelog/fragments/1665780486-heartbeat-es-output-only.yaml @@ -11,7 +11,7 @@ kind: feature # Change summary; a 80ish characters long description of the change. -summary: heartbeat-es-output-only +summary: Only support elasticsearch as an output for the beta synthetics integration. # Long description; in case the summary is not enough to describe the change # this field accommodate a description without length limits. From 24d3d39f0a77c18f4d1157bbff6a84369ba75a4a Mon Sep 17 00:00:00 2001 From: Andrew Cholakian Date: Wed, 19 Oct 2022 15:07:38 -0500 Subject: [PATCH 6/6] Update changelog/fragments/1665780486-heartbeat-es-output-only.yaml Co-authored-by: Craig MacKenzie --- changelog/fragments/1665780486-heartbeat-es-output-only.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/changelog/fragments/1665780486-heartbeat-es-output-only.yaml b/changelog/fragments/1665780486-heartbeat-es-output-only.yaml index 762c8c9008a..1e3b4059ddf 100644 --- a/changelog/fragments/1665780486-heartbeat-es-output-only.yaml +++ b/changelog/fragments/1665780486-heartbeat-es-output-only.yaml @@ -15,7 +15,7 @@ summary: Only support elasticsearch as an output for the beta synthetics integra # Long description; in case the summary is not enough to describe the change # this field accommodate a description without length limits. -description: only support elasticsearch as an output for the beta synthetics integration +# description: # Affected component; a word indicating the component this changeset affects. component: synthetics-integration