update

sbueringer · Sep 8, 2018 · 13e26ca · 13e26ca
1 parent 7220a3e
commit 13e26ca
Show file tree

Hide file tree

Showing 6 changed files with 17 additions and 30 deletions.
diff --git a/datasource.go b/datasource.go
@@ -58,26 +58,12 @@ func handleQueries(consul *api.Client, consulToken string, queries []query) *dat
 func handleTest(consul *api.Client, consulToken, refID string) *datasource.DatasourceResponse {
 	e, _, err := consul.ACL().Info(consulToken, &api.QueryOptions{})
 	if err != nil {
-		return &datasource.DatasourceResponse{
-			Results: []*datasource.QueryResult{
-				{
-					RefId: refID,
-					Error: fmt.Sprintf("error retrieving acl info for token: %v", err),
-				},
-			},
-		}
+		return generateErrorResponse(fmt.Errorf("error retrieving acl info for token: %v", err), refID)
 	}
 	if e != nil && e.ID == consulToken {
 		return &datasource.DatasourceResponse{}
 	}
-	return &datasource.DatasourceResponse{
-		Results: []*datasource.QueryResult{
-			{
-				RefId: refID,
-				Error: "consulToken is not valid",
-			},
-		},
-	}
+	return generateErrorResponse(fmt.Errorf("consulToken is not valid"), refID)
 }
 
 func handleTimeseries(consul *api.Client, qs []query) *datasource.DatasourceResponse {

diff --git a/dist/grafana-consul-plugin_linux_amd64 b/dist/grafana-consul-plugin_linux_amd64
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/spec/datasource.jest.ts b/spec/datasource.jest.ts
@@ -13,6 +13,7 @@ describe('ConsulDatasource', () => {
     beforeEach(() => {
         ctx.$q = q;
         ctx.ds = new Datasource({}, ctx.$q, ctx.backendSrv, ctx.templateSrv);
+        ctx.ds.debug = true;
     });
 
     it('query should return an empty array when no targets are set', (done) => {

diff --git a/src/datasource.ts b/src/datasource.ts
@@ -9,6 +9,7 @@ export class ConsulDatasource {
 
     name: string;
     id: string;
+    debug: boolean = false;
 
     /** @ngInject **/
     constructor(instanceSettings, private $q, private backendSrv, private templateSrv) {
@@ -17,7 +18,7 @@ export class ConsulDatasource {
     }
 
     query(options) {
-        console.log('query: ' + JSON.stringify(options));
+        if (this.debug) { console.log('query: ' + JSON.stringify(options)); }
 
         let activeTargets: { [key:string]:any; } = {};
         // const activeTargets: any[] = [];
@@ -36,13 +37,12 @@ export class ConsulDatasource {
         return this.doRequest({data: query})
             .then(result => {
 
-                console.log('results pre-table/timeseries: ' + JSON.stringify(result));
-                //TODO support multiple
+                if (this.debug) { console.log('results pre-table/timeseries: ' + JSON.stringify(result)); }
 
                 const datas: any[] = [];
 
                 _.each(result.data.results, (results, refId) => {
-                    console.log('single result pre-table/timeseries: ' + JSON.stringify(results));
+                    if (this.debug) { console.log('single result pre-table/timeseries: ' + JSON.stringify(results)); }
 
                     if (results.tables && results.tables.length > 0) {
                         const data = results.tables[0];
@@ -65,7 +65,7 @@ export class ConsulDatasource {
                         });
                     }
                 });
-                console.log('result query: ' + JSON.stringify({data: datas}));
+                if (this.debug) { console.log('result query: ' + JSON.stringify({data: datas})); }
                 return {_request: result._request, data: datas,}
             });
     }
@@ -81,7 +81,7 @@ export class ConsulDatasource {
     }
 
     testDatasource() {
-        console.log('testDatasource');
+        if (this.debug) { console.log('testDatasource'); }
         return this.backendSrv.datasourceRequest({
             url: '/api/tsdb/query',
             method: 'POST',
@@ -107,7 +107,7 @@ export class ConsulDatasource {
     }
 
     metricFindQuery(query) {
-        console.log('metricFindQuery: ' + JSON.stringify(query));
+        if (this.debug) { console.log('metricFindQuery: ' + JSON.stringify(query)); }
         return this.doFindQuery({
             data: {
                 targets:
@@ -128,21 +128,21 @@ export class ConsulDatasource {
     }
 
     doFindQuery(options) {
-        console.log('doFindQuery: ' + JSON.stringify(options));
+        if (this.debug) { console.log('doFindQuery: ' + JSON.stringify(options));}
         return this.backendSrv.datasourceRequest({
             url: '/api/tsdb/query',
             method: 'POST',
             data: {
                 queries: options.data.targets,
             },
         }).then(result => {
-            console.log('doFindQuery result: ' + JSON.stringify(result));
+            if (this.debug) { console.log('doFindQuery result: ' + JSON.stringify(result));}
             return result;
         });
     }
 
     doRequest(options) {
-        console.log('doRequest: ' + JSON.stringify(options));
+        if (this.debug) { console.log('doRequest: ' + JSON.stringify(options));}
 
         const data = {
             from: '',
@@ -159,13 +159,13 @@ export class ConsulDatasource {
             method: 'POST',
             data,
         }).then(result => {
-            console.log('doRequest result: ' + JSON.stringify(result));
+            if (this.debug) { console.log('doRequest result: ' + JSON.stringify(result));}
             return result;
         });
     }
 
     buildQueryParameters(options) {
-        console.log('buildQueryParameters: ' + JSON.stringify(options));
+        if (this.debug) { console.log('buildQueryParameters: ' + JSON.stringify(options));}
 
         options.targets = _.filter(options.targets, target => {
             return target.target !== '' && !target.hide;