From 7dac64354f9c6abd71a8be909ff49b096c70f8f8 Mon Sep 17 00:00:00 2001 From: Daniel Lee Date: Fri, 15 Dec 2017 16:24:23 +0100 Subject: [PATCH 1/4] teams: missing nginject attribute --- public/app/features/org/team_details_ctrl.ts | 1 + public/app/plugins/datasource/grafana-live/plugin.json | 7 +++++++ 2 files changed, 8 insertions(+) create mode 100644 public/app/plugins/datasource/grafana-live/plugin.json diff --git a/public/app/features/org/team_details_ctrl.ts b/public/app/features/org/team_details_ctrl.ts index e4dc91386b5..e96c3512180 100644 --- a/public/app/features/org/team_details_ctrl.ts +++ b/public/app/features/org/team_details_ctrl.ts @@ -5,6 +5,7 @@ export default class TeamDetailsCtrl { teamMembers: User[] = []; navModel: any; + /** @ngInject **/ constructor(private $scope, private backendSrv, private $routeParams, navModelSrv) { this.navModel = navModelSrv.getNav('cfg', 'teams', 0); this.get(); diff --git a/public/app/plugins/datasource/grafana-live/plugin.json b/public/app/plugins/datasource/grafana-live/plugin.json new file mode 100644 index 00000000000..1f2ec204949 --- /dev/null +++ b/public/app/plugins/datasource/grafana-live/plugin.json @@ -0,0 +1,7 @@ +{ + "type": "datasource", + "name": "Grafana Live", + "id": "grafana-live", + + "metrics": true +} From 77cc546315767891cf8897da26ff4cedc92b84c9 Mon Sep 17 00:00:00 2001 From: Daniel Lee Date: Fri, 15 Dec 2017 16:36:31 +0100 Subject: [PATCH 2/4] dashfolder: nginject fix --- public/app/features/dashboard/create_folder_ctrl.ts | 1 + public/app/plugins/datasource/grafana-live/plugin.json | 7 ------- 2 files changed, 1 insertion(+), 7 deletions(-) delete mode 100644 public/app/plugins/datasource/grafana-live/plugin.json diff --git a/public/app/features/dashboard/create_folder_ctrl.ts b/public/app/features/dashboard/create_folder_ctrl.ts index 8eebfecf1b5..f75fdee926e 100644 --- a/public/app/features/dashboard/create_folder_ctrl.ts +++ b/public/app/features/dashboard/create_folder_ctrl.ts @@ -6,6 +6,7 @@ export class CreateFolderCtrl { nameExists = false; titleTouched = false; + /** @ngInject **/ constructor(private backendSrv, private $location, navModelSrv) { this.navModel = navModelSrv.getNav('dashboards', 'manage-dashboards', 0); } diff --git a/public/app/plugins/datasource/grafana-live/plugin.json b/public/app/plugins/datasource/grafana-live/plugin.json deleted file mode 100644 index 1f2ec204949..00000000000 --- a/public/app/plugins/datasource/grafana-live/plugin.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "type": "datasource", - "name": "Grafana Live", - "id": "grafana-live", - - "metrics": true -} From fcf1ff10d2f1b3b682abb0e04dd135eb58d45cb2 Mon Sep 17 00:00:00 2001 From: Scott Ernst Date: Fri, 15 Dec 2017 12:44:13 -0600 Subject: [PATCH 3/4] Kinesis Metric Capitalization Fixes the capitalization of the AWS/Kinesis ShardId metric, which was incorrectly specified as "ShardID" instead of "ShardId" as specified in the AWS documentation: http://docs.aws.amazon.com/streams/latest/dev/monitoring-with-cloudwatch.html --- pkg/tsdb/cloudwatch/metric_find_query.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkg/tsdb/cloudwatch/metric_find_query.go b/pkg/tsdb/cloudwatch/metric_find_query.go index b9d4d5b6a80..1e1e855b123 100644 --- a/pkg/tsdb/cloudwatch/metric_find_query.go +++ b/pkg/tsdb/cloudwatch/metric_find_query.go @@ -127,7 +127,7 @@ func init() { "AWS/Events": {"RuleName"}, "AWS/Firehose": {"DeliveryStreamName"}, "AWS/IoT": {"Protocol"}, - "AWS/Kinesis": {"StreamName", "ShardID"}, + "AWS/Kinesis": {"StreamName", "ShardId"}, "AWS/KinesisAnalytics": {"Flow", "Id", "Application"}, "AWS/Lambda": {"FunctionName", "Resource", "Version", "Alias"}, "AWS/Logs": {"LogGroupName", "DestinationType", "FilterName"}, From 72568845553f1cbb1ffe7051ab8a013c719f6916 Mon Sep 17 00:00:00 2001 From: shankdever <34627333+shankdever@users.noreply.github.com> Date: Mon, 18 Dec 2017 18:03:28 +0530 Subject: [PATCH 4/4] ux: Add missing icon for login with grafana-com, fixes #10238 (#10249) --- public/img/grafana_mask_icon_white.svg | 12 ++++++++++++ 1 file changed, 12 insertions(+) create mode 100644 public/img/grafana_mask_icon_white.svg diff --git a/public/img/grafana_mask_icon_white.svg b/public/img/grafana_mask_icon_white.svg new file mode 100644 index 00000000000..d810d3735c7 --- /dev/null +++ b/public/img/grafana_mask_icon_white.svg @@ -0,0 +1,12 @@ + + + + grafana_mask_icon + Created with Sketch. + + + + + + + \ No newline at end of file