diff --git a/pkg/api/cloudwatch/metrics.go b/pkg/api/cloudwatch/metrics.go
index bc21da81f44..1357fccb127 100644
--- a/pkg/api/cloudwatch/metrics.go
+++ b/pkg/api/cloudwatch/metrics.go
@@ -65,6 +65,8 @@ func init() {
}
}
+// Whenever this list is updated, frontend list should also be updated.
+// Please update the region list in public/app/plugins/datasource/cloudwatch/partials/config.html
func handleGetRegions(req *cwRequest, c *middleware.Context) {
regions := []string{
"us-east-1", "us-west-2", "us-west-1", "eu-west-1", "eu-central-1", "ap-southeast-1",
diff --git a/pkg/social/social.go b/pkg/social/social.go
index 1a00934b937..4a8cb8bac5d 100644
--- a/pkg/social/social.go
+++ b/pkg/social/social.go
@@ -193,7 +193,7 @@ func (s *SocialGithub) FetchPrivateEmail(client *http.Client) (string, error) {
Verified bool `json:"verified"`
}
- emailsUrl := fmt.Sprintf("https://api.github.com/user/emails")
+ emailsUrl := fmt.Sprintf(s.apiUrl + "/emails")
r, err := client.Get(emailsUrl)
if err != nil {
return "", err
@@ -222,7 +222,7 @@ func (s *SocialGithub) FetchTeamMemberships(client *http.Client) ([]int, error)
Id int `json:"id"`
}
- membershipUrl := fmt.Sprintf("https://api.github.com/user/teams")
+ membershipUrl := fmt.Sprintf(s.apiUrl + "/teams")
r, err := client.Get(membershipUrl)
if err != nil {
return nil, err
@@ -249,7 +249,7 @@ func (s *SocialGithub) FetchOrganizations(client *http.Client) ([]string, error)
Login string `json:"login"`
}
- url := fmt.Sprintf("https://api.github.com/user/orgs")
+ url := fmt.Sprintf(s.apiUrl + "/orgs")
r, err := client.Get(url)
if err != nil {
return nil, err
diff --git a/public/app/core/utils/kbn.js b/public/app/core/utils/kbn.js
index a8d8c8584df..1d60ba48fd6 100644
--- a/public/app/core/utils/kbn.js
+++ b/public/app/core/utils/kbn.js
@@ -310,6 +310,16 @@ function($, _) {
};
};
+ kbn.formatBuilders.simpleCountUnit = function(symbol) {
+ var units = ['', 'K', 'M', 'B', 'T'];
+ var scaler = kbn.formatBuilders.scaledUnits(1000, units);
+ return function(size, decimals, scaledDecimals) {
+ if (size === null) { return ""; }
+ var scaled = scaler(size, decimals, scaledDecimals);
+ return scaled + " " + symbol;
+ };
+ };
+
///// VALUE FORMATS /////
// Dimensionless Units
@@ -344,6 +354,12 @@ function($, _) {
kbn.valueFormats.bps = kbn.formatBuilders.decimalSIPrefix('bps');
kbn.valueFormats.Bps = kbn.formatBuilders.decimalSIPrefix('Bps');
+ // Throughput
+ kbn.valueFormats.ops = kbn.formatBuilders.simpleCountUnit('ops');
+ kbn.valueFormats.rps = kbn.formatBuilders.simpleCountUnit('rps');
+ kbn.valueFormats.wps = kbn.formatBuilders.simpleCountUnit('wps');
+ kbn.valueFormats.iops = kbn.formatBuilders.simpleCountUnit('iops');
+
// Energy
kbn.valueFormats.watt = kbn.formatBuilders.decimalSIPrefix('W');
kbn.valueFormats.kwatt = kbn.formatBuilders.decimalSIPrefix('W', 1);
@@ -522,6 +538,15 @@ function($, _) {
{text: 'bytes/sec', value: 'Bps'},
]
},
+ {
+ text: 'throughput',
+ submenu: [
+ {text: 'ops/sec (ops)', value: 'ops' },
+ {text: 'reads/sec (rps)', value: 'rps' },
+ {text: 'writes/sec (wps)', value: 'wps' },
+ {text: 'I/O ops/sec (iops)', value: 'iops'},
+ ]
+ },
{
text: 'length',
submenu: [
@@ -576,7 +601,7 @@ function($, _) {
{text: 'Inches of mercury', value: 'pressurehg' },
{text: 'PSI', value: 'pressurepsi' },
]
- },
+ }
];
};
diff --git a/public/app/plugins/datasource/cloudwatch/datasource.js b/public/app/plugins/datasource/cloudwatch/datasource.js
index 576fb9ffcdd..6847d714975 100644
--- a/public/app/plugins/datasource/cloudwatch/datasource.js
+++ b/public/app/plugins/datasource/cloudwatch/datasource.js
@@ -216,7 +216,7 @@ function (angular, _) {
CloudWatchDatasource.prototype.testDatasource = function() {
/* use billing metrics for test */
- var region = 'us-east-1';
+ var region = this.defaultRegion;
var namespace = 'AWS/Billing';
var metricName = 'EstimatedCharges';
var dimensions = {};
diff --git a/public/app/plugins/datasource/cloudwatch/partials/config.html b/public/app/plugins/datasource/cloudwatch/partials/config.html
index 60c645c33f9..311ca0ae3dc 100644
--- a/public/app/plugins/datasource/cloudwatch/partials/config.html
+++ b/public/app/plugins/datasource/cloudwatch/partials/config.html
@@ -19,8 +19,13 @@
Default RegionSpecify the region, such as for US West (Oregon) use ` us-west-2 ` as the region.
-
-
+
+
+
diff --git a/public/test/core/utils/kbn_specs.js b/public/test/core/utils/kbn_specs.js
index 0a51312e9b1..2253f4d8ecd 100644
--- a/public/test/core/utils/kbn_specs.js
+++ b/public/test/core/utils/kbn_specs.js
@@ -62,6 +62,12 @@ define([
describeValueFormat('ns', 25, 1, 0, '25 ns');
describeValueFormat('ns', 2558, 50, 0, '2.56 µs');
+ describeValueFormat('ops', 123, 1, 0, '123 ops');
+ describeValueFormat('rps', 456000, 1000, -1, '456K rps');
+ describeValueFormat('rps', 123456789, 1000000, 2, '123.457M rps');
+ describeValueFormat('wps', 789000000, 1000000, -1, '789M wps');
+ describeValueFormat('iops', 11000000000, 1000000000, -1, '11B iops');
+
describe('kbn.toFixed and negative decimals', function() {
it('should treat as zero decimals', function() {
var str = kbn.toFixed(186.123, -2);