Use new ES client for licensing plugin #92143

pgayvallet · 2021-02-22T11:14:30Z

Summary

Part of #83910
Fix #92185

migrate the licensing plugin to use the new ES client
adapt the monitoring usage of createLicensePoller

Checklist

Unit or functional tests were updated or added to match the most common scenarios

This reverts commit 4a61b64

…-licensing-to-new-client

pgayvallet · 2021-06-23T14:57:13Z

x-pack/plugins/licensing/server/plugin.ts

-function normalizeServerLicense(license: RawLicense): PublicLicense {
+function normalizeServerLicense(
+  license: estypes.XpackInfoMinimalLicenseInformation
+): PublicLicense {


The client now provides proper typing for the xpack/info endpoint, so we can now use them.

pgayvallet · 2021-06-23T15:00:12Z

x-pack/plugins/licensing/server/plugin.ts

+      const normalizedLicense =
+        response.license && response.license.type !== 'missing'


TIL there is a missing type in the client def. Not sure this is really used, as it seems we never encountered it, but still added the check.

pgayvallet · 2021-06-23T15:03:13Z

x-pack/plugins/monitoring/server/plugin.ts

+    const cluster = instantiateClient(
+      config.ui.elasticsearch,
+      this.log,
+      core.elasticsearch.createClient
+    );


As monitoring is not migrated to the new client yet (due to this issue), I instantiated the new client at the only place we currently need it. I will let the owners refactor that when migrating the rest of the plugin

elasticmachine · 2021-06-23T15:06:15Z

Pinging @elastic/kibana-core (Team:Core)

matschaffer · 2021-06-24T03:39:10Z

@pgayvallet it looks like @simianhacker has the monitoring ui parts of this covered in #101850

Guessing it'd make sense for you to back yours out of this PR, but maybe best for you and him to work that out.

pgayvallet · 2021-06-24T06:05:48Z

Guessing it'd make sense for you to back yours out of this PR, but maybe best for you and him to work that out.

Thanks for the info. Looking at #101850, it would be pretty straightforward to rebase my PR against it once it gets merged. I guess the best option is for me to wait until #101850 is merged and just remove the shim that @simianhacker was forced to use the your licensing service.

Given that the PR is approved, I'm guessing it should be merged soon?

mshustov · 2021-06-24T12:27:29Z

x-pack/plugins/licensing/server/plugin.ts

-        path: '/_xpack?accept_enterprise=true',
+      const { body: response } = await client.asInternalUser.xpack.info({
+        // @ts-expect-error `accept_enterprise` is not present in the client definition
+        accept_enterprise: true,


while license.get accepts accept_enterprise: true, but it doesn't contain features in the response object 😞

x-pack/plugins/licensing/server/plugin.ts

simianhacker

Monitoring portion looks good to me.

…-licensing-to-new-client

kibanamachine · 2021-06-30T12:40:53Z

💚 Build Succeeded

Metrics [docs]

Public APIs missing comments

Total count of every public API that lacks a comment. Target amount is 0. Run node scripts/build_api_docs --plugin [yourplugin] --stats comments for more detailed information.

id	before	after	diff
`licensing`	44	42	-2

Unknown metric groups

API count

id	before	after	diff
`licensing`	120	117	-3

References to deprecated APIs

id	before	after	diff
`licensing`	18	0	-18
`monitoring`	2	0	-2
total			-20

History

💔 Build #135483 failed ceeb62d
💚 Build #133533 succeeded fd524e1
💔 Build #133464 failed 42a119d
💔 Build #133441 failed 537939a
💔 Build #133454 failed 49a134f

To update your PR or re-run it, just comment with:
@elasticmachine merge upstream

* use new client for licensing API * add logs * adapt unit tests * Revert "add logs" This reverts commit 4a61b64 * fix some type errors * fix test types * adapt monitoring usage of `createLicensePoller` * remove test comment * fix unit test * remove createLicensePoller from setup contract * fix unit tests

pgayvallet · 2021-06-30T14:01:20Z

Merging after FF to complete #101850

* use new client for licensing API * add logs * adapt unit tests * Revert "add logs" This reverts commit 4a61b64 * fix some type errors * fix test types * adapt monitoring usage of `createLicensePoller` * remove test comment * fix unit test * remove createLicensePoller from setup contract * fix unit tests

* use new client for licensing API * add logs * adapt unit tests * Revert "add logs" This reverts commit 4a61b64 * fix some type errors * fix test types * adapt monitoring usage of `createLicensePoller` * remove test comment * fix unit test * remove createLicensePoller from setup contract * fix unit tests Co-authored-by: Pierre Gayvallet <pierre.gayvallet@gmail.com>

pgayvallet added 4 commits February 22, 2021 12:13

use new client for licensing API

70618f6

add logs

4a61b64

adapt unit tests

bbcac5e

Revert "add logs"

b4fbe80

This reverts commit 4a61b64

pgayvallet changed the title ~~Add licensing plugin status change~~ Use new ES client for licensing plugin Feb 22, 2021

pgayvallet mentioned this pull request Feb 22, 2021

Monitoring: legacy ES client usages blocking migration of the licensing plugin #92185

Closed

pgayvallet added 4 commits June 23, 2021 10:06

Merge remote-tracking branch 'upstream/master' into kbn-89828-migrate…

537939a

…-licensing-to-new-client

fix some type errors

f131b0c

fix test types

49a134f

adapt monitoring usage of createLicensePoller

d755f1b

pgayvallet added chore Team:Core Core services & architecture: plugins, logging, config, saved objects, http, ES client, i18n, etc v7.14.0 release_note:skip Skip the PR/issue when compiling release notes labels Jun 23, 2021

pgayvallet added 2 commits June 23, 2021 12:13

remove test comment

42a119d

fix unit test

fd524e1

pgayvallet commented Jun 23, 2021

View reviewed changes

pgayvallet marked this pull request as ready for review June 23, 2021 15:06

pgayvallet requested a review from a team as a code owner June 23, 2021 15:06

pgayvallet requested a review from a team June 23, 2021 15:06

mshustov approved these changes Jun 24, 2021

View reviewed changes

simianhacker self-requested a review June 24, 2021 15:43

simianhacker approved these changes Jun 24, 2021

View reviewed changes

pgayvallet added 2 commits June 30, 2021 09:01

Merge remote-tracking branch 'upstream/master' into kbn-89828-migrate…

47f2c90

…-licensing-to-new-client

remove createLicensePoller from setup contract

ceeb62d

fix unit tests

d8b9355

pgayvallet added v7.15.0 and removed v7.14.0 labels Jun 30, 2021

pgayvallet added v7.14.0 and removed v7.15.0 labels Jun 30, 2021

pgayvallet merged commit 5bb9691 into elastic:master Jun 30, 2021

pgayvallet mentioned this pull request Jun 30, 2021

[7.x] Use new ES client for licensing plugin (#92143) #103893

Merged

spalger added v7.15.0 v8.0.0 labels Jul 7, 2021

spalger mentioned this pull request Jul 7, 2021

[7.14] Use new ES client for licensing plugin (#92143) #104718

Merged

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Use new ES client for licensing plugin #92143

Use new ES client for licensing plugin #92143

pgayvallet commented Feb 22, 2021 •

edited

Loading

pgayvallet Jun 23, 2021

pgayvallet Jun 23, 2021

pgayvallet Jun 23, 2021

elasticmachine commented Jun 23, 2021

matschaffer commented Jun 24, 2021

pgayvallet commented Jun 24, 2021 •

edited

Loading

mshustov Jun 24, 2021

simianhacker left a comment

kibanamachine commented Jun 30, 2021

API count

References to deprecated APIs

pgayvallet commented Jun 30, 2021

		const normalizedLicense =
		response.license && response.license.type !== 'missing'

Use new ES client for licensing plugin #92143

Use new ES client for licensing plugin #92143

Conversation

pgayvallet commented Feb 22, 2021 • edited Loading

Summary

Checklist

pgayvallet Jun 23, 2021

Choose a reason for hiding this comment

pgayvallet Jun 23, 2021

Choose a reason for hiding this comment

pgayvallet Jun 23, 2021

Choose a reason for hiding this comment

elasticmachine commented Jun 23, 2021

matschaffer commented Jun 24, 2021

pgayvallet commented Jun 24, 2021 • edited Loading

mshustov Jun 24, 2021

Choose a reason for hiding this comment

simianhacker left a comment

Choose a reason for hiding this comment

kibanamachine commented Jun 30, 2021

💚 Build Succeeded

Metrics [docs]

Public APIs missing comments

API count

References to deprecated APIs

History

pgayvallet commented Jun 30, 2021

pgayvallet commented Feb 22, 2021 •

edited

Loading

pgayvallet commented Jun 24, 2021 •

edited

Loading