[Heartbeat] Use the proper 'base' data_stream as conf #28455

andrewvc · 2021-10-14T21:17:32Z

Previously we assumed the first config was the base stream, but lately fleet is sending things out of order, so we search for it instead.

To test this try using the config in the linked issue below as a heartbeat.yml

Fixes #28453

My code follows the style guidelines of this project
I have commented my code, particularly in hard-to-understand areas
I have made corresponding changes to the documentation
I have made corresponding change to the default configuration files
I have added tests that prove my fix is effective or that my feature works
I have added an entry in CHANGELOG.next.asciidoc or CHANGELOG-developer.next.asciidoc.

Previously we assumed the first config was the base stream, but lately fleet is sending things out of order, so we search for it instead. Fixes elastic#28453

mergify · 2021-10-14T21:17:46Z

This pull request does not have a backport label. Could you fix it @andrewvc? 🙏
To fixup this pull request, you need to add the backport labels for the needed
branches, such as:

backport-v./d./d./d is the label to automatically backport to the 7./d branch. /d is the digit

NOTE: backport-skip has been added to this pull request.

elasticmachine · 2021-10-14T21:18:05Z

Pinging @elastic/uptime (Team:Uptime)

elasticmachine · 2021-10-14T21:21:46Z

💚 Build Succeeded

the below badges are clickable and redirect to their specific view in the CI or DOCS

Expand to view the summary

Build stats

Start Time: 2021-10-14T22:43:45.377+0000
Duration: 66 min 13 sec
Commit: 5f0cc63

Test stats 🧪

Test	Results
Failed	0
Passed	3553
Skipped	80
Total	3633

💚 Flaky test report

Tests succeeded.

🤖 GitHub comments

To re-run your PR in the CI, just comment with:

/test : Re-trigger the build.
/package : Generate the packages and run the E2E tests.
/beats-tester : Run the installation tests with beats-tester.

vigneshshanmugam

LGTM

heartbeat/monitors/factory.go

vigneshshanmugam · 2021-10-14T22:36:10Z

heartbeat/monitors/stdfields/unnest.go

+		return nil, fmt.Errorf("could not determine base stream for config: %s", id)
+	}
+
+	err = res.Merge(common.MapStr{"id": optS.Id, "data_stream": optS.DataStream})


what is the use of this assigment here? seems like we are not using it.

remove debug statements below.

yeah, I should just return the err (which should never happen really)

Oh, sorry, it does return. If you have a return with no args, it returns the variables initialized in the function signature as the return types.

Previously we assumed the first config was the base stream, but lately fleet is sending things out of order, so we search for it instead. To test this try using the config in the linked issue below as a heartbeat.yml Fixes #28453 (cherry picked from commit 2fcd0c4)

Previously we assumed the first config was the base stream, but lately fleet is sending things out of order, so we search for it instead. To test this try using the config in the linked issue below as a heartbeat.yml Fixes #28453 (cherry picked from commit 2fcd0c4) Co-authored-by: Andrew Cholakian <andrew@andrewvc.com>

Previously we assumed the first config was the base stream, but lately fleet is sending things out of order, so we search for it instead. To test this try using the config in the linked issue below as a heartbeat.yml Fixes elastic#28453

andrewvc · 2021-11-09T20:39:47Z

@Mergifyio backport 7.15

Previously we assumed the first config was the base stream, but lately fleet is sending things out of order, so we search for it instead. To test this try using the config in the linked issue below as a heartbeat.yml Fixes #28453 (cherry picked from commit 2fcd0c4)

mergify · 2021-11-09T20:41:21Z

backport 7.15

✅ Backports have been created

#28896 [Heartbeat] Use the proper 'base' data_stream as conf (backport #28455) has been created for branch 7.15

Previously we assumed the first config was the base stream, but lately fleet is sending things out of order, so we search for it instead. To test this try using the config in the linked issue below as a heartbeat.yml Fixes #28453 (cherry picked from commit 2fcd0c4) Co-authored-by: Andrew Cholakian <andrew@andrewvc.com>

andrewvc · 2021-11-16T02:47:35Z

@Mergifyio backport 8.0

Previously we assumed the first config was the base stream, but lately fleet is sending things out of order, so we search for it instead. To test this try using the config in the linked issue below as a heartbeat.yml Fixes #28453 (cherry picked from commit 2fcd0c4)

mergify · 2021-11-16T02:48:14Z

backport 8.0

✅ Backports have been created

