Skip to content

Commit

Permalink
[Heartbeat] Only support elasticsearch output for synthetics integrat…
Browse files Browse the repository at this point in the history
…ion (#1491)

* [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.

* Add buildspec
* Add changelog
* Remove test that configures heartbeat+logstash

Co-authored-by: mergify[bot] <37929162+mergify[bot]@users.noreply.github.com>
Co-authored-by: Craig MacKenzie <craig.mackenzie@elastic.co>
  • Loading branch information
3 people authored Oct 19, 2022
1 parent 97b8834 commit f2ee0d3
Show file tree
Hide file tree
Showing 5 changed files with 34 additions and 33 deletions.
31 changes: 31 additions & 0 deletions changelog/fragments/1665780486-heartbeat-es-output-only.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,31 @@
# Kind can be one of:
# - breaking-change: a change to previously-documented behavior
# - deprecation: functionality that is being removed in a later release
# - bug-fix: fixes a problem in a previous version
# - enhancement: extends functionality but does not break or fix existing behavior
# - feature: new functionality
# - known-issue: problems that we are aware of in a given version
# - security: impacts on the security of a product or a user’s deployment.
# - upgrade: important information for someone upgrading from a prior version
# - other: does not fit into any of the other categories
kind: feature

# Change summary; a 80ish characters long description of the change.
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.
# description:

# Affected component; a word indicating the component this changeset affects.
component: synthetics-integration

# PR number; optional; the PR number that added the changeset.
# If not present is automatically filled by the tooling finding the PR where this changelog fragment has been added.
# NOTE: the tooling supports backports, so it's able to fill the original PR number instead of the backport PR number.
# Please provide it if you are adding a fragment for a different PR.
pr: 1491

# Issue number; optional; the GitHub issue related to this changeset (either closes or is part of).
# If not present is automatically filled by the tooling with the issue linked to the PR number.
#issue: 1234
2 changes: 1 addition & 1 deletion internal/pkg/agent/program/program_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -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"},
},
},
Expand Down
2 changes: 1 addition & 1 deletion internal/pkg/agent/program/supported.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

29 changes: 0 additions & 29 deletions internal/pkg/agent/program/testdata/logstash_config-heartbeat.yml

This file was deleted.

3 changes: 1 addition & 2 deletions internal/spec/heartbeat.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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

0 comments on commit f2ee0d3

Please sign in to comment.