Merge branch 'master' into ingest/package-renaming

packages/kbn-config/src/env.test.ts

@@ -198,6 +198,18 @@ test('pluginSearchPaths contains x-pack/examples plugins path if --run-examples
   expect(env.pluginSearchPaths).toContain('/some/home/dir/x-pack/examples');
 });
 
+test('pluginSearchPaths does not contain x-pack/examples plugins path if --oss flag is true', () => {
+  const env = new Env(
+    '/some/home/dir',
+    packageInfos,
+    getEnvOptions({
+      cliArgs: { runExamples: true, oss: true },
+    })
+  );
+
+  expect(env.pluginSearchPaths).not.toContain('/some/home/dir/x-pack/examples');
+});
+
 test('pluginSearchPaths does not contains examples plugins path if --run-examples flag is false', () => {
   const env = new Env(
     '/some/home/dir',

packages/kbn-config/src/env.ts

@@ -123,8 +123,9 @@ export class Env {
       resolve(this.homeDir, 'src', 'plugins'),
       ...(options.cliArgs.oss ? [] : [resolve(this.homeDir, 'x-pack', 'plugins')]),
       resolve(this.homeDir, 'plugins'),
-      ...(options.cliArgs.runExamples
-        ? [resolve(this.homeDir, 'examples'), resolve(this.homeDir, 'x-pack', 'examples')]
+      ...(options.cliArgs.runExamples ? [resolve(this.homeDir, 'examples')] : []),
+      ...(options.cliArgs.runExamples && !options.cliArgs.oss
+        ? [resolve(this.homeDir, 'x-pack', 'examples')]
         : []),
       resolve(this.homeDir, '..', 'kibana-extra'),
     ];

packages/kbn-dev-utils/src/kbn_client/kbn_client.ts

@@ -54,8 +54,8 @@ export class KbnClient {
   /**
    * Make a direct request to the Kibana server
    */
-  async request(options: ReqOptions) {
-    return await this.requester.request(options);
+  async request<T>(options: ReqOptions) {
+    return await this.requester.request<T>(options);
   }
 
   resolveUrl(relativeUrl: string) {

tsconfig.base.json

@@ -39,6 +39,8 @@
     // Resolve modules in the same way as Node.js. Aka make `require` works the
     // same in TypeScript as it does in Node.js.
     "moduleResolution": "node",
+    // "resolveJsonModule" allows for importing, extracting types from and generating .json files.
+    "resolveJsonModule": true,
     // Disallow inconsistently-cased references to the same file.
     "forceConsistentCasingInFileNames": true,
     // Forbid unused local variables as the rule was deprecated by ts-lint

typings/index.d.ts

@@ -35,15 +35,6 @@ declare module '*.svg' {
   export default content;
 }
 
-// allow JSON files to be imported directly without lint errors
-// see: https://github.com/palantir/tslint/issues/1264#issuecomment-228433367
-// and: https://github.com/Microsoft/TypeScript/wiki/Breaking-Changes#arbitrary-expressions-are-forbidden-in-export-assignments-in-ambient-contexts
-declare module '*.json' {
-  const json: any;
-  // eslint-disable-next-line import/no-default-export
-  export default json;
-}
-
 type MethodKeysOf<T> = {
   [K in keyof T]: T[K] extends (...args: any[]) => any ? K : never;
 }[keyof T];

x-pack/plugins/apm/public/components/app/ErrorGroupOverview/List/__test__/List.test.tsx

@@ -43,6 +43,7 @@ describe('ErrorGroupOverview -> List', () => {
       <MemoryRouter>
         <MockApmPluginContextWrapper>
           <MockUrlParamsContextProvider>
+            {/* @ts-expect-error invalid json props */}
             <ErrorGroupList items={props.items} serviceName="opbeans-python" />
           </MockUrlParamsContextProvider>
         </MockApmPluginContextWrapper>

x-pack/plugins/apm/public/components/app/Settings/anomaly_detection/legacy_jobs_callout.tsx

@@ -8,9 +8,20 @@ import { EuiCallOut, EuiButton } from '@elastic/eui';
 import React from 'react';
 import { i18n } from '@kbn/i18n';
 import { useApmPluginContext } from '../../../../hooks/useApmPluginContext';
+import { useMlHref } from '../../../../../../ml/public';
 
 export function LegacyJobsCallout() {
-  const { core } = useApmPluginContext();
+  const {
+    core,
+    plugins: { ml },
+  } = useApmPluginContext();
+  const mlADLink = useMlHref(ml, core.http.basePath.get(), {
+    page: 'jobs',
+    pageState: {
+      jobId: 'high_mean_response_time',
+    },
+  });
+
   return (
     <EuiCallOut
       title={i18n.translate(
@@ -28,11 +39,7 @@ export function LegacyJobsCallout() {
           }
         )}
       </p>
-      <EuiButton
-        href={core.http.basePath.prepend(
-          '/app/ml#/jobs?mlManagement=(jobId:high_mean_response_time)'
-        )}
-      >
+      <EuiButton href={mlADLink}>
         {i18n.translate(
           'xpack.apm.settings.anomaly_detection.legacy_jobs.button',
           { defaultMessage: 'Review jobs' }

x-pack/plugins/apm/public/components/shared/Links/DiscoverLinks/__test__/DiscoverTransactionButton.test.tsx

@@ -15,6 +15,7 @@ import mockTransaction from './mockTransaction.json';
 
 describe('DiscoverTransactionLink component', () => {
   it('should render with data', () => {
+    // @ts-expect-error invalid json mock
     const transaction: Transaction = mockTransaction;
 
     expect(
@@ -25,6 +26,7 @@ describe('DiscoverTransactionLink component', () => {
 
 describe('getDiscoverQuery', () => {
   it('should return the correct query params object', () => {
+    // @ts-expect-error invalid json mock
     const transaction: Transaction = mockTransaction;
     const result = getDiscoverQuery(transaction);
     expect(result).toMatchSnapshot();

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

@@ -22,7 +22,7 @@ describe('MLJobLink', () => {
     );
 
     expect(href).toMatchInlineSnapshot(
-      `"/basepath/app/ml#/timeseriesexplorer?_g=(ml:(jobIds:!(myservicename-mytransactiontype-high_mean_response_time)),refreshInterval:(pause:!t,value:0),time:(from:now/w,to:now-4h))"`
+      `"/app/ml/timeseriesexplorer?_g=(ml:(jobIds:!(myservicename-mytransactiontype-high_mean_response_time)),refreshInterval:(pause:!t,value:0),time:(from:now%2Fw,to:now-4h))&_a=(mlTimeSeriesExplorer:(),zoom:(from:now%2Fw,to:now-4h))"`
     );
   });
   it('should produce the correct URL with jobId, serviceName, and transactionType', async () => {
@@ -41,7 +41,27 @@ describe('MLJobLink', () => {
     );
 
     expect(href).toMatchInlineSnapshot(
-      `"/basepath/app/ml#/timeseriesexplorer?_g=(ml:(jobIds:!(myservicename-mytransactiontype-high_mean_response_time)),refreshInterval:(pause:!t,value:0),time:(from:now/w,to:now-4h))&_a=(mlTimeSeriesExplorer:(entities:(service.name:opbeans-test,transaction.type:request)))"`
+      `"/app/ml/timeseriesexplorer?_g=(ml:(jobIds:!(myservicename-mytransactiontype-high_mean_response_time)),refreshInterval:(pause:!t,value:0),time:(from:now%2Fw,to:now-4h))&_a=(mlTimeSeriesExplorer:(entities:(service.name:opbeans-test,transaction.type:request)),zoom:(from:now%2Fw,to:now-4h))"`
+    );
+  });
+
+  it('correctly encodes time range values', async () => {
+    const href = await getRenderedHref(
+      () => (
+        <MLJobLink
+          jobId="apm-production-485b-high_mean_transaction_duration"
+          serviceName="opbeans-java"
+          transactionType="request"
+        />
+      ),
+      {
+        search:
+          '?rangeFrom=2020-07-29T17:27:29.000Z&rangeTo=2020-07-29T18:45:00.000Z&refreshInterval=10000&refreshPaused=true',
+      } as Location
+    );
+
+    expect(href).toMatchInlineSnapshot(
+      `"/app/ml/timeseriesexplorer?_g=(ml:(jobIds:!(apm-production-485b-high_mean_transaction_duration)),refreshInterval:(pause:!t,value:10000),time:(from:'2020-07-29T17:27:29.000Z',to:'2020-07-29T18:45:00.000Z'))&_a=(mlTimeSeriesExplorer:(entities:(service.name:opbeans-java,transaction.type:request)),zoom:(from:'2020-07-29T17:27:29.000Z',to:'2020-07-29T18:45:00.000Z'))"`
     );
   });
 });

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

@@ -11,16 +11,14 @@ import { MLLink } from './MLLink';
 
 test('MLLink produces the correct URL', async () => {
   const href = await getRenderedHref(
-    () => (
-      <MLLink path="/some/path" query={{ ml: { jobIds: ['something'] } }} />
-    ),
+    () => <MLLink query={{ ml: { jobIds: ['something'] } }} />,
     {
       search:
         '?rangeFrom=now-5h&rangeTo=now-2h&refreshPaused=true&refreshInterval=0',
     } as Location
   );
 
   expect(href).toMatchInlineSnapshot(
-    `"/basepath/app/ml#/some/path?_g=(ml:(jobIds:!(something)),refreshInterval:(pause:!t,value:0),time:(from:now-5h,to:now-2h))&mlManagement=(groupIds:!(apm))"`
+    `"/app/ml/jobs?mlManagement=(groupIds:!(apm),jobId:!(something))&_g=(refreshInterval:(pause:!t,value:0),time:(from:now-5h,to:now-2h))"`
   );
 });

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

@@ -6,11 +6,9 @@
 
 import { EuiLink } from '@elastic/eui';
 import React from 'react';
-import { useLocation } from 'react-router-dom';
-import rison, { RisonValue } from 'rison-node';
-import url from 'url';
 import { useApmPluginContext } from '../../../../hooks/useApmPluginContext';
-import { getTimepickerRisonData, TimepickerRisonData } from '../rison_helpers';
+import { useMlHref, ML_PAGES } from '../../../../../../ml/public';
+import { useUrlParams } from '../../../../hooks/useUrlParams';
 
 interface MlRisonData {
   ml?: {
@@ -26,28 +24,41 @@ interface Props {
 }
 
 export function MLLink({ children, path = '', query = {}, external }: Props) {
-  const { core } = useApmPluginContext();
-  const location = useLocation();
+  const {
+    core,
+    plugins: { ml },
+  } = useApmPluginContext();
 
-  const risonQuery: MlRisonData & TimepickerRisonData = getTimepickerRisonData(
-    location.search
-  );
-
-  if (query.ml) {
-    risonQuery.ml = query.ml;
+  let jobIds: string[] = [];
+  if (query.ml?.jobIds) {
+    jobIds = query.ml.jobIds;
   }
+  const { urlParams } = useUrlParams();
+  const { rangeFrom, rangeTo, refreshInterval, refreshPaused } = urlParams;
 
-  const href = url.format({
-    pathname: core.http.basePath.prepend('/app/ml'),
-    hash: `${path}?_g=${rison.encode(
-      risonQuery as RisonValue
-    )}&mlManagement=${rison.encode({ groupIds: ['apm'] })}`,
+  // default to link to ML Anomaly Detection jobs management page
+  const mlADLink = useMlHref(ml, core.http.basePath.get(), {
+    page: ML_PAGES.ANOMALY_DETECTION_JOBS_MANAGE,
+    pageState: {
+      jobId: jobIds,
+      groupIds: ['apm'],
+      globalState: {
+        time:
+          rangeFrom !== undefined && rangeTo !== undefined
+            ? { from: rangeFrom, to: rangeTo }
+            : undefined,
+        refreshInterval:
+          refreshPaused !== undefined && refreshInterval !== undefined
+            ? { pause: refreshPaused, value: refreshInterval }
+            : undefined,
+      },
+    },
   });
 
   return (
     <EuiLink
       children={children}
-      href={href}
+      href={mlADLink}
       external={external}
       target={external ? '_blank' : undefined}
     />