Skip to content

[azure] Fix event.duration field conflict in log data streams#2891

Merged
andrewkroh merged 8 commits intoelastic:mainfrom
legoguy1000:2887-azure-field-conflict
Mar 29, 2022
Merged

[azure] Fix event.duration field conflict in log data streams#2891
andrewkroh merged 8 commits intoelastic:mainfrom
legoguy1000:2887-azure-field-conflict

Conversation

@legoguy1000
Copy link
Contributor

@legoguy1000 legoguy1000 commented Mar 26, 2022 •
edited by andrewkroh
Loading

What does this PR do?

Fix event.duration field conflict in Azure Logs.

Checklist

  • I have reviewed tips for building integrations and this pull request is aligned with them.
  • I have verified that all data streams collect metrics or logs.
  • I have added an entry to my package's changelog.yml file.
  • I have verified that Kibana version constraints are current according to guidelines.

Related issues

@legoguy1000 legoguy1000 requested a review from a team as a code owner March 26, 2022 18:10
@elasticmachine
Copy link

elasticmachine commented Mar 26, 2022 •
edited
Loading

💚 Build Succeeded

the below badges are clickable and redirect to their specific view in the CI or DOCS
Pipeline View Test View Changes Artifacts preview preview

Expand to view the summary

Build stats

  • Start Time: 2022-03-29T14:32:54.252+0000

  • Duration: 11 min 55 sec

Test stats 🧪

Test Results
Failed 0
Passed 85
Skipped 0
Total 85

🤖 GitHub comments

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

  • /test : Re-trigger the build.

@andrewkroh
Copy link
Member

andrewkroh commented Mar 28, 2022

I think the version needs bumped to 1.1.3 to correct the merge conflicts.

@andrewkroh andrewkroh added bug Something isn't working, use only for issues Integration:azure Azure Logs Team:Cloud-Monitoring Label for the Cloud Monitoring team labels Mar 28, 2022
@andrewkroh
Copy link
Member

andrewkroh commented Mar 28, 2022

/test

kaiyan-sheng
kaiyan-sheng approved these changes Mar 28, 2022
View reviewed changes
Copy link
Contributor

@kaiyan-sheng kaiyan-sheng left a comment

Choose a reason for hiding this comment

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

Thanks for fixing this! I see this field is also missing in the other azure log data streams. Do you mind adding them in the same PR 🙂 ? If not, I can add the rest in a separate PR too. Thanks again!!

@legoguy1000
Copy link
Contributor Author

legoguy1000 commented Mar 28, 2022

Thanks for fixing this! I see this field is also missing in the other azure log data streams. Do you mind adding them in the same PR 🙂 ? If not, I can add the rest in a separate PR too. Thanks again!!

No problem.

@legoguy1000
Copy link
Contributor Author

legoguy1000 commented Mar 29, 2022

@kaiyan-sheng done

@andrewkroh
Copy link
Member

andrewkroh commented Mar 29, 2022

/test

@andrewkroh andrewkroh changed the title [Azure] Fix Activity Logs field conflict [Azure] Fix event.duration field conflict in log data streams Mar 29, 2022
@andrewkroh
Copy link
Member

andrewkroh commented Mar 29, 2022

I fixed a merge conflict with another PR that I merged in and changed the version to 1.1.4.

@andrewkroh andrewkroh changed the title [Azure] Fix event.duration field conflict in log data streams [azure] Fix event.duration field conflict in log data streams Mar 29, 2022
@kaiyan-sheng
Copy link
Contributor

kaiyan-sheng commented Mar 29, 2022

Seems like the CI is not happy 😬 Could you rerun the test to generate the expected json files please? Thanks!!

@andrewkroh
Copy link
Member

andrewkroh commented Mar 29, 2022

Oh, it's probably the new forwarded tags from the other PR that recently merged.

@legoguy1000
Copy link
Contributor Author

legoguy1000 commented Mar 29, 2022

looks like it was the static data files.

@andrewkroh andrewkroh merged commit fb2d4f6 into elastic:main Mar 29, 2022
@legoguy1000 legoguy1000 deleted the 2887-azure-field-conflict branch March 29, 2022 15:00
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@andrewkroh andrewkroh andrewkroh approved these changes

@kaiyan-sheng kaiyan-sheng kaiyan-sheng approved these changes

Assignees

No one assigned

Labels

bug Something isn't working, use only for issues Integration:azure Azure Logs Team:Cloud-Monitoring Label for the Cloud Monitoring team

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

[azure] mapping conflict event.duration

4 participants

@legoguy1000 @elasticmachine @andrewkroh @kaiyan-sheng