Merge branch 'master' of github.com:elastic/kibana into implement/improve-kbn-client-ssl

Author: spalger

docs/settings/apm-settings.asciidoc

@@ -61,6 +61,10 @@ Changing these settings may disable features of the APM App.
 | `xpack.observability.annotations.index`
   | Index name where Observability annotations are stored. Defaults to `observability-annotations`.
 
+| `xpack.apm.searchAggregatedTransactions`
+  | experimental[] Enables Transaction histogram metrics. Defaults to `false`. When `true`, additional configuration in APM Server is required.
+    See {apm-server-ref-v}/transaction-metrics.html[Configure transaction metrics] for more information.
+
 | `apm_oss.indexPattern` {ess-icon}
   | The index pattern used for integrations with Machine Learning and Query Bar.
   It must match all apm indices. Defaults to `apm-*`.

x-pack/plugins/uptime/server/lib/requests/__tests__/get_latest_monitor.test.ts

@@ -17,6 +17,11 @@ describe('getLatestMonitor', () => {
         query: {
           bool: {
             filter: [
+              {
+                exists: {
+                  field: 'summary',
+                },
+              },
               {
                 range: {
                   '@timestamp': {

x-pack/plugins/uptime/server/lib/requests/get_latest_monitor.ts

@@ -18,8 +18,6 @@ export interface GetLatestMonitorParams {
   monitorId?: string | null;
 
   observerLocation?: string;
-
-  status?: string;
 }
 
 // Get The monitor latest state sorted by timestamp with date range
@@ -30,14 +28,14 @@ export const getLatestMonitor: UMElasticsearchQueryFn<GetLatestMonitorParams, Pi
   dateEnd,
   monitorId,
   observerLocation,
-  status,
 }) => {
   const params = {
     index: dynamicSettings.heartbeatIndices,
     body: {
       query: {
         bool: {
           filter: [
+            { exists: { field: 'summary' } },
             {
               range: {
                 '@timestamp': {
@@ -46,7 +44,6 @@ export const getLatestMonitor: UMElasticsearchQueryFn<GetLatestMonitorParams, Pi
                 },
               },
             },
-            ...(status ? [{ term: { 'monitor.status': status } }] : []),
             ...(monitorId ? [{ term: { 'monitor.id': monitorId } }] : []),
             ...(observerLocation ? [{ term: { 'observer.geo.name': observerLocation } }] : []),
           ],