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

Introduce "assemblies" and deprecate "assembly" in manifests #11

Merged
merged 1 commit into from Mar 8, 2018

Conversation

@bernd
Copy link
Member

bernd commented Feb 23, 2018

The "assembly" boolean field was used to decide if a module should be
included in the open-source assembly descriptor. The enterprise assembly
descriptor included a hard coded list of plugins and wasn't generated like
the open-source descriptor.

We need to be able to generate the enterprise assembly descriptor as well
because we now have different artifacts in 2.4 and 3.0, for example.

To do this, we introduced the "assemblies" field which contains a list of
assembly descriptor IDs. The open-souce and enterprise assembly descriptor
templates now get a list of modules for a given assembly ID.

// graylog-assembly.xml
{{ range $assembly := index .Assemblies "graylog" }}
  // ...
{{ end }}

// graylog-enterprise-assembly.xml
{{ range $assembly := index .Assemblies "graylog-enterprise" }}
  // ...
{{ end }}

This makes it possible to configure one or more assemblies for each
module in the manifest. It also allows us to include each module in more
than one assembly.

The CLI tool will emit a warning for manifests which still use the old
"assembly" field.

The "assembly" boolean field was used to decide if a module should be
included in the open-source assembly descriptor. The enterprise assembly
descriptor included a hard coded list of plugins and wasn't generated like
the open-source descriptor.

We need to be able to generate the enterprise assembly descriptor as well
because we now have different artifacts in 2.4 and 3.0, for example.

To do this, we introduced the "assemblies" field which contains a list of
assembly descriptor IDs. The open-souce and enterprise assembly descriptor
templates now get a list of modules for a given assembly ID.

    // graylog-assembly.xml
    {{ range $assembly := index .Assemblies "graylog" }}
      // ...
    {{ end }}

    // graylog-enterprise-assembly.xml
    {{ range $assembly := index .Assemblies "graylog-enterprise" }}
      // ...
    {{ end }}

This makes it possible to configure one or more assemblies for each
module in the manifest. It also allows us to include each module in more
than one assembly.

The CLI tool will emit a warning for manifests which still use the old
"assembly" field.
bernd added a commit to Graylog2/graylog-project that referenced this pull request Feb 23, 2018
@bernd bernd merged commit 1350f49 into master Mar 8, 2018
3 checks passed
3 checks passed
continuous-integration/travis-ci/pr The Travis CI build passed
Details
continuous-integration/travis-ci/push The Travis CI build passed
Details
license/cla Contributor License Agreement is signed.
Details
@bernd bernd deleted the new-assembly branch Mar 8, 2018
bernd added a commit to Graylog2/graylog-project that referenced this pull request Mar 8, 2018
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
1 participant
You can’t perform that action at this time.