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.

Sign up for GitHub

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

Jump to bottom

Filebeat azure module pipeline fixes and changes #26148

Merged
merged 16 commits into from
Jun 10, 2021
Merged

Filebeat azure module pipeline fixes and changes #26148

merged 16 commits into from
Jun 10, 2021

Conversation

narph
Copy link
Contributor

@narph narph commented Jun 4, 2021 •
edited
Loading

What does this PR do?

  • fixes several issues and adds more parsing options
  • fixes escape in the logs
  • adds more parsing options for resource id
  • fixes mapping issues for json fields
  • fixes parsing issues with IP

Why is it important?

  • fixes several issues and adds more parsing options

Checklist

  • 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.

Related issues

@botelastic botelastic bot added the needs_team Indicates that the issue/PR needs a Team:* label label Jun 4, 2021
@narph narph self-assigned this Jun 4, 2021
@narph narph added the Team:Platforms Label for the Integrations - Platforms team label Jun 4, 2021
@elasticmachine
Copy link
Collaborator

Pinging @elastic/integrations (Team:Platforms)

@botelastic botelastic bot removed the needs_team Indicates that the issue/PR needs a Team:* label label Jun 4, 2021
@mergify
Copy link
Contributor

mergify bot commented Jun 4, 2021

This pull request is now in conflicts. Could you fix it? 🙏
To fixup this pull request, you can check out it locally. See documentation: https://help.github.com/articles/checking-out-pull-requests-locally/

git fetch upstream
git checkout -b filebeat-azure-pipeline upstream/filebeat-azure-pipeline
git merge upstream/master
git push upstream filebeat-azure-pipeline

@elasticmachine
Copy link
Collaborator

elasticmachine commented Jun 4, 2021 •
edited by jenkins-beats-ci bot
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

Expand to view the summary

Build stats

  • Build Cause: Pull request #26148 updated

  • Start Time: 2021-06-09T15:58:36.688+0000

  • Duration: 116 min 5 sec

  • Commit: 9f2fe0f

Test stats 🧪

Test Results
Failed 0
Passed 14034
Skipped 2292
Total 16326

Trends 🧪

Image of Build Times

Image of Tests

💚 Flaky test report

Tests succeeded.

Expand to view the summary

Test stats 🧪

Test Results
Failed 0
Passed 14034
Skipped 2292
Total 16326

@narph narph added Team:Integrations Label for the Integrations team and removed Team:Platforms Label for the Integrations - Platforms team labels Jun 9, 2021
jsoriano
jsoriano reviewed Jun 9, 2021
View reviewed changes
Copy link
Member

@jsoriano jsoriano left a comment

Choose a reason for hiding this comment

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

Looks good, only a couple of small things.

🚀

x-pack/filebeat/module/azure/azure-shared-pipeline.yml Outdated Show resolved Hide resolved
x-pack/filebeat/module/azure/azure-shared-pipeline.yml Outdated Show resolved Hide resolved
x-pack/filebeat/module/azure/azure-shared-pipeline.yml Show resolved Hide resolved
x-pack/filebeat/module/azure/platformlogs/test/platformlogs-eventhub.log Show resolved Hide resolved
x-pack/filebeat/module/azure/platformlogs/test/platformlogs-kube.log Show resolved Hide resolved
jsoriano
jsoriano approved these changes Jun 9, 2021
View reviewed changes
Copy link
Member

@jsoriano jsoriano left a comment

Choose a reason for hiding this comment

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

👍

@narph narph merged commit d971550 into elastic:master Jun 10, 2021
@narph narph deleted the filebeat-azure-pipeline branch June 10, 2021 07:58
This was referenced Jun 10, 2021
Closed
Closed
Closed
Closed
narph added a commit to narph/beats that referenced this pull request Jun 10, 2021
@narph
Filebeat azure module pipeline fixes and changes (elastic#26148)
257252d 
* fix for filbeat pipeline

* changelog

* fixes

* retest

* generate files

* retest

* fix tests

* fix tests

* update fields

* update result

* fix name

* Format expected json files

* sub

* update fields

* fix test

Co-authored-by: Jaime Soriano Pastor <jaime.soriano@elastic.co>
(cherry picked from commit d971550)
@narph narph mentioned this pull request Jun 10, 2021
Merged
6 tasks
narph added a commit that referenced this pull request Jun 10, 2021
@narph
Cherry-pick #26148 to 7.x: Filebeat azure module pipeline fixes and c…
5f21f7c 
…hanges (#26233)

* Filebeat azure module pipeline fixes and changes (#26148)

* fix for filbeat pipeline

* changelog

* fixes

* retest

* generate files

* retest

* fix tests

* fix tests

* update fields

* update result

* fix name

* Format expected json files

* sub

* update fields

* fix test

Co-authored-by: Jaime Soriano Pastor <jaime.soriano@elastic.co>
(cherry picked from commit d971550)

* generate fields
mdelapenya added a commit to mdelapenya/beats that referenced this pull request Jun 21, 2021
@mdelapenya
Merge branch 'master' into archive-system-tests
30ccbed 
* master: (26 commits)
  Report total and free CPU for vSphere virtual machines (elastic#26167)
  [filebeat] Add preserve_original_event option to o365audit input (elastic#26273)
  Change xml processor names in script processor to match convention (elastic#26263)
  [Oracle] Fixing default values for paths in config template (elastic#26276)
  Add more ECS fields to logs (elastic#25998)
  [Heartbeat] Fix broken invocation of synth package (elastic#26228)
  rename sqs file name (elastic#26227)
  Populate the agent action result if there is no matching action handlers (elastic#26152)
  Add ISO8601 as supported timestamp type (elastic#25564)
  Move Filebeat azure module to GA (elastic#26168)
  Filebeat azure module pipeline fixes and changes (elastic#26148)
  libbeat: monitor version (elastic#26214)
  Add new parser to filestream input: container (elastic#26115)
  [Metricbeat] Add state_statefulset replicas.ready (elastic#26088)
  Disable test processors system test for windows 10 (elastic#26216)
  Fix startup with failing configuration (elastic#26126)
  Remove 32 bits version of Elastic Agent. (elastic#25708)
  Chane fleetmode detection to ony use management.enabled (elastic#26180)
  Make `filestream` input GA (elastic#26127)
  libbeat/idxmgmt/ilm: fix alias creation (elastic#26146)
  ...
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@jsoriano jsoriano jsoriano approved these changes

Assignees

@narph narph

Labels
7.14 Candidate Team:Integrations Label for the Integrations team
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

Azure Activity Logs fail to index when fields expected to be json is a string
3 participants
@narph @elasticmachine @jsoriano