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

Include metricbeat modules directory into agentbeat build #39278

Merged
merged 3 commits into from
Apr 30, 2024

Conversation

blakerouse
Copy link
Contributor

Proposed commit message

Fixes issue where module directory from metricbeat was not included into the agentbeat build.

module directory is required for metricbeat lightweight modules to work.

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

@blakerouse blakerouse added Team:Elastic-Agent Label for the Agent team backport-v8.14.0 Automated backport with mergify labels Apr 29, 2024
@blakerouse blakerouse self-assigned this Apr 29, 2024
@blakerouse blakerouse requested a review from a team as a code owner April 29, 2024 20:19
@elasticmachine
Copy link
Collaborator

Pinging @elastic/elastic-agent (Team:Elastic-Agent)

@botelastic botelastic bot added needs_team Indicates that the issue/PR needs a Team:* label and removed needs_team Indicates that the issue/PR needs a Team:* label labels Apr 29, 2024
@elasticmachine
Copy link
Collaborator

elasticmachine commented Apr 29, 2024

💚 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

  • Duration: 112 min 43 sec

❕ Flaky test report

No test was executed to be analysed.

🤖 GitHub comments

Expand to view the 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.

  • run elasticsearch-ci/docs : Re-trigger the docs validation. (use unformatted text in the comment!)

Copy link
Member

@cmacknz cmacknz left a comment

Choose a reason for hiding this comment

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

LGTM

❯ tree module
module
├── activemq
│   ├── broker
│   │   └── manifest.yml
│   ├── module.yml
│   ├── queue
│   │   └── manifest.yml
│   └── topic
│       └── manifest.yml
├── airflow
│   ├── module.yml
│   └── statsd
│       └── manifest.yml
├── apache
│   └── module.yml
├── aws
│   ├── dynamodb
│   │   └── manifest.yml
│   ├── ebs
│   │   └── manifest.yml
│   ├── ec2
│   │   └── manifest.yml
│   ├── elb
│   │   └── manifest.yml
│   ├── kinesis
│   │   └── manifest.yml
│   ├── lambda
│   │   └── manifest.yml
│   ├── module.yml
│   ├── natgateway
│   │   └── manifest.yml
│   ├── rds
│   │   └── manifest.yml
│   ├── s3_daily_storage
│   │   └── manifest.yml
│   ├── s3_request
│   │   └── manifest.yml
│   ├── sns
│   │   └── manifest.yml
│   ├── sqs
│   │   └── manifest.yml
│   ├── transitgateway
│   │   └── manifest.yml
│   ├── usage
│   │   └── manifest.yml
│   └── vpn
│       └── manifest.yml
├── azure
│   ├── app_state
│   │   └── manifest.yml
│   ├── compute_vm
│   │   └── manifest.yml
│   ├── compute_vm_scaleset
│   │   └── manifest.yml
│   ├── container_instance
│   │   └── manifest.yml
│   ├── container_registry
│   │   └── manifest.yml
│   ├── container_service
│   │   └── manifest.yml
│   ├── database_account
│   │   └── manifest.yml
│   └── module.yml
├── cloudfoundry
│   └── module.yml
├── cockroachdb
│   ├── module.yml
│   └── status
│       └── manifest.yml
├── docker
│   └── module.yml
├── enterprisesearch
│   └── module.yml
├── gcp
│   ├── compute
│   │   └── manifest.yml
│   ├── dataproc
│   │   └── manifest.yml
│   ├── firestore
│   │   └── manifest.yml
│   ├── gke
│   │   └── manifest.yml
│   ├── loadbalancing
│   │   └── manifest.yml
│   ├── module.yml
│   ├── pubsub
│   │   └── manifest.yml
│   └── storage
│       └── manifest.yml
├── golang
│   └── module.yml
├── haproxy
│   └── module.yml
├── ibmmq
│   ├── module.yml
│   └── qmgr
│       └── manifest.yml
├── iis
│   ├── module.yml
│   ├── webserver
│   │   └── manifest.yml
│   └── website
│       └── manifest.yml
├── istio
│   ├── istiod
│   │   └── manifest.yml
│   ├── module.yml
│   └── proxy
│       └── manifest.yml
├── kafka
│   ├── broker
│   │   └── manifest.yml
│   ├── consumer
│   │   └── manifest.yml
│   ├── module.yml
│   └── producer
│       └── manifest.yml
├── kubernetes
│   └── module.yml
├── mongodb
│   └── module.yml
├── mysql
│   ├── module.yml
│   └── performance
│       └── manifest.yml
├── nats
│   └── module.yml
├── nginx
│   └── module.yml
├── rabbitmq
│   └── module.yml
├── redis
│   └── module.yml
├── redisenterprise
│   ├── module.yml
│   ├── node
│   │   └── manifest.yml
│   └── proxy
│       └── manifest.yml
├── stan
│   └── module.yml
├── system
│   └── module.yml
├── tomcat
│   ├── cache
│   │   └── manifest.yml
│   ├── memory
│   │   └── manifest.yml
│   ├── module.yml
│   ├── requests
│   │   └── manifest.yml
│   └── threading
│       └── manifest.yml
├── uwsgi
│   └── module.yml
├── vsphere
│   └── module.yml
└── windows
    └── module.yml

79 directories, 79 files

@pierrehilbert pierrehilbert added the Team:Elastic-Agent-Data-Plane Label for the Agent Data Plane team label Apr 30, 2024
@elasticmachine
Copy link
Collaborator

Pinging @elastic/elastic-agent-data-plane (Team:Elastic-Agent-Data-Plane)

mg.SerialDeps(Update, osquerybeat.FetchOsqueryDistros, CrossBuildDeps, CrossBuild, devtools.Package, TestPackages)
// Add metricbeat lightweight modules.
if err := metricbeat.CustomizeLightModulesPackaging(); err != nil {
return err
Copy link
Contributor

Choose a reason for hiding this comment

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

It would be nice to wrap this error to add more context about what failed.

@blakerouse blakerouse merged commit 8c48989 into elastic:main Apr 30, 2024
29 of 31 checks passed
@blakerouse blakerouse deleted the agentbeat-metricbeat-modules branch April 30, 2024 17:12
mergify bot pushed a commit that referenced this pull request Apr 30, 2024
blakerouse added a commit that referenced this pull request Apr 30, 2024
…39323)

(cherry picked from commit 8c48989)

Co-authored-by: Blake Rouse <blake.rouse@elastic.co>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
backport-v8.14.0 Automated backport with mergify Team:Elastic-Agent Label for the Agent team Team:Elastic-Agent-Data-Plane Label for the Agent Data Plane team
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Agentbeat breaks configuration only Metricbeat modules
5 participants