Skip to content

Move import-beats script#4

Merged
mtojek merged 3 commits intoelastic:masterfrom
mtojek:move-import-beats-script
May 5, 2020
Merged

Move import-beats script#4
mtojek merged 3 commits intoelastic:masterfrom
mtojek:move-import-beats-script

Conversation

@mtojek
Copy link
Contributor

@mtojek mtojek commented May 5, 2020

Issue: elastic/package-registry#414

Done:

  • Copy dev/import-beats script to the integrations repo
  • Copy testing/environment script to the integrations and make it working (package registry in different repo)
  • Add CI to integrations to still validate packages (copy from package-storage)

TODO:

  • update import-beats docs: README and CONTRIBUTING
  • testing/environments: make it working

@mtojek mtojek requested a review from ruflin May 5, 2020 09:08
@mtojek mtojek self-assigned this May 5, 2020
Copy link
Contributor

@ruflin ruflin left a comment

Choose a reason for hiding this comment

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

You seem to be overwriting all existing files in this PR, is that on purpose.

To make this PR better reviewable, perhaps first just push in all the automation and scripts as part of the PR and remove the packages itself?

After we got it in, we should also discuss if we need to adjust the directory structure a bit.

@@ -0,0 +1,13 @@
FROM golang:1.14.2
Copy link
Contributor

Choose a reason for hiding this comment

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

@kuisathaverat Would be great to get a CI setup for this repo too, if we don't already have it.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

If this is a matter of adjusting Jenkinsfile, I can handle it in the followups.

Copy link
Contributor

Choose a reason for hiding this comment

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

It is about adding this repo to JJBB, needs to happen in an other repo.

@@ -1,19 +0,0 @@
---
Copy link
Contributor

Choose a reason for hiding this comment

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

Was this removed on purpose?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

This is an old file. Not relevant to what we'll have here.

@@ -1,4 +0,0 @@
# Integrations repository (ONLY EXPERIMENTAL USE)
Copy link
Contributor

Choose a reason for hiding this comment

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

Removed on purpose? Same for all the specs files?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Yes. All these files contain nothing relevant. Only placeholders.

Copy link
Contributor

Choose a reason for hiding this comment

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

I see. @andresrc FYI

@mtojek
Copy link
Contributor Author

mtojek commented May 5, 2020

To make this PR better reviewable, perhaps first just push in all the automation and scripts as part of the PR and remove the packages itself?

Done.

@mtojek mtojek marked this pull request as ready for review May 5, 2020 09:32
@mtojek mtojek requested a review from ruflin May 5, 2020 09:33
@mtojek
Copy link
Contributor Author

mtojek commented May 5, 2020

@ruflin I'm ok with reviewing and pushing the current state of PR and then apply next changes in followups (testing/environment, CI, docs).

Copy link
Contributor

@ruflin ruflin left a comment

Choose a reason for hiding this comment

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

LGTM

Lets have follow up PR's to add the packages, cleanup magefile etc.

}
}

err = BuildRootFile()
Copy link
Contributor

Choose a reason for hiding this comment

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

This will probably not be needed anymore in here?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Not sure yet. I want to build the package directory with gzipped artifacts and mount it in the container image with EPR. I'll come back to this.

@mtojek mtojek merged commit 713fab9 into elastic:master May 5, 2020
@mtojek mtojek changed the title Move import-beats script and package data Move import-beats script May 5, 2020
tommyers-elastic pushed a commit that referenced this pull request Oct 18, 2023
* [azure_app_service] - removed dotted YAML keys from manifest

The format_version in the package manifest changed from 2.8.0 to 3.0.0. Removed
dotted YAML keys from package manifest. Added 'owner.type: elastic' to package
manifest.

[git-generate]
go run github.com/andrewkroh/go-examples/ecs-update@latest -v -format-version=3.0.0 -fix-dotted-yaml-keys -add-owner-type packages/azure_app_service

* [citrix_adc] - removed dotted YAML keys from manifest

The format_version in the package manifest changed from 2.0.0 to 3.0.0. Removed
dotted YAML keys from package manifest. Added 'owner.type: elastic' to package
manifest.

[git-generate]
go run github.com/andrewkroh/go-examples/ecs-update@latest -v -format-version=3.0.0 -fix-dotted-yaml-keys -add-owner-type packages/citrix_adc

* [redis]: migration with yq

* [redis] - removed dotted YAML keys from manifest

The format_version in the package manifest changed from 1.0.0 to 3.0.0. Removed
dotted YAML keys from package manifest. Added 'owner.type: elastic' to package
manifest.

[git-generate]
go run github.com/andrewkroh/go-examples/ecs-update@latest -v -format-version=3.0.0 -fix-dotted-yaml-keys -add-owner-type packages/redis

* [tomcat]: migration with yq

* [tomcat] - removed dotted YAML keys from manifest

The format_version in the package manifest changed from 1.0.0 to 3.0.0. Removed
dotted YAML keys from package manifest. Added 'owner.type: elastic' to package
manifest.

[git-generate]
go run github.com/andrewkroh/go-examples/ecs-update@latest -v -format-version=3.0.0 -fix-dotted-yaml-keys -add-owner-type packages/tomcat

* Add validation.yml

* Fix PR number in changelog
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants