Merge branch 'master' into loader

Author: kibanamachine

src/core/public/overlays/banners/banners_list.test.tsx

@@ -43,7 +43,7 @@ describe('BannersList', () => {
     ]);
 
     expect(mount(<BannersList banners$={banners$} />).html()).toMatchInlineSnapshot(
-      `"<div class=\\"kbnGlobalBannerList\\"><div data-test-priority=\\"0\\" class=\\"kbnGlobalBannerList__item\\"><h1>Hello!</h1></div></div>"`
+      `"<div class=\\"kbnGlobalBannerList\\"><div data-test-priority=\\"0\\" class=\\"kbnGlobalBannerList__item\\" data-test-subj=\\"global-banner-item\\"><h1>Hello!</h1></div></div>"`
     );
   });
 
@@ -85,7 +85,7 @@ describe('BannersList', () => {
 
     // Two new banners should be rendered
     expect(component.html()).toMatchInlineSnapshot(
-      `"<div class=\\"kbnGlobalBannerList\\"><div data-test-priority=\\"1\\" class=\\"kbnGlobalBannerList__item\\"><h1>First Banner!</h1></div><div data-test-priority=\\"0\\" class=\\"kbnGlobalBannerList__item\\"><h1>Second banner!</h1></div></div>"`
+      `"<div class=\\"kbnGlobalBannerList\\"><div data-test-priority=\\"1\\" class=\\"kbnGlobalBannerList__item\\" data-test-subj=\\"global-banner-item\\"><h1>First Banner!</h1></div><div data-test-priority=\\"0\\" class=\\"kbnGlobalBannerList__item\\" data-test-subj=\\"global-banner-item\\"><h1>Second banner!</h1></div></div>"`
     );
     // Original banner should be unmounted
     expect(unmount).toHaveBeenCalled();

src/core/public/overlays/banners/banners_list.tsx

@@ -59,6 +59,11 @@ const BannerItem: React.FunctionComponent<{ banner: OverlayBanner }> = ({ banner
   useEffect(() => banner.mount(element.current!), [banner]); // Only unmount / remount if banner object changed.
 
   return (
-    <div data-test-priority={banner.priority} className="kbnGlobalBannerList__item" ref={element} />
+    <div
+      data-test-priority={banner.priority}
+      className="kbnGlobalBannerList__item"
+      ref={element}
+      data-test-subj="global-banner-item"
+    />
   );
 };

test/functional/page_objects/common_page.ts

@@ -505,6 +505,16 @@ export function CommonPageProvider({ getService, getPageObjects }: FtrProviderCo
     async scrollKibanaBodyTop() {
       await browser.setScrollToById('kibana-body', 0, 0);
     }
+
+    /**
+     * Dismiss Banner if available.
+     */
+    async dismissBanner() {
+      if (await testSubjects.exists('global-banner-item')) {
+        const button = await find.byButtonText('Dismiss');
+        await button.click();
+      }
+    }
   }
 
   return new CommonPage();

test/scripts/jenkins_xpack_build_plugins.sh

@@ -10,5 +10,6 @@ node scripts/build_kibana_platform_plugins \
   --scan-dir "$XPACK_DIR/test/alerting_api_integration/plugins" \
   --scan-dir "$XPACK_DIR/test/plugin_api_integration/plugins" \
   --scan-dir "$XPACK_DIR/test/plugin_api_perf/plugins" \
+  --scan-dir "$XPACK_DIR/test/licensing_plugin/plugins" \
   --workers 12 \
   --verbose

x-pack/plugins/apm/public/components/shared/Links/apm/AnomalyDetectionSetupLink.tsx

@@ -9,7 +9,10 @@ import { i18n } from '@kbn/i18n';
 import { useApmPluginContext } from '../../../../hooks/useApmPluginContext';
 import { APIReturnType } from '../../../../services/rest/createCallApmApi';
 import { APMLink } from './APMLink';
-import { getEnvironmentLabel } from '../../../../../common/environment_filter_values';
+import {
+  ENVIRONMENT_ALL,
+  getEnvironmentLabel,
+} from '../../../../../common/environment_filter_values';
 import { useUrlParams } from '../../../../hooks/useUrlParams';
 import { useFetcher, FETCH_STATUS } from '../../../../hooks/useFetcher';
 import { useLicense } from '../../../../hooks/useLicense';
@@ -57,7 +60,8 @@ export function MissingJobsAlert({ environment }: { environment?: string }) {
     return null;
   }
 
-  const isEnvironmentSelected = !!environment;
+  const isEnvironmentSelected =
+    environment && environment !== ENVIRONMENT_ALL.value;
 
   // there are jobs for at least one environment
   if (!isEnvironmentSelected && data.jobs.length > 0) {
@@ -80,7 +84,7 @@ export function MissingJobsAlert({ environment }: { environment?: string }) {
 }
 
 function getTooltipText(environment?: string) {
-  if (!environment) {
+  if (!environment || environment === ENVIRONMENT_ALL.value) {
     return i18n.translate('xpack.apm.anomalyDetectionSetup.notEnabledText', {
       defaultMessage: `Anomaly detection is not yet enabled. Click to continue setup.`,
     });

x-pack/plugins/apm/public/components/shared/Links/apm/anomaly_detection_setup_link.test.tsx

@@ -96,4 +96,15 @@ describe('MissingJobsAlert', () => {
       expect(toolTipText).toBe(undefined);
     });
   });
+
+  describe('when at least one job exists and all environments are selected', () => {
+    it('does not show a warning', async () => {
+      const { toolTipAnchor, toolTipText } = await renderTooltipAnchor({
+        jobs: [{ environment: 'ENVIRONMENT_ALL', job_id: 'my_job_id' }],
+      });
+
+      expect(toolTipAnchor).not.toBeInTheDocument();
+      expect(toolTipText).toBe(undefined);
+    });
+  });
 });

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

@@ -117,7 +117,7 @@ export class LicensingPlugin implements Plugin<LicensingPluginSetup, LicensingPl
     return {
       refresh: refreshManually,
       license$,
-      featureUsage: this.featureUsage.setup({ http: core.http }),
+      featureUsage: this.featureUsage.setup(),
     };
   }
 

x-pack/plugins/licensing/public/services/feature_usage_service.test.ts

@@ -18,22 +18,33 @@ describe('FeatureUsageService', () => {
 
   describe('#setup', () => {
     describe('#register', () => {
-      it('calls the endpoint with the correct parameters', async () => {
-        const setup = service.setup({ http });
-        await setup.register('my-feature', 'platinum');
+      it('calls the endpoint on start with the correct parameters', async () => {
+        const setup = service.setup();
+        setup.register('my-feature', 'platinum');
+        setup.register('my-other-feature', 'gold');
+        expect(http.post).not.toHaveBeenCalled();
+
+        service.start({ http });
         expect(http.post).toHaveBeenCalledTimes(1);
         expect(http.post).toHaveBeenCalledWith('/internal/licensing/feature_usage/register', {
-          body: JSON.stringify({
-            featureName: 'my-feature',
-            licenseType: 'platinum',
-          }),
+          body: JSON.stringify([
+            { featureName: 'my-feature', licenseType: 'platinum' },
+            { featureName: 'my-other-feature', licenseType: 'gold' },
+          ]),
         });
       });
 
-      it('does not call endpoint if on anonymous path', async () => {
+      it('does not call endpoint on start if no registrations', async () => {
+        service.setup();
+        service.start({ http });
+        expect(http.post).not.toHaveBeenCalled();
+      });
+
+      it('does not call endpoint on start if on anonymous path', async () => {
         http.anonymousPaths.isAnonymous.mockReturnValue(true);
-        const setup = service.setup({ http });
-        await setup.register('my-feature', 'platinum');
+        const setup = service.setup();
+        setup.register('my-feature', 'platinum');
+        service.start({ http });
         expect(http.post).not.toHaveBeenCalled();
       });
     });
@@ -42,7 +53,7 @@ describe('FeatureUsageService', () => {
   describe('#start', () => {
     describe('#notifyUsage', () => {
       it('calls the endpoint with the correct parameters', async () => {
-        service.setup({ http });
+        service.setup();
         const start = service.start({ http });
         await start.notifyUsage('my-feature', 42);
 
@@ -56,7 +67,7 @@ describe('FeatureUsageService', () => {
       });
 
       it('correctly convert dates', async () => {
-        service.setup({ http });
+        service.setup();
         const start = service.start({ http });
 
         const now = new Date();
@@ -74,7 +85,7 @@ describe('FeatureUsageService', () => {
 
       it('does not call endpoint if on anonymous path', async () => {
         http.anonymousPaths.isAnonymous.mockReturnValue(true);
-        service.setup({ http });
+        service.setup();
         const start = service.start({ http });
         await start.notifyUsage('my-feature', 42);
         expect(http.post).not.toHaveBeenCalled();

x-pack/plugins/licensing/public/services/feature_usage_service.ts

@@ -5,15 +5,15 @@
  */
 
 import { isDate } from 'lodash';
-import type { HttpSetup, HttpStart } from 'src/core/public';
+import type { HttpStart } from 'src/core/public';
 import { LicenseType } from '../../common/types';
 
 /** @public */
 export interface FeatureUsageServiceSetup {
   /**
    * Register a feature to be able to notify of it's usages using the {@link FeatureUsageServiceStart | service start contract}.
    */
-  register(featureName: string, licenseType: LicenseType): Promise<void>;
+  register(featureName: string, licenseType: LicenseType): void;
 }
 
 /** @public */
@@ -27,10 +27,6 @@ export interface FeatureUsageServiceStart {
   notifyUsage(featureName: string, usedAt?: Date | number): Promise<void>;
 }
 
-interface SetupDeps {
-  http: HttpSetup;
-}
-
 interface StartDeps {
   http: HttpStart;
 }
@@ -39,29 +35,33 @@ interface StartDeps {
  * @internal
  */
 export class FeatureUsageService {
-  public setup({ http }: SetupDeps): FeatureUsageServiceSetup {
+  private readonly registrations: Array<{ featureName: string; licenseType: LicenseType }> = [];
+
+  public setup(): FeatureUsageServiceSetup {
     return {
       register: async (featureName, licenseType) => {
-        // Skip registration if on logged-out page
-        // NOTE: this only works because the login page does a full-page refresh after logging in
-        // If this is ever changed, this code will need to buffer registrations and call them after the user logs in.
-        if (http.anonymousPaths.isAnonymous(window.location.pathname)) return;
-
-        await http.post('/internal/licensing/feature_usage/register', {
-          body: JSON.stringify({
-            featureName,
-            licenseType,
-          }),
-        });
+        this.registrations.push({ featureName, licenseType });
       },
     };
   }
 
   public start({ http }: StartDeps): FeatureUsageServiceStart {
+    // Skip registration if on logged-out page
+    // NOTE: this only works because the login page does a full-page refresh after logging in
+    // If this is ever changed, this code will need to buffer registrations and call them after the user logs in.
+    const registrationPromise =
+      http.anonymousPaths.isAnonymous(window.location.pathname) || this.registrations.length === 0
+        ? Promise.resolve()
+        : http.post('/internal/licensing/feature_usage/register', {
+            body: JSON.stringify(this.registrations),
+          });
+
     return {
       notifyUsage: async (featureName, usedAt = Date.now()) => {
         // Skip notification if on logged-out page
         if (http.anonymousPaths.isAnonymous(window.location.pathname)) return;
+        // Wait for registrations to complete
+        await registrationPromise;
 
         const lastUsed = isDate(usedAt) ? usedAt.getTime() : usedAt;
         await http.post('/internal/licensing/feature_usage/notify', {

x-pack/plugins/licensing/server/routes/internal/register_feature.ts

@@ -16,22 +16,26 @@ export function registerRegisterFeatureRoute(
     {
       path: '/internal/licensing/feature_usage/register',
       validate: {
-        body: schema.object({
-          featureName: schema.string(),
-          licenseType: schema.string({
-            validate: (value) => {
-              if (!(value in LICENSE_TYPE)) {
-                return `Invalid license type: ${value}`;
-              }
-            },
-          }),
-        }),
+        body: schema.arrayOf(
+          schema.object({
+            featureName: schema.string(),
+            licenseType: schema.string({
+              validate: (value) => {
+                if (!(value in LICENSE_TYPE)) {
+                  return `Invalid license type: ${value}`;
+                }
+              },
+            }),
+          })
+        ),
       },
     },
     async (context, request, response) => {
-      const { featureName, licenseType } = request.body;
+      const registrations = request.body;
 
-      featureUsageSetup.register(featureName, licenseType as LicenseType);
+      registrations.forEach(({ featureName, licenseType }) => {
+        featureUsageSetup.register(featureName, licenseType as LicenseType);
+      });
 
       return response.ok({
         body: {