From 7396d80278d36aa0efaa63abe8d15897b8a62226 Mon Sep 17 00:00:00 2001
From: Joe Reuter <johannes.reuter@elastic.co>
Date: Mon, 14 Feb 2022 14:33:55 +0100
Subject: [PATCH] [TSVB] Use panel interval for annotations (#125222)

(cherry picked from commit 5babc9f6637b22a9ee6369f65ee71dfe6afa52e4)
---
 .../lib/vis_data/annotations/get_request_params.ts   |  2 ++
 .../request_processors/annotations/date_histogram.ts | 12 +++++++++++-
 .../vis_data/request_processors/annotations/types.ts |  5 +++++
 test/functional/apps/visualize/_tsvb_time_series.ts  |  6 ------
 4 files changed, 18 insertions(+), 7 deletions(-)

diff --git a/src/plugins/vis_types/timeseries/server/lib/vis_data/annotations/get_request_params.ts b/src/plugins/vis_types/timeseries/server/lib/vis_data/annotations/get_request_params.ts
index 41f7e7c86708f..815598007030d 100644
--- a/src/plugins/vis_types/timeseries/server/lib/vis_data/annotations/get_request_params.ts
+++ b/src/plugins/vis_types/timeseries/server/lib/vis_data/annotations/get_request_params.ts
@@ -31,6 +31,7 @@ export async function getAnnotationRequestParams(
     capabilities,
     uiSettings,
     cachedIndexPatternFetcher,
+    buildSeriesMetaParams,
   }: AnnotationServices
 ): Promise<EsSearchRequest> {
   const annotationIndex = await cachedIndexPatternFetcher(annotation.index_pattern);
@@ -43,6 +44,7 @@ export async function getAnnotationRequestParams(
     annotationIndex,
     capabilities,
     uiSettings,
+    getMetaParams: () => buildSeriesMetaParams(annotationIndex, Boolean(panel.use_kibana_indexes)),
   });
 
   return {
diff --git a/src/plugins/vis_types/timeseries/server/lib/vis_data/request_processors/annotations/date_histogram.ts b/src/plugins/vis_types/timeseries/server/lib/vis_data/request_processors/annotations/date_histogram.ts
index a52e15eb90fee..c1bd0a11f550a 100644
--- a/src/plugins/vis_types/timeseries/server/lib/vis_data/request_processors/annotations/date_histogram.ts
+++ b/src/plugins/vis_types/timeseries/server/lib/vis_data/request_processors/annotations/date_histogram.ts
@@ -23,16 +23,26 @@ export const dateHistogram: AnnotationsRequestProcessorsFunction = ({
   annotationIndex,
   capabilities,
   uiSettings,
+  getMetaParams,
 }) => {
   return (next) => async (doc) => {
+    const maxBarsUiSettings = await uiSettings.get(UI_SETTINGS.HISTOGRAM_MAX_BARS);
     const barTargetUiSettings = await uiSettings.get(UI_SETTINGS.HISTOGRAM_BAR_TARGET);
     const timeField = annotation.time_field || annotationIndex.indexPattern?.timeFieldName || '';
+    const { interval, maxBars } = await getMetaParams();
 
     if (panel.use_kibana_indexes) {
       validateField(timeField, annotationIndex);
     }
 
     const { bucketSize, intervalString } = getBucketSize(
+      req,
+      interval,
+      capabilities,
+      maxBars ? Math.min(maxBarsUiSettings, maxBars) : barTargetUiSettings
+    );
+
+    const { bucketSize: autoBucketSize, intervalString: autoIntervalString } = getBucketSize(
       req,
       'auto',
       capabilities,
@@ -49,7 +59,7 @@ export const dateHistogram: AnnotationsRequestProcessorsFunction = ({
         min: from.valueOf(),
         max: to.valueOf() - bucketSize * 1000,
       },
-      ...dateHistogramInterval(intervalString),
+      ...dateHistogramInterval(autoBucketSize < bucketSize ? autoIntervalString : intervalString),
     });
     return next(doc);
   };
diff --git a/src/plugins/vis_types/timeseries/server/lib/vis_data/request_processors/annotations/types.ts b/src/plugins/vis_types/timeseries/server/lib/vis_data/request_processors/annotations/types.ts
index 0b67d6f0d1984..ae2563fbfb64b 100644
--- a/src/plugins/vis_types/timeseries/server/lib/vis_data/request_processors/annotations/types.ts
+++ b/src/plugins/vis_types/timeseries/server/lib/vis_data/request_processors/annotations/types.ts
@@ -22,6 +22,11 @@ export interface AnnotationsRequestProcessorsParams {
   annotationIndex: FetchedIndexPattern;
   capabilities: SearchCapabilities;
   uiSettings: IUiSettingsClient;
+  getMetaParams: () => Promise<{
+    maxBars: number;
+    timeField?: string | undefined;
+    interval: string;
+  }>;
 }
 
 export type AnnotationSearchRequest = Record<string, unknown>;
diff --git a/test/functional/apps/visualize/_tsvb_time_series.ts b/test/functional/apps/visualize/_tsvb_time_series.ts
index 4fa8cd6f2d7f5..d21581fba56d7 100644
--- a/test/functional/apps/visualize/_tsvb_time_series.ts
+++ b/test/functional/apps/visualize/_tsvb_time_series.ts
@@ -468,12 +468,9 @@ export default function ({ getPageObjects, getService }: FtrProviderContext) {
             await visualBuilder.setAnnotationFilter('geo.dest : "AW" or geo.src : "AM"');
             await visualBuilder.setAnnotationFields('extension.raw');
             await visualBuilder.setAnnotationRowTemplate('extension: {{extension.raw}}');
-
             const annotationsData = await visualBuilder.getAnnotationsData();
-
             expect(annotationsData).to.eql(expectedAnnotationsData);
           });
-
           it('should display correct annotations data for machine.os.raw and memory fields', async () => {
             const expectedAnnotationsData = [
               {
@@ -512,12 +509,9 @@ export default function ({ getPageObjects, getService }: FtrProviderContext) {
             await visualBuilder.setAnnotationRowTemplate(
               'OS: {{machine.os.raw}}, memory: {{memory}}'
             );
-
             const annotationsData = await visualBuilder.getAnnotationsData();
-
             expect(annotationsData).to.eql(expectedAnnotationsData);
           });
-
           it('should display correct annotations data when using runtime field', async () => {
             const expectedAnnotationsData = [
               {