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

[Apache] Use new labels for license and subscription #3816

Merged
merged 2 commits into from
Jul 28, 2022
Merged

[Apache] Use new labels for license and subscription #3816

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
ee2eaad
[Apache] Use new labels for license and subscription
jsoriano Jul 24, 2022
c93d0ad
Fix version
jsoriano Jul 25, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions packages/apache/changelog.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,9 @@
# newer versions go on top
- version: "1.5.0"
changes:
- description: Use new labels for source license and subscription
type: enhancement
link: https://github.com/elastic/integrations/issues/3816
- version: "1.4.1"
changes:
- description: Add correct field mapping for event.created
Expand Down
5 changes: 4 additions & 1 deletion packages/apache/manifest.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,15 +1,18 @@
format_version: 1.0.0
name: apache
title: Apache HTTP Server
version: 1.4.1
version: 1.5.0
license: basic
Copy link
Contributor

Choose a reason for hiding this comment

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

Don't you want to drop the original license field or is it too early?

Copy link
Member Author

Choose a reason for hiding this comment

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

I think that we have to leave them for packages targeting current versions of Kibana. It uses this field from the manifest. Though if it doesn't find it, it defaults to basic.

Copy link
Contributor

Choose a reason for hiding this comment

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

Hm.. so we can drop the license field for Kibanas targeting >=8.4.0 or >=8.5.0?

Copy link
Member Author

Choose a reason for hiding this comment

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

Not sure, it hasn't been implemented yet in kibana.

source:
license: Elastic-2.0
description: Collect logs and metrics from Apache servers with Elastic Agent.
type: integration
categories:
- web
release: ga
conditions:
kibana.version: "^8.0.0"
elastic.subscription: basic
Copy link
Contributor

Choose a reason for hiding this comment

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

@jsoriano , I understand that for now we are keeping both older license field and subscription.
But when we remove the older field but bring up the integration on older Kibana version won't it be a regression as it won't understand our newer subscription fields ?

Will we be upgrading the kibana version when we remove the older license field ?

Copy link
Member Author

Choose a reason for hiding this comment

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

Current versions of Kibana don't read these values directly from the manifest, but from the registry API. We are adding some compatibility layers in the registry to fill the old fields when only the new ones are available (elastic/package-registry#826). This should help on the migration to the new fields on packages that work with current and older versions of Kibana.
Here we are keeping both fields as a safeguard, as this is going to be the first package using the new fields.
In any case by now it won't do any harm to keep the old license field if wanted.

Copy link
Member Author

Choose a reason for hiding this comment

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

Also, all packages have license: basic now, that is the default for Kibana when license is not set.

screenshots:
- src: /img/apache-metrics-overview.png
title: Apache metrics overview
Expand Down