[Apache] Use new labels for license and subscription #3816
Conversation
💚 Build Succeeded
Expand to view the summary
Build stats
Test stats 🧪
🤖 GitHub commentsTo re-run your PR in the CI, just comment with:
|
🌐 Coverage report
|
packages/apache/manifest.yml
Outdated
| @@ -1,15 +1,18 @@ | |||
| format_version: 1.0.0 | |||
| name: apache | |||
| title: Apache HTTP Server | |||
| version: 1.4.1 | |||
| version: 1.4.2 | |||
There was a problem hiding this comment.
nit: 1.5 as it isn't a patch.
| @@ -1,15 +1,18 @@ | |||
| format_version: 1.0.0 | |||
| name: apache | |||
| title: Apache HTTP Server | |||
| version: 1.4.1 | |||
| version: 1.4.2 | |||
| license: basic | |||
There was a problem hiding this comment.
Don't you want to drop the original license field or is it too early?
There was a problem hiding this comment.
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.
There was a problem hiding this comment.
Hm.. so we can drop the license field for Kibanas targeting >=8.4.0 or >=8.5.0?
There was a problem hiding this comment.
Not sure, it hasn't been implemented yet in kibana.
| 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 |
There was a problem hiding this comment.
@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 ?
There was a problem hiding this comment.
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.
There was a problem hiding this comment.
Also, all packages have license: basic now, that is the default for Kibana when license is not set.
What does this PR do?
licensefield is deprecated as of elastic/package-spec#355, use the new fields in the apache package.Checklist
changelog.ymlfile.Related issues