#28989 [Heartbeat] Use the proper 'base' data_stream as conf (backport #28455) has been created for branch 8.0

…elastic#28896) Previously we assumed the first config was the base stream, but lately fleet is sending things out of order, so we search for it instead. To test this try using the config in the linked issue below as a heartbeat.yml Fixes elastic#28453 (cherry picked from commit bdde4c0) Co-authored-by: Andrew Cholakian <andrew@andrewvc.com>

[Heartbeat] Use the proper 'base' data_stream as conf

95d64f6

Previously we assumed the first config was the base stream, but lately fleet is sending things out of order, so we search for it instead. Fixes elastic#28453

andrewvc requested a review from a team as a code owner October 14, 2021 21:17

botelastic bot added the needs_team Indicates that the issue/PR needs a Team:* label label Oct 14, 2021

andrewvc self-assigned this Oct 14, 2021

andrewvc requested a review from justinkambic October 14, 2021 21:17

mergify bot added the backport-skip Skip notification from the automated backport with mergify label Oct 14, 2021

andrewvc added backport-v7.16.0 Automated backport with mergify bug Heartbeat v7.16.0 Team:obs-ds-hosted-services Label for the Observability Hosted Services team and removed backport-skip Skip notification from the automated backport with mergify labels Oct 14, 2021

botelastic bot removed the needs_team Indicates that the issue/PR needs a Team:* label label Oct 14, 2021

Changelog

d58347c

Use type one level higher

c7f4258

andrewvc requested a review from vigneshshanmugam October 14, 2021 21:41

vigneshshanmugam approved these changes Oct 14, 2021

View reviewed changes

andrewvc added 2 commits October 14, 2021 17:42

Remove debug

6cc6055

Remove debug

5f0cc63

andrewvc merged commit 2fcd0c4 into elastic:master Oct 15, 2021

andrewvc deleted the fix-ds-order branch October 15, 2021 00:02

mergify bot mentioned this pull request Oct 15, 2021

[7.x](backport #28455) [Heartbeat] Use the proper 'base' data_stream as conf #28458

Merged

mergify bot mentioned this pull request Nov 9, 2021

[Heartbeat] Use the proper 'base' data_stream as conf (backport #28455) #28896

Merged

mergify bot mentioned this pull request Nov 16, 2021

[Heartbeat] Use the proper 'base' data_stream as conf (backport #28455) #28989

Closed

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

[Heartbeat] Use the proper 'base' data_stream as conf #28455

[Heartbeat] Use the proper 'base' data_stream as conf #28455

andrewvc commented Oct 14, 2021 •

edited

Loading

mergify bot commented Oct 14, 2021

elasticmachine commented Oct 14, 2021

elasticmachine commented Oct 14, 2021 •

edited by jenkins-beats-ci bot

Loading

Build stats

Test stats 🧪

vigneshshanmugam left a comment

vigneshshanmugam Oct 14, 2021

andrewvc Oct 14, 2021

andrewvc Oct 14, 2021

vigneshshanmugam Oct 14, 2021

andrewvc commented Nov 9, 2021

mergify bot commented Nov 9, 2021

andrewvc commented Nov 16, 2021

mergify bot commented Nov 16, 2021

[Heartbeat] Use the proper 'base' data_stream as conf #28455

[Heartbeat] Use the proper 'base' data_stream as conf #28455

Conversation

andrewvc commented Oct 14, 2021 • edited Loading

mergify bot commented Oct 14, 2021

elasticmachine commented Oct 14, 2021

elasticmachine commented Oct 14, 2021 • edited by jenkins-beats-ci bot Loading

💚 Build Succeeded

Build stats

Test stats 🧪

💚 Flaky test report

🤖 GitHub comments

vigneshshanmugam left a comment

Choose a reason for hiding this comment

vigneshshanmugam Oct 14, 2021

Choose a reason for hiding this comment

andrewvc Oct 14, 2021

Choose a reason for hiding this comment

andrewvc Oct 14, 2021

Choose a reason for hiding this comment

vigneshshanmugam Oct 14, 2021

Choose a reason for hiding this comment

andrewvc commented Nov 9, 2021

mergify bot commented Nov 9, 2021

✅ Backports have been created

andrewvc commented Nov 16, 2021

mergify bot commented Nov 16, 2021

✅ Backports have been created

andrewvc commented Oct 14, 2021 •

edited

Loading

elasticmachine commented Oct 14, 2021 •

edited by jenkins-beats-ci bot

Loading