Merge branch 'master' into security/support-deprecated-users

elastic · May 2, 2020 · dd5c950 · dd5c950
2 parents 33a7f52 + 8eeaf96
commit dd5c950
Show file tree

Hide file tree

Showing 8 changed files with 36 additions and 3 deletions.
diff --git a/x-pack/plugins/apm/scripts/optimize-tsconfig/paths.js b/x-pack/plugins/apm/scripts/optimize-tsconfig/paths.js
@@ -5,7 +5,7 @@
  */
 const path = require('path');
 
-const xpackRoot = path.resolve(__dirname, '../../../../..');
+const xpackRoot = path.resolve(__dirname, '../../../..');
 const kibanaRoot = path.resolve(xpackRoot, '..');
 
 const tsconfigTpl = path.resolve(__dirname, './tsconfig.json');

diff --git a/x-pack/plugins/apm/server/lib/transaction_groups/__snapshots__/fetcher.test.ts.snap b/x-pack/plugins/apm/server/lib/transaction_groups/__snapshots__/fetcher.test.ts.snap
diff --git a/x-pack/plugins/apm/server/lib/transaction_groups/__snapshots__/queries.test.ts.snap b/x-pack/plugins/apm/server/lib/transaction_groups/__snapshots__/queries.test.ts.snap
diff --git a/x-pack/plugins/apm/server/lib/transaction_groups/fetcher.ts b/x-pack/plugins/apm/server/lib/transaction_groups/fetcher.ts
@@ -83,7 +83,11 @@ export function transactionGroupsFetcher(
             sample: { top_hits: { size: 1, sort } },
             avg: { avg: { field: TRANSACTION_DURATION } },
             p95: {
-              percentiles: { field: TRANSACTION_DURATION, percents: [95] }
+              percentiles: {
+                field: TRANSACTION_DURATION,
+                percents: [95],
+                hdr: { number_of_significant_value_digits: 2 }
+              }
             },
             sum: { sum: { field: TRANSACTION_DURATION } }
           }

diff --git a/x-pack/plugins/apm/server/lib/transactions/__snapshots__/queries.test.ts.snap b/x-pack/plugins/apm/server/lib/transactions/__snapshots__/queries.test.ts.snap
diff --git a/...apm/server/lib/transactions/charts/get_timeseries_data/__snapshots__/fetcher.test.ts.snap b/...apm/server/lib/transactions/charts/get_timeseries_data/__snapshots__/fetcher.test.ts.snap
diff --git a/x-pack/plugins/apm/server/lib/transactions/charts/get_timeseries_data/fetcher.ts b/x-pack/plugins/apm/server/lib/transactions/charts/get_timeseries_data/fetcher.ts
@@ -69,7 +69,11 @@ export function timeseriesFetcher({
           aggs: {
             avg: { avg: { field: TRANSACTION_DURATION } },
             pct: {
-              percentiles: { field: TRANSACTION_DURATION, percents: [95, 99] }
+              percentiles: {
+                field: TRANSACTION_DURATION,
+                percents: [95, 99],
+                hdr: { number_of_significant_value_digits: 2 }
+              }
             }
           }
         },

diff --git a/x-pack/plugins/apm/typings/elasticsearch/aggregations.ts b/x-pack/plugins/apm/typings/elasticsearch/aggregations.ts
@@ -86,6 +86,7 @@ export interface AggregationOptionsByType {
   percentiles: {
     field: string;
     percents?: number[];
+    hdr?: { number_of_significant_value_digits: number };
   };
   extended_stats: {
     field: string;