feat(cloudwatch): contining work on moving hard coded stuff to backend and cleaning up code, #684

pkg/api/cloudwatch/cloudwatch.go

@@ -10,7 +10,6 @@ import (
 	"github.com/aws/aws-sdk-go/service/cloudwatch"
 	"github.com/aws/aws-sdk-go/service/ec2"
 	"github.com/grafana/grafana/pkg/middleware"
-	"github.com/grafana/grafana/pkg/util"
 )
 
 type actionHandler func(*cwRequest, *middleware.Context)
@@ -29,6 +28,8 @@ func init() {
 		"ListMetrics":         handleListMetrics,
 		"DescribeInstances":   handleDescribeInstances,
 		"__GetRegions":        handleGetRegions,
+		"__GetNamespaces":     handleGetNamespaces,
+		"__GetMetrics":     handleGetMetrics,
 	}
 }
 
@@ -122,20 +123,6 @@ func handleDescribeInstances(req *cwRequest, c *middleware.Context) {
 	c.JSON(200, resp)
 }
 
-func handleGetRegions(req *cwRequest, c *middleware.Context) {
-	regions := []string{
-		"us-west-2", "us-west-1", "eu-west-1", "eu-central-1", "ap-southeast-1",
-		"ap-southeast-2", "ap-northeast-1", "sa-east-1",
-	}
-
-	result := []interface{}{}
-	for _, region := range regions {
-		result = append(result, util.DynMap{"text": region, "value": region})
-	}
-
-	c.JSON(200, result)
-}
-
 func HandleRequest(c *middleware.Context) {
 	var req cwRequest
 	req.Body, _ = ioutil.ReadAll(c.Req.Request.Body)

pkg/api/cloudwatch/metrics.go

+package cloudwatch
+
+import (
+	"encoding/json"
+
+	"github.com/grafana/grafana/pkg/middleware"
+	"github.com/grafana/grafana/pkg/util"
+)
+
+var metricsMap map[string][]string
+
+func init() {
+	metricsMap = map[string][]string{
+		"AWS/AutoScaling": []string{"GroupMinSize", "GroupMaxSize", "GroupDesiredCapacity", "GroupInServiceInstances", "GroupPendingInstances", "GroupStandbyInstances", "GroupTerminatingInstances", "GroupTotalInstances"},
+		"AWS/Billing":     []string{"EstimatedCharges"},
+		"AWS/EC2":         []string{"CPUCreditUsage", "CPUCreditBalance", "CPUUtilization", "DiskReadOps", "DiskWriteOps", "DiskReadBytes", "DiskWriteBytes", "NetworkIn", "NetworkOut", "StatusCheckFailed", "StatusCheckFailed_Instance", "StatusCheckFailed_System"},
+		"AWS/CloudFront":  []string{"Requests", "BytesDownloaded", "BytesUploaded", "TotalErrorRate", "4xxErrorRate", "5xxErrorRate"},
+		"AWS/CloudSearch": []string{"SuccessfulRequests", "SearchableDocuments", "IndexUtilization", "Partitions"},
+		"AWS/DynamoDB":    []string{"ConditionalCheckFailedRequests", "ConsumedReadCapacityUnits", "ConsumedWriteCapacityUnits", "OnlineIndexConsumedWriteCapacity", "OnlineIndexPercentageProgress", "OnlineIndexThrottleEvents", "ProvisionedReadCapacityUnits", "ProvisionedWriteCapacityUnits", "ReadThrottleEvents", "ReturnedItemCount", "SuccessfulRequestLatency", "SystemErrors", "ThrottledRequests", "UserErrors", "WriteThrottleEvents"},
+		"AWS/ElastiCache": []string{
+			"CPUUtilization", "SwapUsage", "FreeableMemory", "NetworkBytesIn", "NetworkBytesOut",
+			"BytesUsedForCacheItems", "BytesReadIntoMemcached", "BytesWrittenOutFromMemcached", "CasBadval", "CasHits", "CasMisses", "CmdFlush", "CmdGet", "CmdSet", "CurrConnections", "CurrItems", "DecrHits", "DecrMisses", "DeleteHits", "DeleteMisses", "Evictions", "GetHits", "GetMisses", "IncrHits", "IncrMisses", "Reclaimed",
+			"CurrConnections", "Evictions", "Reclaimed", "NewConnections", "BytesUsedForCache", "CacheHits", "CacheMisses", "ReplicationLag", "GetTypeCmds", "SetTypeCmds", "KeyBasedCmds", "StringBasedCmds", "HashBasedCmds", "ListBasedCmds", "SetBasedCmds", "SortedSetBasedCmds", "CurrItems",
+		},
+		"AWS/EBS": []string{"VolumeReadBytes", "VolumeWriteBytes", "VolumeReadOps", "VolumeWriteOps", "VolumeTotalReadTime", "VolumeTotalWriteTime", "VolumeIdleTime", "VolumeQueueLength", "VolumeThroughputPercentage", "VolumeConsumedReadWriteOps"},
+		"AWS/ELB": []string{"HealthyHostCount", "UnHealthyHostCount", "RequestCount", "Latency", "HTTPCode_ELB_4XX", "HTTPCode_ELB_5XX", "HTTPCode_Backend_2XX", "HTTPCode_Backend_3XX", "HTTPCode_Backend_4XX", "HTTPCode_Backend_5XX", "BackendConnectionErrors", "SurgeQueueLength", "SpilloverCount"},
+	}
+}
+
+//   "AWS/ElasticMapReduce": [
+//     "CoreNodesPending", "CoreNodesRunning", "HBaseBackupFailed", "HBaseMostRecentBackupDuration", "HBaseTimeSinceLastSuccessfulBackup", "HDFSBytesRead", "HDFSBytesWritten", "HDFSUtilization", "IsIdle", "JobsFailed", "JobsRunning", "LiveDataNodes", "LiveTaskTrackers", "MapSlotsOpen", "MissingBlocks", "ReduceSlotsOpen", "RemainingMapTasks", "RemainingMapTasksPerSlot", "RemainingReduceTasks", "RunningMapTasks", "RunningReduceTasks", "S3BytesRead", "S3BytesWritten", "TaskNodesPending", "TaskNodesRunning", "TotalLoad"
+//   ],
+//   "AWS/Kinesis": [
+//     "PutRecord.Bytes", "PutRecord.Latency", "PutRecord.Success", "PutRecords.Bytes", "PutRecords.Latency", "PutRecords.Records", "PutRecords.Success", "IncomingBytes", "IncomingRecords", "GetRecords.Bytes", "GetRecords.IteratorAgeMilliseconds", "GetRecords.Latency", "GetRecords.Success"
+//   ],
+//   "AWS/ML": [
+//     "PredictCount", "PredictFailureCount"
+//   ],
+//   "AWS/OpsWorks": [
+//     "cpu_idle", "cpu_nice", "cpu_system", "cpu_user", "cpu_waitio", "load_1", "load_5", "load_15", "memory_buffers", "memory_cached", "memory_free", "memory_swap", "memory_total", "memory_used", "procs"
+//   ],
+//   "AWS/Redshift": [
+//     "CPUUtilization", "DatabaseConnections", "HealthStatus", "MaintenanceMode", "NetworkReceiveThroughput", "NetworkTransmitThroughput", "PercentageDiskSpaceUsed", "ReadIOPS", "ReadLatency", "ReadThroughput", "WriteIOPS", "WriteLatency", "WriteThroughput"
+//   ],
+//   "AWS/RDS": [
+//     "BinLogDiskUsage", "CPUUtilization", "DatabaseConnections", "DiskQueueDepth", "FreeableMemory", "FreeStorageSpace", "ReplicaLag", "SwapUsage", "ReadIOPS", "WriteIOPS", "ReadLatency", "WriteLatency", "ReadThroughput", "WriteThroughput", "NetworkReceiveThroughput", "NetworkTransmitThroughput"
+//   ],
+//   "AWS/Route53": [
+//     "HealthCheckStatus", "HealthCheckPercentageHealthy"
+//   ],
+//   "AWS/SNS": [
+//     "NumberOfMessagesPublished", "PublishSize", "NumberOfNotificationsDelivered", "NumberOfNotificationsFailed"
+//   ],
+//   "AWS/SQS": [
+//     "NumberOfMessagesSent", "SentMessageSize", "NumberOfMessagesReceived", "NumberOfEmptyReceives", "NumberOfMessagesDeleted", "ApproximateNumberOfMessagesDelayed", "ApproximateNumberOfMessagesVisible", "ApproximateNumberOfMessagesNotVisible"
+//   ],
+//   "AWS/S3": [
+//     "BucketSizeBytes", "NumberOfObjects"
+//   ],
+//   "AWS/SWF": [
+//     "DecisionTaskScheduleToStartTime", "DecisionTaskStartToCloseTime", "DecisionTasksCompleted", "StartedDecisionTasksTimedOutOnClose", "WorkflowStartToCloseTime", "WorkflowsCanceled", "WorkflowsCompleted", "WorkflowsContinuedAsNew", "WorkflowsFailed", "WorkflowsTerminated", "WorkflowsTimedOut"
+//   ],
+//   "AWS/StorageGateway": [
+//     "CacheHitPercent", "CachePercentUsed", "CachePercentDirty", "CloudBytesDownloaded", "CloudDownloadLatency", "CloudBytesUploaded", "UploadBufferFree", "UploadBufferPercentUsed", "UploadBufferUsed", "QueuedWrites", "ReadBytes", "ReadTime", "TotalCacheSize", "WriteBytes", "WriteTime", "WorkingStorageFree", "WorkingStoragePercentUsed", "WorkingStorageUsed", "CacheHitPercent", "CachePercentUsed", "CachePercentDirty", "ReadBytes", "ReadTime", "WriteBytes", "WriteTime", "QueuedWrites"
+//   ],
+//   "AWS/WorkSpaces": [
+//     "Available", "Unhealthy", "ConnectionAttempt", "ConnectionSuccess", "ConnectionFailure", "SessionLaunchTime", "InSessionLatency", "SessionDisconnect"
+//   ],
+// };
+
+func handleGetRegions(req *cwRequest, c *middleware.Context) {
+	regions := []string{
+		"us-west-2", "us-west-1", "eu-west-1", "eu-central-1", "ap-southeast-1",
+		"ap-southeast-2", "ap-northeast-1", "sa-east-1",
+	}
+
+	result := []interface{}{}
+	for _, region := range regions {
+		result = append(result, util.DynMap{"text": region, "value": region})
+	}
+
+	c.JSON(200, result)
+}
+
+func handleGetNamespaces(req *cwRequest, c *middleware.Context) {
+	result := []interface{}{}
+	for key, _ := range metricsMap {
+		result = append(result, util.DynMap{"text": key, "value": key})
+	}
+
+	c.JSON(200, result)
+}
+
+func handleGetMetrics(req *cwRequest, c *middleware.Context) {
+	reqParam := &struct {
+		Parameters struct {
+			Namespace string `json:"namespace"`
+		} `json:"parameters"`
+	}{}
+
+	json.Unmarshal(req.Body, reqParam)
+
+	namespaceMetrics, exists := metricsMap[reqParam.Parameters.Namespace]
+	if !exists {
+		c.JsonApiErr(404, "Unable to find namespace "+reqParam.Parameters.Namespace, nil)
+		return
+	}
+
+	result := []interface{}{}
+	for _, name := range namespaceMetrics {
+		result = append(result, util.DynMap{"text": name, "value": name})
+	}
+
+	c.JSON(200, result)
+}

public/app/plugins/datasource/cloudwatch/specs/datasource_specs.ts

@@ -84,87 +84,79 @@ describe('CloudWatchDatasource', function() {
     });
   });
 
