Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Backport 13356 6.8 #21408

Merged
merged 6 commits into from
Sep 30, 2020
Merged

Backport 13356 6.8 #21408

merged 6 commits into from
Sep 30, 2020

Conversation

ChrsMark
Copy link
Member

@ChrsMark ChrsMark commented Sep 30, 2020

This PR cherry-picks #13356 to 6.8

Tested on minikube with:
filebeat-kubernetes.6.8.minikube.yaml.txt

ScreenShot:
Screenshot 2020-09-30 at 13 13 46

@ChrsMark ChrsMark requested review from a team as code owners September 30, 2020 09:43
@botelastic botelastic bot added the needs_team Indicates that the issue/PR needs a Team:* label label Sep 30, 2020
@ChrsMark ChrsMark changed the base branch from master to 6.8 September 30, 2020 09:44
@cla-checker-service
Copy link

cla-checker-service bot commented Sep 30, 2020

💚 CLA has been signed

@ChrsMark ChrsMark requested a review from exekias September 30, 2020 10:16
@@ -228,7 +228,8 @@ func TestEmitEvent(t *testing.T) {
"kubernetes": common.MapStr{
"namespace": "default",
"container": common.MapStr{
"name": "filebeat",
"name": "filebeat",
"image": "elastic/filebeat:6.3.0",
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Is this field in fields.yml? I guess it may be there already because of the kubernetes module

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

yes it is there

, also visible in your screenshot

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

👍

@exekias exekias added the Team:Platforms Label for the Integrations - Platforms team label Sep 30, 2020
@elasticmachine
Copy link
Collaborator

Pinging @elastic/integrations-platforms (Team:Platforms)

@botelastic botelastic bot removed the needs_team Indicates that the issue/PR needs a Team:* label label Sep 30, 2020
Signed-off-by: chrismark <chrismarkou92@gmail.com>
Signed-off-by: chrismark <chrismarkou92@gmail.com>
Signed-off-by: chrismark <chrismarkou92@gmail.com>
Signed-off-by: chrismark <chrismarkou92@gmail.com>
@ChrsMark
Copy link
Member Author

@ChrsMark ChrsMark merged commit 113bff4 into elastic:6.8 Sep 30, 2020
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Team:Platforms Label for the Integrations - Platforms team
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants