Przeglądaj źródła

Merge pull request #13556 from grafana/influxdb-annotation-fix

fix for influxdb annotation issue that caused text to be shown twice
Torkel Ödegaard 7 lat temu
rodzic
commit
ed349075a0

+ 4 - 3
public/app/plugins/datasource/influxdb/influx_series.ts

@@ -99,9 +99,6 @@ export default class InfluxSeries {
         if (column === 'sequence_number') {
         if (column === 'sequence_number') {
           return;
           return;
         }
         }
-        if (!titleCol) {
-          titleCol = index;
-        }
         if (column === this.annotation.titleColumn) {
         if (column === this.annotation.titleColumn) {
           titleCol = index;
           titleCol = index;
           return;
           return;
@@ -114,6 +111,10 @@ export default class InfluxSeries {
           textCol = index;
           textCol = index;
           return;
           return;
         }
         }
+        // legacy case
+        if (!titleCol && textCol !== index) {
+          titleCol = index;
+        }
       });
       });
 
 
       _.each(series.values, value => {
       _.each(series.values, value => {