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

[7.16](backport #27954) Get metricbeat to compile on AIX #28545

Closed
wants to merge 1 commit into from

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Oct 19, 2021

This is an automatic backport of pull request #27954 done by Mergify.
Cherry-pick of 298d786 has failed:

On branch mergify/bp/7.x/pr-27954
Your branch is up to date with 'origin/7.x'.

You are currently cherry-picking commit 298d786fc6.
  (fix conflicts and run "git cherry-pick --continue")
  (use "git cherry-pick --skip" to skip this patch)
  (use "git cherry-pick --abort" to cancel the cherry-pick operation)

Changes to be committed:
	modified:   CHANGELOG.next.asciidoc
	modified:   NOTICE.txt
	modified:   filebeat/autodiscover/defaults.go
	new file:   libbeat/autodiscover/providers/docker/doc.go
	new file:   libbeat/autodiscover/providers/kubernetes/doc.go
	modified:   libbeat/autodiscover/providers/kubernetes/node.go
	modified:   libbeat/autodiscover/providers/kubernetes/pod.go
	modified:   libbeat/autodiscover/providers/kubernetes/service.go
	modified:   libbeat/metric/system/diskio/diskstat.go
	new file:   libbeat/metric/system/diskio/doc.go
	modified:   libbeat/statestore/backend/memlog/util_other.go
	modified:   metricbeat/module/docker/docker.go
	new file:   metricbeat/module/docker/stat.go
	new file:   metricbeat/module/linux/iostat/doc.go
	modified:   metricbeat/module/linux/iostat/iostat.go
	modified:   metricbeat/module/postgresql/postgresql_test.go
	modified:   metricbeat/module/system/service/data.go
	modified:   metricbeat/module/system/service/dbus.go
	modified:   metricbeat/module/system/service/service.go
	modified:   metricbeat/module/system/service/service_test.go
	modified:   x-pack/elastic-agent/pkg/composable/providers/kubernetes/config.go
	modified:   x-pack/elastic-agent/pkg/composable/providers/kubernetesleaderelection/config.go
	modified:   x-pack/elastic-agent/pkg/composable/providers/kubernetessecrets/config.go
	modified:   x-pack/filebeat/input/azureeventhub/azureeventhub_integration_test.go
	modified:   x-pack/filebeat/input/azureeventhub/config.go
	modified:   x-pack/filebeat/input/azureeventhub/config_test.go
	new file:   x-pack/filebeat/input/azureeventhub/doc.go
	modified:   x-pack/filebeat/input/azureeventhub/eph.go
	modified:   x-pack/filebeat/input/azureeventhub/eph_test.go
	modified:   x-pack/filebeat/input/azureeventhub/file_persister_test.go
	modified:   x-pack/filebeat/input/azureeventhub/input.go
	modified:   x-pack/filebeat/input/azureeventhub/input_test.go
	new file:   x-pack/filebeat/input/cloudfoundry/doc.go
	modified:   x-pack/filebeat/input/cloudfoundry/input.go
	modified:   x-pack/filebeat/input/cloudfoundry/v1.go
	modified:   x-pack/filebeat/input/cloudfoundry/v2.go
	modified:   x-pack/filebeat/input/default-inputs/inputs.go
	new file:   x-pack/filebeat/input/default-inputs/inputs_aix.go
	new file:   x-pack/filebeat/input/default-inputs/inputs_other.go
	modified:   x-pack/libbeat/common/cloudfoundry/cache_integration_test.go
	modified:   x-pack/libbeat/processors/add_cloudfoundry_metadata/add_cloudfoundry_metadata.go
	modified:   x-pack/libbeat/processors/add_cloudfoundry_metadata/add_cloudfoundry_metadata_test.go
	new file:   x-pack/libbeat/processors/add_cloudfoundry_metadata/doc.go
	modified:   x-pack/metricbeat/module/cloudfoundry/cloudfoundry.go
	modified:   x-pack/metricbeat/module/cloudfoundry/container/container.go
	modified:   x-pack/metricbeat/module/cloudfoundry/container/container_integration_test.go
	modified:   x-pack/metricbeat/module/cloudfoundry/container/container_test.go
	new file:   x-pack/metricbeat/module/cloudfoundry/container/doc.go
	modified:   x-pack/metricbeat/module/cloudfoundry/counter/counter.go
	modified:   x-pack/metricbeat/module/cloudfoundry/counter/counter_integration_test.go
	modified:   x-pack/metricbeat/module/cloudfoundry/counter/counter_test.go
	new file:   x-pack/metricbeat/module/cloudfoundry/counter/doc.go
	modified:   x-pack/metricbeat/module/cloudfoundry/hub.go
	modified:   x-pack/metricbeat/module/cloudfoundry/mtest/config.go
	modified:   x-pack/metricbeat/module/cloudfoundry/mtest/modulemock.go
	modified:   x-pack/metricbeat/module/cloudfoundry/v1.go
	modified:   x-pack/metricbeat/module/cloudfoundry/v1_test.go
	modified:   x-pack/metricbeat/module/cloudfoundry/v2.go
	new file:   x-pack/metricbeat/module/cloudfoundry/value/doc.go
	modified:   x-pack/metricbeat/module/cloudfoundry/value/value.go
	modified:   x-pack/metricbeat/module/cloudfoundry/value/value_integration_test.go
	modified:   x-pack/metricbeat/module/cloudfoundry/value/value_test.go

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   go.mod
	both modified:   go.sum

To fix up this pull request, you can check it out locally. See documentation: https://docs.github.com/en/github/collaborating-with-pull-requests/reviewing-changes-in-pull-requests/checking-out-pull-requests-locally


Mergify commands and options

More conditions and actions can be found in the documentation.

You can also trigger Mergify actions by commenting on this pull request:

  • @Mergifyio refresh will re-evaluate the rules
  • @Mergifyio rebase will rebase this PR on its base branch
  • @Mergifyio update will merge the base branch into this PR
  • @Mergifyio backport <destination> will backport this PR on <destination> branch

Additionally, on Mergify dashboard you can:

  • look at your merge queues
  • generate the Mergify configuration with the config editor.

Finally, you can contact us on https://mergify.io/

* first pass at getting AIX to build

* make notice

* format libbeat files

* fix newer pgsql lib quoting

* fix build tags

* try to move around docker stat files

* add diskio targets

* remove cloudfoundry from aix

* forgot formatting, again

* get filebeat to build

* mage fmt

* fix bad import

* fix merge

* changelog

* fmt

* fix filebeat

* fix broken headers, again

* see if list_docker is fixed

* fix CI

* go mod tidy

(cherry picked from commit 298d786)

# Conflicts:
#	go.mod
#	go.sum
@mergify mergify bot added backport conflicts There is a conflict in the backported pull request labels Oct 19, 2021
@botelastic botelastic bot added the needs_team Indicates that the issue/PR needs a Team:* label label Oct 19, 2021
@elasticmachine
Copy link
Collaborator

💔 Build Failed

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: 11 min 32 sec

❕ Flaky test report

No test was executed to be analysed.

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

@mergify
Copy link
Contributor Author

mergify bot commented Oct 19, 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 mergify/bp/7.x/pr-27954 upstream/mergify/bp/7.x/pr-27954
git merge upstream/7.x
git push upstream mergify/bp/7.x/pr-27954

@andresrc andresrc changed the title [7.x](backport #27954) Get metricbeat to compile on AIX [7.16](backport #27954) Get metricbeat to compile on AIX Oct 20, 2021
@andresrc andresrc changed the base branch from 7.x to 7.16 October 20, 2021 14:44
@jsoriano jsoriano added the Team:Integrations Label for the Integrations team label Oct 25, 2021
@elasticmachine
Copy link
Collaborator

Pinging @elastic/integrations (Team:Integrations)

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

mergify bot commented Nov 22, 2021

This pull request has not been merged yet. Could you please review and merge it @fearful-symmetry? 🙏

2 similar comments
@mergify
Copy link
Contributor Author

mergify bot commented Nov 29, 2021

This pull request has not been merged yet. Could you please review and merge it @fearful-symmetry? 🙏

@mergify
Copy link
Contributor Author

mergify bot commented Dec 6, 2021

This pull request has not been merged yet. Could you please review and merge it @fearful-symmetry? 🙏

@mergify mergify bot deleted the mergify/bp/7.x/pr-27954 branch December 7, 2021 19:13
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
backport conflicts There is a conflict in the backported pull request Team:Integrations Label for the Integrations team
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants