Merge branch 'master' into update-alert-status-usage

elastic · Aug 20, 2021 · 35b18e5 · 35b18e5
2 parents 736b94b + 442d9c3
commit 35b18e5
Show file tree

Hide file tree

Showing 4 changed files with 23 additions and 21 deletions.
diff --git a/x-pack/plugins/apm/server/lib/services/__snapshots__/queries.test.ts.snap b/x-pack/plugins/apm/server/lib/services/__snapshots__/queries.test.ts.snap
diff --git a/x-pack/plugins/apm/server/lib/services/get_service_agent.ts b/x-pack/plugins/apm/server/lib/services/get_service_agent.ts
@@ -16,14 +16,14 @@ import { Setup, SetupTimeRange } from '../helpers/setup_request';
 import { getProcessorEventForAggregatedTransactions } from '../helpers/aggregated_transactions';
 
 interface ServiceAgent {
-  service?: {
-    runtime: {
-      name: string;
-    };
-  };
   agent?: {
     name: string;
   };
+  service?: {
+    runtime?: {
+      name?: string;
+    };
+  };
 }
 
 export async function getServiceAgent({
@@ -50,23 +50,23 @@ export async function getServiceAgent({
     },
     body: {
       size: 1,
-      _source: [SERVICE_RUNTIME_NAME, AGENT_NAME],
+      _source: [AGENT_NAME, SERVICE_RUNTIME_NAME],
       query: {
         bool: {
           filter: [
             { term: { [SERVICE_NAME]: serviceName } },
             ...rangeQuery(start, end),
-            {
-              exists: {
-                field: SERVICE_RUNTIME_NAME,
-              },
-            },
             {
               exists: {
                 field: AGENT_NAME,
               },
             },
           ],
+          should: {
+            exists: {
+              field: SERVICE_RUNTIME_NAME,
+            },
+          },
         },
       },
     },
@@ -80,6 +80,6 @@ export async function getServiceAgent({
     return {};
   }
 
-  const { service, agent } = response.hits.hits[0]._source as ServiceAgent;
-  return { agentName: agent?.name, runtimeName: service?.runtime.name };
+  const { agent, service } = response.hits.hits[0]._source as ServiceAgent;
+  return { agentName: agent?.name, runtimeName: service?.runtime?.name };
 }
diff --git a/x-pack/test/functional/apps/dashboard_mode/dashboard_view_mode.js b/x-pack/test/functional/apps/dashboard_mode/dashboard_view_mode.js
@@ -62,7 +62,8 @@ export default function ({ getService, getPageObjects }) {
       await kibanaServer.savedObjects.clean({ types });
     });
 
-    describe('Dashboard viewer', () => {
+    // FAILING ES PROMOTION: https://github.com/elastic/kibana/issues/109351
+    describe.skip('Dashboard viewer', () => {
       after(async () => {
         await security.testUser.restoreDefaults();
       });

diff --git a/x-pack/test/functional/apps/security/users.js b/x-pack/test/functional/apps/security/users.js
@@ -12,7 +12,8 @@ export default function ({ getService, getPageObjects }) {
   const config = getService('config');
   const log = getService('log');
 
-  describe('users', function () {
+  // FAILING ES PROMOTION: https://github.com/elastic/kibana/issues/109349
+  describe.skip('users', function () {
     before(async () => {
       log.debug('users');
       await PageObjects.settings.navigateTo();