From 5d760f84656109a02460bff65b0b4198267a679f Mon Sep 17 00:00:00 2001
From: Ivana Huckova <30407135+ivanahuckova@users.noreply.github.com>
Date: Tue, 11 Jan 2022 11:05:24 +0100
Subject: [PATCH] Prometheus: annotation: fix only first frame was process
 error & typo. (#43486) (#43804)

---
 .../datasource/prometheus/datasource.ts       | 121 +++++++++---------
 1 file changed, 62 insertions(+), 59 deletions(-)

diff --git a/public/app/plugins/datasource/prometheus/datasource.ts b/public/app/plugins/datasource/prometheus/datasource.ts
index 974781893a0..9b4b73ae72e 100644
--- a/public/app/plugins/datasource/prometheus/datasource.ts
+++ b/public/app/plugins/datasource/prometheus/datasource.ts
@@ -680,13 +680,13 @@ export class PrometheusDatasource extends DataSourceWithBackend<PromQuery, PromO
         })
         .pipe(
           map((rsp: FetchResponse<BackendDataSourceResponse>) => {
-            return this.processsAnnotationResponse(options, rsp.data);
+            return this.processAnnotationResponse(options, rsp.data);
           })
         )
     );
   }
 
-  processsAnnotationResponse = (options: any, data: BackendDataSourceResponse) => {
+  processAnnotationResponse = (options: any, data: BackendDataSourceResponse) => {
     const frames: DataFrame[] = toDataQueryResponse({ data: data }).data;
     if (!frames || !frames.length) {
       return [];
@@ -697,71 +697,74 @@ export class PrometheusDatasource extends DataSourceWithBackend<PromQuery, PromO
 
     const step = rangeUtil.intervalToSeconds(annotation.step || ANNOTATION_QUERY_STEP_DEFAULT) * 1000;
     const tagKeysArray = tagKeys.split(',');
-    const frame = frames[0];
-    const timeField = frame.fields[0];
-    const valueField = frame.fields[1];
-    const labels = valueField?.labels || {};
 
-    const tags = Object.keys(labels)
-      .filter((label) => tagKeysArray.includes(label))
-      .map((label) => labels[label]);
-
-    const timeValueTuple: Array<[number, number]> = [];
-
-    let idx = 0;
-    valueField.values.toArray().forEach((value: string) => {
-      let timeStampValue: number;
-      let valueValue: number;
-      const time = timeField.values.get(idx);
-
-      // If we want to use value as a time, we use value as timeStampValue and valueValue will be 1
-      if (options.annotation.useValueForTime) {
-        timeStampValue = Math.floor(parseFloat(value));
-        valueValue = 1;
-      } else {
-        timeStampValue = Math.floor(parseFloat(time));
-        valueValue = parseFloat(value);
-      }
-
-      idx++;
-      timeValueTuple.push([timeStampValue, valueValue]);
-    });
-
-    const activeValues = timeValueTuple.filter((value) => value[1] >= 1);
-    const activeValuesTimestamps = activeValues.map((value) => value[0]);
-
-    // Instead of creating singular annotation for each active event we group events into region if they are less
-    // or equal to `step` apart.
     const eventList: AnnotationEvent[] = [];
-    let latestEvent: AnnotationEvent | null = null;
 
-    for (const timestamp of activeValuesTimestamps) {
-      // We already have event `open` and we have new event that is inside the `step` so we just update the end.
-      if (latestEvent && (latestEvent.timeEnd ?? 0) + step >= timestamp) {
-        latestEvent.timeEnd = timestamp;
-        continue;
+    for (const frame of frames) {
+      const timeField = frame.fields[0];
+      const valueField = frame.fields[1];
+      const labels = valueField?.labels || {};
+
+      const tags = Object.keys(labels)
+        .filter((label) => tagKeysArray.includes(label))
+        .map((label) => labels[label]);
+
+      const timeValueTuple: Array<[number, number]> = [];
+
+      let idx = 0;
+      valueField.values.toArray().forEach((value: string) => {
+        let timeStampValue: number;
+        let valueValue: number;
+        const time = timeField.values.get(idx);
+
+        // If we want to use value as a time, we use value as timeStampValue and valueValue will be 1
+        if (options.annotation.useValueForTime) {
+          timeStampValue = Math.floor(parseFloat(value));
+          valueValue = 1;
+        } else {
+          timeStampValue = Math.floor(parseFloat(time));
+          valueValue = parseFloat(value);
+        }
+
+        idx++;
+        timeValueTuple.push([timeStampValue, valueValue]);
+      });
+
+      const activeValues = timeValueTuple.filter((value) => value[1] >= 1);
+      const activeValuesTimestamps = activeValues.map((value) => value[0]);
+
+      // Instead of creating singular annotation for each active event we group events into region if they are less
+      // or equal to `step` apart.
+      let latestEvent: AnnotationEvent | null = null;
+
+      for (const timestamp of activeValuesTimestamps) {
+        // We already have event `open` and we have new event that is inside the `step` so we just update the end.
+        if (latestEvent && (latestEvent.timeEnd ?? 0) + step >= timestamp) {
+          latestEvent.timeEnd = timestamp;
+          continue;
+        }
+
+        // Event exists but new one is outside of the `step` so we add it to eventList.
+        if (latestEvent) {
+          eventList.push(latestEvent);
+        }
+
+        // We start a new region.
+        latestEvent = {
+          time: timestamp,
+          timeEnd: timestamp,
+          annotation,
+          title: renderTemplate(titleFormat, labels),
+          tags,
+          text: renderTemplate(textFormat, labels),
+        };
       }
 
-      // Event exists but new one is outside of the `step` so we add it to eventList.
       if (latestEvent) {
+        // Finish up last point if we have one
+        latestEvent.timeEnd = activeValuesTimestamps[activeValuesTimestamps.length - 1];
         eventList.push(latestEvent);
       }
-
-      // We start a new region.
-      latestEvent = {
-        time: timestamp,
-        timeEnd: timestamp,
-        annotation,
-        title: renderTemplate(titleFormat, labels),
-        tags,
-        text: renderTemplate(textFormat, labels),
-      };
-    }
-
-    if (latestEvent) {
-      // Finish up last point if we have one
-      latestEvent.timeEnd = activeValuesTimestamps[activeValuesTimestamps.length - 1];
-      eventList.push(latestEvent);
     }
 
     return eventList;