-  describe('When performing CloudWatch metricFindQuery', function() {
-    var requestParams;
-    var response = {
-      Metrics: [
-        {
-          Namespace: 'AWS/EC2',
-          MetricName: 'CPUUtilization',
-          Dimensions: [
-            {
-              Name: 'InstanceId',
-              Value: 'i-12345678'
-            }
-          ]
-        }
-      ]
-    };
-
-    beforeEach(function() {
-      ctx.backendSrv.datasourceRequest = function(params) {
-        requestParams = params;
-        return ctx.$q.when({data: response});
-      };
-    });
-
-    describe('regions()', () => {
-      let params, result;
+  function describeMetricFindQuery(query, func) {
+    describe('metricFindQuery ' + query, () => {
+      let scenario: any = {};
+      scenario.setup = setupCallback => {
         beforeEach(() => {
+          setupCallback();
           ctx.backendSrv.datasourceRequest = args => {
-          params = args;
-          return ctx.$q.when({data: [{text: 'us-east-1'}]});
+            scenario.request = args;
+            return ctx.$q.when({data: scenario.requestResponse });
           };
-        ctx.ds.metricFindQuery("regions()").then(args => {
-          result = args;
+          ctx.ds.metricFindQuery(query).then(args => {
+            scenario.result = args;
           });
           ctx.$rootScope.$apply();
         });
+      };
 
-      it('should issue __GetRegions request', () => {
-        expect(result[0].text).to.contain('us-east-1');
-        expect(params.data.action).to.be('__GetRegions');
+      func(scenario);
     });
+  }
+
+  describeMetricFindQuery('regions()', scenario => {
+    scenario.setup(() => {
+      scenario.requestResponse = [{text: 'us-east-1'}];
     });
 
-    it('should return suggest list for namespace()', function(done) {
-      var query = 'namespaces()';
-      ctx.ds.metricFindQuery(query).then(function(result) {
-        result = result.map(function(v) { return v.text; });
-        expect(result).to.contain('AWS/EC2');
-        done();
+    it('should call __GetRegions and return result', () => {
+      expect(scenario.result[0].text).to.contain('us-east-1');
+      expect(scenario.request.data.action).to.be('__GetRegions');
     });
-      ctx.$rootScope.$apply();
   });
 
-    it('should return suggest list for metrics()', function(done) {
-      var query = 'metrics(AWS/EC2)';
-      ctx.ds.metricFindQuery(query).then(function(result) {
-        result = result.map(function(v) { return v.text; });
-        expect(result).to.contain('CPUUtilization');
-        done();
-      });
-      ctx.$rootScope.$apply();
+  describeMetricFindQuery('namespaces()', scenario => {
+    scenario.setup(() => {
+      scenario.requestResponse = [{text: 'AWS/EC2'}];
     });
 
-    it('should return suggest list for dimension_keys()', function(done) {
-      var query = 'dimension_keys(AWS/EC2)';
-      ctx.ds.metricFindQuery(query).then(function(result) {
-        result = result.map(function(v) { return v.text; });
-        expect(result).to.contain('InstanceId');
-        done();
+    it('should call __GetNamespaces and return result', () => {
+      expect(scenario.result[0].text).to.contain('AWS/EC2');
+      expect(scenario.request.data.action).to.be('__GetNamespaces');
     });
-      ctx.$rootScope.$apply();
   });
 
-    it('should return suggest list for dimension_values()', function(done) {
-      var query = 'dimension_values(us-east-1,AWS/EC2,CPUUtilization)';
-      ctx.ds.metricFindQuery(query).then(function(result) {
-        result = result.map(function(v) { return v.text; });
-        expect(result).to.eql(['i-12345678']);
-        done();
+  describeMetricFindQuery('metrics(AWS/EC2)', scenario => {
+    scenario.setup(() => {
+      scenario.requestResponse = [{text: 'CPUUtilization'}];
     });
-      ctx.$rootScope.$apply();
+
+    it('should call __GetMetrics and return result', () => {
+      expect(scenario.result[0].text).to.be('CPUUtilization');
+      expect(scenario.request.data.action).to.be('__GetMetrics');
     });
   });
+
+  describe('When performing metricFindQuery', function() {
+    // it('should return suggest list for dimension_keys()', function(done) {
+    //   var query = 'dimension_keys(AWS/EC2)';
+    //   ctx.ds.metricFindQuery(query).then(function(result) {
+    //     result = result.map(function(v) { return v.text; });
+    //     expect(result).to.contain('InstanceId');
+    //     done();
+    //   });
+    //   ctx.$rootScope.$apply();
+    // });
+    //
+    // it('should return suggest list for dimension_values()', function(done) {
+    //   var query = 'dimension_values(us-east-1,AWS/EC2,CPUUtilization)';
+    //   ctx.ds.metricFindQuery(query).then(function(result) {
+    //     result = result.map(function(v) { return v.text; });
+    //     expect(result).to.eql(['i-12345678']);
+    //     done();
+    //   });
+    //   ctx.$rootScope.$apply();
+    // });
+  });
 });