Merge branch 'main' into infra-ui-fix-lazy-public-imports

elastic · Jan 25, 2022 · 382ac4a · 382ac4a
2 parents 7d5bb90 + e4f97cd
commit 382ac4a
Show file tree

Hide file tree

Showing 69 changed files with 1,729 additions and 419 deletions.
diff --git a/src/core/public/application/utils/parse_app_url.test.ts b/src/core/public/application/utils/parse_app_url.test.ts
@@ -39,6 +39,12 @@ describe('parseAppUrl', () => {
       id: 'bar',
       appRoute: '/custom-bar',
     });
+    createApp({
+      id: 're',
+    });
+    createApp({
+      id: 'retail',
+    });
   });
 
   describe('with absolute paths', () => {
@@ -51,6 +57,14 @@ describe('parseAppUrl', () => {
         app: 'bar',
         path: undefined,
       });
+      expect(parseAppUrl('/base-path/app/re', basePath, apps, currentUrl)).toEqual({
+        app: 're',
+        path: undefined,
+      });
+      expect(parseAppUrl('/base-path/app/retail', basePath, apps, currentUrl)).toEqual({
+        app: 'retail',
+        path: undefined,
+      });
     });
     it('parses the path', () => {
       expect(parseAppUrl('/base-path/app/foo/some/path', basePath, apps, currentUrl)).toEqual({
@@ -63,6 +77,14 @@ describe('parseAppUrl', () => {
         app: 'bar',
         path: '/another/path/',
       });
+      expect(parseAppUrl('/base-path/app/re/tail', basePath, apps, currentUrl)).toEqual({
+        app: 're',
+        path: '/tail',
+      });
+      expect(parseAppUrl('/base-path/app/retail/path', basePath, apps, currentUrl)).toEqual({
+        app: 'retail',
+        path: '/path',
+      });
     });
     it('includes query and hash in the path for default app route', () => {
       expect(parseAppUrl('/base-path/app/foo#hash/bang', basePath, apps, currentUrl)).toEqual({
@@ -89,6 +111,18 @@ describe('parseAppUrl', () => {
         app: 'foo',
         path: '/path#hash/bang?hello=dolly',
       });
+      expect(parseAppUrl('/base-path/app/re#hash/bang', basePath, apps, currentUrl)).toEqual({
+        app: 're',
+        path: '#hash/bang',
+      });
+      expect(parseAppUrl('/base-path/app/retail?hello=dolly', basePath, apps, currentUrl)).toEqual({
+        app: 'retail',
+        path: '?hello=dolly',
+      });
+      expect(parseAppUrl('/base-path/app/retail#hash/bang', basePath, apps, currentUrl)).toEqual({
+        app: 'retail',
+        path: '#hash/bang',
+      });
     });
     it('includes query and hash in the path for custom app route', () => {
       expect(parseAppUrl('/base-path/custom-bar#hash/bang', basePath, apps, currentUrl)).toEqual({
@@ -190,7 +224,6 @@ describe('parseAppUrl', () => {
         path: '/path#hash?hello=dolly',
       });
     });
-
     it('returns undefined if the relative path redirect outside of the basePath', () => {
       expect(
         parseAppUrl(
@@ -201,6 +234,19 @@ describe('parseAppUrl', () => {
         )
       ).toBeUndefined();
     });
+    it('works with inclusive app ids', () => {
+      expect(
+        parseAppUrl(
+          './retail/path',
+          basePath,
+          apps,
+          'https://kibana.local:8080/base-path/app/current'
+        )
+      ).toEqual({
+        app: 'retail',
+        path: '/path',
+      });
+    });
   });
 
   describe('with absolute urls', () => {
@@ -217,6 +263,18 @@ describe('parseAppUrl', () => {
         app: 'bar',
         path: undefined,
       });
+      expect(
+        parseAppUrl('https://kibana.local:8080/base-path/app/re', basePath, apps, currentUrl)
+      ).toEqual({
+        app: 're',
+        path: undefined,
+      });
+      expect(
+        parseAppUrl('https://kibana.local:8080/base-path/app/retail', basePath, apps, currentUrl)
+      ).toEqual({
+        app: 'retail',
+        path: undefined,
+      });
     });
     it('parses the path', () => {
       expect(
@@ -241,6 +299,29 @@ describe('parseAppUrl', () => {
         app: 'bar',
         path: '/another/path/',
       });
+
+      expect(
+        parseAppUrl(
+          'https://kibana.local:8080/base-path/app/re/some/path',
+          basePath,
+          apps,
+          currentUrl
+        )
+      ).toEqual({
+        app: 're',
+        path: '/some/path',
+      });
+      expect(
+        parseAppUrl(
+          'https://kibana.local:8080/base-path/app/retail/another/path/',
+          basePath,
+          apps,
+          currentUrl
+        )
+      ).toEqual({
+        app: 'retail',
+        path: '/another/path/',
+      });
     });
     it('includes query and hash in the path for default app routes', () => {
       expect(
@@ -298,6 +379,28 @@ describe('parseAppUrl', () => {
         app: 'foo',
         path: '/path#hash/bang?hello=dolly',
       });
+      expect(
+        parseAppUrl(
+          'https://kibana.local:8080/base-path/app/re#hash/bang',
+          basePath,
+          apps,
+          currentUrl
+        )
+      ).toEqual({
+        app: 're',
+        path: '#hash/bang',
+      });
+      expect(
+        parseAppUrl(
+          'https://kibana.local:8080/base-path/app/re?hello=dolly',
+          basePath,
+          apps,
+          currentUrl
+        )
+      ).toEqual({
+        app: 're',
+        path: '?hello=dolly',
+      });
     });
     it('includes query and hash in the path for custom app route', () => {
       expect(

diff --git a/src/core/public/application/utils/parse_app_url.ts b/src/core/public/application/utils/parse_app_url.ts
@@ -61,7 +61,7 @@ export const parseAppUrl = (
   for (const app of apps.values()) {
     const appPath = app.appRoute || `/app/${app.id}`;
 
-    if (url.startsWith(appPath)) {
+    if (urlInApp(url, appPath)) {
       const path = url.substr(appPath.length);
       return {
         app: app.id,
@@ -70,3 +70,16 @@ export const parseAppUrl = (
     }
   }
 };
+
+const separators = ['/', '?', '#'];
+
+const urlInApp = (url: string, appPath: string) => {
+  if (url === appPath) {
+    return true;
+  }
+  if (url.startsWith(appPath)) {
+    const nextChar = url.substring(appPath.length, appPath.length + 1);
+    return separators.includes(nextChar);
+  }
+  return false;
+};
diff --git a/src/core/server/elasticsearch/client/log_query_and_deprecation.test.ts b/src/core/server/elasticsearch/client/log_query_and_deprecation.test.ts
@@ -540,14 +540,13 @@ describe('instrumentQueryAndDeprecationLogger', () => {
       });
       client.diagnostic.emit('response', new errors.ResponseError(response), response);
 
-      // One debug log entry from 'elasticsearch.query' context
-      expect(loggingSystemMock.collect(logger).debug.length).toEqual(1);
-      expect(loggingSystemMock.collect(logger).info[0][0]).toMatch(
+      // Test debug[1] since theree is one log entry from 'elasticsearch.query' context
+      expect(loggingSystemMock.collect(logger).debug[1][0]).toMatch(
         'Elasticsearch deprecation: 299 Elasticsearch-8.1.0 "GET /_path is deprecated"'
       );
-      expect(loggingSystemMock.collect(logger).info[0][0]).toMatch('Origin:kibana');
-      expect(loggingSystemMock.collect(logger).info[0][0]).toMatch(/Stack trace:\n.*at/);
-      expect(loggingSystemMock.collect(logger).info[0][0]).toMatch(
+      expect(loggingSystemMock.collect(logger).debug[1][0]).toMatch('Origin:kibana');
+      expect(loggingSystemMock.collect(logger).debug[1][0]).toMatch(/Stack trace:\n.*at/);
+      expect(loggingSystemMock.collect(logger).debug[1][0]).toMatch(
         /Query:\n.*400\n.*GET \/_path\?hello\=dolly \[illegal_argument_exception\]: request \[\/_path\] contains unrecognized parameter: \[name\]/
       );
     });
@@ -573,7 +572,6 @@ describe('instrumentQueryAndDeprecationLogger', () => {
       });
       client.diagnostic.emit('response', null, response);
 
-      expect(loggingSystemMock.collect(logger).info).toEqual([]);
       // Test debug[1] since theree is one log entry from 'elasticsearch.query' context
       expect(loggingSystemMock.collect(logger).debug[1][0]).toMatch(
         'Elasticsearch deprecation: 299 Elasticsearch-8.1.0 "GET /_path is deprecated"'
@@ -608,14 +606,13 @@ describe('instrumentQueryAndDeprecationLogger', () => {
       });
       client.diagnostic.emit('response', null, response);
 
-      // One debug log entry from 'elasticsearch.query' context
-      expect(loggingSystemMock.collect(logger).debug.length).toEqual(1);
-      expect(loggingSystemMock.collect(logger).info[0][0]).toMatch(
+      // Test debug[1] since theree is one log entry from 'elasticsearch.query' context
+      expect(loggingSystemMock.collect(logger).debug[1][0]).toMatch(
         'Elasticsearch deprecation: 299 Elasticsearch-8.1.0 "GET /_path is deprecated"'
       );
-      expect(loggingSystemMock.collect(logger).info[0][0]).toMatch('Origin:kibana');
-      expect(loggingSystemMock.collect(logger).info[0][0]).toMatch(/Stack trace:\n.*at/);
-      expect(loggingSystemMock.collect(logger).info[0][0]).toMatch(
+      expect(loggingSystemMock.collect(logger).debug[1][0]).toMatch('Origin:kibana');
+      expect(loggingSystemMock.collect(logger).debug[1][0]).toMatch(/Stack trace:\n.*at/);
+      expect(loggingSystemMock.collect(logger).debug[1][0]).toMatch(
         /Query:\n.*200\n.*GET \/_path\?hello\=dolly/
       );
     });

diff --git a/src/core/server/elasticsearch/client/log_query_and_deprecation.ts b/src/core/server/elasticsearch/client/log_query_and_deprecation.ts
@@ -139,12 +139,9 @@ export const instrumentEsQueryAndDeprecationLogger = ({
         // Strip the first 5 stack trace lines as these are irrelavent to finding the call site
         const stackTrace = new Error().stack?.split('\n').slice(5).join('\n');
 
-        const deprecationMsg = `Elasticsearch deprecation: ${event.warnings}\nOrigin:${requestOrigin}\nStack trace:\n${stackTrace}\nQuery:\n${queryMsg}`;
-        if (requestOrigin === 'kibana') {
-          deprecationLogger.info(deprecationMsg);
-        } else {
-          deprecationLogger.debug(deprecationMsg);
-        }
+        deprecationLogger.debug(
+          `Elasticsearch deprecation: ${event.warnings}\nOrigin:${requestOrigin}\nStack trace:\n${stackTrace}\nQuery:\n${queryMsg}`
+        );
       }
     }
   });

diff --git a/src/core/server/saved_objects/migrations/integration_tests/7.7.2_xpack_100k.test.ts b/src/core/server/saved_objects/migrations/integration_tests/7.7.2_xpack_100k.test.ts
@@ -63,6 +63,7 @@ describe('migration from 7.7.2-xpack with 100k objects', () => {
           loggers: [
             {
               name: 'root',
+              level: 'info',
               appenders: ['file'],
             },
           ],

diff --git a/...core/server/saved_objects/migrations/integration_tests/7_13_0_failed_action_tasks.test.ts b/...core/server/saved_objects/migrations/integration_tests/7_13_0_failed_action_tasks.test.ts
@@ -128,6 +128,7 @@ function createRoot() {
         loggers: [
           {
             name: 'root',
+            level: 'info',
             appenders: ['file'],
           },
         ],

diff --git a/src/core/server/saved_objects/migrations/integration_tests/7_13_0_transform_failures.test.ts b/src/core/server/saved_objects/migrations/integration_tests/7_13_0_transform_failures.test.ts
@@ -170,6 +170,7 @@ function createRoot() {
         loggers: [
           {
             name: 'root',
+            level: 'info',
             appenders: ['file'],
           },
         ],

diff --git a/src/core/server/saved_objects/migrations/integration_tests/7_13_0_unknown_types.test.ts b/src/core/server/saved_objects/migrations/integration_tests/7_13_0_unknown_types.test.ts
@@ -124,6 +124,7 @@ function createRoot() {
         loggers: [
           {
             name: 'root',
+            level: 'info',
             appenders: ['file'],
           },
         ],

diff --git a/src/core/server/saved_objects/migrations/integration_tests/batch_size_bytes.test.ts b/src/core/server/saved_objects/migrations/integration_tests/batch_size_bytes.test.ts
@@ -154,6 +154,7 @@ function createRoot(options: { maxBatchSizeBytes?: number }) {
         loggers: [
           {
             name: 'root',
+            level: 'info',
             appenders: ['file'],
           },
         ],

diff --git a/...d_objects/migrations/integration_tests/batch_size_bytes_exceeds_es_content_length.test.ts b/...d_objects/migrations/integration_tests/batch_size_bytes_exceeds_es_content_length.test.ts
@@ -105,6 +105,7 @@ function createRoot(options: { maxBatchSizeBytes?: number }) {
         loggers: [
           {
             name: 'root',
+            level: 'info',
             appenders: ['file'],
           },
         ],

diff --git a/src/core/server/saved_objects/migrations/integration_tests/collects_corrupt_docs.test.ts b/src/core/server/saved_objects/migrations/integration_tests/collects_corrupt_docs.test.ts
@@ -165,6 +165,7 @@ function createRoot() {
           {
             name: 'root',
             appenders: ['file'],
+            level: 'info',
           },
         ],
       },

diff --git a/src/core/server/saved_objects/migrations/integration_tests/corrupt_outdated_docs.test.ts b/src/core/server/saved_objects/migrations/integration_tests/corrupt_outdated_docs.test.ts
@@ -169,6 +169,7 @@ function createRoot() {
           {
             name: 'root',
             appenders: ['file'],
+            level: 'info',
           },
         ],
       },

diff --git a/src/core/server/saved_objects/migrations/integration_tests/migration_from_older_v1.test.ts b/src/core/server/saved_objects/migrations/integration_tests/migration_from_older_v1.test.ts
@@ -94,6 +94,7 @@ describe('migrating from 7.3.0-xpack which used v1 migrations', () => {
             {
               name: 'root',
               appenders: ['file'],
+              level: 'info',
             },
           ],
         },

diff --git a/src/core/server/saved_objects/migrations/integration_tests/migration_from_same_v1.test.ts b/src/core/server/saved_objects/migrations/integration_tests/migration_from_same_v1.test.ts
@@ -94,6 +94,7 @@ describe('migrating from the same Kibana version that used v1 migrations', () =>
             {
               name: 'root',
               appenders: ['file'],
+              level: 'info',
             },
           ],
         },

diff --git a/src/core/server/saved_objects/migrations/integration_tests/multiple_es_nodes.test.ts b/src/core/server/saved_objects/migrations/integration_tests/multiple_es_nodes.test.ts
@@ -83,6 +83,7 @@ function createRoot({ logFileName, hosts }: RootConfig) {
         {
           name: 'root',
           appenders: ['file'],
+          level: 'info',
         },
       ],
     },

diff --git a/src/core/server/saved_objects/migrations/integration_tests/multiple_kibana_nodes.test.ts b/src/core/server/saved_objects/migrations/integration_tests/multiple_kibana_nodes.test.ts
@@ -83,6 +83,7 @@ async function createRoot({ logFileName }: CreateRootConfig) {
         {
           name: 'root',
           appenders: ['file'],
+          level: 'info',
         },
         {
           name: 'savedobjects-service',

diff --git a/src/core/server/saved_objects/migrations/integration_tests/outdated_docs.test.ts b/src/core/server/saved_objects/migrations/integration_tests/outdated_docs.test.ts
@@ -109,6 +109,7 @@ function createRoot() {
         loggers: [
           {
             name: 'root',
+            level: 'info',
             appenders: ['file'],
           },
         ],

diff --git a/src/core/server/saved_objects/migrations/integration_tests/rewriting_id.test.ts b/src/core/server/saved_objects/migrations/integration_tests/rewriting_id.test.ts
@@ -76,6 +76,7 @@ function createRoot() {
         loggers: [
           {
             name: 'root',
+            level: 'info',
             appenders: ['file'],
           },
         ],

diff --git a/src/core/test_helpers/kbn_server.ts b/src/core/test_helpers/kbn_server.ts
@@ -109,6 +109,25 @@ export function createRootWithCorePlugins(settings = {}, cliArgs: Partial<CliArg
       username: kibanaServerTestUser.username,
       password: kibanaServerTestUser.password,
     },
+    // Log ES deprecations to surface these in CI
+    logging: {
+      loggers: [
+        {
+          name: 'root',
+          level: 'error',
+          appenders: ['console'],
+        },
+        {
+          name: 'elasticsearch.deprecation',
+          level: 'all',
+          appenders: ['deprecation'],
+        },
+      ],
+      appenders: {
+        deprecation: { type: 'console', layout: { type: 'json' } },
+        console: { type: 'console', layout: { type: 'pattern' } },
+      },
+    },
     // createRootWithSettings sets default value to "true", so undefined should be threatened as "true".
     ...(cliArgs.oss === false
       ? {