Merge pull request #180 from doitintl/issue-178

avivl · web-flow · commit ecb8eb69aa8c · 2019-11-26T14:23:45.000+02:00
Solves #178
diff --git a/dist/module.js b/dist/module.js
diff --git a/dist/module.js.map b/dist/module.js.map
diff --git a/dist/partials/config.html b/dist/partials/config.html
@@ -110,6 +110,14 @@ <h6>Uploaded Key Details</h6>
     The project that the Queries will be run in if you are using a flat-rate pricing model.
   </info-popover>
 </div>
+<div class="gf-form">
+  <label class="gf-form-label">Processing Location</label>
+  <div class="gf-form-select-wrapper">
+    <select class="gf-form-input gf-size-auto" ng-model="ctrl.current.jsonData.processingLocation"
+            ng-options="f.value as f.text for f in ctrl.locations"
+            ng-change="ctrl.refresh()"></select>
+  </div>
+</div>
 <gf-form-switch class="gf-form" label="Send anonymous usage data" label-class="width-13" checked="ctrl.current.jsonData.sendUsageData" switch-class="max-width-6"></gf-form-switch>
 <label class="gf-form-label query-keyword pointer">
 </label>
diff --git a/src/bigquery_query.ts b/src/bigquery_query.ts
@@ -106,7 +106,7 @@ export default class BigQueryQuery {
     target.format = target.format || "time_series";
     target.orderByCol = target.orderByCol || "1";
     target.orderBySort = target.orderBySort || "1";
-    target.location = target.location || "US";
+    target.location = target.location || undefined;
     target.timeColumn = target.timeColumn || "-- time --";
     target.timeColumnType = target.timeColumnType || "TIMESTAMP";
     target.metricColumn = target.metricColumn || "none";
diff --git a/src/config_ctrl.ts b/src/config_ctrl.ts
@@ -4,6 +4,7 @@ import {isCombinedModifierFlagSet} from "tslint";
 export class BigQueryConfigCtrl {
   private static templateUrl = "partials/config.html";
   public authenticationTypes: any[];
+  public locations: any[];
   public inputDataValid: boolean;
   public jsonText: string;
   public validationErrors: string[] = [];
@@ -12,12 +13,14 @@ export class BigQueryConfigCtrl {
   private readonly defaultAuthenticationType: string;
   private readonly defaultSendUsageData: boolean;
   private readonly defaultFlatRateProject: string;
+  private readonly defaultProcessingLocation: string;
 
   /** @ngInject */
   constructor(datasourceSrv) {
     this.defaultAuthenticationType = "jwt";
     this.defaultSendUsageData = true;
     this.defaultFlatRateProject = undefined;
+    this.defaultProcessingLocation = undefined;
     this.datasourceSrv = datasourceSrv;
     this.current.jsonData = this.current.jsonData || {};
     this.current.jsonData.authenticationType = this.current.jsonData
@@ -30,12 +33,37 @@ export class BigQueryConfigCtrl {
     if (this.current.jsonData.flatRateProject === undefined) {
       this.current.jsonData.flatRateProject = this.defaultFlatRateProject;
     }
+    if (this.current.jsonData.processingLocations === undefined) {
+      this.current.jsonData.processingLocations = this.defaultProcessingLocation;
+    }
     this.current.secureJsonData = this.current.secureJsonData || {};
     this.current.secureJsonFields = this.current.secureJsonFields || {};
     this.authenticationTypes = [
       { key: this.defaultAuthenticationType, value: "Google JWT File" },
       { key: "gce", value: "GCE Default Service Account" }
     ];
+    this.locations = [
+      { text: "United States (US)", value: "US" },
+      { text: "European Union (EU)", value: "EU" },
+      { text: "Los Angeles (us-west2)", value: "us-west2" },
+      {
+        text: "Montréal (northamerica-northeast1)",
+        value: "northamerica-northeast1"
+      },
+      { text: "Northern Virginia (us-east4)", value: "us-east4" },
+      { text: "São Paulo (southamerica-east1)", value: "southamerica-east1" },
+      { text: "Finland (europe-north1)", value: "europe-north1" },
+      { text: "London (europe-west2)", value: "europe-west2" },
+      { text: "Frankfurt (europe-west3)", value: "europe-west3" },
+      { text: "Zürich (europe-west6)", value: "europe-west6" },
+      { text: "Hong Kong (asia-east2)", value: "asia-east2" },
+      { text: "Mumbai (asia-south1)", value: "asia-south1" },
+      { text: "Osaka (asia-northeast2)", value: "asia-northeast2" },
+      { text: "Taiwan (asia-east1)", value: "asia-east1" },
+      { text: "Tokyo (asia-northeast1)", value: "asia-northeast1" },
+      { text: "Singapore (asia-southeast1)", value: "asia-southeast1" },
+      { text: "Sydney (australia-southeast1)", value: "australia-southeast1" }
+    ];
   }
 
   public onUpload(json) {
diff --git a/src/datasource.ts b/src/datasource.ts
@@ -161,6 +161,7 @@ export class BigQueryDatasource {
   private readonly url: string;
   private mixpanel;
   private runInProject: string;
+  private processingLocation: string;
 
   /** @ngInject */
   constructor(
@@ -194,6 +195,11 @@ export class BigQueryDatasource {
       this.jsonData.flatRateProject && this.jsonData.flatRateProject.length
         ? this.jsonData.flatRateProject
         : this.projectName;
+    this.processingLocation =
+      this.jsonData.processingLocation &&
+      this.jsonData.processingLocation.length
+        ? this.jsonData.processingLocation
+        : undefined;
   }
 
   public async query(options) {
@@ -472,10 +478,12 @@ export class BigQueryDatasource {
   private async doQueryRequest(query, requestId, maxRetries = 3) {
     const path = `v2/projects/${this.runInProject}/queries`;
     const url = this.url + `${this.baseUrl}${path}`;
+    const location =
+      this.queryModel.target.location || this.processingLocation || "US";
     return this.backendSrv
       .datasourceRequest({
         data: {
-          location: this.queryModel.target.location,
+          location,
           query,
           useLegacySql: false,
           useQueryCache: true
@@ -507,11 +515,13 @@ export class BigQueryDatasource {
   private async _waitForJobComplete(queryResults, requestId, jobId) {
     let sleepTimeMs = 100;
     console.log("New job id: ", jobId);
+    const location =
+      this.queryModel.target.location || this.processingLocation || "US";
     const path =
       `v2/projects/${this.runInProject}/queries/` +
       jobId +
       "?location=" +
-      this.queryModel.target.location;
+      location;
     while (!queryResults.data.jobComplete) {
       await sleep(sleepTimeMs);
       sleepTimeMs *= 2;
@@ -524,13 +534,15 @@ export class BigQueryDatasource {
 
   private async _getQueryResults(queryResults, rows, requestId, jobId) {
     while (queryResults.data.pageToken) {
+      const location =
+        this.queryModel.target.location || this.processingLocation || "US";
       const path =
         `v2/projects/${this.runInProject}/queries/` +
         jobId +
         "?pageToken=" +
         queryResults.data.pageToken +
         "&location=" +
-        this.queryModel.target.location;
+        location;
       queryResults = await this.doRequest(`${this.baseUrl}${path}`, requestId);
       if (queryResults.length === 0) {
         return rows;
diff --git a/src/partials/config.html b/src/partials/config.html
@@ -110,6 +110,14 @@ <h6>Uploaded Key Details</h6>
     The project that the Queries will be run in if you are using a flat-rate pricing model.
   </info-popover>
 </div>
+<div class="gf-form">
+  <label class="gf-form-label">Processing Location</label>
+  <div class="gf-form-select-wrapper">
+    <select class="gf-form-input gf-size-auto" ng-model="ctrl.current.jsonData.processingLocation"
+            ng-options="f.value as f.text for f in ctrl.locations"
+            ng-change="ctrl.refresh()"></select>
+  </div>
+</div>
 <gf-form-switch class="gf-form" label="Send anonymous usage data" label-class="width-13" checked="ctrl.current.jsonData.sendUsageData" switch-class="max-width-6"></gf-form-switch>
 <label class="gf-form-label query-keyword pointer">
 </label>
diff --git a/src/query_ctrl.ts b/src/query_ctrl.ts
@@ -26,7 +26,7 @@ export class BigQueryQueryCtrl extends QueryCtrl {
   public queryModel: BigQueryQuery;
   public lastQueryMeta: QueryMeta;
   public lastQueryError: string;
-  public locations:any[];
+  public locations: any[];
   public showHelp: boolean;
   public projectSegment: any;
   public datasetSegment: any;
