Merge pull request grafana#12771 from dehrax/12224-prometheus-ds

Karma to Jest: prometheus datasource
NatelEnergy · Aug 1, 2018 · 9d37437 · 9d37437
2 parents 8d0c4cd + 951b623
commit 9d37437
Show file tree

Hide file tree

Showing 3 changed files with 808 additions and 698 deletions.
diff --git a/public/app/plugins/datasource/prometheus/datasource.ts b/public/app/plugins/datasource/prometheus/datasource.ts
@@ -175,7 +175,6 @@ export class PrometheusDatasource {
           responseIndex: index,
           refId: activeTargets[index].refId,
         };
-
         this.resultTransformer.transform(result, response, transformerOptions);
       });
-Original file line number
+Diff line change
@@ Expand Up / @@ -175,7 +175,6 @@ export class PrometheusDatasource { @@
               responseIndex: index,
               refId: activeTargets[index].refId,
             };
             this.resultTransformer.transform(result, response, transformerOptions);
           });
@@ Expand Down @@