From 8987cfe0a21b99751a2fe14eec76c89dcaca748b Mon Sep 17 00:00:00 2001 From: Mitsuhiro Tanda Date: Sat, 21 May 2016 17:56:57 +0900 Subject: [PATCH 001/175] (templating) add sort order option --- public/app/features/templating/editorCtrl.js | 7 ++++ .../features/templating/partials/editor.html | 11 ++++++ .../features/templating/templateValuesSrv.js | 20 ++++++++-- public/test/specs/templateValuesSrv-specs.js | 38 +++++++++++++++++++ 4 files changed, 73 insertions(+), 3 deletions(-) diff --git a/public/app/features/templating/editorCtrl.js b/public/app/features/templating/editorCtrl.js index 5efebc21e30..a8181ee1db3 100644 --- a/public/app/features/templating/editorCtrl.js +++ b/public/app/features/templating/editorCtrl.js @@ -13,6 +13,7 @@ function (angular, _) { type: 'query', datasource: null, refresh: 0, + sort: 1, name: '', hide: 0, options: [], @@ -34,6 +35,12 @@ function (angular, _) { {value: 2, text: "On Time Range Change"}, ]; + $scope.sortOptions = [ + {value: 0, text: "Without Sort"}, + {value: 1, text: "Alphabetical"}, + {value: 2, text: "Numerical"}, + ]; + $scope.hideOptions = [ {value: 0, text: ""}, {value: 1, text: "Label"}, diff --git a/public/app/features/templating/partials/editor.html b/public/app/features/templating/partials/editor.html index dd5aa6fa543..b55959bad93 100644 --- a/public/app/features/templating/partials/editor.html +++ b/public/app/features/templating/partials/editor.html @@ -181,6 +181,17 @@ +
+ + Sort + + How to sort the values of this variable. + + +
+ +
+
Query diff --git a/public/app/features/templating/templateValuesSrv.js b/public/app/features/templating/templateValuesSrv.js index fb751a2ce3a..896c152ce35 100644 --- a/public/app/features/templating/templateValuesSrv.js +++ b/public/app/features/templating/templateValuesSrv.js @@ -327,7 +327,7 @@ function (angular, _, kbn) { this.metricNamesToVariableValues = function(variable, metricNames) { var regex, options, i, matches; - options = {}; // use object hash to remove duplicates + options = []; if (variable.regex) { regex = kbn.stringToJsRegex(templateSrv.replace(variable.regex)); @@ -355,10 +355,24 @@ function (angular, _, kbn) { } } - options[value] = {text: text, value: value}; + options.push({text: text, value: value}); } + options = _.uniq(options, 'value'); - return _.sortBy(options, 'text'); + if (variable.sort === 1) { + return _.sortBy(options, 'text'); + } else if (variable.sort === 2) { + return _.sortBy(options, function(opt) { + var matches = opt.text.match(/.*?(\d+).*/); + if (!matches) { + return 0; + } else { + return parseInt(matches[1], 10); + } + }); + } else { + return options; + } }; this.addAllOption = function(variable) { diff --git a/public/test/specs/templateValuesSrv-specs.js b/public/test/specs/templateValuesSrv-specs.js index 7a8d8c1fccb..df59b798f3d 100644 --- a/public/test/specs/templateValuesSrv-specs.js +++ b/public/test/specs/templateValuesSrv-specs.js @@ -386,5 +386,43 @@ define([ }); }); + describeUpdateVariable('without sort', function(scenario) { + scenario.setup(function() { + scenario.variable = {type: 'query', query: 'apps.*', name: 'test', sort: 0}; + scenario.queryResult = [{text: 'bbb2'}, {text: 'aaa10'}, { text: 'ccc3'}]; + }); + + it('should return options without sort', function() { + expect(scenario.variable.options[0].text).to.be('bbb2'); + expect(scenario.variable.options[1].text).to.be('aaa10'); + expect(scenario.variable.options[2].text).to.be('ccc3'); + }); + }); + + describeUpdateVariable('with alphabetical sort', function(scenario) { + scenario.setup(function() { + scenario.variable = {type: 'query', query: 'apps.*', name: 'test', sort: 1}; + scenario.queryResult = [{text: 'bbb2'}, {text: 'aaa10'}, { text: 'ccc3'}]; + }); + + it('should return options with alphabetical sort', function() { + expect(scenario.variable.options[0].text).to.be('aaa10'); + expect(scenario.variable.options[1].text).to.be('bbb2'); + expect(scenario.variable.options[2].text).to.be('ccc3'); + }); + }); + + describeUpdateVariable('with numerical sort', function(scenario) { + scenario.setup(function() { + scenario.variable = {type: 'query', query: 'apps.*', name: 'test', sort: 2}; + scenario.queryResult = [{text: 'bbb2'}, {text: 'aaa10'}, { text: 'ccc3'}]; + }); + + it('should return options with numerical sort', function() { + expect(scenario.variable.options[0].text).to.be('bbb2'); + expect(scenario.variable.options[1].text).to.be('ccc3'); + expect(scenario.variable.options[2].text).to.be('aaa10'); + }); + }); }); }); From 16dc095329da44a96a9d344f7faba22ccb1edc5d Mon Sep 17 00:00:00 2001 From: Mitsuhiro Tanda Date: Sat, 18 Jun 2016 02:08:24 +0900 Subject: [PATCH 002/175] (templating) support asc/desc sort --- public/app/features/templating/editorCtrl.js | 6 ++-- .../features/templating/templateValuesSrv.js | 31 ++++++++++++------- public/test/specs/templateValuesSrv-specs.js | 30 ++++++++++++++++-- 3 files changed, 52 insertions(+), 15 deletions(-) diff --git a/public/app/features/templating/editorCtrl.js b/public/app/features/templating/editorCtrl.js index a8181ee1db3..5c923271278 100644 --- a/public/app/features/templating/editorCtrl.js +++ b/public/app/features/templating/editorCtrl.js @@ -37,8 +37,10 @@ function (angular, _) { $scope.sortOptions = [ {value: 0, text: "Without Sort"}, - {value: 1, text: "Alphabetical"}, - {value: 2, text: "Numerical"}, + {value: 1, text: "Alphabetical (asc)"}, + {value: 2, text: "Alphabetical (desc)"}, + {value: 3, text: "Numerical (asc)"}, + {value: 4, text: "Numerical (desc)"}, ]; $scope.hideOptions = [ diff --git a/public/app/features/templating/templateValuesSrv.js b/public/app/features/templating/templateValuesSrv.js index 896c152ce35..38f305f3f40 100644 --- a/public/app/features/templating/templateValuesSrv.js +++ b/public/app/features/templating/templateValuesSrv.js @@ -359,18 +359,27 @@ function (angular, _, kbn) { } options = _.uniq(options, 'value'); - if (variable.sort === 1) { - return _.sortBy(options, 'text'); - } else if (variable.sort === 2) { - return _.sortBy(options, function(opt) { - var matches = opt.text.match(/.*?(\d+).*/); - if (!matches) { - return 0; - } else { - return parseInt(matches[1], 10); - } - }); + var sortType = Math.ceil(variable.sort / 2); + if (sortType === 0) { + return options; } else { + if (sortType === 1) { + options = _.sortBy(options, 'text'); + } else if (sortType === 2) { + options = _.sortBy(options, function(opt) { + var matches = opt.text.match(/.*?(\d+).*/); + if (!matches) { + return 0; + } else { + return parseInt(matches[1], 10); + } + }); + } + + if (variable.sort % 2 === 0) { + options = options.reverse(); + } + return options; } }; diff --git a/public/test/specs/templateValuesSrv-specs.js b/public/test/specs/templateValuesSrv-specs.js index df59b798f3d..1742f5739c3 100644 --- a/public/test/specs/templateValuesSrv-specs.js +++ b/public/test/specs/templateValuesSrv-specs.js @@ -399,7 +399,7 @@ define([ }); }); - describeUpdateVariable('with alphabetical sort', function(scenario) { + describeUpdateVariable('with alphabetical sort (asc)', function(scenario) { scenario.setup(function() { scenario.variable = {type: 'query', query: 'apps.*', name: 'test', sort: 1}; scenario.queryResult = [{text: 'bbb2'}, {text: 'aaa10'}, { text: 'ccc3'}]; @@ -412,17 +412,43 @@ define([ }); }); - describeUpdateVariable('with numerical sort', function(scenario) { + describeUpdateVariable('with alphabetical sort (desc)', function(scenario) { scenario.setup(function() { scenario.variable = {type: 'query', query: 'apps.*', name: 'test', sort: 2}; scenario.queryResult = [{text: 'bbb2'}, {text: 'aaa10'}, { text: 'ccc3'}]; }); + it('should return options with alphabetical sort', function() { + expect(scenario.variable.options[0].text).to.be('ccc3'); + expect(scenario.variable.options[1].text).to.be('bbb2'); + expect(scenario.variable.options[2].text).to.be('aaa10'); + }); + }); + + describeUpdateVariable('with numerical sort (asc)', function(scenario) { + scenario.setup(function() { + scenario.variable = {type: 'query', query: 'apps.*', name: 'test', sort: 3}; + scenario.queryResult = [{text: 'bbb2'}, {text: 'aaa10'}, { text: 'ccc3'}]; + }); + it('should return options with numerical sort', function() { expect(scenario.variable.options[0].text).to.be('bbb2'); expect(scenario.variable.options[1].text).to.be('ccc3'); expect(scenario.variable.options[2].text).to.be('aaa10'); }); }); + + describeUpdateVariable('with numerical sort (desc)', function(scenario) { + scenario.setup(function() { + scenario.variable = {type: 'query', query: 'apps.*', name: 'test', sort: 4}; + scenario.queryResult = [{text: 'bbb2'}, {text: 'aaa10'}, { text: 'ccc3'}]; + }); + + it('should return options with numerical sort', function() { + expect(scenario.variable.options[0].text).to.be('aaa10'); + expect(scenario.variable.options[1].text).to.be('ccc3'); + expect(scenario.variable.options[2].text).to.be('bbb2'); + }); + }); }); }); From 8af3bb739c1050656e853eedc4d9aa12bacd86e8 Mon Sep 17 00:00:00 2001 From: Mitsuhiro Tanda Date: Sun, 26 Jun 2016 22:15:57 +0900 Subject: [PATCH 003/175] refactor --- .../features/templating/templateValuesSrv.js | 42 +++++++++---------- 1 file changed, 21 insertions(+), 21 deletions(-) diff --git a/public/app/features/templating/templateValuesSrv.js b/public/app/features/templating/templateValuesSrv.js index 38f305f3f40..cd74c2b665f 100644 --- a/public/app/features/templating/templateValuesSrv.js +++ b/public/app/features/templating/templateValuesSrv.js @@ -359,29 +359,29 @@ function (angular, _, kbn) { } options = _.uniq(options, 'value'); - var sortType = Math.ceil(variable.sort / 2); - if (sortType === 0) { - return options; - } else { - if (sortType === 1) { - options = _.sortBy(options, 'text'); - } else if (sortType === 2) { - options = _.sortBy(options, function(opt) { - var matches = opt.text.match(/.*?(\d+).*/); - if (!matches) { - return 0; - } else { - return parseInt(matches[1], 10); - } - }); - } - - if (variable.sort % 2 === 0) { - options = options.reverse(); - } - + if (variable.sort === 0) { return options; } + + var sortType = Math.ceil(variable.sort / 2); + var reverseSort = (variable.sort % 2 === 0); + if (sortType === 1) { + options = _.sortBy(options, 'text'); + } else if (sortType === 2) { + options = _.sortBy(options, function(opt) { + var matches = opt.text.match(/.*?(\d+).*/); + if (!matches) { + return 0; + } else { + return parseInt(matches[1], 10); + } + }); + } + if (reverseSort) { + options = options.reverse(); + } + + return options; }; this.addAllOption = function(variable) { From b4646b6c3a4256a17cab41dacc496d9c885a2544 Mon Sep 17 00:00:00 2001 From: Kevin Fitzpatrick Date: Tue, 12 Apr 2016 17:54:45 -0700 Subject: [PATCH 004/175] Allow users to use a generic oauth that conforms to the github style. Enables users to set their own link text. --- pkg/api/login.go | 2 ++ pkg/setting/setting_oauth.go | 5 +++-- pkg/social/social.go | 18 +++++++++++++++++- public/app/core/controllers/login_ctrl.js | 4 +++- public/app/partials/login.html | 4 ++++ 5 files changed, 29 insertions(+), 4 deletions(-) diff --git a/pkg/api/login.go b/pkg/api/login.go index 4f976f753a2..789765ee01e 100644 --- a/pkg/api/login.go +++ b/pkg/api/login.go @@ -27,6 +27,8 @@ func LoginView(c *middleware.Context) { viewData.Settings["googleAuthEnabled"] = setting.OAuthService.Google viewData.Settings["githubAuthEnabled"] = setting.OAuthService.GitHub + viewData.Settings["genericOAuthEnabled"] = setting.OAuthService.Generic + viewData.Settings["oauthProviderName"] = setting.OAuthService.OAuthProviderName viewData.Settings["disableUserSignUp"] = !setting.AllowUserSignUp viewData.Settings["loginHint"] = setting.LoginHint viewData.Settings["allowUserPassLogin"] = setting.AllowUserPassLogin diff --git a/pkg/setting/setting_oauth.go b/pkg/setting/setting_oauth.go index db2f0fb3802..71c4ade1468 100644 --- a/pkg/setting/setting_oauth.go +++ b/pkg/setting/setting_oauth.go @@ -11,8 +11,9 @@ type OAuthInfo struct { } type OAuther struct { - GitHub, Google, Twitter bool - OAuthInfos map[string]*OAuthInfo + GitHub, Google, Twitter, Generic bool + OAuthInfos map[string]*OAuthInfo + OAuthProviderName string } var OAuthService *OAuther diff --git a/pkg/social/social.go b/pkg/social/social.go index 4a8cb8bac5d..402f02449ff 100644 --- a/pkg/social/social.go +++ b/pkg/social/social.go @@ -42,7 +42,7 @@ func NewOAuthService() { setting.OAuthService = &setting.OAuther{} setting.OAuthService.OAuthInfos = make(map[string]*setting.OAuthInfo) - allOauthes := []string{"github", "google"} + allOauthes := []string{"github", "google", "generic-oauth"} for _, name := range allOauthes { sec := setting.Cfg.Section("auth." + name) @@ -98,6 +98,22 @@ func NewOAuthService() { allowSignup: info.AllowSignup, } } + + // Generic - Uses the same scheme as Github. + if name == "generic-oauth" { + setting.OAuthService.Generic = true + setting.OAuthService.OAuthProviderName = sec.Key("oauth_provider_name").String() + teamIds := sec.Key("team_ids").Ints(",") + allowedOrganizations := sec.Key("allowed_organizations").Strings(" ") + SocialMap["generic-oauth"] = &SocialGithub{ + Config: &config, + allowedDomains: info.AllowedDomains, + apiUrl: info.ApiUrl, + allowSignup: info.AllowSignup, + teamIds: teamIds, + allowedOrganizations: allowedOrganizations, + } + } } } diff --git a/public/app/core/controllers/login_ctrl.js b/public/app/core/controllers/login_ctrl.js index 8696d94f4f3..60136a05c0c 100644 --- a/public/app/core/controllers/login_ctrl.js +++ b/public/app/core/controllers/login_ctrl.js @@ -17,8 +17,10 @@ function (angular, coreModule, config) { $scope.googleAuthEnabled = config.googleAuthEnabled; $scope.githubAuthEnabled = config.githubAuthEnabled; - $scope.oauthEnabled = config.githubAuthEnabled || config.googleAuthEnabled; + $scope.oauthEnabled = config.githubAuthEnabled || config.googleAuthEnabled || config.genericOAuthEnabled; $scope.allowUserPassLogin = config.allowUserPassLogin; + $scope.genericOAuthEnabled = config.genericOAuthEnabled; + $scope.oauthProviderName = config.oauthProviderName; $scope.disableUserSignUp = config.disableUserSignUp; $scope.loginHint = config.loginHint; diff --git a/public/app/partials/login.html b/public/app/partials/login.html index 5bee63e6214..200200ee4b9 100644 --- a/public/app/partials/login.html +++ b/public/app/partials/login.html @@ -59,6 +59,10 @@ with Github + + + with {{oauthProviderName || "OAuth 2"}} +
From f2baa5b210b2000509bbb2aa319a6bedf238903f Mon Sep 17 00:00:00 2001 From: Kevin Fitzpatrick Date: Wed, 18 May 2016 13:37:04 -0700 Subject: [PATCH 005/175] Make Generic OAuth Configs ENV VARS-friendly Use underscores instead of dashes. --- pkg/social/social.go | 6 +++--- public/app/partials/login.html | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/pkg/social/social.go b/pkg/social/social.go index 402f02449ff..3c970f89e4f 100644 --- a/pkg/social/social.go +++ b/pkg/social/social.go @@ -42,7 +42,7 @@ func NewOAuthService() { setting.OAuthService = &setting.OAuther{} setting.OAuthService.OAuthInfos = make(map[string]*setting.OAuthInfo) - allOauthes := []string{"github", "google", "generic-oauth"} + allOauthes := []string{"github", "google", "generic_oauth"} for _, name := range allOauthes { sec := setting.Cfg.Section("auth." + name) @@ -100,12 +100,12 @@ func NewOAuthService() { } // Generic - Uses the same scheme as Github. - if name == "generic-oauth" { + if name == "generic_oauth" { setting.OAuthService.Generic = true setting.OAuthService.OAuthProviderName = sec.Key("oauth_provider_name").String() teamIds := sec.Key("team_ids").Ints(",") allowedOrganizations := sec.Key("allowed_organizations").Strings(" ") - SocialMap["generic-oauth"] = &SocialGithub{ + SocialMap["generic_oauth"] = &SocialGithub{ Config: &config, allowedDomains: info.AllowedDomains, apiUrl: info.ApiUrl, diff --git a/public/app/partials/login.html b/public/app/partials/login.html index 200200ee4b9..f4f5fb26d7e 100644 --- a/public/app/partials/login.html +++ b/public/app/partials/login.html @@ -59,7 +59,7 @@ with Github - + with {{oauthProviderName || "OAuth 2"}} From 35b90afdd03e44c299010e6da1ac4497624b92dc Mon Sep 17 00:00:00 2001 From: Trent White Date: Wed, 24 Aug 2016 17:41:29 -0400 Subject: [PATCH 006/175] initial styling --- conf/defaults.ini | 2 +- emails/assets/css/ink.css | 2 + emails/assets/css/style.css | 8 +- emails/templates/alert_notification.html | 4 +- emails/templates/layouts/default.html | 238 +++++++++++++----- public/emails/alert_notification.html | 306 ++++++++++++++++------- public/emails/invited_to_org.html | 270 ++++++++++++++------ public/emails/new_user_invite.html | 274 ++++++++++++++------ public/emails/reset_password.html | 264 +++++++++++++------ public/emails/signup_started.html | 268 ++++++++++++++------ public/emails/welcome_on_signup.html | 260 +++++++++++++------ 11 files changed, 1366 insertions(+), 530 deletions(-) diff --git a/conf/defaults.ini b/conf/defaults.ini index 2219b56a77d..6f3fede698a 100644 --- a/conf/defaults.ini +++ b/conf/defaults.ini @@ -372,7 +372,7 @@ global_session = -1 # \______(_______;;;)__;;;) [alerting] -enabled = false +enabled = true #################################### Internal Grafana Metrics ########################## # Metrics available at HTTP API Url /api/metrics diff --git a/emails/assets/css/ink.css b/emails/assets/css/ink.css index e65aed19194..926db026ea6 100644 --- a/emails/assets/css/ink.css +++ b/emails/assets/css/ink.css @@ -17,6 +17,8 @@ body{ padding:0; } + + .ExternalClass { width:100%; } diff --git a/emails/assets/css/style.css b/emails/assets/css/style.css index f138a0c1296..63c7aaa5b3b 100644 --- a/emails/assets/css/style.css +++ b/emails/assets/css/style.css @@ -9,7 +9,8 @@ h1 {font-size: 40px;} h2 {font-size: 36px;} h3 { font-size: 22px; - margin-top: 20px; + margin-top: 10px; + margin-bottom: 10px; } h4 {font-size: 20px;} h5 {font-size: 18px;} @@ -79,10 +80,13 @@ table.google-plus:hover td { } .header { - background: #333; +margin-top:25px; +margin-bottom: 25px; } .footer { + background-color: #2e2e2e; + color: #999999; margin-top: 20px; } diff --git a/emails/templates/alert_notification.html b/emails/templates/alert_notification.html index 5adcda1a620..2f64854ce4e 100644 --- a/emails/templates/alert_notification.html +++ b/emails/templates/alert_notification.html @@ -6,7 +6,7 @@
-

[[.Title]]

+

[[.Title]]
@@ -42,7 +42,7 @@ Value - [[range .EvalMatches]] + [[range .EvalMatches]] dwds [[.Metric]] diff --git a/emails/templates/layouts/default.html b/emails/templates/layouts/default.html index 0fd5b35ea48..eb968ed7cbc 100644 --- a/emails/templates/layouts/default.html +++ b/emails/templates/layouts/default.html @@ -3,77 +3,199 @@ - - - - + + + + - + + -
-
- - - - - -
-
- - - - - -
- - - - - - -
- -
- -
- -
-
- - +
+ +
- + +
- {{> body }} - - - - - -
- - - - - -
-
-

- Sent by Grafana v[[.BuildVersion]] -

-
-
-
+ 		+
+ + + + +
+ + + + + + +
+ +
+ +
+ +
+
+ + + + + + + - +
+ {{> body }}
+ + + + +
+ + + + + +
+
+

+ Sent by Grafana v[[.BuildVersion]] +
© 2016 Grafana and raintank +

+
+
+
diff --git a/public/emails/alert_notification.html b/public/emails/alert_notification.html index f80a8330eaf..a292fb45af9 100644 --- a/public/emails/alert_notification.html +++ b/public/emails/alert_notification.html @@ -3,9 +3,9 @@ - + - - - -
-
+ + + +
+
+ + + + - -
+
- - - + +
-
+ + + - -
- - - + +
+ + + + + +
+ +
- - - - - -
- -
+
-
+
+
-
-
- - - -
+ + + + + +
{{Subject .Subject "{{.Title}}"}} - - -
- - -
-

{{.Title}}

+ + +
+ + +
+

{{.Title}}
@@ -129,13 +249,13 @@ color: #FFFFFF !important;
- - -
- - -
-

{{.Message}}

+ + +
+ + +
+

{{.Message}}
@@ -144,25 +264,25 @@ color: #FFFFFF !important;
{{if ne .State "ok" }} - - -
-
- - -
+ + +
+
+ + + - - {{range .EvalMatches}} - - + - @@ -174,13 +294,13 @@ color: #FFFFFF !important;
Metric name + Value
+ {{range .EvalMatches}} dwds +
{{.Metric}} + {{.Value}}
{{end}} - - -
- - -
- + + +
+ + +
+
@@ -189,13 +309,13 @@ color: #FFFFFF !important;
- - -
- - - -
- Alert rule - Alerts page + + + - +
+ + +
+ Alert rule - Alerts page
@@ -206,34 +326,32 @@ color: #FFFFFF !important; - - - - -
- - - - - -
-
-

- Sent by Grafana v{{.BuildVersion}} -

-
-
-
- -
+ + + + +
+ + + + + +
+
+

+ Sent by Grafana v{{.BuildVersion}} +
© 2016 Grafana and raintank +

+
+
+
diff --git a/public/emails/invited_to_org.html b/public/emails/invited_to_org.html index 8263fb65a15..ac80a3983ae 100644 --- a/public/emails/invited_to_org.html +++ b/public/emails/invited_to_org.html @@ -3,9 +3,9 @@ - + - - - -
-
+ + + +
+
+ + + + - -
+
- - - + +
-
+ + + - -
- - - + +
+ + + + + +
+ +
- - - - - -
- -
+
-
+
+
-
-
- - - -
+ + + + + +
{{Subject .Subject "{{.InvitedBy}} has added you to the {{.OrgName}} organization"}} - - -
+ + +
- - -
-

You have been added to {{.OrgName}}

+ + + - +
+

You have been added to {{.OrgName}}
@@ -134,22 +254,22 @@ color: #FFFFFF !important;
- - -
- - -
-

{{.InvitedBy}} has added you to the {{.OrgName}} organization in Grafana. -

Once logged in, {{.OrgName}} will be available in the left side menu, in the dropdown below your username.

+ + + -
+ + + - + - - - +
+

{{.InvitedBy}} has added you to the {{.OrgName}} organization in Grafana. +

Once logged in, {{.OrgName}} will be available in the left side menu, in the dropdown below your username.
- - - + + @@ -162,34 +282,32 @@ color: #FFFFFF !important; -
Log in now
+ + +
Log in now
- - - -
- - - - - -
-
-

- Sent by Grafana v{{.BuildVersion}} -

-
-
-
- -
+ + + + +
+ + + + + +
+
+

+ Sent by Grafana v{{.BuildVersion}} +
© 2016 Grafana and raintank +

+
+
+
diff --git a/public/emails/new_user_invite.html b/public/emails/new_user_invite.html index 15de19a7bf6..3bd942ac051 100644 --- a/public/emails/new_user_invite.html +++ b/public/emails/new_user_invite.html @@ -3,9 +3,9 @@ - + - - - -
-
+ + + +
+
+ + + + - -
+
- - - + +
-
+ + + - -
- - - + +
+ + + + + +
+ +
- - - - - -
- -
+
-
+
+
-
-
- - - -
+ + + + + +
{{Subject .Subject "{{.InvitedBy}} has invited you to join Grafana"}} - - -
+ + +
- - -
-

You're invited to join {{.OrgName}}

+ + + - +
+

You're invited to join {{.OrgName}}
@@ -134,63 +254,61 @@ color: #FFFFFF !important;
- - -
- - - -
-

You've been invited to join the {{.OrgName}} organization by {{.InvitedBy}}. To accept your invitation and join the team, please click the link below:

+ + + - +
+ + + - -
+

You've been invited to join the {{.OrgName}} organization by {{.InvitedBy}}. To accept your invitation and join the team, please click the link below:
- - - + + - - + - +
Accept Invitation
+ + +
Accept Invitation
-

You can also copy/paste this link into your browser directly: {{.LinkUrl}}

+
+

You can also copy/paste this link into your browser directly: {{.LinkUrl}}
- - - - -
- - - - - -
-
-

- Sent by Grafana v{{.BuildVersion}} -

-
-
-
- -
+ + + + +
+ + + + + +
+
+

+ Sent by Grafana v{{.BuildVersion}} +
© 2016 Grafana and raintank +

+
+
+
diff --git a/public/emails/reset_password.html b/public/emails/reset_password.html index 46947a74c30..e32821d6c57 100644 --- a/public/emails/reset_password.html +++ b/public/emails/reset_password.html @@ -3,9 +3,9 @@ - + - - - -
-
+ + + +
+
+ + + + - -
+
- - - + +
-
+ + + - -
- - - + +
+ + + + + +
+ +
- - - - - -
- -
+
-
+
+
-
-
- - - -
+ + + + + +
{{Subject .Subject "Reset your Grafana password - {{.Name}}"}} - - -
+ + +
- - -
-

Hi {{.Name}}

+ + + - +
+

Hi {{.Name}}
@@ -132,21 +252,21 @@ color: #FFFFFF !important;
- - -
- - - -
-

+ + + - +
+ + + - +
+

Please click the following link to reset your password within {{.EmailCodeValidHours}} hours.

-

- {{.AppUrl}}user/password/reset?code={{.Code}} +

+ {{.AppUrl}}user/password/reset?code={{.Code}}

-

Not working? Try copying and pasting it to your browser.

+

Not working? Try copying and pasting it to your browser.
@@ -157,34 +277,32 @@ color: #FFFFFF !important; - - - - -
- - - - - -
-
-

- Sent by Grafana v{{.BuildVersion}} -

-
-
-
- -
+ + + + +
+ + + + + +
+
+

+ Sent by Grafana v{{.BuildVersion}} +
© 2016 Grafana and raintank +

+
+
+

diff --git a/public/emails/signup_started.html b/public/emails/signup_started.html index a8ee02174a8..1dad4fd4e04 100644 --- a/public/emails/signup_started.html +++ b/public/emails/signup_started.html @@ -3,9 +3,9 @@ - + - - - -
-
+ + + +
+
+ + + + - -
+
- - - + +
-
+ + + - -
- - - + +
+ + + + + +
+ +
- - - - - -
- -
+
-
+
+
-
-
- - - -
+ + + + + +
{{Subject .Subject "Welcome to Grafana, please complete your sign up!"}} - - -
+ + +
- - -
-

Complete the signup

+ + + - +
+

Complete the signup
@@ -132,23 +252,23 @@ color: #FFFFFF !important;
- - -
- - -
+ + + -
+ + + - + - - - +
Copy and past the email verification code:
- {{.Code}}
in + {{.Code}}
in the sign up form or use the link below.
- - - + + @@ -161,34 +281,32 @@ color: #FFFFFF !important; -
Complete Sign Up
+ + +
Complete Sign Up
- - - -
- - - - - -
-
-

- Sent by Grafana v{{.BuildVersion}} -

-
-
-
- -
+ + + + +
+ + + + + +
+
+

+ Sent by Grafana v{{.BuildVersion}} +
© 2016 Grafana and raintank +

+
+
+
diff --git a/public/emails/welcome_on_signup.html b/public/emails/welcome_on_signup.html index f2f931689c1..265281b7eb1 100644 --- a/public/emails/welcome_on_signup.html +++ b/public/emails/welcome_on_signup.html @@ -3,9 +3,9 @@ - + - - - -
-
+ + + +
+
+ + + + - -
+
- - - + +
-
+ + + - -
- - - + +
+ + + + + +
+ +
- - - - - -
- -
+
-
+
+
-
-
- - - -
+ + + + + +
{{Subject .Subject "Welcome to Grafana"}} - - -
+ + +
- - -
-

Hi {{.Name}}

+ + + - +
+

Hi {{.Name}}
@@ -132,17 +252,17 @@ color: #FFFFFF !important;
- - - -
- - - - +
-

- If you are new to Grafana please read the Getting Started guide. + + + @@ -152,34 +272,32 @@ color: #FFFFFF !important; -
+ + + - +
+

+ If you are new to Grafana please read the Getting Started guide.

- - - -
- - - - - -
-
-

- Sent by Grafana v{{.BuildVersion}} -

-
-
-
- -

+ + + + +
+ + + + + +
+
+

+ Sent by Grafana v{{.BuildVersion}} +
© 2016 Grafana and raintank +

+
+
+
From ab4f06bc5403752e4fb6c5ecf42e1ccb24a3d241 Mon Sep 17 00:00:00 2001 From: Trent White Date: Fri, 26 Aug 2016 14:25:39 -0400 Subject: [PATCH 007/175] redesign email template --- emails/assets/css/style.css | 43 +++ emails/templates/alert_notification.html | 41 +- .../templates/alert_notification_example.html | 115 ++++++ emails/templates/invited_to_org.html | 4 +- emails/templates/layouts/default.html | 65 +--- emails/templates/new_user_invite.html | 4 +- emails/templates/reset_password.html | 4 +- emails/templates/signup_started.html | 2 +- emails/templates/welcome_on_signup.html | 14 +- public/emails/alert_notification.html | 110 +++--- public/emails/alert_notification_example.html | 359 ++++++++++++++++++ public/emails/invited_to_org.html | 73 ++-- public/emails/new_user_invite.html | 73 ++-- public/emails/reset_password.html | 73 ++-- public/emails/signup_started.html | 71 ++-- public/emails/welcome_on_signup.html | 83 ++-- 16 files changed, 770 insertions(+), 364 deletions(-) create mode 100644 emails/templates/alert_notification_example.html create mode 100644 public/emails/alert_notification_example.html diff --git a/emails/assets/css/style.css b/emails/assets/css/style.css index 63c7aaa5b3b..6f46d36581d 100644 --- a/emails/assets/css/style.css +++ b/emails/assets/css/style.css @@ -84,6 +84,10 @@ margin-top:25px; margin-bottom: 25px; } +.data { + font-size: 16px; +} + .footer { background-color: #2e2e2e; color: #999999; @@ -138,6 +142,45 @@ table.columns td.better-button { color: #FFFFFF !important; } +table.better-button-alt { + margin-top: 10px; + margin-bottom: 20px; +} + +table.columns td.better-button-alt { + -webkit-border-radius: 2px; + -moz-border-radius: 2px; + border-radius: 2px; + padding-bottom: 0px; +} + +.better-button-alt a { + text-decoration: none; + -webkit-border-radius: 2px; + -moz-border-radius: 2px; + border-radius: 2px; + + padding: 12px 25px; + border: 1px solid #ff8f2b; + background-color: #EFEFEF; + display: inline-block; + color: #ff8f2b; +} + +.better-button-alt:hover a { + color: #ff8f2b !important; + background-color: #DDDDDD; + border: 1px solid #F2821E; +} + +.better-button-alt:visited a { + color: #ff8f2b !important; +} + +.better-button-alt:active a { + color: #ff8f2b !important; +} + .verification-code { background-color: #EEEEEE; padding: 3px; diff --git a/emails/templates/alert_notification.html b/emails/templates/alert_notification.html index 2f64854ce4e..4c7eed1d5d9 100644 --- a/emails/templates/alert_notification.html +++ b/emails/templates/alert_notification.html @@ -16,7 +16,7 @@ -
+
@@ -31,24 +31,24 @@ [[if ne .State "ok" ]] -
+
- - - [[range .EvalMatches]] dwds + [[range .EvalMatches]] - - [[end]] @@ -79,8 +79,23 @@
- Metric name + +
Metric name
 - Value + +
Value
- [[.Metric]] + +
[[.Metric]]
 - [[.Value]] + +
[[.Value]]
- +
- Alert rule - Alerts page + + + + + +
+ View your Alert rule +
+ 		+ + + + +
+ Go to the Alerts page +
diff --git a/emails/templates/alert_notification_example.html b/emails/templates/alert_notification_example.html new file mode 100644 index 00000000000..7b618130e57 --- /dev/null +++ b/emails/templates/alert_notification_example.html @@ -0,0 +1,115 @@ + + + + +
+ + + + +
+

[CRITICAL] Imaginary timeserie alert

+
+
+ + + + + +
+ + + + +
+

Alert message that will support markdown in some distant future.

+
+
+ + + + + + +
+
+ + + + + + + + + + + + + + + + + +
+ Metric name + + Value +
+ desktop + + 40 +
+ mobile + + 20 +
+
+
+ + + + + + +
+ + + + +
+ +
+
+ + + + + + +
+ + + + + +
+ + + + +
+ View your Alert rule +
+ 		+ + + + +
+ Go to the Alerts page +
+
+
+ + + \ No newline at end of file diff --git a/emails/templates/invited_to_org.html b/emails/templates/invited_to_org.html index 59e76cd5a77..681830604b9 100644 --- a/emails/templates/invited_to_org.html +++ b/emails/templates/invited_to_org.html @@ -9,7 +9,7 @@ @@ -25,7 +25,7 @@
-

You have been added to [[.OrgName]]

+

You have been added to [[.OrgName]]
diff --git a/emails/templates/layouts/default.html b/emails/templates/layouts/default.html index eb968ed7cbc..6dece2f29c3 100644 --- a/emails/templates/layouts/default.html +++ b/emails/templates/layouts/default.html @@ -10,25 +10,25 @@ @@ -174,14 +135,14 @@ td[class="stack-column-center"] {
-

[[.InvitedBy]] has added you to the [[.OrgName]] organization in Grafana. +

[[.InvitedBy]] has added you to the [[.OrgName]] organization in Grafana.

Once logged in, [[.OrgName]] will be available in the left side menu, in the dropdown below your username.
- +
- +
- diff --git a/public/emails/alert_notification.html b/public/emails/alert_notification.html index a292fb45af9..07e41a06876 100644 --- a/public/emails/alert_notification.html +++ b/public/emails/alert_notification.html @@ -48,6 +48,15 @@ color: #FFFFFF !important; .better-button:active a { color: #FFFFFF !important; } +.better-button-alt:hover a { +color: #ff8f2b !important; background-color: #DDDDDD; border: 1px solid #F2821E; +} +.better-button-alt:visited a { +color: #ff8f2b !important; +} +.better-button-alt:active a { +color: #ff8f2b !important; +} body { height: 100% !important; width: 100% !important; } @@ -88,12 +97,21 @@ text-decoration: underline; table[class="body"] .columns { table-layout: fixed !important; float: none !important; width: 100% !important; padding-right: 0px !important; padding-left: 0px !important; display: block !important; } + table[class="body"] .column { + table-layout: fixed !important; float: none !important; width: 100% !important; padding-right: 0px !important; padding-left: 0px !important; display: block !important; + } table[class="body"] table.columns td { width: 100% !important; } table[class="body"] .columns td.six { width: 50% !important; } + table[class="body"] .column td.six { + width: 50% !important; + } + table[class="body"] .columns td.twelve { + width: 100% !important; + } table[class="body"] table.columns td.expander { width: 1px !important; } @@ -111,12 +129,6 @@ text-decoration: underline; img[class="fluid-centered"] { margin: auto !important; } - table[class="articles"] { - width: 90% !important; - } - table[class="article-links"] { - width: 100% !important; - } td[class="comms-content"] { padding: 20px !important; } @@ -156,41 +168,8 @@ text-decoration: underline; td[class="spacer mb-shorten"] { height: 25px !important; } - a[class="footer-legal-links"] { - display: block !important; margin-bottom: 6px !important; font-size: 12px !important; line-height: 18px !important; - } - td[class="footer-links-list"] { - margin: 12px 0; - } - a[class="post-title"] { - font-size: 22px !important; line-height: 32px !important; - } - a[class="post-title spotlight"] { - font-size: 22px !important; line-height: 32px !important; - } - td[class="legal-text"] { - font-size: 12px !important; line-height: 18px !important; - } - td[class="avatar"] { - width: 30% !important; - } - td[class="links"] { - width: 30% !important; - } - td[class="links"] { - width: 70% !important; - } - a[class="main-cta"] { - width: 90% !important; font-size: 18px !important; - } - table[class="button"] { - width: 90% !important; font-size: 18px !important; - } - a[class="cta-big-link"] { - font-size: 18px !important; line-height: 26px !important; - } - a[class="btn-white"] { - font-size: 13px !important; width: 90px !important; + .two-up td { + width: 270px; } } @@ -251,7 +230,7 @@ text-decoration: underline;
+
-

+

Sent by Grafana v[[.BuildVersion]]
© 2016 Grafana and raintank

diff --git a/emails/templates/new_user_invite.html b/emails/templates/new_user_invite.html index 86948a665f6..6e75a203953 100644 --- a/emails/templates/new_user_invite.html +++ b/emails/templates/new_user_invite.html @@ -9,7 +9,7 @@ @@ -25,7 +25,7 @@
-

You're invited to join [[.OrgName]]

+

You're invited to join [[.OrgName]]
diff --git a/emails/templates/reset_password.html b/emails/templates/reset_password.html index f3aca5da95e..e9d1527116c 100644 --- a/emails/templates/reset_password.html +++ b/emails/templates/reset_password.html @@ -7,7 +7,7 @@
-

You've been invited to join the [[.OrgName]] organization by [[.InvitedBy]]. To accept your invitation and join the team, please click the link below:

+

You've been invited to join the [[.OrgName]] organization by [[.InvitedBy]]. To accept your invitation and join the team, please click the link below:
@@ -24,7 +24,7 @@ @@ -29,6 +34,13 @@ + + +
-

Hi [[.Name]]

+

Hi [[.Name]],

- Please click the following link to reset your password within [[.EmailCodeValidHours]] hours. + Please click the following link to reset your password within [[.EmailCodeValidHours]] hours.

[[.AppUrl]]user/password/reset?code=[[.Code]] diff --git a/emails/templates/signup_started.html b/emails/templates/signup_started.html index 39b369a1f7c..15689a0e62c 100644 --- a/emails/templates/signup_started.html +++ b/emails/templates/signup_started.html @@ -7,7 +7,7 @@ diff --git a/emails/templates/welcome_on_signup.html b/emails/templates/welcome_on_signup.html index b93c56b77b1..0e0e4dbe3bc 100644 --- a/emails/templates/welcome_on_signup.html +++ b/emails/templates/welcome_on_signup.html @@ -7,10 +7,15 @@
-

Complete the signup

+

Complete the signup
+ + +
-

Hi [[.Name]]

+

Hi [[.Name]],
+ Welcome! Ready to start building some beautiful metric and analytic dashboards? +

+ Thank you for joining our community. +
+

The Grafana Team

+
-
+
@@ -266,24 +245,24 @@ text-decoration: underline; {{if ne .State "ok" }} -
+
- - - {{range .EvalMatches}} dwds + {{range .EvalMatches}} - - {{end}} @@ -314,8 +293,23 @@ text-decoration: underline;
- Metric name + +
Metric name
 - Value + +
Value
- {{.Metric}} + +
{{.Metric}}
 - {{.Value}} + +
{{.Value}}
- +
- Alert rule - Alerts page + + + + + +
+ View your Alert rule +
+ 		+ + + + +
+ Go to the Alerts page +
@@ -330,12 +324,12 @@ text-decoration: underline;
- +
-
- +
+ -
+

Sent by Grafana v{{.BuildVersion}} diff --git a/public/emails/alert_notification_example.html b/public/emails/alert_notification_example.html new file mode 100644 index 00000000000..9b3fe1911a8 --- /dev/null +++ b/public/emails/alert_notification_example.html @@ -0,0 +1,359 @@ + + + + + + + + + + + + + +
+
+ + + + + +
+
+ + + + + +
+ + + + + + +
+ +
+ +
+ +
+
+ + + + + + + + +
+ + + + +
+ + + + +
+

[CRITICAL] Imaginary timeserie alert

+
+
+ + + + + +
+ + + + +
+

Alert message that will support markdown in some distant future.

+
+
+ + + + + + +
+
+ + + + + + + + + + + + + + + + + +
+ Metric name + + Value +
+ desktop + + 40 +
+ mobile + + 20 +
+
+
+ + + + + + +
+ + + + +
+ +
+
+ + + + + + +
+ + + + + +
+ + + + +
+ View your Alert rule +
+ 		+ + + + +
+ Go to the Alerts page +
+
+
+ + + + +
+ + + + + +
+ + + + + +
+
+

+ Sent by Grafana v{{.BuildVersion}} +
© 2016 Grafana and raintank +

+
+
+
+
+
+ + diff --git a/public/emails/invited_to_org.html b/public/emails/invited_to_org.html index ac80a3983ae..0aa52751453 100644 --- a/public/emails/invited_to_org.html +++ b/public/emails/invited_to_org.html @@ -48,6 +48,15 @@ color: #FFFFFF !important; .better-button:active a { color: #FFFFFF !important; } +.better-button-alt:hover a { +color: #ff8f2b !important; background-color: #DDDDDD; border: 1px solid #F2821E; +} +.better-button-alt:visited a { +color: #ff8f2b !important; +} +.better-button-alt:active a { +color: #ff8f2b !important; +} body { height: 100% !important; width: 100% !important; } @@ -88,12 +97,21 @@ text-decoration: underline; table[class="body"] .columns { table-layout: fixed !important; float: none !important; width: 100% !important; padding-right: 0px !important; padding-left: 0px !important; display: block !important; } + table[class="body"] .column { + table-layout: fixed !important; float: none !important; width: 100% !important; padding-right: 0px !important; padding-left: 0px !important; display: block !important; + } table[class="body"] table.columns td { width: 100% !important; } table[class="body"] .columns td.six { width: 50% !important; } + table[class="body"] .column td.six { + width: 50% !important; + } + table[class="body"] .columns td.twelve { + width: 100% !important; + } table[class="body"] table.columns td.expander { width: 1px !important; } @@ -111,12 +129,6 @@ text-decoration: underline; img[class="fluid-centered"] { margin: auto !important; } - table[class="articles"] { - width: 90% !important; - } - table[class="article-links"] { - width: 100% !important; - } td[class="comms-content"] { padding: 20px !important; } @@ -156,41 +168,8 @@ text-decoration: underline; td[class="spacer mb-shorten"] { height: 25px !important; } - a[class="footer-legal-links"] { - display: block !important; margin-bottom: 6px !important; font-size: 12px !important; line-height: 18px !important; - } - td[class="footer-links-list"] { - margin: 12px 0; - } - a[class="post-title"] { - font-size: 22px !important; line-height: 32px !important; - } - a[class="post-title spotlight"] { - font-size: 22px !important; line-height: 32px !important; - } - td[class="legal-text"] { - font-size: 12px !important; line-height: 18px !important; - } - td[class="avatar"] { - width: 30% !important; - } - td[class="links"] { - width: 30% !important; - } - td[class="links"] { - width: 70% !important; - } - a[class="main-cta"] { - width: 90% !important; font-size: 18px !important; - } - table[class="button"] { - width: 90% !important; font-size: 18px !important; - } - a[class="cta-big-link"] { - font-size: 18px !important; line-height: 26px !important; - } - a[class="btn-white"] { - font-size: 13px !important; width: 90px !important; + .two-up td { + width: 270px; } } @@ -244,7 +223,7 @@ text-decoration: underline; @@ -260,7 +239,7 @@ text-decoration: underline;
-

You have been added to {{.OrgName}}

+

You have been added to {{.OrgName}}
@@ -286,12 +265,12 @@ text-decoration: underline;
-

{{.InvitedBy}} has added you to the {{.OrgName}} organization in Grafana. +

{{.InvitedBy}} has added you to the {{.OrgName}} organization in Grafana.

Once logged in, {{.OrgName}} will be available in the left side menu, in the dropdown below your username.
- +
-
- +
+ -
+

Sent by Grafana v{{.BuildVersion}} diff --git a/public/emails/new_user_invite.html b/public/emails/new_user_invite.html index 3bd942ac051..d6bde373431 100644 --- a/public/emails/new_user_invite.html +++ b/public/emails/new_user_invite.html @@ -48,6 +48,15 @@ color: #FFFFFF !important; .better-button:active a { color: #FFFFFF !important; } +.better-button-alt:hover a { +color: #ff8f2b !important; background-color: #DDDDDD; border: 1px solid #F2821E; +} +.better-button-alt:visited a { +color: #ff8f2b !important; +} +.better-button-alt:active a { +color: #ff8f2b !important; +} body { height: 100% !important; width: 100% !important; } @@ -88,12 +97,21 @@ text-decoration: underline; table[class="body"] .columns { table-layout: fixed !important; float: none !important; width: 100% !important; padding-right: 0px !important; padding-left: 0px !important; display: block !important; } + table[class="body"] .column { + table-layout: fixed !important; float: none !important; width: 100% !important; padding-right: 0px !important; padding-left: 0px !important; display: block !important; + } table[class="body"] table.columns td { width: 100% !important; } table[class="body"] .columns td.six { width: 50% !important; } + table[class="body"] .column td.six { + width: 50% !important; + } + table[class="body"] .columns td.twelve { + width: 100% !important; + } table[class="body"] table.columns td.expander { width: 1px !important; } @@ -111,12 +129,6 @@ text-decoration: underline; img[class="fluid-centered"] { margin: auto !important; } - table[class="articles"] { - width: 90% !important; - } - table[class="article-links"] { - width: 100% !important; - } td[class="comms-content"] { padding: 20px !important; } @@ -156,41 +168,8 @@ text-decoration: underline; td[class="spacer mb-shorten"] { height: 25px !important; } - a[class="footer-legal-links"] { - display: block !important; margin-bottom: 6px !important; font-size: 12px !important; line-height: 18px !important; - } - td[class="footer-links-list"] { - margin: 12px 0; - } - a[class="post-title"] { - font-size: 22px !important; line-height: 32px !important; - } - a[class="post-title spotlight"] { - font-size: 22px !important; line-height: 32px !important; - } - td[class="legal-text"] { - font-size: 12px !important; line-height: 18px !important; - } - td[class="avatar"] { - width: 30% !important; - } - td[class="links"] { - width: 30% !important; - } - td[class="links"] { - width: 70% !important; - } - a[class="main-cta"] { - width: 90% !important; font-size: 18px !important; - } - table[class="button"] { - width: 90% !important; font-size: 18px !important; - } - a[class="cta-big-link"] { - font-size: 18px !important; line-height: 26px !important; - } - a[class="btn-white"] { - font-size: 13px !important; width: 90px !important; + .two-up td { + width: 270px; } } @@ -244,7 +223,7 @@ text-decoration: underline; @@ -260,7 +239,7 @@ text-decoration: underline;
-

You're invited to join {{.OrgName}}

+

You're invited to join {{.OrgName}}
@@ -287,12 +266,12 @@ text-decoration: underline;
-

You've been invited to join the {{.OrgName}} organization by {{.InvitedBy}}. To accept your invitation and join the team, please click the link below:

+

You've been invited to join the {{.OrgName}} organization by {{.InvitedBy}}. To accept your invitation and join the team, please click the link below:
- +
-
- +
+ -
+

Sent by Grafana v{{.BuildVersion}} diff --git a/public/emails/reset_password.html b/public/emails/reset_password.html index e32821d6c57..88148f6eddc 100644 --- a/public/emails/reset_password.html +++ b/public/emails/reset_password.html @@ -48,6 +48,15 @@ color: #FFFFFF !important; .better-button:active a { color: #FFFFFF !important; } +.better-button-alt:hover a { +color: #ff8f2b !important; background-color: #DDDDDD; border: 1px solid #F2821E; +} +.better-button-alt:visited a { +color: #ff8f2b !important; +} +.better-button-alt:active a { +color: #ff8f2b !important; +} body { height: 100% !important; width: 100% !important; } @@ -88,12 +97,21 @@ text-decoration: underline; table[class="body"] .columns { table-layout: fixed !important; float: none !important; width: 100% !important; padding-right: 0px !important; padding-left: 0px !important; display: block !important; } + table[class="body"] .column { + table-layout: fixed !important; float: none !important; width: 100% !important; padding-right: 0px !important; padding-left: 0px !important; display: block !important; + } table[class="body"] table.columns td { width: 100% !important; } table[class="body"] .columns td.six { width: 50% !important; } + table[class="body"] .column td.six { + width: 50% !important; + } + table[class="body"] .columns td.twelve { + width: 100% !important; + } table[class="body"] table.columns td.expander { width: 1px !important; } @@ -111,12 +129,6 @@ text-decoration: underline; img[class="fluid-centered"] { margin: auto !important; } - table[class="articles"] { - width: 90% !important; - } - table[class="article-links"] { - width: 100% !important; - } td[class="comms-content"] { padding: 20px !important; } @@ -156,41 +168,8 @@ text-decoration: underline; td[class="spacer mb-shorten"] { height: 25px !important; } - a[class="footer-legal-links"] { - display: block !important; margin-bottom: 6px !important; font-size: 12px !important; line-height: 18px !important; - } - td[class="footer-links-list"] { - margin: 12px 0; - } - a[class="post-title"] { - font-size: 22px !important; line-height: 32px !important; - } - a[class="post-title spotlight"] { - font-size: 22px !important; line-height: 32px !important; - } - td[class="legal-text"] { - font-size: 12px !important; line-height: 18px !important; - } - td[class="avatar"] { - width: 30% !important; - } - td[class="links"] { - width: 30% !important; - } - td[class="links"] { - width: 70% !important; - } - a[class="main-cta"] { - width: 90% !important; font-size: 18px !important; - } - table[class="button"] { - width: 90% !important; font-size: 18px !important; - } - a[class="cta-big-link"] { - font-size: 18px !important; line-height: 26px !important; - } - a[class="btn-white"] { - font-size: 13px !important; width: 90px !important; + .two-up td { + width: 270px; } } @@ -242,7 +221,7 @@ text-decoration: underline; @@ -259,7 +238,7 @@ text-decoration: underline;
-

Hi {{.Name}}

+

Hi {{.Name}},

- Please click the following link to reset your password within {{.EmailCodeValidHours}} hours. + Please click the following link to reset your password within {{.EmailCodeValidHours}} hours.

{{.AppUrl}}user/password/reset?code={{.Code}} @@ -281,12 +260,12 @@ text-decoration: underline;

- +
-
- +
+ -
+

Sent by Grafana v{{.BuildVersion}} diff --git a/public/emails/signup_started.html b/public/emails/signup_started.html index 1dad4fd4e04..e9a1dc9b29e 100644 --- a/public/emails/signup_started.html +++ b/public/emails/signup_started.html @@ -48,6 +48,15 @@ color: #FFFFFF !important; .better-button:active a { color: #FFFFFF !important; } +.better-button-alt:hover a { +color: #ff8f2b !important; background-color: #DDDDDD; border: 1px solid #F2821E; +} +.better-button-alt:visited a { +color: #ff8f2b !important; +} +.better-button-alt:active a { +color: #ff8f2b !important; +} body { height: 100% !important; width: 100% !important; } @@ -88,12 +97,21 @@ text-decoration: underline; table[class="body"] .columns { table-layout: fixed !important; float: none !important; width: 100% !important; padding-right: 0px !important; padding-left: 0px !important; display: block !important; } + table[class="body"] .column { + table-layout: fixed !important; float: none !important; width: 100% !important; padding-right: 0px !important; padding-left: 0px !important; display: block !important; + } table[class="body"] table.columns td { width: 100% !important; } table[class="body"] .columns td.six { width: 50% !important; } + table[class="body"] .column td.six { + width: 50% !important; + } + table[class="body"] .columns td.twelve { + width: 100% !important; + } table[class="body"] table.columns td.expander { width: 1px !important; } @@ -111,12 +129,6 @@ text-decoration: underline; img[class="fluid-centered"] { margin: auto !important; } - table[class="articles"] { - width: 90% !important; - } - table[class="article-links"] { - width: 100% !important; - } td[class="comms-content"] { padding: 20px !important; } @@ -156,41 +168,8 @@ text-decoration: underline; td[class="spacer mb-shorten"] { height: 25px !important; } - a[class="footer-legal-links"] { - display: block !important; margin-bottom: 6px !important; font-size: 12px !important; line-height: 18px !important; - } - td[class="footer-links-list"] { - margin: 12px 0; - } - a[class="post-title"] { - font-size: 22px !important; line-height: 32px !important; - } - a[class="post-title spotlight"] { - font-size: 22px !important; line-height: 32px !important; - } - td[class="legal-text"] { - font-size: 12px !important; line-height: 18px !important; - } - td[class="avatar"] { - width: 30% !important; - } - td[class="links"] { - width: 30% !important; - } - td[class="links"] { - width: 70% !important; - } - a[class="main-cta"] { - width: 90% !important; font-size: 18px !important; - } - table[class="button"] { - width: 90% !important; font-size: 18px !important; - } - a[class="cta-big-link"] { - font-size: 18px !important; line-height: 26px !important; - } - a[class="btn-white"] { - font-size: 13px !important; width: 90px !important; + .two-up td { + width: 270px; } } @@ -242,7 +221,7 @@ text-decoration: underline; @@ -285,12 +264,12 @@ text-decoration: underline;
-

Complete the signup

+

Complete the signup
- +
-
- + @@ -276,12 +267,12 @@ text-decoration: underline;
+ - @@ -264,6 +248,13 @@ text-decoration: underline; + + +
+

Sent by Grafana v{{.BuildVersion}} diff --git a/public/emails/welcome_on_signup.html b/public/emails/welcome_on_signup.html index 265281b7eb1..123e2e145d6 100644 --- a/public/emails/welcome_on_signup.html +++ b/public/emails/welcome_on_signup.html @@ -48,6 +48,15 @@ color: #FFFFFF !important; .better-button:active a { color: #FFFFFF !important; } +.better-button-alt:hover a { +color: #ff8f2b !important; background-color: #DDDDDD; border: 1px solid #F2821E; +} +.better-button-alt:visited a { +color: #ff8f2b !important; +} +.better-button-alt:active a { +color: #ff8f2b !important; +} body { height: 100% !important; width: 100% !important; } @@ -88,12 +97,21 @@ text-decoration: underline; table[class="body"] .columns { table-layout: fixed !important; float: none !important; width: 100% !important; padding-right: 0px !important; padding-left: 0px !important; display: block !important; } + table[class="body"] .column { + table-layout: fixed !important; float: none !important; width: 100% !important; padding-right: 0px !important; padding-left: 0px !important; display: block !important; + } table[class="body"] table.columns td { width: 100% !important; } table[class="body"] .columns td.six { width: 50% !important; } + table[class="body"] .column td.six { + width: 50% !important; + } + table[class="body"] .columns td.twelve { + width: 100% !important; + } table[class="body"] table.columns td.expander { width: 1px !important; } @@ -111,12 +129,6 @@ text-decoration: underline; img[class="fluid-centered"] { margin: auto !important; } - table[class="articles"] { - width: 90% !important; - } - table[class="article-links"] { - width: 100% !important; - } td[class="comms-content"] { padding: 20px !important; } @@ -156,41 +168,8 @@ text-decoration: underline; td[class="spacer mb-shorten"] { height: 25px !important; } - a[class="footer-legal-links"] { - display: block !important; margin-bottom: 6px !important; font-size: 12px !important; line-height: 18px !important; - } - td[class="footer-links-list"] { - margin: 12px 0; - } - a[class="post-title"] { - font-size: 22px !important; line-height: 32px !important; - } - a[class="post-title spotlight"] { - font-size: 22px !important; line-height: 32px !important; - } - td[class="legal-text"] { - font-size: 12px !important; line-height: 18px !important; - } - td[class="avatar"] { - width: 30% !important; - } - td[class="links"] { - width: 30% !important; - } - td[class="links"] { - width: 70% !important; - } - a[class="main-cta"] { - width: 90% !important; font-size: 18px !important; - } - table[class="button"] { - width: 90% !important; font-size: 18px !important; - } - a[class="cta-big-link"] { - font-size: 18px !important; line-height: 26px !important; - } - a[class="btn-white"] { - font-size: 13px !important; width: 90px !important; + .two-up td { + width: 270px; } } @@ -242,10 +221,15 @@ text-decoration: underline; + + +
-

Hi {{.Name}}

+

Hi {{.Name}},
+ Welcome! Ready to start building some beautiful metric and analytic dashboards? +

+ Thank you for joining our community. +
+

The Grafana Team

+
- +
-
- +
+ -
+

Sent by Grafana v{{.BuildVersion}} From 90873cfe76adc6df1a2e8a673855a21d60a4f1a4 Mon Sep 17 00:00:00 2001 From: Trent White Date: Mon, 29 Aug 2016 16:55:19 -0400 Subject: [PATCH 008/175] getting tables to behave on mobile --- emails/assets/css/ink.css | 4 +--- emails/assets/css/style.css | 4 ++++ emails/templates/alert_notification.html | 2 +- .../templates/alert_notification_example.html | 2 +- emails/templates/layouts/default.html | 4 ++-- public/emails/alert_notification.html | 24 +++++++++---------- public/emails/alert_notification_example.html | 16 ++++++------- public/emails/invited_to_org.html | 12 +++++----- public/emails/new_user_invite.html | 12 +++++----- public/emails/reset_password.html | 12 +++++----- public/emails/signup_started.html | 12 +++++----- public/emails/welcome_on_signup.html | 12 +++++----- 12 files changed, 59 insertions(+), 57 deletions(-) diff --git a/emails/assets/css/ink.css b/emails/assets/css/ink.css index 926db026ea6..f4c1a291cb3 100644 --- a/emails/assets/css/ink.css +++ b/emails/assets/css/ink.css @@ -44,7 +44,6 @@ img { text-decoration:none; -ms-interpolation-mode: bicubic; width: auto; - max-width: 100%; float: left; clear: both; display: block; @@ -583,8 +582,7 @@ body.outlook p { @media only screen and (max-width: 600px) { table[class="body"] img { - width: auto !important; - height: auto !important; + } table[class="body"] center { diff --git a/emails/assets/css/style.css b/emails/assets/css/style.css index 6f46d36581d..83f8d2c67a6 100644 --- a/emails/assets/css/style.css +++ b/emails/assets/css/style.css @@ -102,6 +102,10 @@ margin-bottom: 25px; table[class="body"] .left-text-pad { padding-right: 10px !important; } + + .logo { + margin-left: 10px; + } } table.better-button { diff --git a/emails/templates/alert_notification.html b/emails/templates/alert_notification.html index 4c7eed1d5d9..643b1b72054 100644 --- a/emails/templates/alert_notification.html +++ b/emails/templates/alert_notification.html @@ -33,7 +33,7 @@

- +
Metric name
diff --git a/emails/templates/alert_notification_example.html b/emails/templates/alert_notification_example.html index 7b618130e57..006f668b455 100644 --- a/emails/templates/alert_notification_example.html +++ b/emails/templates/alert_notification_example.html @@ -32,7 +32,7 @@
- +
Metric name diff --git a/emails/templates/layouts/default.html b/emails/templates/layouts/default.html index 6dece2f29c3..d19364dec75 100644 --- a/emails/templates/layouts/default.html +++ b/emails/templates/layouts/default.html @@ -108,7 +108,7 @@ td[class="stack-column-center"] { @@ -128,7 +128,7 @@ td[class="stack-column-center"] { - diff --git a/public/emails/alert_notification.html b/public/emails/alert_notification.html index 07e41a06876..3d3ddf73ad7 100644 --- a/public/emails/alert_notification.html +++ b/public/emails/alert_notification.html @@ -10,7 +10,7 @@ body { width: 100% !important; min-width: 100%; -webkit-text-size-adjust: 100%; -ms-text-size-adjust: 100%; margin: 0; padding: 0; } img { -outline: none; text-decoration: none; -ms-interpolation-mode: bicubic; width: auto; max-width: 100%; float: left; clear: both; display: block; +outline: none; text-decoration: none; -ms-interpolation-mode: bicubic; width: auto; float: left; clear: both; display: block; } body { color: #222222; font-family: "Helvetica", "Arial", sans-serif; font-weight: normal; padding: 0; margin: 0; text-align: left; line-height: 1.3; @@ -79,9 +79,6 @@ a:hover { text-decoration: underline; } @media only screen and (max-width: 600px) { - table[class="body"] img { - width: auto !important; height: auto !important; - } table[class="body"] center { min-width: 0 !important; } @@ -115,6 +112,9 @@ text-decoration: underline; table[class="body"] table.columns td.expander { width: 1px !important; } + .logo { + margin-left: 10px; + } } @media (max-width: 600px) { table[class="email-container"] { @@ -191,7 +191,7 @@ text-decoration: underline;
- +
+ {{> body }}
@@ -211,7 +211,7 @@ text-decoration: underline; -
- +
+ {{Subject .Subject "{{.Title}}"}} @@ -247,21 +247,21 @@ text-decoration: underline;
- +
- - {{range .EvalMatches}} - - @@ -279,7 +279,7 @@ text-decoration: underline;
+
Metric name
 +
Value
+
{{.Metric}}
 +
{{.Value}}
- +
diff --git a/public/emails/alert_notification_example.html b/public/emails/alert_notification_example.html index 9b3fe1911a8..a3ae8340072 100644 --- a/public/emails/alert_notification_example.html +++ b/public/emails/alert_notification_example.html @@ -10,7 +10,7 @@ body { width: 100% !important; min-width: 100%; -webkit-text-size-adjust: 100%; -ms-text-size-adjust: 100%; margin: 0; padding: 0; } img { -outline: none; text-decoration: none; -ms-interpolation-mode: bicubic; width: auto; max-width: 100%; float: left; clear: both; display: block; +outline: none; text-decoration: none; -ms-interpolation-mode: bicubic; width: auto; float: left; clear: both; display: block; } body { color: #222222; font-family: "Helvetica", "Arial", sans-serif; font-weight: normal; padding: 0; margin: 0; text-align: left; line-height: 1.3; @@ -79,9 +79,6 @@ a:hover { text-decoration: underline; } @media only screen and (max-width: 600px) { - table[class="body"] img { - width: auto !important; height: auto !important; - } table[class="body"] center { min-width: 0 !important; } @@ -115,6 +112,9 @@ text-decoration: underline; table[class="body"] table.columns td.expander { width: 1px !important; } + .logo { + margin-left: 10px; + } } @media (max-width: 600px) { table[class="email-container"] { @@ -191,7 +191,7 @@ text-decoration: underline; @@ -211,14 +211,14 @@ text-decoration: underline; -
- +
+
-

[CRITICAL] Imaginary timeserie alert

+

[CRITICAL] Imaginary timeserie alert
@@ -246,7 +246,7 @@ text-decoration: underline;
- +
Metric name diff --git a/public/emails/invited_to_org.html b/public/emails/invited_to_org.html index 0aa52751453..edb69e13428 100644 --- a/public/emails/invited_to_org.html +++ b/public/emails/invited_to_org.html @@ -10,7 +10,7 @@ body { width: 100% !important; min-width: 100%; -webkit-text-size-adjust: 100%; -ms-text-size-adjust: 100%; margin: 0; padding: 0; } img { -outline: none; text-decoration: none; -ms-interpolation-mode: bicubic; width: auto; max-width: 100%; float: left; clear: both; display: block; +outline: none; text-decoration: none; -ms-interpolation-mode: bicubic; width: auto; float: left; clear: both; display: block; } body { color: #222222; font-family: "Helvetica", "Arial", sans-serif; font-weight: normal; padding: 0; margin: 0; text-align: left; line-height: 1.3; @@ -79,9 +79,6 @@ a:hover { text-decoration: underline; } @media only screen and (max-width: 600px) { - table[class="body"] img { - width: auto !important; height: auto !important; - } table[class="body"] center { min-width: 0 !important; } @@ -115,6 +112,9 @@ text-decoration: underline; table[class="body"] table.columns td.expander { width: 1px !important; } + .logo { + margin-left: 10px; + } } @media (max-width: 600px) { table[class="email-container"] { @@ -191,7 +191,7 @@ text-decoration: underline; @@ -211,7 +211,7 @@ text-decoration: underline; -
- +
+ {{Subject .Subject "{{.InvitedBy}} has added you to the {{.OrgName}} organization"}} diff --git a/public/emails/new_user_invite.html b/public/emails/new_user_invite.html index d6bde373431..43d57748f68 100644 --- a/public/emails/new_user_invite.html +++ b/public/emails/new_user_invite.html @@ -10,7 +10,7 @@ body { width: 100% !important; min-width: 100%; -webkit-text-size-adjust: 100%; -ms-text-size-adjust: 100%; margin: 0; padding: 0; } img { -outline: none; text-decoration: none; -ms-interpolation-mode: bicubic; width: auto; max-width: 100%; float: left; clear: both; display: block; +outline: none; text-decoration: none; -ms-interpolation-mode: bicubic; width: auto; float: left; clear: both; display: block; } body { color: #222222; font-family: "Helvetica", "Arial", sans-serif; font-weight: normal; padding: 0; margin: 0; text-align: left; line-height: 1.3; @@ -79,9 +79,6 @@ a:hover { text-decoration: underline; } @media only screen and (max-width: 600px) { - table[class="body"] img { - width: auto !important; height: auto !important; - } table[class="body"] center { min-width: 0 !important; } @@ -115,6 +112,9 @@ text-decoration: underline; table[class="body"] table.columns td.expander { width: 1px !important; } + .logo { + margin-left: 10px; + } } @media (max-width: 600px) { table[class="email-container"] { @@ -191,7 +191,7 @@ text-decoration: underline; @@ -211,7 +211,7 @@ text-decoration: underline; -
- +
+ {{Subject .Subject "{{.InvitedBy}} has invited you to join Grafana"}} diff --git a/public/emails/reset_password.html b/public/emails/reset_password.html index 88148f6eddc..cdc62902c30 100644 --- a/public/emails/reset_password.html +++ b/public/emails/reset_password.html @@ -10,7 +10,7 @@ body { width: 100% !important; min-width: 100%; -webkit-text-size-adjust: 100%; -ms-text-size-adjust: 100%; margin: 0; padding: 0; } img { -outline: none; text-decoration: none; -ms-interpolation-mode: bicubic; width: auto; max-width: 100%; float: left; clear: both; display: block; +outline: none; text-decoration: none; -ms-interpolation-mode: bicubic; width: auto; float: left; clear: both; display: block; } body { color: #222222; font-family: "Helvetica", "Arial", sans-serif; font-weight: normal; padding: 0; margin: 0; text-align: left; line-height: 1.3; @@ -79,9 +79,6 @@ a:hover { text-decoration: underline; } @media only screen and (max-width: 600px) { - table[class="body"] img { - width: auto !important; height: auto !important; - } table[class="body"] center { min-width: 0 !important; } @@ -115,6 +112,9 @@ text-decoration: underline; table[class="body"] table.columns td.expander { width: 1px !important; } + .logo { + margin-left: 10px; + } } @media (max-width: 600px) { table[class="email-container"] { @@ -191,7 +191,7 @@ text-decoration: underline; @@ -211,7 +211,7 @@ text-decoration: underline; -
- +
+ {{Subject .Subject "Reset your Grafana password - {{.Name}}"}} diff --git a/public/emails/signup_started.html b/public/emails/signup_started.html index e9a1dc9b29e..a22d439072f 100644 --- a/public/emails/signup_started.html +++ b/public/emails/signup_started.html @@ -10,7 +10,7 @@ body { width: 100% !important; min-width: 100%; -webkit-text-size-adjust: 100%; -ms-text-size-adjust: 100%; margin: 0; padding: 0; } img { -outline: none; text-decoration: none; -ms-interpolation-mode: bicubic; width: auto; max-width: 100%; float: left; clear: both; display: block; +outline: none; text-decoration: none; -ms-interpolation-mode: bicubic; width: auto; float: left; clear: both; display: block; } body { color: #222222; font-family: "Helvetica", "Arial", sans-serif; font-weight: normal; padding: 0; margin: 0; text-align: left; line-height: 1.3; @@ -79,9 +79,6 @@ a:hover { text-decoration: underline; } @media only screen and (max-width: 600px) { - table[class="body"] img { - width: auto !important; height: auto !important; - } table[class="body"] center { min-width: 0 !important; } @@ -115,6 +112,9 @@ text-decoration: underline; table[class="body"] table.columns td.expander { width: 1px !important; } + .logo { + margin-left: 10px; + } } @media (max-width: 600px) { table[class="email-container"] { @@ -191,7 +191,7 @@ text-decoration: underline;
@@ -211,7 +211,7 @@ text-decoration: underline; -
- +
+ {{Subject .Subject "Welcome to Grafana, please complete your sign up!"}} diff --git a/public/emails/welcome_on_signup.html b/public/emails/welcome_on_signup.html index 123e2e145d6..606c804df0d 100644 --- a/public/emails/welcome_on_signup.html +++ b/public/emails/welcome_on_signup.html @@ -10,7 +10,7 @@ body { width: 100% !important; min-width: 100%; -webkit-text-size-adjust: 100%; -ms-text-size-adjust: 100%; margin: 0; padding: 0; } img { -outline: none; text-decoration: none; -ms-interpolation-mode: bicubic; width: auto; max-width: 100%; float: left; clear: both; display: block; +outline: none; text-decoration: none; -ms-interpolation-mode: bicubic; width: auto; float: left; clear: both; display: block; } body { color: #222222; font-family: "Helvetica", "Arial", sans-serif; font-weight: normal; padding: 0; margin: 0; text-align: left; line-height: 1.3; @@ -79,9 +79,6 @@ a:hover { text-decoration: underline; } @media only screen and (max-width: 600px) { - table[class="body"] img { - width: auto !important; height: auto !important; - } table[class="body"] center { min-width: 0 !important; } @@ -115,6 +112,9 @@ text-decoration: underline; table[class="body"] table.columns td.expander { width: 1px !important; } + .logo { + margin-left: 10px; + } } @media (max-width: 600px) { table[class="email-container"] { @@ -191,7 +191,7 @@ text-decoration: underline;
@@ -211,7 +211,7 @@ text-decoration: underline; -
- +
+ {{Subject .Subject "Welcome to Grafana"}} From 1a70e69447023483e991399c5831cbf6ce66f1ba Mon Sep 17 00:00:00 2001 From: bergquist Date: Tue, 30 Aug 2016 15:23:59 +0200 Subject: [PATCH 009/175] mark second td as last --- emails/templates/alert_notification.html | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/emails/templates/alert_notification.html b/emails/templates/alert_notification.html index 643b1b72054..7e71e5eb62d 100644 --- a/emails/templates/alert_notification.html +++ b/emails/templates/alert_notification.html @@ -35,19 +35,19 @@
- - [[range .EvalMatches]] - - From 852a8b77e411a96aba930354299a607e76d9cc98 Mon Sep 17 00:00:00 2001 From: Trent White Date: Mon, 29 Aug 2016 17:03:26 -0400 Subject: [PATCH 010/175] table tweak --- emails/templates/alert_notification.html | 2 +- emails/templates/alert_notification_example.html | 2 +- public/emails/alert_notification.html | 10 +++++----- public/emails/alert_notification_example.html | 2 +- 4 files changed, 8 insertions(+), 8 deletions(-) diff --git a/emails/templates/alert_notification.html b/emails/templates/alert_notification.html index 7e71e5eb62d..e044525e7eb 100644 --- a/emails/templates/alert_notification.html +++ b/emails/templates/alert_notification.html @@ -33,7 +33,7 @@
+
Metric name
 +
Value
+
[[.Metric]]
 +
[[.Value]]
- +
Metric name
diff --git a/emails/templates/alert_notification_example.html b/emails/templates/alert_notification_example.html index 006f668b455..7b618130e57 100644 --- a/emails/templates/alert_notification_example.html +++ b/emails/templates/alert_notification_example.html @@ -32,7 +32,7 @@
- +
Metric name diff --git a/public/emails/alert_notification.html b/public/emails/alert_notification.html index 3d3ddf73ad7..03fe5f0faaf 100644 --- a/public/emails/alert_notification.html +++ b/public/emails/alert_notification.html @@ -247,21 +247,21 @@ text-decoration: underline;
- +
- - {{range .EvalMatches}} - - diff --git a/public/emails/alert_notification_example.html b/public/emails/alert_notification_example.html index a3ae8340072..8a3e06c523e 100644 --- a/public/emails/alert_notification_example.html +++ b/public/emails/alert_notification_example.html @@ -246,7 +246,7 @@ text-decoration: underline;
+
Metric name
 +
Value
+
{{.Metric}}
 +
{{.Value}}
- +
Metric name From 00f82010f8739aff5148e7e6326d16a2f50a03b5 Mon Sep 17 00:00:00 2001 From: Trent White Date: Tue, 30 Aug 2016 12:11:00 -0400 Subject: [PATCH 011/175] tweaked alert example to see if there were any visual changes --- emails/templates/alert_notification_example.html | 12 ++++++------ public/emails/alert_notification.html | 8 ++++---- public/emails/alert_notification_example.html | 12 ++++++------ 3 files changed, 16 insertions(+), 16 deletions(-) diff --git a/emails/templates/alert_notification_example.html b/emails/templates/alert_notification_example.html index 7b618130e57..5061b8579ac 100644 --- a/emails/templates/alert_notification_example.html +++ b/emails/templates/alert_notification_example.html @@ -34,28 +34,28 @@ - - - - - - diff --git a/public/emails/alert_notification.html b/public/emails/alert_notification.html index 03fe5f0faaf..8106592fb8d 100644 --- a/public/emails/alert_notification.html +++ b/public/emails/alert_notification.html @@ -249,19 +249,19 @@ text-decoration: underline;
+ Metric name + Value
+ desktop + 40
+ mobile + 20
- - {{range .EvalMatches}} - - diff --git a/public/emails/alert_notification_example.html b/public/emails/alert_notification_example.html index 8a3e06c523e..f0aa5f8b3b6 100644 --- a/public/emails/alert_notification_example.html +++ b/public/emails/alert_notification_example.html @@ -248,28 +248,28 @@ text-decoration: underline;
+
Metric name
 +
Value
+
{{.Metric}}
 +
{{.Value}}
- - - - - - From e2f5bf166665f679bf6f91dec2d1f742f48bd380 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Torkel=20=C3=96degaard?= Date: Mon, 5 Sep 2016 13:38:25 +0200 Subject: [PATCH 012/175] feat(alerting): fixed confirm delete dashboard issue --- public/app/core/services/alert_srv.ts | 17 ++++++++--------- .../app/features/dashboard/dashnav/dashnav.ts | 15 +++++---------- public/app/partials/confirm_modal.html | 7 +++---- 3 files changed, 16 insertions(+), 23 deletions(-) diff --git a/public/app/core/services/alert_srv.ts b/public/app/core/services/alert_srv.ts index 4ef329f975e..286f03db5f5 100644 --- a/public/app/core/services/alert_srv.ts +++ b/public/app/core/services/alert_srv.ts @@ -80,28 +80,27 @@ export class AlertSrv { showConfirmModal(payload) { var scope = this.$rootScope.$new(); - scope.title = payload.title; - scope.text = payload.text; - scope.text2 = payload.text2; - scope.confirmTextRequired = payload.confirmText !== undefined && payload.confirmText !== ""; - scope.onConfirm = function() { - if (!scope.confirmTextRequired || (scope.confirmTextRequired && scope.confirmTextValid)) { - payload.onConfirm(); - scope.dismiss(); - } + payload.onConfirm(); + scope.dismiss(); }; scope.updateConfirmText = function(value) { scope.confirmTextValid = payload.confirmText.toLowerCase() === value.toLowerCase(); }; + scope.title = payload.title; + scope.text = payload.text; + scope.text2 = payload.text2; + scope.confirmText = payload.confirmText; + scope.onConfirm = payload.onConfirm; scope.onAltAction = payload.onAltAction; scope.altActionText = payload.altActionText; scope.icon = payload.icon || "fa-check"; scope.yesText = payload.yesText || "Yes"; scope.noText = payload.noText || "Cancel"; + scope.confirmTextValid = scope.confirmText ? false : true; var confirmModal = this.$modal({ template: 'public/app/partials/confirm_modal.html', diff --git a/public/app/features/dashboard/dashnav/dashnav.ts b/public/app/features/dashboard/dashnav/dashnav.ts index 23e490f3e81..32a59402832 100644 --- a/public/app/features/dashboard/dashnav/dashnav.ts +++ b/public/app/features/dashboard/dashnav/dashnav.ts @@ -158,18 +158,13 @@ export class DashNavCtrl { $scope.deleteDashboard = function() { var confirmText = ""; var text2 = $scope.dashboard.title; - var alerts = 0; - - _.each($scope.dashboard.rows, row => { - _.each(row.panels, panel => { - if (panel.alerting && panel.alerting.queryRef !== '- select query -') { - alerts += 1; - }; - }); - }); + var alerts = $scope.dashboard.rows.reduce((memo, row) => { + memo += row.panels.filter(panel => panel.alert && panel.alert.enabled).length; + return memo; + }, 0); if (alerts > 0) { - confirmText = $scope.dashboard.title; + confirmText = 'DELETE'; text2 = `This dashboad contains ${alerts} alerts. Deleting this dashboad will also delete those alerts`; } diff --git a/public/app/partials/confirm_modal.html b/public/app/partials/confirm_modal.html index 85788911ff7..e0b6884618b 100644 --- a/public/app/partials/confirm_modal.html +++ b/public/app/partials/confirm_modal.html @@ -22,14 +22,13 @@ -
- Please type in the name of the dashboard to confirm. - +
+
- +
From 4c5461d4ba7bc5bfcd1a9e41434c18eda1024611 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Torkel=20=C3=96degaard?= Date: Mon, 5 Sep 2016 14:26:08 +0200 Subject: [PATCH 013/175] feat(alerting): alerting scheduling distribution, only distibutes it on seconds for now, not sub second distribution, #5854 --- pkg/services/alerting/models.go | 9 +++++---- pkg/services/alerting/scheduler.go | 29 ++++++++++++++++++++++++----- 2 files changed, 29 insertions(+), 9 deletions(-) diff --git a/pkg/services/alerting/models.go b/pkg/services/alerting/models.go index e11e1e1aaaf..39e7eb83166 100644 --- a/pkg/services/alerting/models.go +++ b/pkg/services/alerting/models.go @@ -1,10 +1,11 @@ package alerting type Job struct { - Offset int64 - Delay bool - Running bool - Rule *Rule + Offset int64 + OffsetWait bool + Delay bool + Running bool + Rule *Rule } type ResultLogEntry struct { diff --git a/pkg/services/alerting/scheduler.go b/pkg/services/alerting/scheduler.go index ffac7ddb659..6701ad6eb6c 100644 --- a/pkg/services/alerting/scheduler.go +++ b/pkg/services/alerting/scheduler.go @@ -1,6 +1,7 @@ package alerting import ( + "math" "time" "github.com/grafana/grafana/pkg/log" @@ -34,8 +35,8 @@ func (s *SchedulerImpl) Update(rules []*Rule) { } job.Rule = rule - job.Offset = int64(i) - + job.Offset = ((rule.Frequency * 1000) / int64(len(rules))) * int64(i) + job.Offset = int64(math.Floor(float64(job.Offset) / 1000)) jobs[rule.Id] = job } @@ -46,9 +47,27 @@ func (s *SchedulerImpl) Tick(tickTime time.Time, execQueue chan *Job) { now := tickTime.Unix() for _, job := range s.jobs { - if now%job.Rule.Frequency == 0 && job.Running == false { - s.log.Debug("Scheduler: Putting job on to exec queue", "name", job.Rule.Name) - execQueue <- job + if job.Running { + continue + } + + if job.OffsetWait && now%job.Offset == 0 { + job.OffsetWait = false + s.enque(job, execQueue) + continue + } + + if now%job.Rule.Frequency == 0 { + if job.Offset > 0 { + job.OffsetWait = true + } else { + s.enque(job, execQueue) + } } } } + +func (s *SchedulerImpl) enque(job *Job, execQueue chan *Job) { + s.log.Debug("Scheduler: Putting job on to exec queue", "name", job.Rule.Name, "id", job.Rule.Id) + execQueue <- job +} From d11bc57c37d2b7e2f32c04d84258ff91fbee130e Mon Sep 17 00:00:00 2001 From: bergquist Date: Mon, 5 Sep 2016 14:43:53 +0200 Subject: [PATCH 014/175] feat(notifications): make it possible to send test alert notifications closes #5847 --- pkg/api/alerting.go | 16 ++++ pkg/api/api.go | 1 + pkg/api/dtos/alerting.go | 7 ++ pkg/services/alerting/notifier.go | 5 +- pkg/services/alerting/test_notification.go | 93 +++++++++++++++++++ .../alerting/notification_edit_ctrl.ts | 20 ++++ .../alerting/partials/notification_edit.html | 24 ++++- 7 files changed, 163 insertions(+), 3 deletions(-) create mode 100644 pkg/services/alerting/test_notification.go diff --git a/pkg/api/alerting.go b/pkg/api/alerting.go index 80b5108bbad..10492cb9a47 100644 --- a/pkg/api/alerting.go +++ b/pkg/api/alerting.go @@ -214,6 +214,22 @@ func DeleteAlertNotification(c *middleware.Context) Response { return ApiSuccess("Notification deleted") } +//POST /api/alert-notifications/test +func NotificationTest(c *middleware.Context, dto dtos.NotificationTestCommand) Response { + cmd := &alerting.NotificationTestCommand{ + Name: dto.Name, + Type: dto.Type, + Severity: dto.Severity, + Settings: dto.Settings, + } + + if err := bus.Dispatch(cmd); err != nil { + return ApiError(500, "Failed to send alert notifications", err) + } + + return ApiSuccess("Test notification sent") +} + func GetAlertHistory(c *middleware.Context) Response { alertId, err := getAlertIdForRequest(c) if err != nil { diff --git a/pkg/api/api.go b/pkg/api/api.go index 132c609dde4..de3a1de8a65 100644 --- a/pkg/api/api.go +++ b/pkg/api/api.go @@ -259,6 +259,7 @@ func Register(r *macaron.Macaron) { r.Get("/alert-notifications", wrap(GetAlertNotifications)) r.Group("/alert-notifications", func() { + r.Post("/test", bind(dtos.NotificationTestCommand{}), wrap(NotificationTest)) r.Post("/", bind(m.CreateAlertNotificationCommand{}), wrap(CreateAlertNotification)) r.Put("/:notificationId", bind(m.UpdateAlertNotificationCommand{}), wrap(UpdateAlertNotification)) r.Get("/:notificationId", wrap(GetAlertNotificationById)) diff --git a/pkg/api/dtos/alerting.go b/pkg/api/dtos/alerting.go index d5fbb2c3a9f..474f0a5a048 100644 --- a/pkg/api/dtos/alerting.go +++ b/pkg/api/dtos/alerting.go @@ -63,3 +63,10 @@ type AlertHistory struct { Data *simplejson.Json `json:"data"` } + +type NotificationTestCommand struct { + Name string `json:"name"` + Type string `json:"type"` + Settings *simplejson.Json `json:"settings"` + Severity string `json:"severity"` +} diff --git a/pkg/services/alerting/notifier.go b/pkg/services/alerting/notifier.go index c345594de2c..55090d9772f 100644 --- a/pkg/services/alerting/notifier.go +++ b/pkg/services/alerting/notifier.go @@ -46,6 +46,10 @@ func (n *RootNotifier) Notify(context *EvalContext) { n.log.Error("Failed to upload alert panel image", "error", err) } + n.sendNotifications(notifiers, context) +} + +func (n *RootNotifier) sendNotifications(notifiers []Notifier, context *EvalContext) { for _, notifier := range notifiers { n.log.Info("Sending notification", "firing", context.Firing, "type", notifier.GetType()) go notifier.Notify(context) @@ -53,7 +57,6 @@ func (n *RootNotifier) Notify(context *EvalContext) { } func (n *RootNotifier) uploadImage(context *EvalContext) error { - uploader, _ := imguploader.NewImageUploader() imageUrl, err := context.GetImageUrl() diff --git a/pkg/services/alerting/test_notification.go b/pkg/services/alerting/test_notification.go new file mode 100644 index 00000000000..026dfdd18a5 --- /dev/null +++ b/pkg/services/alerting/test_notification.go @@ -0,0 +1,93 @@ +package alerting + +import ( + "github.com/grafana/grafana/pkg/bus" + "github.com/grafana/grafana/pkg/components/simplejson" + "github.com/grafana/grafana/pkg/log" + "github.com/grafana/grafana/pkg/models" +) + +type NotificationTestCommand struct { + Severity string + Name string + Type string + Settings *simplejson.Json +} + +func init() { + bus.AddHandler("alerting", handleNotificationTestCommand) + +} + +func handleNotificationTestCommand(cmd *NotificationTestCommand) error { + notifier := NewRootNotifier() + + model := &models.AlertNotification{ + Name: cmd.Name, + Type: cmd.Type, + Settings: cmd.Settings, + } + + notifiers, err := notifier.getNotifierFor(model) + + if err != nil { + log.Error2("Failed to create notifier", "error", err.Error()) + return err + } + + severity := models.AlertSeverityType(cmd.Severity) + notifier.sendNotifications([]Notifier{notifiers}, createTestEvalContext(severity)) + + return nil +} + +func createTestEvalContext(severity models.AlertSeverityType) *EvalContext { + state := models.AlertStateOK + firing := false + if severity == models.AlertSeverityCritical { + state = models.AlertStateCritical + firing = true + } + if severity == models.AlertSeverityWarning { + state = models.AlertStateWarning + firing = true + } + + testRule := &Rule{ + DashboardId: 1, + PanelId: 1, + Name: "Test notification", + Message: "Someone is testing the alert notification within grafana.", + State: state, + Severity: severity, + } + + ctx := NewEvalContext(testRule) + ctx.ImagePublicUrl = "http://grafana.org/assets/img/blog/mixed_styles.png" + + ctx.IsTestRun = true + ctx.Firing = firing + ctx.Error = nil + ctx.EvalMatches = evalMatchesBasedOnSeverity(severity) + + return ctx +} + +func evalMatchesBasedOnSeverity(severity models.AlertSeverityType) []*EvalMatch { + matches := make([]*EvalMatch, 0) + if severity == models.AlertSeverityOK { + return matches + } + + matches = append(matches, &EvalMatch{ + Metric: "High value", + Value: 100, + }) + + matches = append(matches, &EvalMatch{ + Metric: "Higher Value", + Value: 200, + }) + + return matches +} diff --git a/public/app/features/alerting/notification_edit_ctrl.ts b/public/app/features/alerting/notification_edit_ctrl.ts index fc33118cb00..99193a9d7d1 100644 --- a/public/app/features/alerting/notification_edit_ctrl.ts +++ b/public/app/features/alerting/notification_edit_ctrl.ts @@ -7,6 +7,8 @@ import config from 'app/core/config'; export class AlertNotificationEditCtrl { model: any; + showTest: boolean = false; + testSeverity: string = "critical"; /** @ngInject */ constructor(private $routeParams, private backendSrv, private $scope, private $location) { @@ -47,6 +49,24 @@ export class AlertNotificationEditCtrl { typeChanged() { this.model.settings = {}; } + + toggleTest() { + this.showTest = !this.showTest; + } + + testNotification() { + var payload = { + name: this.model.name, + type: this.model.type, + settings: this.model.settings, + severity: this.testSeverity + }; + + this.backendSrv.post(`/api/alert-notifications/test`, payload) + .then(res => { + this.$scope.appEvent('alert-succes', ['Test notification sent', '']); + }); + } } coreModule.controller('AlertNotificationEditCtrl', AlertNotificationEditCtrl); diff --git a/public/app/features/alerting/partials/notification_edit.html b/public/app/features/alerting/partials/notification_edit.html index 2faf3e2dfe0..5664d201967 100644 --- a/public/app/features/alerting/partials/notification_edit.html +++ b/public/app/features/alerting/partials/notification_edit.html @@ -60,7 +60,27 @@ -
- +
+
+
+ +
+
+ +
+ +
+ Severity for test notification +
+ +
+
+
+ +
+
From b501590a75d3a2d78ad6d121ec0897711827a78f Mon Sep 17 00:00:00 2001 From: Carl Bergquist Date: Mon, 5 Sep 2016 17:38:55 +0200 Subject: [PATCH 015/175] fix(.editorconfig): correct spelling of indent_style Unleash the fucking fury --- .editorconfig | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.editorconfig b/.editorconfig index 831bb8696cc..3701d80b453 100644 --- a/.editorconfig +++ b/.editorconfig @@ -2,7 +2,7 @@ root = true [*.go] -indent_style = tabs +indent_style = tab indent_size = 2 charset = utf-8 trim_trailing_whitespace = true From 015423b2332138e914cb91491583ae725bc4e1e6 Mon Sep 17 00:00:00 2001 From: bergquist Date: Mon, 5 Sep 2016 21:13:35 +0200 Subject: [PATCH 016/175] tech(gitignore): ignore vscode folder --- .gitignore | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.gitignore b/.gitignore index 515c19e7e0b..721a2a71ad4 100644 --- a/.gitignore +++ b/.gitignore @@ -25,6 +25,7 @@ public/css/*.min.css *.swp .idea/ *.iml +.vscode/ /data/* /bin/* @@ -37,4 +38,4 @@ profile.cov .notouch /pkg/cmd/grafana-cli/grafana-cli /pkg/cmd/grafana-server/grafana-server -/examples/*/dist \ No newline at end of file +/examples/*/dist From eb0396ad950c36570d0930a07272f2614b20a941 Mon Sep 17 00:00:00 2001 From: bergquist Date: Mon, 5 Sep 2016 21:35:03 +0200 Subject: [PATCH 017/175] chore(tsdb): remove some logging --- pkg/tsdb/graphite/graphite.go | 2 -- 1 file changed, 2 deletions(-) diff --git a/pkg/tsdb/graphite/graphite.go b/pkg/tsdb/graphite/graphite.go index 0247ad0dca8..7191cbd7a63 100644 --- a/pkg/tsdb/graphite/graphite.go +++ b/pkg/tsdb/graphite/graphite.go @@ -47,8 +47,6 @@ func (e *GraphiteExecutor) Execute(queries tsdb.QuerySlice, context *tsdb.QueryC formData["target"] = []string{query.Query} } - glog.Info("Graphite request body", "formdata", formData.Encode()) - req, err := e.createRequest(formData) if err != nil { result.Error = err From c893e5d24183c604bdea8904a9a3091f9e3e3502 Mon Sep 17 00:00:00 2001 From: bergquist Date: Mon, 5 Sep 2016 21:33:05 +0200 Subject: [PATCH 018/175] feat(notifications): add support for default notifications ref #5883 --- pkg/api/alerting.go | 11 ++-- pkg/api/dtos/alerting.go | 11 ++-- pkg/models/alert_notifications.go | 31 +++++----- pkg/services/alerting/notifier.go | 5 +- pkg/services/sqlstore/alert_notification.go | 61 +++++++++++-------- .../sqlstore/alert_notification_test.go | 4 +- pkg/services/sqlstore/migrations/alert_mig.go | 4 ++ .../alerting/notification_edit_ctrl.ts | 3 +- .../alerting/partials/notification_edit.html | 9 +++ .../alerting/partials/notifications_list.html | 7 ++- 10 files changed, 89 insertions(+), 57 deletions(-) diff --git a/pkg/api/alerting.go b/pkg/api/alerting.go index 10492cb9a47..83a370499c5 100644 --- a/pkg/api/alerting.go +++ b/pkg/api/alerting.go @@ -157,11 +157,12 @@ func GetAlertNotifications(c *middleware.Context) Response { for _, notification := range query.Result { result = append(result, dtos.AlertNotification{ - Id: notification.Id, - Name: notification.Name, - Type: notification.Type, - Created: notification.Created, - Updated: notification.Updated, + Id: notification.Id, + Name: notification.Name, + Type: notification.Type, + IsDefault: notification.IsDefault, + Created: notification.Created, + Updated: notification.Updated, }) } diff --git a/pkg/api/dtos/alerting.go b/pkg/api/dtos/alerting.go index 474f0a5a048..83b21757d32 100644 --- a/pkg/api/dtos/alerting.go +++ b/pkg/api/dtos/alerting.go @@ -22,11 +22,12 @@ type AlertRule struct { } type AlertNotification struct { - Id int64 `json:"id"` - Name string `json:"name"` - Type string `json:"type"` - Created time.Time `json:"created"` - Updated time.Time `json:"updated"` + Id int64 `json:"id"` + Name string `json:"name"` + Type string `json:"type"` + IsDefault bool `json:"isDefault"` + Created time.Time `json:"created"` + Updated time.Time `json:"updated"` } type AlertTestCommand struct { diff --git a/pkg/models/alert_notifications.go b/pkg/models/alert_notifications.go index 464d6dc88da..1e586b4974e 100644 --- a/pkg/models/alert_notifications.go +++ b/pkg/models/alert_notifications.go @@ -7,29 +7,32 @@ import ( ) type AlertNotification struct { - Id int64 `json:"id"` - OrgId int64 `json:"-"` - Name string `json:"name"` - Type string `json:"type"` - Settings *simplejson.Json `json:"settings"` - Created time.Time `json:"created"` - Updated time.Time `json:"updated"` + Id int64 `json:"id"` + OrgId int64 `json:"-"` + Name string `json:"name"` + Type string `json:"type"` + IsDefault bool `json:"isDefault"` + Settings *simplejson.Json `json:"settings"` + Created time.Time `json:"created"` + Updated time.Time `json:"updated"` } type CreateAlertNotificationCommand struct { - Name string `json:"name" binding:"Required"` - Type string `json:"type" binding:"Required"` - Settings *simplejson.Json `json:"settings"` + Name string `json:"name" binding:"Required"` + Type string `json:"type" binding:"Required"` + IsDefault bool `json:"isDefault"` + Settings *simplejson.Json `json:"settings"` OrgId int64 `json:"-"` Result *AlertNotification } type UpdateAlertNotificationCommand struct { - Id int64 `json:"id" binding:"Required"` - Name string `json:"name" binding:"Required"` - Type string `json:"type" binding:"Required"` - Settings *simplejson.Json `json:"settings" binding:"Required"` + Id int64 `json:"id" binding:"Required"` + Name string `json:"name" binding:"Required"` + Type string `json:"type" binding:"Required"` + IsDefault bool `json:"isDefault"` + Settings *simplejson.Json `json:"settings" binding:"Required"` OrgId int64 `json:"-"` Result *AlertNotification diff --git a/pkg/services/alerting/notifier.go b/pkg/services/alerting/notifier.go index 55090d9772f..b82d4dd3864 100644 --- a/pkg/services/alerting/notifier.go +++ b/pkg/services/alerting/notifier.go @@ -88,11 +88,12 @@ func (n *RootNotifier) uploadImage(context *EvalContext) error { } func (n *RootNotifier) getNotifiers(orgId int64, notificationIds []int64) ([]Notifier, error) { + query := &m.GetAlertNotificationsQuery{OrgId: orgId} + if len(notificationIds) == 0 { - return []Notifier{}, nil + query.Ids = []int64{0} } - query := &m.GetAlertNotificationsQuery{OrgId: orgId, Ids: notificationIds} if err := bus.Dispatch(query); err != nil { return nil, err } diff --git a/pkg/services/sqlstore/alert_notification.go b/pkg/services/sqlstore/alert_notification.go index c5b3a2f5975..d33e6d90151 100644 --- a/pkg/services/sqlstore/alert_notification.go +++ b/pkg/services/sqlstore/alert_notification.go @@ -40,33 +40,36 @@ func getAlertNotificationsInternal(query *m.GetAlertNotificationsQuery, sess *xo params := make([]interface{}, 0) sql.WriteString(`SELECT - alert_notification.id, - alert_notification.org_id, - alert_notification.name, - alert_notification.type, - alert_notification.created, - alert_notification.updated, - alert_notification.settings - FROM alert_notification - `) + alert_notification.id, + alert_notification.org_id, + alert_notification.name, + alert_notification.type, + alert_notification.created, + alert_notification.updated, + alert_notification.settings, + alert_notification.is_default + FROM alert_notification + `) sql.WriteString(` WHERE alert_notification.org_id = ?`) params = append(params, query.OrgId) - if query.Name != "" { - sql.WriteString(` AND alert_notification.name = ?`) - params = append(params, query.Name) - } + if query.Name != "" || query.Id != 0 || len(query.Ids) > 0 { + if query.Name != "" { + sql.WriteString(` AND alert_notification.name = ?`) + params = append(params, query.Name) + } - if query.Id != 0 { - sql.WriteString(` AND alert_notification.id = ?`) - params = append(params, query.Id) - } + if query.Id != 0 { + sql.WriteString(` AND alert_notification.id = ?`) + params = append(params, query.Id) + } - if len(query.Ids) > 0 { - sql.WriteString(` AND alert_notification.id IN (?` + strings.Repeat(",?", len(query.Ids)-1) + ")") - for _, v := range query.Ids { - params = append(params, v) + if len(query.Ids) > 0 { + sql.WriteString(` AND ((alert_notification.is_default = 1) OR alert_notification.id IN (?` + strings.Repeat(",?", len(query.Ids)-1) + "))") + for _, v := range query.Ids { + params = append(params, v) + } } } @@ -93,12 +96,13 @@ func CreateAlertNotificationCommand(cmd *m.CreateAlertNotificationCommand) error } alertNotification := &m.AlertNotification{ - OrgId: cmd.OrgId, - Name: cmd.Name, - Type: cmd.Type, - Settings: cmd.Settings, - Created: time.Now(), - Updated: time.Now(), + OrgId: cmd.OrgId, + Name: cmd.Name, + Type: cmd.Type, + Settings: cmd.Settings, + Created: time.Now(), + Updated: time.Now(), + IsDefault: cmd.IsDefault, } if _, err = sess.Insert(alertNotification); err != nil { @@ -132,6 +136,9 @@ func UpdateAlertNotification(cmd *m.UpdateAlertNotificationCommand) error { current.Settings = cmd.Settings current.Name = cmd.Name current.Type = cmd.Type + current.IsDefault = cmd.IsDefault + + sess.UseBool("is_default") if affected, err := sess.Id(cmd.Id).Update(current); err != nil { return err diff --git a/pkg/services/sqlstore/alert_notification_test.go b/pkg/services/sqlstore/alert_notification_test.go index 4cbcf13a000..f9ecf0e5234 100644 --- a/pkg/services/sqlstore/alert_notification_test.go +++ b/pkg/services/sqlstore/alert_notification_test.go @@ -63,10 +63,12 @@ func TestAlertNotificationSQLAccess(t *testing.T) { cmd1 := m.CreateAlertNotificationCommand{Name: "nagios", Type: "webhook", OrgId: 1, Settings: simplejson.New()} cmd2 := m.CreateAlertNotificationCommand{Name: "slack", Type: "webhook", OrgId: 1, Settings: simplejson.New()} cmd3 := m.CreateAlertNotificationCommand{Name: "ops2", Type: "email", OrgId: 1, Settings: simplejson.New()} + cmd4 := m.CreateAlertNotificationCommand{IsDefault: true, Name: "default", Type: "email", OrgId: 1, Settings: simplejson.New()} So(CreateAlertNotificationCommand(&cmd1), ShouldBeNil) So(CreateAlertNotificationCommand(&cmd2), ShouldBeNil) So(CreateAlertNotificationCommand(&cmd3), ShouldBeNil) + So(CreateAlertNotificationCommand(&cmd4), ShouldBeNil) Convey("search", func() { query := &m.GetAlertNotificationsQuery{ @@ -76,7 +78,7 @@ func TestAlertNotificationSQLAccess(t *testing.T) { err := GetAlertNotifications(query) So(err, ShouldBeNil) - So(len(query.Result), ShouldEqual, 2) + So(len(query.Result), ShouldEqual, 3) }) }) }) diff --git a/pkg/services/sqlstore/migrations/alert_mig.go b/pkg/services/sqlstore/migrations/alert_mig.go index 63d61d8b196..b6956be41c7 100644 --- a/pkg/services/sqlstore/migrations/alert_mig.go +++ b/pkg/services/sqlstore/migrations/alert_mig.go @@ -62,5 +62,9 @@ func addAlertMigrations(mg *Migrator) { } mg.AddMigration("create alert_notification table v1", NewAddTableMigration(alert_notification)) + mg.AddMigration("Add column is_default", NewAddColumnMigration(alert_notification, &Column{ + Name: "is_default", Type: DB_Bool, Nullable: false, Default: "0", + })) mg.AddMigration("add index alert_notification org_id & name", NewAddIndexMigration(alert_notification, alert_notification.Indices[0])) + } diff --git a/public/app/features/alerting/notification_edit_ctrl.ts b/public/app/features/alerting/notification_edit_ctrl.ts index 99193a9d7d1..d465a9021a6 100644 --- a/public/app/features/alerting/notification_edit_ctrl.ts +++ b/public/app/features/alerting/notification_edit_ctrl.ts @@ -17,7 +17,8 @@ export class AlertNotificationEditCtrl { } else { this.model = { type: 'email', - settings: {} + settings: {}, + isDefault: false }; } } diff --git a/public/app/features/alerting/partials/notification_edit.html b/public/app/features/alerting/partials/notification_edit.html index 5664d201967..c9f181eacf9 100644 --- a/public/app/features/alerting/partials/notification_edit.html +++ b/public/app/features/alerting/partials/notification_edit.html @@ -25,6 +25,15 @@ +
+ + +
diff --git a/public/app/features/alerting/partials/notifications_list.html b/public/app/features/alerting/partials/notifications_list.html index df3cbfcc65d..8777d6f6a1b 100644 --- a/public/app/features/alerting/partials/notifications_list.html +++ b/public/app/features/alerting/partials/notifications_list.html @@ -10,7 +10,7 @@
-
+ Metric name + Value
+ desktop + 40
+ mobile + 20
+
@@ -25,7 +25,10 @@ - - [[range .EvalMatches]] @@ -47,8 +47,8 @@ - [[end]] From 59cb51dc6fa8c67fe0f30de7645387aaecbdda66 Mon Sep 17 00:00:00 2001 From: bergquist Date: Wed, 7 Sep 2016 13:47:57 +0200 Subject: [PATCH 037/175] test(emails): update fake data model --- pkg/services/notifications/send_email_integration_test.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkg/services/notifications/send_email_integration_test.go b/pkg/services/notifications/send_email_integration_test.go index b91cc178240..1a4406dc13a 100644 --- a/pkg/services/notifications/send_email_integration_test.go +++ b/pkg/services/notifications/send_email_integration_test.go @@ -40,7 +40,7 @@ func TestEmailIntegrationTest(t *testing.T) { "RuleUrl": "http://localhost:3000/dashboard/db/graphite-dashboard", "ImageLink": "http://localhost:3000/render/dashboard-solo/db/graphite-dashboard?panelId=1&from=1471008499616&to=1471012099617&width=1000&height=500", "AlertPageUrl": "http://localhost:3000/alerting", - "Events": []map[string]string{ + "EvalMatches": []map[string]string{ { "Metric": "desktop", "Value": "40", From 62372978e47467d943983ed940e22fd320ae97fd Mon Sep 17 00:00:00 2001 From: bergquist Date: Wed, 7 Sep 2016 13:51:17 +0200 Subject: [PATCH 038/175] style: convert tabs to spaces --- emails/templates/alert_notification.html | 168 +++++++++--------- .../templates/alert_notification_example.html | 115 ------------ 2 files changed, 84 insertions(+), 199 deletions(-) delete mode 100644 emails/templates/alert_notification_example.html diff --git a/emails/templates/alert_notification.html b/emails/templates/alert_notification.html index e66eefa6b07..2c9f78ce6fb 100644 --- a/emails/templates/alert_notification.html +++ b/emails/templates/alert_notification.html @@ -1,106 +1,106 @@ [[Subject .Subject "[[.Title]]"]]
Name Type {{notification.type}} + + + default + edit From 2ca7284a56476602f2b3843168370a7cf90fe924 Mon Sep 17 00:00:00 2001 From: bergquist Date: Tue, 6 Sep 2016 08:42:35 +0200 Subject: [PATCH 019/175] tech(notifications): splitt into 3 queries closes #5883 --- pkg/api/alerting.go | 4 +- pkg/models/alert_notifications.go | 12 +++ pkg/services/alerting/notifier.go | 6 +- pkg/services/sqlstore/alert_notification.go | 77 +++++++++++++++---- .../sqlstore/alert_notification_test.go | 19 ++++- 5 files changed, 93 insertions(+), 25 deletions(-) diff --git a/pkg/api/alerting.go b/pkg/api/alerting.go index 83a370499c5..37d247a7c8f 100644 --- a/pkg/api/alerting.go +++ b/pkg/api/alerting.go @@ -147,7 +147,7 @@ func DelAlert(c *middleware.Context) Response { } func GetAlertNotifications(c *middleware.Context) Response { - query := &models.GetAlertNotificationsQuery{OrgId: c.OrgId} + query := &models.GetAllAlertNotificationsQuery{OrgId: c.OrgId} if err := bus.Dispatch(query); err != nil { return ApiError(500, "Failed to get alert notifications", err) @@ -179,7 +179,7 @@ func GetAlertNotificationById(c *middleware.Context) Response { return ApiError(500, "Failed to get alert notifications", err) } - return Json(200, query.Result[0]) + return Json(200, query.Result) } func CreateAlertNotification(c *middleware.Context, cmd models.CreateAlertNotificationCommand) Response { diff --git a/pkg/models/alert_notifications.go b/pkg/models/alert_notifications.go index 1e586b4974e..87b515f370c 100644 --- a/pkg/models/alert_notifications.go +++ b/pkg/models/alert_notifications.go @@ -46,8 +46,20 @@ type DeleteAlertNotificationCommand struct { type GetAlertNotificationsQuery struct { Name string Id int64 + OrgId int64 + + Result *AlertNotification +} + +type GetAlertNotificationsToSendQuery struct { Ids []int64 OrgId int64 Result []*AlertNotification } + +type GetAllAlertNotificationsQuery struct { + OrgId int64 + + Result []*AlertNotification +} diff --git a/pkg/services/alerting/notifier.go b/pkg/services/alerting/notifier.go index b82d4dd3864..b4b5cd819ff 100644 --- a/pkg/services/alerting/notifier.go +++ b/pkg/services/alerting/notifier.go @@ -88,11 +88,7 @@ func (n *RootNotifier) uploadImage(context *EvalContext) error { } func (n *RootNotifier) getNotifiers(orgId int64, notificationIds []int64) ([]Notifier, error) { - query := &m.GetAlertNotificationsQuery{OrgId: orgId} - - if len(notificationIds) == 0 { - query.Ids = []int64{0} - } + query := &m.GetAlertNotificationsToSendQuery{OrgId: orgId, Ids: notificationIds} if err := bus.Dispatch(query); err != nil { return nil, err diff --git a/pkg/services/sqlstore/alert_notification.go b/pkg/services/sqlstore/alert_notification.go index d33e6d90151..5105ca39eff 100644 --- a/pkg/services/sqlstore/alert_notification.go +++ b/pkg/services/sqlstore/alert_notification.go @@ -16,6 +16,8 @@ func init() { bus.AddHandler("sql", CreateAlertNotificationCommand) bus.AddHandler("sql", UpdateAlertNotification) bus.AddHandler("sql", DeleteAlertNotification) + bus.AddHandler("sql", GetAlertNotificationsToSend) + bus.AddHandler("sql", GetAllAlertNotifications) } func DeleteAlertNotification(cmd *m.DeleteAlertNotificationCommand) error { @@ -32,10 +34,20 @@ func DeleteAlertNotification(cmd *m.DeleteAlertNotificationCommand) error { } func GetAlertNotifications(query *m.GetAlertNotificationsQuery) error { - return getAlertNotificationsInternal(query, x.NewSession()) + return getAlertNotificationInternal(query, x.NewSession()) } -func getAlertNotificationsInternal(query *m.GetAlertNotificationsQuery, sess *xorm.Session) error { +func GetAllAlertNotifications(query *m.GetAllAlertNotificationsQuery) error { + results := make([]*m.AlertNotification, 0) + if err := x.Where("org_id = ?", query.OrgId).Find(&results); err != nil { + return err + } + + query.Result = results + return nil +} + +func GetAlertNotificationsToSend(query *m.GetAlertNotificationsToSendQuery) error { var sql bytes.Buffer params := make([]interface{}, 0) @@ -54,7 +66,44 @@ func getAlertNotificationsInternal(query *m.GetAlertNotificationsQuery, sess *xo sql.WriteString(` WHERE alert_notification.org_id = ?`) params = append(params, query.OrgId) - if query.Name != "" || query.Id != 0 || len(query.Ids) > 0 { + sql.WriteString(` AND ((alert_notification.is_default = 1)`) + if len(query.Ids) > 0 { + sql.WriteString(` OR alert_notification.id IN (?` + strings.Repeat(",?", len(query.Ids)-1) + ")") + for _, v := range query.Ids { + params = append(params, v) + } + } + sql.WriteString(`)`) + + results := make([]*m.AlertNotification, 0) + if err := x.Sql(sql.String(), params...).Find(&results); err != nil { + return err + } + + query.Result = results + return nil +} + +func getAlertNotificationInternal(query *m.GetAlertNotificationsQuery, sess *xorm.Session) error { + var sql bytes.Buffer + params := make([]interface{}, 0) + + sql.WriteString(`SELECT + alert_notification.id, + alert_notification.org_id, + alert_notification.name, + alert_notification.type, + alert_notification.created, + alert_notification.updated, + alert_notification.settings, + alert_notification.is_default + FROM alert_notification + `) + + sql.WriteString(` WHERE alert_notification.org_id = ?`) + params = append(params, query.OrgId) + + if query.Name != "" || query.Id != 0 { if query.Name != "" { sql.WriteString(` AND alert_notification.name = ?`) params = append(params, query.Name) @@ -64,13 +113,6 @@ func getAlertNotificationsInternal(query *m.GetAlertNotificationsQuery, sess *xo sql.WriteString(` AND alert_notification.id = ?`) params = append(params, query.Id) } - - if len(query.Ids) > 0 { - sql.WriteString(` AND ((alert_notification.is_default = 1) OR alert_notification.id IN (?` + strings.Repeat(",?", len(query.Ids)-1) + "))") - for _, v := range query.Ids { - params = append(params, v) - } - } } results := make([]*m.AlertNotification, 0) @@ -78,20 +120,25 @@ func getAlertNotificationsInternal(query *m.GetAlertNotificationsQuery, sess *xo return err } - query.Result = results + if len(results) == 0 { + query.Result = nil + } else { + query.Result = results[0] + } + return nil } func CreateAlertNotificationCommand(cmd *m.CreateAlertNotificationCommand) error { return inTransaction(func(sess *xorm.Session) error { existingQuery := &m.GetAlertNotificationsQuery{OrgId: cmd.OrgId, Name: cmd.Name} - err := getAlertNotificationsInternal(existingQuery, sess) + err := getAlertNotificationInternal(existingQuery, sess) if err != nil { return err } - if len(existingQuery.Result) > 0 { + if existingQuery.Result != nil { return fmt.Errorf("Alert notification name %s already exists", cmd.Name) } @@ -124,11 +171,11 @@ func UpdateAlertNotification(cmd *m.UpdateAlertNotificationCommand) error { // check if name exists sameNameQuery := &m.GetAlertNotificationsQuery{OrgId: cmd.OrgId, Name: cmd.Name} - if err := getAlertNotificationsInternal(sameNameQuery, sess); err != nil { + if err := getAlertNotificationInternal(sameNameQuery, sess); err != nil { return err } - if len(sameNameQuery.Result) > 0 && sameNameQuery.Result[0].Id != current.Id { + if sameNameQuery.Result != nil && sameNameQuery.Result.Id != current.Id { return fmt.Errorf("Alert notification name %s already exists", cmd.Name) } diff --git a/pkg/services/sqlstore/alert_notification_test.go b/pkg/services/sqlstore/alert_notification_test.go index f9ecf0e5234..d37062fb58f 100644 --- a/pkg/services/sqlstore/alert_notification_test.go +++ b/pkg/services/sqlstore/alert_notification_test.go @@ -23,7 +23,7 @@ func TestAlertNotificationSQLAccess(t *testing.T) { err := GetAlertNotifications(cmd) fmt.Printf("errror %v", err) So(err, ShouldBeNil) - So(len(cmd.Result), ShouldEqual, 0) + So(cmd.Result, ShouldBeNil) }) Convey("Can save Alert Notification", func() { @@ -65,21 +65,34 @@ func TestAlertNotificationSQLAccess(t *testing.T) { cmd3 := m.CreateAlertNotificationCommand{Name: "ops2", Type: "email", OrgId: 1, Settings: simplejson.New()} cmd4 := m.CreateAlertNotificationCommand{IsDefault: true, Name: "default", Type: "email", OrgId: 1, Settings: simplejson.New()} + otherOrg := m.CreateAlertNotificationCommand{Name: "default", Type: "email", OrgId: 2, Settings: simplejson.New()} + So(CreateAlertNotificationCommand(&cmd1), ShouldBeNil) So(CreateAlertNotificationCommand(&cmd2), ShouldBeNil) So(CreateAlertNotificationCommand(&cmd3), ShouldBeNil) So(CreateAlertNotificationCommand(&cmd4), ShouldBeNil) + So(CreateAlertNotificationCommand(&otherOrg), ShouldBeNil) Convey("search", func() { - query := &m.GetAlertNotificationsQuery{ + query := &m.GetAlertNotificationsToSendQuery{ Ids: []int64{cmd1.Result.Id, cmd2.Result.Id, 112341231}, OrgId: 1, } - err := GetAlertNotifications(query) + err := GetAlertNotificationsToSend(query) So(err, ShouldBeNil) So(len(query.Result), ShouldEqual, 3) }) + + Convey("all", func() { + query := &m.GetAllAlertNotificationsQuery{ + OrgId: 1, + } + + err := GetAllAlertNotifications(query) + So(err, ShouldBeNil) + So(len(query.Result), ShouldEqual, 4) + }) }) }) } From 6b17cdbca64c4417154430d0ca1dc4bde7338a50 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Torkel=20=C3=96degaard?= Date: Tue, 6 Sep 2016 09:14:11 +0200 Subject: [PATCH 020/175] feat(alerting): Save As removes alerts from panels, closes #5965 --- .../app/features/alerting/alert_tab_ctrl.ts | 38 +++++++++++-------- .../features/alerting/partials/alert_tab.html | 1 - .../features/dashboard/saveDashboardAsCtrl.js | 8 ++++ 3 files changed, 31 insertions(+), 16 deletions(-) diff --git a/public/app/features/alerting/alert_tab_ctrl.ts b/public/app/features/alerting/alert_tab_ctrl.ts index c5ed6187f35..d10265a3ab7 100644 --- a/public/app/features/alerting/alert_tab_ctrl.ts +++ b/public/app/features/alerting/alert_tab_ctrl.ts @@ -74,18 +74,20 @@ export class AlertTabCtrl { this.alertNotifications.push(model); } }); - }).then(() => { - this.backendSrv.get(`/api/alert-history?dashboardId=${this.panelCtrl.dashboard.id}&panelId=${this.panel.id}`).then(res => { - this.alertHistory = _.map(res, ah => { - ah.time = moment(ah.timestamp).format('MMM D, YYYY HH:mm:ss'); - ah.stateModel = alertDef.getStateDisplayModel(ah.newState); + }); + } - ah.metrics = _.map(ah.data, ev=> { - return ev.Metric + "=" + ev.Value; - }).join(', '); + getAlertHistory() { + this.backendSrv.get(`/api/alert-history?dashboardId=${this.panelCtrl.dashboard.id}&panelId=${this.panel.id}`).then(res => { + this.alertHistory = _.map(res, ah => { + ah.time = moment(ah.timestamp).format('MMM D, YYYY HH:mm:ss'); + ah.stateModel = alertDef.getStateDisplayModel(ah.newState); - return ah; - }); + ah.metrics = _.map(ah.data, ev=> { + return ev.Metric + "=" + ev.Value; + }).join(', '); + + return ah; }); }); } @@ -125,7 +127,11 @@ export class AlertTabCtrl { } initModel() { - var alert = this.alert = this.panel.alert = this.panel.alert || {}; + var alert = this.alert = this.panel.alert = this.panel.alert || {enabled: false}; + + if (!this.alert.enabled) { + return; + } alert.conditions = alert.conditions || []; if (alert.conditions.length === 0) { @@ -145,11 +151,9 @@ export class AlertTabCtrl { return memo; }, []); - if (this.alert.enabled) { - this.panelCtrl.editingThresholds = true; - } - ThresholdMapper.alertToGraphThresholds(this.panel); + + this.panelCtrl.editingThresholds = true; this.panelCtrl.render(); } @@ -173,6 +177,10 @@ export class AlertTabCtrl { } validateModel() { + if (!this.alert.enabled) { + return; + } + let firstTarget; var fixed = false; let foundTarget = null; diff --git a/public/app/features/alerting/partials/alert_tab.html b/public/app/features/alerting/partials/alert_tab.html index e755496b732..85919ef8a63 100644 --- a/public/app/features/alerting/partials/alert_tab.html +++ b/public/app/features/alerting/partials/alert_tab.html @@ -65,7 +65,6 @@ -
+ From 22805ce56bd2bc89bb23a05d83c925771e46b2b3 Mon Sep 17 00:00:00 2001 From: bergquist Date: Tue, 6 Sep 2016 14:42:34 +0200 Subject: [PATCH 023/175] fix(alert_tab): fix broken alert history --- public/app/features/alerting/alert_tab_ctrl.ts | 7 +++++++ public/app/features/alerting/partials/alert_tab.html | 6 +++--- 2 files changed, 10 insertions(+), 3 deletions(-) diff --git a/public/app/features/alerting/alert_tab_ctrl.ts b/public/app/features/alerting/alert_tab_ctrl.ts index d10265a3ab7..c0cb0936f62 100644 --- a/public/app/features/alerting/alert_tab_ctrl.ts +++ b/public/app/features/alerting/alert_tab_ctrl.ts @@ -106,6 +106,13 @@ export class AlertTabCtrl { })); } + changeTabIndex(newTabIndex) { + this.subTabIndex = newTabIndex; + + if (this.subTabIndex === 2) { + this.getAlertHistory(); + } + } notificationAdded() { var model = _.findWhere(this.notifications, {name: this.addNotificationSegment.value}); diff --git a/public/app/features/alerting/partials/alert_tab.html b/public/app/features/alerting/partials/alert_tab.html index 85919ef8a63..db2fa978869 100644 --- a/public/app/features/alerting/partials/alert_tab.html +++ b/public/app/features/alerting/partials/alert_tab.html @@ -2,15 +2,15 @@
Metric name
 -
Value
+ 		+
Value
[[.Metric]]
 -
[[.Value]]
+ 		+
[[.Value]]
- - - + + +
- - - - -
-

[[.Title]]

-
-
+ + + + +
+

[[.Title]]

+
+
- - - + + +
- - - - -
-

[[.Message]]

-
-
+ + + + +
+

[[.Message]]

+
+
[[if ne .State "ok" ]] - - - + + +
-
- - - - - - [[range .EvalMatches]] - - - - - [[end]] -
-
Metric name
- 		-
Value
-
-
[[.Metric]]
- 		-
[[.Value]]
-
-
-
+
+ + + + + + [[range .EvalMatches]] + + + + + [[end]] +
+
Metric name
+ 		+
Value
+
+
[[.Metric]]
+ 		+
[[.Value]]
+
+
+
[[end]] - - + +
- - - - -
- -
-
+ + + + +
+ +
+
- - - + + +
- - - - - -
- - - - -
- View your Alert rule -
- 		- - - - -
- Go to the Alerts page -
-
-
+ + + + + +
+ + + + +
+ View your Alert rule +
+ 		+ + + + +
+ Go to the Alerts page +
+
+
diff --git a/emails/templates/alert_notification_example.html b/emails/templates/alert_notification_example.html deleted file mode 100644 index 5061b8579ac..00000000000 --- a/emails/templates/alert_notification_example.html +++ /dev/null @@ -1,115 +0,0 @@ - - - - -
- - - - -
-

[CRITICAL] Imaginary timeserie alert

-
-
- - - - - -
- - - - -
-

Alert message that will support markdown in some distant future.

-
-
- - - - - - -
-
- - - - - - - - - - - - - - - - - -
- Metric name - - Value -
- desktop - - 40 -
- mobile - - 20 -
-
-
- - - - - - -
- - - - -
- -
-
- - - - - - -
- - - - - -
- - - - -
- View your Alert rule -
- 		- - - - -
- Go to the Alerts page -
-
-
- - - \ No newline at end of file From f56d45ac56ed568e6f3f8edee4468a18e68668a0 Mon Sep 17 00:00:00 2001 From: bergquist Date: Wed, 7 Sep 2016 15:13:24 +0200 Subject: [PATCH 039/175] feat(alerting): include default notifications in alert tab --- public/app/features/alerting/alert_tab_ctrl.ts | 8 ++++++++ public/app/features/alerting/partials/alert_tab.html | 6 +++--- 2 files changed, 11 insertions(+), 3 deletions(-) diff --git a/public/app/features/alerting/alert_tab_ctrl.ts b/public/app/features/alerting/alert_tab_ctrl.ts index f3cc998deaa..b372520507d 100644 --- a/public/app/features/alerting/alert_tab_ctrl.ts +++ b/public/app/features/alerting/alert_tab_ctrl.ts @@ -76,6 +76,14 @@ export class AlertTabCtrl { this.alertNotifications.push(model); } }); + + _.each(this.notifications, item => { + if (item.isDefault) { + item.iconClass = this.getNotificationIcon(item.type); + item.bgColor = "#00678b"; + this.alertNotifications.push(item); + } + }); }); } diff --git a/public/app/features/alerting/partials/alert_tab.html b/public/app/features/alerting/partials/alert_tab.html index 770e3a2cb05..fbbcf810ee6 100644 --- a/public/app/features/alerting/partials/alert_tab.html +++ b/public/app/features/alerting/partials/alert_tab.html @@ -6,7 +6,7 @@
  • - Notifications ({{ctrl.alert.notifications.length}}) + Notifications ({{ctrl.alertNotifications.length}})
  • @@ -122,9 +122,9 @@
    Send to - +  {{nc.name}}  - +
    From 30f36fe2c48bae294f3287651fe7745a17d983ac Mon Sep 17 00:00:00 2001 From: bergquist Date: Wed, 7 Sep 2016 15:24:38 +0200 Subject: [PATCH 040/175] docs(changelog): add note about merging #4718 --- CHANGELOG.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 487a97cf3b4..055aa9316fe 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -10,6 +10,7 @@ * **Database**: Allow database config using one propertie, closes [#5456](https://github.com/grafana/grafana/pull/5456) * **Graphite**: Add support for groupByNode, closes [#5613](https://github.com/grafana/grafana/pull/5613) * **Influxdb**: Add support for elapsed(), closes [#5827](https://github.com/grafana/grafana/pull/5827) +* **OAuth**: Add support for generic oauth, closes [#4718](https://github.com/grafana/grafana/pull/4718) ### Breaking changes * **SystemD**: Change systemd description, closes [#5971](https://github.com/grafana/grafana/pull/5971) From 592ae5a39a23ace67233699c458d9650bd840459 Mon Sep 17 00:00:00 2001 From: bergquist Date: Wed, 7 Sep 2016 17:05:41 +0200 Subject: [PATCH 041/175] tests(alerting): fixes broken tests. pointers and stuff :shrug: --- .../alerting/conditions/evaluator_test.go | 15 ++++++++---- .../alerting/conditions/query_test.go | 8 +++++-- pkg/services/alerting/conditions/reducer.go | 1 + .../alerting/conditions/reducer_test.go | 23 ++++++++----------- pkg/services/alerting/rule_test.go | 9 ++++---- 5 files changed, 32 insertions(+), 24 deletions(-) diff --git a/pkg/services/alerting/conditions/evaluator_test.go b/pkg/services/alerting/conditions/evaluator_test.go index 585dca2b878..d2919f37d9d 100644 --- a/pkg/services/alerting/conditions/evaluator_test.go +++ b/pkg/services/alerting/conditions/evaluator_test.go @@ -14,7 +14,7 @@ func evalutorScenario(json string, reducedValue float64, datapoints ...float64) evaluator, err := NewAlertEvaluator(jsonModel) So(err, ShouldBeNil) - return evaluator.Eval(reducedValue) + return evaluator.Eval(&reducedValue) } func TestEvalutors(t *testing.T) { @@ -42,8 +42,15 @@ func TestEvalutors(t *testing.T) { So(evalutorScenario(`{"type": "outside_range", "params": [100, 1] }`, 50), ShouldBeFalse) }) - Convey("no_value", t, func() { - So(evalutorScenario(`{"type": "no_value", "params": [] }`, 1000), ShouldBeTrue) - So(evalutorScenario(`{"type": "no_value", "params": [] }`, 1000, 1, 2), ShouldBeFalse) + Convey("no_data", t, func() { + So(evalutorScenario(`{"type": "no_data", "params": [] }`, 50), ShouldBeFalse) + + jsonModel, err := simplejson.NewJson([]byte(`{"type": "no_data", "params": [] }`)) + So(err, ShouldBeNil) + + evaluator, err := NewAlertEvaluator(jsonModel) + So(err, ShouldBeNil) + + So(evaluator.Eval(nil), ShouldBeTrue) }) } diff --git a/pkg/services/alerting/conditions/query_test.go b/pkg/services/alerting/conditions/query_test.go index 07cc6871801..88891c83096 100644 --- a/pkg/services/alerting/conditions/query_test.go +++ b/pkg/services/alerting/conditions/query_test.go @@ -41,7 +41,9 @@ func TestQueryCondition(t *testing.T) { }) Convey("should fire when avg is above 100", func() { - ctx.series = tsdb.TimeSeriesSlice{tsdb.NewTimeSeries("test1", [][2]float64{{120, 0}})} + one := float64(120) + two := float64(0) + ctx.series = tsdb.TimeSeriesSlice{tsdb.NewTimeSeries("test1", [][2]*float64{{&one, &two}})} ctx.exec() So(ctx.result.Error, ShouldBeNil) @@ -49,7 +51,9 @@ func TestQueryCondition(t *testing.T) { }) Convey("Should not fire when avg is below 100", func() { - ctx.series = tsdb.TimeSeriesSlice{tsdb.NewTimeSeries("test1", [][2]float64{{90, 0}})} + one := float64(90) + two := float64(0) + ctx.series = tsdb.TimeSeriesSlice{tsdb.NewTimeSeries("test1", [][2]*float64{{&one, &two}})} ctx.exec() So(ctx.result.Error, ShouldBeNil) diff --git a/pkg/services/alerting/conditions/reducer.go b/pkg/services/alerting/conditions/reducer.go index 50a36b716d2..2bb4cec00be 100644 --- a/pkg/services/alerting/conditions/reducer.go +++ b/pkg/services/alerting/conditions/reducer.go @@ -60,6 +60,7 @@ func (s *SimpleReducer) Reduce(series *tsdb.TimeSeries) *float64 { } case "count": value = float64(len(series.Points)) + allNull = false } if allNull { diff --git a/pkg/services/alerting/conditions/reducer_test.go b/pkg/services/alerting/conditions/reducer_test.go index af242bbd668..f60154bc98d 100644 --- a/pkg/services/alerting/conditions/reducer_test.go +++ b/pkg/services/alerting/conditions/reducer_test.go @@ -10,44 +10,39 @@ import ( func TestSimpleReducer(t *testing.T) { Convey("Test simple reducer by calculating", t, func() { Convey("avg", func() { - result := testReducer("avg", 1, 2, 3) + result := *testReducer("avg", 1, 2, 3) So(result, ShouldEqual, float64(2)) }) Convey("sum", func() { - result := testReducer("sum", 1, 2, 3) + result := *testReducer("sum", 1, 2, 3) So(result, ShouldEqual, float64(6)) }) Convey("min", func() { - result := testReducer("min", 3, 2, 1) + result := *testReducer("min", 3, 2, 1) So(result, ShouldEqual, float64(1)) }) Convey("max", func() { - result := testReducer("max", 1, 2, 3) + result := *testReducer("max", 1, 2, 3) So(result, ShouldEqual, float64(3)) }) - Convey("mean odd numbers", func() { - result := testReducer("mean", 1, 2, 3000) - So(result, ShouldEqual, float64(2)) - }) - Convey("count", func() { - result := testReducer("count", 1, 2, 3000) + result := *testReducer("count", 1, 2, 3000) So(result, ShouldEqual, float64(3)) }) }) } -func testReducer(typ string, datapoints ...float64) float64 { +func testReducer(typ string, datapoints ...float64) *float64 { reducer := NewSimpleReducer(typ) - var timeserie [][2]float64 + var timeserie [][2]*float64 dummieTimestamp := float64(521452145) - for _, v := range datapoints { - timeserie = append(timeserie, [2]float64{v, dummieTimestamp}) + for idx := range datapoints { + timeserie = append(timeserie, [2]*float64{&datapoints[idx], &dummieTimestamp}) } tsdb := &tsdb.TimeSeries{ diff --git a/pkg/services/alerting/rule_test.go b/pkg/services/alerting/rule_test.go index 2d0677b2d70..622904ec3fc 100644 --- a/pkg/services/alerting/rule_test.go +++ b/pkg/services/alerting/rule_test.go @@ -81,10 +81,11 @@ func TestAlertRuleModel(t *testing.T) { Convey("Can read notifications", func() { So(len(alertRule.Notifications), ShouldEqual, 2) }) - - Convey("Can read noDataMode", func() { - So(len(alertRule.NoDataMode), ShouldEqual, m.AlertStateCritical) - }) + /* + Convey("Can read noDataMode", func() { + So(len(alertRule.NoDataMode), ShouldEqual, m.AlertStateCritical) + }) + */ }) }) } From 21c5b543fb058d0d30737ffa098fe7ddec19049e Mon Sep 17 00:00:00 2001 From: bergquist Date: Thu, 8 Sep 2016 09:03:29 +0200 Subject: [PATCH 042/175] feat(profile): hide orgs list when it only contains one org --- public/app/features/org/partials/profile.html | 4 ++-- public/app/features/org/profile_ctrl.ts | 4 +++- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/public/app/features/org/partials/profile.html b/public/app/features/org/partials/profile.html index 02fa2878a17..c51c3750ee5 100644 --- a/public/app/features/org/partials/profile.html +++ b/public/app/features/org/partials/profile.html @@ -33,8 +33,8 @@ Change Password
    -

    Organizations

    -
    +

    Organizations

    +
    diff --git a/public/app/features/org/profile_ctrl.ts b/public/app/features/org/profile_ctrl.ts index 65bff1f6c12..a97799f1e85 100644 --- a/public/app/features/org/profile_ctrl.ts +++ b/public/app/features/org/profile_ctrl.ts @@ -7,8 +7,9 @@ import _ from 'lodash'; export class ProfileCtrl { user: any; old_theme: any; - orgs: any; + orgs: any = []; userForm: any; + showOrgsList: boolean = false; /** @ngInject **/ constructor(private backendSrv, private contextSrv, private $location) { @@ -26,6 +27,7 @@ export class ProfileCtrl { getUserOrgs() { this.backendSrv.get('/api/user/orgs').then(orgs => { this.orgs = orgs; + this.showOrgsList = orgs.length > 1; }); } From 5f934e023877a2b055768639ca3120a8477e3a4a Mon Sep 17 00:00:00 2001 From: bergquist Date: Thu, 8 Sep 2016 09:59:51 +0200 Subject: [PATCH 043/175] feat(emails): move bg color to main table --- emails/templates/layouts/default.html | 6 +- public/emails/alert_notification.html | 254 +++++++++++++------------- public/emails/invited_to_org.html | 118 ++++++------ public/emails/new_user_invite.html | 122 ++++++------- public/emails/reset_password.html | 112 ++++++------ public/emails/signup_started.html | 116 ++++++------ public/emails/welcome_on_signup.html | 118 ++++++------ 7 files changed, 405 insertions(+), 441 deletions(-) diff --git a/emails/templates/layouts/default.html b/emails/templates/layouts/default.html index d19364dec75..f6d729054cd 100644 --- a/emails/templates/layouts/default.html +++ b/emails/templates/layouts/default.html @@ -90,12 +90,12 @@ td[class="stack-column-center"] { } } - -
    + +
    - +
    diff --git a/public/emails/alert_notification.html b/public/emails/alert_notification.html index 8106592fb8d..e91ab6450fe 100644 --- a/public/emails/alert_notification.html +++ b/public/emails/alert_notification.html @@ -5,7 +5,7 @@ - - - - -
    -
    - - - -
    -
    - - -
    + + +
    +
    - - -
    - + + +
    +
    + + + +
    + + + + - +
    +
    @@ -206,115 +200,115 @@ text-decoration: underline;
    - - - +
    + + - - +
    +
    {{Subject .Subject "{{.Title}}"}} - - - - +
    - - - - -
    -

    {{.Title}}

    -
    -
    + + +
    + + + + +
    +

    {{.Title}}

    +
    +
    - - - - +
    - - - - -
    -

    {{.Message}}

    -
    -
    + + +
    + + + + +
    +

    {{.Message}}

    +
    +
    {{if ne .State "ok" }} - - - - +
    -
    - - - - - - {{range .EvalMatches}} - - - - - {{end}} -
    -
    Metric name
    -     		-
    Value
    -
    -
    {{.Metric}}
    -     		-
    {{.Value}}
    -
    -
    -
    + + +
    +
    + + + + + + {{range .EvalMatches}} + + + + + {{end}} +
    +
    Metric name
    +     		+
    Value
    +
    +
    {{.Metric}}
    +     		+
    {{.Value}}
    +
    +
    +
    {{end}} - - - - +
    - - - - -
    - -
    -
    + + +
    + + + + +
    + +
    +
    - - - - +
    - - - - - -
    - - - - -
    - View your Alert rule -
    -     		- - - - -
    - Go to the Alerts page -
    -
    -
    + + +
    + + + + + +
    + + + + +
    + View your Alert rule +
    +     		+ + + + +
    + Go to the Alerts page +
    +
    +
    @@ -324,20 +318,20 @@ text-decoration: underline;
    - - -
    - - -
    -
    -

    - Sent by Grafana v{{.BuildVersion}} + + + diff --git a/public/emails/invited_to_org.html b/public/emails/invited_to_org.html index edb69e13428..284728663c4 100644 --- a/public/emails/invited_to_org.html +++ b/public/emails/invited_to_org.html @@ -5,7 +5,7 @@ - - -
    + + + - +
    +
    +

    + Sent by Grafana v{{.BuildVersion}}
    © 2016 Grafana and raintank

    - -
    -
    - - - -
    -
    - - -
    + + +
    +
    - - -
    - + + +
    +
    + + + +
    + + + + - +
    +
    @@ -206,26 +200,26 @@ text-decoration: underline;
    - - - +
    + + - - +
    +
    {{Subject .Subject "{{.InvitedBy}} has added you to the {{.OrgName}} organization"}} - - -
    + + +
    - - -
    -

    You have been added to {{.OrgName}}

    + + + - +
    +

    You have been added to {{.OrgName}}
    @@ -233,22 +227,22 @@ text-decoration: underline;
    - - -
    - - -
    -

    {{.InvitedBy}} has added you to the {{.OrgName}} organization in Grafana. -

    Once logged in, {{.OrgName}} will be available in the left side menu, in the dropdown below your username.

    + + +
    + + + - + - -
    +

    {{.InvitedBy}} has added you to the {{.OrgName}} organization in Grafana. +

    Once logged in, {{.OrgName}} will be available in the left side menu, in the dropdown below your username.
    - - - + + @@ -265,20 +259,20 @@ text-decoration: underline;
    Log in now
    + + +
    Log in now
    - - -
    - - -
    -
    -

    - Sent by Grafana v{{.BuildVersion}} + + + diff --git a/public/emails/new_user_invite.html b/public/emails/new_user_invite.html index 43d57748f68..7fb015138b9 100644 --- a/public/emails/new_user_invite.html +++ b/public/emails/new_user_invite.html @@ -5,7 +5,7 @@ - - -
    + + + - +
    +
    +

    + Sent by Grafana v{{.BuildVersion}}
    © 2016 Grafana and raintank

    - -
    -
    - - - -
    -
    - - -
    + + +
    +
    - - -
    - + + +
    +
    + + + +
    + + + + - +
    +
    @@ -206,26 +200,26 @@ text-decoration: underline;
    - - - +
    + + - - +
    +
    {{Subject .Subject "{{.InvitedBy}} has invited you to join Grafana"}} - - -
    + + +
    - - -
    -

    You're invited to join {{.OrgName}}

    + + + - +
    +

    You're invited to join {{.OrgName}}
    @@ -233,29 +227,29 @@ text-decoration: underline;
    - - -
    - - -
    -

    You've been invited to join the {{.OrgName}} organization by {{.InvitedBy}}. To accept your invitation and join the team, please click the link below:

    + + +
    + + + - - @@ -266,20 +260,20 @@ text-decoration: underline;
    +

    You've been invited to join the {{.OrgName}} organization by {{.InvitedBy}}. To accept your invitation and join the team, please click the link below:
    - - - + + - - + - +
    Accept Invitation
    + + +
    Accept Invitation
    -

    You can also copy/paste this link into your browser directly: {{.LinkUrl}}

    +
    +

    You can also copy/paste this link into your browser directly: {{.LinkUrl}}
    - - -
    - - -
    -
    -

    - Sent by Grafana v{{.BuildVersion}} + + + diff --git a/public/emails/reset_password.html b/public/emails/reset_password.html index cdc62902c30..7290195b074 100644 --- a/public/emails/reset_password.html +++ b/public/emails/reset_password.html @@ -5,7 +5,7 @@ - - -
    + + + - +
    +
    +

    + Sent by Grafana v{{.BuildVersion}}
    © 2016 Grafana and raintank

    - -
    -
    - - - -
    -
    - - -
    + + +
    +
    - - -
    - + + +
    +
    + + + +
    + + + + - +
    +
    @@ -206,24 +200,24 @@ text-decoration: underline;
    - - - +
    + + - - +
    +
    {{Subject .Subject "Reset your Grafana password - {{.Name}}"}} - - -
    + + +
    - - -
    -

    Hi {{.Name}},

    + + + - +
    +

    Hi {{.Name}},
    @@ -231,21 +225,21 @@ text-decoration: underline;
    - - -
    - - -
    -

    + + +
    + + + - +
    +

    Please click the following link to reset your password within {{.EmailCodeValidHours}} hours.

    -

    - {{.AppUrl}}user/password/reset?code={{.Code}} +

    + {{.AppUrl}}user/password/reset?code={{.Code}}

    -

    Not working? Try copying and pasting it to your browser.

    +

    Not working? Try copying and pasting it to your browser.
    @@ -260,20 +254,20 @@ text-decoration: underline;
    - - -
    - - -
    -
    -

    - Sent by Grafana v{{.BuildVersion}} + + + diff --git a/public/emails/signup_started.html b/public/emails/signup_started.html index a22d439072f..1123576b461 100644 --- a/public/emails/signup_started.html +++ b/public/emails/signup_started.html @@ -5,7 +5,7 @@ - - -
    + + + - +
    +
    +

    + Sent by Grafana v{{.BuildVersion}}
    © 2016 Grafana and raintank

    - -
    -
    - - - -
    -
    - - -
    + + +
    +
    - - -
    - + + +
    +
    + + + +
    + + + + - +
    +
    @@ -206,24 +200,24 @@ text-decoration: underline;
    - - - +
    + + - - +
    +
    {{Subject .Subject "Welcome to Grafana, please complete your sign up!"}} - - -
    + + +
    - - -
    -

    Complete the signup

    + + + - +
    +

    Complete the signup
    @@ -231,23 +225,23 @@ text-decoration: underline;
    - - -
    - - -
    + + +
    + + + - + - -
    Copy and past the email verification code:
    - {{.Code}}
    in + {{.Code}}
    in the sign up form or use the link below.
    - - - + + @@ -264,20 +258,20 @@ text-decoration: underline;
    Complete Sign Up
    + + +
    Complete Sign Up
    - - -
    - - -
    -
    -

    - Sent by Grafana v{{.BuildVersion}} + + + diff --git a/public/emails/welcome_on_signup.html b/public/emails/welcome_on_signup.html index 606c804df0d..e37f23c4653 100644 --- a/public/emails/welcome_on_signup.html +++ b/public/emails/welcome_on_signup.html @@ -5,7 +5,7 @@ - - -
    + + + - +
    +
    +

    + Sent by Grafana v{{.BuildVersion}}
    © 2016 Grafana and raintank

    - -
    -
    - - - -
    -
    - - -
    + + +
    +
    - - -
    - + + +
    +
    + + + +
    + + + + - +
    +
    @@ -206,27 +200,27 @@ text-decoration: underline;
    - - - +
    + + - - +
    +
    {{Subject .Subject "Welcome to Grafana"}} - - -
    + + +
    - - -
    -

    Hi {{.Name}},

    + + + - + - - + @@ -236,23 +230,23 @@ text-decoration: underline;
    +

    Hi {{.Name}},
    +
    Welcome! Ready to start building some beautiful metric and analytic dashboards?
    - - -
    - - -
    -

    - If you are new to Grafana please read the Getting Started guide. + + +
    + + + - + - - +
    +

    + If you are new to Grafana please read the Getting Started guide.

    +
    Thank you for joining our community.
    -

    The Grafana Team

    +

    The Grafana Team
    @@ -267,20 +261,20 @@ text-decoration: underline;
    - - -
    - - -
    -
    -

    - Sent by Grafana v{{.BuildVersion}} + + + From acf74cdacc0ba59ae5e989ae44d3dda7b26c63e3 Mon Sep 17 00:00:00 2001 From: bergquist Date: Thu, 8 Sep 2016 10:45:10 +0200 Subject: [PATCH 044/175] fix(alerting): change execution time to ms --- pkg/services/alerting/eval_handler.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkg/services/alerting/eval_handler.go b/pkg/services/alerting/eval_handler.go index 2818f5ae8a2..9f47252968b 100644 --- a/pkg/services/alerting/eval_handler.go +++ b/pkg/services/alerting/eval_handler.go @@ -78,7 +78,7 @@ func (e *DefaultEvalHandler) eval(context *EvalContext) { } context.EndTime = time.Now() - elapsedTime := context.EndTime.Sub(context.StartTime) + elapsedTime := context.EndTime.Sub(context.StartTime) / time.Millisecond metrics.M_Alerting_Exeuction_Time.Update(elapsedTime) context.DoneChan <- true } From 3c9432b7e9f05aeb0bc95efff4aa56ea5bc024fd Mon Sep 17 00:00:00 2001 From: bergquist Date: Thu, 8 Sep 2016 10:48:11 +0200 Subject: [PATCH 045/175] fix(metrics): default updateSince to ms --- pkg/metrics/timer.go | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkg/metrics/timer.go b/pkg/metrics/timer.go index a22d61c408e..61c3bf9533d 100644 --- a/pkg/metrics/timer.go +++ b/pkg/metrics/timer.go @@ -222,7 +222,8 @@ func (t *StandardTimer) Update(d time.Duration) { func (t *StandardTimer) UpdateSince(ts time.Time) { t.mutex.Lock() defer t.mutex.Unlock() - t.histogram.Update(int64(time.Since(ts))) + sinceMs := time.Since(ts) / time.Millisecond + t.histogram.Update(int64(sinceMs)) t.meter.Mark(1) } From d60bd77658a477c4b3daf84b22e9e8d231e90212 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Torkel=20=C3=96degaard?= Date: Thu, 8 Sep 2016 11:25:45 +0200 Subject: [PATCH 046/175] feat(annotations): added support to show grafana stored annotations in graphs, #5982 --- pkg/api/alerting.go | 37 --------- pkg/api/annotations.go | 42 ++++++++++ pkg/api/api.go | 4 +- pkg/api/dtos/alerting.go | 11 --- pkg/api/dtos/annotations.go | 15 ++++ pkg/api/frontendsettings.go | 1 + pkg/services/alerting/eval_context.go | 1 - pkg/services/alerting/result_handler.go | 2 +- pkg/services/annotations/annotations.go | 30 ++++--- pkg/services/sqlstore/annotation.go | 5 +- .../sqlstore/migrations/annotation_mig.go | 15 ++-- .../app/core/directives/plugin_component.ts | 8 +- .../app/features/alerting/alert_tab_ctrl.ts | 2 +- .../features/alerting/partials/alert_tab.html | 4 +- .../app/features/annotations/editor_ctrl.js | 76 ----------------- .../app/features/annotations/editor_ctrl.ts | 82 +++++++++++++++++++ .../features/annotations/partials/editor.html | 40 ++++----- .../plugins/datasource/grafana/datasource.ts | 15 ++++ .../app/plugins/datasource/grafana/module.ts | 13 +++ .../grafana/partials/annotations.editor.html | 20 +++++ .../plugins/datasource/grafana/plugin.json | 1 + 21 files changed, 246 insertions(+), 178 deletions(-) create mode 100644 pkg/api/annotations.go create mode 100644 pkg/api/dtos/annotations.go delete mode 100644 public/app/features/annotations/editor_ctrl.js create mode 100644 public/app/features/annotations/editor_ctrl.ts create mode 100644 public/app/plugins/datasource/grafana/partials/annotations.editor.html diff --git a/pkg/api/alerting.go b/pkg/api/alerting.go index 37d247a7c8f..bd40d8d63e9 100644 --- a/pkg/api/alerting.go +++ b/pkg/api/alerting.go @@ -8,7 +8,6 @@ import ( "github.com/grafana/grafana/pkg/middleware" "github.com/grafana/grafana/pkg/models" "github.com/grafana/grafana/pkg/services/alerting" - "github.com/grafana/grafana/pkg/services/annotations" ) func ValidateOrgAlert(c *middleware.Context) { @@ -231,42 +230,6 @@ func NotificationTest(c *middleware.Context, dto dtos.NotificationTestCommand) R return ApiSuccess("Test notification sent") } -func GetAlertHistory(c *middleware.Context) Response { - alertId, err := getAlertIdForRequest(c) - if err != nil { - return ApiError(400, "Invalid request", err) - } - - query := &annotations.ItemQuery{ - AlertId: alertId, - Type: annotations.AlertType, - OrgId: c.OrgId, - Limit: c.QueryInt64("limit"), - } - - repo := annotations.GetRepository() - - items, err := repo.Find(query) - if err != nil { - return ApiError(500, "Failed to get history for alert", err) - } - - var result []dtos.AlertHistory - for _, item := range items { - result = append(result, dtos.AlertHistory{ - AlertId: item.AlertId, - Timestamp: item.Timestamp, - Data: item.Data, - NewState: item.NewState, - Text: item.Text, - Metric: item.Metric, - Title: item.Title, - }) - } - - return Json(200, result) -} - func getAlertIdForRequest(c *middleware.Context) (int64, error) { alertId := c.QueryInt64("alertId") panelId := c.QueryInt64("panelId") diff --git a/pkg/api/annotations.go b/pkg/api/annotations.go new file mode 100644 index 00000000000..4e43a7ea21e --- /dev/null +++ b/pkg/api/annotations.go @@ -0,0 +1,42 @@ +package api + +import ( + "github.com/grafana/grafana/pkg/api/dtos" + "github.com/grafana/grafana/pkg/middleware" + "github.com/grafana/grafana/pkg/services/annotations" +) + +func GetAnnotations(c *middleware.Context) Response { + + query := &annotations.ItemQuery{ + From: c.QueryInt64("from") / 1000, + To: c.QueryInt64("to") / 1000, + Type: annotations.ItemType(c.Query("type")), + OrgId: c.OrgId, + Limit: c.QueryInt64("limit"), + } + + repo := annotations.GetRepository() + + items, err := repo.Find(query) + if err != nil { + return ApiError(500, "Failed to get annotations", err) + } + + result := make([]dtos.Annotation, 0) + + for _, item := range items { + result = append(result, dtos.Annotation{ + AlertId: item.AlertId, + Time: item.Epoch * 1000, + Data: item.Data, + NewState: item.NewState, + PrevState: item.PrevState, + Text: item.Text, + Metric: item.Metric, + Title: item.Title, + }) + } + + return Json(200, result) +} diff --git a/pkg/api/api.go b/pkg/api/api.go index de3a1de8a65..71331acda9f 100644 --- a/pkg/api/api.go +++ b/pkg/api/api.go @@ -254,8 +254,6 @@ func Register(r *macaron.Macaron) { r.Get("/", wrap(GetAlerts)) }) - r.Get("/alert-history", wrap(GetAlertHistory)) - r.Get("/alert-notifications", wrap(GetAlertNotifications)) r.Group("/alert-notifications", func() { @@ -266,6 +264,8 @@ func Register(r *macaron.Macaron) { r.Delete("/:notificationId", wrap(DeleteAlertNotification)) }, reqOrgAdmin) + r.Get("/annotations", wrap(GetAnnotations)) + // error test r.Get("/metrics/error", wrap(GenerateError)) diff --git a/pkg/api/dtos/alerting.go b/pkg/api/dtos/alerting.go index 83b21757d32..2b91cf0cb5b 100644 --- a/pkg/api/dtos/alerting.go +++ b/pkg/api/dtos/alerting.go @@ -54,17 +54,6 @@ type EvalMatch struct { Value float64 `json:"value"` } -type AlertHistory struct { - AlertId int64 `json:"alertId"` - NewState string `json:"newState"` - Timestamp time.Time `json:"timestamp"` - Title string `json:"title"` - Text string `json:"text"` - Metric string `json:"metric"` - - Data *simplejson.Json `json:"data"` -} - type NotificationTestCommand struct { Name string `json:"name"` Type string `json:"type"` diff --git a/pkg/api/dtos/annotations.go b/pkg/api/dtos/annotations.go new file mode 100644 index 00000000000..2068b6186d2 --- /dev/null +++ b/pkg/api/dtos/annotations.go @@ -0,0 +1,15 @@ +package dtos + +import "github.com/grafana/grafana/pkg/components/simplejson" + +type Annotation struct { + AlertId int64 `json:"alertId"` + NewState string `json:"newState"` + PrevState string `json:"prevState"` + Time int64 `json:"time"` + Title string `json:"title"` + Text string `json:"text"` + Metric string `json:"metric"` + + Data *simplejson.Json `json:"data"` +} diff --git a/pkg/api/frontendsettings.go b/pkg/api/frontendsettings.go index 5a84409d2c1..3a019e80c49 100644 --- a/pkg/api/frontendsettings.go +++ b/pkg/api/frontendsettings.go @@ -105,6 +105,7 @@ func getFrontendSettingsMap(c *middleware.Context) (map[string]interface{}, erro grafanaDatasourceMeta, _ := plugins.DataSources["grafana"] datasources["-- Grafana --"] = map[string]interface{}{ "type": "grafana", + "name": "-- Grafana --", "meta": grafanaDatasourceMeta, } diff --git a/pkg/services/alerting/eval_context.go b/pkg/services/alerting/eval_context.go index d1ac851daf1..f54a4e212be 100644 --- a/pkg/services/alerting/eval_context.go +++ b/pkg/services/alerting/eval_context.go @@ -66,7 +66,6 @@ func (c *EvalContext) GetStateModel() *StateDescription { default: panic("Unknown rule state " + c.Rule.State) } - } func (a *EvalContext) GetDurationMs() float64 { diff --git a/pkg/services/alerting/result_handler.go b/pkg/services/alerting/result_handler.go index 7932aead4aa..6239a1e58d7 100644 --- a/pkg/services/alerting/result_handler.go +++ b/pkg/services/alerting/result_handler.go @@ -73,7 +73,7 @@ func (handler *DefaultResultHandler) Handle(ctx *EvalContext) { Text: ctx.GetStateModel().Text, NewState: string(ctx.Rule.State), PrevState: string(oldState), - Timestamp: time.Now(), + Epoch: time.Now().Unix(), Data: annotationData, } diff --git a/pkg/services/annotations/annotations.go b/pkg/services/annotations/annotations.go index 06be152ec31..e9ef899eca9 100644 --- a/pkg/services/annotations/annotations.go +++ b/pkg/services/annotations/annotations.go @@ -1,10 +1,6 @@ package annotations -import ( - "time" - - "github.com/grafana/grafana/pkg/components/simplejson" -) +import "github.com/grafana/grafana/pkg/components/simplejson" type Repository interface { Save(item *Item) error @@ -13,6 +9,8 @@ type Repository interface { type ItemQuery struct { OrgId int64 `json:"orgId"` + From int64 `json:"from"` + To int64 `json:"from"` Type ItemType `json:"type"` AlertId int64 `json:"alertId"` @@ -36,17 +34,17 @@ const ( ) type Item struct { - Id int64 `json:"id"` - OrgId int64 `json:"orgId"` - Type ItemType `json:"type"` - Title string `json:"title"` - Text string `json:"text"` - Metric string `json:"metric"` - AlertId int64 `json:"alertId"` - UserId int64 `json:"userId"` - PrevState string `json:"prevState"` - NewState string `json:"newState"` - Timestamp time.Time `json:"timestamp"` + Id int64 `json:"id"` + OrgId int64 `json:"orgId"` + Type ItemType `json:"type"` + Title string `json:"title"` + Text string `json:"text"` + Metric string `json:"metric"` + AlertId int64 `json:"alertId"` + UserId int64 `json:"userId"` + PrevState string `json:"prevState"` + NewState string `json:"newState"` + Epoch int64 `json:"epoch"` Data *simplejson.Json `json:"data"` } diff --git a/pkg/services/sqlstore/annotation.go b/pkg/services/sqlstore/annotation.go index 5cf4461b370..e5a5443c3bf 100644 --- a/pkg/services/sqlstore/annotation.go +++ b/pkg/services/sqlstore/annotation.go @@ -38,6 +38,9 @@ func (r *SqlAnnotationRepo) Find(query *annotations.ItemQuery) ([]*annotations.I params = append(params, query.AlertId) } + sql.WriteString(` AND epoch BETWEEN ? AND ?`) + params = append(params, query.From, query.To) + if query.Type != "" { sql.WriteString(` AND type = ?`) params = append(params, string(query.Type)) @@ -47,7 +50,7 @@ func (r *SqlAnnotationRepo) Find(query *annotations.ItemQuery) ([]*annotations.I query.Limit = 10 } - sql.WriteString(fmt.Sprintf("ORDER BY timestamp DESC LIMIT %v", query.Limit)) + sql.WriteString(fmt.Sprintf("ORDER BY epoch DESC LIMIT %v", query.Limit)) items := make([]*annotations.Item, 0) if err := x.Sql(sql.String(), params...).Find(&items); err != nil { diff --git a/pkg/services/sqlstore/migrations/annotation_mig.go b/pkg/services/sqlstore/migrations/annotation_mig.go index 11b4eeed629..ddb622894ac 100644 --- a/pkg/services/sqlstore/migrations/annotation_mig.go +++ b/pkg/services/sqlstore/migrations/annotation_mig.go @@ -5,6 +5,7 @@ import ( ) func addAnnotationMig(mg *Migrator) { + table := Table{ Name: "annotation", Columns: []*Column{ @@ -19,20 +20,22 @@ func addAnnotationMig(mg *Migrator) { {Name: "prev_state", Type: DB_NVarchar, Length: 25, Nullable: false}, {Name: "new_state", Type: DB_NVarchar, Length: 25, Nullable: false}, {Name: "data", Type: DB_Text, Nullable: false}, - {Name: "timestamp", Type: DB_DateTime, Nullable: false}, + {Name: "epoch", Type: DB_BigInt, Nullable: false}, }, Indices: []*Index{ {Cols: []string{"org_id", "alert_id"}, Type: IndexType}, {Cols: []string{"org_id", "type"}, Type: IndexType}, - {Cols: []string{"timestamp"}, Type: IndexType}, + {Cols: []string{"epoch"}, Type: IndexType}, }, } - mg.AddMigration("create annotation table v1", NewAddTableMigration(table)) + mg.AddMigration("Drop old annotation table v2", NewDropTableMigration("annotation")) + + mg.AddMigration("create annotation table v3", NewAddTableMigration(table)) // create indices - mg.AddMigration("add index annotation org_id & alert_id ", NewAddIndexMigration(table, table.Indices[0])) + mg.AddMigration("add index annotation org_id & alert_id v2", NewAddIndexMigration(table, table.Indices[0])) - mg.AddMigration("add index annotation org_id & type", NewAddIndexMigration(table, table.Indices[1])) - mg.AddMigration("add index annotation timestamp", NewAddIndexMigration(table, table.Indices[2])) + mg.AddMigration("add index annotation org_id & type v2", NewAddIndexMigration(table, table.Indices[1])) + mg.AddMigration("add index annotation epoch", NewAddIndexMigration(table, table.Indices[2])) } diff --git a/public/app/core/directives/plugin_component.ts b/public/app/core/directives/plugin_component.ts index dbe9932d574..60685fae74e 100644 --- a/public/app/core/directives/plugin_component.ts +++ b/public/app/core/directives/plugin_component.ts @@ -136,12 +136,12 @@ function pluginDirectiveLoader($compile, datasourceSrv, $rootScope, $q, $http, $ } // Annotations case "annotations-query-ctrl": { - return System.import(scope.currentDatasource.meta.module).then(function(dsModule) { + return System.import(scope.ctrl.currentDatasource.meta.module).then(function(dsModule) { return { - baseUrl: scope.currentDatasource.meta.baseUrl, - name: 'annotations-query-ctrl-' + scope.currentDatasource.meta.id, + baseUrl: scope.ctrl.currentDatasource.meta.baseUrl, + name: 'annotations-query-ctrl-' + scope.ctrl.currentDatasource.meta.id, bindings: {annotation: "=", datasource: "="}, - attrs: {"annotation": "currentAnnotation", datasource: "currentDatasource"}, + attrs: {"annotation": "ctrl.currentAnnotation", datasource: "ctrl.currentDatasource"}, Component: dsModule.AnnotationsQueryCtrl, }; }); diff --git a/public/app/features/alerting/alert_tab_ctrl.ts b/public/app/features/alerting/alert_tab_ctrl.ts index f3cc998deaa..d19904eea0d 100644 --- a/public/app/features/alerting/alert_tab_ctrl.ts +++ b/public/app/features/alerting/alert_tab_ctrl.ts @@ -80,7 +80,7 @@ export class AlertTabCtrl { } getAlertHistory() { - this.backendSrv.get(`/api/alert-history?dashboardId=${this.panelCtrl.dashboard.id}&panelId=${this.panel.id}`).then(res => { + this.backendSrv.get(`/api/alert-history?dashboardId=${this.panelCtrl.dashboard.id}&panelId=${this.panel.id}&limit=50`).then(res => { this.alertHistory = _.map(res, ah => { ah.time = moment(ah.timestamp).format('MMM D, YYYY HH:mm:ss'); ah.stateModel = alertDef.getStateDisplayModel(ah.newState); diff --git a/public/app/features/alerting/partials/alert_tab.html b/public/app/features/alerting/partials/alert_tab.html index 770e3a2cb05..c5517990934 100644 --- a/public/app/features/alerting/partials/alert_tab.html +++ b/public/app/features/alerting/partials/alert_tab.html @@ -10,7 +10,7 @@
  • - Alert History + State history
  • Delete @@ -136,7 +136,7 @@
    -
    Alert history
    +
    State history (last 50 state changes)
    1. diff --git a/public/app/features/annotations/editor_ctrl.js b/public/app/features/annotations/editor_ctrl.js deleted file mode 100644 index c37592cc905..00000000000 --- a/public/app/features/annotations/editor_ctrl.js +++ /dev/null @@ -1,76 +0,0 @@ -define([ - 'angular', - 'lodash', - 'jquery' -], -function (angular, _, $) { - 'use strict'; - - var module = angular.module('grafana.controllers'); - - module.controller('AnnotationsEditorCtrl', function($scope, datasourceSrv) { - var annotationDefaults = { - name: '', - datasource: null, - iconColor: 'rgba(255, 96, 96, 1)', - enable: true - }; - - $scope.init = function() { - $scope.mode = 'list'; - $scope.datasources = datasourceSrv.getAnnotationSources(); - $scope.annotations = $scope.dashboard.annotations.list; - $scope.reset(); - - $scope.$watch('mode', function(newVal) { - if (newVal === 'new') { $scope.reset(); } - }); - }; - - $scope.datasourceChanged = function() { - return datasourceSrv.get($scope.currentAnnotation.datasource).then(function(ds) { - $scope.currentDatasource = ds; - $scope.currentAnnotation.datasource = $scope.currentAnnotation.datasource; - }); - }; - - $scope.edit = function(annotation) { - $scope.currentAnnotation = annotation; - $scope.currentIsNew = false; - $scope.datasourceChanged(); - $scope.mode = 'edit'; - - $(".tooltip.in").remove(); - }; - - $scope.reset = function() { - $scope.currentAnnotation = angular.copy(annotationDefaults); - $scope.currentAnnotation.datasource = $scope.datasources[0].name; - $scope.currentIsNew = true; - $scope.datasourceChanged(); - }; - - $scope.update = function() { - $scope.reset(); - $scope.mode = 'list'; - $scope.broadcastRefresh(); - }; - - $scope.add = function() { - $scope.annotations.push($scope.currentAnnotation); - $scope.reset(); - $scope.mode = 'list'; - $scope.updateSubmenuVisibility(); - $scope.broadcastRefresh(); - }; - - $scope.removeAnnotation = function(annotation) { - var index = _.indexOf($scope.annotations, annotation); - $scope.annotations.splice(index, 1); - $scope.updateSubmenuVisibility(); - $scope.broadcastRefresh(); - }; - - }); - -}); diff --git a/public/app/features/annotations/editor_ctrl.ts b/public/app/features/annotations/editor_ctrl.ts new file mode 100644 index 00000000000..6d4837def48 --- /dev/null +++ b/public/app/features/annotations/editor_ctrl.ts @@ -0,0 +1,82 @@ +/// + +import angular from 'angular'; +import _ from 'lodash'; +import config from 'app/core/config'; +import $ from 'jquery'; +import coreModule from 'app/core/core_module'; + +export class AnnotationsEditorCtrl { + mode: any; + datasources: any; + annotations: any; + currentAnnotation: any; + currentDatasource: any; + currentIsNew: any; + + annotationDefaults: any = { + name: '', + datasource: null, + iconColor: 'rgba(255, 96, 96, 1)', + enable: true + }; + + constructor(private $scope, private datasourceSrv) { + $scope.ctrl = this; + + this.mode = 'list'; + this.datasources = datasourceSrv.getAnnotationSources(); + this.annotations = $scope.dashboard.annotations.list; + this.reset(); + + $scope.$watch('mode', newVal => { + if (newVal === 'new') { + this.reset(); + } + }); + } + + datasourceChanged() { + return this.datasourceSrv.get(this.currentAnnotation.datasource).then(ds => { + this.currentDatasource = ds; + }); + } + + edit(annotation) { + this.currentAnnotation = annotation; + this.currentIsNew = false; + this.datasourceChanged(); + this.mode = 'edit'; + $(".tooltip.in").remove(); + } + + reset() { + this.currentAnnotation = angular.copy(this.annotationDefaults); + this.currentAnnotation.datasource = this.datasources[0].name; + this.currentIsNew = true; + this.datasourceChanged(); + } + + update() { + this.reset(); + this.mode = 'list'; + this.$scope.broadcastRefresh(); + }; + + add() { + this.annotations.push(this.currentAnnotation); + this.reset(); + this.mode = 'list'; + this.$scope.updateSubmenuVisibility(); + this.$scope.broadcastRefresh(); + }; + + removeAnnotation(annotation) { + var index = _.indexOf(this.annotations, annotation); + this.annotations.splice(index, 1); + this.$scope.updateSubmenuVisibility(); + this.$scope.broadcastRefresh(); + } +} + +coreModule.controller('AnnotationsEditorCtrl', AnnotationsEditorCtrl); diff --git a/public/app/features/annotations/partials/editor.html b/public/app/features/annotations/partials/editor.html index 702d8921bef..f42e5a3a7ae 100644 --- a/public/app/features/annotations/partials/editor.html +++ b/public/app/features/annotations/partials/editor.html @@ -1,4 +1,4 @@ -
      +

      Annotations @@ -6,16 +6,16 @@ @@ -26,18 +26,18 @@

      -
      -
      +
      +
      No annotations defined
    • + + + - +
    +
    +

    + Sent by Grafana v{{.BuildVersion}}
    © 2016 Grafana and raintank

    - + - - + + @@ -54,43 +54,43 @@
      {{annotation.name}} @@ -46,7 +46,7 @@ - +
    -

    +
    -   New +   New
    -
    +
    Name - +
    Datasource
    - +
    - +
    - +
    - - + +
    diff --git a/public/app/plugins/datasource/grafana/datasource.ts b/public/app/plugins/datasource/grafana/datasource.ts index b2914155107..bdd6ba014a2 100644 --- a/public/app/plugins/datasource/grafana/datasource.ts +++ b/public/app/plugins/datasource/grafana/datasource.ts @@ -12,6 +12,21 @@ class GrafanaDatasource { maxDataPoints: options.maxDataPoints }); } + + annotationQuery(options) { + return this.backendSrv.get('/api/annotations', { + from: options.range.from.valueOf(), + to: options.range.to.valueOf(), + limit: options.limit, + type: options.type, + }).then(data => { + return data.map(item => { + item.annotation = options.annotation; + return item; + }); + }); + } + } export {GrafanaDatasource}; diff --git a/public/app/plugins/datasource/grafana/module.ts b/public/app/plugins/datasource/grafana/module.ts index be560940032..615a0b2d175 100644 --- a/public/app/plugins/datasource/grafana/module.ts +++ b/public/app/plugins/datasource/grafana/module.ts @@ -8,9 +8,22 @@ class GrafanaQueryCtrl extends QueryCtrl { static templateUrl = 'partials/query.editor.html'; } +class GrafanaAnnotationsQueryCtrl { + annotation: any; + + constructor() { + this.annotation.type = this.annotation.type || 'alert'; + this.annotation.limit = this.annotation.limit || 100; + } + + static templateUrl = 'partials/annotations.editor.html'; +} + + export { GrafanaDatasource, GrafanaDatasource as Datasource, GrafanaQueryCtrl as QueryCtrl, + GrafanaAnnotationsQueryCtrl as AnnotationsQueryCtrl, }; diff --git a/public/app/plugins/datasource/grafana/partials/annotations.editor.html b/public/app/plugins/datasource/grafana/partials/annotations.editor.html new file mode 100644 index 00000000000..54e21ac902e --- /dev/null +++ b/public/app/plugins/datasource/grafana/partials/annotations.editor.html @@ -0,0 +1,20 @@ + +
    +
    Filters
    +
    +
    + Type +
    + +
    +
    +
    + Max limit +
    + +
    +
    +
    +
    diff --git a/public/app/plugins/datasource/grafana/plugin.json b/public/app/plugins/datasource/grafana/plugin.json index fdccb24b59d..906ef0e9bf1 100644 --- a/public/app/plugins/datasource/grafana/plugin.json +++ b/public/app/plugins/datasource/grafana/plugin.json @@ -4,5 +4,6 @@ "id": "grafana", "builtIn": true, + "annotations": true, "metrics": true } From bec099cd8413f592eff0b2bfc3fb495738ba0688 Mon Sep 17 00:00:00 2001 From: bergquist Date: Thu, 8 Sep 2016 11:41:56 +0200 Subject: [PATCH 047/175] tech: remove unused files --- pkg/models/alert_state.go | 47 ---------------------- pkg/services/alerting/conditions/common.go | 1 - 2 files changed, 48 deletions(-) delete mode 100644 pkg/models/alert_state.go delete mode 100644 pkg/services/alerting/conditions/common.go diff --git a/pkg/models/alert_state.go b/pkg/models/alert_state.go deleted file mode 100644 index 5071efc2171..00000000000 --- a/pkg/models/alert_state.go +++ /dev/null @@ -1,47 +0,0 @@ -package models - -// type AlertState struct { -// Id int64 `json:"-"` -// OrgId int64 `json:"-"` -// AlertId int64 `json:"alertId"` -// State string `json:"state"` -// Created time.Time `json:"created"` -// Info string `json:"info"` -// TriggeredAlerts *simplejson.Json `json:"triggeredAlerts"` -// } -// -// func (this *UpdateAlertStateCommand) IsValidState() bool { -// for _, v := range alertstates.ValidStates { -// if this.State == v { -// return true -// } -// } -// return false -// } -// -// // Commands -// -// type UpdateAlertStateCommand struct { -// AlertId int64 `json:"alertId" binding:"Required"` -// OrgId int64 `json:"orgId" binding:"Required"` -// State string `json:"state" binding:"Required"` -// Info string `json:"info"` -// -// Result *Alert -// } -// -// // Queries -// -// type GetAlertsStateQuery struct { -// OrgId int64 `json:"orgId" binding:"Required"` -// AlertId int64 `json:"alertId" binding:"Required"` -// -// Result *[]AlertState -// } -// -// type GetLastAlertStateQuery struct { -// AlertId int64 -// OrgId int64 -// -// Result *AlertState -// } diff --git a/pkg/services/alerting/conditions/common.go b/pkg/services/alerting/conditions/common.go deleted file mode 100644 index 06702fd1e08..00000000000 --- a/pkg/services/alerting/conditions/common.go +++ /dev/null @@ -1 +0,0 @@ -package conditions From 23de094a8180770375cb9d5fa53394b7e537de75 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Torkel=20=C3=96degaard?= Date: Thu, 8 Sep 2016 13:22:30 +0200 Subject: [PATCH 048/175] feat(alerting/annotations): fixed broken test --- pkg/metrics/graphite_test.go | 3 ++- pkg/setting/setting.go | 11 ++++++----- 2 files changed, 8 insertions(+), 6 deletions(-) diff --git a/pkg/metrics/graphite_test.go b/pkg/metrics/graphite_test.go index 2f866ddd7b6..ff2bf530d5e 100644 --- a/pkg/metrics/graphite_test.go +++ b/pkg/metrics/graphite_test.go @@ -10,6 +10,8 @@ import ( func TestGraphitePublisher(t *testing.T) { + setting.CustomInitPath = "conf/does_not_exist.ini" + Convey("Test graphite prefix replacement", t, func() { var err error err = setting.NewConfigContext(&setting.CommandLineArgs{ @@ -67,7 +69,6 @@ func TestGraphitePublisher(t *testing.T) { _, err = setting.Cfg.NewSection("metrics.graphite") - setting.InstanceName = "hostname.with.dots.com" publisher, err := CreateGraphitePublisher() So(err, ShouldBeNil) diff --git a/pkg/setting/setting.go b/pkg/setting/setting.go index fd010c42ca2..33b026713a1 100644 --- a/pkg/setting/setting.go +++ b/pkg/setting/setting.go @@ -47,10 +47,11 @@ var ( BuildStamp int64 // Paths - LogsPath string - HomePath string - DataPath string - PluginsPath string + LogsPath string + HomePath string + DataPath string + PluginsPath string + CustomInitPath = "conf/custom.ini" // Log settings. LogModes []string @@ -312,7 +313,7 @@ func evalConfigValues() { func loadSpecifedConfigFile(configFile string) error { if configFile == "" { - configFile = filepath.Join(HomePath, "conf/custom.ini") + configFile = filepath.Join(HomePath, CustomInitPath) // return without error if custom file does not exist if !pathExists(configFile) { return nil From 9511f89a22c5cbffd3220f5351ff957c979b92c5 Mon Sep 17 00:00:00 2001 From: bergquist Date: Thu, 8 Sep 2016 13:28:41 +0200 Subject: [PATCH 049/175] fix(alerting): fixes bug in query conditions --- pkg/services/alerting/conditions/query.go | 4 ++-- pkg/services/alerting/conditions/query_test.go | 13 +++++++++++++ 2 files changed, 15 insertions(+), 2 deletions(-) diff --git a/pkg/services/alerting/conditions/query.go b/pkg/services/alerting/conditions/query.go index ef51e09685c..b8a8e4d0fda 100644 --- a/pkg/services/alerting/conditions/query.go +++ b/pkg/services/alerting/conditions/query.go @@ -55,13 +55,13 @@ func (c *QueryCondition) Eval(context *alerting.EvalContext) { }) } - context.Firing = evalMatch - // handle no data scenario if reducedValue == nil { context.NoDataFound = true } } + + context.Firing = len(context.EvalMatches) > 0 } func (c *QueryCondition) executeQuery(context *alerting.EvalContext) (tsdb.TimeSeriesSlice, error) { diff --git a/pkg/services/alerting/conditions/query_test.go b/pkg/services/alerting/conditions/query_test.go index 88891c83096..f0772583e9a 100644 --- a/pkg/services/alerting/conditions/query_test.go +++ b/pkg/services/alerting/conditions/query_test.go @@ -59,6 +59,19 @@ func TestQueryCondition(t *testing.T) { So(ctx.result.Error, ShouldBeNil) So(ctx.result.Firing, ShouldBeFalse) }) + + Convey("Should fire if only first serie matches", func() { + one := float64(120) + two := float64(0) + ctx.series = tsdb.TimeSeriesSlice{ + tsdb.NewTimeSeries("test1", [][2]*float64{{&one, &two}}), + tsdb.NewTimeSeries("test2", [][2]*float64{{&two, &two}}), + } + ctx.exec() + + So(ctx.result.Error, ShouldBeNil) + So(ctx.result.Firing, ShouldBeTrue) + }) }) }) } From 0ac4ece00d10754687467dc3aa77a88dfe045dc7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Torkel=20=C3=96degaard?= Date: Thu, 8 Sep 2016 14:31:30 +0200 Subject: [PATCH 050/175] feat(annotations): refactoring annotations srv to typescript, #5990 --- .../features/annotations/annotations_srv.js | 98 ------------------- .../features/annotations/annotations_srv.ts | 91 +++++++++++++++++ .../app/features/annotations/editor_ctrl.ts | 2 +- public/app/plugins/panel/graph/graph.js | 11 ++- 4 files changed, 98 insertions(+), 104 deletions(-) delete mode 100644 public/app/features/annotations/annotations_srv.js create mode 100644 public/app/features/annotations/annotations_srv.ts diff --git a/public/app/features/annotations/annotations_srv.js b/public/app/features/annotations/annotations_srv.js deleted file mode 100644 index 8f84a6ba905..00000000000 --- a/public/app/features/annotations/annotations_srv.js +++ /dev/null @@ -1,98 +0,0 @@ -define([ - 'angular', - 'lodash', - './editor_ctrl', -], function (angular, _) { - 'use strict'; - - var module = angular.module('grafana.services'); - - module.service('annotationsSrv', function($rootScope, $q, datasourceSrv, alertSrv, timeSrv) { - var promiseCached; - var list = []; - var self = this; - - this.init = function() { - $rootScope.onAppEvent('refresh', this.clearCache, $rootScope); - $rootScope.onAppEvent('dashboard-initialized', this.clearCache, $rootScope); - }; - - this.clearCache = function() { - promiseCached = null; - list = []; - }; - - this.getAnnotations = function(dashboard) { - if (dashboard.annotations.list.length === 0) { - return $q.when(null); - } - - if (promiseCached) { - return promiseCached; - } - - self.dashboard = dashboard; - var annotations = _.where(dashboard.annotations.list, {enable: true}); - - var range = timeSrv.timeRange(); - var rangeRaw = timeSrv.timeRange(false); - - var promises = _.map(annotations, function(annotation) { - if (annotation.snapshotData) { - self.receiveAnnotationResults(annotation.snapshotData); - return; - } - return datasourceSrv.get(annotation.datasource).then(function(datasource) { - var query = {range: range, rangeRaw: rangeRaw, annotation: annotation}; - return datasource.annotationQuery(query) - .then(self.receiveAnnotationResults) - .then(function(results) { - if (dashboard.snapshot) { - annotation.snapshotData = angular.copy(results); - } - }) - .then(null, errorHandler); - }, this); - }); - - promiseCached = $q.all(promises).then(function() { - return list; - }).catch(function(err) { - $rootScope.appEvent('alert-error', ['Annotations failed', (err.message || err)]); - }); - - return promiseCached; - }; - - this.receiveAnnotationResults = function(results) { - for (var i = 0; i < results.length; i++) { - self.addAnnotation(results[i]); - } - - return results; - }; - - this.addAnnotation = function(options) { - list.push({ - annotation: options.annotation, - min: options.time, - max: options.time, - eventType: options.annotation.name, - title: options.title, - tags: options.tags, - text: options.text, - score: 1 - }); - }; - - function errorHandler(err) { - console.log('Annotation error: ', err); - var message = err.message || "Annotation query failed"; - alertSrv.set('Annotations error', message,'error'); - } - - // Now init - this.init(); - }); - -}); diff --git a/public/app/features/annotations/annotations_srv.ts b/public/app/features/annotations/annotations_srv.ts new file mode 100644 index 00000000000..9eaeccfa54c --- /dev/null +++ b/public/app/features/annotations/annotations_srv.ts @@ -0,0 +1,91 @@ +/// + +import './editor_ctrl'; + +import angular from 'angular'; +import _ from 'lodash'; +import $ from 'jquery'; +import coreModule from 'app/core/core_module'; + +export class AnnotationsSrv { + globalAnnotationsPromise: any; + + /** @ngInject */ + constructor(private $rootScope, + private $q, + private datasourceSrv, + private timeSrv) { + $rootScope.onAppEvent('refresh', this.clearCache.bind(this), $rootScope); + $rootScope.onAppEvent('dashboard-initialized', this.clearCache.bind(this), $rootScope); + } + + clearCache() { + this.globalAnnotationsPromise = null; + } + + getAnnotations(dashboard) { + if (dashboard.annotations.list.length === 0) { + return this.$q.when(null); + } + + if (this.globalAnnotationsPromise) { + return this.globalAnnotationsPromise; + } + + var annotations = _.where(dashboard.annotations.list, {enable: true}); + var range = this.timeSrv.timeRange(); + var rangeRaw = this.timeSrv.timeRange(false); + + this.globalAnnotationsPromise = this.$q.all(_.map(annotations, annotation => { + if (annotation.snapshotData) { + return this.translateQueryResult(annotation.snapshotData); + } + + return this.datasourceSrv.get(annotation.datasource).then(datasource => { + // issue query against data source + return datasource.annotationQuery({ + range: range, + rangeRaw: + rangeRaw, + annotation: annotation + }); + }) + .then(results => { + // store response in annotation object if this is a snapshot call + if (dashboard.snapshot) { + annotation.snapshotData = angular.copy(results); + } + // translate result + return this.translateQueryResult(results); + }); + })) + .then(allResults => { + return _.flatten(allResults); + }).catch(err => { + this.$rootScope.appEvent('alert-error', ['Annotations failed', (err.message || err)]); + }); + + return this.globalAnnotationsPromise; + } + + translateQueryResult(results) { + var translated = []; + + for (var item of results) { + translated.push({ + annotation: item.annotation, + min: item.time, + max: item.time, + eventType: item.annotation.name, + title: item.title, + tags: item.tags, + text: item.text, + score: 1 + }); + } + + return translated; + } +} + +coreModule.service('annotationsSrv', AnnotationsSrv); diff --git a/public/app/features/annotations/editor_ctrl.ts b/public/app/features/annotations/editor_ctrl.ts index 6d4837def48..3929d7d9a32 100644 --- a/public/app/features/annotations/editor_ctrl.ts +++ b/public/app/features/annotations/editor_ctrl.ts @@ -2,7 +2,6 @@ import angular from 'angular'; import _ from 'lodash'; -import config from 'app/core/config'; import $ from 'jquery'; import coreModule from 'app/core/core_module'; @@ -21,6 +20,7 @@ export class AnnotationsEditorCtrl { enable: true }; + /** @ngInject */ constructor(private $scope, private datasourceSrv) { $scope.ctrl = this; diff --git a/public/app/plugins/panel/graph/graph.js b/public/app/plugins/panel/graph/graph.js index 0978036ef9f..d7f2275e498 100755 --- a/public/app/plugins/panel/graph/graph.js +++ b/public/app/plugins/panel/graph/graph.js @@ -320,16 +320,17 @@ function (angular, $, moment, _, kbn, GraphTooltip, thresholdManExports) { } var types = {}; + for (var i = 0; i < annotations.length; i++) { + var item = annotations[i]; - _.each(annotations, function(event) { - if (!types[event.annotation.name]) { - types[event.annotation.name] = { - color: event.annotation.iconColor, + if (!types[item.annotation.name]) { + types[item.annotation.name] = { + color: item.annotation.iconColor, position: 'BOTTOM', markerSize: 5, }; } - }); + } options.events = { levels: _.keys(types).length + 1, From 7b9099ef9333fae3a2f40dd5b9609eec7ece6b6e Mon Sep 17 00:00:00 2001 From: bergquist Date: Thu, 8 Sep 2016 14:33:10 +0200 Subject: [PATCH 051/175] fix(query): requires all that all series are empty to set NoDataFound --- pkg/services/alerting/conditions/query.go | 4 ++- .../alerting/conditions/query_test.go | 26 +++++++++++++++++++ 2 files changed, 29 insertions(+), 1 deletion(-) diff --git a/pkg/services/alerting/conditions/query.go b/pkg/services/alerting/conditions/query.go index b8a8e4d0fda..dd39453ae42 100644 --- a/pkg/services/alerting/conditions/query.go +++ b/pkg/services/alerting/conditions/query.go @@ -38,6 +38,7 @@ func (c *QueryCondition) Eval(context *alerting.EvalContext) { return } + emptySerieCount := 0 for _, series := range seriesList { reducedValue := c.Reducer.Reduce(series) evalMatch := c.Evaluator.Eval(reducedValue) @@ -57,10 +58,11 @@ func (c *QueryCondition) Eval(context *alerting.EvalContext) { // handle no data scenario if reducedValue == nil { - context.NoDataFound = true + emptySerieCount++ } } + context.NoDataFound = emptySerieCount == len(seriesList) context.Firing = len(context.EvalMatches) > 0 } diff --git a/pkg/services/alerting/conditions/query_test.go b/pkg/services/alerting/conditions/query_test.go index f0772583e9a..f78ac17db2b 100644 --- a/pkg/services/alerting/conditions/query_test.go +++ b/pkg/services/alerting/conditions/query_test.go @@ -72,6 +72,32 @@ func TestQueryCondition(t *testing.T) { So(ctx.result.Error, ShouldBeNil) So(ctx.result.Firing, ShouldBeTrue) }) + + Convey("Empty series", func() { + Convey("Should set NoDataFound both series are empty", func() { + ctx.series = tsdb.TimeSeriesSlice{ + tsdb.NewTimeSeries("test1", [][2]*float64{}), + tsdb.NewTimeSeries("test2", [][2]*float64{}), + } + ctx.exec() + + So(ctx.result.Error, ShouldBeNil) + So(ctx.result.NoDataFound, ShouldBeTrue) + }) + + Convey("Should not set NoDataFound if one serie is empty", func() { + one := float64(120) + two := float64(0) + ctx.series = tsdb.TimeSeriesSlice{ + tsdb.NewTimeSeries("test1", [][2]*float64{}), + tsdb.NewTimeSeries("test2", [][2]*float64{{&one, &two}}), + } + ctx.exec() + + So(ctx.result.Error, ShouldBeNil) + So(ctx.result.NoDataFound, ShouldBeFalse) + }) + }) }) }) } From aa80b52c073530347003589a342648d355f2cf92 Mon Sep 17 00:00:00 2001 From: bergquist Date: Thu, 8 Sep 2016 16:29:31 +0200 Subject: [PATCH 052/175] feat(alerting): make it possible to skip ssl verification for alerting https requests --- conf/defaults.ini | 3 +++ conf/sample.ini | 3 +++ pkg/setting/setting.go | 4 +++- pkg/tsdb/graphite/graphite.go | 19 ++++++++++++++----- 4 files changed, 23 insertions(+), 6 deletions(-) diff --git a/conf/defaults.ini b/conf/defaults.ini index 53a034bfeaa..685699b19db 100644 --- a/conf/defaults.ini +++ b/conf/defaults.ini @@ -387,6 +387,9 @@ global_session = -1 [alerting] enabled = true +# Skip ssl validation for queries sent to the timeserie database. +skip_ssl_validation = false + #################################### Internal Grafana Metrics ########################## # Metrics available at HTTP API Url /api/metrics [metrics] diff --git a/conf/sample.ini b/conf/sample.ini index 2c428ea775f..d72e63db508 100644 --- a/conf/sample.ini +++ b/conf/sample.ini @@ -333,6 +333,9 @@ check_for_updates = true [alerting] ;enabled = false +# Skip ssl validation for queries sent to the timeserie database. +;skip_ssl_validation = false + #################################### Internal Grafana Metrics ########################## # Metrics available at HTTP API Url /api/metrics [metrics] diff --git a/pkg/setting/setting.go b/pkg/setting/setting.go index fd010c42ca2..376e1c1408a 100644 --- a/pkg/setting/setting.go +++ b/pkg/setting/setting.go @@ -141,7 +141,8 @@ var ( Quota QuotaSettings // Alerting - AlertingEnabled bool + AlertingEnabled bool + AlertingSkipSSLValidation bool // logger logger log.Logger @@ -546,6 +547,7 @@ func NewConfigContext(args *CommandLineArgs) error { alerting := Cfg.Section("alerting") AlertingEnabled = alerting.Key("enabled").MustBool(false) + AlertingSkipSSLValidation = alerting.Key("skip_ssl_validation").MustBool(false) readSessionConfig() readSmtpSettings() diff --git a/pkg/tsdb/graphite/graphite.go b/pkg/tsdb/graphite/graphite.go index 6e554dbe810..ec1e454e6e9 100644 --- a/pkg/tsdb/graphite/graphite.go +++ b/pkg/tsdb/graphite/graphite.go @@ -1,6 +1,7 @@ package graphite import ( + "crypto/tls" "encoding/json" "fmt" "io/ioutil" @@ -15,10 +16,6 @@ import ( "github.com/grafana/grafana/pkg/tsdb" ) -var ( - HttpClient = http.Client{Timeout: time.Duration(10 * time.Second)} -) - type GraphiteExecutor struct { *tsdb.DataSourceInfo } @@ -27,11 +24,23 @@ func NewGraphiteExecutor(dsInfo *tsdb.DataSourceInfo) tsdb.Executor { return &GraphiteExecutor{dsInfo} } -var glog log.Logger +var ( + glog log.Logger + HttpClient http.Client +) func init() { glog = log.New("tsdb.graphite") tsdb.RegisterExecutor("graphite", NewGraphiteExecutor) + + tr := &http.Transport{ + TLSClientConfig: &tls.Config{InsecureSkipVerify: setting.AlertingSkipSSLValidation}, + } + + HttpClient = http.Client{ + Timeout: time.Duration(10 * time.Second), + Transport: tr, + } } func (e *GraphiteExecutor) Execute(queries tsdb.QuerySlice, context *tsdb.QueryContext) *tsdb.BatchResult { From 9d09e5bbd05f49a10117532577c7c70712727cc1 Mon Sep 17 00:00:00 2001 From: Mitsuhiro Tanda Date: Fri, 9 Sep 2016 00:46:04 +0900 Subject: [PATCH 053/175] (prometheus) fix template variable expansion in legend --- public/app/plugins/datasource/prometheus/datasource.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/public/app/plugins/datasource/prometheus/datasource.ts b/public/app/plugins/datasource/prometheus/datasource.ts index a763b2f92ea..8f9fceeba3e 100644 --- a/public/app/plugins/datasource/prometheus/datasource.ts +++ b/public/app/plugins/datasource/prometheus/datasource.ts @@ -257,7 +257,7 @@ export function PrometheusDatasource(instanceSettings, $q, backendSrv, templateS return this.getOriginalMetricName(labelData); } - return this.renderTemplate(options.legendFormat, labelData) || '{}'; + return this.renderTemplate(templateSrv.replace(options.legendFormat), labelData) || '{}'; }; this.renderTemplate = function(aliasPattern, aliasData) { From 583790e6507f22ea45779b10ade1da06a8c85b6f Mon Sep 17 00:00:00 2001 From: bergquist Date: Fri, 9 Sep 2016 07:40:35 +0200 Subject: [PATCH 054/175] fix(alering): the crocdile turned on me > < closes #5855 --- pkg/services/alerting/eval_handler.go | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkg/services/alerting/eval_handler.go b/pkg/services/alerting/eval_handler.go index 9f47252968b..ab4c377197b 100644 --- a/pkg/services/alerting/eval_handler.go +++ b/pkg/services/alerting/eval_handler.go @@ -20,7 +20,7 @@ type DefaultEvalHandler struct { func NewEvalHandler() *DefaultEvalHandler { return &DefaultEvalHandler{ log: log.New("alerting.evalHandler"), - alertJobTimeout: time.Second * 5, + alertJobTimeout: time.Second * 10, } } @@ -29,9 +29,9 @@ func (e *DefaultEvalHandler) Eval(context *EvalContext) { select { case <-time.After(e.alertJobTimeout): - context.Error = fmt.Errorf("Timeout") + context.Error = fmt.Errorf("Execution timed out after %v", e.alertJobTimeout) context.EndTime = time.Now() - e.log.Debug("Job Execution timeout", "alertId", context.Rule.Id) + e.log.Debug("Job Execution timeout", "alertId", context.Rule.Id, "timeout setting", e.alertJobTimeout) e.retry(context) case <-context.DoneChan: e.log.Debug("Job Execution done", "timeMs", context.GetDurationMs(), "alertId", context.Rule.Id, "firing", context.Firing) @@ -45,10 +45,10 @@ func (e *DefaultEvalHandler) Eval(context *EvalContext) { func (e *DefaultEvalHandler) retry(context *EvalContext) { e.log.Debug("Retrying eval exeuction", "alertId", context.Rule.Id) - context.RetryCount++ - if context.RetryCount > MaxRetries { + if context.RetryCount < MaxRetries { context.DoneChan = make(chan bool, 1) context.CancelChan = make(chan bool, 1) + context.RetryCount++ e.Eval(context) } } From 4a2f2fba73fc049bec5b91b68aaf5d0b311c3722 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Torkel=20=C3=96degaard?= Date: Fri, 9 Sep 2016 11:30:55 +0200 Subject: [PATCH 055/175] feat(alerting): show panel specific alert annotations, #5694 --- pkg/api/annotations.go | 13 ++-- pkg/api/dtos/annotations.go | 16 ++-- pkg/services/alerting/result_handler.go | 20 ++--- pkg/services/annotations/annotations.go | 36 +++++---- pkg/services/sqlstore/annotation.go | 15 ++++ .../sqlstore/migrations/annotation_mig.go | 15 ++-- .../features/annotations/annotations_srv.ts | 78 +++++++++++-------- .../features/annotations/partials/editor.html | 2 +- public/app/features/dashboard/timeSrv.js | 24 +++--- .../dashboard/timepicker/timepicker.ts | 2 +- .../app/features/panel/metrics_panel_ctrl.ts | 6 +- .../plugins/datasource/grafana/datasource.ts | 5 -- public/app/plugins/panel/graph/graph.js | 6 +- public/app/plugins/panel/graph/module.ts | 18 +++-- public/test/specs/time_srv_specs.js | 14 ++-- 15 files changed, 156 insertions(+), 114 deletions(-) diff --git a/pkg/api/annotations.go b/pkg/api/annotations.go index 4e43a7ea21e..420486047c3 100644 --- a/pkg/api/annotations.go +++ b/pkg/api/annotations.go @@ -9,11 +9,14 @@ import ( func GetAnnotations(c *middleware.Context) Response { query := &annotations.ItemQuery{ - From: c.QueryInt64("from") / 1000, - To: c.QueryInt64("to") / 1000, - Type: annotations.ItemType(c.Query("type")), - OrgId: c.OrgId, - Limit: c.QueryInt64("limit"), + From: c.QueryInt64("from") / 1000, + To: c.QueryInt64("to") / 1000, + Type: annotations.ItemType(c.Query("type")), + OrgId: c.OrgId, + AlertId: c.QueryInt64("alertId"), + DashboardId: c.QueryInt64("dashboardId"), + PanelId: c.QueryInt64("panelId"), + Limit: c.QueryInt64("limit"), } repo := annotations.GetRepository() diff --git a/pkg/api/dtos/annotations.go b/pkg/api/dtos/annotations.go index 2068b6186d2..a5d5823e1a4 100644 --- a/pkg/api/dtos/annotations.go +++ b/pkg/api/dtos/annotations.go @@ -3,13 +3,15 @@ package dtos import "github.com/grafana/grafana/pkg/components/simplejson" type Annotation struct { - AlertId int64 `json:"alertId"` - NewState string `json:"newState"` - PrevState string `json:"prevState"` - Time int64 `json:"time"` - Title string `json:"title"` - Text string `json:"text"` - Metric string `json:"metric"` + AlertId int64 `json:"alertId"` + DashboardId int64 `json:"dashboardId"` + PanelId int64 `json:"panelId"` + NewState string `json:"newState"` + PrevState string `json:"prevState"` + Time int64 `json:"time"` + Title string `json:"title"` + Text string `json:"text"` + Metric string `json:"metric"` Data *simplejson.Json `json:"data"` } diff --git a/pkg/services/alerting/result_handler.go b/pkg/services/alerting/result_handler.go index 6239a1e58d7..822d2bf8513 100644 --- a/pkg/services/alerting/result_handler.go +++ b/pkg/services/alerting/result_handler.go @@ -66,15 +66,17 @@ func (handler *DefaultResultHandler) Handle(ctx *EvalContext) { // save annotation item := annotations.Item{ - OrgId: ctx.Rule.OrgId, - Type: annotations.AlertType, - AlertId: ctx.Rule.Id, - Title: ctx.Rule.Name, - Text: ctx.GetStateModel().Text, - NewState: string(ctx.Rule.State), - PrevState: string(oldState), - Epoch: time.Now().Unix(), - Data: annotationData, + OrgId: ctx.Rule.OrgId, + DashboardId: ctx.Rule.DashboardId, + PanelId: ctx.Rule.PanelId, + Type: annotations.AlertType, + AlertId: ctx.Rule.Id, + Title: ctx.Rule.Name, + Text: ctx.GetStateModel().Text, + NewState: string(ctx.Rule.State), + PrevState: string(oldState), + Epoch: time.Now().Unix(), + Data: annotationData, } annotationRepo := annotations.GetRepository() diff --git a/pkg/services/annotations/annotations.go b/pkg/services/annotations/annotations.go index e9ef899eca9..9c0b44316dc 100644 --- a/pkg/services/annotations/annotations.go +++ b/pkg/services/annotations/annotations.go @@ -8,11 +8,13 @@ type Repository interface { } type ItemQuery struct { - OrgId int64 `json:"orgId"` - From int64 `json:"from"` - To int64 `json:"from"` - Type ItemType `json:"type"` - AlertId int64 `json:"alertId"` + OrgId int64 `json:"orgId"` + From int64 `json:"from"` + To int64 `json:"from"` + Type ItemType `json:"type"` + AlertId int64 `json:"alertId"` + DashboardId int64 `json:"dashboardId"` + PanelId int64 `json:"panelId"` Limit int64 `json:"alertId"` } @@ -34,17 +36,19 @@ const ( ) type Item struct { - Id int64 `json:"id"` - OrgId int64 `json:"orgId"` - Type ItemType `json:"type"` - Title string `json:"title"` - Text string `json:"text"` - Metric string `json:"metric"` - AlertId int64 `json:"alertId"` - UserId int64 `json:"userId"` - PrevState string `json:"prevState"` - NewState string `json:"newState"` - Epoch int64 `json:"epoch"` + Id int64 `json:"id"` + OrgId int64 `json:"orgId"` + DashboardId int64 `json:"dashboardId"` + PanelId int64 `json:"panelId"` + Type ItemType `json:"type"` + Title string `json:"title"` + Text string `json:"text"` + Metric string `json:"metric"` + AlertId int64 `json:"alertId"` + UserId int64 `json:"userId"` + PrevState string `json:"prevState"` + NewState string `json:"newState"` + Epoch int64 `json:"epoch"` Data *simplejson.Json `json:"data"` } diff --git a/pkg/services/sqlstore/annotation.go b/pkg/services/sqlstore/annotation.go index e5a5443c3bf..b604b0de44f 100644 --- a/pkg/services/sqlstore/annotation.go +++ b/pkg/services/sqlstore/annotation.go @@ -38,6 +38,21 @@ func (r *SqlAnnotationRepo) Find(query *annotations.ItemQuery) ([]*annotations.I params = append(params, query.AlertId) } + if query.AlertId != 0 { + sql.WriteString(` AND alert_id = ?`) + params = append(params, query.AlertId) + } + + if query.DashboardId != 0 { + sql.WriteString(` AND dashboard_id = ?`) + params = append(params, query.DashboardId) + } + + if query.PanelId != 0 { + sql.WriteString(` AND panel_id = ?`) + params = append(params, query.PanelId) + } + sql.WriteString(` AND epoch BETWEEN ? AND ?`) params = append(params, query.From, query.To) diff --git a/pkg/services/sqlstore/migrations/annotation_mig.go b/pkg/services/sqlstore/migrations/annotation_mig.go index ddb622894ac..6e2f6a680ba 100644 --- a/pkg/services/sqlstore/migrations/annotation_mig.go +++ b/pkg/services/sqlstore/migrations/annotation_mig.go @@ -13,6 +13,8 @@ func addAnnotationMig(mg *Migrator) { {Name: "org_id", Type: DB_BigInt, Nullable: false}, {Name: "alert_id", Type: DB_BigInt, Nullable: true}, {Name: "user_id", Type: DB_BigInt, Nullable: true}, + {Name: "dashboard_id", Type: DB_BigInt, Nullable: true}, + {Name: "panel_id", Type: DB_BigInt, Nullable: true}, {Name: "type", Type: DB_NVarchar, Length: 25, Nullable: false}, {Name: "title", Type: DB_Text, Nullable: false}, {Name: "text", Type: DB_Text, Nullable: false}, @@ -25,17 +27,18 @@ func addAnnotationMig(mg *Migrator) { Indices: []*Index{ {Cols: []string{"org_id", "alert_id"}, Type: IndexType}, {Cols: []string{"org_id", "type"}, Type: IndexType}, + {Cols: []string{"dashboard_id", "panel_id"}, Type: IndexType}, {Cols: []string{"epoch"}, Type: IndexType}, }, } - mg.AddMigration("Drop old annotation table v2", NewDropTableMigration("annotation")) + mg.AddMigration("Drop old annotation table v3", NewDropTableMigration("annotation")) - mg.AddMigration("create annotation table v3", NewAddTableMigration(table)) + mg.AddMigration("create annotation table v4", NewAddTableMigration(table)) // create indices - mg.AddMigration("add index annotation org_id & alert_id v2", NewAddIndexMigration(table, table.Indices[0])) - - mg.AddMigration("add index annotation org_id & type v2", NewAddIndexMigration(table, table.Indices[1])) - mg.AddMigration("add index annotation epoch", NewAddIndexMigration(table, table.Indices[2])) + mg.AddMigration("add index annotation org_id & alert_id v3", NewAddIndexMigration(table, table.Indices[0])) + mg.AddMigration("add index annotation org_id & type v3", NewAddIndexMigration(table, table.Indices[1])) + mg.AddMigration("add index annotation dashboard_id panel_id", NewAddIndexMigration(table, table.Indices[2])) + mg.AddMigration("add index annotation epoch v3", NewAddIndexMigration(table, table.Indices[3])) } diff --git a/public/app/features/annotations/annotations_srv.ts b/public/app/features/annotations/annotations_srv.ts index 9eaeccfa54c..9fbf5d7f0e6 100644 --- a/public/app/features/annotations/annotations_srv.ts +++ b/public/app/features/annotations/annotations_srv.ts @@ -14,6 +14,7 @@ export class AnnotationsSrv { constructor(private $rootScope, private $q, private datasourceSrv, + private backendSrv, private timeSrv) { $rootScope.onAppEvent('refresh', this.clearCache.bind(this), $rootScope); $rootScope.onAppEvent('dashboard-initialized', this.clearCache.bind(this), $rootScope); @@ -23,9 +24,41 @@ export class AnnotationsSrv { this.globalAnnotationsPromise = null; } - getAnnotations(dashboard) { + getAnnotations(options) { + return this.$q.all([ + this.getGlobalAnnotations(options), + this.getPanelAnnotations(options) + ]).then(allResults => { + return _.flatten(allResults); + }).catch(err => { + this.$rootScope.appEvent('alert-error', ['Annotations failed', (err.message || err)]); + }); + } + + getPanelAnnotations(options) { + var panel = options.panel; + var dashboard = options.dashboard; + + if (panel && panel.alert && panel.alert.enabled) { + return this.backendSrv.get('/api/annotations', { + from: options.range.from.valueOf(), + to: options.range.to.valueOf(), + limit: 100, + panelId: panel.id, + dashboardId: dashboard.id, + }).then(results => { + return this.translateQueryResult({iconColor: '#AA0000', name: 'panel-alert'}, results); + }); + } + + return this.$q.when([]); + } + + getGlobalAnnotations(options) { + var dashboard = options.dashboard; + if (dashboard.annotations.list.length === 0) { - return this.$q.when(null); + return this.$q.when([]); } if (this.globalAnnotationsPromise) { @@ -34,21 +67,15 @@ export class AnnotationsSrv { var annotations = _.where(dashboard.annotations.list, {enable: true}); var range = this.timeSrv.timeRange(); - var rangeRaw = this.timeSrv.timeRange(false); this.globalAnnotationsPromise = this.$q.all(_.map(annotations, annotation => { if (annotation.snapshotData) { - return this.translateQueryResult(annotation.snapshotData); + return this.translateQueryResult(annotation, annotation.snapshotData); } return this.datasourceSrv.get(annotation.datasource).then(datasource => { // issue query against data source - return datasource.annotationQuery({ - range: range, - rangeRaw: - rangeRaw, - annotation: annotation - }); + return datasource.annotationQuery({range: range, rangeRaw: range.raw, annotation: annotation}); }) .then(results => { // store response in annotation object if this is a snapshot call @@ -56,35 +83,22 @@ export class AnnotationsSrv { annotation.snapshotData = angular.copy(results); } // translate result - return this.translateQueryResult(results); + return this.translateQueryResult(annotation, results); }); - })) - .then(allResults => { - return _.flatten(allResults); - }).catch(err => { - this.$rootScope.appEvent('alert-error', ['Annotations failed', (err.message || err)]); - }); + })); return this.globalAnnotationsPromise; } - translateQueryResult(results) { - var translated = []; - + translateQueryResult(annotation, results) { for (var item of results) { - translated.push({ - annotation: item.annotation, - min: item.time, - max: item.time, - eventType: item.annotation.name, - title: item.title, - tags: item.tags, - text: item.text, - score: 1 - }); + item.source = annotation; + item.min = item.time; + item.max = item.time; + item.scope = 1; + item.eventType = annotation.name; } - - return translated; + return results; } } diff --git a/public/app/features/annotations/partials/editor.html b/public/app/features/annotations/partials/editor.html index f42e5a3a7ae..0bfc8bb2028 100644 --- a/public/app/features/annotations/partials/editor.html +++ b/public/app/features/annotations/partials/editor.html @@ -40,7 +40,7 @@
    		- + Edit diff --git a/public/app/features/dashboard/timeSrv.js b/public/app/features/dashboard/timeSrv.js index 1e1e6dede59..5a140aeeeb3 100644 --- a/public/app/features/dashboard/timeSrv.js +++ b/public/app/features/dashboard/timeSrv.js @@ -119,10 +119,7 @@ define([ }; this.timeRangeForUrl = function() { - var range = this.timeRange(false); - if (_.isString(range.to) && range.to.indexOf('now')) { - range = this.timeRange(); - } + var range = this.timeRange().raw; if (moment.isMoment(range.from)) { range.from = range.from.valueOf(); } if (moment.isMoment(range.to)) { range.to = range.to.valueOf(); } @@ -130,17 +127,20 @@ define([ return range; }; - this.timeRange = function(parse) { + this.timeRange = function() { // make copies if they are moment (do not want to return out internal moment, because they are mutable!) - var from = moment.isMoment(this.time.from) ? moment(this.time.from) : this.time.from ; - var to = moment.isMoment(this.time.to) ? moment(this.time.to) : this.time.to ; + var range = { + from: moment.isMoment(this.time.from) ? moment(this.time.from) : this.time.from, + to: moment.isMoment(this.time.to) ? moment(this.time.to) : this.time.to, + }; - if (parse !== false) { - from = dateMath.parse(from, false); - to = dateMath.parse(to, true); - } + range = { + from: dateMath.parse(range.from, false), + to: dateMath.parse(range.to, true), + raw: range + }; - return {from: from, to: to}; + return range; }; this.zoomOut = function(factor) { diff --git a/public/app/features/dashboard/timepicker/timepicker.ts b/public/app/features/dashboard/timepicker/timepicker.ts index abf48ad0b23..49daad3df28 100644 --- a/public/app/features/dashboard/timepicker/timepicker.ts +++ b/public/app/features/dashboard/timepicker/timepicker.ts @@ -46,7 +46,7 @@ export class TimePickerCtrl { this.firstDayOfWeek = moment.localeData().firstDayOfWeek(); var time = angular.copy(this.timeSrv.timeRange()); - var timeRaw = angular.copy(this.timeSrv.timeRange(false)); + var timeRaw = angular.copy(time.raw); if (!this.dashboard.isTimezoneUtc()) { time.from.local(); diff --git a/public/app/features/panel/metrics_panel_ctrl.ts b/public/app/features/panel/metrics_panel_ctrl.ts index 269559bc22a..65625e6fd70 100644 --- a/public/app/features/panel/metrics_panel_ctrl.ts +++ b/public/app/features/panel/metrics_panel_ctrl.ts @@ -80,6 +80,8 @@ class MetricsPanelCtrl extends PanelCtrl { delete this.error; this.loading = true; + this.updateTimeRange(); + // load datasource service this.setTimeQueryStart(); this.datasourceSrv.get(this.panel.datasource) @@ -100,6 +102,7 @@ class MetricsPanelCtrl extends PanelCtrl { }); } + setTimeQueryStart() { this.timing.queryStart = new Date().getTime(); } @@ -110,7 +113,7 @@ class MetricsPanelCtrl extends PanelCtrl { updateTimeRange() { this.range = this.timeSrv.timeRange(); - this.rangeRaw = this.timeSrv.timeRange(false); + this.rangeRaw = this.range.raw; this.applyPanelTimeOverrides(); @@ -169,7 +172,6 @@ class MetricsPanelCtrl extends PanelCtrl { }; issueQueries(datasource) { - this.updateTimeRange(); this.datasource = datasource; if (!this.panel.targets || this.panel.targets.length === 0) { diff --git a/public/app/plugins/datasource/grafana/datasource.ts b/public/app/plugins/datasource/grafana/datasource.ts index bdd6ba014a2..58799778acd 100644 --- a/public/app/plugins/datasource/grafana/datasource.ts +++ b/public/app/plugins/datasource/grafana/datasource.ts @@ -19,11 +19,6 @@ class GrafanaDatasource { to: options.range.to.valueOf(), limit: options.limit, type: options.type, - }).then(data => { - return data.map(item => { - item.annotation = options.annotation; - return item; - }); }); } diff --git a/public/app/plugins/panel/graph/graph.js b/public/app/plugins/panel/graph/graph.js index d7f2275e498..f58b92e57c5 100755 --- a/public/app/plugins/panel/graph/graph.js +++ b/public/app/plugins/panel/graph/graph.js @@ -323,9 +323,9 @@ function (angular, $, moment, _, kbn, GraphTooltip, thresholdManExports) { for (var i = 0; i < annotations.length; i++) { var item = annotations[i]; - if (!types[item.annotation.name]) { - types[item.annotation.name] = { - color: item.annotation.iconColor, + if (!types[item.source.name]) { + types[item.source.name] = { + color: item.source.iconColor, position: 'BOTTOM', markerSize: 5, }; diff --git a/public/app/plugins/panel/graph/module.ts b/public/app/plugins/panel/graph/module.ts index 05da5652b74..8f17fcf7f93 100644 --- a/public/app/plugins/panel/graph/module.ts +++ b/public/app/plugins/panel/graph/module.ts @@ -55,10 +55,6 @@ class GraphCtrl extends MetricsPanelCtrl { xaxis: { show: true }, - alert: { - warn: {op: '>', value: undefined}, - crit: {op: '>', value: undefined}, - }, // show/hide lines lines : true, // fill factor @@ -105,7 +101,6 @@ class GraphCtrl extends MetricsPanelCtrl { aliasColors: {}, // other style overrides seriesOverrides: [], - alerting: {}, thresholds: [], }; @@ -115,7 +110,6 @@ class GraphCtrl extends MetricsPanelCtrl { _.defaults(this.panel, this.panelDefaults); _.defaults(this.panel.tooltip, this.panelDefaults.tooltip); - _.defaults(this.panel.alert, this.panelDefaults.alert); _.defaults(this.panel.legend, this.panelDefaults.legend); this.colors = $scope.$root.colors; @@ -161,7 +155,11 @@ class GraphCtrl extends MetricsPanelCtrl { } issueQueries(datasource) { - this.annotationsPromise = this.annotationsSrv.getAnnotations(this.dashboard); + this.annotationsPromise = this.annotationsSrv.getAnnotations({ + dashboard: this.dashboard, + panel: this.panel, + range: this.range, + }); return super.issueQueries(datasource); } @@ -170,7 +168,11 @@ class GraphCtrl extends MetricsPanelCtrl { } onDataSnapshotLoad(snapshotData) { - this.annotationsPromise = this.annotationsSrv.getAnnotations(this.dashboard); + this.annotationsPromise = this.annotationsSrv.getAnnotations({ + dashboard: this.dashboard, + panel: this.panel, + range: this.range, + }); this.onDataReceived(snapshotData); } diff --git a/public/test/specs/time_srv_specs.js b/public/test/specs/time_srv_specs.js index 60bdd1a4c5b..f95f2daecd2 100644 --- a/public/test/specs/time_srv_specs.js +++ b/public/test/specs/time_srv_specs.js @@ -25,14 +25,14 @@ define([ describe('timeRange', function() { it('should return unparsed when parse is false', function() { ctx.service.setTime({from: 'now', to: 'now-1h' }); - var time = ctx.service.timeRange(false); - expect(time.from).to.be('now'); - expect(time.to).to.be('now-1h'); + var time = ctx.service.timeRange(); + expect(time.raw.from).to.be('now'); + expect(time.raw.to).to.be('now-1h'); }); it('should return parsed when parse is true', function() { ctx.service.setTime({from: 'now', to: 'now-1h' }); - var time = ctx.service.timeRange(true); + var time = ctx.service.timeRange(); expect(moment.isMoment(time.from)).to.be(true); expect(moment.isMoment(time.to)).to.be(true); }); @@ -43,9 +43,9 @@ define([ ctx.$routeParams.from = 'now-2d'; ctx.$routeParams.to = 'now'; ctx.service.init(_dashboard); - var time = ctx.service.timeRange(false); - expect(time.from).to.be('now-2d'); - expect(time.to).to.be('now'); + var time = ctx.service.timeRange(); + expect(time.raw.from).to.be('now-2d'); + expect(time.raw.to).to.be('now'); }); it('should handle formated dates', function() { From e7b56c6389af30759efa12ce3fb509b851158eb2 Mon Sep 17 00:00:00 2001 From: bergquist Date: Fri, 9 Sep 2016 13:28:19 +0200 Subject: [PATCH 056/175] tech(metrics): move all request counters into one middleware --- pkg/api/common.go | 3 --- pkg/cmd/grafana-server/web.go | 1 + pkg/metrics/metrics.go | 2 ++ pkg/middleware/middleware.go | 11 --------- pkg/middleware/request_metrics.go | 38 +++++++++++++++++++++++++++++++ 5 files changed, 41 insertions(+), 14 deletions(-) create mode 100644 pkg/middleware/request_metrics.go diff --git a/pkg/api/common.go b/pkg/api/common.go index 9d3ad90783b..82eed0db5fe 100644 --- a/pkg/api/common.go +++ b/pkg/api/common.go @@ -4,7 +4,6 @@ import ( "encoding/json" "net/http" - "github.com/grafana/grafana/pkg/metrics" "github.com/grafana/grafana/pkg/middleware" "github.com/grafana/grafana/pkg/setting" "gopkg.in/macaron.v1" @@ -88,10 +87,8 @@ func ApiError(status int, message string, err error) *NormalResponse { switch status { case 404: - metrics.M_Api_Status_404.Inc(1) data["message"] = "Not Found" case 500: - metrics.M_Api_Status_500.Inc(1) data["message"] = "Internal Server Error" } diff --git a/pkg/cmd/grafana-server/web.go b/pkg/cmd/grafana-server/web.go index 51975ac5617..4c294a814ca 100644 --- a/pkg/cmd/grafana-server/web.go +++ b/pkg/cmd/grafana-server/web.go @@ -53,6 +53,7 @@ func newMacaron() *macaron.Macaron { m.Use(middleware.GetContextHandler()) m.Use(middleware.Sessioner(&setting.SessionOptions)) + m.Use(middleware.RequestMetrics()) return m } diff --git a/pkg/metrics/metrics.go b/pkg/metrics/metrics.go index 31dd6f8b201..74b7b76dcc5 100644 --- a/pkg/metrics/metrics.go +++ b/pkg/metrics/metrics.go @@ -15,6 +15,7 @@ var ( M_Page_Status_404 Counter M_Api_Status_500 Counter M_Api_Status_404 Counter + M_Api_Status_200 Counter M_Api_User_SignUpStarted Counter M_Api_User_SignUpCompleted Counter M_Api_User_SignUpInvite Counter @@ -57,6 +58,7 @@ func initMetricVars(settings *MetricSettings) { M_Api_Status_500 = RegCounter("api.resp_status", "code", "500") M_Api_Status_404 = RegCounter("api.resp_status", "code", "404") + M_Api_Status_200 = RegCounter("api.resp_status", "code", "200") M_Api_User_SignUpStarted = RegCounter("api.user.signup_started") M_Api_User_SignUpCompleted = RegCounter("api.user.signup_completed") diff --git a/pkg/middleware/middleware.go b/pkg/middleware/middleware.go index 5d52c68722e..df1768e1c3a 100644 --- a/pkg/middleware/middleware.go +++ b/pkg/middleware/middleware.go @@ -208,15 +208,6 @@ func (ctx *Context) Handle(status int, title string, err error) { } } - switch status { - case 200: - metrics.M_Page_Status_200.Inc(1) - case 404: - metrics.M_Page_Status_404.Inc(1) - case 500: - metrics.M_Page_Status_500.Inc(1) - } - ctx.Data["Title"] = title ctx.HTML(status, strconv.Itoa(status)) } @@ -243,10 +234,8 @@ func (ctx *Context) JsonApiErr(status int, message string, err error) { switch status { case 404: - metrics.M_Api_Status_404.Inc(1) resp["message"] = "Not Found" case 500: - metrics.M_Api_Status_500.Inc(1) resp["message"] = "Internal Server Error" } diff --git a/pkg/middleware/request_metrics.go b/pkg/middleware/request_metrics.go new file mode 100644 index 00000000000..d2aa86c86de --- /dev/null +++ b/pkg/middleware/request_metrics.go @@ -0,0 +1,38 @@ +package middleware + +import ( + "net/http" + "strings" + + "github.com/grafana/grafana/pkg/metrics" + "gopkg.in/macaron.v1" +) + +func RequestMetrics() macaron.Handler { + return func(res http.ResponseWriter, req *http.Request, c *macaron.Context) { + rw := res.(macaron.ResponseWriter) + c.Next() + + status := rw.Status() + + if strings.HasPrefix(req.URL.Path, "/api/") { + switch status { + case 200: + metrics.M_Api_Status_200.Inc(1) + case 404: + metrics.M_Api_Status_404.Inc(1) + case 500: + metrics.M_Api_Status_500.Inc(1) + } + } else { + switch status { + case 200: + metrics.M_Page_Status_200.Inc(1) + case 404: + metrics.M_Page_Status_404.Inc(1) + case 500: + metrics.M_Page_Status_500.Inc(1) + } + } + } +} From 4edb31723c0338d3a0829e9622320ce41b732be9 Mon Sep 17 00:00:00 2001 From: bergquist Date: Fri, 9 Sep 2016 13:53:50 +0200 Subject: [PATCH 057/175] fix(metrics): ignore datasource proxy requests --- pkg/middleware/request_metrics.go | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/pkg/middleware/request_metrics.go b/pkg/middleware/request_metrics.go index d2aa86c86de..4439b7deb5c 100644 --- a/pkg/middleware/request_metrics.go +++ b/pkg/middleware/request_metrics.go @@ -15,7 +15,11 @@ func RequestMetrics() macaron.Handler { status := rw.Status() - if strings.HasPrefix(req.URL.Path, "/api/") { + if strings.HasPrefix(req.RequestURI, "/api/datasources/proxy") { + return + } + + if strings.HasPrefix(req.RequestURI, "/api/") { switch status { case 200: metrics.M_Api_Status_200.Inc(1) From 7b1c374f64c690adc6ee05ad41bdebd7c4553852 Mon Sep 17 00:00:00 2001 From: Chen Chenglong Date: Sat, 10 Sep 2016 15:40:57 +0800 Subject: [PATCH 058/175] support connect ldap server with starttls (#5969) * support connect ldap server with starttls * add more doc for start_tls option --- conf/ldap.toml | 2 ++ docs/sources/installation/ldap.md | 2 ++ pkg/login/ldap.go | 11 ++++++++++- pkg/login/settings.go | 1 + 4 files changed, 15 insertions(+), 1 deletion(-) diff --git a/conf/ldap.toml b/conf/ldap.toml index 395179e219f..812cd582c91 100644 --- a/conf/ldap.toml +++ b/conf/ldap.toml @@ -8,6 +8,8 @@ host = "127.0.0.1" port = 389 # Set to true if ldap server supports TLS use_ssl = false +# Set to true if connect ldap server with STARTTLS pattern (create connection in insecure, then upgrade to secure connection with TLS) +start_tls = false # set to true if you want to skip ssl cert validation ssl_skip_verify = false # set to the path to your root CA certificate or leave unset to use system defaults diff --git a/docs/sources/installation/ldap.md b/docs/sources/installation/ldap.md index a5311fb4fa5..8002c045d82 100644 --- a/docs/sources/installation/ldap.md +++ b/docs/sources/installation/ldap.md @@ -27,6 +27,8 @@ host = "127.0.0.1" port = 389 # Set to true if ldap server supports TLS use_ssl = false +# Set to true if connect ldap server with STARTTLS pattern (create connection in insecure, then upgrade to secure connection with TLS) +start_tls = false # set to true if you want to skip ssl cert validation ssl_skip_verify = false # set to the path to your root CA certificate or leave unset to use system defaults diff --git a/pkg/login/ldap.go b/pkg/login/ldap.go index 4e8188e7a4b..d8c916bb765 100644 --- a/pkg/login/ldap.go +++ b/pkg/login/ldap.go @@ -48,7 +48,16 @@ func (a *ldapAuther) Dial() error { ServerName: host, RootCAs: certPool, } - a.conn, err = ldap.DialTLS("tcp", address, tlsCfg) + if a.server.StartTLS { + a.conn, err = ldap.Dial("tcp", address) + if err == nil { + if err = a.conn.StartTLS(tlsCfg); err == nil { + return nil + } + } + } else { + a.conn, err = ldap.DialTLS("tcp", address, tlsCfg) + } } else { a.conn, err = ldap.Dial("tcp", address) } diff --git a/pkg/login/settings.go b/pkg/login/settings.go index e01c0e50992..e0713302a6d 100644 --- a/pkg/login/settings.go +++ b/pkg/login/settings.go @@ -19,6 +19,7 @@ type LdapServerConf struct { Host string `toml:"host"` Port int `toml:"port"` UseSSL bool `toml:"use_ssl"` + StartTLS bool `toml:"start_tls"` SkipVerifySSL bool `toml:"ssl_skip_verify"` RootCACert string `toml:"root_ca_cert"` BindDN string `toml:"bind_dn"` From 7aab4a4a590cbdbe29434c5a1df258ffc976e326 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Torkel=20=C3=96degaard?= Date: Sat, 10 Sep 2016 09:56:03 +0200 Subject: [PATCH 059/175] fix(table): fixed issue with using mixed data source in table panel, fixes #5999 --- CHANGELOG.md | 3 +++ public/app/features/panel/metrics_panel_ctrl.ts | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 055aa9316fe..d66b8075625 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -15,6 +15,9 @@ ### Breaking changes * **SystemD**: Change systemd description, closes [#5971](https://github.com/grafana/grafana/pull/5971) +### Bugfixes +* **Table Panel**: Fixed problem when switching to Mixed datasource in metrics tab, fixes [#5999](https://github.com/grafana/grafana/pull/5999) + # 3.1.2 (unreleased) * **Templating**: Fixed issue when combining row & panel repeats, fixes [#5790](https://github.com/grafana/grafana/issues/5790) * **Drag&Drop**: Fixed issue with drag and drop in latest Chrome(51+), fixes [#5767](https://github.com/grafana/grafana/issues/5767) diff --git a/public/app/features/panel/metrics_panel_ctrl.ts b/public/app/features/panel/metrics_panel_ctrl.ts index 269559bc22a..4721035900c 100644 --- a/public/app/features/panel/metrics_panel_ctrl.ts +++ b/public/app/features/panel/metrics_panel_ctrl.ts @@ -244,7 +244,7 @@ class MetricsPanelCtrl extends PanelCtrl { if (datasource.meta.mixed) { _.each(this.panel.targets, target => { target.datasource = this.panel.datasource; - if (target.datasource === null) { + if (!target.datasource) { target.datasource = config.defaultDatasource; } }); From 014b70ded95ee91c35eb689571a7188cf5754feb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Torkel=20=C3=96degaard?= Date: Sat, 10 Sep 2016 12:00:33 +0200 Subject: [PATCH 060/175] fix(graph): fixed showing rendering error in inspector, fixes #5995 --- public/app/features/panel/panel_ctrl.ts | 2 +- public/app/partials/inspector.html | 6 +++--- public/app/plugins/panel/graph/graph.js | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/public/app/features/panel/panel_ctrl.ts b/public/app/features/panel/panel_ctrl.ts index e58994974cd..3bcca4f3f72 100644 --- a/public/app/features/panel/panel_ctrl.ts +++ b/public/app/features/panel/panel_ctrl.ts @@ -242,7 +242,7 @@ export class PanelCtrl { var modalScope = this.$scope.$new(); modalScope.panel = this.panel; modalScope.dashboard = this.dashboard; - modalScope.inspector = angular.copy(this.inspector); + modalScope.inspector = $.extend(true, {}, this.inspector); this.publishAppEvent('show-modal', { src: 'public/app/partials/inspector.html', diff --git a/public/app/partials/inspector.html b/public/app/partials/inspector.html index 1b1510090ad..228dfc7041e 100644 --- a/public/app/partials/inspector.html +++ b/public/app/partials/inspector.html @@ -68,9 +68,9 @@ - 
    -			{{stack_trace}}
-
    +
    +{{stack_trace}}
+
    diff --git a/public/app/plugins/panel/graph/graph.js b/public/app/plugins/panel/graph/graph.js index 0978036ef9f..7493404b5e9 100755 --- a/public/app/plugins/panel/graph/graph.js +++ b/public/app/plugins/panel/graph/graph.js @@ -265,7 +265,7 @@ function (angular, $, moment, _, kbn, GraphTooltip, thresholdManExports) { console.log('flotcharts error', e); ctrl.error = e.message || "Render Error"; ctrl.renderError = true; - ctrl.inspector = {error: ctrl.error}; + ctrl.inspector = {error: e}; } if (incrementRenderCounter) { From eb673fd16d3df49e1a4ef8660e378914e28012bb Mon Sep 17 00:00:00 2001 From: bergquist Date: Mon, 12 Sep 2016 10:11:30 +0200 Subject: [PATCH 061/175] fix(middleware): typo --- pkg/middleware/logger.go | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkg/middleware/logger.go b/pkg/middleware/logger.go index c6405ef80f9..9bed7cbe16b 100644 --- a/pkg/middleware/logger.go +++ b/pkg/middleware/logger.go @@ -49,9 +49,9 @@ func Logger() macaron.Handler { if ctx, ok := c.Data["ctx"]; ok { ctxTyped := ctx.(*Context) if status == 500 { - ctxTyped.Logger.Error("Request Completed", "method", req.Method, "path", req.URL.Path, "status", status, "remote_addr", c.RemoteAddr(), "time_ns", timeTakenMs, "size", rw.Size()) + ctxTyped.Logger.Error("Request Completed", "method", req.Method, "path", req.URL.Path, "status", status, "remote_addr", c.RemoteAddr(), "time_ms", timeTakenMs, "size", rw.Size()) } else { - ctxTyped.Logger.Info("Request Completed", "method", req.Method, "path", req.URL.Path, "status", status, "remote_addr", c.RemoteAddr(), "time_ns", timeTakenMs, "size", rw.Size()) + ctxTyped.Logger.Info("Request Completed", "method", req.Method, "path", req.URL.Path, "status", status, "remote_addr", c.RemoteAddr(), "time_ms", timeTakenMs, "size", rw.Size()) } } } From 501f89e829b926b0fdd82e6ad18df84030567084 Mon Sep 17 00:00:00 2001 From: Rubycut Date: Mon, 12 Sep 2016 10:45:17 +0200 Subject: [PATCH 062/175] Increase datasource limit to 1000 #3910 --- pkg/services/sqlstore/datasource.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkg/services/sqlstore/datasource.go b/pkg/services/sqlstore/datasource.go index c028fd0fccc..2f1b40b2d61 100644 --- a/pkg/services/sqlstore/datasource.go +++ b/pkg/services/sqlstore/datasource.go @@ -43,7 +43,7 @@ func GetDataSourceByName(query *m.GetDataSourceByNameQuery) error { } func GetDataSources(query *m.GetDataSourcesQuery) error { - sess := x.Limit(100, 0).Where("org_id=?", query.OrgId).Asc("name") + sess := x.Limit(1000, 0).Where("org_id=?", query.OrgId).Asc("name") query.Result = make([]*m.DataSource, 0) return sess.Find(&query.Result) From 6c5860d3e888d93e57c75f23de75d6850473d65d Mon Sep 17 00:00:00 2001 From: bergquist Date: Mon, 12 Sep 2016 13:29:31 +0200 Subject: [PATCH 063/175] feat(metrics): measure proxy requests --- pkg/metrics/metrics.go | 21 +++++++++-- pkg/middleware/request_metrics.go | 63 +++++++++++++++++++++---------- 2 files changed, 60 insertions(+), 24 deletions(-) diff --git a/pkg/metrics/metrics.go b/pkg/metrics/metrics.go index 74b7b76dcc5..80d316c022f 100644 --- a/pkg/metrics/metrics.go +++ b/pkg/metrics/metrics.go @@ -13,9 +13,15 @@ var ( M_Page_Status_200 Counter M_Page_Status_500 Counter M_Page_Status_404 Counter - M_Api_Status_500 Counter - M_Api_Status_404 Counter + M_Page_Status_Unknown Counter M_Api_Status_200 Counter + M_Api_Status_404 Counter + M_Api_Status_500 Counter + M_Api_Status_Unknown Counter + M_Proxy_Status_200 Counter + M_Proxy_Status_404 Counter + M_Proxy_Status_500 Counter + M_Proxy_Status_Unknown Counter M_Api_User_SignUpStarted Counter M_Api_User_SignUpCompleted Counter M_Api_User_SignUpInvite Counter @@ -55,10 +61,17 @@ func initMetricVars(settings *MetricSettings) { M_Page_Status_200 = RegCounter("page.resp_status", "code", "200") M_Page_Status_500 = RegCounter("page.resp_status", "code", "500") M_Page_Status_404 = RegCounter("page.resp_status", "code", "404") + M_Page_Status_Unknown = RegCounter("page.resp_status", "code", "unknown") - M_Api_Status_500 = RegCounter("api.resp_status", "code", "500") - M_Api_Status_404 = RegCounter("api.resp_status", "code", "404") M_Api_Status_200 = RegCounter("api.resp_status", "code", "200") + M_Api_Status_404 = RegCounter("api.resp_status", "code", "404") + M_Api_Status_500 = RegCounter("api.resp_status", "code", "500") + M_Api_Status_Unknown = RegCounter("api.resp_status", "code", "unknown") + + M_Proxy_Status_200 = RegCounter("proxy.resp_status", "code", "200") + M_Proxy_Status_404 = RegCounter("proxy.resp_status", "code", "404") + M_Proxy_Status_500 = RegCounter("proxy.resp_status", "code", "500") + M_Proxy_Status_Unknown = RegCounter("proxy.resp_status", "code", "unknown") M_Api_User_SignUpStarted = RegCounter("api.user.signup_started") M_Api_User_SignUpCompleted = RegCounter("api.user.signup_completed") diff --git a/pkg/middleware/request_metrics.go b/pkg/middleware/request_metrics.go index 4439b7deb5c..417a1817d15 100644 --- a/pkg/middleware/request_metrics.go +++ b/pkg/middleware/request_metrics.go @@ -16,27 +16,50 @@ func RequestMetrics() macaron.Handler { status := rw.Status() if strings.HasPrefix(req.RequestURI, "/api/datasources/proxy") { - return - } - - if strings.HasPrefix(req.RequestURI, "/api/") { - switch status { - case 200: - metrics.M_Api_Status_200.Inc(1) - case 404: - metrics.M_Api_Status_404.Inc(1) - case 500: - metrics.M_Api_Status_500.Inc(1) - } + countProxyRequests(status) + } else if strings.HasPrefix(req.RequestURI, "/api/") { + countApiRequests(status) } else { - switch status { - case 200: - metrics.M_Page_Status_200.Inc(1) - case 404: - metrics.M_Page_Status_404.Inc(1) - case 500: - metrics.M_Page_Status_500.Inc(1) - } + countPageRequests(status) } } } + +func countApiRequests(status int) { + switch status { + case 200: + metrics.M_Api_Status_200.Inc(1) + case 404: + metrics.M_Api_Status_404.Inc(1) + case 500: + metrics.M_Api_Status_500.Inc(1) + default: + metrics.M_Api_Status_Unknown.Inc(1) + } +} + +func countPageRequests(status int) { + switch status { + case 200: + metrics.M_Page_Status_200.Inc(1) + case 404: + metrics.M_Page_Status_404.Inc(1) + case 500: + metrics.M_Page_Status_500.Inc(1) + default: + metrics.M_Page_Status_Unknown.Inc(1) + } +} + +func countProxyRequests(status int) { + switch status { + case 200: + metrics.M_Proxy_Status_200.Inc(1) + case 404: + metrics.M_Proxy_Status_404.Inc(1) + case 500: + metrics.M_Proxy_Status_500.Inc(1) + default: + metrics.M_Proxy_Status_Unknown.Inc(1) + } +} From d7bf70a77b82149658c42aff5b72f51eb20f91a9 Mon Sep 17 00:00:00 2001 From: bergquist Date: Mon, 12 Sep 2016 13:37:00 +0200 Subject: [PATCH 064/175] tech(tsdb): remove skip ssl setting. should be based on datasource settings --- conf/defaults.ini | 3 --- conf/sample.ini | 3 --- pkg/setting/setting.go | 3 +-- pkg/tsdb/graphite/graphite.go | 2 +- 4 files changed, 2 insertions(+), 9 deletions(-) diff --git a/conf/defaults.ini b/conf/defaults.ini index 685699b19db..53a034bfeaa 100644 --- a/conf/defaults.ini +++ b/conf/defaults.ini @@ -387,9 +387,6 @@ global_session = -1 [alerting] enabled = true -# Skip ssl validation for queries sent to the timeserie database. -skip_ssl_validation = false - #################################### Internal Grafana Metrics ########################## # Metrics available at HTTP API Url /api/metrics [metrics] diff --git a/conf/sample.ini b/conf/sample.ini index d72e63db508..2c428ea775f 100644 --- a/conf/sample.ini +++ b/conf/sample.ini @@ -333,9 +333,6 @@ check_for_updates = true [alerting] ;enabled = false -# Skip ssl validation for queries sent to the timeserie database. -;skip_ssl_validation = false - #################################### Internal Grafana Metrics ########################## # Metrics available at HTTP API Url /api/metrics [metrics] diff --git a/pkg/setting/setting.go b/pkg/setting/setting.go index 376e1c1408a..aa0ce883423 100644 --- a/pkg/setting/setting.go +++ b/pkg/setting/setting.go @@ -141,8 +141,7 @@ var ( Quota QuotaSettings // Alerting - AlertingEnabled bool - AlertingSkipSSLValidation bool + AlertingEnabled bool // logger logger log.Logger diff --git a/pkg/tsdb/graphite/graphite.go b/pkg/tsdb/graphite/graphite.go index ec1e454e6e9..4042702378c 100644 --- a/pkg/tsdb/graphite/graphite.go +++ b/pkg/tsdb/graphite/graphite.go @@ -34,7 +34,7 @@ func init() { tsdb.RegisterExecutor("graphite", NewGraphiteExecutor) tr := &http.Transport{ - TLSClientConfig: &tls.Config{InsecureSkipVerify: setting.AlertingSkipSSLValidation}, + TLSClientConfig: &tls.Config{InsecureSkipVerify: true}, } HttpClient = http.Client{ From 811b7188c48f4b34296a6e8c342bee16294883f1 Mon Sep 17 00:00:00 2001 From: bergquist Date: Mon, 12 Sep 2016 14:47:02 +0200 Subject: [PATCH 065/175] docs(config): add docs for how to run grafana behind a reverse proxy --- docs/mkdocs.yml | 1 + docs/sources/installation/behind_proxy.md | 64 +++++++++++++++++++++++ 2 files changed, 65 insertions(+) create mode 100644 docs/sources/installation/behind_proxy.md diff --git a/docs/mkdocs.yml b/docs/mkdocs.yml index e4a528dcdbd..e8a397328a1 100644 --- a/docs/mkdocs.yml +++ b/docs/mkdocs.yml @@ -42,6 +42,7 @@ pages: - ['installation/performance.md', 'Installation', 'Performance Tips'] - ['installation/troubleshooting.md', 'Installation', 'Troubleshooting'] - ['installation/migrating_to2.md', 'Installation', 'Migrating from v1.x to v2.x'] +- ['installation/behind_proxy.md', 'Installation', 'Grafana behind reverse proxy'] - ['guides/basic_concepts.md', 'User Guides', 'Basic Concepts'] - ['guides/gettingstarted.md', 'User Guides', 'Getting Started'] diff --git a/docs/sources/installation/behind_proxy.md b/docs/sources/installation/behind_proxy.md new file mode 100644 index 00000000000..0cf2507b404 --- /dev/null +++ b/docs/sources/installation/behind_proxy.md @@ -0,0 +1,64 @@ +--- +page_title: Running Grafana behind a reverse proxy +page_description: Guide for running Grafana behind a reverse proxy +page_keywords: Grafana, reverse proxy, nginx, haproxy +--- + +# Running Grafana behind a reverse proxy + +It should be straight forward to get Grafana up and running behind a reverse proxy. But here are some things that you might run into. + +Links and redirects will not be rendered correctly unless you set the server.domain setting. +``` +[server] +domain = foo.bar +``` + +To use sub *path* ex `http://foo.bar/grafana` make sure to include `/grafana` in the end of root_url. +Otherwise Grafana will not behave correctly. See example below. + +# Examples +Here are some example configurations for running Grafana behind a reverse proxy. + +## Grafana configuration (ex http://foo.bar.com) +``` +[server] +domain = foo.bar +``` + +## Nginx configuration +``` +server { + listen 80; + root /usr/share/nginx/www; + index index.html index.htm; + + location / { + proxy_pass http://localhost:3000/; + } +} +``` + +# Examples with **sub path** (ex http://foo.bar.com/grafana) + +## Grafana configuration with sub path +``` +[server] +domain = foo.bar +root_url = %(protocol)s://%(domain)s:/grafana +``` + +## Nginx configuration with sub path +``` +server { + listen 80; + root /usr/share/nginx/www; + index index.html index.htm; + + location /grafana/ { + proxy_pass http://localhost:3000/; + } +} +``` + + From 157ab1ba362670e1e0c38306f358ff23307709fe Mon Sep 17 00:00:00 2001 From: bergquist Date: Mon, 12 Sep 2016 14:57:37 +0200 Subject: [PATCH 066/175] fix(setting): broken code --- pkg/setting/setting.go | 1 - 1 file changed, 1 deletion(-) diff --git a/pkg/setting/setting.go b/pkg/setting/setting.go index aa0ce883423..fd010c42ca2 100644 --- a/pkg/setting/setting.go +++ b/pkg/setting/setting.go @@ -546,7 +546,6 @@ func NewConfigContext(args *CommandLineArgs) error { alerting := Cfg.Section("alerting") AlertingEnabled = alerting.Key("enabled").MustBool(false) - AlertingSkipSSLValidation = alerting.Key("skip_ssl_validation").MustBool(false) readSessionConfig() readSmtpSettings() From f998b86ade1728bbeeb8ab1ff3114cde7fe2e0b7 Mon Sep 17 00:00:00 2001 From: Mitsuhiro Tanda Date: Mon, 12 Sep 2016 23:47:31 +0900 Subject: [PATCH 067/175] (cloudwatch) add metrics/dimensions --- pkg/api/cloudwatch/metrics.go | 34 +++++++++++++++++++++------------- 1 file changed, 21 insertions(+), 13 deletions(-) diff --git a/pkg/api/cloudwatch/metrics.go b/pkg/api/cloudwatch/metrics.go index 4721924cff4..36a2c726714 100644 --- a/pkg/api/cloudwatch/metrics.go +++ b/pkg/api/cloudwatch/metrics.go @@ -67,25 +67,29 @@ func init() { "CoreNodesRunning", "CoreNodesPending", "LiveDataNodes", "MRTotalNodes", "MRActiveNodes", "MRLostNodes", "MRUnhealthyNodes", "MRDecommissionedNodes", "MRRebootedNodes", "S3BytesWritten", "S3BytesRead", "HDFSUtilization", "HDFSBytesRead", "HDFSBytesWritten", "MissingBlocks", "CorruptBlocks", "TotalLoad", "MemoryTotalMB", "MemoryReservedMB", "MemoryAvailableMB", "MemoryAllocatedMB", "PendingDeletionBlocks", "UnderReplicatedBlocks", "DfsPendingReplicationBlocks", "CapacityRemainingGB", "HbaseBackupFailed", "MostRecentBackupDuration", "TimeSinceLastSuccessfulBackup"}, - "AWS/ES": {"ClusterStatus.green", "ClusterStatus.yellow", "ClusterStatus.red", "Nodes", "SearchableDocuments", "DeletedDocuments", "CPUUtilization", "FreeStorageSpace", "JVMMemoryPressure", "AutomatedSnapshotFailure", "MasterCPUUtilization", "MasterFreeStorageSpace", "MasterJVMMemoryPressure", "ReadLatency", "WriteLatency", "ReadThroughput", "WriteThroughput", "DiskQueueLength", "ReadIOPS", "WriteIOPS"}, - "AWS/Events": {"Invocations", "FailedInvocations", "TriggeredRules", "MatchedEvents", "ThrottledRules"}, - "AWS/Kinesis": {"GetRecords.Bytes", "GetRecords.IteratorAge", "GetRecords.IteratorAgeMilliseconds", "GetRecords.Latency", "GetRecords.Records", "GetRecords.Success", "IncomingBytes", "IncomingRecords", "PutRecord.Bytes", "PutRecord.Latency", "PutRecord.Success", "PutRecords.Bytes", "PutRecords.Latency", "PutRecords.Records", "PutRecords.Success", "ReadProvisionedThroughputExceeded", "WriteProvisionedThroughputExceeded", "IteratorAgeMilliseconds", "OutgoingBytes", "OutgoingRecords"}, - "AWS/Lambda": {"Invocations", "Errors", "Duration", "Throttles"}, - "AWS/Logs": {"IncomingBytes", "IncomingLogEvents", "ForwardedBytes", "ForwardedLogEvents", "DeliveryErrors", "DeliveryThrottling"}, - "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", "CPUCreditUsage", "CPUCreditBalance", "DatabaseConnections", "DiskQueueDepth", "FreeableMemory", "FreeStorageSpace", "ReplicaLag", "SwapUsage", "ReadIOPS", "WriteIOPS", "ReadLatency", "WriteLatency", "ReadThroughput", "WriteThroughput", "NetworkReceiveThroughput", "NetworkTransmitThroughput"}, - "AWS/Route53": {"HealthCheckStatus", "HealthCheckPercentageHealthy", "ConnectionTime", "SSLHandshakeTime", "TimeToFirstByte"}, - "AWS/S3": {"BucketSizeBytes", "NumberOfObjects"}, - "AWS/SNS": {"NumberOfMessagesPublished", "PublishSize", "NumberOfNotificationsDelivered", "NumberOfNotificationsFailed"}, - "AWS/SQS": {"NumberOfMessagesSent", "SentMessageSize", "NumberOfMessagesReceived", "NumberOfEmptyReceives", "NumberOfMessagesDeleted", "ApproximateNumberOfMessagesDelayed", "ApproximateNumberOfMessagesVisible", "ApproximateNumberOfMessagesNotVisible"}, + "AWS/ES": {"ClusterStatus.green", "ClusterStatus.yellow", "ClusterStatus.red", "Nodes", "SearchableDocuments", "DeletedDocuments", "CPUUtilization", "FreeStorageSpace", "JVMMemoryPressure", "AutomatedSnapshotFailure", "MasterCPUUtilization", "MasterFreeStorageSpace", "MasterJVMMemoryPressure", "ReadLatency", "WriteLatency", "ReadThroughput", "WriteThroughput", "DiskQueueLength", "ReadIOPS", "WriteIOPS"}, + "AWS/Events": {"Invocations", "FailedInvocations", "TriggeredRules", "MatchedEvents", "ThrottledRules"}, + "AWS/Firehose": {"DeliveryToElasticsearch.Bytes", "DeliveryToElasticsearch.Records", "DeliveryToElasticsearch.Success", "DeliveryToRedshift.Bytes", "DeliveryToRedshift.Records", "DeliveryToRedshift.Success", "DeliveryToS3.Bytes", "DeliveryToS3.DataFreshness", "DeliveryToS3.Records", "DeliveryToS3.Success", "IncomingBytes", "IncomingRecords", "DescribeDeliveryStream.Latency", "DescribeDeliveryStream.Requests", "ListDeliveryStreams.Latency", "ListDeliveryStreams.Requests", "PutRecord.Bytes", "PutRecord.Latency", "PutRecord.Requests", "PutRecordBatch.Bytes", "PutRecordBatch.Latency", "PutRecordBatch.Records", "PutRecordBatch.Requests", "UpdateDeliveryStream.Latency", "UpdateDeliveryStream.Requests"}, + "AWS/IoT": {"PublishIn.Success", "PublishOut.Success", "Subscribe.Success", "Ping.Success", "Connect.Success", "GetThingShadow.Accepted"}, + "AWS/Kinesis": {"GetRecords.Bytes", "GetRecords.IteratorAge", "GetRecords.IteratorAgeMilliseconds", "GetRecords.Latency", "GetRecords.Records", "GetRecords.Success", "IncomingBytes", "IncomingRecords", "PutRecord.Bytes", "PutRecord.Latency", "PutRecord.Success", "PutRecords.Bytes", "PutRecords.Latency", "PutRecords.Records", "PutRecords.Success", "ReadProvisionedThroughputExceeded", "WriteProvisionedThroughputExceeded", "IteratorAgeMilliseconds", "OutgoingBytes", "OutgoingRecords"}, + "AWS/KinesisAnalytics": {"Bytes", "MillisBehindLatest", "Records"}, + "AWS/Lambda": {"Invocations", "Errors", "Duration", "Throttles"}, + "AWS/Logs": {"IncomingBytes", "IncomingLogEvents", "ForwardedBytes", "ForwardedLogEvents", "DeliveryErrors", "DeliveryThrottling"}, + "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", "CPUCreditUsage", "CPUCreditBalance", "DatabaseConnections", "DiskQueueDepth", "FreeableMemory", "FreeStorageSpace", "ReplicaLag", "SwapUsage", "ReadIOPS", "WriteIOPS", "ReadLatency", "WriteLatency", "ReadThroughput", "WriteThroughput", "NetworkReceiveThroughput", "NetworkTransmitThroughput"}, + "AWS/Route53": {"HealthCheckStatus", "HealthCheckPercentageHealthy", "ConnectionTime", "SSLHandshakeTime", "TimeToFirstByte"}, + "AWS/S3": {"BucketSizeBytes", "NumberOfObjects"}, + "AWS/SNS": {"NumberOfMessagesPublished", "PublishSize", "NumberOfNotificationsDelivered", "NumberOfNotificationsFailed"}, + "AWS/SQS": {"NumberOfMessagesSent", "SentMessageSize", "NumberOfMessagesReceived", "NumberOfEmptyReceives", "NumberOfMessagesDeleted", "ApproximateNumberOfMessagesDelayed", "ApproximateNumberOfMessagesVisible", "ApproximateNumberOfMessagesNotVisible"}, "AWS/StorageGateway": {"CacheHitPercent", "CachePercentUsed", "CachePercentDirty", "CloudBytesDownloaded", "CloudDownloadLatency", "CloudBytesUploaded", "UploadBufferFree", "UploadBufferPercentUsed", "UploadBufferUsed", "QueuedWrites", "ReadBytes", "ReadTime", "TotalCacheSize", "WriteBytes", "WriteTime", "TimeSinceLastRecoveryPoint", "WorkingStorageFree", "WorkingStoragePercentUsed", "WorkingStorageUsed", "CacheHitPercent", "CachePercentUsed", "CachePercentDirty", "ReadBytes", "ReadTime", "WriteBytes", "WriteTime", "QueuedWrites"}, "AWS/SWF": {"DecisionTaskScheduleToStartTime", "DecisionTaskStartToCloseTime", "DecisionTasksCompleted", "StartedDecisionTasksTimedOutOnClose", "WorkflowStartToCloseTime", "WorkflowsCanceled", "WorkflowsCompleted", "WorkflowsContinuedAsNew", "WorkflowsFailed", "WorkflowsTerminated", "WorkflowsTimedOut", "ActivityTaskScheduleToCloseTime", "ActivityTaskScheduleToStartTime", "ActivityTaskStartToCloseTime", "ActivityTasksCanceled", "ActivityTasksCompleted", "ActivityTasksFailed", "ScheduledActivityTasksTimedOutOnClose", "ScheduledActivityTasksTimedOutOnStart", "StartedActivityTasksTimedOutOnClose", "StartedActivityTasksTimedOutOnHeartbeat"}, "AWS/WAF": {"AllowedRequests", "BlockedRequests", "CountedRequests"}, "AWS/WorkSpaces": {"Available", "Unhealthy", "ConnectionAttempt", "ConnectionSuccess", "ConnectionFailure", "SessionLaunchTime", "InSessionLatency", "SessionDisconnect"}, + "KMS": {"SecondsUntilKeyMaterialExpiration"}, } dimensionsMap = map[string][]string{ "AWS/ApiGateway": {"ApiName", "Method", "Resource", "Stage"}, @@ -106,7 +110,10 @@ func init() { "AWS/ElasticMapReduce": {"ClusterId", "JobFlowId", "JobId"}, "AWS/ES": {"ClientId", "DomainName"}, "AWS/Events": {"RuleName"}, + "AWS/Firehose": {}, + "AWS/IoT": {"Protocol"}, "AWS/Kinesis": {"StreamName", "ShardID"}, + "AWS/KinesisAnalytics": {"Flow", "Id"}, "AWS/Lambda": {"FunctionName", "Resource", "Version", "Alias"}, "AWS/Logs": {"LogGroupName", "DestinationType", "FilterName"}, "AWS/ML": {"MLModelId", "RequestMode"}, @@ -121,6 +128,7 @@ func init() { "AWS/SWF": {"Domain", "WorkflowTypeName", "WorkflowTypeVersion", "ActivityTypeName", "ActivityTypeVersion"}, "AWS/WAF": {"Rule", "WebACL"}, "AWS/WorkSpaces": {"DirectoryId", "WorkspaceId"}, + "KMS": {"KeyId"}, } customMetricsMetricsMap = make(map[string]map[string]map[string]*CustomMetricsCache) From 9c5436c648bf300bd20e44ca24049a3fac3cca17 Mon Sep 17 00:00:00 2001 From: bergquist Date: Tue, 13 Sep 2016 07:39:30 +0200 Subject: [PATCH 068/175] feat(templating): set default sort order --- public/app/features/templating/editorCtrl.js | 1 + 1 file changed, 1 insertion(+) diff --git a/public/app/features/templating/editorCtrl.js b/public/app/features/templating/editorCtrl.js index 5c923271278..95f3bd2e9dd 100644 --- a/public/app/features/templating/editorCtrl.js +++ b/public/app/features/templating/editorCtrl.js @@ -123,6 +123,7 @@ function (angular, _) { $scope.currentIsNew = false; $scope.mode = 'edit'; + $scope.current.sort = $scope.current.sort || replacementDefaults.sort; if ($scope.current.datasource === void 0) { $scope.current.datasource = null; $scope.current.type = 'query'; From 03fb152d4b323c08ce216222a26f52f327bfca95 Mon Sep 17 00:00:00 2001 From: bergquist Date: Tue, 13 Sep 2016 08:11:04 +0200 Subject: [PATCH 069/175] tech(templates): extract sort method --- .../features/templating/templateValuesSrv.js | 18 +++++++++++------- 1 file changed, 11 insertions(+), 7 deletions(-) diff --git a/public/app/features/templating/templateValuesSrv.js b/public/app/features/templating/templateValuesSrv.js index 1059d1a19c4..6125a4b44a9 100644 --- a/public/app/features/templating/templateValuesSrv.js +++ b/public/app/features/templating/templateValuesSrv.js @@ -374,12 +374,20 @@ function (angular, _, $, kbn) { } options = _.uniq(options, 'value'); - if (variable.sort === 0) { + return this.sortVariableValues(options, variable.sort); + }; + + this.addAllOption = function(variable) { + variable.options.unshift({text: 'All', value: "$__all"}); + }; + + this.sortVariableValues = function(options, sortOrder) { + if (sortOrder === 0) { return options; } - var sortType = Math.ceil(variable.sort / 2); - var reverseSort = (variable.sort % 2 === 0); + var sortType = Math.ceil(sortOrder / 2); + var reverseSort = (sortOrder % 2 === 0); if (sortType === 1) { options = _.sortBy(options, 'text'); } else if (sortType === 2) { @@ -399,10 +407,6 @@ function (angular, _, $, kbn) { return options; }; - this.addAllOption = function(variable) { - variable.options.unshift({text: 'All', value: "$__all"}); - }; - }); }); From 3ba3d9d4451c9fe1e61668a8d97f5ec50b13b393 Mon Sep 17 00:00:00 2001 From: bergquist Date: Tue, 13 Sep 2016 08:14:43 +0200 Subject: [PATCH 070/175] docs(changelog): add note about closing #2839 --- CHANGELOG.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index d66b8075625..3e6049d5dc2 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -5,6 +5,7 @@ * **SingleStat**: Add seriename as option in singlestat panel, closes [#4740](https://github.com/grafana/grafana/issues/4740) * **Localization**: Week start day now dependant on browser locale setting, closes [#3003](https://github.com/grafana/grafana/issues/3003) * **Templating**: Update panel repeats for variables that change on time refresh, closes [#5021](https://github.com/grafana/grafana/issues/5021) +* **Templating**: Add support for numeric and alphabetical sorting of variable values, closes [#2839](https://github.com/grafana/grafana/issues/2839) * **Elasticsearch**: Support to set Precision Threshold for Unique Count metric, closes [#4689](https://github.com/grafana/grafana/issues/4689) * **Navigation**: Add search to org swithcer, closes [#2609](https://github.com/grafana/grafana/issues/2609) * **Database**: Allow database config using one propertie, closes [#5456](https://github.com/grafana/grafana/pull/5456) From e53b8159568eaee603f184722719dde74ea27b76 Mon Sep 17 00:00:00 2001 From: Jouni Kuusisto Date: Tue, 13 Sep 2016 09:57:39 +0300 Subject: [PATCH 071/175] Enable "With Credentials" for InfluxDB datasource (#6018) --- public/app/plugins/datasource/influxdb/datasource.ts | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/public/app/plugins/datasource/influxdb/datasource.ts b/public/app/plugins/datasource/influxdb/datasource.ts index 9a5ebbef859..08af9e71a91 100644 --- a/public/app/plugins/datasource/influxdb/datasource.ts +++ b/public/app/plugins/datasource/influxdb/datasource.ts @@ -16,6 +16,7 @@ export default class InfluxDatasource { name: string; database: any; basicAuth: any; + withCredentials: any; interval: any; supportAnnotations: boolean; supportMetrics: boolean; @@ -33,6 +34,7 @@ export default class InfluxDatasource { this.name = instanceSettings.name; this.database = instanceSettings.database; this.basicAuth = instanceSettings.basicAuth; + this.withCredentials = instanceSettings.withCredentials; this.interval = (instanceSettings.jsonData || {}).timeInterval; this.supportAnnotations = true; this.supportMetrics = true; @@ -187,6 +189,9 @@ export default class InfluxDatasource { }; options.headers = options.headers || {}; + if (this.basicAuth || this.withCredentials) { + options.withCredentials = true; + } if (self.basicAuth) { options.headers.Authorization = self.basicAuth; } From 1264a1b3a65ae0182f05e7de25555d48a54ee6c2 Mon Sep 17 00:00:00 2001 From: Mitsuhiro Tanda Date: Tue, 13 Sep 2016 16:08:33 +0900 Subject: [PATCH 072/175] (cloudwatch) add metrics/dimensions (#6020) --- pkg/api/cloudwatch/metrics.go | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkg/api/cloudwatch/metrics.go b/pkg/api/cloudwatch/metrics.go index 36a2c726714..4d5fa1f52db 100644 --- a/pkg/api/cloudwatch/metrics.go +++ b/pkg/api/cloudwatch/metrics.go @@ -72,7 +72,7 @@ func init() { "AWS/Firehose": {"DeliveryToElasticsearch.Bytes", "DeliveryToElasticsearch.Records", "DeliveryToElasticsearch.Success", "DeliveryToRedshift.Bytes", "DeliveryToRedshift.Records", "DeliveryToRedshift.Success", "DeliveryToS3.Bytes", "DeliveryToS3.DataFreshness", "DeliveryToS3.Records", "DeliveryToS3.Success", "IncomingBytes", "IncomingRecords", "DescribeDeliveryStream.Latency", "DescribeDeliveryStream.Requests", "ListDeliveryStreams.Latency", "ListDeliveryStreams.Requests", "PutRecord.Bytes", "PutRecord.Latency", "PutRecord.Requests", "PutRecordBatch.Bytes", "PutRecordBatch.Latency", "PutRecordBatch.Records", "PutRecordBatch.Requests", "UpdateDeliveryStream.Latency", "UpdateDeliveryStream.Requests"}, "AWS/IoT": {"PublishIn.Success", "PublishOut.Success", "Subscribe.Success", "Ping.Success", "Connect.Success", "GetThingShadow.Accepted"}, "AWS/Kinesis": {"GetRecords.Bytes", "GetRecords.IteratorAge", "GetRecords.IteratorAgeMilliseconds", "GetRecords.Latency", "GetRecords.Records", "GetRecords.Success", "IncomingBytes", "IncomingRecords", "PutRecord.Bytes", "PutRecord.Latency", "PutRecord.Success", "PutRecords.Bytes", "PutRecords.Latency", "PutRecords.Records", "PutRecords.Success", "ReadProvisionedThroughputExceeded", "WriteProvisionedThroughputExceeded", "IteratorAgeMilliseconds", "OutgoingBytes", "OutgoingRecords"}, - "AWS/KinesisAnalytics": {"Bytes", "MillisBehindLatest", "Records"}, + "AWS/KinesisAnalytics": {"Bytes", "MillisBehindLatest", "Records", "Success"}, "AWS/Lambda": {"Invocations", "Errors", "Duration", "Throttles"}, "AWS/Logs": {"IncomingBytes", "IncomingLogEvents", "ForwardedBytes", "ForwardedLogEvents", "DeliveryErrors", "DeliveryThrottling"}, "AWS/ML": {"PredictCount", "PredictFailureCount"}, @@ -113,7 +113,7 @@ func init() { "AWS/Firehose": {}, "AWS/IoT": {"Protocol"}, "AWS/Kinesis": {"StreamName", "ShardID"}, - "AWS/KinesisAnalytics": {"Flow", "Id"}, + "AWS/KinesisAnalytics": {"Flow", "Id", "Application"}, "AWS/Lambda": {"FunctionName", "Resource", "Version", "Alias"}, "AWS/Logs": {"LogGroupName", "DestinationType", "FilterName"}, "AWS/ML": {"MLModelId", "RequestMode"}, From 6a723dff37ddc6ec0235cdb5ef30a298c82a1895 Mon Sep 17 00:00:00 2001 From: bergquist Date: Tue, 13 Sep 2016 14:25:48 +0200 Subject: [PATCH 073/175] feat(notifications): set default value to false for new notifications --- public/app/features/alerting/alert_tab_ctrl.ts | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/public/app/features/alerting/alert_tab_ctrl.ts b/public/app/features/alerting/alert_tab_ctrl.ts index b372520507d..8cb0f09ee9c 100644 --- a/public/app/features/alerting/alert_tab_ctrl.ts +++ b/public/app/features/alerting/alert_tab_ctrl.ts @@ -130,7 +130,11 @@ export class AlertTabCtrl { return; } - this.alertNotifications.push({name: model.name, iconClass: this.getNotificationIcon(model.type)}); + this.alertNotifications.push({ + name: model.name, + iconClass: this.getNotificationIcon(model.type), + isDefault: false + }); this.alert.notifications.push({id: model.id}); // reset plus button From a73424d6af55528531ca70fbcec9e36c86e5d62c Mon Sep 17 00:00:00 2001 From: wvl Date: Tue, 13 Sep 2016 15:04:21 +0200 Subject: [PATCH 074/175] Secure Elasticsearch datasources a bit (#6031) Instead of allowing users to access the entire cluster, apply some sane restrictions. Change-Id: Ib2e93722bf2e39d700d4afa713ff49ec556f2fdf --- pkg/api/dataproxy.go | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/pkg/api/dataproxy.go b/pkg/api/dataproxy.go index 66d654d4d93..97f2529c781 100644 --- a/pkg/api/dataproxy.go +++ b/pkg/api/dataproxy.go @@ -104,6 +104,22 @@ func ProxyDataSourceRequest(c *middleware.Context) { } proxyPath := c.Params("*") + + if ds.Type == m.DS_ES { + if c.Req.Request.Method == "DELETE" { + c.JsonApiErr(403, "Deletes not allowed on proxied Elasticsearch datasource", nil) + return + } + if c.Req.Request.Method == "PUT" { + c.JsonApiErr(403, "Puts not allowed on proxied Elasticsearch datasource", nil) + return + } + if c.Req.Request.Method == "POST" && proxyPath != "_msearch" { + c.JsonApiErr(403, "Posts not allowed on proxied Elasticsearch datasource except on /_msearch", nil) + return + } + } + proxy := NewReverseProxy(ds, proxyPath, targetUrl) proxy.Transport = dataProxyTransport proxy.ServeHTTP(c.Resp, c.Req.Request) From b0c7e61ef869537093b03da9b57399dd3d10dc03 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Torkel=20=C3=96degaard?= Date: Tue, 13 Sep 2016 15:09:55 +0200 Subject: [PATCH 075/175] feat(alerting): removed severity --- pkg/api/alerting.go | 2 - pkg/api/dtos/alerting.go | 22 +++-- pkg/metrics/metrics.go | 80 +++++++++---------- pkg/models/alert.go | 26 ++---- pkg/services/alerting/eval_context.go | 17 ++-- pkg/services/alerting/extractor.go | 5 -- pkg/services/alerting/interfaces.go | 4 +- pkg/services/alerting/notifier.go | 4 +- pkg/services/alerting/notifier_test.go | 15 ++-- pkg/services/alerting/notifiers/base.go | 22 ++--- pkg/services/alerting/notifiers/base_test.go | 50 ++++++------ pkg/services/alerting/notifiers/email.go | 19 +++-- pkg/services/alerting/notifiers/webhook.go | 1 - pkg/services/alerting/result_handler.go | 18 ++--- pkg/services/alerting/rule.go | 4 +- pkg/services/alerting/test_notification.go | 30 +++---- pkg/services/sqlstore/alert.go | 2 +- pkg/services/sqlstore/alert_test.go | 4 +- public/app/features/alerting/alert_def.ts | 25 ++---- .../app/features/alerting/alert_list_ctrl.ts | 5 +- .../app/features/alerting/alert_tab_ctrl.ts | 10 +-- .../features/alerting/partials/alert_tab.html | 14 +--- .../app/features/alerting/threshold_mapper.ts | 2 +- 23 files changed, 143 insertions(+), 238 deletions(-) diff --git a/pkg/api/alerting.go b/pkg/api/alerting.go index bd40d8d63e9..d9a543b2425 100644 --- a/pkg/api/alerting.go +++ b/pkg/api/alerting.go @@ -49,7 +49,6 @@ func GetAlerts(c *middleware.Context) Response { Name: alert.Name, Message: alert.Message, State: alert.State, - Severity: alert.Severity, EvalDate: alert.EvalDate, NewStateDate: alert.NewStateDate, ExecutionError: alert.ExecutionError, @@ -219,7 +218,6 @@ func NotificationTest(c *middleware.Context, dto dtos.NotificationTestCommand) R cmd := &alerting.NotificationTestCommand{ Name: dto.Name, Type: dto.Type, - Severity: dto.Severity, Settings: dto.Settings, } diff --git a/pkg/api/dtos/alerting.go b/pkg/api/dtos/alerting.go index 2b91cf0cb5b..e024768cd5e 100644 --- a/pkg/api/dtos/alerting.go +++ b/pkg/api/dtos/alerting.go @@ -8,17 +8,16 @@ import ( ) type AlertRule struct { - Id int64 `json:"id"` - DashboardId int64 `json:"dashboardId"` - PanelId int64 `json:"panelId"` - Name string `json:"name"` - Message string `json:"message"` - State m.AlertStateType `json:"state"` - Severity m.AlertSeverityType `json:"severity"` - NewStateDate time.Time `json:"newStateDate"` - EvalDate time.Time `json:"evalDate"` - ExecutionError string `json:"executionError"` - DashbboardUri string `json:"dashboardUri"` + Id int64 `json:"id"` + DashboardId int64 `json:"dashboardId"` + PanelId int64 `json:"panelId"` + Name string `json:"name"` + Message string `json:"message"` + State m.AlertStateType `json:"state"` + NewStateDate time.Time `json:"newStateDate"` + EvalDate time.Time `json:"evalDate"` + ExecutionError string `json:"executionError"` + DashbboardUri string `json:"dashboardUri"` } type AlertNotification struct { @@ -58,5 +57,4 @@ type NotificationTestCommand struct { Name string `json:"name"` Type string `json:"type"` Settings *simplejson.Json `json:"settings"` - Severity string `json:"severity"` } diff --git a/pkg/metrics/metrics.go b/pkg/metrics/metrics.go index 80d316c022f..bbe580de218 100644 --- a/pkg/metrics/metrics.go +++ b/pkg/metrics/metrics.go @@ -9,43 +9,42 @@ func init() { } var ( - M_Instance_Start Counter - M_Page_Status_200 Counter - M_Page_Status_500 Counter - M_Page_Status_404 Counter - M_Page_Status_Unknown Counter - M_Api_Status_200 Counter - M_Api_Status_404 Counter - M_Api_Status_500 Counter - M_Api_Status_Unknown Counter - M_Proxy_Status_200 Counter - M_Proxy_Status_404 Counter - M_Proxy_Status_500 Counter - M_Proxy_Status_Unknown Counter - M_Api_User_SignUpStarted Counter - M_Api_User_SignUpCompleted Counter - M_Api_User_SignUpInvite Counter - M_Api_Dashboard_Save Timer - M_Api_Dashboard_Get Timer - M_Api_Dashboard_Search Timer - M_Api_Admin_User_Create Counter - M_Api_Login_Post Counter - M_Api_Login_OAuth Counter - M_Api_Org_Create Counter - M_Api_Dashboard_Snapshot_Create Counter - M_Api_Dashboard_Snapshot_External Counter - M_Api_Dashboard_Snapshot_Get Counter - M_Models_Dashboard_Insert Counter - M_Alerting_Result_State_Critical Counter - M_Alerting_Result_State_Warning Counter - M_Alerting_Result_State_Ok Counter - M_Alerting_Result_State_Paused Counter - M_Alerting_Result_State_Unknown Counter - M_Alerting_Result_State_ExecutionError Counter - M_Alerting_Active_Alerts Counter - M_Alerting_Notification_Sent_Slack Counter - M_Alerting_Notification_Sent_Email Counter - M_Alerting_Notification_Sent_Webhook Counter + M_Instance_Start Counter + M_Page_Status_200 Counter + M_Page_Status_500 Counter + M_Page_Status_404 Counter + M_Page_Status_Unknown Counter + M_Api_Status_200 Counter + M_Api_Status_404 Counter + M_Api_Status_500 Counter + M_Api_Status_Unknown Counter + M_Proxy_Status_200 Counter + M_Proxy_Status_404 Counter + M_Proxy_Status_500 Counter + M_Proxy_Status_Unknown Counter + M_Api_User_SignUpStarted Counter + M_Api_User_SignUpCompleted Counter + M_Api_User_SignUpInvite Counter + M_Api_Dashboard_Save Timer + M_Api_Dashboard_Get Timer + M_Api_Dashboard_Search Timer + M_Api_Admin_User_Create Counter + M_Api_Login_Post Counter + M_Api_Login_OAuth Counter + M_Api_Org_Create Counter + M_Api_Dashboard_Snapshot_Create Counter + M_Api_Dashboard_Snapshot_External Counter + M_Api_Dashboard_Snapshot_Get Counter + M_Models_Dashboard_Insert Counter + M_Alerting_Result_State_Alerting Counter + M_Alerting_Result_State_Ok Counter + M_Alerting_Result_State_Paused Counter + M_Alerting_Result_State_NoData Counter + M_Alerting_Result_State_ExecError Counter + M_Alerting_Active_Alerts Counter + M_Alerting_Notification_Sent_Slack Counter + M_Alerting_Notification_Sent_Email Counter + M_Alerting_Notification_Sent_Webhook Counter // Timers M_DataSource_ProxyReq_Timer Timer @@ -92,12 +91,11 @@ func initMetricVars(settings *MetricSettings) { M_Models_Dashboard_Insert = RegCounter("models.dashboard.insert") - M_Alerting_Result_State_Critical = RegCounter("alerting.result", "state", "critical") - M_Alerting_Result_State_Warning = RegCounter("alerting.result", "state", "warning") + M_Alerting_Result_State_Alerting = RegCounter("alerting.result", "state", "alerting") M_Alerting_Result_State_Ok = RegCounter("alerting.result", "state", "ok") M_Alerting_Result_State_Paused = RegCounter("alerting.result", "state", "paused") - M_Alerting_Result_State_Unknown = RegCounter("alerting.result", "state", "unknown") - M_Alerting_Result_State_ExecutionError = RegCounter("alerting.result", "state", "execution_error") + M_Alerting_Result_State_NoData = RegCounter("alerting.result", "state", "no_data") + M_Alerting_Result_State_ExecError = RegCounter("alerting.result", "state", "exec_error") M_Alerting_Active_Alerts = RegCounter("alerting.active_alerts") M_Alerting_Notification_Sent_Slack = RegCounter("alerting.notifications_sent", "type", "slack") diff --git a/pkg/models/alert.go b/pkg/models/alert.go index d7dcd5b39a8..23c2c747a0f 100644 --- a/pkg/models/alert.go +++ b/pkg/models/alert.go @@ -10,27 +10,15 @@ type AlertStateType string type AlertSeverityType string const ( - AlertStateUnknown AlertStateType = "unknown" - AlertStateExeuctionError AlertStateType = "execution_error" - AlertStatePaused AlertStateType = "paused" - AlertStateCritical AlertStateType = "critical" - AlertStateWarning AlertStateType = "warning" - AlertStateOK AlertStateType = "ok" + AlertStateNoData AlertStateType = "no_data" + AlertStateExecError AlertStateType = "execution_error" + AlertStatePaused AlertStateType = "paused" + AlertStateAlerting AlertStateType = "alerting" + AlertStateOK AlertStateType = "ok" ) func (s AlertStateType) IsValid() bool { - return s == AlertStateOK || s == AlertStateUnknown || s == AlertStateExeuctionError || s == AlertStatePaused || s == AlertStateCritical || s == AlertStateWarning -} - -const ( - AlertSeverityCritical AlertSeverityType = "critical" - AlertSeverityWarning AlertSeverityType = "warning" - AlertSeverityInfo AlertSeverityType = "info" - AlertSeverityOK AlertSeverityType = "ok" -) - -func (s AlertSeverityType) IsValid() bool { - return s == AlertSeverityCritical || s == AlertSeverityInfo || s == AlertSeverityWarning + return s == AlertStateOK || s == AlertStateNoData || s == AlertStateExecError || s == AlertStatePaused } type Alert struct { @@ -41,7 +29,7 @@ type Alert struct { PanelId int64 Name string Message string - Severity AlertSeverityType + Severity string State AlertStateType Handler int64 Silenced bool diff --git a/pkg/services/alerting/eval_context.go b/pkg/services/alerting/eval_context.go index f54a4e212be..13067c25f08 100644 --- a/pkg/services/alerting/eval_context.go +++ b/pkg/services/alerting/eval_context.go @@ -43,25 +43,20 @@ func (c *EvalContext) GetStateModel() *StateDescription { Color: "#36a64f", Text: "OK", } - case m.AlertStateUnknown: + case m.AlertStateNoData: return &StateDescription{ Color: "#888888", - Text: "UNKNOWN", + Text: "No Data", } - case m.AlertStateExeuctionError: + case m.AlertStateExecError: return &StateDescription{ Color: "#000", - Text: "EXECUTION_ERROR", + Text: "Execution Error", } - case m.AlertStateWarning: - return &StateDescription{ - Color: "#fd821b", - Text: "WARNING", - } - case m.AlertStateCritical: + case m.AlertStateAlerting: return &StateDescription{ Color: "#D63232", - Text: "CRITICAL", + Text: "Alerting", } default: panic("Unknown rule state " + c.Rule.State) diff --git a/pkg/services/alerting/extractor.go b/pkg/services/alerting/extractor.go index 7d3b800fb31..cf516786412 100644 --- a/pkg/services/alerting/extractor.go +++ b/pkg/services/alerting/extractor.go @@ -88,14 +88,9 @@ func (e *DashAlertExtractor) GetAlerts() ([]*m.Alert, error) { Name: jsonAlert.Get("name").MustString(), Handler: jsonAlert.Get("handler").MustInt64(), Message: jsonAlert.Get("message").MustString(), - Severity: m.AlertSeverityType(jsonAlert.Get("severity").MustString()), Frequency: getTimeDurationStringToSeconds(jsonAlert.Get("frequency").MustString()), } - if !alert.Severity.IsValid() { - return nil, ValidationError{Reason: "Invalid alert Severity"} - } - for _, condition := range jsonAlert.Get("conditions").MustArray() { jsonCondition := simplejson.NewFromAny(condition) diff --git a/pkg/services/alerting/interfaces.go b/pkg/services/alerting/interfaces.go index e2549da2365..78ffc280375 100644 --- a/pkg/services/alerting/interfaces.go +++ b/pkg/services/alerting/interfaces.go @@ -2,8 +2,6 @@ package alerting import ( "time" - - "github.com/grafana/grafana/pkg/models" ) type EvalHandler interface { @@ -19,7 +17,7 @@ type Notifier interface { Notify(alertResult *EvalContext) GetType() string NeedsImage() bool - MatchSeverity(result models.AlertSeverityType) bool + PassesFilter(rule *Rule) bool } type Condition interface { diff --git a/pkg/services/alerting/notifier.go b/pkg/services/alerting/notifier.go index 9a81501833d..bb48f71cdcd 100644 --- a/pkg/services/alerting/notifier.go +++ b/pkg/services/alerting/notifier.go @@ -28,7 +28,7 @@ func (n *RootNotifier) NeedsImage() bool { return false } -func (n *RootNotifier) MatchSeverity(result m.AlertSeverityType) bool { +func (n *RootNotifier) PassesFilter(rule *Rule) bool { return false } @@ -130,7 +130,7 @@ func shouldUseNotification(notifier Notifier, context *EvalContext) bool { return true } - return notifier.MatchSeverity(context.Rule.Severity) + return notifier.PassesFilter(context.Rule) } type NotifierFactory func(notification *m.AlertNotification) (Notifier, error) diff --git a/pkg/services/alerting/notifier_test.go b/pkg/services/alerting/notifier_test.go index 1354177f9b3..c854d8475b5 100644 --- a/pkg/services/alerting/notifier_test.go +++ b/pkg/services/alerting/notifier_test.go @@ -6,6 +6,7 @@ import ( "fmt" "github.com/grafana/grafana/pkg/models" + m "github.com/grafana/grafana/pkg/models" . "github.com/smartystreets/goconvey/convey" ) @@ -23,7 +24,7 @@ func (fn *FakeNotifier) NeedsImage() bool { func (fn *FakeNotifier) Notify(alertResult *EvalContext) {} -func (fn *FakeNotifier) MatchSeverity(result models.AlertSeverityType) bool { +func (fn *FakeNotifier) PassesFilter(rule *Rule) bool { return fn.FakeMatchResult } @@ -34,7 +35,7 @@ func TestAlertNotificationExtraction(t *testing.T) { ctx := &EvalContext{ Firing: false, Rule: &Rule{ - Severity: models.AlertSeverityCritical, + State: m.AlertStateAlerting, }, } notifier := &FakeNotifier{FakeMatchResult: false} @@ -42,12 +43,12 @@ func TestAlertNotificationExtraction(t *testing.T) { So(shouldUseNotification(notifier, ctx), ShouldBeTrue) }) - Convey("exeuction error cannot be ignored", func() { + Convey("execution error cannot be ignored", func() { ctx := &EvalContext{ Firing: true, Error: fmt.Errorf("I used to be a programmer just like you"), Rule: &Rule{ - Severity: models.AlertSeverityCritical, + State: m.AlertStateOK, }, } notifier := &FakeNotifier{FakeMatchResult: false} @@ -59,7 +60,7 @@ func TestAlertNotificationExtraction(t *testing.T) { ctx := &EvalContext{ Firing: true, Rule: &Rule{ - Severity: models.AlertSeverityCritical, + State: models.AlertStateAlerting, }, } notifier := &FakeNotifier{FakeMatchResult: true} @@ -70,9 +71,7 @@ func TestAlertNotificationExtraction(t *testing.T) { Convey("firing alert that dont match", func() { ctx := &EvalContext{ Firing: true, - Rule: &Rule{ - Severity: models.AlertSeverityCritical, - }, + Rule: &Rule{State: m.AlertStateOK}, } notifier := &FakeNotifier{FakeMatchResult: false} diff --git a/pkg/services/alerting/notifiers/base.go b/pkg/services/alerting/notifiers/base.go index acfafd59ac4..27c2a625d17 100644 --- a/pkg/services/alerting/notifiers/base.go +++ b/pkg/services/alerting/notifiers/base.go @@ -2,33 +2,21 @@ package notifiers import ( "github.com/grafana/grafana/pkg/components/simplejson" - "github.com/grafana/grafana/pkg/models" + "github.com/grafana/grafana/pkg/services/alerting" ) type NotifierBase struct { - Name string - Type string - SeverityFilter models.AlertSeverityType + Name string + Type string } func NewNotifierBase(name, notifierType string, model *simplejson.Json) NotifierBase { base := NotifierBase{Name: name, Type: notifierType} - - severityFilter := models.AlertSeverityType(model.Get("severityFilter").MustString("")) - - if severityFilter == models.AlertSeverityCritical || severityFilter == models.AlertSeverityWarning { - base.SeverityFilter = severityFilter - } - return base } -func (n *NotifierBase) MatchSeverity(result models.AlertSeverityType) bool { - if !n.SeverityFilter.IsValid() { - return true - } - - return n.SeverityFilter == result +func (n *NotifierBase) PassesFilter(rule *alerting.Rule) bool { + return true } func (n *NotifierBase) GetType() string { diff --git a/pkg/services/alerting/notifiers/base_test.go b/pkg/services/alerting/notifiers/base_test.go index af5dd902c87..775594fea44 100644 --- a/pkg/services/alerting/notifiers/base_test.go +++ b/pkg/services/alerting/notifiers/base_test.go @@ -3,34 +3,32 @@ package notifiers import ( "testing" - "github.com/grafana/grafana/pkg/components/simplejson" - m "github.com/grafana/grafana/pkg/models" . "github.com/smartystreets/goconvey/convey" ) func TestBaseNotifier(t *testing.T) { - Convey("Parsing base notification severity", t, func() { - - Convey("matches", func() { - json := ` - { - "severityFilter": "critical" - }` - - settingsJSON, _ := simplejson.NewJson([]byte(json)) - not := NewNotifierBase("ops", "email", settingsJSON) - So(not.MatchSeverity(m.AlertSeverityCritical), ShouldBeTrue) - }) - - Convey("does not match", func() { - json := ` - { - "severityFilter": "critical" - }` - - settingsJSON, _ := simplejson.NewJson([]byte(json)) - not := NewNotifierBase("ops", "email", settingsJSON) - So(not.MatchSeverity(m.AlertSeverityWarning), ShouldBeFalse) - }) - }) + // Convey("Parsing base notification state", t, func() { + // + // Convey("matches", func() { + // json := ` + // { + // "states": "critical" + // }` + // + // settingsJSON, _ := simplejson.NewJson([]byte(json)) + // not := NewNotifierBase("ops", "email", settingsJSON) + // So(not.MatchSeverity(m.AlertSeverityCritical), ShouldBeTrue) + // }) + // + // Convey("does not match", func() { + // json := ` + // { + // "severityFilter": "critical" + // }` + // + // settingsJSON, _ := simplejson.NewJson([]byte(json)) + // not := NewNotifierBase("ops", "email", settingsJSON) + // So(not.MatchSeverity(m.AlertSeverityWarning), ShouldBeFalse) + // }) + // }) } diff --git a/pkg/services/alerting/notifiers/email.go b/pkg/services/alerting/notifiers/email.go index c754dd7985e..eccd3ce9dfb 100644 --- a/pkg/services/alerting/notifiers/email.go +++ b/pkg/services/alerting/notifiers/email.go @@ -47,16 +47,15 @@ func (this *EmailNotifier) Notify(context *alerting.EvalContext) { cmd := &m.SendEmailCommand{ Data: map[string]interface{}{ - "Title": context.GetNotificationTitle(), - "State": context.Rule.State, - "Name": context.Rule.Name, - "Severity": context.Rule.Severity, - "SeverityColor": context.GetStateModel().Color, - "Message": context.Rule.Message, - "RuleUrl": ruleUrl, - "ImageLink": context.ImagePublicUrl, - "AlertPageUrl": setting.AppUrl + "alerting", - "EvalMatches": context.EvalMatches, + "Title": context.GetNotificationTitle(), + "State": context.Rule.State, + "Name": context.Rule.Name, + "StateModel": context.GetStateModel(), + "Message": context.Rule.Message, + "RuleUrl": ruleUrl, + "ImageLink": context.ImagePublicUrl, + "AlertPageUrl": setting.AppUrl + "alerting", + "EvalMatches": context.EvalMatches, }, To: this.Addresses, Template: "alert_notification.html", diff --git a/pkg/services/alerting/notifiers/webhook.go b/pkg/services/alerting/notifiers/webhook.go index 9a66d18c73c..7e28b35cd0a 100644 --- a/pkg/services/alerting/notifiers/webhook.go +++ b/pkg/services/alerting/notifiers/webhook.go @@ -45,7 +45,6 @@ func (this *WebhookNotifier) Notify(context *alerting.EvalContext) { bodyJSON.Set("ruleId", context.Rule.Id) bodyJSON.Set("ruleName", context.Rule.Name) bodyJSON.Set("state", context.Rule.State) - bodyJSON.Set("severity", context.Rule.Severity) bodyJSON.Set("evalMatches", context.EvalMatches) ruleUrl, err := context.GetRuleUrl() diff --git a/pkg/services/alerting/result_handler.go b/pkg/services/alerting/result_handler.go index 822d2bf8513..2f9572dcf80 100644 --- a/pkg/services/alerting/result_handler.go +++ b/pkg/services/alerting/result_handler.go @@ -34,11 +34,11 @@ func (handler *DefaultResultHandler) Handle(ctx *EvalContext) { annotationData := simplejson.New() if ctx.Error != nil { handler.log.Error("Alert Rule Result Error", "ruleId", ctx.Rule.Id, "error", ctx.Error) - ctx.Rule.State = m.AlertStateExeuctionError + ctx.Rule.State = m.AlertStateExecError exeuctionError = ctx.Error.Error() annotationData.Set("errorMessage", exeuctionError) } else if ctx.Firing { - ctx.Rule.State = m.AlertStateType(ctx.Rule.Severity) + ctx.Rule.State = m.AlertStateAlerting annotationData = simplejson.NewFromAny(ctx.EvalMatches) } else { // handle no data case @@ -90,17 +90,15 @@ func (handler *DefaultResultHandler) Handle(ctx *EvalContext) { func countStateResult(state m.AlertStateType) { switch state { - case m.AlertStateCritical: - metrics.M_Alerting_Result_State_Critical.Inc(1) - case m.AlertStateWarning: - metrics.M_Alerting_Result_State_Warning.Inc(1) + case m.AlertStateAlerting: + metrics.M_Alerting_Result_State_Alerting.Inc(1) case m.AlertStateOK: metrics.M_Alerting_Result_State_Ok.Inc(1) case m.AlertStatePaused: metrics.M_Alerting_Result_State_Paused.Inc(1) - case m.AlertStateUnknown: - metrics.M_Alerting_Result_State_Unknown.Inc(1) - case m.AlertStateExeuctionError: - metrics.M_Alerting_Result_State_ExecutionError.Inc(1) + case m.AlertStateNoData: + metrics.M_Alerting_Result_State_NoData.Inc(1) + case m.AlertStateExecError: + metrics.M_Alerting_Result_State_ExecError.Inc(1) } } diff --git a/pkg/services/alerting/rule.go b/pkg/services/alerting/rule.go index a967e2c40fb..5f59b60b64f 100644 --- a/pkg/services/alerting/rule.go +++ b/pkg/services/alerting/rule.go @@ -20,7 +20,6 @@ type Rule struct { Message string NoDataState m.AlertStateType State m.AlertStateType - Severity m.AlertSeverityType Conditions []Condition Notifications []int64 } @@ -66,9 +65,8 @@ func NewRuleFromDBAlert(ruleDef *m.Alert) (*Rule, error) { model.Name = ruleDef.Name model.Message = ruleDef.Message model.Frequency = ruleDef.Frequency - model.Severity = ruleDef.Severity model.State = ruleDef.State - model.NoDataState = m.AlertStateType(ruleDef.Settings.Get("noDataState").MustString("unknown")) + model.NoDataState = m.AlertStateType(ruleDef.Settings.Get("noDataState").MustString("no_data")) for _, v := range ruleDef.Settings.Get("notifications").MustArray() { jsonModel := simplejson.NewFromAny(v) diff --git a/pkg/services/alerting/test_notification.go b/pkg/services/alerting/test_notification.go index c3fbaeb4f1c..c483835b8e1 100644 --- a/pkg/services/alerting/test_notification.go +++ b/pkg/services/alerting/test_notification.go @@ -4,11 +4,11 @@ import ( "github.com/grafana/grafana/pkg/bus" "github.com/grafana/grafana/pkg/components/simplejson" "github.com/grafana/grafana/pkg/log" - "github.com/grafana/grafana/pkg/models" + m "github.com/grafana/grafana/pkg/models" ) type NotificationTestCommand struct { - Severity string + State m.AlertStateType Name string Type string Settings *simplejson.Json @@ -22,7 +22,7 @@ func init() { func handleNotificationTestCommand(cmd *NotificationTestCommand) error { notifier := NewRootNotifier() - model := &models.AlertNotification{ + model := &m.AlertNotification{ Name: cmd.Name, Type: cmd.Type, Settings: cmd.Settings, @@ -35,23 +35,12 @@ func handleNotificationTestCommand(cmd *NotificationTestCommand) error { return err } - severity := models.AlertSeverityType(cmd.Severity) - notifier.sendNotifications([]Notifier{notifiers}, createTestEvalContext(severity)) + notifier.sendNotifications([]Notifier{notifiers}, createTestEvalContext(cmd.State)) return nil } -func createTestEvalContext(severity models.AlertSeverityType) *EvalContext { - state := models.AlertStateOK - firing := false - if severity == models.AlertSeverityCritical { - state = models.AlertStateCritical - firing = true - } - if severity == models.AlertSeverityWarning { - state = models.AlertStateWarning - firing = true - } +func createTestEvalContext(state m.AlertStateType) *EvalContext { testRule := &Rule{ DashboardId: 1, @@ -59,23 +48,22 @@ func createTestEvalContext(severity models.AlertSeverityType) *EvalContext { Name: "Test notification", Message: "Someone is testing the alert notification within grafana.", State: state, - Severity: severity, } ctx := NewEvalContext(testRule) ctx.ImagePublicUrl = "http://grafana.org/assets/img/blog/mixed_styles.png" ctx.IsTestRun = true - ctx.Firing = firing + ctx.Firing = state == m.AlertStateAlerting ctx.Error = nil - ctx.EvalMatches = evalMatchesBasedOnSeverity(severity) + ctx.EvalMatches = evalMatchesBasedOnState(state) return ctx } -func evalMatchesBasedOnSeverity(severity models.AlertSeverityType) []*EvalMatch { +func evalMatchesBasedOnState(state m.AlertStateType) []*EvalMatch { matches := make([]*EvalMatch, 0) - if severity == models.AlertSeverityOK { + if state == m.AlertStateOK { return matches } diff --git a/pkg/services/sqlstore/alert.go b/pkg/services/sqlstore/alert.go index cfabe7c12d2..8e22fc7dd43 100644 --- a/pkg/services/sqlstore/alert.go +++ b/pkg/services/sqlstore/alert.go @@ -159,7 +159,7 @@ func upsertAlerts(existingAlerts []*m.Alert, cmd *m.SaveAlertsCommand, sess *xor } else { alert.Updated = time.Now() alert.Created = time.Now() - alert.State = m.AlertStateUnknown + alert.State = m.AlertStateNoData alert.NewStateDate = time.Now() _, err := sess.Insert(alert) diff --git a/pkg/services/sqlstore/alert_test.go b/pkg/services/sqlstore/alert_test.go index 2bdfdd28efa..02126c2984a 100644 --- a/pkg/services/sqlstore/alert_test.go +++ b/pkg/services/sqlstore/alert_test.go @@ -47,7 +47,7 @@ func TestAlertingDataAccess(t *testing.T) { So(err2, ShouldBeNil) So(alert.Name, ShouldEqual, "Alerting title") So(alert.Message, ShouldEqual, "Alerting message") - So(alert.State, ShouldEqual, "unknown") + So(alert.State, ShouldEqual, "no_data") So(alert.Frequency, ShouldEqual, 1) }) @@ -77,7 +77,7 @@ func TestAlertingDataAccess(t *testing.T) { So(query.Result[0].Name, ShouldEqual, "Name") Convey("Alert state should not be updated", func() { - So(query.Result[0].State, ShouldEqual, "unknown") + So(query.Result[0].State, ShouldEqual, "no_data") }) }) diff --git a/public/app/features/alerting/alert_def.ts b/public/app/features/alerting/alert_def.ts index 1c0312c3028..15f1f373bd5 100644 --- a/public/app/features/alerting/alert_def.ts +++ b/public/app/features/alerting/alert_def.ts @@ -38,9 +38,8 @@ var reducerTypes = [ var noDataModes = [ {text: 'OK', value: 'ok'}, - {text: 'Critical', value: 'critical'}, - {text: 'Warning', value: 'warning'}, - {text: 'Unknown', value: 'unknown'}, + {text: 'Alerting', value: 'alerting'}, + {text: 'No Data', value: 'no_data'}, ]; function createReducerPart(model) { @@ -48,10 +47,6 @@ function createReducerPart(model) { return new QueryPart(model, def); } -var severityLevels = { - 'critical': {text: 'Critical', iconClass: 'icon-gf icon-gf-critical', stateClass: 'alert-state-critical'}, - 'warning': {text: 'Warning', iconClass: 'icon-gf icon-gf-warning', stateClass: 'alert-state-warning'}, -}; function getStateDisplayModel(state) { switch (state) { @@ -62,23 +57,16 @@ function getStateDisplayModel(state) { stateClass: 'alert-state-ok' }; } - case 'critical': { + case 'alerting': { return { - text: 'CRITICAL', + text: 'ALERTING', iconClass: 'icon-gf icon-gf-critical', stateClass: 'alert-state-critical' }; } - case 'warning': { + case 'no_data': { return { - text: 'WARNING', - iconClass: 'icon-gf icon-gf-warning', - stateClass: 'alert-state-warning' - }; - } - case 'unknown': { - return { - text: 'UNKNOWN', + text: 'NO DATA', iconClass: "fa fa-question", stateClass: 'alert-state-warning' }; @@ -106,7 +94,6 @@ export default { getStateDisplayModel: getStateDisplayModel, conditionTypes: conditionTypes, evalFunctions: evalFunctions, - severityLevels: severityLevels, noDataModes: noDataModes, reducerTypes: reducerTypes, createReducerPart: createReducerPart, diff --git a/public/app/features/alerting/alert_list_ctrl.ts b/public/app/features/alerting/alert_list_ctrl.ts index 0a8e9addcd7..4b429e961a7 100644 --- a/public/app/features/alerting/alert_list_ctrl.ts +++ b/public/app/features/alerting/alert_list_ctrl.ts @@ -13,9 +13,8 @@ export class AlertListCtrl { stateFilters = [ {text: 'All', value: null}, {text: 'OK', value: 'ok'}, - {text: 'Unknown', value: 'unknown'}, - {text: 'Warning', value: 'warning'}, - {text: 'Critical', value: 'critical'}, + {text: 'Alerting', value: 'alerting'}, + {text: 'No Data', value: 'no_data'}, {text: 'Execution Error', value: 'execution_error'}, ]; diff --git a/public/app/features/alerting/alert_tab_ctrl.ts b/public/app/features/alerting/alert_tab_ctrl.ts index ee8892f6bba..e71b7686d5c 100644 --- a/public/app/features/alerting/alert_tab_ctrl.ts +++ b/public/app/features/alerting/alert_tab_ctrl.ts @@ -17,7 +17,6 @@ export class AlertTabCtrl { alert: any; conditionModels: any; evalFunctions: any; - severityLevels: any; noDataModes: any; addNotificationSegment; notifications; @@ -41,7 +40,6 @@ export class AlertTabCtrl { this.subTabIndex = 0; this.evalFunctions = alertDef.evalFunctions; this.conditionTypes = alertDef.conditionTypes; - this.severityLevels = alertDef.severityLevels; this.noDataModes = alertDef.noDataModes; this.appSubUrl = config.appSubUrl; } @@ -155,8 +153,7 @@ export class AlertTabCtrl { alert.conditions.push(this.buildDefaultCondition()); } - alert.noDataState = alert.noDataState || 'unknown'; - alert.severity = alert.severity || 'critical'; + alert.noDataState = alert.noDataState || 'no_data'; alert.frequency = alert.frequency || '60s'; alert.handler = alert.handler || 1; alert.notifications = alert.notifications || []; @@ -321,11 +318,6 @@ export class AlertTabCtrl { this.panelCtrl.render(); } - severityChanged() { - ThresholdMapper.alertToGraphThresholds(this.panel); - this.panelCtrl.render(); - } - evaluatorTypeChanged(evaluator) { // ensure params array is correct length switch (evaluator.type) { diff --git a/public/app/features/alerting/partials/alert_tab.html b/public/app/features/alerting/partials/alert_tab.html index a8ec861a5eb..434605ffe5e 100644 --- a/public/app/features/alerting/partials/alert_tab.html +++ b/public/app/features/alerting/partials/alert_tab.html @@ -29,18 +29,8 @@
    Name -
    -
    -
    - Evaluate every - -
    -
    - Severity -
    - -
    + Evaluate every +
    diff --git a/public/app/features/alerting/threshold_mapper.ts b/public/app/features/alerting/threshold_mapper.ts index 16801b9a9fa..b14f9a4d933 100644 --- a/public/app/features/alerting/threshold_mapper.ts +++ b/public/app/features/alerting/threshold_mapper.ts @@ -62,7 +62,7 @@ export class ThresholdMapper { for (var t of panel.thresholds) { t.fill = true; t.line = true; - t.colorMode = panel.alert.severity; + t.colorMode = 'critical'; } var updated = true; From 3af891d02358504f9d19b0481b09a3454f0052af Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Torkel=20=C3=96degaard?= Date: Tue, 13 Sep 2016 16:13:41 +0200 Subject: [PATCH 076/175] feat(alerting): restored alert history --- pkg/services/sqlstore/annotation.go | 6 ++++-- public/app/features/alerting/alert_tab_ctrl.ts | 2 +- public/app/features/alerting/partials/alert_tab.html | 7 +++---- 3 files changed, 8 insertions(+), 7 deletions(-) diff --git a/pkg/services/sqlstore/annotation.go b/pkg/services/sqlstore/annotation.go index b604b0de44f..88152af4ce0 100644 --- a/pkg/services/sqlstore/annotation.go +++ b/pkg/services/sqlstore/annotation.go @@ -53,8 +53,10 @@ func (r *SqlAnnotationRepo) Find(query *annotations.ItemQuery) ([]*annotations.I params = append(params, query.PanelId) } - sql.WriteString(` AND epoch BETWEEN ? AND ?`) - params = append(params, query.From, query.To) + if query.From > 0 && query.To > 0 { + sql.WriteString(` AND epoch BETWEEN ? AND ?`) + params = append(params, query.From, query.To) + } if query.Type != "" { sql.WriteString(` AND type = ?`) diff --git a/public/app/features/alerting/alert_tab_ctrl.ts b/public/app/features/alerting/alert_tab_ctrl.ts index e71b7686d5c..62ac4c00e46 100644 --- a/public/app/features/alerting/alert_tab_ctrl.ts +++ b/public/app/features/alerting/alert_tab_ctrl.ts @@ -86,7 +86,7 @@ export class AlertTabCtrl { } getAlertHistory() { - this.backendSrv.get(`/api/alert-history?dashboardId=${this.panelCtrl.dashboard.id}&panelId=${this.panel.id}&limit=50`).then(res => { + this.backendSrv.get(`/api/annotations?dashboardId=${this.panelCtrl.dashboard.id}&panelId=${this.panel.id}&limit=50`).then(res => { this.alertHistory = _.map(res, ah => { ah.time = moment(ah.timestamp).format('MMM D, YYYY HH:mm:ss'); ah.stateModel = alertDef.getStateDisplayModel(ah.newState); diff --git a/public/app/features/alerting/partials/alert_tab.html b/public/app/features/alerting/partials/alert_tab.html index 434605ffe5e..3d6e183d93f 100644 --- a/public/app/features/alerting/partials/alert_tab.html +++ b/public/app/features/alerting/partials/alert_tab.html @@ -27,11 +27,10 @@
    Alert Config
    - Name - - Evaluate every + Name + + Evaluate every -
    From 8c30babdf1b5b3bc7b022b40ed0a359fcd8f58c6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Torkel=20=C3=96degaard?= Date: Tue, 13 Sep 2016 16:24:00 +0200 Subject: [PATCH 077/175] feat(alerting): fixed build issues --- pkg/services/alerting/extractor_test.go | 6 ------ pkg/services/alerting/notifiers/base_test.go | 8 ++------ pkg/services/annotations/annotations.go | 1 + .../sqlstore/migrations/annotation_mig.go | 19 +++++++++++-------- 4 files changed, 14 insertions(+), 20 deletions(-) diff --git a/pkg/services/alerting/extractor_test.go b/pkg/services/alerting/extractor_test.go index e3df5e571d1..b25ce313b54 100644 --- a/pkg/services/alerting/extractor_test.go +++ b/pkg/services/alerting/extractor_test.go @@ -44,7 +44,6 @@ func TestAlertRuleExtraction(t *testing.T) { "handler": 1, "enabled": true, "frequency": "60s", - "severity": "critical", "conditions": [ { "type": "query", @@ -129,11 +128,6 @@ func TestAlertRuleExtraction(t *testing.T) { So(alerts[1].Handler, ShouldEqual, 0) }) - Convey("should extract Severity property", func() { - So(alerts[0].Severity, ShouldEqual, "critical") - So(alerts[1].Severity, ShouldEqual, "warning") - }) - Convey("should extract frequency in seconds", func() { So(alerts[0].Frequency, ShouldEqual, 60) So(alerts[1].Frequency, ShouldEqual, 60) diff --git a/pkg/services/alerting/notifiers/base_test.go b/pkg/services/alerting/notifiers/base_test.go index 775594fea44..8e527906cfd 100644 --- a/pkg/services/alerting/notifiers/base_test.go +++ b/pkg/services/alerting/notifiers/base_test.go @@ -1,12 +1,8 @@ package notifiers -import ( - "testing" +import . "github.com/smartystreets/goconvey/convey" - . "github.com/smartystreets/goconvey/convey" -) - -func TestBaseNotifier(t *testing.T) { +func TestBaseNotifier( /* t *testing.T */ ) { // Convey("Parsing base notification state", t, func() { // // Convey("matches", func() { diff --git a/pkg/services/annotations/annotations.go b/pkg/services/annotations/annotations.go index 9c0b44316dc..e39970d8b3a 100644 --- a/pkg/services/annotations/annotations.go +++ b/pkg/services/annotations/annotations.go @@ -40,6 +40,7 @@ type Item struct { OrgId int64 `json:"orgId"` DashboardId int64 `json:"dashboardId"` PanelId int64 `json:"panelId"` + CategoryId int64 `json:"panelId"` Type ItemType `json:"type"` Title string `json:"title"` Text string `json:"text"` diff --git a/pkg/services/sqlstore/migrations/annotation_mig.go b/pkg/services/sqlstore/migrations/annotation_mig.go index 6e2f6a680ba..a307100ad3c 100644 --- a/pkg/services/sqlstore/migrations/annotation_mig.go +++ b/pkg/services/sqlstore/migrations/annotation_mig.go @@ -15,6 +15,7 @@ func addAnnotationMig(mg *Migrator) { {Name: "user_id", Type: DB_BigInt, Nullable: true}, {Name: "dashboard_id", Type: DB_BigInt, Nullable: true}, {Name: "panel_id", Type: DB_BigInt, Nullable: true}, + {Name: "category_id", Type: DB_BigInt, Nullable: true}, {Name: "type", Type: DB_NVarchar, Length: 25, Nullable: false}, {Name: "title", Type: DB_Text, Nullable: false}, {Name: "text", Type: DB_Text, Nullable: false}, @@ -27,18 +28,20 @@ func addAnnotationMig(mg *Migrator) { Indices: []*Index{ {Cols: []string{"org_id", "alert_id"}, Type: IndexType}, {Cols: []string{"org_id", "type"}, Type: IndexType}, - {Cols: []string{"dashboard_id", "panel_id"}, Type: IndexType}, - {Cols: []string{"epoch"}, Type: IndexType}, + {Cols: []string{"org_id", "category_id"}, Type: IndexType}, + {Cols: []string{"org_id", "dashboard_id", "panel_id", "epoch"}, Type: IndexType}, + {Cols: []string{"org_id", "epoch"}, Type: IndexType}, }, } - mg.AddMigration("Drop old annotation table v3", NewDropTableMigration("annotation")) + mg.AddMigration("Drop old annotation table v4", NewDropTableMigration("annotation")) - mg.AddMigration("create annotation table v4", NewAddTableMigration(table)) + mg.AddMigration("create annotation table v5", NewAddTableMigration(table)) // create indices - mg.AddMigration("add index annotation org_id & alert_id v3", NewAddIndexMigration(table, table.Indices[0])) - mg.AddMigration("add index annotation org_id & type v3", NewAddIndexMigration(table, table.Indices[1])) - mg.AddMigration("add index annotation dashboard_id panel_id", NewAddIndexMigration(table, table.Indices[2])) - mg.AddMigration("add index annotation epoch v3", NewAddIndexMigration(table, table.Indices[3])) + mg.AddMigration("add index annotation 0 v3", NewAddIndexMigration(table, table.Indices[0])) + mg.AddMigration("add index annotation 1 v3", NewAddIndexMigration(table, table.Indices[1])) + mg.AddMigration("add index annotation 2 v3", NewAddIndexMigration(table, table.Indices[2])) + mg.AddMigration("add index annotation 3 v3", NewAddIndexMigration(table, table.Indices[3])) + mg.AddMigration("add index annotation 4 v3", NewAddIndexMigration(table, table.Indices[4])) } From f5809c02099d34a97b6e642aac81da5a27187fb3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Torkel=20=C3=96degaard?= Date: Tue, 13 Sep 2016 20:14:18 +0200 Subject: [PATCH 078/175] fix(build): trying to fix build --- pkg/services/alerting/notifiers/base_test.go | 56 +++++++++---------- pkg/services/alerting/test_notification.go | 16 ++---- .../alerting/notification_edit_ctrl.ts | 1 - .../alerting/partials/notification_edit.html | 18 ------ 4 files changed, 34 insertions(+), 57 deletions(-) diff --git a/pkg/services/alerting/notifiers/base_test.go b/pkg/services/alerting/notifiers/base_test.go index 8e527906cfd..8cfc1ec3ae9 100644 --- a/pkg/services/alerting/notifiers/base_test.go +++ b/pkg/services/alerting/notifiers/base_test.go @@ -1,30 +1,30 @@ package notifiers -import . "github.com/smartystreets/goconvey/convey" - -func TestBaseNotifier( /* t *testing.T */ ) { - // Convey("Parsing base notification state", t, func() { - // - // Convey("matches", func() { - // json := ` - // { - // "states": "critical" - // }` - // - // settingsJSON, _ := simplejson.NewJson([]byte(json)) - // not := NewNotifierBase("ops", "email", settingsJSON) - // So(not.MatchSeverity(m.AlertSeverityCritical), ShouldBeTrue) - // }) - // - // Convey("does not match", func() { - // json := ` - // { - // "severityFilter": "critical" - // }` - // - // settingsJSON, _ := simplejson.NewJson([]byte(json)) - // not := NewNotifierBase("ops", "email", settingsJSON) - // So(not.MatchSeverity(m.AlertSeverityWarning), ShouldBeFalse) - // }) - // }) -} +// import . "github.com/smartystreets/goconvey/convey" +// +// func TestBaseNotifier( t *testing.T ) { +// Convey("Parsing base notification state", t, func() { +// +// Convey("matches", func() { +// json := ` +// { +// "states": "critical" +// }` +// +// settingsJSON, _ := simplejson.NewJson([]byte(json)) +// not := NewNotifierBase("ops", "email", settingsJSON) +// So(not.MatchSeverity(m.AlertSeverityCritical), ShouldBeTrue) +// }) +// +// Convey("does not match", func() { +// json := ` +// { +// "severityFilter": "critical" +// }` +// +// settingsJSON, _ := simplejson.NewJson([]byte(json)) +// not := NewNotifierBase("ops", "email", settingsJSON) +// So(not.MatchSeverity(m.AlertSeverityWarning), ShouldBeFalse) +// }) +// }) +// } diff --git a/pkg/services/alerting/test_notification.go b/pkg/services/alerting/test_notification.go index c483835b8e1..de2cb981aaa 100644 --- a/pkg/services/alerting/test_notification.go +++ b/pkg/services/alerting/test_notification.go @@ -35,38 +35,34 @@ func handleNotificationTestCommand(cmd *NotificationTestCommand) error { return err } - notifier.sendNotifications([]Notifier{notifiers}, createTestEvalContext(cmd.State)) + notifier.sendNotifications([]Notifier{notifiers}, createTestEvalContext()) return nil } -func createTestEvalContext(state m.AlertStateType) *EvalContext { +func createTestEvalContext() *EvalContext { testRule := &Rule{ DashboardId: 1, PanelId: 1, Name: "Test notification", Message: "Someone is testing the alert notification within grafana.", - State: state, + State: m.AlertStateAlerting, } ctx := NewEvalContext(testRule) ctx.ImagePublicUrl = "http://grafana.org/assets/img/blog/mixed_styles.png" ctx.IsTestRun = true - ctx.Firing = state == m.AlertStateAlerting + ctx.Firing = true ctx.Error = nil - ctx.EvalMatches = evalMatchesBasedOnState(state) + ctx.EvalMatches = evalMatchesBasedOnState() return ctx } -func evalMatchesBasedOnState(state m.AlertStateType) []*EvalMatch { +func evalMatchesBasedOnState() []*EvalMatch { matches := make([]*EvalMatch, 0) - if state == m.AlertStateOK { - return matches - } - matches = append(matches, &EvalMatch{ Metric: "High value", Value: 100, diff --git a/public/app/features/alerting/notification_edit_ctrl.ts b/public/app/features/alerting/notification_edit_ctrl.ts index 3ef9e822333..de5703a0631 100644 --- a/public/app/features/alerting/notification_edit_ctrl.ts +++ b/public/app/features/alerting/notification_edit_ctrl.ts @@ -62,7 +62,6 @@ export class AlertNotificationEditCtrl { name: this.model.name, type: this.model.type, settings: this.model.settings, - severity: this.testSeverity }; this.backendSrv.post(`/api/alert-notifications/test`, payload) diff --git a/public/app/features/alerting/partials/notification_edit.html b/public/app/features/alerting/partials/notification_edit.html index 59f4607a2e7..65964b2c7c4 100644 --- a/public/app/features/alerting/partials/notification_edit.html +++ b/public/app/features/alerting/partials/notification_edit.html @@ -25,15 +25,6 @@ -
    - Severity filter -
    - -
    -
    -
    - Severity for test notification -
    - -
    -
    From 25139c77b9abdf9221ba65533673d5169fc5ee25 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Torkel=20=C3=96degaard?= Date: Tue, 13 Sep 2016 20:33:49 +0200 Subject: [PATCH 079/175] tech(update angularjs): updated angularjs to 1.5.9 --- bower.json | 8 +- public/vendor/angular-mocks/.bower.json | 14 +- public/vendor/angular-mocks/LICENSE.md | 21 + public/vendor/angular-mocks/README.md | 2 +- public/vendor/angular-mocks/angular-mocks.js | 663 +- public/vendor/angular-mocks/bower.json | 4 +- public/vendor/angular-mocks/package.json | 11 +- public/vendor/angular-route/.bower.json | 14 +- public/vendor/angular-route/LICENSE.md | 21 + public/vendor/angular-route/angular-route.js | 366 +- .../vendor/angular-route/angular-route.min.js | 22 +- .../angular-route/angular-route.min.js.map | 6 +- public/vendor/angular-route/bower.json | 4 +- public/vendor/angular-route/package.json | 11 +- public/vendor/angular-sanitize/.bower.json | 14 +- public/vendor/angular-sanitize/LICENSE.md | 21 + .../angular-sanitize/angular-sanitize.js | 696 +- .../angular-sanitize/angular-sanitize.min.js | 21 +- .../angular-sanitize.min.js.map | 6 +- public/vendor/angular-sanitize/bower.json | 4 +- public/vendor/angular-sanitize/package.json | 11 +- public/vendor/angular/.bower.json | 12 +- public/vendor/angular/LICENSE.md | 21 + public/vendor/angular/angular.js | 5619 +++++++++++------ public/vendor/angular/angular.min.js | 630 +- public/vendor/angular/angular.min.js.gzip | Bin 54974 -> 57862 bytes public/vendor/angular/angular.min.js.map | 6 +- public/vendor/angular/bower.json | 2 +- public/vendor/angular/package.json | 2 +- 29 files changed, 5544 insertions(+), 2688 deletions(-) create mode 100644 public/vendor/angular-mocks/LICENSE.md create mode 100644 public/vendor/angular-route/LICENSE.md create mode 100644 public/vendor/angular-sanitize/LICENSE.md create mode 100644 public/vendor/angular/LICENSE.md diff --git a/bower.json b/bower.json index 2624254acbe..be47d97901e 100644 --- a/bower.json +++ b/bower.json @@ -14,10 +14,10 @@ ], "dependencies": { "jquery": "~2.2.4", - "angular": "~1.5.3", - "angular-route": "~1.5.3", - "angular-mocks": "~1.5.3", - "angular-sanitize": "~1.5.3", + "angular": "~1.5.9", + "angular-route": "~1.5.9", + "angular-mocks": "~1.5.9", + "angular-sanitize": "~1.5.9", "angular-bindonce": "~0.3.3" } } diff --git a/public/vendor/angular-mocks/.bower.json b/public/vendor/angular-mocks/.bower.json index 03fc650628a..9c007005ad9 100644 --- a/public/vendor/angular-mocks/.bower.json +++ b/public/vendor/angular-mocks/.bower.json @@ -1,20 +1,20 @@ { "name": "angular-mocks", - "version": "1.5.3", + "version": "1.5.9-build.5020+sha.0784977", "license": "MIT", "main": "./angular-mocks.js", "ignore": [], "dependencies": { - "angular": "1.5.3" + "angular": "1.5.9-build.5020+sha.0784977" }, "homepage": "https://github.com/angular/bower-angular-mocks", - "_release": "1.5.3", + "_release": "1.5.9-build.5020+sha.0784977", "_resolution": { "type": "version", - "tag": "v1.5.3", - "commit": "319557fe710cecc11e12c772cc1abb8098d29ccb" + "tag": "v1.5.9-build.5020+sha.0784977", + "commit": "f390789bb409cabbcaec5e3d316e467c9df5863f" }, - "_source": "git://github.com/angular/bower-angular-mocks.git", - "_target": "~1.5.3", + "_source": "https://github.com/angular/bower-angular-mocks.git", + "_target": "~1.5.9", "_originalSource": "angular-mocks" } \ No newline at end of file diff --git a/public/vendor/angular-mocks/LICENSE.md b/public/vendor/angular-mocks/LICENSE.md new file mode 100644 index 00000000000..2c395eef1ba --- /dev/null +++ b/public/vendor/angular-mocks/LICENSE.md @@ -0,0 +1,21 @@ +The MIT License (MIT) + +Copyright (c) 2016 Angular + +Permission is hereby granted, free of charge, to any person obtaining a copy +of this software and associated documentation files (the "Software"), to deal +in the Software without restriction, including without limitation the rights +to use, copy, modify, merge, publish, distribute, sublicense, and/or sell +copies of the Software, and to permit persons to whom the Software is +furnished to do so, subject to the following conditions: + +The above copyright notice and this permission notice shall be included in all +copies or substantial portions of the Software. + +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, +OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE +SOFTWARE. diff --git a/public/vendor/angular-mocks/README.md b/public/vendor/angular-mocks/README.md index 440cce9b78a..61b9d8c0831 100644 --- a/public/vendor/angular-mocks/README.md +++ b/public/vendor/angular-mocks/README.md @@ -20,7 +20,7 @@ You can `require` ngMock modules: var angular = require('angular'); angular.module('myMod', [ require('angular-animate'), - require('angular-mocks/ngMock') + require('angular-mocks/ngMock'), require('angular-mocks/ngAnimateMock') ]); ``` diff --git a/public/vendor/angular-mocks/angular-mocks.js b/public/vendor/angular-mocks/angular-mocks.js index a1fc2fcf7ae..1917193cff6 100644 --- a/public/vendor/angular-mocks/angular-mocks.js +++ b/public/vendor/angular-mocks/angular-mocks.js @@ -1,9 +1,9 @@ /** - * @license AngularJS v1.5.3 + * @license AngularJS v1.5.9-build.5020+sha.0784977 * (c) 2010-2016 Google, Inc. http://angularjs.org * License: MIT */ -(function(window, angular, undefined) { +(function(window, angular) { 'use strict'; @@ -13,6 +13,7 @@ * @description * * Namespace from 'angular-mocks.js' which contains testing related code. + * */ angular.mock = {}; @@ -24,7 +25,7 @@ angular.mock = {}; * @description * This service is a mock implementation of {@link ng.$browser}. It provides fake * implementation for commonly used browser apis that are hard to test, e.g. setTimeout, xhr, - * cookies, etc... + * cookies, etc. * * The api of this service is the same as that of the real {@link ng.$browser $browser}, except * that there are several helper methods available which can be used in tests. @@ -39,7 +40,7 @@ angular.mock.$Browser = function() { var self = this; this.isMock = true; - self.$$url = "http://server/"; + self.$$url = 'http://server/'; self.$$lastUrl = self.$$url; // used by url polling fn self.pollFns = []; @@ -112,19 +113,29 @@ angular.mock.$Browser = function() { * @param {number=} number of milliseconds to flush. See {@link #defer.now} */ self.defer.flush = function(delay) { + var nextTime; + if (angular.isDefined(delay)) { - self.defer.now += delay; + // A delay was passed so compute the next time + nextTime = self.defer.now + delay; } else { if (self.deferredFns.length) { - self.defer.now = self.deferredFns[self.deferredFns.length - 1].time; + // No delay was passed so set the next time so that it clears the deferred queue + nextTime = self.deferredFns[self.deferredFns.length - 1].time; } else { + // No delay passed, but there are no deferred tasks so flush - indicates an error! throw new Error('No deferred tasks to be flushed'); } } - while (self.deferredFns.length && self.deferredFns[0].time <= self.defer.now) { + while (self.deferredFns.length && self.deferredFns[0].time <= nextTime) { + // Increment the time and call the next deferred function + self.defer.now = self.deferredFns[0].time; self.deferredFns.shift().fn(); } + + // Ensure that the current time is correct + self.defer.now = nextTime; }; self.$$baseHref = '/'; @@ -226,13 +237,13 @@ angular.mock.$ExceptionHandlerProvider = function() { * @param {string} mode Mode of operation, defaults to `rethrow`. * * - `log`: Sometimes it is desirable to test that an error is thrown, for this case the `log` - * mode stores an array of errors in `$exceptionHandler.errors`, to allow later - * assertion of them. See {@link ngMock.$log#assertEmpty assertEmpty()} and - * {@link ngMock.$log#reset reset()} + * mode stores an array of errors in `$exceptionHandler.errors`, to allow later assertion of + * them. See {@link ngMock.$log#assertEmpty assertEmpty()} and + * {@link ngMock.$log#reset reset()}. * - `rethrow`: If any errors are passed to the handler in tests, it typically means that there - * is a bug in the application or test, so this mock will make these tests fail. - * For any implementations that expect exceptions to be thrown, the `rethrow` mode - * will also maintain a log of thrown errors. + * is a bug in the application or test, so this mock will make these tests fail. For any + * implementations that expect exceptions to be thrown, the `rethrow` mode will also maintain + * a log of thrown errors in `$exceptionHandler.errors`. */ this.mode = function(mode) { @@ -241,19 +252,19 @@ angular.mock.$ExceptionHandlerProvider = function() { case 'rethrow': var errors = []; handler = function(e) { - if (arguments.length == 1) { + if (arguments.length === 1) { errors.push(e); } else { errors.push([].slice.call(arguments, 0)); } - if (mode === "rethrow") { + if (mode === 'rethrow') { throw e; } }; handler.errors = errors; break; default: - throw new Error("Unknown mode '" + mode + "', only 'log'/'rethrow' modes are allowed!"); + throw new Error('Unknown mode \'' + mode + '\', only \'log\'/\'rethrow\' modes are allowed!'); } }; @@ -403,8 +414,8 @@ angular.mock.$LogProvider = function() { }); }); if (errors.length) { - errors.unshift("Expected $log to be empty! Either a message was logged unexpectedly, or " + - "an expected log message was not checked and removed:"); + errors.unshift('Expected $log to be empty! Either a message was logged unexpectedly, or ' + + 'an expected log message was not checked and removed:'); errors.push(''); throw new Error(errors.join('\n---------\n')); } @@ -452,7 +463,7 @@ angular.mock.$IntervalProvider = function() { promise = deferred.promise; count = (angular.isDefined(count)) ? count : 0; - promise.then(null, null, (!hasParams) ? fn : function() { + promise.then(null, function() {}, (!hasParams) ? fn : function() { fn.apply(null, args); }); @@ -512,6 +523,7 @@ angular.mock.$IntervalProvider = function() { }); if (angular.isDefined(fnIndex)) { + repeatFns[fnIndex].deferred.promise.then(undefined, function() {}); repeatFns[fnIndex].deferred.reject('canceled'); repeatFns.splice(fnIndex, 1); return true; @@ -547,16 +559,13 @@ angular.mock.$IntervalProvider = function() { }; -/* jshint -W101 */ -/* The R_ISO8061_STR regex is never going to fit into the 100 char limit! - * This directive should go inside the anonymous function but a bug in JSHint means that it would - * not be enacted early enough to prevent the warning. - */ -var R_ISO8061_STR = /^(-?\d{4})-?(\d\d)-?(\d\d)(?:T(\d\d)(?:\:?(\d\d)(?:\:?(\d\d)(?:\.(\d{3}))?)?)?(Z|([+-])(\d\d):?(\d\d)))?$/; - function jsonStringToDate(string) { + // The R_ISO8061_STR regex is never going to fit into the 100 char limit! + // eslit-disable-next-line max-len + var R_ISO8061_STR = /^(-?\d{4})-?(\d\d)-?(\d\d)(?:T(\d\d)(?::?(\d\d)(?::?(\d\d)(?:\.(\d{3}))?)?)?(Z|([+-])(\d\d):?(\d\d)))?$/; + var match; - if (match = string.match(R_ISO8061_STR)) { + if ((match = string.match(R_ISO8061_STR))) { var date = new Date(0), tzHour = 0, tzMin = 0; @@ -639,9 +648,10 @@ angular.mock.TzDate = function(offset, timestamp) { timestamp = self.origDate.getTime(); if (isNaN(timestamp)) { + // eslint-disable-next-line no-throw-literal throw { - name: "Illegal Argument", - message: "Arg '" + tsStr + "' passed into TzDate constructor is not a valid date string" + name: 'Illegal Argument', + message: 'Arg \'' + tsStr + '\' passed into TzDate constructor is not a valid date string' }; } } else { @@ -747,7 +757,7 @@ angular.mock.TzDate = function(offset, timestamp) { angular.forEach(unimplementedMethods, function(methodName) { self[methodName] = function() { - throw new Error("Method '" + methodName + "' is not implemented in the TzDate mock"); + throw new Error('Method \'' + methodName + '\' is not implemented in the TzDate mock'); }; }); @@ -756,7 +766,6 @@ angular.mock.TzDate = function(offset, timestamp) { //make "tzDateInstance instanceof Date" return true angular.mock.TzDate.prototype = Date.prototype; -/* jshint +W101 */ /** @@ -766,6 +775,8 @@ angular.mock.TzDate.prototype = Date.prototype; * @description * Mock implementation of the {@link ng.$animate `$animate`} service. Exposes two additional methods * for testing animations. + * + * You need to require the `ngAnimateMock` module in your test suite for instance `beforeEach(module('ngAnimateMock'))` */ angular.mock.animate = angular.module('ngAnimateMock', ['ng']) @@ -931,13 +942,10 @@ angular.mock.animate = angular.module('ngAnimateMock', ['ng']) * @name angular.mock.dump * @description * - * *NOTE*: this is not an injectable instance, just a globally available function. + * *NOTE*: This is not an injectable instance, just a globally available function. * - * Method for serializing common angular objects (scope, elements, etc..) into strings, useful for - * debugging. - * - * This method is also available on window, where it can be used to display objects on debug - * console. + * Method for serializing common angular objects (scope, elements, etc..) into strings. + * It is useful for logging objects to the console when debugging. * * @param {*} object - any object to turn into string. * @return {string} a serialized string of the argument @@ -1003,8 +1011,10 @@ angular.mock.dump = function(object) { * Fake HTTP backend implementation suitable for unit testing applications that use the * {@link ng.$http $http service}. * - * *Note*: For fake HTTP backend implementation suitable for end-to-end testing or backend-less + *
    + * **Note**: For fake HTTP backend implementation suitable for end-to-end testing or backend-less * development please see {@link ngMockE2E.$httpBackend e2e $httpBackend mock}. + *
    * * During unit testing, we want our unit tests to run quickly and have no external dependencies so * we don’t want to send [XHR](https://developer.mozilla.org/en/xmlhttprequest) or @@ -1203,7 +1213,7 @@ angular.mock.dump = function(object) { $httpBackend.expectPOST('/add-msg.py', undefined, function(headers) { // check if the header was sent, if it wasn't the expectation won't // match the request and the test will fail - return headers['Authorization'] == 'xxx'; + return headers['Authorization'] === 'xxx'; }).respond(201, ''); $rootScope.saveMessage('whatever'); @@ -1328,12 +1338,15 @@ function createHttpBackendMock($rootScope, $timeout, $delegate, $browser) { } // TODO(vojta): change params to: method, url, data, headers, callback - function $httpBackend(method, url, data, callback, headers, timeout, withCredentials, responseType) { + function $httpBackend(method, url, data, callback, headers, timeout, withCredentials, responseType, eventHandlers, uploadEventHandlers) { var xhr = new MockXhr(), expectation = expectations[0], wasExpected = false; + xhr.$$events = eventHandlers; + xhr.upload.$$events = uploadEventHandlers; + function prettyPrint(data) { return (angular.isString(data) || angular.isFunction(data) || data instanceof RegExp) ? data @@ -1342,7 +1355,11 @@ function createHttpBackendMock($rootScope, $timeout, $delegate, $browser) { function wrapResponse(wrapped) { if (!$browser && timeout) { - timeout.then ? timeout.then(handleTimeout) : $timeout(handleTimeout, timeout); + if (timeout.then) { + timeout.then(handleTimeout); + } else { + $timeout(handleTimeout, timeout); + } } return handleResponse; @@ -1393,7 +1410,7 @@ function createHttpBackendMock($rootScope, $timeout, $delegate, $browser) { // if $browser specified, we do auto flush all requests ($browser ? $browser.defer : responsesPush)(wrapResponse(definition)); } else if (definition.passThrough) { - $delegate(method, url, data, callback, headers, timeout, withCredentials, responseType); + $delegate(method, url, data, callback, headers, timeout, withCredentials, responseType, eventHandlers, uploadEventHandlers); } else throw new Error('No response defined !'); return; } @@ -1411,7 +1428,7 @@ function createHttpBackendMock($rootScope, $timeout, $delegate, $browser) { * Creates a new backend definition. * * @param {string} method HTTP method. - * @param {string|RegExp|function(string)} url HTTP url or function that receives a url + * @param {string|RegExp|function(string)=} url HTTP url or function that receives a url * and returns true if the url matches the current definition. * @param {(string|RegExp|function(string))=} data HTTP request body or function that receives * data string and returns true if the data is as expected. @@ -1423,14 +1440,19 @@ function createHttpBackendMock($rootScope, $timeout, $delegate, $browser) { * order to change how a matched request is handled. * * - respond – - * `{function([status,] data[, headers, statusText]) - * | function(function(method, url, data, headers, params)}` + * ```js + * {function([status,] data[, headers, statusText]) + * | function(function(method, url, data, headers, params)} + * ``` * – The respond method takes a set of static data to be returned or a function that can - * return an array containing response status (number), response data (string), response - * headers (Object), and the text for the status (string). The respond method returns the - * `requestHandler` object for possible overrides. + * return an array containing response status (number), response data (Array|Object|string), + * response headers (Object), and the text for the status (string). The respond method returns + * the `requestHandler` object for possible overrides. */ $httpBackend.when = function(method, url, data, headers, keys) { + + assertArgDefined(arguments, 1, 'url'); + var definition = new MockHttpExpectation(method, url, data, headers, keys), chain = { respond: function(status, data, headers, statusText) { @@ -1458,7 +1480,7 @@ function createHttpBackendMock($rootScope, $timeout, $delegate, $browser) { * @description * Creates a new backend definition for GET requests. For more info see `when()`. * - * @param {string|RegExp|function(string)} url HTTP url or function that receives a url + * @param {string|RegExp|function(string)=} url HTTP url or function that receives a url * and returns true if the url matches the current definition. * @param {(Object|function(Object))=} headers HTTP headers. * @param {(Array)=} keys Array of keys to assign to regex matches in request url described above. @@ -1473,7 +1495,7 @@ function createHttpBackendMock($rootScope, $timeout, $delegate, $browser) { * @description * Creates a new backend definition for HEAD requests. For more info see `when()`. * - * @param {string|RegExp|function(string)} url HTTP url or function that receives a url + * @param {string|RegExp|function(string)=} url HTTP url or function that receives a url * and returns true if the url matches the current definition. * @param {(Object|function(Object))=} headers HTTP headers. * @param {(Array)=} keys Array of keys to assign to regex matches in request url described above. @@ -1488,7 +1510,7 @@ function createHttpBackendMock($rootScope, $timeout, $delegate, $browser) { * @description * Creates a new backend definition for DELETE requests. For more info see `when()`. * - * @param {string|RegExp|function(string)} url HTTP url or function that receives a url + * @param {string|RegExp|function(string)=} url HTTP url or function that receives a url * and returns true if the url matches the current definition. * @param {(Object|function(Object))=} headers HTTP headers. * @param {(Array)=} keys Array of keys to assign to regex matches in request url described above. @@ -1503,7 +1525,7 @@ function createHttpBackendMock($rootScope, $timeout, $delegate, $browser) { * @description * Creates a new backend definition for POST requests. For more info see `when()`. * - * @param {string|RegExp|function(string)} url HTTP url or function that receives a url + * @param {string|RegExp|function(string)=} url HTTP url or function that receives a url * and returns true if the url matches the current definition. * @param {(string|RegExp|function(string))=} data HTTP request body or function that receives * data string and returns true if the data is as expected. @@ -1520,7 +1542,7 @@ function createHttpBackendMock($rootScope, $timeout, $delegate, $browser) { * @description * Creates a new backend definition for PUT requests. For more info see `when()`. * - * @param {string|RegExp|function(string)} url HTTP url or function that receives a url + * @param {string|RegExp|function(string)=} url HTTP url or function that receives a url * and returns true if the url matches the current definition. * @param {(string|RegExp|function(string))=} data HTTP request body or function that receives * data string and returns true if the data is as expected. @@ -1537,7 +1559,7 @@ function createHttpBackendMock($rootScope, $timeout, $delegate, $browser) { * @description * Creates a new backend definition for JSONP requests. For more info see `when()`. * - * @param {string|RegExp|function(string)} url HTTP url or function that receives a url + * @param {string|RegExp|function(string)=} url HTTP url or function that receives a url * and returns true if the url matches the current definition. * @param {(Array)=} keys Array of keys to assign to regex matches in request url described above. * @returns {requestHandler} Returns an object with `respond` method that controls how a matched @@ -1600,7 +1622,7 @@ function createHttpBackendMock($rootScope, $timeout, $delegate, $browser) { * Creates a new request expectation. * * @param {string} method HTTP method. - * @param {string|RegExp|function(string)} url HTTP url or function that receives a url + * @param {string|RegExp|function(string)=} url HTTP url or function that receives a url * and returns true if the url matches the current definition. * @param {(string|RegExp|function(string)|Object)=} data HTTP request body or function that * receives data string and returns true if the data is as expected, or Object if request body @@ -1613,14 +1635,19 @@ function createHttpBackendMock($rootScope, $timeout, $delegate, $browser) { * order to change how a matched request is handled. * * - respond – - * `{function([status,] data[, headers, statusText]) - * | function(function(method, url, data, headers, params)}` + * ``` + * { function([status,] data[, headers, statusText]) + * | function(function(method, url, data, headers, params)} + * ``` * – The respond method takes a set of static data to be returned or a function that can - * return an array containing response status (number), response data (string), response - * headers (Object), and the text for the status (string). The respond method returns the - * `requestHandler` object for possible overrides. + * return an array containing response status (number), response data (Array|Object|string), + * response headers (Object), and the text for the status (string). The respond method returns + * the `requestHandler` object for possible overrides. */ $httpBackend.expect = function(method, url, data, headers, keys) { + + assertArgDefined(arguments, 1, 'url'); + var expectation = new MockHttpExpectation(method, url, data, headers, keys), chain = { respond: function(status, data, headers, statusText) { @@ -1639,7 +1666,7 @@ function createHttpBackendMock($rootScope, $timeout, $delegate, $browser) { * @description * Creates a new request expectation for GET requests. For more info see `expect()`. * - * @param {string|RegExp|function(string)} url HTTP url or function that receives a url + * @param {string|RegExp|function(string)=} url HTTP url or function that receives a url * and returns true if the url matches the current definition. * @param {Object=} headers HTTP headers. * @param {(Array)=} keys Array of keys to assign to regex matches in request url described above. @@ -1654,7 +1681,7 @@ function createHttpBackendMock($rootScope, $timeout, $delegate, $browser) { * @description * Creates a new request expectation for HEAD requests. For more info see `expect()`. * - * @param {string|RegExp|function(string)} url HTTP url or function that receives a url + * @param {string|RegExp|function(string)=} url HTTP url or function that receives a url * and returns true if the url matches the current definition. * @param {Object=} headers HTTP headers. * @param {(Array)=} keys Array of keys to assign to regex matches in request url described above. @@ -1669,7 +1696,7 @@ function createHttpBackendMock($rootScope, $timeout, $delegate, $browser) { * @description * Creates a new request expectation for DELETE requests. For more info see `expect()`. * - * @param {string|RegExp|function(string)} url HTTP url or function that receives a url + * @param {string|RegExp|function(string)=} url HTTP url or function that receives a url * and returns true if the url matches the current definition. * @param {Object=} headers HTTP headers. * @param {(Array)=} keys Array of keys to assign to regex matches in request url described above. @@ -1684,7 +1711,7 @@ function createHttpBackendMock($rootScope, $timeout, $delegate, $browser) { * @description * Creates a new request expectation for POST requests. For more info see `expect()`. * - * @param {string|RegExp|function(string)} url HTTP url or function that receives a url + * @param {string|RegExp|function(string)=} url HTTP url or function that receives a url * and returns true if the url matches the current definition. * @param {(string|RegExp|function(string)|Object)=} data HTTP request body or function that * receives data string and returns true if the data is as expected, or Object if request body @@ -1702,7 +1729,7 @@ function createHttpBackendMock($rootScope, $timeout, $delegate, $browser) { * @description * Creates a new request expectation for PUT requests. For more info see `expect()`. * - * @param {string|RegExp|function(string)} url HTTP url or function that receives a url + * @param {string|RegExp|function(string)=} url HTTP url or function that receives a url * and returns true if the url matches the current definition. * @param {(string|RegExp|function(string)|Object)=} data HTTP request body or function that * receives data string and returns true if the data is as expected, or Object if request body @@ -1720,7 +1747,7 @@ function createHttpBackendMock($rootScope, $timeout, $delegate, $browser) { * @description * Creates a new request expectation for PATCH requests. For more info see `expect()`. * - * @param {string|RegExp|function(string)} url HTTP url or function that receives a url + * @param {string|RegExp|function(string)=} url HTTP url or function that receives a url * and returns true if the url matches the current definition. * @param {(string|RegExp|function(string)|Object)=} data HTTP request body or function that * receives data string and returns true if the data is as expected, or Object if request body @@ -1738,7 +1765,7 @@ function createHttpBackendMock($rootScope, $timeout, $delegate, $browser) { * @description * Creates a new request expectation for JSONP requests. For more info see `expect()`. * - * @param {string|RegExp|function(string)} url HTTP url or function that receives an url + * @param {string|RegExp|function(string)=} url HTTP url or function that receives an url * and returns true if the url matches the current definition. * @param {(Array)=} keys Array of keys to assign to regex matches in request url described above. * @returns {requestHandler} Returns an object with `respond` method that controls how a matched @@ -1769,24 +1796,34 @@ function createHttpBackendMock($rootScope, $timeout, $delegate, $browser) { * @ngdoc method * @name $httpBackend#flush * @description - * Flushes all pending requests using the trained responses. + * Flushes pending requests using the trained responses. Requests are flushed in the order they + * were made, but it is also possible to skip one or more requests (for example to have them + * flushed later). This is useful for simulating scenarios where responses arrive from the server + * in any order. * - * @param {number=} count Number of responses to flush (in the order they arrived). If undefined, - * all pending requests will be flushed. If there are no pending requests when the flush method - * is called an exception is thrown (as this typically a sign of programming error). + * If there are no pending requests to flush when the method is called, an exception is thrown (as + * this is typically a sign of programming error). + * + * @param {number=} count - Number of responses to flush. If undefined/null, all pending requests + * (starting after `skip`) will be flushed. + * @param {number=} [skip=0] - Number of pending requests to skip. For example, a value of `5` + * would skip the first 5 pending requests and start flushing from the 6th onwards. */ - $httpBackend.flush = function(count, digest) { + $httpBackend.flush = function(count, skip, digest) { if (digest !== false) $rootScope.$digest(); - if (!responses.length) throw new Error('No pending request to flush !'); + + skip = skip || 0; + if (skip >= responses.length) throw new Error('No pending request to flush !'); if (angular.isDefined(count) && count !== null) { while (count--) { - if (!responses.length) throw new Error('No more pending request to flush !'); - responses.shift()(); + var part = responses.splice(skip, 1); + if (!part.length) throw new Error('No more pending request to flush !'); + part[0](); } } else { - while (responses.length) { - responses.shift()(); + while (responses.length > skip) { + responses.splice(skip, 1)[0](); } } $httpBackend.verifyNoOutstandingExpectation(digest); @@ -1828,7 +1865,8 @@ function createHttpBackendMock($rootScope, $timeout, $delegate, $browser) { * afterEach($httpBackend.verifyNoOutstandingRequest); * ``` */ - $httpBackend.verifyNoOutstandingRequest = function() { + $httpBackend.verifyNoOutstandingRequest = function(digest) { + if (digest !== false) $rootScope.$digest(); if (responses.length) { throw new Error('Unflushed requests: ' + responses.length); } @@ -1854,25 +1892,52 @@ function createHttpBackendMock($rootScope, $timeout, $delegate, $browser) { function createShortMethods(prefix) { angular.forEach(['GET', 'DELETE', 'JSONP', 'HEAD'], function(method) { $httpBackend[prefix + method] = function(url, headers, keys) { + assertArgDefined(arguments, 0, 'url'); + + // Change url to `null` if `undefined` to stop it throwing an exception further down + if (angular.isUndefined(url)) url = null; + return $httpBackend[prefix](method, url, undefined, headers, keys); }; }); angular.forEach(['PUT', 'POST', 'PATCH'], function(method) { $httpBackend[prefix + method] = function(url, data, headers, keys) { + assertArgDefined(arguments, 0, 'url'); + + // Change url to `null` if `undefined` to stop it throwing an exception further down + if (angular.isUndefined(url)) url = null; + return $httpBackend[prefix](method, url, data, headers, keys); }; }); } } +function assertArgDefined(args, index, name) { + if (args.length > index && angular.isUndefined(args[index])) { + throw new Error('Undefined argument `' + name + '`; the argument is provided but not defined'); + } +} + + function MockHttpExpectation(method, url, data, headers, keys) { + function getUrlParams(u) { + var params = u.slice(u.indexOf('?') + 1).split('&'); + return params.sort(); + } + + function compareUrl(u) { + return (url.slice(0, url.indexOf('?')) === u.slice(0, u.indexOf('?')) && + getUrlParams(url).join() === getUrlParams(u).join()); + } + this.data = data; this.headers = headers; this.match = function(m, u, d, h) { - if (method != m) return false; + if (method !== m) return false; if (!this.matchUrl(u)) return false; if (angular.isDefined(d) && !this.matchData(d)) return false; if (angular.isDefined(h) && !this.matchHeaders(h)) return false; @@ -1883,7 +1948,7 @@ function MockHttpExpectation(method, url, data, headers, keys) { if (!url) return true; if (angular.isFunction(url.test)) return url.test(u); if (angular.isFunction(url)) return url(u); - return url == u; + return (url === u || compareUrl(u)); }; this.matchHeaders = function(h) { @@ -1899,6 +1964,7 @@ function MockHttpExpectation(method, url, data, headers, keys) { if (data && !angular.isString(data)) { return angular.equals(angular.fromJson(angular.toJson(data)), angular.fromJson(d)); } + // eslint-disable-next-line eqeqeq return data == d; }; @@ -1930,7 +1996,7 @@ function MockHttpExpectation(method, url, data, headers, keys) { var obj = {}, key_value, key, queryStr = u.indexOf('?') > -1 ? u.substring(u.indexOf('?') + 1) - : ""; + : ''; angular.forEach(queryStr.split('&'), function(keyValue) { if (keyValue) { @@ -1997,7 +2063,7 @@ function MockXhr() { header = undefined; angular.forEach(this.$$respHeaders, function(headerVal, headerName) { - if (!header && angular.lowercase(headerName) == name) header = headerVal; + if (!header && angular.lowercase(headerName) === name) header = headerVal; }); return header; }; @@ -2012,6 +2078,20 @@ function MockXhr() { }; this.abort = angular.noop; + + // This section simulates the events on a real XHR object (and the upload object) + // When we are testing $httpBackend (inside the angular project) we make partial use of this + // but store the events directly ourselves on `$$events`, instead of going through the `addEventListener` + this.$$events = {}; + this.addEventListener = function(name, listener) { + if (angular.isUndefined(this.$$events[name])) this.$$events[name] = []; + this.$$events[name].push(listener); + }; + + this.upload = { + $$events: {}, + addEventListener: this.addEventListener + }; } @@ -2056,7 +2136,7 @@ angular.mock.$TimeoutDecorator = ['$delegate', '$browser', function($delegate, $ function formatPendingTasksAsString(tasks) { var result = []; angular.forEach(tasks, function(task) { - result.push('{id: ' + task.id + ', ' + 'time: ' + task.time + '}'); + result.push('{id: ' + task.id + ', time: ' + task.time + '}'); }); return result.join(', '); @@ -2166,9 +2246,15 @@ angular.mock.$RootElementProvider = function() { angular.mock.$ControllerDecorator = ['$delegate', function($delegate) { return function(expression, locals, later, ident) { if (later && typeof later === 'object') { - var create = $delegate(expression, locals, true, ident); - angular.extend(create.instance, later); - return create(); + var instantiate = $delegate(expression, locals, true, ident); + angular.extend(instantiate.instance, later); + + var instance = instantiate(); + if (instance !== instantiate.instance) { + angular.extend(instance, later); + } + + return instance; } return $delegate(expression, locals, later, ident); }; @@ -2178,12 +2264,21 @@ angular.mock.$ControllerDecorator = ['$delegate', function($delegate) { * @ngdoc service * @name $componentController * @description - * A service that can be used to create instances of component controllers. - *
    + * A service that can be used to create instances of component controllers. Useful for unit-testing. + * * Be aware that the controller will be instantiated and attached to the scope as specified in - * the component definition object. That means that you must always provide a `$scope` object - * in the `locals` param. - *
    + * the component definition object. If you do not provide a `$scope` object in the `locals` param + * then the helper will create a new isolated scope as a child of `$rootScope`. + * + * If you are using `$element` or `$attrs` in the controller, make sure to provide them as `locals`. + * The `$element` must be a jqLite-wrapped DOM element, and `$attrs` should be an object that + * has all properties / functions that you are using in the controller. If this is getting too complex, + * you should compile the component instead and access the component's controller via the + * {@link angular.element#methods `controller`} function. + * + * See also the section on {@link guide/component#unit-testing-component-controllers unit-testing component controllers} + * in the guide. + * * @param {string} componentName the name of the component whose controller we want to instantiate * @param {Object} locals Injection locals for Controller. * @param {Object=} bindings Properties to add to the controller before invoking the constructor. This is used @@ -2191,8 +2286,9 @@ angular.mock.$ControllerDecorator = ['$delegate', function($delegate) { * @param {string=} ident Override the property name to use when attaching the controller to the scope. * @return {Object} Instance of requested controller. */ -angular.mock.$ComponentControllerProvider = ['$compileProvider', function($compileProvider) { - this.$get = ['$controller','$injector', function($controller,$injector) { +angular.mock.$ComponentControllerProvider = ['$compileProvider', + function ComponentControllerProvider($compileProvider) { + this.$get = ['$controller','$injector', '$rootScope', function($controller, $injector, $rootScope) { return function $componentController(componentName, locals, bindings, ident) { // get all directives associated to the component name var directives = $injector.get(componentName + 'Directive'); @@ -2210,6 +2306,9 @@ angular.mock.$ComponentControllerProvider = ['$compileProvider', function($compi } // get the info of the component var directiveInfo = candidateDirectives[0]; + // create a scope if needed + locals = locals || {}; + locals.$scope = locals.$scope || $rootScope.$new(true); return $controller(directiveInfo.controller, locals, bindings, ident || directiveInfo.controllerAs); }; }]; @@ -2231,6 +2330,34 @@ angular.mock.$ComponentControllerProvider = ['$compileProvider', function($compi * *
    * + * @installation + * + * First, download the file: + * * [Google CDN](https://developers.google.com/speed/libraries/devguide#angularjs) e.g. + * `"//ajax.googleapis.com/ajax/libs/angularjs/X.Y.Z/angular-mocks.js"` + * * [NPM](https://www.npmjs.com/) e.g. `npm install angular-mocks@X.Y.Z` + * * [Bower](http://bower.io) e.g. `bower install angular-mocks#X.Y.Z` + * * [code.angularjs.org](https://code.angularjs.org/) (discouraged for production use) e.g. + * `"//code.angularjs.org/X.Y.Z/angular-mocks.js"` + * + * where X.Y.Z is the AngularJS version you are running. + * + * Then, configure your test runner to load `angular-mocks.js` after `angular.js`. + * This example uses Karma: + * + * ``` + * config.set({ + * files: [ + * 'build/angular.js', // and other module files you need + * 'build/angular-mocks.js', + * '', + * '' + * ] + * }); + * ``` + * + * Including the `angular-mocks.js` file automatically adds the `ngMock` module, so your tests + * are ready to go! */ angular.module('ngMock', ['ng']).provider({ $browser: angular.mock.$BrowserProvider, @@ -2259,6 +2386,7 @@ angular.module('ngMock', ['ng']).provider({ * the {@link ngMockE2E.$httpBackend e2e $httpBackend} mock. */ angular.module('ngMockE2E', ['ng']).config(['$provide', function($provide) { + $provide.value('$httpBackend', angular.injector(['ng']).get('$httpBackend')); $provide.decorator('$httpBackend', angular.mock.e2e.$httpBackendDecorator); }]); @@ -2270,8 +2398,10 @@ angular.module('ngMockE2E', ['ng']).config(['$provide', function($provide) { * Fake HTTP backend implementation suitable for end-to-end testing or backend-less development of * applications that use the {@link ng.$http $http service}. * - * *Note*: For fake http backend implementation suitable for unit testing please see + *
    + * **Note**: For fake http backend implementation suitable for unit testing please see * {@link ngMock.$httpBackend unit-testing $httpBackend mock}. + *
    * * This implementation can be used to respond with static or dynamic responses via the `when` api * and its shortcuts (`whenGET`, `whenPOST`, etc) and optionally pass through requests to the @@ -2292,9 +2422,9 @@ angular.module('ngMockE2E', ['ng']).config(['$provide', function($provide) { * on the `ngMockE2E` and your application modules and defines the fake backend: * * ```js - * myAppDev = angular.module('myAppDev', ['myApp', 'ngMockE2E']); + * var myAppDev = angular.module('myAppDev', ['myApp', 'ngMockE2E']); * myAppDev.run(function($httpBackend) { - * phones = [{name: 'phone1'}, {name: 'phone2'}]; + * var phones = [{name: 'phone1'}, {name: 'phone2'}]; * * // returns the current list of phones * $httpBackend.whenGET('/phones').respond(phones); @@ -2305,12 +2435,74 @@ angular.module('ngMockE2E', ['ng']).config(['$provide', function($provide) { * phones.push(phone); * return [200, phone, {}]; * }); - * $httpBackend.whenGET(/^\/templates\//).passThrough(); + * $httpBackend.whenGET(/^\/templates\//).passThrough(); // Requests for templates are handled by the real server * //... * }); * ``` * * Afterwards, bootstrap your app with this new module. + * + * ## Example + * + * + * var myApp = angular.module('myApp', []); + * + * myApp.controller('MainCtrl', function MainCtrl($http) { + * var ctrl = this; + * + * ctrl.phones = []; + * ctrl.newPhone = { + * name: '' + * }; + * + * ctrl.getPhones = function() { + * $http.get('/phones').then(function(response) { + * ctrl.phones = response.data; + * }); + * }; + * + * ctrl.addPhone = function(phone) { + * $http.post('/phones', phone).then(function() { + * ctrl.newPhone = {name: ''}; + * return ctrl.getPhones(); + * }); + * }; + * + * ctrl.getPhones(); + * }); + * + * + * var myAppDev = angular.module('myAppE2E', ['myApp', 'ngMockE2E']); + * + * myAppDev.run(function($httpBackend) { + * var phones = [{name: 'phone1'}, {name: 'phone2'}]; + * + * // returns the current list of phones + * $httpBackend.whenGET('/phones').respond(phones); + * + * // adds a new phone to the phones array + * $httpBackend.whenPOST('/phones').respond(function(method, url, data) { + * var phone = angular.fromJson(data); + * phones.push(phone); + * return [200, phone, {}]; + * }); + * }); + * + * + *
    + *
    + * + * + *
    + *

    Phones

    + *
      + *
    • {{phone.name}}
      • + *
    + *
    + *     + *     + * + * */ /** @@ -2321,7 +2513,7 @@ angular.module('ngMockE2E', ['ng']).config(['$provide', function($provide) { * Creates a new backend definition. * * @param {string} method HTTP method. - * @param {string|RegExp|function(string)} url HTTP url or function that receives a url + * @param {string|RegExp|function(string)=} url HTTP url or function that receives a url * and returns true if the url matches the current definition. * @param {(string|RegExp)=} data HTTP request body. * @param {(Object|function(Object))=} headers HTTP headers or function that receives http header @@ -2333,11 +2525,13 @@ angular.module('ngMockE2E', ['ng']).config(['$provide', function($provide) { * `respond` or `passThrough` again in order to change how a matched request is handled. * * - respond – - * `{function([status,] data[, headers, statusText]) - * | function(function(method, url, data, headers, params)}` + * ``` + * { function([status,] data[, headers, statusText]) + * | function(function(method, url, data, headers, params)} + * ``` * – The respond method takes a set of static data to be returned or a function that can return - * an array containing response status (number), response data (string), response headers - * (Object), and the text for the status (string). + * an array containing response status (number), response data (Array|Object|string), response + * headers (Object), and the text for the status (string). * - passThrough – `{function()}` – Any request matching a backend definition with * `passThrough` handler will be passed through to the real backend (an XHR request will be made * to the server.) @@ -2351,7 +2545,7 @@ angular.module('ngMockE2E', ['ng']).config(['$provide', function($provide) { * @description * Creates a new backend definition for GET requests. For more info see `when()`. * - * @param {string|RegExp|function(string)} url HTTP url or function that receives a url + * @param {string|RegExp|function(string)=} url HTTP url or function that receives a url * and returns true if the url matches the current definition. * @param {(Object|function(Object))=} headers HTTP headers. * @param {(Array)=} keys Array of keys to assign to regex matches in request url described on @@ -2368,7 +2562,7 @@ angular.module('ngMockE2E', ['ng']).config(['$provide', function($provide) { * @description * Creates a new backend definition for HEAD requests. For more info see `when()`. * - * @param {string|RegExp|function(string)} url HTTP url or function that receives a url + * @param {string|RegExp|function(string)=} url HTTP url or function that receives a url * and returns true if the url matches the current definition. * @param {(Object|function(Object))=} headers HTTP headers. * @param {(Array)=} keys Array of keys to assign to regex matches in request url described on @@ -2385,7 +2579,7 @@ angular.module('ngMockE2E', ['ng']).config(['$provide', function($provide) { * @description * Creates a new backend definition for DELETE requests. For more info see `when()`. * - * @param {string|RegExp|function(string)} url HTTP url or function that receives a url + * @param {string|RegExp|function(string)=} url HTTP url or function that receives a url * and returns true if the url matches the current definition. * @param {(Object|function(Object))=} headers HTTP headers. * @param {(Array)=} keys Array of keys to assign to regex matches in request url described on @@ -2402,7 +2596,7 @@ angular.module('ngMockE2E', ['ng']).config(['$provide', function($provide) { * @description * Creates a new backend definition for POST requests. For more info see `when()`. * - * @param {string|RegExp|function(string)} url HTTP url or function that receives a url + * @param {string|RegExp|function(string)=} url HTTP url or function that receives a url * and returns true if the url matches the current definition. * @param {(string|RegExp)=} data HTTP request body. * @param {(Object|function(Object))=} headers HTTP headers. @@ -2420,7 +2614,7 @@ angular.module('ngMockE2E', ['ng']).config(['$provide', function($provide) { * @description * Creates a new backend definition for PUT requests. For more info see `when()`. * - * @param {string|RegExp|function(string)} url HTTP url or function that receives a url + * @param {string|RegExp|function(string)=} url HTTP url or function that receives a url * and returns true if the url matches the current definition. * @param {(string|RegExp)=} data HTTP request body. * @param {(Object|function(Object))=} headers HTTP headers. @@ -2438,7 +2632,7 @@ angular.module('ngMockE2E', ['ng']).config(['$provide', function($provide) { * @description * Creates a new backend definition for PATCH requests. For more info see `when()`. * - * @param {string|RegExp|function(string)} url HTTP url or function that receives a url + * @param {string|RegExp|function(string)=} url HTTP url or function that receives a url * and returns true if the url matches the current definition. * @param {(string|RegExp)=} data HTTP request body. * @param {(Object|function(Object))=} headers HTTP headers. @@ -2456,7 +2650,7 @@ angular.module('ngMockE2E', ['ng']).config(['$provide', function($provide) { * @description * Creates a new backend definition for JSONP requests. For more info see `when()`. * - * @param {string|RegExp|function(string)} url HTTP url or function that receives a url + * @param {string|RegExp|function(string)=} url HTTP url or function that receives a url * and returns true if the url matches the current definition. * @param {(Array)=} keys Array of keys to assign to regex matches in request url described on * {@link ngMock.$httpBackend $httpBackend mock}. @@ -2508,6 +2702,7 @@ angular.mock.$RootScopeDecorator = ['$delegate', function($delegate) { * @ngdoc method * @name $rootScope.Scope#$countChildScopes * @module ngMock + * @this $rootScope.Scope * @description * Counts all the direct and indirect child scopes of the current scope. * @@ -2516,7 +2711,6 @@ angular.mock.$RootScopeDecorator = ['$delegate', function($delegate) { * @returns {number} Total number of child scopes. */ function countChildScopes() { - // jshint validthis: true var count = 0; // exclude the current scope var pendingChildHeads = [this.$$childHead]; var currentScope; @@ -2538,6 +2732,7 @@ angular.mock.$RootScopeDecorator = ['$delegate', function($delegate) { /** * @ngdoc method * @name $rootScope.Scope#$countWatchers + * @this $rootScope.Scope * @module ngMock * @description * Counts all the watchers of direct and indirect child scopes of the current scope. @@ -2548,7 +2743,6 @@ angular.mock.$RootScopeDecorator = ['$delegate', function($delegate) { * @returns {number} Total number of watchers. */ function countWatchers() { - // jshint validthis: true var count = this.$$watchers ? this.$$watchers.length : 0; // include the current scope var pendingChildHeads = [this.$$childHead]; var currentScope; @@ -2568,7 +2762,7 @@ angular.mock.$RootScopeDecorator = ['$delegate', function($delegate) { }]; -!(function(jasmineOrMocha) { +(function(jasmineOrMocha) { if (!jasmineOrMocha) { return; @@ -2663,7 +2857,7 @@ angular.mock.$RootScopeDecorator = ['$delegate', function($delegate) { * * You cannot call `sharedInjector()` from within a context already using `sharedInjector()`. * - * ## Example + * ## Example * * Typically beforeAll is used to make many assertions about a single operation. This can * cut down test run-time as the test setup doesn't need to be re-run, and enabling focussed @@ -2701,14 +2895,14 @@ angular.mock.$RootScopeDecorator = ['$delegate', function($delegate) { */ module.sharedInjector = function() { if (!(module.$$beforeAllHook && module.$$afterAllHook)) { - throw Error("sharedInjector() cannot be used unless your test runner defines beforeAll/afterAll"); + throw Error('sharedInjector() cannot be used unless your test runner defines beforeAll/afterAll'); } var initialized = false; - module.$$beforeAllHook(function() { + module.$$beforeAllHook(/** @this */ function() { if (injectorState.shared) { - injectorState.sharedError = Error("sharedInjector() cannot be called inside a context that has already called sharedInjector()"); + injectorState.sharedError = Error('sharedInjector() cannot be called inside a context that has already called sharedInjector()'); throw injectorState.sharedError; } initialized = true; @@ -2727,10 +2921,10 @@ angular.mock.$RootScopeDecorator = ['$delegate', function($delegate) { }; module.$$beforeEach = function() { - if (injectorState.shared && currentSpec && currentSpec != this) { + if (injectorState.shared && currentSpec && currentSpec !== this) { var state = currentSpec; currentSpec = this; - angular.forEach(["$injector","$modules","$providerInjector", "$injectorStrict"], function(k) { + angular.forEach(['$injector','$modules','$providerInjector', '$injectorStrict'], function(k) { currentSpec[k] = state[k]; state[k] = null; }); @@ -2791,7 +2985,7 @@ angular.mock.$RootScopeDecorator = ['$delegate', function($delegate) { angular.forEach(angular.callbacks, function(val, key) { delete angular.callbacks[key]; }); - angular.callbacks.counter = 0; + angular.callbacks.$$counter = 0; }; (window.beforeEach || window.setup)(module.$$beforeEach); @@ -2885,7 +3079,7 @@ angular.mock.$RootScopeDecorator = ['$delegate', function($delegate) { - var ErrorAddingDeclarationLocationStack = function(e, errorForStack) { + var ErrorAddingDeclarationLocationStack = function ErrorAddingDeclarationLocationStack(e, errorForStack) { this.message = e.message; this.name = e.name; if (e.line) this.line = e.line; @@ -2894,14 +3088,20 @@ angular.mock.$RootScopeDecorator = ['$delegate', function($delegate) { this.stack = e.stack + '\n' + errorForStack.stack; if (e.stackArray) this.stackArray = e.stackArray; }; - ErrorAddingDeclarationLocationStack.prototype.toString = Error.prototype.toString; + ErrorAddingDeclarationLocationStack.prototype = Error.prototype; window.inject = angular.mock.inject = function() { var blockFns = Array.prototype.slice.call(arguments, 0); var errorForStack = new Error('Declaration Location'); - return wasInjectorCreated() ? workFn.call(currentSpec) : workFn; + // IE10+ and PhanthomJS do not set stack trace information, until the error is thrown + if (!errorForStack.stack) { + try { + throw errorForStack; + } catch (e) { /* empty */ } + } + return wasInjectorCreated() ? WorkFn.call(currentSpec) : WorkFn; ///////////////////// - function workFn() { + function WorkFn() { var modules = currentSpec.$modules || []; var strictDi = !!currentSpec.$injectorStrict; modules.unshift(['$injector', function($injector) { @@ -2914,7 +3114,7 @@ angular.mock.$RootScopeDecorator = ['$delegate', function($delegate) { if (strictDi) { // If strictDi is enabled, annotate the providerInjector blocks angular.forEach(modules, function(moduleFn) { - if (typeof moduleFn === "function") { + if (typeof moduleFn === 'function') { angular.injector.$$annotate(moduleFn); } }); @@ -2929,9 +3129,7 @@ angular.mock.$RootScopeDecorator = ['$delegate', function($delegate) { injector.annotate(blockFns[i]); } try { - /* jshint -W040 *//* Jasmine explicitly provides a `this` object when calling functions */ injector.invoke(blockFns[i] || angular.noop, this); - /* jshint +W040 */ } catch (e) { if (e.stack && errorForStack) { throw new ErrorAddingDeclarationLocationStack(e, errorForStack); @@ -2970,5 +3168,218 @@ angular.mock.$RootScopeDecorator = ['$delegate', function($delegate) { } })(window.jasmine || window.mocha); +'use strict'; + +(function() { + /** + * Triggers a browser event. Attempts to choose the right event if one is + * not specified. + * + * @param {Object} element Either a wrapped jQuery/jqLite node or a DOMElement + * @param {string} eventType Optional event type + * @param {Object=} eventData An optional object which contains additional event data (such as x,y + * coordinates, keys, etc...) that are passed into the event when triggered + */ + window.browserTrigger = function browserTrigger(element, eventType, eventData) { + if (element && !element.nodeName) element = element[0]; + if (!element) return; + + eventData = eventData || {}; + var relatedTarget = eventData.relatedTarget || element; + var keys = eventData.keys; + var x = eventData.x; + var y = eventData.y; + + var inputType = (element.type) ? element.type.toLowerCase() : null, + nodeName = element.nodeName.toLowerCase(); + if (!eventType) { + eventType = { + 'text': 'change', + 'textarea': 'change', + 'hidden': 'change', + 'password': 'change', + 'button': 'click', + 'submit': 'click', + 'reset': 'click', + 'image': 'click', + 'checkbox': 'click', + 'radio': 'click', + 'select-one': 'change', + 'select-multiple': 'change', + '_default_': 'click' + }[inputType || '_default_']; + } + + if (nodeName === 'option') { + element.parentNode.value = element.value; + element = element.parentNode; + eventType = 'change'; + } + + keys = keys || []; + function pressed(key) { + return keys.indexOf(key) !== -1; + } + + var evnt; + if (/transitionend/.test(eventType)) { + if (window.WebKitTransitionEvent) { + evnt = new window.WebKitTransitionEvent(eventType, eventData); + evnt.initEvent(eventType, false, true); + } else { + try { + evnt = new window.TransitionEvent(eventType, eventData); + } catch (e) { + evnt = window.document.createEvent('TransitionEvent'); + evnt.initTransitionEvent(eventType, null, null, null, eventData.elapsedTime || 0); + } + } + } else if (/animationend/.test(eventType)) { + if (window.WebKitAnimationEvent) { + evnt = new window.WebKitAnimationEvent(eventType, eventData); + evnt.initEvent(eventType, false, true); + } else { + try { + evnt = new window.AnimationEvent(eventType, eventData); + } catch (e) { + evnt = window.document.createEvent('AnimationEvent'); + evnt.initAnimationEvent(eventType, null, null, null, eventData.elapsedTime || 0); + } + } + } else if (/touch/.test(eventType) && supportsTouchEvents()) { + evnt = createTouchEvent(element, eventType, x, y); + } else if (/key/.test(eventType)) { + evnt = window.document.createEvent('Events'); + evnt.initEvent(eventType, eventData.bubbles, eventData.cancelable); + evnt.view = window; + evnt.ctrlKey = pressed('ctrl'); + evnt.altKey = pressed('alt'); + evnt.shiftKey = pressed('shift'); + evnt.metaKey = pressed('meta'); + evnt.keyCode = eventData.keyCode; + evnt.charCode = eventData.charCode; + evnt.which = eventData.which; + } else { + evnt = window.document.createEvent('MouseEvents'); + x = x || 0; + y = y || 0; + evnt.initMouseEvent(eventType, true, true, window, 0, x, y, x, y, pressed('ctrl'), + pressed('alt'), pressed('shift'), pressed('meta'), 0, relatedTarget); + } + + /* we're unable to change the timeStamp value directly so this + * is only here to allow for testing where the timeStamp value is + * read */ + evnt.$manualTimeStamp = eventData.timeStamp; + + if (!evnt) return; + + var originalPreventDefault = evnt.preventDefault, + appWindow = element.ownerDocument.defaultView, + fakeProcessDefault = true, + finalProcessDefault, + angular = appWindow.angular || {}; + + // igor: temporary fix for https://bugzilla.mozilla.org/show_bug.cgi?id=684208 + angular['ff-684208-preventDefault'] = false; + evnt.preventDefault = function() { + fakeProcessDefault = false; + return originalPreventDefault.apply(evnt, arguments); + }; + + if (!eventData.bubbles || supportsEventBubblingInDetachedTree() || isAttachedToDocument(element)) { + element.dispatchEvent(evnt); + } else { + triggerForPath(element, evnt); + } + + finalProcessDefault = !(angular['ff-684208-preventDefault'] || !fakeProcessDefault); + + delete angular['ff-684208-preventDefault']; + + return finalProcessDefault; + }; + + function supportsTouchEvents() { + if ('_cached' in supportsTouchEvents) { + return supportsTouchEvents._cached; + } + if (!window.document.createTouch || !window.document.createTouchList) { + supportsTouchEvents._cached = false; + return false; + } + try { + window.document.createEvent('TouchEvent'); + } catch (e) { + supportsTouchEvents._cached = false; + return false; + } + supportsTouchEvents._cached = true; + return true; + } + + function createTouchEvent(element, eventType, x, y) { + var evnt = new window.Event(eventType); + x = x || 0; + y = y || 0; + + var touch = window.document.createTouch(window, element, Date.now(), x, y, x, y); + var touches = window.document.createTouchList(touch); + + evnt.touches = touches; + + return evnt; + } + + function supportsEventBubblingInDetachedTree() { + if ('_cached' in supportsEventBubblingInDetachedTree) { + return supportsEventBubblingInDetachedTree._cached; + } + supportsEventBubblingInDetachedTree._cached = false; + var doc = window.document; + if (doc) { + var parent = doc.createElement('div'), + child = parent.cloneNode(); + parent.appendChild(child); + parent.addEventListener('e', function() { + supportsEventBubblingInDetachedTree._cached = true; + }); + var evnt = window.document.createEvent('Events'); + evnt.initEvent('e', true, true); + child.dispatchEvent(evnt); + } + return supportsEventBubblingInDetachedTree._cached; + } + + function triggerForPath(element, evnt) { + var stop = false; + + var _stopPropagation = evnt.stopPropagation; + evnt.stopPropagation = function() { + stop = true; + _stopPropagation.apply(evnt, arguments); + }; + patchEventTargetForBubbling(evnt, element); + do { + element.dispatchEvent(evnt); + // eslint-disable-next-line no-unmodified-loop-condition + } while (!stop && (element = element.parentNode)); + } + + function patchEventTargetForBubbling(event, target) { + event._target = target; + Object.defineProperty(event, 'target', {get: function() { return this._target;}}); + } + + function isAttachedToDocument(element) { + while ((element = element.parentNode)) { + if (element === window) { + return true; + } + } + return false; + } +})(); + })(window, window.angular); diff --git a/public/vendor/angular-mocks/bower.json b/public/vendor/angular-mocks/bower.json index 4ce65bbc809..a510d3e75f2 100644 --- a/public/vendor/angular-mocks/bower.json +++ b/public/vendor/angular-mocks/bower.json @@ -1,10 +1,10 @@ { "name": "angular-mocks", - "version": "1.5.3", + "version": "1.5.9-build.5020+sha.0784977", "license": "MIT", "main": "./angular-mocks.js", "ignore": [], "dependencies": { - "angular": "1.5.3" + "angular": "1.5.9-build.5020+sha.0784977" } } diff --git a/public/vendor/angular-mocks/package.json b/public/vendor/angular-mocks/package.json index 42d78038650..c23f1279087 100644 --- a/public/vendor/angular-mocks/package.json +++ b/public/vendor/angular-mocks/package.json @@ -1,6 +1,6 @@ { "name": "angular-mocks", - "version": "1.5.3", + "version": "1.5.9-build.5020+sha.0784977", "description": "AngularJS mocks for testing", "main": "angular-mocks.js", "scripts": { @@ -23,5 +23,12 @@ "bugs": { "url": "https://github.com/angular/angular.js/issues" }, - "homepage": "http://angularjs.org" + "homepage": "http://angularjs.org", + "jspm": { + "shim": { + "angular-mocks": { + "deps": ["angular"] + } + } + } } diff --git a/public/vendor/angular-route/.bower.json b/public/vendor/angular-route/.bower.json index 0abe0215778..8f1e6a8c9a0 100644 --- a/public/vendor/angular-route/.bower.json +++ b/public/vendor/angular-route/.bower.json @@ -1,20 +1,20 @@ { "name": "angular-route", - "version": "1.5.3", + "version": "1.5.9-build.5020+sha.0784977", "license": "MIT", "main": "./angular-route.js", "ignore": [], "dependencies": { - "angular": "1.5.3" + "angular": "1.5.9-build.5020+sha.0784977" }, "homepage": "https://github.com/angular/bower-angular-route", - "_release": "1.5.3", + "_release": "1.5.9-build.5020+sha.0784977", "_resolution": { "type": "version", - "tag": "v1.5.3", - "commit": "750e4833612071d30993c8e4a547a6982eba3b84" + "tag": "v1.5.9-build.5020+sha.0784977", + "commit": "59b887d9b94bc1088f3efed333ae2366fafdad7c" }, - "_source": "git://github.com/angular/bower-angular-route.git", - "_target": "~1.5.3", + "_source": "https://github.com/angular/bower-angular-route.git", + "_target": "~1.5.9", "_originalSource": "angular-route" } \ No newline at end of file diff --git a/public/vendor/angular-route/LICENSE.md b/public/vendor/angular-route/LICENSE.md new file mode 100644 index 00000000000..2c395eef1ba --- /dev/null +++ b/public/vendor/angular-route/LICENSE.md @@ -0,0 +1,21 @@ +The MIT License (MIT) + +Copyright (c) 2016 Angular + +Permission is hereby granted, free of charge, to any person obtaining a copy +of this software and associated documentation files (the "Software"), to deal +in the Software without restriction, including without limitation the rights +to use, copy, modify, merge, publish, distribute, sublicense, and/or sell +copies of the Software, and to permit persons to whom the Software is +furnished to do so, subject to the following conditions: + +The above copyright notice and this permission notice shall be included in all +copies or substantial portions of the Software. + +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, +OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE +SOFTWARE. diff --git a/public/vendor/angular-route/angular-route.js b/public/vendor/angular-route/angular-route.js index 3c9a4e8595e..93ded6fc305 100644 --- a/public/vendor/angular-route/angular-route.js +++ b/public/vendor/angular-route/angular-route.js @@ -1,9 +1,44 @@ /** - * @license AngularJS v1.5.3 + * @license AngularJS v1.5.9-build.5020+sha.0784977 * (c) 2010-2016 Google, Inc. http://angularjs.org * License: MIT */ -(function(window, angular, undefined) {'use strict'; +(function(window, angular) {'use strict'; + +/* global shallowCopy: true */ + +/** + * Creates a shallow copy of an object, an array or a primitive. + * + * Assumes that there are no proto properties for objects. + */ +function shallowCopy(src, dst) { + if (isArray(src)) { + dst = dst || []; + + for (var i = 0, ii = src.length; i < ii; i++) { + dst[i] = src[i]; + } + } else if (isObject(src)) { + dst = dst || {}; + + for (var key in src) { + if (!(key.charAt(0) === '$' && key.charAt(1) === '$')) { + dst[key] = src[key]; + } + } + } + + return dst || src; +} + +/* global shallowCopy: false */ + +// `isArray` and `isObject` are necessary for `shallowCopy()` (included via `src/shallowCopy.js`). +// They are initialized inside the `$RouteProvider`, to ensure `window.angular` is available. +var isArray; +var isObject; +var isDefined; /** * @ngdoc module @@ -20,18 +55,22 @@ * *
    */ - /* global -ngRouteModule */ -var ngRouteModule = angular.module('ngRoute', ['ng']). - provider('$route', $RouteProvider). - // Ensure `$route` will be instantiated in time to capture the initial - // `$locationChangeSuccess` event. This is necessary in case `ngView` is - // included in an asynchronously loaded template. - run(['$route', angular.noop]), - $routeMinErr = angular.$$minErr('ngRoute'); +/* global -ngRouteModule */ +var ngRouteModule = angular. + module('ngRoute', []). + provider('$route', $RouteProvider). + // Ensure `$route` will be instantiated in time to capture the initial `$locationChangeSuccess` + // event (unless explicitly disabled). This is necessary in case `ngView` is included in an + // asynchronously loaded template. + run(instantiateRoute); +var $routeMinErr = angular.$$minErr('ngRoute'); +var isEagerInstantiationEnabled; + /** * @ngdoc provider * @name $routeProvider + * @this * * @description * @@ -44,6 +83,10 @@ var ngRouteModule = angular.module('ngRoute', ['ng']). * Requires the {@link ngRoute `ngRoute`} module to be installed. */ function $RouteProvider() { + isArray = angular.isArray; + isObject = angular.isObject; + isDefined = angular.isDefined; + function inherit(parent, extra) { return angular.extend(Object.create(parent), extra); } @@ -79,12 +122,12 @@ function $RouteProvider() { * * Object properties: * - * - `controller` – `{(string|function()=}` – Controller fn that should be associated with + * - `controller` – `{(string|Function)=}` – Controller fn that should be associated with * newly created scope or the name of a {@link angular.Module#controller registered * controller} if passed as a string. * - `controllerAs` – `{string=}` – An identifier name for a reference to the controller. * If present, the controller will be published to scope under the `controllerAs` name. - * - `template` – `{string=|function()=}` – html template as a string or a function that + * - `template` – `{(string|Function)=}` – html template as a string or a function that * returns an html template as a string which should be used by {@link * ngRoute.directive:ngView ngView} or {@link ng.directive:ngInclude ngInclude} directives. * This property takes precedence over `templateUrl`. @@ -94,7 +137,7 @@ function $RouteProvider() { * - `{Array.}` - route parameters extracted from the current * `$location.path()` by applying the current route * - * - `templateUrl` – `{string=|function()=}` – path or function that returns a path to an html + * - `templateUrl` – `{(string|Function)=}` – path or function that returns a path to an html * template that should be used by {@link ngRoute.directive:ngView ngView}. * * If `templateUrl` is a function, it will be called with the following parameters: @@ -102,7 +145,7 @@ function $RouteProvider() { * - `{Array.}` - route parameters extracted from the current * `$location.path()` by applying the current route * - * - `resolve` - `{Object.=}` - An optional map of dependencies which should + * - `resolve` - `{Object.=}` - An optional map of dependencies which should * be injected into the controller. If any of these dependencies are promises, the router * will wait for them all to be resolved or one to be rejected before the controller is * instantiated. @@ -122,7 +165,7 @@ function $RouteProvider() { * The map object is: * * - `key` – `{string}`: a name of a dependency to be injected into the controller. - * - `factory` - `{string|function}`: If `string` then it is an alias for a service. + * - `factory` - `{string|Function}`: If `string` then it is an alias for a service. * Otherwise if function, then it is {@link auto.$injector#invoke injected} * and the return value is treated as the dependency. If the result is a promise, it is * resolved before its value is injected into the controller. Be aware that @@ -132,7 +175,7 @@ function $RouteProvider() { * - `resolveAs` - `{string=}` - The name under which the `resolve` map will be available on * the scope of the route. If omitted, defaults to `$resolve`. * - * - `redirectTo` – `{(string|function())=}` – value to update + * - `redirectTo` – `{(string|Function)=}` – value to update * {@link ng.$location $location} path with and trigger route redirection. * * If `redirectTo` is a function, it will be called with the following parameters: @@ -143,7 +186,31 @@ function $RouteProvider() { * - `{Object}` - current `$location.search()` * * The custom `redirectTo` function is expected to return a string which will be used - * to update `$location.path()` and `$location.search()`. + * to update `$location.url()`. If the function throws an error, no further processing will + * take place and the {@link ngRoute.$route#$routeChangeError $routeChangeError} event will + * be fired. + * + * Routes that specify `redirectTo` will not have their controllers, template functions + * or resolves called, the `$location` will be changed to the redirect url and route + * processing will stop. The exception to this is if the `redirectTo` is a function that + * returns `undefined`. In this case the route transition occurs as though there was no + * redirection. + * + * - `resolveRedirectTo` – `{Function=}` – a function that will (eventually) return the value + * to update {@link ng.$location $location} URL with and trigger route redirection. In + * contrast to `redirectTo`, dependencies can be injected into `resolveRedirectTo` and the + * return value can be either a string or a promise that will be resolved to a string. + * + * Similar to `redirectTo`, if the return value is `undefined` (or a promise that gets + * resolved to `undefined`), no redirection takes place and the route transition occurs as + * though there was no redirection. + * + * If the function throws an error or the returned promise gets rejected, no further + * processing will take place and the + * {@link ngRoute.$route#$routeChangeError $routeChangeError} event will be fired. + * + * `redirectTo` takes precedence over `resolveRedirectTo`, so specifying both on the same + * route definition, will cause the latter to be ignored. * * - `[reloadOnSearch=true]` - `{boolean=}` - reload route when only `$location.search()` * or `$location.hash()` changes. @@ -163,7 +230,7 @@ function $RouteProvider() { */ this.when = function(path, route) { //copy original route object to preserve params inherited from proto chain - var routeCopy = angular.copy(route); + var routeCopy = shallowCopy(route); if (angular.isUndefined(routeCopy.reloadOnSearch)) { routeCopy.reloadOnSearch = true; } @@ -177,7 +244,7 @@ function $RouteProvider() { // create redirection for trailing slashes if (path) { - var redirectPath = (path[path.length - 1] == '/') + var redirectPath = (path[path.length - 1] === '/') ? path.substr(0, path.length - 1) : path + '/'; @@ -262,6 +329,47 @@ function $RouteProvider() { return this; }; + /** + * @ngdoc method + * @name $routeProvider#eagerInstantiationEnabled + * @kind function + * + * @description + * Call this method as a setter to enable/disable eager instantiation of the + * {@link ngRoute.$route $route} service upon application bootstrap. You can also call it as a + * getter (i.e. without any arguments) to get the current value of the + * `eagerInstantiationEnabled` flag. + * + * Instantiating `$route` early is necessary for capturing the initial + * {@link ng.$location#$locationChangeStart $locationChangeStart} event and navigating to the + * appropriate route. Usually, `$route` is instantiated in time by the + * {@link ngRoute.ngView ngView} directive. Yet, in cases where `ngView` is included in an + * asynchronously loaded template (e.g. in another directive's template), the directive factory + * might not be called soon enough for `$route` to be instantiated _before_ the initial + * `$locationChangeSuccess` event is fired. Eager instantiation ensures that `$route` is always + * instantiated in time, regardless of when `ngView` will be loaded. + * + * The default value is true. + * + * **Note**:
    + * You may want to disable the default behavior when unit-testing modules that depend on + * `ngRoute`, in order to avoid an unexpected request for the default route's template. + * + * @param {boolean=} enabled - If provided, update the internal `eagerInstantiationEnabled` flag. + * + * @returns {*} The current value of the `eagerInstantiationEnabled` flag if used as a getter or + * itself (for chaining) if used as a setter. + */ + isEagerInstantiationEnabled = true; + this.eagerInstantiationEnabled = function eagerInstantiationEnabled(enabled) { + if (isDefined(enabled)) { + isEagerInstantiationEnabled = enabled; + return this; + } + + return isEagerInstantiationEnabled; + }; + this.$get = ['$rootScope', '$location', @@ -355,12 +463,12 @@ function $RouteProvider() { * }) * * .controller('BookController', function($scope, $routeParams) { - * $scope.name = "BookController"; + * $scope.name = 'BookController'; * $scope.params = $routeParams; * }) * * .controller('ChapterController', function($scope, $routeParams) { - * $scope.name = "ChapterController"; + * $scope.name = 'ChapterController'; * $scope.params = $routeParams; * }) * @@ -393,15 +501,15 @@ function $RouteProvider() { * it('should load and compile correct template', function() { * element(by.linkText('Moby: Ch1')).click(); * var content = element(by.css('[ng-view]')).getText(); - * expect(content).toMatch(/controller\: ChapterController/); - * expect(content).toMatch(/Book Id\: Moby/); - * expect(content).toMatch(/Chapter Id\: 1/); + * expect(content).toMatch(/controller: ChapterController/); + * expect(content).toMatch(/Book Id: Moby/); + * expect(content).toMatch(/Chapter Id: 1/); * * element(by.partialLinkText('Scarlet')).click(); * * content = element(by.css('[ng-view]')).getText(); - * expect(content).toMatch(/controller\: BookController/); - * expect(content).toMatch(/Book Id\: Scarlet/); + * expect(content).toMatch(/controller: BookController/); + * expect(content).toMatch(/Book Id: Scarlet/); * }); * * @@ -449,12 +557,14 @@ function $RouteProvider() { * @name $route#$routeChangeError * @eventType broadcast on root scope * @description - * Broadcasted if any of the resolve promises are rejected. + * Broadcasted if a redirection function fails or any redirection or resolve promises are + * rejected. * * @param {Object} angularEvent Synthetic event object * @param {Route} current Current route information. * @param {Route} previous Previous route information. - * @param {Route} rejection Rejection of the promise. Usually the error of the failed promise. + * @param {Route} rejection The thrown error or the rejection reason of the promise. Usually + * the rejection reason is the error that caused the promise to get rejected. */ /** @@ -595,65 +705,136 @@ function $RouteProvider() { } else if (nextRoute || lastRoute) { forceReload = false; $route.current = nextRoute; - if (nextRoute) { - if (nextRoute.redirectTo) { - if (angular.isString(nextRoute.redirectTo)) { - $location.path(interpolate(nextRoute.redirectTo, nextRoute.params)).search(nextRoute.params) - .replace(); - } else { - $location.url(nextRoute.redirectTo(nextRoute.pathParams, $location.path(), $location.search())) - .replace(); - } - } - } - $q.when(nextRoute). - then(function() { - if (nextRoute) { - var locals = angular.extend({}, nextRoute.resolve), - template, templateUrl; + var nextRoutePromise = $q.resolve(nextRoute); - angular.forEach(locals, function(value, key) { - locals[key] = angular.isString(value) ? - $injector.get(value) : $injector.invoke(value, null, null, key); + nextRoutePromise. + then(getRedirectionData). + then(handlePossibleRedirection). + then(function(keepProcessingRoute) { + return keepProcessingRoute && nextRoutePromise. + then(resolveLocals). + then(function(locals) { + // after route change + if (nextRoute === $route.current) { + if (nextRoute) { + nextRoute.locals = locals; + angular.copy(nextRoute.params, $routeParams); + } + $rootScope.$broadcast('$routeChangeSuccess', nextRoute, lastRoute); + } }); - - if (angular.isDefined(template = nextRoute.template)) { - if (angular.isFunction(template)) { - template = template(nextRoute.params); - } - } else if (angular.isDefined(templateUrl = nextRoute.templateUrl)) { - if (angular.isFunction(templateUrl)) { - templateUrl = templateUrl(nextRoute.params); - } - if (angular.isDefined(templateUrl)) { - nextRoute.loadedTemplateUrl = $sce.valueOf(templateUrl); - template = $templateRequest(templateUrl); - } - } - if (angular.isDefined(template)) { - locals['$template'] = template; - } - return $q.all(locals); - } - }). - then(function(locals) { - // after route change - if (nextRoute == $route.current) { - if (nextRoute) { - nextRoute.locals = locals; - angular.copy(nextRoute.params, $routeParams); - } - $rootScope.$broadcast('$routeChangeSuccess', nextRoute, lastRoute); - } - }, function(error) { - if (nextRoute == $route.current) { + }).catch(function(error) { + if (nextRoute === $route.current) { $rootScope.$broadcast('$routeChangeError', nextRoute, lastRoute, error); } }); } } + function getRedirectionData(route) { + var data = { + route: route, + hasRedirection: false + }; + + if (route) { + if (route.redirectTo) { + if (angular.isString(route.redirectTo)) { + data.path = interpolate(route.redirectTo, route.params); + data.search = route.params; + data.hasRedirection = true; + } else { + var oldPath = $location.path(); + var oldSearch = $location.search(); + var newUrl = route.redirectTo(route.pathParams, oldPath, oldSearch); + + if (angular.isDefined(newUrl)) { + data.url = newUrl; + data.hasRedirection = true; + } + } + } else if (route.resolveRedirectTo) { + return $q. + resolve($injector.invoke(route.resolveRedirectTo)). + then(function(newUrl) { + if (angular.isDefined(newUrl)) { + data.url = newUrl; + data.hasRedirection = true; + } + + return data; + }); + } + } + + return data; + } + + function handlePossibleRedirection(data) { + var keepProcessingRoute = true; + + if (data.route !== $route.current) { + keepProcessingRoute = false; + } else if (data.hasRedirection) { + var oldUrl = $location.url(); + var newUrl = data.url; + + if (newUrl) { + $location. + url(newUrl). + replace(); + } else { + newUrl = $location. + path(data.path). + search(data.search). + replace(). + url(); + } + + if (newUrl !== oldUrl) { + // Exit out and don't process current next value, + // wait for next location change from redirect + keepProcessingRoute = false; + } + } + + return keepProcessingRoute; + } + + function resolveLocals(route) { + if (route) { + var locals = angular.extend({}, route.resolve); + angular.forEach(locals, function(value, key) { + locals[key] = angular.isString(value) ? + $injector.get(value) : + $injector.invoke(value, null, null, key); + }); + var template = getTemplateFor(route); + if (angular.isDefined(template)) { + locals['$template'] = template; + } + return $q.all(locals); + } + } + + function getTemplateFor(route) { + var template, templateUrl; + if (angular.isDefined(template = route.template)) { + if (angular.isFunction(template)) { + template = template(route.params); + } + } else if (angular.isDefined(templateUrl = route.templateUrl)) { + if (angular.isFunction(templateUrl)) { + templateUrl = templateUrl(route.params); + } + if (angular.isDefined(templateUrl)) { + route.loadedTemplateUrl = $sce.valueOf(templateUrl); + template = $templateRequest(templateUrl); + } + } + return template; + } /** * @returns {Object} the current active route, by matching it against the URL @@ -694,6 +875,14 @@ function $RouteProvider() { }]; } +instantiateRoute.$inject = ['$injector']; +function instantiateRoute($injector) { + if (isEagerInstantiationEnabled) { + // Instantiate `$route` + $injector.get('$route'); + } +} + ngRouteModule.provider('$routeParams', $RouteParamsProvider); @@ -701,6 +890,7 @@ ngRouteModule.provider('$routeParams', $RouteParamsProvider); * @ngdoc service * @name $routeParams * @requires $route + * @this * * @description * The `$routeParams` service allows you to retrieve the current set of route parameters. @@ -870,17 +1060,17 @@ ngRouteModule.directive('ngView', ngViewFillContentFactory); $locationProvider.html5Mode(true); }]) .controller('MainCtrl', ['$route', '$routeParams', '$location', - function($route, $routeParams, $location) { + function MainCtrl($route, $routeParams, $location) { this.$route = $route; this.$location = $location; this.$routeParams = $routeParams; }]) - .controller('BookCtrl', ['$routeParams', function($routeParams) { - this.name = "BookCtrl"; + .controller('BookCtrl', ['$routeParams', function BookCtrl($routeParams) { + this.name = 'BookCtrl'; this.params = $routeParams; }]) - .controller('ChapterCtrl', ['$routeParams', function($routeParams) { - this.name = "ChapterCtrl"; + .controller('ChapterCtrl', ['$routeParams', function ChapterCtrl($routeParams) { + this.name = 'ChapterCtrl'; this.params = $routeParams; }]); @@ -890,15 +1080,15 @@ ngRouteModule.directive('ngView', ngViewFillContentFactory); it('should load and compile correct template', function() { element(by.linkText('Moby: Ch1')).click(); var content = element(by.css('[ng-view]')).getText(); - expect(content).toMatch(/controller\: ChapterCtrl/); - expect(content).toMatch(/Book Id\: Moby/); - expect(content).toMatch(/Chapter Id\: 1/); + expect(content).toMatch(/controller: ChapterCtrl/); + expect(content).toMatch(/Book Id: Moby/); + expect(content).toMatch(/Chapter Id: 1/); element(by.partialLinkText('Scarlet')).click(); content = element(by.css('[ng-view]')).getText(); - expect(content).toMatch(/controller\: BookCtrl/); - expect(content).toMatch(/Book Id\: Scarlet/); + expect(content).toMatch(/controller: BookCtrl/); + expect(content).toMatch(/Book Id: Scarlet/); }); diff --git a/public/vendor/angular-route/angular-route.min.js b/public/vendor/angular-route/angular-route.min.js index 5d2e84f9498..c600cb6b26e 100644 --- a/public/vendor/angular-route/angular-route.min.js +++ b/public/vendor/angular-route/angular-route.min.js @@ -1,15 +1,17 @@ /* - AngularJS v1.5.3 + AngularJS v1.5.9-build.5020+sha.0784977 (c) 2010-2016 Google, Inc. http://angularjs.org License: MIT */ -(function(r,d,C){'use strict';function x(s,h,g){return{restrict:"ECA",terminal:!0,priority:400,transclude:"element",link:function(a,c,b,f,y){function k(){n&&(g.cancel(n),n=null);l&&(l.$destroy(),l=null);m&&(n=g.leave(m),n.then(function(){n=null}),m=null)}function z(){var b=s.current&&s.current.locals;if(d.isDefined(b&&b.$template)){var b=a.$new(),f=s.current;m=y(b,function(b){g.enter(b,null,m||c).then(function(){!d.isDefined(u)||u&&!a.$eval(u)||h()});k()});l=f.scope=b;l.$emit("$viewContentLoaded"); -l.$eval(v)}else k()}var l,m,n,u=b.autoscroll,v=b.onload||"";a.$on("$routeChangeSuccess",z);z()}}}function A(d,h,g){return{restrict:"ECA",priority:-400,link:function(a,c){var b=g.current,f=b.locals;c.html(f.$template);var y=d(c.contents());if(b.controller){f.$scope=a;var k=h(b.controller,f);b.controllerAs&&(a[b.controllerAs]=k);c.data("$ngControllerController",k);c.children().data("$ngControllerController",k)}a[b.resolveAs||"$resolve"]=f;y(a)}}}r=d.module("ngRoute",["ng"]).provider("$route",function(){function s(a, -c){return d.extend(Object.create(a),c)}function h(a,d){var b=d.caseInsensitiveMatch,f={originalPath:a,regexp:a},g=f.keys=[];a=a.replace(/([().])/g,"\\$1").replace(/(\/)?:(\w+)(\*\?|[\?\*])?/g,function(a,d,b,c){a="?"===c||"*?"===c?"?":null;c="*"===c||"*?"===c?"*":null;g.push({name:b,optional:!!a});d=d||"";return""+(a?"":d)+"(?:"+(a?d:"")+(c&&"(.+?)"||"([^/]+)")+(a||"")+")"+(a||"")}).replace(/([\/$\*])/g,"\\$1");f.regexp=new RegExp("^"+a+"$",b?"i":"");return f}var g={};this.when=function(a,c){var b= -d.copy(c);d.isUndefined(b.reloadOnSearch)&&(b.reloadOnSearch=!0);d.isUndefined(b.caseInsensitiveMatch)&&(b.caseInsensitiveMatch=this.caseInsensitiveMatch);g[a]=d.extend(b,a&&h(a,b));if(a){var f="/"==a[a.length-1]?a.substr(0,a.length-1):a+"/";g[f]=d.extend({redirectTo:a},h(f,b))}return this};this.caseInsensitiveMatch=!1;this.otherwise=function(a){"string"===typeof a&&(a={redirectTo:a});this.when(null,a);return this};this.$get=["$rootScope","$location","$routeParams","$q","$injector","$templateRequest", -"$sce",function(a,c,b,f,h,k,r){function l(b){var e=t.current;(x=(p=n())&&e&&p.$$route===e.$$route&&d.equals(p.pathParams,e.pathParams)&&!p.reloadOnSearch&&!v)||!e&&!p||a.$broadcast("$routeChangeStart",p,e).defaultPrevented&&b&&b.preventDefault()}function m(){var w=t.current,e=p;if(x)w.params=e.params,d.copy(w.params,b),a.$broadcast("$routeUpdate",w);else if(e||w)v=!1,(t.current=e)&&e.redirectTo&&(d.isString(e.redirectTo)?c.path(u(e.redirectTo,e.params)).search(e.params).replace():c.url(e.redirectTo(e.pathParams, -c.path(),c.search())).replace()),f.when(e).then(function(){if(e){var a=d.extend({},e.resolve),b,c;d.forEach(a,function(b,e){a[e]=d.isString(b)?h.get(b):h.invoke(b,null,null,e)});d.isDefined(b=e.template)?d.isFunction(b)&&(b=b(e.params)):d.isDefined(c=e.templateUrl)&&(d.isFunction(c)&&(c=c(e.params)),d.isDefined(c)&&(e.loadedTemplateUrl=r.valueOf(c),b=k(c)));d.isDefined(b)&&(a.$template=b);return f.all(a)}}).then(function(c){e==t.current&&(e&&(e.locals=c,d.copy(e.params,b)),a.$broadcast("$routeChangeSuccess", -e,w))},function(b){e==t.current&&a.$broadcast("$routeChangeError",e,w,b)})}function n(){var a,b;d.forEach(g,function(f,g){var q;if(q=!b){var h=c.path();q=f.keys;var l={};if(f.regexp)if(h=f.regexp.exec(h)){for(var k=1,n=h.length;k + - - + $scope.reset(); + }]); + + */ function copy(source, destination) { var stackSource = []; @@ -862,10 +889,10 @@ function copy(source, destination) { if (destination) { if (isTypedArray(destination) || isArrayBuffer(destination)) { - throw ngMinErr('cpta', "Can't copy! TypedArray destination cannot be mutated."); + throw ngMinErr('cpta', 'Can\'t copy! TypedArray destination cannot be mutated.'); } if (source === destination) { - throw ngMinErr('cpi', "Can't copy! Source and destination are identical."); + throw ngMinErr('cpi', 'Can\'t copy! Source and destination are identical.'); } // Empty the destination object @@ -931,7 +958,7 @@ function copy(source, destination) { if (isWindow(source) || isScope(source)) { throw ngMinErr('cpws', - "Can't copy! Making copies of Window or Scope instances is not supported."); + 'Can\'t copy! Making copies of Window or Scope instances is not supported.'); } var needsRecurse = false; @@ -961,13 +988,16 @@ function copy(source, destination) { case '[object Uint8ClampedArray]': case '[object Uint16Array]': case '[object Uint32Array]': - return new source.constructor(copyElement(source.buffer)); + return new source.constructor(copyElement(source.buffer), source.byteOffset, source.length); case '[object ArrayBuffer]': - //Support: IE10 + // Support: IE10 if (!source.slice) { + // If we're in this case we know the environment supports ArrayBuffer + /* eslint-disable no-undef */ var copied = new ArrayBuffer(source.byteLength); new Uint8Array(copied).set(new Uint8Array(source)); + /* eslint-enable */ return copied; } return source.slice(0); @@ -993,31 +1023,6 @@ function copy(source, destination) { } } -/** - * Creates a shallow copy of an object, an array or a primitive. - * - * Assumes that there are no proto properties for objects. - */ -function shallowCopy(src, dst) { - if (isArray(src)) { - dst = dst || []; - - for (var i = 0, ii = src.length; i < ii; i++) { - dst[i] = src[i]; - } - } else if (isObject(src)) { - dst = dst || {}; - - for (var key in src) { - if (!(key.charAt(0) === '$' && key.charAt(1) === '$')) { - dst[key] = src[key]; - } - } - } - - return dst || src; -} - /** * @ngdoc function @@ -1047,16 +1052,51 @@ function shallowCopy(src, dst) { * @param {*} o1 Object or value to compare. * @param {*} o2 Object or value to compare. * @returns {boolean} True if arguments are equal. + * + * @example + + +
    +
    +

    User 1

    + Name: + Age: + +

    User 2

    + Name: + Age: + +
    +
    + +
    + User 1: 
    {{user1 | json}}
    + User 2: 
    {{user2 | json}}
    + Equal: 
    {{result}}
    +
    +
    +     + + angular.module('equalsExample', []).controller('ExampleController', ['$scope', function($scope) { + $scope.user1 = {}; + $scope.user2 = {}; + $scope.compare = function() { + $scope.result = angular.equals($scope.user1, $scope.user2); + }; + }]); + +     */ function equals(o1, o2) { if (o1 === o2) return true; if (o1 === null || o2 === null) return false; + // eslint-disable-next-line no-self-compare if (o1 !== o1 && o2 !== o2) return true; // NaN === NaN var t1 = typeof o1, t2 = typeof o2, length, key, keySet; - if (t1 == t2 && t1 == 'object') { + if (t1 === t2 && t1 === 'object') { if (isArray(o1)) { if (!isArray(o2)) return false; - if ((length = o1.length) == o2.length) { + if ((length = o1.length) === o2.length) { for (key = 0; key < length; key++) { if (!equals(o1[key], o2[key])) return false; } @@ -1067,7 +1107,7 @@ function equals(o1, o2) { return equals(o1.getTime(), o2.getTime()); } else if (isRegExp(o1)) { if (!isRegExp(o2)) return false; - return o1.toString() == o2.toString(); + return o1.toString() === o2.toString(); } else { if (isScope(o1) || isScope(o2) || isWindow(o1) || isWindow(o2) || isArray(o2) || isDate(o2) || isRegExp(o2)) return false; @@ -1093,8 +1133,8 @@ var csp = function() { if (!isDefined(csp.rules)) { - var ngCspElement = (document.querySelector('[ng-csp]') || - document.querySelector('[data-ng-csp]')); + var ngCspElement = (window.document.querySelector('[ng-csp]') || + window.document.querySelector('[data-ng-csp]')); if (ngCspElement) { var ngCspAttribute = ngCspElement.getAttribute('ng-csp') || @@ -1115,9 +1155,8 @@ var csp = function() { function noUnsafeEval() { try { - /* jshint -W031, -W054 */ + // eslint-disable-next-line no-new, no-new-func new Function(''); - /* jshint +W031, +W054 */ return false; } catch (e) { return true; @@ -1169,7 +1208,8 @@ var jq = function() { var i, ii = ngAttrPrefixes.length, prefix, name; for (i = 0; i < ii; ++i) { prefix = ngAttrPrefixes[i]; - if (el = document.querySelector('[' + prefix.replace(':', '\\:') + 'jq]')) { + el = window.document.querySelector('[' + prefix.replace(':', '\\:') + 'jq]'); + if (el) { name = el.getAttribute(prefix + 'jq'); break; } @@ -1187,7 +1227,6 @@ function sliceArgs(args, startIndex) { } -/* jshint -W101 */ /** * @ngdoc function * @name angular.bind @@ -1205,7 +1244,6 @@ function sliceArgs(args, startIndex) { * @param {...*} args Optional arguments to be prebound to the `fn` function call. * @returns {function()} Function that wraps the `fn` with all the specified bindings. */ -/* jshint +W101 */ function bind(self, fn) { var curryArgs = arguments.length > 2 ? sliceArgs(arguments, 2) : []; if (isFunction(fn) && !(fn instanceof RegExp)) { @@ -1221,7 +1259,7 @@ function bind(self, fn) { : fn.call(self); }; } else { - // in IE, native methods are not functions so they cannot be bound (note: they don't need to be) + // In IE, native methods are not functions so they cannot be bound (note: they don't need to be). return fn; } } @@ -1234,7 +1272,7 @@ function toJsonReplacer(key, value) { val = undefined; } else if (isWindow(value)) { val = '$WINDOW'; - } else if (value && document === value) { + } else if (value && window.document === value) { val = '$DOCUMENT'; } else if (isScope(value)) { val = '$SCOPE'; @@ -1258,6 +1296,27 @@ function toJsonReplacer(key, value) { * @param {boolean|number} [pretty=2] If set to true, the JSON output will contain newlines and whitespace. * If set to an integer, the JSON output will contain that many spaces per indentation. * @returns {string|undefined} JSON-ified string representing `obj`. + * @knownIssue + * + * The Safari browser throws a `RangeError` instead of returning `null` when it tries to stringify a `Date` + * object with an invalid date value. The only reliable way to prevent this is to monkeypatch the + * `Date.prototype.toJSON` method as follows: + * + * ``` + * var _DatetoJSON = Date.prototype.toJSON; + * Date.prototype.toJSON = function() { + * try { + * return _DatetoJSON.call(this); + * } catch(e) { + * if (e instanceof RangeError) { + * return null; + * } + * throw e; + * } + * }; + * ``` + * + * See https://github.com/angular/angular.js/pull/14221 for more information. */ function toJson(obj, pretty) { if (isUndefined(obj)) return undefined; @@ -1292,7 +1351,7 @@ function timezoneToOffset(timezone, fallback) { // IE/Edge do not "understand" colon (`:`) in timezone timezone = timezone.replace(ALL_COLONS, ''); var requestedTimezoneOffset = Date.parse('Jan 01, 1970 00:00:00 ' + timezone) / 60000; - return isNaN(requestedTimezoneOffset) ? fallback : requestedTimezoneOffset; + return isNumberNaN(requestedTimezoneOffset) ? fallback : requestedTimezoneOffset; } @@ -1320,7 +1379,7 @@ function startingTag(element) { // turns out IE does not let you set .html() on elements which // are not allowed to have children. So we just ignore it. element.empty(); - } catch (e) {} + } catch (e) { /* empty */ } var elemHtml = jqLite('
    ').append(element).html(); try { return element[0].nodeType === NODE_TYPE_TEXT ? lowercase(elemHtml) : @@ -1348,7 +1407,7 @@ function tryDecodeURIComponent(value) { try { return decodeURIComponent(value); } catch (e) { - // Ignore any invalid uri component + // Ignore any invalid uri component. } } @@ -1359,7 +1418,7 @@ function tryDecodeURIComponent(value) { */ function parseKeyValue(/**string*/keyValue) { var obj = {}; - forEach((keyValue || "").split('&'), function(keyValue) { + forEach((keyValue || '').split('&'), function(keyValue) { var splitPoint, key, val; if (keyValue) { key = keyValue = keyValue.replace(/\+/g,'%20'); @@ -1424,7 +1483,7 @@ function encodeUriSegment(val) { * This method is intended for encoding *key* or *value* parts of query component. We need a custom * method because encodeURIComponent is too aggressive and encodes stuff that doesn't have to be * encoded per http://tools.ietf.org/html/rfc3986: - * query = *( pchar / "/" / "?" ) + * query = *( pchar / "/" / "?" ) * pchar = unreserved / pct-encoded / sub-delims / ":" / "@" * unreserved = ALPHA / DIGIT / "-" / "." / "_" / "~" * pct-encoded = "%" HEXDIG HEXDIG @@ -1497,7 +1556,7 @@ function getNgAttribute(element, ngAttr) { * * `ngApp` is the easiest, and most common way to bootstrap an application. * - +
    I can add: {{a}} + {{b}} = {{ a+b }} @@ -1513,7 +1572,7 @@ function getNgAttribute(element, ngAttr) { * * Using `ngStrictDi`, you would see something like this: * - +
    @@ -1562,7 +1621,7 @@ function getNgAttribute(element, ngAttr) { }]) .controller('GoodController2', GoodController2); function GoodController2($scope) { - $scope.name = "World"; + $scope.name = 'World'; } GoodController2.$inject = ['$scope']; @@ -1593,7 +1652,7 @@ function angularInit(element, bootstrap) { module, config = {}; - // The element `element` has priority over any other element + // The element `element` has priority over any other element. forEach(ngAttrPrefixes, function(prefix) { var name = prefix + 'app'; @@ -1612,7 +1671,7 @@ function angularInit(element, bootstrap) { } }); if (appElement) { - config.strictDi = getNgAttribute(appElement, "strict-di") !== null; + config.strictDi = getNgAttribute(appElement, 'strict-di') !== null; bootstrap(appElement, module ? [module] : [], config); } } @@ -1686,11 +1745,11 @@ function bootstrap(element, modules, config) { element = jqLite(element); if (element.injector()) { - var tag = (element[0] === document) ? 'document' : startingTag(element); - //Encode angle brackets to prevent input from being sanitized to empty string #8683 + var tag = (element[0] === window.document) ? 'document' : startingTag(element); + // Encode angle brackets to prevent input from being sanitized to empty string #8683. throw ngMinErr( 'btstrpd', - "App Already Bootstrapped with this Element '{0}'", + 'App already bootstrapped with this element \'{0}\'', tag.replace(//,'>')); } @@ -1819,7 +1878,7 @@ function bindJQuery() { jQuery.cleanData = function(elems) { var events; for (var i = 0, elem; (elem = elems[i]) != null; i++) { - events = jQuery._data(elem, "events"); + events = jQuery._data(elem, 'events'); if (events && events.$destroy) { jQuery(elem).triggerHandler('$destroy'); } @@ -1841,7 +1900,7 @@ function bindJQuery() { */ function assertArg(arg, name, reason) { if (!arg) { - throw ngMinErr('areq', "Argument '{0}' is {1}", (name || '?'), (reason || "required")); + throw ngMinErr('areq', 'Argument \'{0}\' is {1}', (name || '?'), (reason || 'required')); } return arg; } @@ -1863,7 +1922,7 @@ function assertArgFn(arg, name, acceptArrayAnnotation) { */ function assertNotHasOwnProperty(name, context) { if (name === 'hasOwnProperty') { - throw ngMinErr('badname', "hasOwnProperty is not a valid {0} name", context); + throw ngMinErr('badname', 'hasOwnProperty is not a valid {0} name', context); } } @@ -1933,6 +1992,27 @@ function createMap() { return Object.create(null); } +function stringify(value) { + if (value == null) { // null || undefined + return ''; + } + switch (typeof value) { + case 'string': + break; + case 'number': + value = '' + value; + break; + default: + if (hasCustomToString(value) && !isArray(value) && !isDate(value)) { + value = value.toString(); + } else { + value = toJson(value); + } + } + + return value; +} + var NODE_TYPE_ELEMENT = 1; var NODE_TYPE_ATTRIBUTE = 2; var NODE_TYPE_TEXT = 3; @@ -2031,9 +2111,9 @@ function setupModuleLoader(window) { } return ensure(modules, name, function() { if (!requires) { - throw $injectorMinErr('nomod', "Module '{0}' is not available! You either misspelled " + - "the module name or forgot to load it. If registering a module ensure that you " + - "specify the dependencies as the second argument.", name); + throw $injectorMinErr('nomod', 'Module \'{0}\' is not available! You either misspelled ' + + 'the module name or forgot to load it. If registering a module ensure that you ' + + 'specify the dependencies as the second argument.', name); } /** @type {!Array.>} */ @@ -2137,13 +2217,13 @@ function setupModuleLoader(window) { * @ngdoc method * @name angular.Module#decorator * @module ng - * @param {string} The name of the service to decorate. - * @param {Function} This function will be invoked when the service needs to be - * instantiated and should return the decorated service instance. + * @param {string} name The name of the service to decorate. + * @param {Function} decorFn This function will be invoked when the service needs to be + * instantiated and should return the decorated service instance. * @description * See {@link auto.$provide#decorator $provide.decorator()}. */ - decorator: invokeLaterAndSetModuleName('$provide', 'decorator'), + decorator: invokeLaterAndSetModuleName('$provide', 'decorator', configBlocks), /** * @ngdoc method @@ -2289,10 +2369,11 @@ function setupModuleLoader(window) { * @param {string} method * @returns {angular.Module} */ - function invokeLaterAndSetModuleName(provider, method) { + function invokeLaterAndSetModuleName(provider, method, queue) { + if (!queue) queue = invokeQueue; return function(recipeName, factoryFunction) { if (factoryFunction && isFunction(factoryFunction)) factoryFunction.$$moduleName = name; - invokeQueue.push([provider, method, arguments]); + queue.push([provider, method, arguments]); return moduleInstance; }; } @@ -2302,7 +2383,34 @@ function setupModuleLoader(window) { } -/* global: toDebugString: true */ +/* global shallowCopy: true */ + +/** + * Creates a shallow copy of an object, an array or a primitive. + * + * Assumes that there are no proto properties for objects. + */ +function shallowCopy(src, dst) { + if (isArray(src)) { + dst = dst || []; + + for (var i = 0, ii = src.length; i < ii; i++) { + dst[i] = src[i]; + } + } else if (isObject(src)) { + dst = dst || {}; + + for (var key in src) { + if (!(key.charAt(0) === '$' && key.charAt(1) === '$')) { + dst[key] = src[key]; + } + } + } + + return dst || src; +} + +/* global toDebugString: true */ function serializeObject(obj) { var seen = []; @@ -2341,7 +2449,6 @@ function toDebugString(obj) { formDirective, scriptDirective, selectDirective, - styleDirective, optionDirective, ngBindDirective, ngBindHtmlDirective, @@ -2395,6 +2502,7 @@ function toDebugString(obj) { $ControllerProvider, $DateProvider, $DocumentProvider, + $$IsDocumentHiddenProvider, $ExceptionHandlerProvider, $FilterProvider, $$ForceReflowProvider, @@ -2406,8 +2514,10 @@ function toDebugString(obj) { $HttpParamSerializerJQLikeProvider, $HttpBackendProvider, $xhrFactoryProvider, + $jsonpCallbacksProvider, $LocationProvider, $LogProvider, + $ModelOptionsProvider, $ParseProvider, $RootScopeProvider, $QProvider, @@ -2443,11 +2553,13 @@ function toDebugString(obj) { * - `codeName` – `{string}` – Code name of the release, such as "jiggling-armfat". */ var version = { - full: '1.5.3', // all of these placeholder strings will be replaced by grunt's - major: 1, // package task + // These placeholder strings will be replaced by grunt's `build` task. + // They need to be double- or single-quoted. + full: '1.5.9-build.5020+sha.0784977', + major: 1, minor: 5, - dot: 3, - codeName: 'diplohaplontic-meiosis' + dot: 9, + codeName: 'snapshot' }; @@ -2478,11 +2590,14 @@ function publishExternalAPI(angular) { 'isDate': isDate, 'lowercase': lowercase, 'uppercase': uppercase, - 'callbacks': {counter: 0}, + 'callbacks': {$$counter: 0}, 'getTestability': getTestability, + 'reloadWithDebugInfo': reloadWithDebugInfo, '$$minErr': minErr, '$$csp': csp, - 'reloadWithDebugInfo': reloadWithDebugInfo + '$$encodeUriSegment': encodeUriSegment, + '$$encodeUriQuery': encodeUriQuery, + '$$stringify': stringify }); angularModule = setupModuleLoader(window); @@ -2501,7 +2616,6 @@ function publishExternalAPI(angular) { form: formDirective, script: scriptDirective, select: selectDirective, - style: styleDirective, option: optionDirective, ngBind: ngBindDirective, ngBindHtml: ngBindHtmlDirective, @@ -2557,6 +2671,7 @@ function publishExternalAPI(angular) { $cacheFactory: $CacheFactoryProvider, $controller: $ControllerProvider, $document: $DocumentProvider, + $$isDocumentHidden: $$IsDocumentHiddenProvider, $exceptionHandler: $ExceptionHandlerProvider, $filter: $FilterProvider, $$forceReflow: $$ForceReflowProvider, @@ -2567,8 +2682,10 @@ function publishExternalAPI(angular) { $httpParamSerializerJQLike: $HttpParamSerializerJQLikeProvider, $httpBackend: $HttpBackendProvider, $xhrFactory: $xhrFactoryProvider, + $jsonpCallbacks: $jsonpCallbacksProvider, $location: $LocationProvider, $log: $LogProvider, + $modelOptions: $ModelOptionsProvider, $parse: $ParseProvider, $rootScope: $RootScopeProvider, $q: $QProvider, @@ -2601,11 +2718,10 @@ function publishExternalAPI(angular) { * Or gives undesired access to variables likes document or window? * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */ -/* global JQLitePrototype: true, - addEventListenerFn: true, - removeEventListenerFn: true, +/* global + JQLitePrototype: true, BOOLEAN_ATTR: true, - ALIASED_ATTR: true, + ALIASED_ATTR: true */ ////////////////////////////////// @@ -2643,7 +2759,7 @@ function publishExternalAPI(angular) { * ## Angular's jqLite * jqLite provides only the following jQuery methods: * - * - [`addClass()`](http://api.jquery.com/addClass/) + * - [`addClass()`](http://api.jquery.com/addClass/) - Does not support a function as first argument * - [`after()`](http://api.jquery.com/after/) * - [`append()`](http://api.jquery.com/append/) * - [`attr()`](http://api.jquery.com/attr/) - Does not support functions as parameters @@ -2670,12 +2786,12 @@ function publishExternalAPI(angular) { * - [`ready()`](http://api.jquery.com/ready/) * - [`remove()`](http://api.jquery.com/remove/) * - [`removeAttr()`](http://api.jquery.com/removeAttr/) - * - [`removeClass()`](http://api.jquery.com/removeClass/) + * - [`removeClass()`](http://api.jquery.com/removeClass/) - Does not support a function as first argument * - [`removeData()`](http://api.jquery.com/removeData/) * - [`replaceWith()`](http://api.jquery.com/replaceWith/) * - [`text()`](http://api.jquery.com/text/) - * - [`toggleClass()`](http://api.jquery.com/toggleClass/) - * - [`triggerHandler()`](http://api.jquery.com/triggerHandler/) - Passes a dummy event object to handlers. + * - [`toggleClass()`](http://api.jquery.com/toggleClass/) - Does not support a function as first argument + * - [`triggerHandler()`](http://api.jquery.com/triggerHandler/) - Passes a dummy event object to handlers * - [`unbind()`](http://api.jquery.com/unbind/) - Does not support namespaces or event object as parameter * - [`val()`](http://api.jquery.com/val/) * - [`wrap()`](http://api.jquery.com/wrap/) @@ -2704,6 +2820,9 @@ function publishExternalAPI(angular) { * - `inheritedData()` - same as `data()`, but walks up the DOM until a value is found or the top * parent element is reached. * + * @knownIssue You cannot spy on `angular.element` if you are using Jasmine version 1.x. See + * https://github.com/angular/angular.js/issues/14251 for more information. + * * @param {string|DOMElement} element HTML string or DOMElement to be wrapped into jQuery. * @returns {Object} jQuery object. */ @@ -2711,13 +2830,7 @@ function publishExternalAPI(angular) { JQLite.expando = 'ng339'; var jqCache = JQLite.cache = {}, - jqId = 1, - addEventListenerFn = function(element, type, fn) { - element.addEventListener(type, fn, false); - }, - removeEventListenerFn = function(element, type, fn) { - element.removeEventListener(type, fn, false); - }; + jqId = 1; /* * !!! This is an undocumented "private" function !!! @@ -2730,9 +2843,9 @@ JQLite._data = function(node) { function jqNextId() { return ++jqId; } -var SPECIAL_CHARS_REGEXP = /([\:\-\_]+(.))/g; +var SPECIAL_CHARS_REGEXP = /([:\-_]+(.))/g; var MOZ_HACK_REGEXP = /^moz([A-Z])/; -var MOUSE_EVENT_MAP= { mouseleave: "mouseout", mouseenter: "mouseover"}; +var MOUSE_EVENT_MAP = { mouseleave: 'mouseout', mouseenter: 'mouseover' }; var jqLiteMinErr = minErr('jqLite'); /** @@ -2760,7 +2873,7 @@ var wrapMap = { 'col': [2, '', '
    '], 'tr': [2, '', '
    '], 'td': [3, '', '
    '], - '_default': [0, "", ""] + '_default': [0, '', ''] }; wrapMap.optgroup = wrapMap.option; @@ -2802,10 +2915,10 @@ function jqLiteBuildFragment(html, context) { nodes.push(context.createTextNode(html)); } else { // Convert html into DOM nodes - tmp = tmp || fragment.appendChild(context.createElement("div")); - tag = (TAG_NAME_REGEXP.exec(html) || ["", ""])[1].toLowerCase(); + tmp = fragment.appendChild(context.createElement('div')); + tag = (TAG_NAME_REGEXP.exec(html) || ['', ''])[1].toLowerCase(); wrap = wrapMap[tag] || wrapMap._default; - tmp.innerHTML = wrap[1] + html.replace(XHTML_TAG_REGEXP, "<$1>") + wrap[2]; + tmp.innerHTML = wrap[1] + html.replace(XHTML_TAG_REGEXP, '<$1>') + wrap[2]; // Descend through wrappers to the right content i = wrap[0]; @@ -2816,12 +2929,12 @@ function jqLiteBuildFragment(html, context) { nodes = concat(nodes, tmp.childNodes); tmp = fragment.firstChild; - tmp.textContent = ""; + tmp.textContent = ''; } // Remove wrapper from fragment - fragment.textContent = ""; - fragment.innerHTML = ""; // Clear inner HTML + fragment.textContent = ''; + fragment.innerHTML = ''; // Clear inner HTML forEach(nodes, function(node) { fragment.appendChild(node); }); @@ -2830,7 +2943,7 @@ function jqLiteBuildFragment(html, context) { } function jqLiteParseHTML(html, context) { - context = context || document; + context = context || window.document; var parsed; if ((parsed = SINGLE_TAG_REGEXP.exec(html))) { @@ -2856,10 +2969,9 @@ function jqLiteWrapNode(node, wrapper) { // IE9-11 has no method "contains" in SVG element and in Node.prototype. Bug #10259. -var jqLiteContains = Node.prototype.contains || function(arg) { - // jshint bitwise: false +var jqLiteContains = window.Node.prototype.contains || /** @this */ function(arg) { + // eslint-disable-next-line no-bitwise return !!(this.compareDocumentPosition(arg) & 16); - // jshint bitwise: true }; ///////////////////////////////////////////// @@ -2875,7 +2987,7 @@ function JQLite(element) { argIsString = true; } if (!(this instanceof JQLite)) { - if (argIsString && element.charAt(0) != '<') { + if (argIsString && element.charAt(0) !== '<') { throw jqLiteMinErr('nosel', 'Looking up elements via selectors is not supported by jqLite! See: http://docs.angularjs.org/api/angular.element'); } return new JQLite(element); @@ -2915,7 +3027,7 @@ function jqLiteOff(element, type, fn, unsupported) { if (!type) { for (type in events) { if (type !== '$destroy') { - removeEventListenerFn(element, type, handle); + element.removeEventListener(type, handle); } delete events[type]; } @@ -2927,7 +3039,7 @@ function jqLiteOff(element, type, fn, unsupported) { arrayRemove(listenerFns || [], fn); } if (!(isDefined(fn) && listenerFns && listenerFns.length > 0)) { - removeEventListenerFn(element, type, handle); + element.removeEventListener(type, handle); delete events[type]; } }; @@ -3004,17 +3116,17 @@ function jqLiteData(element, key, value) { function jqLiteHasClass(element, selector) { if (!element.getAttribute) return false; - return ((" " + (element.getAttribute('class') || '') + " ").replace(/[\n\t]/g, " "). - indexOf(" " + selector + " ") > -1); + return ((' ' + (element.getAttribute('class') || '') + ' ').replace(/[\n\t]/g, ' '). + indexOf(' ' + selector + ' ') > -1); } function jqLiteRemoveClass(element, cssClasses) { if (cssClasses && element.setAttribute) { forEach(cssClasses.split(' '), function(cssClass) { element.setAttribute('class', trim( - (" " + (element.getAttribute('class') || '') + " ") - .replace(/[\n\t]/g, " ") - .replace(" " + trim(cssClass) + " ", " ")) + (' ' + (element.getAttribute('class') || '') + ' ') + .replace(/[\n\t]/g, ' ') + .replace(' ' + trim(cssClass) + ' ', ' ')) ); }); } @@ -3023,7 +3135,7 @@ function jqLiteRemoveClass(element, cssClasses) { function jqLiteAddClass(element, cssClasses) { if (cssClasses && element.setAttribute) { var existingClasses = (' ' + (element.getAttribute('class') || '') + ' ') - .replace(/[\n\t]/g, " "); + .replace(/[\n\t]/g, ' '); forEach(cssClasses.split(' '), function(cssClass) { cssClass = trim(cssClass); @@ -3070,7 +3182,7 @@ function jqLiteController(element, name) { function jqLiteInheritedData(element, name, value) { // if element is the document object work with the html element instead // this makes $(document).scope() possible - if (element.nodeType == NODE_TYPE_DOCUMENT) { + if (element.nodeType === NODE_TYPE_DOCUMENT) { element = element.documentElement; } var names = isArray(name) ? name : [name]; @@ -3128,14 +3240,13 @@ var JQLitePrototype = JQLite.prototype = { } // check if document is already loaded - if (document.readyState === 'complete') { - setTimeout(trigger); + if (window.document.readyState === 'complete') { + window.setTimeout(trigger); } else { this.on('DOMContentLoaded', trigger); // works for modern browsers and IE9 // we can not use jqLite since we are not done loading and jQuery could be loaded later. - // jshint -W064 + // eslint-disable-next-line new-cap JQLite(window).on('load', trigger); // fallback to window.onload for others - // jshint +W064 } }, toString: function() { @@ -3172,7 +3283,8 @@ var ALIASED_ATTR = { 'ngMaxlength': 'maxlength', 'ngMin': 'min', 'ngMax': 'max', - 'ngPattern': 'pattern' + 'ngPattern': 'pattern', + 'ngStep': 'step' }; function getBooleanAttrName(element, name) { @@ -3240,7 +3352,7 @@ forEach({ var lowercasedName = lowercase(name); if (BOOLEAN_ATTR[lowercasedName]) { if (isDefined(value)) { - if (!!value) { + if (value) { element[name] = true; element.setAttribute(name, lowercasedName); } else { @@ -3294,7 +3406,7 @@ forEach({ result.push(option.value || option.text); } }); - return result.length === 0 ? null : result; + return result; } return element.value; } @@ -3322,7 +3434,7 @@ forEach({ // in a way that survives minification. // jqLiteEmpty takes no arguments but is a setter. if (fn !== jqLiteEmpty && - (isUndefined((fn.length == 2 && (fn !== jqLiteHasClass && fn !== jqLiteController)) ? arg1 : arg2))) { + (isUndefined((fn.length === 2 && (fn !== jqLiteHasClass && fn !== jqLiteController)) ? arg1 : arg2))) { if (isObject(arg1)) { // we are a write, but the object properties are the key/values @@ -3464,7 +3576,7 @@ forEach({ eventFns = events[type] = []; eventFns.specialHandlerWrapper = specialHandlerWrapper; if (type !== '$destroy' && !noEventListener) { - addEventListenerFn(element, type, handle); + element.addEventListener(type, handle); } } @@ -3664,6 +3776,7 @@ forEach({ // Provider for private $$jqLite service +/** @this */ function $$jqLiteProvider() { this.$get = function $$jqLite() { return extend(JQLite, { @@ -3706,7 +3819,7 @@ function hashKey(obj, nextUidFn) { } var objType = typeof obj; - if (objType == 'function' || (objType == 'object' && obj !== null)) { + if (objType === 'function' || (objType === 'object' && obj !== null)) { key = obj.$$hashKey = objType + ':' + (nextUidFn || nextUid)(); } else { key = objType + ':' + obj; @@ -3756,7 +3869,7 @@ HashMap.prototype = { } }; -var $$HashMapProvider = [function() { +var $$HashMapProvider = [/** @this */function() { this.$get = [function() { return HashMap; }]; @@ -3819,6 +3932,7 @@ var $$HashMapProvider = [function() { /** * @ngdoc module * @name auto + * @installation * @description * * Implicit module which gets automatically added to each {@link auto.$injector $injector}. @@ -3831,8 +3945,16 @@ var FN_ARG = /^\s*(_?)(\S+?)\1\s*$/; var STRIP_COMMENTS = /((\/\/.*$)|(\/\*[\s\S]*?\*\/))/mg; var $injectorMinErr = minErr('$injector'); +function stringifyFn(fn) { + // Support: Chrome 50-51 only + // Creating a new string by adding `' '` at the end, to hack around some bug in Chrome v50/51 + // (See https://github.com/angular/angular.js/issues/14487.) + // TODO (gkalpak): Remove workaround when Chrome v52 is released + return Function.prototype.toString.call(fn) + ' '; +} + function extractArgs(fn) { - var fnText = fn.toString().replace(STRIP_COMMENTS, ''), + var fnText = stringifyFn(fn).replace(STRIP_COMMENTS, ''), args = fnText.match(ARROW_ARG) || fnText.match(FN_ARGS); return args; } @@ -4075,7 +4197,6 @@ function annotate(fn, strictDi, name) { - /** * @ngdoc service * @name $provide @@ -4100,18 +4221,20 @@ function annotate(fn, strictDi, name) { * these cases the {@link auto.$provide $provide} service has additional helper methods to register * services without specifying a provider. * - * * {@link auto.$provide#provider provider(provider)} - registers a **service provider** with the + * * {@link auto.$provide#provider provider(name, provider)} - registers a **service provider** with the * {@link auto.$injector $injector} - * * {@link auto.$provide#constant constant(obj)} - registers a value/object that can be accessed by + * * {@link auto.$provide#constant constant(name, obj)} - registers a value/object that can be accessed by * providers and services. - * * {@link auto.$provide#value value(obj)} - registers a value/object that can only be accessed by + * * {@link auto.$provide#value value(name, obj)} - registers a value/object that can only be accessed by * services, not providers. - * * {@link auto.$provide#factory factory(fn)} - registers a service **factory function**, `fn`, + * * {@link auto.$provide#factory factory(name, fn)} - registers a service **factory function** * that will be wrapped in a **service provider** object, whose `$get` property will contain the * given factory function. - * * {@link auto.$provide#service service(class)} - registers a **constructor function**, `class` + * * {@link auto.$provide#service service(name, Fn)} - registers a **constructor function** * that will be wrapped in a **service provider** object, whose `$get` property will instantiate * a new object using the given constructor function. + * * {@link auto.$provide#decorator decorator(name, decorFn)} - registers a **decorator function** that + * will be able to modify or replace the implementation of another service. * * See the individual methods for more information and examples. */ @@ -4368,18 +4491,20 @@ function annotate(fn, strictDi, name) { * @name $provide#decorator * @description * - * Register a **service decorator** with the {@link auto.$injector $injector}. A service decorator + * Register a **decorator function** with the {@link auto.$injector $injector}. A decorator function * intercepts the creation of a service, allowing it to override or modify the behavior of the - * service. The object returned by the decorator may be the original service, or a new service - * object which replaces or wraps and delegates to the original service. + * service. The return value of the decorator function may be the original service, or a new service + * that replaces (or wraps and delegates to) the original service. + * + * You can find out more about using decorators in the {@link guide/decorators} guide. * * @param {string} name The name of the service to decorate. * @param {Function|Array.} decorator This function will be invoked when the service needs to be - * instantiated and should return the decorated service instance. The function is called using + * provided and should return the decorated service instance. The function is called using * the {@link auto.$injector#invoke injector.invoke} method and is therefore fully injectable. * Local injection arguments: * - * * `$delegate` - The original service instance, which can be monkey patched, configured, + * * `$delegate` - The original service instance, which can be replaced, monkey patched, configured, * decorated or delegated to. * * @example @@ -4415,7 +4540,7 @@ function createInjector(modulesToLoad, strictDi) { if (angular.isString(caller)) { path.push(caller); } - throw $injectorMinErr('unpr', "Unknown provider: {0}", path.join(' <- ')); + throw $injectorMinErr('unpr', 'Unknown provider: {0}', path.join(' <- ')); })), instanceCache = {}, protoInstanceInjector = @@ -4454,16 +4579,16 @@ function createInjector(modulesToLoad, strictDi) { provider_ = providerInjector.instantiate(provider_); } if (!provider_.$get) { - throw $injectorMinErr('pget', "Provider '{0}' must define $get factory method.", name); + throw $injectorMinErr('pget', 'Provider \'{0}\' must define $get factory method.', name); } - return providerCache[name + providerSuffix] = provider_; + return (providerCache[name + providerSuffix] = provider_); } function enforceReturnValue(name, factory) { - return function enforcedReturnValue() { + return /** @this */ function enforcedReturnValue() { var result = instanceInjector.invoke(factory, this); if (isUndefined(result)) { - throw $injectorMinErr('undef', "Provider '{0}' must return a value from $get factory method.", name); + throw $injectorMinErr('undef', 'Provider \'{0}\' must return a value from $get factory method.', name); } return result; }; @@ -4536,15 +4661,15 @@ function createInjector(modulesToLoad, strictDi) { if (isArray(module)) { module = module[module.length - 1]; } - if (e.message && e.stack && e.stack.indexOf(e.message) == -1) { + if (e.message && e.stack && e.stack.indexOf(e.message) === -1) { // Safari & FF's stack traces don't contain error.message content // unlike those of Chrome and IE // So if stack doesn't contain message, we create a new string that contains both. // Since error.stack is read-only in Safari, I'm overriding e and not e.stack here. - /* jshint -W022 */ + // eslint-disable-next-line no-ex-assign e = e.message + '\n' + e.stack; } - throw $injectorMinErr('modulerr', "Failed to instantiate module {0} due to:\n{1}", + throw $injectorMinErr('modulerr', 'Failed to instantiate module {0} due to:\n{1}', module, e.stack || e.message || e); } }); @@ -4568,7 +4693,8 @@ function createInjector(modulesToLoad, strictDi) { try { path.unshift(serviceName); cache[serviceName] = INSTANTIATING; - return cache[serviceName] = factory(serviceName, caller); + cache[serviceName] = factory(serviceName, caller); + return cache[serviceName]; } catch (err) { if (cache[serviceName] === INSTANTIATING) { delete cache[serviceName]; @@ -4599,13 +4725,16 @@ function createInjector(modulesToLoad, strictDi) { function isClass(func) { // IE 9-11 do not support classes and IE9 leaks with the code below. - if (msie <= 11) { + if (msie <= 11 || typeof func !== 'function') { return false; } - // Workaround for MS Edge. - // Check https://connect.microsoft.com/IE/Feedback/Details/2211653 - return typeof func === 'function' - && /^(?:class\s|constructor\()/.test(Function.prototype.toString.call(func)); + var result = func.$$ngIsClass; + if (!isBoolean(result)) { + // Support: Edge 12-13 only + // See: https://developer.microsoft.com/en-us/microsoft-edge/platform/issues/6156135/ + result = func.$$ngIsClass = /^(?:class\b|constructor\()/.test(stringifyFn(func)); + } + return result; } function invoke(fn, self, locals, serviceName) { @@ -4658,6 +4787,7 @@ createInjector.$$annotate = annotate; /** * @ngdoc provider * @name $anchorScrollProvider + * @this * * @description * Use `$anchorScrollProvider` to disable automatic scrolling whenever @@ -4696,7 +4826,7 @@ function $AnchorScrollProvider() { * When called, it scrolls to the element related to the specified `hash` or (if omitted) to the * current value of {@link ng.$location#hash $location.hash()}, according to the rules specified * in the - * [HTML5 spec](http://www.w3.org/html/wg/drafts/html/master/browsers.html#the-indicated-part-of-the-document). + * [HTML5 spec](http://www.w3.org/html/wg/drafts/html/master/browsers.html#an-indicated-part-of-the-document). * * It also watches the {@link ng.$location#hash $location.hash()} and automatically scrolls to * match any anchor whenever it changes. This can be disabled by calling @@ -4729,7 +4859,7 @@ function $AnchorScrollProvider() { *
    * * @example - +
    Go to bottom @@ -4739,7 +4869,7 @@ function $AnchorScrollProvider() { angular.module('anchorScrollExample', []) .controller('ScrollController', ['$scope', '$location', '$anchorScroll', - function ($scope, $location, $anchorScroll) { + function($scope, $location, $anchorScroll) { $scope.gotoBottom = function() { // set the location.hash to the id of // the element you wish to scroll to. @@ -4768,7 +4898,7 @@ function $AnchorScrollProvider() { * See {@link ng.$anchorScroll#yOffset $anchorScroll.yOffset} for more details. * * @example - +
    @@ -4785,7 +4915,7 @@ function $AnchorScrollProvider() { $anchorScroll.yOffset = 50; // always scroll by 50 extra pixels }]) .controller('headerCtrl', ['$anchorScroll', '$location', '$scope', - function ($anchorScroll, $location, $scope) { + function($anchorScroll, $location, $scope) { $scope.gotoAnchor = function(x) { var newHash = 'anchor' + x; if ($location.hash() !== newHash) { @@ -4904,7 +5034,7 @@ function $AnchorScrollProvider() { // first anchor with given name :-D else if ((elm = getFirstAnchor(document.getElementsByName(hash)))) scrollTo(elm); - // no element and hash == 'top', scroll to the top of the page + // no element and hash === 'top', scroll to the top of the page else if (hash === 'top') scrollTo(null); } @@ -4979,13 +5109,13 @@ function prepareAnimateOptions(options) { : {}; } -var $$CoreAnimateJsProvider = function() { +var $$CoreAnimateJsProvider = /** @this */ function() { this.$get = noop; }; // this is prefixed with Core since it conflicts with // the animateQueueProvider defined in ngAnimate/animateQueue.js -var $$CoreAnimateQueueProvider = function() { +var $$CoreAnimateQueueProvider = /** @this */ function() { var postDigestQueue = new HashMap(); var postDigestElements = []; @@ -4998,17 +5128,23 @@ var $$CoreAnimateQueueProvider = function() { pin: noop, push: function(element, event, options, domOperation) { - domOperation && domOperation(); + if (domOperation) { + domOperation(); + } options = options || {}; - options.from && element.css(options.from); - options.to && element.css(options.to); + if (options.from) { + element.css(options.from); + } + if (options.to) { + element.css(options.to); + } if (options.addClass || options.removeClass) { addRemoveClassesPostDigest(element, options.addClass, options.removeClass); } - var runner = new $$AnimateRunner(); // jshint ignore:line + var runner = new $$AnimateRunner(); // since there are no animations to run the runner needs to be // notified that the animation call is complete. @@ -5052,8 +5188,12 @@ var $$CoreAnimateQueueProvider = function() { }); forEach(element, function(elm) { - toAdd && jqLiteAddClass(elm, toAdd); - toRemove && jqLiteRemoveClass(elm, toRemove); + if (toAdd) { + jqLiteAddClass(elm, toAdd); + } + if (toRemove) { + jqLiteRemoveClass(elm, toRemove); + } }); postDigestQueue.remove(element); } @@ -5093,7 +5233,7 @@ var $$CoreAnimateQueueProvider = function() { * * To see the functional implementation check out `src/ngAnimate/animate.js`. */ -var $AnimateProvider = ['$provide', function($provide) { +var $AnimateProvider = ['$provide', /** @this */ function($provide) { var provider = this; this.$$registeredAnimations = Object.create(null); @@ -5139,7 +5279,7 @@ var $AnimateProvider = ['$provide', function($provide) { */ this.register = function(name, factory) { if (name && name.charAt(0) !== '.') { - throw $animateMinErr('notcsel', "Expecting class selector starting with '.' got '{0}'.", name); + throw $animateMinErr('notcsel', 'Expecting class selector starting with \'.\' got \'{0}\'.', name); } var key = name + '-animation'; @@ -5165,7 +5305,7 @@ var $AnimateProvider = ['$provide', function($provide) { if (arguments.length === 1) { this.$$classNameFilter = (expression instanceof RegExp) ? expression : null; if (this.$$classNameFilter) { - var reservedRegex = new RegExp("(\\s+|\\/)" + NG_ANIMATE_CLASSNAME + "(\\s+|\\/)"); + var reservedRegex = new RegExp('(\\s+|\\/)' + NG_ANIMATE_CLASSNAME + '(\\s+|\\/)'); if (reservedRegex.test(this.$$classNameFilter.toString())) { throw $animateMinErr('nongcls','$animateProvider.classNameFilter(regex) prohibits accepting a regex value which matches/contains the "{0}" CSS class.', NG_ANIMATE_CLASSNAME); @@ -5186,7 +5326,11 @@ var $AnimateProvider = ['$provide', function($provide) { afterElement = null; } } - afterElement ? afterElement.after(element) : parentElement.prepend(element); + if (afterElement) { + afterElement.after(element); + } else { + parentElement.prepend(element); + } } /** @@ -5252,6 +5396,9 @@ var $AnimateProvider = ['$provide', function($provide) { * // remove all the animation event listeners listening for `enter` * $animate.off('enter'); * + * // remove listeners for all animation events from the container element + * $animate.off(container); + * * // remove all the animation event listeners listening for `enter` on the given element and its children * $animate.off('enter', container); * @@ -5260,7 +5407,9 @@ var $AnimateProvider = ['$provide', function($provide) { * $animate.off('enter', container, callback); * ``` * - * @param {string} event the animation event (e.g. enter, leave, move, addClass, removeClass, etc...) + * @param {string|DOMElement} event|container the animation event (e.g. enter, leave, move, + * addClass, removeClass, etc...), or the container element. If it is the element, all other + * arguments are ignored. * @param {DOMElement=} container the container element the event listener was placed on * @param {Function=} callback the callback function that was registered as the listener */ @@ -5324,7 +5473,9 @@ var $AnimateProvider = ['$provide', function($provide) { * @param {Promise} animationPromise The animation promise that is returned when an animation is started. */ cancel: function(runner) { - runner.end && runner.end(); + if (runner.end) { + runner.end(); + } }, /** @@ -5341,7 +5492,13 @@ var $AnimateProvider = ['$provide', function($provide) { * @param {DOMElement} parent the parent element which will append the element as * a child (so long as the after element is not present) * @param {DOMElement=} after the sibling element after which the element will be appended - * @param {object=} options an optional collection of options/styles that will be applied to the element + * @param {object=} options an optional collection of options/styles that will be applied to the element. + * The object can have the following properties: + * + * - **addClass** - `{string}` - space-separated CSS classes to add to element + * - **from** - `{Object}` - CSS properties & values at the beginning of animation. Must have matching `to` + * - **removeClass** - `{string}` - space-separated CSS classes to remove from element + * - **to** - `{Object}` - CSS properties & values at end of animation. Must have matching `from` * * @return {Promise} the animation callback promise */ @@ -5367,7 +5524,13 @@ var $AnimateProvider = ['$provide', function($provide) { * @param {DOMElement} parent the parent element which will append the element as * a child (so long as the after element is not present) * @param {DOMElement=} after the sibling element after which the element will be appended - * @param {object=} options an optional collection of options/styles that will be applied to the element + * @param {object=} options an optional collection of options/styles that will be applied to the element. + * The object can have the following properties: + * + * - **addClass** - `{string}` - space-separated CSS classes to add to element + * - **from** - `{Object}` - CSS properties & values at the beginning of animation. Must have matching `to` + * - **removeClass** - `{string}` - space-separated CSS classes to remove from element + * - **to** - `{Object}` - CSS properties & values at end of animation. Must have matching `from` * * @return {Promise} the animation callback promise */ @@ -5388,7 +5551,13 @@ var $AnimateProvider = ['$provide', function($provide) { * digest once the animation has completed. * * @param {DOMElement} element the element which will be removed from the DOM - * @param {object=} options an optional collection of options/styles that will be applied to the element + * @param {object=} options an optional collection of options/styles that will be applied to the element. + * The object can have the following properties: + * + * - **addClass** - `{string}` - space-separated CSS classes to add to element + * - **from** - `{Object}` - CSS properties & values at the beginning of animation. Must have matching `to` + * - **removeClass** - `{string}` - space-separated CSS classes to remove from element + * - **to** - `{Object}` - CSS properties & values at end of animation. Must have matching `from` * * @return {Promise} the animation callback promise */ @@ -5412,7 +5581,13 @@ var $AnimateProvider = ['$provide', function($provide) { * * @param {DOMElement} element the element which the CSS classes will be applied to * @param {string} className the CSS class(es) that will be added (multiple classes are separated via spaces) - * @param {object=} options an optional collection of options/styles that will be applied to the element + * @param {object=} options an optional collection of options/styles that will be applied to the element. + * The object can have the following properties: + * + * - **addClass** - `{string}` - space-separated CSS classes to add to element + * - **from** - `{Object}` - CSS properties & values at the beginning of animation. Must have matching `to` + * - **removeClass** - `{string}` - space-separated CSS classes to remove from element + * - **to** - `{Object}` - CSS properties & values at end of animation. Must have matching `from` * * @return {Promise} the animation callback promise */ @@ -5436,7 +5611,13 @@ var $AnimateProvider = ['$provide', function($provide) { * * @param {DOMElement} element the element which the CSS classes will be applied to * @param {string} className the CSS class(es) that will be removed (multiple classes are separated via spaces) - * @param {object=} options an optional collection of options/styles that will be applied to the element + * @param {object=} options an optional collection of options/styles that will be applied to the element. + * The object can have the following properties: + * + * - **addClass** - `{string}` - space-separated CSS classes to add to element + * - **from** - `{Object}` - CSS properties & values at the beginning of animation. Must have matching `to` + * - **removeClass** - `{string}` - space-separated CSS classes to remove from element + * - **to** - `{Object}` - CSS properties & values at end of animation. Must have matching `from` * * @return {Promise} the animation callback promise */ @@ -5461,7 +5642,13 @@ var $AnimateProvider = ['$provide', function($provide) { * @param {DOMElement} element the element which the CSS classes will be applied to * @param {string} add the CSS class(es) that will be added (multiple classes are separated via spaces) * @param {string} remove the CSS class(es) that will be removed (multiple classes are separated via spaces) - * @param {object=} options an optional collection of options/styles that will be applied to the element + * @param {object=} options an optional collection of options/styles that will be applied to the element. + * The object can have the following properties: + * + * - **addClass** - `{string}` - space-separated CSS classes to add to element + * - **from** - `{Object}` - CSS properties & values at the beginning of animation. Must have matching `to` + * - **removeClass** - `{string}` - space-separated CSS classes to remove from element + * - **to** - `{Object}` - CSS properties & values at end of animation. Must have matching `from` * * @return {Promise} the animation callback promise */ @@ -5502,7 +5689,13 @@ var $AnimateProvider = ['$provide', function($provide) { * @param {string=} className an optional CSS class that will be applied to the element for the duration of the animation. If * this value is left as empty then a CSS class of `ng-inline-animate` will be applied to the element. * (Note that if no animation is detected then this value will not be applied to the element.) - * @param {object=} options an optional collection of options/styles that will be applied to the element + * @param {object=} options an optional collection of options/styles that will be applied to the element. + * The object can have the following properties: + * + * - **addClass** - `{string}` - space-separated CSS classes to add to element + * - **from** - `{Object}` - CSS properties & values at the beginning of animation. Must have matching `to` + * - **removeClass** - `{string}` - space-separated CSS classes to remove from element + * - **to** - `{Object}` - CSS properties & values at end of animation. Must have matching `from` * * @return {Promise} the animation callback promise */ @@ -5519,7 +5712,7 @@ var $AnimateProvider = ['$provide', function($provide) { }]; }]; -var $$AnimateAsyncRunFactoryProvider = function() { +var $$AnimateAsyncRunFactoryProvider = /** @this */ function() { this.$get = ['$$rAF', function($$rAF) { var waitQueue = []; @@ -5540,15 +5733,19 @@ var $$AnimateAsyncRunFactoryProvider = function() { passed = true; }); return function(callback) { - passed ? callback() : waitForTick(callback); + if (passed) { + callback(); + } else { + waitForTick(callback); + } }; }; }]; }; -var $$AnimateRunnerFactoryProvider = function() { - this.$get = ['$q', '$sniffer', '$$animateAsyncRun', '$document', '$timeout', - function($q, $sniffer, $$animateAsyncRun, $document, $timeout) { +var $$AnimateRunnerFactoryProvider = /** @this */ function() { + this.$get = ['$q', '$sniffer', '$$animateAsyncRun', '$$isDocumentHidden', '$timeout', + function($q, $sniffer, $$animateAsyncRun, $$isDocumentHidden, $timeout) { var INITIAL_STATE = 0; var DONE_PENDING_STATE = 1; @@ -5600,11 +5797,7 @@ var $$AnimateRunnerFactoryProvider = function() { this._doneCallbacks = []; this._tick = function(fn) { - var doc = $document[0]; - - // the document may not be ready or attached - // to the module for some internal tests - if (doc && doc.hidden) { + if ($$isDocumentHidden()) { timeoutTick(fn); } else { rafTick(fn); @@ -5633,7 +5826,11 @@ var $$AnimateRunnerFactoryProvider = function() { var self = this; this.promise = $q(function(resolve, reject) { self.done(function(status) { - status === false ? reject() : resolve(); + if (status === false) { + reject(); + } else { + resolve(); + } }); }); } @@ -5703,10 +5900,13 @@ var $$AnimateRunnerFactoryProvider = function() { }]; }; +/* exported $CoreAnimateCssProvider */ + /** * @ngdoc service * @name $animateCss * @kind object + * @this * * @description * This is the core version of `$animateCss`. By default, only when the `ngAnimate` is included, @@ -5739,7 +5939,6 @@ var $CoreAnimateCssProvider = function() { options.from = null; } - /* jshint newcap: false */ var closed, runner = new $$AnimateRunner(); return { start: run, @@ -5929,7 +6128,7 @@ function Browser(window, document, $log, $sniffer) { // Do the assignment again so that those two variables are referentially identical. lastHistoryState = cachedState; } else { - if (!sameBase || pendingLocation) { + if (!sameBase) { pendingLocation = url; } if (replace) { @@ -5943,6 +6142,9 @@ function Browser(window, document, $log, $sniffer) { pendingLocation = url; } } + if (pendingLocation) { + pendingLocation = url; + } return self; // getter } else { @@ -5950,7 +6152,7 @@ function Browser(window, document, $log, $sniffer) { // the new location.href if a reload happened or if there is a bug like in iOS 9 (see // https://openradar.appspot.com/22186109). // - the replacement is a workaround for https://bugzilla.mozilla.org/show_bug.cgi?id=407172 - return pendingLocation || location.href.replace(/%27/g,"'"); + return pendingLocation || location.href.replace(/%27/g,'\''); } }; @@ -6075,7 +6277,7 @@ function Browser(window, document, $log, $sniffer) { */ self.baseHref = function() { var href = baseElement.attr('href'); - return href ? href.replace(/^(https?\:)?\/\/[^\/]*/, '') : ''; + return href ? href.replace(/^(https?:)?\/\/[^\/]*/, '') : ''; }; /** @@ -6126,6 +6328,7 @@ function Browser(window, document, $log, $sniffer) { } +/** @this */ function $BrowserProvider() { this.$get = ['$window', '$log', '$sniffer', '$document', function($window, $log, $sniffer, $document) { @@ -6136,6 +6339,7 @@ function $BrowserProvider() { /** * @ngdoc service * @name $cacheFactory + * @this * * @description * Factory that constructs {@link $cacheFactory.Cache Cache} objects and gives access to @@ -6172,7 +6376,7 @@ function $BrowserProvider() { * - `{void}` `destroy()` — Removes references to this cache from $cacheFactory. * * @example - +
    @@ -6221,7 +6425,7 @@ function $CacheFactoryProvider() { function cacheFactory(cacheId, options) { if (cacheId in caches) { - throw minErr('$cacheFactory')('iid', "CacheId '{0}' is already taken!", cacheId); + throw minErr('$cacheFactory')('iid', 'CacheId \'{0}\' is already taken!', cacheId); } var size = 0, @@ -6271,7 +6475,7 @@ function $CacheFactoryProvider() { * })); * ``` */ - return caches[cacheId] = { + return (caches[cacheId] = { /** * @ngdoc method @@ -6349,8 +6553,8 @@ function $CacheFactoryProvider() { if (!lruEntry) return; - if (lruEntry == freshEnd) freshEnd = lruEntry.p; - if (lruEntry == staleEnd) staleEnd = lruEntry.n; + if (lruEntry === freshEnd) freshEnd = lruEntry.p; + if (lruEntry === staleEnd) staleEnd = lruEntry.n; link(lruEntry.n,lruEntry.p); delete lruHash[key]; @@ -6415,17 +6619,17 @@ function $CacheFactoryProvider() { info: function() { return extend({}, stats, {size: size}); } - }; + }); /** * makes the `entry` the freshEnd of the LRU linked list */ function refresh(entry) { - if (entry != freshEnd) { + if (entry !== freshEnd) { if (!staleEnd) { staleEnd = entry; - } else if (staleEnd == entry) { + } else if (staleEnd === entry) { staleEnd = entry.n; } @@ -6441,7 +6645,7 @@ function $CacheFactoryProvider() { * bidirectionally links two entries of the LRU linked list */ function link(nextEntry, prevEntry) { - if (nextEntry != prevEntry) { + if (nextEntry !== prevEntry) { if (nextEntry) nextEntry.p = prevEntry; //p stands for previous, 'prev' didn't minify if (prevEntry) prevEntry.n = nextEntry; //n stands for next, 'next' didn't minify } @@ -6489,6 +6693,7 @@ function $CacheFactoryProvider() { /** * @ngdoc service * @name $templateCache + * @this * * @description * The first time a template is used, it is loaded in the template cache for quick retrieval. You @@ -6587,8 +6792,9 @@ function $TemplateCacheProvider() { * There are many different options for a directive. * * The difference resides in the return value of the factory function. - * You can either return a "Directive Definition Object" (see below) that defines the directive properties, - * or just the `postLink` function (all other properties will have the default values). + * You can either return a {@link $compile#directive-definition-object Directive Definition Object (see below)} + * that defines the directive properties, or just the `postLink` function (all other properties will have + * the default values). * *
    * **Best Practice:** It's recommended to use the "directive definition object" form. @@ -6601,33 +6807,34 @@ function $TemplateCacheProvider() { * * myModule.directive('directiveName', function factory(injectables) { * var directiveDefinitionObject = { - * priority: 0, - * template: '
    ', // or // function(tElement, tAttrs) { ... }, + * {@link $compile#-priority- priority}: 0, + * {@link $compile#-template- template}: '
    ', // or // function(tElement, tAttrs) { ... }, * // or - * // templateUrl: 'directive.html', // or // function(tElement, tAttrs) { ... }, - * transclude: false, - * restrict: 'A', - * templateNamespace: 'html', - * scope: false, - * controller: function($scope, $element, $attrs, $transclude, otherInjectables) { ... }, - * controllerAs: 'stringIdentifier', - * bindToController: false, - * require: 'siblingDirectiveName', // or // ['^parentDirectiveName', '?optionalDirectiveName', '?^optionalParent'], - * compile: function compile(tElement, tAttrs, transclude) { + * // {@link $compile#-templateurl- templateUrl}: 'directive.html', // or // function(tElement, tAttrs) { ... }, + * {@link $compile#-transclude- transclude}: false, + * {@link $compile#-restrict- restrict}: 'A', + * {@link $compile#-templatenamespace- templateNamespace}: 'html', + * {@link $compile#-scope- scope}: false, + * {@link $compile#-controller- controller}: function($scope, $element, $attrs, $transclude, otherInjectables) { ... }, + * {@link $compile#-controlleras- controllerAs}: 'stringIdentifier', + * {@link $compile#-bindtocontroller- bindToController}: false, + * {@link $compile#-require- require}: 'siblingDirectiveName', // or // ['^parentDirectiveName', '?optionalDirectiveName', '?^optionalParent'], + * {@link $compile#-multielement- multiElement}: false, + * {@link $compile#-compile- compile}: function compile(tElement, tAttrs, transclude) { * return { - * pre: function preLink(scope, iElement, iAttrs, controller) { ... }, - * post: function postLink(scope, iElement, iAttrs, controller) { ... } + * {@link $compile#pre-linking-function pre}: function preLink(scope, iElement, iAttrs, controller) { ... }, + * {@link $compile#post-linking-function post}: function postLink(scope, iElement, iAttrs, controller) { ... } * } * // or * // return function postLink( ... ) { ... } * }, * // or - * // link: { - * // pre: function preLink(scope, iElement, iAttrs, controller) { ... }, - * // post: function postLink(scope, iElement, iAttrs, controller) { ... } + * // {@link $compile#-link- link}: { + * // {@link $compile#pre-linking-function pre}: function preLink(scope, iElement, iAttrs, controller) { ... }, + * // {@link $compile#post-linking-function post}: function postLink(scope, iElement, iAttrs, controller) { ... } * // } * // or - * // link: function postLink( ... ) { ... } + * // {@link $compile#-link- link}: function postLink( ... ) { ... } * }; * return directiveDefinitionObject; * }); @@ -6652,6 +6859,125 @@ function $TemplateCacheProvider() { * }); * ``` * + * ### Life-cycle hooks + * Directive controllers can provide the following methods that are called by Angular at points in the life-cycle of the + * directive: + * * `$onInit()` - Called on each controller after all the controllers on an element have been constructed and + * had their bindings initialized (and before the pre & post linking functions for the directives on + * this element). This is a good place to put initialization code for your controller. + * * `$onChanges(changesObj)` - Called whenever one-way (`<`) or interpolation (`@`) bindings are updated. The + * `changesObj` is a hash whose keys are the names of the bound properties that have changed, and the values are an + * object of the form `{ currentValue, previousValue, isFirstChange() }`. Use this hook to trigger updates within a + * component such as cloning the bound value to prevent accidental mutation of the outer value. + * * `$doCheck()` - Called on each turn of the digest cycle. Provides an opportunity to detect and act on + * changes. Any actions that you wish to take in response to the changes that you detect must be + * invoked from this hook; implementing this has no effect on when `$onChanges` is called. For example, this hook + * could be useful if you wish to perform a deep equality check, or to check a Date object, changes to which would not + * be detected by Angular's change detector and thus not trigger `$onChanges`. This hook is invoked with no arguments; + * if detecting changes, you must store the previous value(s) for comparison to the current values. + * * `$onDestroy()` - Called on a controller when its containing scope is destroyed. Use this hook for releasing + * external resources, watches and event handlers. Note that components have their `$onDestroy()` hooks called in + * the same order as the `$scope.$broadcast` events are triggered, which is top down. This means that parent + * components will have their `$onDestroy()` hook called before child components. + * * `$postLink()` - Called after this controller's element and its children have been linked. Similar to the post-link + * function this hook can be used to set up DOM event handlers and do direct DOM manipulation. + * Note that child elements that contain `templateUrl` directives will not have been compiled and linked since + * they are waiting for their template to load asynchronously and their own compilation and linking has been + * suspended until that occurs. + * + * #### Comparison with Angular 2 life-cycle hooks + * Angular 2 also uses life-cycle hooks for its components. While the Angular 1 life-cycle hooks are similar there are + * some differences that you should be aware of, especially when it comes to moving your code from Angular 1 to Angular 2: + * + * * Angular 1 hooks are prefixed with `$`, such as `$onInit`. Angular 2 hooks are prefixed with `ng`, such as `ngOnInit`. + * * Angular 1 hooks can be defined on the controller prototype or added to the controller inside its constructor. + * In Angular 2 you can only define hooks on the prototype of the Component class. + * * Due to the differences in change-detection, you may get many more calls to `$doCheck` in Angular 1 than you would to + * `ngDoCheck` in Angular 2 + * * Changes to the model inside `$doCheck` will trigger new turns of the digest loop, which will cause the changes to be + * propagated throughout the application. + * Angular 2 does not allow the `ngDoCheck` hook to trigger a change outside of the component. It will either throw an + * error or do nothing depending upon the state of `enableProdMode()`. + * + * #### Life-cycle hook examples + * + * This example shows how you can check for mutations to a Date object even though the identity of the object + * has not changed. + * + * + * + * angular.module('do-check-module', []) + * .component('app', { + * template: + * 'Month: ' + + * 'Date: {{ $ctrl.date }}' + + * '', + * controller: function() { + * this.date = new Date(); + * this.month = this.date.getMonth(); + * this.updateDate = function() { + * this.date.setMonth(this.month); + * }; + * } + * }) + * .component('test', { + * bindings: { date: '<' }, + * template: + * '
    {{ $ctrl.log | json }}
    ', + * controller: function() { + * var previousValue; + * this.log = []; + * this.$doCheck = function() { + * var currentValue = this.date && this.date.valueOf(); + * if (previousValue !== currentValue) { + * this.log.push('doCheck: date mutated: ' + this.date); + * previousValue = currentValue; + * } + * }; + * } + * }); + *     + * + * + * + *     + * + * This example show how you might use `$doCheck` to trigger changes in your component's inputs even if the + * actual identity of the component doesn't change. (Be aware that cloning and deep equality checks on large + * arrays or objects can have a negative impact on your application performance) + * + * + * + *
    + * + * + * 
    {{ items }}
    + * + *
    + *     + * + * angular.module('do-check-module', []) + * .component('test', { + * bindings: { items: '<' }, + * template: + * '
    {{ $ctrl.log | json }}
    ', + * controller: function() { + * this.log = []; + * + * this.$doCheck = function() { + * if (this.items_ref !== this.items) { + * this.log.push('doCheck: items changed'); + * this.items_ref = this.items; + * } + * if (!angular.equals(this.items_clone, this.items)) { + * this.log.push('doCheck: items mutated'); + * this.items_clone = angular.copy(this.items); + * } + * }; + * } + * }); + *     + *     * * * ### Directive Definition Object @@ -6660,7 +6986,7 @@ function $TemplateCacheProvider() { * compiler}. The attributes are: * * #### `multiElement` - * When this property is set to true, the HTML compiler will collect DOM nodes between + * When this property is set to true (default is `false`), the HTML compiler will collect DOM nodes between * nodes with the attributes `directive-name-start` and `directive-name-end`, and group them * together as the directive elements. It is recommended that this feature be used on directives * which are not strictly behavioral (such as {@link ngClick}), and which @@ -6681,14 +7007,14 @@ function $TemplateCacheProvider() { * and other directives used in the directive's template will also be excluded from execution. * * #### `scope` - * The scope property can be `true`, an object or a falsy value: + * The scope property can be `false`, `true`, or an object: * - * * **falsy:** No scope will be created for the directive. The directive will use its parent's scope. + * * **`false` (default):** No scope will be created for the directive. The directive will use its + * parent's scope. * * * **`true`:** A new child scope that prototypically inherits from its parent will be created for * the directive's element. If multiple directives on the same element request a new scope, - * only one new scope is created. The new scope rule does not apply for the root of the template - * since the root of the template always gets a new scope. + * only one new scope is created. * * * **`{...}` (an object hash):** A new "isolate" scope is created for the directive's element. The * 'isolate' scope differs from normal scope in that it does not prototypically inherit from its parent @@ -6827,25 +7153,6 @@ function $TemplateCacheProvider() { * The `$transclude` function also has a method on it, `$transclude.isSlotFilled(slotName)`, which returns * `true` if the specified slot contains content (i.e. one or more DOM nodes). * - * The controller can provide the following methods that act as life-cycle hooks: - * * `$onInit()` - Called on each controller after all the controllers on an element have been constructed and - * had their bindings initialized (and before the pre & post linking functions for the directives on - * this element). This is a good place to put initialization code for your controller. - * * `$onChanges(changesObj)` - Called whenever one-way (`<`) or interpolation (`@`) bindings are updated. The - * `changesObj` is a hash whose keys are the names of the bound properties that have changed, and the values are an - * object of the form `{ currentValue: ..., previousValue: ... }`. Use this hook to trigger updates within a component - * such as cloning the bound value to prevent accidental mutation of the outer value. - * * `$onDestroy()` - Called on a controller when its containing scope is destroyed. Use this hook for releasing - * external resources, watches and event handlers. Note that components have their `$onDestroy()` hooks called in - * the same order as the `$scope.$broadcast` events are triggered, which is top down. This means that parent - * components will have their `$onDestroy()` hook called before child components. - * * `$postLink()` - Called after this controller's element and its children have been linked. Similar to the post-link - * function this hook can be used to set up DOM event handlers and do direct DOM manipulation. - * Note that child elements that contain `templateUrl` directives will not have been compiled and linked since - * they are waiting for their template to load asynchronously and their own compilation and linking has been - * suspended until that occurs. - * - * * #### `require` * Require another directive and inject its controller as the fourth argument to the linking function. The * `require` property can be a string, an array or an object: @@ -6859,8 +7166,9 @@ function $TemplateCacheProvider() { * If the `require` property is an object and `bindToController` is truthy, then the required controllers are * bound to the controller using the keys of the `require` property. This binding occurs after all the controllers * have been constructed but before `$onInit` is called. + * If the name of the required controller is the same as the local name (the key), the name can be + * omitted. For example, `{parentDir: '^^'}` is equivalent to `{parentDir: '^^parentDir'}`. * See the {@link $compileProvider#component} helper for an example of how this can be used. - * * If no such required directive(s) can be found, or if the directive does not have a controller, then an error is * raised (unless no link function is specified and the required controllers are not being bound to the directive * controller, in which case error checking is skipped). The name can be prefixed with: @@ -7042,8 +7350,8 @@ function $TemplateCacheProvider() { * any other controller. * * * `transcludeFn` - A transclude linking function pre-bound to the correct transclusion scope. - * This is the same as the `$transclude` - * parameter of directive controllers, see there for details. + * This is the same as the `$transclude` parameter of directive controllers, + * see {@link ng.$compile#-controller- the controller section for details}. * `function([scope], cloneLinkingFn, futureParentElement)`. * * #### Pre-linking function @@ -7130,7 +7438,7 @@ function $TemplateCacheProvider() { * * When you call a transclusion function you can pass in a **clone attach function**. This function accepts * two parameters, `function(clone, scope) { ... }`, where the `clone` is a fresh compiled copy of your transcluded - * content and the `scope` is the newly created transclusion scope, to which the clone is bound. + * content and the `scope` is the newly created transclusion scope, which the clone will be linked to. * *
    * **Best Practice**: Always provide a `cloneFn` (clone attach function) when you call a transclude function @@ -7248,7 +7556,7 @@ function $TemplateCacheProvider() { * to illustrate how `$compile` works. *
    * - + +
    + + Model as range: +
    + Model as number:
    + Min:
    + Max:
    + value = {{value}}
    + myForm.range.$valid = {{myForm.range.$valid}}
    + myForm.range.$error = {{myForm.range.$error}} +
    +     +     + + * ## Range Input with ngMin & ngMax attributes + + * @example + + + +
    + Model as range: +
    + Model as number:
    + Min:
    + Max:
    + value = {{value}}
    + myForm.range.$valid = {{myForm.range.$valid}}
    + myForm.range.$error = {{myForm.range.$error}} +
    +     +     + + */ + 'range': rangeInputType, /** * @ngdoc input @@ -22940,7 +24527,7 @@ function baseInputType(scope, element, attr, ctrl, $sniffer, $browser) { } }; - element.on('keydown', function(event) { + element.on('keydown', /** @this */ function(event) { var key = event.keyCode; // ignore @@ -22965,7 +24552,7 @@ function baseInputType(scope, element, attr, ctrl, $sniffer, $browser) { // For these event types, when native validators are present and the browser supports the type, // check for validity changes on various DOM events. if (PARTIAL_VALIDATION_TYPES[type] && ctrl.$$hasNativeValidators && type === attr.type) { - element.on(PARTIAL_VALIDATION_EVENTS, function(ev) { + element.on(PARTIAL_VALIDATION_EVENTS, /** @this */ function(ev) { if (!timeout) { var validity = this[VALIDITY_STATE_PROPERTY]; var origBadInput = validity.badInput; @@ -23033,7 +24620,7 @@ function createDateParser(regexp, mapping) { // When a date is JSON'ified to wraps itself inside of an extra // set of double quotes. This makes the date parsing code unable // to match the date string and parse it as a date. - if (iso.charAt(0) == '"' && iso.charAt(iso.length - 1) == '"') { + if (iso.charAt(0) === '"' && iso.charAt(iso.length - 1) === '"') { iso = iso.substring(1, iso.length - 1); } if (ISO_DATE_REGEXP.test(iso)) { @@ -23075,7 +24662,7 @@ function createDateInputType(type, regexp, parseDate, format) { return function dynamicDateInputType(scope, element, attr, ctrl, $sniffer, $browser, $filter) { badInputChecker(scope, element, attr, ctrl); baseInputType(scope, element, attr, ctrl, $sniffer, $browser); - var timezone = ctrl && ctrl.$options && ctrl.$options.timezone; + var timezone = ctrl && ctrl.$options.getOption('timezone'); var previousDate; ctrl.$$parserName = type; @@ -23154,10 +24741,7 @@ function badInputChecker(scope, element, attr, ctrl) { } } -function numberInputType(scope, element, attr, ctrl, $sniffer, $browser) { - badInputChecker(scope, element, attr, ctrl); - baseInputType(scope, element, attr, ctrl, $sniffer, $browser); - +function numberFormatterParser(ctrl) { ctrl.$$parserName = 'number'; ctrl.$parsers.push(function(value) { if (ctrl.$isEmpty(value)) return null; @@ -23174,6 +24758,19 @@ function numberInputType(scope, element, attr, ctrl, $sniffer, $browser) { } return value; }); +} + +function parseNumberAttrVal(val) { + if (isDefined(val) && !isNumber(val)) { + val = parseFloat(val); + } + return !isNumberNaN(val) ? val : undefined; +} + +function numberInputType(scope, element, attr, ctrl, $sniffer, $browser) { + badInputChecker(scope, element, attr, ctrl); + numberFormatterParser(ctrl); + baseInputType(scope, element, attr, ctrl, $sniffer, $browser); if (isDefined(attr.min) || attr.ngMin) { var minVal; @@ -23182,10 +24779,7 @@ function numberInputType(scope, element, attr, ctrl, $sniffer, $browser) { }; attr.$observe('min', function(val) { - if (isDefined(val) && !isNumber(val)) { - val = parseFloat(val, 10); - } - minVal = isNumber(val) && !isNaN(val) ? val : undefined; + minVal = parseNumberAttrVal(val); // TODO(matsko): implement validateLater to reduce number of validations ctrl.$validate(); }); @@ -23198,14 +24792,157 @@ function numberInputType(scope, element, attr, ctrl, $sniffer, $browser) { }; attr.$observe('max', function(val) { - if (isDefined(val) && !isNumber(val)) { - val = parseFloat(val, 10); - } - maxVal = isNumber(val) && !isNaN(val) ? val : undefined; + maxVal = parseNumberAttrVal(val); // TODO(matsko): implement validateLater to reduce number of validations ctrl.$validate(); }); } + + if (isDefined(attr.step) || attr.ngStep) { + var stepVal; + ctrl.$validators.step = function(modelValue, viewValue) { + return ctrl.$isEmpty(viewValue) || isUndefined(stepVal) || viewValue % stepVal === 0; + }; + + attr.$observe('step', function(val) { + stepVal = parseNumberAttrVal(val); + // TODO(matsko): implement validateLater to reduce number of validations + ctrl.$validate(); + }); + } +} + +function rangeInputType(scope, element, attr, ctrl, $sniffer, $browser) { + badInputChecker(scope, element, attr, ctrl); + numberFormatterParser(ctrl); + baseInputType(scope, element, attr, ctrl, $sniffer, $browser); + + var supportsRange = ctrl.$$hasNativeValidators && element[0].type === 'range', + minVal = supportsRange ? 0 : undefined, + maxVal = supportsRange ? 100 : undefined, + stepVal = supportsRange ? 1 : undefined, + validity = element[0].validity, + hasMinAttr = isDefined(attr.min), + hasMaxAttr = isDefined(attr.max), + hasStepAttr = isDefined(attr.step); + + var originalRender = ctrl.$render; + + ctrl.$render = supportsRange && isDefined(validity.rangeUnderflow) && isDefined(validity.rangeOverflow) ? + //Browsers that implement range will set these values automatically, but reading the adjusted values after + //$render would cause the min / max validators to be applied with the wrong value + function rangeRender() { + originalRender(); + ctrl.$setViewValue(element.val()); + } : + originalRender; + + if (hasMinAttr) { + ctrl.$validators.min = supportsRange ? + // Since all browsers set the input to a valid value, we don't need to check validity + function noopMinValidator() { return true; } : + // non-support browsers validate the min val + function minValidator(modelValue, viewValue) { + return ctrl.$isEmpty(viewValue) || isUndefined(minVal) || viewValue >= minVal; + }; + + setInitialValueAndObserver('min', minChange); + } + + if (hasMaxAttr) { + ctrl.$validators.max = supportsRange ? + // Since all browsers set the input to a valid value, we don't need to check validity + function noopMaxValidator() { return true; } : + // non-support browsers validate the max val + function maxValidator(modelValue, viewValue) { + return ctrl.$isEmpty(viewValue) || isUndefined(maxVal) || viewValue <= maxVal; + }; + + setInitialValueAndObserver('max', maxChange); + } + + if (hasStepAttr) { + ctrl.$validators.step = supportsRange ? + function nativeStepValidator() { + // Currently, only FF implements the spec on step change correctly (i.e. adjusting the + // input element value to a valid value). It's possible that other browsers set the stepMismatch + // validity error instead, so we can at least report an error in that case. + return !validity.stepMismatch; + } : + // ngStep doesn't set the setp attr, so the browser doesn't adjust the input value as setting step would + function stepValidator(modelValue, viewValue) { + return ctrl.$isEmpty(viewValue) || isUndefined(stepVal) || viewValue % stepVal === 0; + }; + + setInitialValueAndObserver('step', stepChange); + } + + function setInitialValueAndObserver(htmlAttrName, changeFn) { + // interpolated attributes set the attribute value only after a digest, but we need the + // attribute value when the input is first rendered, so that the browser can adjust the + // input value based on the min/max value + element.attr(htmlAttrName, attr[htmlAttrName]); + attr.$observe(htmlAttrName, changeFn); + } + + function minChange(val) { + minVal = parseNumberAttrVal(val); + // ignore changes before model is initialized + if (isNumberNaN(ctrl.$modelValue)) { + return; + } + + if (supportsRange) { + var elVal = element.val(); + // IE11 doesn't set the el val correctly if the minVal is greater than the element value + if (minVal > elVal) { + elVal = minVal; + element.val(elVal); + } + ctrl.$setViewValue(elVal); + } else { + // TODO(matsko): implement validateLater to reduce number of validations + ctrl.$validate(); + } + } + + function maxChange(val) { + maxVal = parseNumberAttrVal(val); + // ignore changes before model is initialized + if (isNumberNaN(ctrl.$modelValue)) { + return; + } + + if (supportsRange) { + var elVal = element.val(); + // IE11 doesn't set the el val correctly if the maxVal is less than the element value + if (maxVal < elVal) { + element.val(maxVal); + // IE11 and Chrome don't set the value to the minVal when max < min + elVal = maxVal < minVal ? minVal : maxVal; + } + ctrl.$setViewValue(elVal); + } else { + // TODO(matsko): implement validateLater to reduce number of validations + ctrl.$validate(); + } + } + + function stepChange(val) { + stepVal = parseNumberAttrVal(val); + // ignore changes before model is initialized + if (isNumberNaN(ctrl.$modelValue)) { + return; + } + + // Some browsers don't adjust the input value correctly, but set the stepMismatch error + if (supportsRange && ctrl.$viewValue !== element.val()) { + ctrl.$setViewValue(element.val()); + } else { + // TODO(matsko): implement validateLater to reduce number of validations + ctrl.$validate(); + } + } } function urlInputType(scope, element, attr, ctrl, $sniffer, $browser) { @@ -23235,14 +24972,20 @@ function emailInputType(scope, element, attr, ctrl, $sniffer, $browser) { } function radioInputType(scope, element, attr, ctrl) { + var doTrim = !attr.ngTrim || trim(attr.ngTrim) !== 'false'; // make the name unique, if not defined if (isUndefined(attr.name)) { element.attr('name', nextUid()); } var listener = function(ev) { + var value; if (element[0].checked) { - ctrl.$setViewValue(attr.value, ev && ev.type); + value = attr.value; + if (doTrim) { + value = trim(value); + } + ctrl.$setViewValue(value, ev && ev.type); } }; @@ -23250,6 +24993,11 @@ function radioInputType(scope, element, attr, ctrl) { ctrl.$render = function() { var value = attr.value; + if (doTrim) { + value = trim(value); + } + // Strict comparison would cause a BC + // eslint-disable-next-line eqeqeq element[0].checked = (value == ctrl.$viewValue); }; @@ -23333,6 +25081,20 @@ function checkboxInputType(scope, element, attr, ctrl, $sniffer, $browser, $filt * @param {string=} ngChange Angular expression to be executed when input changes due to user * interaction with the input element. * @param {boolean=} [ngTrim=true] If set to false Angular will not automatically trim the input. + * + * @knownIssue + * + * When specifying the `placeholder` attribute of `
    - * {{text}} + * {{text}} *
    * * @@ -29538,7 +31420,7 @@ var ngSwitchDefaultDirective = ngDirective({ * This example shows how to use `NgTransclude` with fallback content, that * is displayed if no transcluded content is provided. * - * + * * * + + + + + + + + + +
    +
    +

    + Drag and drop between the two lists. +

    +
    + +

    Beasts

    + +

    Left column of beasts is not draggable and accepts both beasts and priests

    + +
    + +
    +
    +
      +
    • + {{man}} +
      • +
    +
    +
    +
      +
    • + {{woman}} +
      • +
    +
    +
    + +
    + +

    Priests

    + +
    + +
    +
    +
      +
    • + {{man}} +
      • +
    +
    +
    +
      +
    • + {{woman}} +
      • +
    +
    +
    + +
    + +

    Terrorists

    + +

    Each terrorist list item accepts a new terrorist. Shows inserting into a particular + position in an array.

    + +
    + + +
    +
    +
      +
    • + {{man}} +
      • +
    +
    +
    +
      +
    • + {{woman}} +
      • +
    +
    +
    + +
    + +

    Custom Drag Image

    + +

    You may specify a drag-image-element-id to use as the drag image. You can use the + ghost image + technique for the custom drag image.

    + +
    + + +
    +
    +
      +
    • + {{man}} +
      • +
    +
    +
    +
      +
    • + {{woman}} +
      • +
    +
    +
    + +
    Custom drag image #1
    +
    Custom drag image #2
    +
    +
    + + + diff --git a/public/vendor/angular-native-dragdrop/demo/js/app.js b/public/vendor/angular-native-dragdrop/demo/js/app.js new file mode 100644 index 00000000000..e839e205c82 --- /dev/null +++ b/public/vendor/angular-native-dragdrop/demo/js/app.js @@ -0,0 +1,54 @@ +angular.module('app', [ + 'hljs', + 'ang-drag-drop' +]).controller('MainCtrl', function($scope) { + $scope.men = [ + 'John', + 'Jack', + 'Mark', + 'Ernie', + 'Mike (Locked)' + ]; + + + $scope.women = [ + 'Jane', + 'Jill', + 'Betty', + 'Mary' + ]; + + $scope.addText = ''; + + $scope.dropValidateHandler = function($drop, $event, $data) { + if ($data === 'Mike (Locked)') { + return false; + } + if ($drop.element[0] === $event.srcElement.parentNode) { + // Don't allow moving to same container + return false; + } + return true; + }; + + $scope.dropSuccessHandler = function($event, index, array) { + array.splice(index, 1); + }; + + $scope.dropFailureHandler = function($event, index, array) { + alert(array[index] + ' could be dropped into left list!') + }; + + $scope.onDrop = function($event, $data, array, index) { + if (index !== undefined) { + array.splice(index, 0, $data); + } else { + array.push($data); + } + }; + + $scope.getCustomDragElementId = function (index) { + return 'customDrag' + (index % 2); + } + +}); diff --git a/public/vendor/angular-native-dragdrop/docs/examples.md b/public/vendor/angular-native-dragdrop/docs/examples.md new file mode 100644 index 00000000000..5530a7601ee --- /dev/null +++ b/public/vendor/angular-native-dragdrop/docs/examples.md @@ -0,0 +1,8 @@ +#Examples + +##Simple Usage + + + +##With drop validation + \ No newline at end of file diff --git a/public/vendor/angular-native-dragdrop/docs/getting-started.md b/public/vendor/angular-native-dragdrop/docs/getting-started.md new file mode 100644 index 00000000000..2fd3f5b353e --- /dev/null +++ b/public/vendor/angular-native-dragdrop/docs/getting-started.md @@ -0,0 +1,26 @@ +#Installation + +##Download +Download the file [**draganddrop.min.js**](https://raw.githubusercontent.com/angular-dragdrop/angular-dragdrop/master/draganddrop.min.js) or [**draganddrop.js**](https://raw.githubusercontent.com/angular-dragdrop/angular-dragdrop/master/draganddrop.js). + +##Bower + +You can also install via Bower using + +`bower install angular-native-dragdrop --save` + +--- + +#Usage + +##Step - 1 **Add script** +``` + +``` + +##Step - 2 **Include in app** +``` + myApp = angular.module('myApp','ang-drag-drop'); +``` + +##Step - 3 ***Profit!!*** diff --git a/public/vendor/angular-native-dragdrop/docs/index.md b/public/vendor/angular-native-dragdrop/docs/index.md new file mode 100644 index 00000000000..b5370fc23b5 --- /dev/null +++ b/public/vendor/angular-native-dragdrop/docs/index.md @@ -0,0 +1,120 @@ +# Angular Drag and Drop +**A Native ( without jquery ) Drag and Drop directive for AngularJS using HTML5 Drag and Drop** + +--- + +##ui-draggable(expression) + +Directive in module ang-drag-drop (since 1.0.5 - old module name ngDragDrop) + +The ui-draggable attribute tells Angular that the element is draggable. ui-draggable takes an expression as the attribute value. The expression should evaluate to either true or false. You can toggle the draggability of an element using this expression. + +###Additional Attributes + +####_**drag**_(variable) + +The class used to mark child elements of draggable object to be used as drag handle. Default class name is `drag-handle` + +**NOTE**: If attribute is not present drag handle feature is not active. + + + +####_**drag-handle-class**_(string) + +The `drag` property is used to assign the data that needs to be passed along with the dragging element. + + + + +####_**on-drop-success**_(function) + +The `on-drop-success` attribute takes a function. We can consider this to be an on-drop-success handler function. This can be useful if you need to do some post processing after the dragged element is dropped successfully on the drop site. + +**NOTE**: This callback function is only called when the drop succeeds. +You can request the `drag-end` event ( very similiar to requesting the click event in `ng-click` ) by passing `$event` in the event handler. + + + +####_**on-drop-failure**_(function) + +The `on-drop-failure` attribute takes a function. We can consider this to be an on-drop-failure handler function. This can be useful if you need to do some post processing after the dragged element is dropped unsuccessfully on any drop site. + +**NOTE**: This callback function is only called when the drop fails. +You can request the `drag-end` event ( very similiar to requesting the click event in `ng-click` ) by passing `$event` in the event handler. + + + +####_**drag-channel**_(string) + +The `on-drop-failure` attribute takes a function. We can consider this to be an on-drop-failure handler function. This can be useful if you need to do some post processing after the dragged element is dropped unsuccessfully on any drop site. + +**NOTE**: This callback function is only called when the drop fails. +You can request the `drag-end` event ( very similiar to requesting the click event in `ng-click` ) by passing `$event` in the event handler. + + + +###Usage + + + +###Events + +On start of dragging an Angular Event `ANGULAR_DRAG_START` is dispatched from the `$rootScope`. The event also carries carries the information about the channel in which the dragging has started. + +On end of dragging an Angular Event `ANGULAR_DRAG_END` is dispatched from the `$rootScope`. The event also carries carries the information about the channel in which the dragging has started. + +When hovering a draggable element on top of a drop area an Angular Event `ANGULAR_HOVER` is dispatched from the `$rootScope`. The event also carries the information about the channel in which the dragging has started. + +--- + +##ui-on-drop(expression) + +Directive in module ang-drag-drop (since 1.0.5 - old module name ngDragDrop) + +The `ui-on-drop` attribute tells Angular that the element is a drop site. `ui-on-drop` takes a function as the attribute value. The function will be called when a valid dragged element is dropped in that location. A valid dragged element is one which has the same channel as the drop location. + +**NOTE** : This callback function is only called when the drop succeeds. +The `ui-on-drop` callback can request additional parameters. The data that is dragged is available to the callback as $data and its channel as `$channel`. Apart from this the drop event is exposed as `$event`. + +###Additional Attributes + +####_**drop-channel**_(variable) + +The channel that the drop site accepts. The dragged element should have the same channel as this drop site for it to be droppable at this location. It is possible to provide comma separated list of channels. + +**NOTE**: Also special value of `drag-channel` attribute is available to accept dragged element with any channel value — * + + + +####_**drop-validate**_(function) + +Extra validation that makes sure that the drop site accepts the dragged element beyond having the same channel. If not defined, no extra validation is made. + +**NOTE**: This callback function is called only if the channel condition is met, when the element starts being dragged + + + + +####_**drag-enter-class**_(string) + +The class that will be added to the the droppable element when a dragged element ( which is droppable ) enters the drop location. The default value for this is `on-drag-enter` + + + +####_**drag-hover-class**_(string) + +The class that will be added to the drop area element when hovering with an element. The default value for this is `on-drag-hover` + + + +###Usage + + + +###Events + +On start of dragging an Angular Event `ANGULAR_DRAG_START` is dispatched from the `$rootScope`. The event also carries carries the information about the channel in which the dragging has started. + +On end of dragging an Angular Event `ANGULAR_DRAG_END` is dispatched from the `$rootScope`. The event also carries carries the information about the channel in which the dragging has started. + +When hovering a draggable element on top of a drop area an Angular Event `ANGULAR_HOVER` is dispatched from the `$rootScope`. The event also carries the information about the channel in which the dragging has started. \ No newline at end of file diff --git a/public/vendor/angular-native-dragdrop/draganddrop.js b/public/vendor/angular-native-dragdrop/draganddrop.js index 089c8f0e7f9..f1866c8374b 100755 --- a/public/vendor/angular-native-dragdrop/draganddrop.js +++ b/public/vendor/angular-native-dragdrop/draganddrop.js @@ -6,8 +6,12 @@ } function determineEffectAllowed(e) { + if(e.originalEvent) { + e.dataTransfer = e.originalEvent.dataTransfer; + } + // Chrome doesn't set dropEffect, so we have to work it out ourselves - if (e.dataTransfer && e.dataTransfer.dropEffect === 'none') { + if (typeof e.dataTransfer !== 'undefined' && e.dataTransfer.dropEffect === 'none') { if (e.dataTransfer.effectAllowed === 'copy' || e.dataTransfer.effectAllowed === 'move') { e.dataTransfer.dropEffect = e.dataTransfer.effectAllowed; @@ -22,10 +26,6 @@ return; } - if (window.jQuery && (-1 === window.jQuery.event.props.indexOf('dataTransfer'))) { - window.jQuery.event.props.push('dataTransfer'); - } - var module = angular.module('ang-drag-drop', []); module.directive('uiDraggable', ['$parse', '$rootScope', '$dragImage', function($parse, $rootScope, $dragImage) { @@ -61,6 +61,10 @@ } function dragendHandler(e) { + if(e.originalEvent) { + e.dataTransfer = e.originalEvent.dataTransfer; + } + setTimeout(function() { element.unbind('$destroy', dragendHandler); }, 0); @@ -75,25 +79,52 @@ scope.$evalAsync(function() { onDropSuccessFn(scope, {$event: e}); }); - } else { - if (attrs.onDropFailure) { - var onDropFailureFn = $parse(attrs.onDropFailure); - scope.$evalAsync(function() { - onDropFailureFn(scope, {$event: e}); - }); - } + } + }else if (e.dataTransfer && e.dataTransfer.dropEffect === 'none'){ + if (attrs.onDropFailure) { + var onDropFailureFn = $parse(attrs.onDropFailure); + scope.$evalAsync(function() { + onDropFailureFn(scope, {$event: e}); + }); } } element.removeClass(draggingClass); } - function dragstartHandler(e) { - var isDragAllowed = !isDragHandleUsed || dragTarget.classList.contains(dragHandleClass); + function setDragElement(e, dragImageElementId) { + var dragImageElementFn; - if (dragTarget.classList.contains("resize-panel-handle")) { - return; + if(e.originalEvent) { + e.dataTransfer = e.originalEvent.dataTransfer; } + dragImageElementFn = $parse(dragImageElementId); + + scope.$apply(function() { + var elementId = dragImageElementFn(scope, {$event: e}), + dragElement; + + if (!(elementId && angular.isString(elementId))) { + return; + } + + dragElement = document.getElementById(elementId); + + if (!dragElement) { + return; + } + + e.dataTransfer.setDragImage(dragElement, 0, 0); + }); + } + + function dragstartHandler(e) { + if(e.originalEvent) { + e.dataTransfer = e.originalEvent.dataTransfer; + } + + var isDragAllowed = !isDragHandleUsed || dragTarget.classList.contains(dragHandleClass); + if (isDragAllowed) { var sendChannel = attrs.dragChannel || 'defaultchannel'; var dragData = ''; @@ -125,9 +156,12 @@ } } }); + } else if (attrs.dragImageElementId) { + setDragElement(e, attrs.dragImageElementId); } - var transferDataObject = {data: dragData, channel: sendChannel} + var offset = {x: e.offsetX, y: e.offsetY}; + var transferDataObject = {data: dragData, channel: sendChannel, offset: offset}; var transferDataText = angular.toJson(transferDataObject); e.dataTransfer.setData('text', transferDataText); @@ -153,6 +187,26 @@ var customDragEnterEvent = $parse(attr.onDragEnter); var customDragLeaveEvent = $parse(attr.onDragLeave); + function calculateDropOffset(e) { + var offset = { + x: e.offsetX, + y: e.offsetY + }; + var target = e.target; + + while (target !== element[0]) { + offset.x = offset.x + target.offsetLeft; + offset.y = offset.y + target.offsetTop; + + target = target.offsetParent; + if (!target) { + return null; + } + } + + return offset; + } + function onDragOver(e) { if (e.preventDefault) { e.preventDefault(); // Necessary. Allows us to drop. @@ -221,6 +275,10 @@ } function onDrop(e) { + if(e.originalEvent) { + e.dataTransfer = e.originalEvent.dataTransfer; + } + if (e.preventDefault) { e.preventDefault(); // Necessary. Allows us to drop. } @@ -231,11 +289,18 @@ var sendData = e.dataTransfer.getData('text'); sendData = angular.fromJson(sendData); + var dropOffset = calculateDropOffset(e); + + var position = dropOffset ? { + x: dropOffset.x - sendData.offset.x, + y: dropOffset.y - sendData.offset.y + } : null; + determineEffectAllowed(e); var uiOnDropFn = $parse(attr.uiOnDrop); scope.$evalAsync(function() { - uiOnDropFn(scope, {$data: sendData.data, $event: e, $channel: sendData.channel}); + uiOnDropFn(scope, {$data: sendData.data, $event: e, $channel: sendData.channel, $position: position}); }); element.removeClass(dragEnterClass); dragging = 0; @@ -252,6 +317,10 @@ } function preventNativeDnD(e) { + if(e.originalEvent) { + e.dataTransfer = e.originalEvent.dataTransfer; + } + if (e.preventDefault) { e.preventDefault(); } @@ -300,7 +369,7 @@ }); - var deregisterDragEnd = $rootScope.$on('ANGULAR_DRAG_END', function(_, e, channel) { + var deregisterDragEnd = $rootScope.$on('ANGULAR_DRAG_END', function() { element.unbind('dragover', onDragOver); element.unbind('dragenter', onDragEnter); element.unbind('dragleave', onDragLeave); diff --git a/public/vendor/angular-native-dragdrop/draganddrop.min.js b/public/vendor/angular-native-dragdrop/draganddrop.min.js new file mode 100755 index 00000000000..3ae7432907c --- /dev/null +++ b/public/vendor/angular-native-dragdrop/draganddrop.min.js @@ -0,0 +1 @@ +!function(e){"use strict";function a(){return"ondrag"in document.createElement("a")}function n(e){e.originalEvent&&(e.dataTransfer=e.originalEvent.dataTransfer),"undefined"!=typeof e.dataTransfer&&"none"===e.dataTransfer.dropEffect&&("copy"===e.dataTransfer.effectAllowed||"move"===e.dataTransfer.effectAllowed?e.dataTransfer.dropEffect=e.dataTransfer.effectAllowed:"copyMove"!==e.dataTransfer.effectAllowed&&"copymove"!==e.dataTransfer.effectAllowed||(e.dataTransfer.dropEffect=e.ctrlKey?"copy":"move"))}if(!a())return void e.module("ang-drag-drop",[]);var r=e.module("ang-drag-drop",[]);r.directive("uiDraggable",["$parse","$rootScope","$dragImage",function(a,r,t){return function(o,d,f){function i(e){e.originalEvent&&(e.dataTransfer=e.originalEvent.dataTransfer),setTimeout(function(){d.unbind("$destroy",i)},0);var t=f.dragChannel||"defaultchannel";if(r.$broadcast("ANGULAR_DRAG_END",e,t),n(e),e.dataTransfer&&"none"!==e.dataTransfer.dropEffect){if(f.onDropSuccess){var s=a(f.onDropSuccess);o.$evalAsync(function(){s(o,{$event:e})})}}else if(e.dataTransfer&&"none"===e.dataTransfer.dropEffect&&f.onDropFailure){var l=a(f.onDropFailure);o.$evalAsync(function(){l(o,{$event:e})})}d.removeClass(c)}function s(n,r){var t;n.originalEvent&&(n.dataTransfer=n.originalEvent.dataTransfer),t=a(r),o.$apply(function(){var a,r=t(o,{$event:n});r&&e.isString(r)&&(a=document.getElementById(r),a&&n.dataTransfer.setDragImage(a,0,0))})}function l(n){n.originalEvent&&(n.dataTransfer=n.originalEvent.dataTransfer);var l=!v||u.classList.contains(g);if(l){var p=f.dragChannel||"defaultchannel",$="";f.drag&&($=o.$eval(f.drag));var m=f.dragImage||null;d.addClass(c),d.bind("$destroy",i);var T=!(document.uniqueID||window.opera);if(m&&T){var h=a(f.dragImage);o.$apply(function(){var a=h(o,{$event:n});if(a&&(e.isString(a)&&(a=t.generate(a)),a.image)){var r=a.xOffset||0,d=a.yOffset||0;n.dataTransfer.setDragImage(a.image,r,d)}})}else f.dragImageElementId&&s(n,f.dragImageElementId);var b={x:n.offsetX,y:n.offsetY},D={data:$,channel:p,offset:b},y=e.toJson(D);n.dataTransfer.setData("text",y),n.dataTransfer.effectAllowed="copyMove",r.$broadcast("ANGULAR_DRAG_START",n,p,D)}else n.preventDefault()}var g,u,v=!1,c=f.draggingClass||"on-dragging";d.attr("draggable",!1),o.$watch(f.uiDraggable,function(e){e?(d.attr("draggable",e),d.bind("dragend",i),d.bind("dragstart",l)):(d.removeAttr("draggable"),d.unbind("dragend",i),d.unbind("dragstart",l))}),e.isString(f.dragHandleClass)&&(v=!0,g=f.dragHandleClass.trim()||"drag-handle",d.bind("mousedown",function(e){u=e.target}))}}]),r.directive("uiOnDrop",["$parse","$rootScope",function(a,r){return function(t,o,d){function f(e){for(var a={x:e.offsetX,y:e.offsetY},n=e.target;n!==o[0];)if(a.x=a.x+n.offsetLeft,a.y=a.y+n.offsetTop,n=n.offsetParent,!n)return null;return a}function i(e){e.preventDefault&&e.preventDefault(),e.stopPropagation&&e.stopPropagation();var n=a(d.uiOnDragOver);return t.$evalAsync(function(){n(t,{$event:e,$channel:p})}),!1}function s(e){e.preventDefault&&e.preventDefault(),e.stopPropagation&&e.stopPropagation(),c--,0===c&&(t.$evalAsync(function(){b(t,{$event:e,$channel:p})}),o.addClass(m),o.removeClass(T));var n=a(d.uiOnDragLeave);t.$evalAsync(function(){n(t,{$event:e,$channel:p})})}function l(e){e.preventDefault&&e.preventDefault(),e.stopPropagation&&e.stopPropagation(),0===c&&(t.$evalAsync(function(){h(t,{$event:e,$channel:p})}),o.removeClass(m),o.addClass(T)),c++;var n=a(d.uiOnDragEnter);t.$evalAsync(function(){n(t,{$event:e,$channel:p})}),r.$broadcast("ANGULAR_HOVER",$)}function g(r){r.originalEvent&&(r.dataTransfer=r.originalEvent.dataTransfer),r.preventDefault&&r.preventDefault(),r.stopPropagation&&r.stopPropagation();var i=r.dataTransfer.getData("text");i=e.fromJson(i);var s=f(r),l=s?{x:s.x-i.offset.x,y:s.y-i.offset.y}:null;n(r);var g=a(d.uiOnDrop);t.$evalAsync(function(){g(t,{$data:i.data,$event:r,$channel:i.channel,$position:l})}),o.removeClass(m),c=0}function u(e,a){if("*"===a)return!0;var n=new RegExp("(\\s|[,])+("+e+")(\\s|[,])+","i");return n.test(","+a+",")}function v(e){return e.originalEvent&&(e.dataTransfer=e.originalEvent.dataTransfer),e.preventDefault&&e.preventDefault(),e.stopPropagation&&e.stopPropagation(),e.dataTransfer.dropEffect="none",!1}var c=0,p=d.dropChannel||"defaultchannel",$="",m=d.dragEnterClass||"on-drag-enter",T=d.dragHoverClass||"on-drag-hover",h=a(d.onDragEnter),b=a(d.onDragLeave),D=r.$on("ANGULAR_DRAG_START",function(e,n,r,f){$=r;var c=!0;if(u(r,p)||(c=!1),c&&d.dropValidate){var T=a(d.dropValidate);c=T(t,{$drop:{scope:t,element:o},$event:n,$data:f.data,$channel:f.channel})}c?(o.bind("dragover",i),o.bind("dragenter",l),o.bind("dragleave",s),o.bind("drop",g),o.addClass(m)):(o.bind("dragover",v),o.bind("dragenter",v),o.bind("dragleave",v),o.bind("drop",v),o.removeClass(m))}),y=r.$on("ANGULAR_DRAG_END",function(){o.unbind("dragover",i),o.unbind("dragenter",l),o.unbind("dragleave",s),o.unbind("drop",g),o.removeClass(T),o.removeClass(m),o.unbind("dragover",v),o.unbind("dragenter",v),o.unbind("dragleave",v),o.unbind("drop",v)});t.$on("$destroy",function(){D(),y()}),d.$observe("dropChannel",function(e){e&&(p=e)})}}]),r.constant("$dragImageConfig",{height:20,width:200,padding:10,font:"bold 11px Arial",fontColor:"#eee8d5",backgroundColor:"#93a1a1",xOffset:0,yOffset:0}),r.service("$dragImage",["$dragImageConfig",function(a){function n(e,a,n){var t=e.measureText(a).width;if(tn.width;)a=a.substring(0,a.length-1),t=e.measureText(a+r).width;return a+r}var r="…";this.generate=function(r,t){var o=e.extend({},a,t||{}),d=document.createElement("canvas");d.height=o.height,d.width=o.width;var f=d.getContext("2d");f.fillStyle=o.backgroundColor,f.fillRect(0,0,o.width,o.height),f.font=o.font,f.fillStyle=o.fontColor;var i=n(f,r,o);f.fillText(i,4,o.padding+4);var s=new Image;return s.src=d.toDataURL(),{image:s,xOffset:o.xOffset,yOffset:o.yOffset}}}])}(angular); \ No newline at end of file diff --git a/public/vendor/angular-native-dragdrop/index.js b/public/vendor/angular-native-dragdrop/index.js new file mode 100644 index 00000000000..548e0434b32 --- /dev/null +++ b/public/vendor/angular-native-dragdrop/index.js @@ -0,0 +1,2 @@ +require('./draganddrop'); +module.exports = 'ang-drag-drop'; diff --git a/public/vendor/angular-native-dragdrop/mkdocs.yml b/public/vendor/angular-native-dragdrop/mkdocs.yml new file mode 100644 index 00000000000..4eca025bd0d --- /dev/null +++ b/public/vendor/angular-native-dragdrop/mkdocs.yml @@ -0,0 +1,14 @@ +site_name: Angular Drag and Drop + +site_url: http://angular-dragdrop.github.io/angular-dragdrop/ +site_description: Project documentation for angular Drag and Drop. + +repo_url: https://github.com/angular-dragdrop/angular-dragdrop + + +theme : flatly + +pages: +- 'index.md' +- 'getting-started.md' +- 'examples.md' \ No newline at end of file diff --git a/public/vendor/angular-native-dragdrop/package.json b/public/vendor/angular-native-dragdrop/package.json new file mode 100644 index 00000000000..d74355e7896 --- /dev/null +++ b/public/vendor/angular-native-dragdrop/package.json @@ -0,0 +1,26 @@ +{ + "name": "angular-native-dragdrop", + "version": "1.2.2", + "description": "Angular HTML5 Drag and Drop directive written in pure with no dependency on JQuery.", + "main": "index.js", + "scripts": { + "test": "gulp" + }, + "repository": { + "type": "git", + "url": "https://github.com/angular-dragdrop/angular-dragdrop.git" + }, + "author": "ganarajpr", + "license": "MIT", + "bugs": { + "url": "https://github.com/angular-dragdrop/angular-dragdrop/issues" + }, + "homepage": "http://angular-dragdrop.github.io/angular-dragdrop", + "devDependencies": { + "gulp": "^3.8.11", + "gulp-jshint": "^1.9.2", + "gulp-rename": "^1.2.2", + "gulp-uglify": "^1.4.2", + "jshint-stylish": "^1.0.1" + } +} diff --git a/public/vendor/jquery/.bower.json b/public/vendor/jquery/.bower.json index 25f5cf87975..f0ada1a41de 100644 --- a/public/vendor/jquery/.bower.json +++ b/public/vendor/jquery/.bower.json @@ -12,14 +12,14 @@ "library" ], "homepage": "https://github.com/jquery/jquery-dist", - "version": "2.2.4", - "_release": "2.2.4", + "version": "3.1.0", + "_release": "3.1.0", "_resolution": { "type": "version", - "tag": "2.2.4", - "commit": "c0185ab7c75aab88762c5aae780b9d83b80eda72" + "tag": "3.1.0", + "commit": "6f02bc382c0529d3b4f68f6b2ad21876642dbbfe" }, "_source": "https://github.com/jquery/jquery-dist.git", - "_target": "~2.2.4", + "_target": "~3.1.0", "_originalSource": "jquery" } \ No newline at end of file diff --git a/public/vendor/jquery/AUTHORS.txt b/public/vendor/jquery/AUTHORS.txt index dde64cac7ac..0e22886ad33 100644 --- a/public/vendor/jquery/AUTHORS.txt +++ b/public/vendor/jquery/AUTHORS.txt @@ -272,7 +272,24 @@ Christian Grete Liza Ramo Julian Alexander Murillo Joelle Fleurantin +Jae Sung Park Jun Sun +Josh Soref +Henry Wong +Jon Dufresne +Martijn W. van der Lee Devin Wilson -Todor Prikumov +Steve Mao Zack Hall +Bernhard M. Wiedemann +Todor Prikumov +Jha Naman +William Robinet +Alexander Lisianoi +Vitaliy Terziev +Joe Trumbull +Alexander K +Damian Senn +Ralin Chimev +Felipe Sateler +Christophe Tafani-Dereeper diff --git a/public/vendor/jquery/dist/core.js b/public/vendor/jquery/dist/core.js new file mode 100644 index 00000000000..c93c2d92fa6 --- /dev/null +++ b/public/vendor/jquery/dist/core.js @@ -0,0 +1,481 @@ +/* global Symbol */ +// Defining this global in .eslintrc would create a danger of using the global +// unguarded in another place, it seems safer to define global only for this module + +define( [ + "./var/arr", + "./var/document", + "./var/getProto", + "./var/slice", + "./var/concat", + "./var/push", + "./var/indexOf", + "./var/class2type", + "./var/toString", + "./var/hasOwn", + "./var/fnToString", + "./var/ObjectFunctionString", + "./var/support", + "./core/DOMEval" +], function( arr, document, getProto, slice, concat, push, indexOf, + class2type, toString, hasOwn, fnToString, ObjectFunctionString, + support, DOMEval ) { + +"use strict"; + +var + version = "3.1.0", + + // Define a local copy of jQuery + jQuery = function( selector, context ) { + + // The jQuery object is actually just the init constructor 'enhanced' + // Need init if jQuery is called (just allow error to be thrown if not included) + return new jQuery.fn.init( selector, context ); + }, + + // Support: Android <=4.0 only + // Make sure we trim BOM and NBSP + rtrim = /^[\s\uFEFF\xA0]+|[\s\uFEFF\xA0]+$/g, + + // Matches dashed string for camelizing + rmsPrefix = /^-ms-/, + rdashAlpha = /-([a-z])/g, + + // Used by jQuery.camelCase as callback to replace() + fcamelCase = function( all, letter ) { + return letter.toUpperCase(); + }; + +jQuery.fn = jQuery.prototype = { + + // The current version of jQuery being used + jquery: version, + + constructor: jQuery, + + // The default length of a jQuery object is 0 + length: 0, + + toArray: function() { + return slice.call( this ); + }, + + // Get the Nth element in the matched element set OR + // Get the whole matched element set as a clean array + get: function( num ) { + return num != null ? + + // Return just the one element from the set + ( num < 0 ? this[ num + this.length ] : this[ num ] ) : + + // Return all the elements in a clean array + slice.call( this ); + }, + + // Take an array of elements and push it onto the stack + // (returning the new matched element set) + pushStack: function( elems ) { + + // Build a new jQuery matched element set + var ret = jQuery.merge( this.constructor(), elems ); + + // Add the old object onto the stack (as a reference) + ret.prevObject = this; + + // Return the newly-formed element set + return ret; + }, + + // Execute a callback for every element in the matched set. + each: function( callback ) { + return jQuery.each( this, callback ); + }, + + map: function( callback ) { + return this.pushStack( jQuery.map( this, function( elem, i ) { + return callback.call( elem, i, elem ); + } ) ); + }, + + slice: function() { + return this.pushStack( slice.apply( this, arguments ) ); + }, + + first: function() { + return this.eq( 0 ); + }, + + last: function() { + return this.eq( -1 ); + }, + + eq: function( i ) { + var len = this.length, + j = +i + ( i < 0 ? len : 0 ); + return this.pushStack( j >= 0 && j < len ? [ this[ j ] ] : [] ); + }, + + end: function() { + return this.prevObject || this.constructor(); + }, + + // For internal use only. + // Behaves like an Array's method, not like a jQuery method. + push: push, + sort: arr.sort, + splice: arr.splice +}; + +jQuery.extend = jQuery.fn.extend = function() { + var options, name, src, copy, copyIsArray, clone, + target = arguments[ 0 ] || {}, + i = 1, + length = arguments.length, + deep = false; + + // Handle a deep copy situation + if ( typeof target === "boolean" ) { + deep = target; + + // Skip the boolean and the target + target = arguments[ i ] || {}; + i++; + } + + // Handle case when target is a string or something (possible in deep copy) + if ( typeof target !== "object" && !jQuery.isFunction( target ) ) { + target = {}; + } + + // Extend jQuery itself if only one argument is passed + if ( i === length ) { + target = this; + i--; + } + + for ( ; i < length; i++ ) { + + // Only deal with non-null/undefined values + if ( ( options = arguments[ i ] ) != null ) { + + // Extend the base object + for ( name in options ) { + src = target[ name ]; + copy = options[ name ]; + + // Prevent never-ending loop + if ( target === copy ) { + continue; + } + + // Recurse if we're merging plain objects or arrays + if ( deep && copy && ( jQuery.isPlainObject( copy ) || + ( copyIsArray = jQuery.isArray( copy ) ) ) ) { + + if ( copyIsArray ) { + copyIsArray = false; + clone = src && jQuery.isArray( src ) ? src : []; + + } else { + clone = src && jQuery.isPlainObject( src ) ? src : {}; + } + + // Never move original objects, clone them + target[ name ] = jQuery.extend( deep, clone, copy ); + + // Don't bring in undefined values + } else if ( copy !== undefined ) { + target[ name ] = copy; + } + } + } + } + + // Return the modified object + return target; +}; + +jQuery.extend( { + + // Unique for each copy of jQuery on the page + expando: "jQuery" + ( version + Math.random() ).replace( /\D/g, "" ), + + // Assume jQuery is ready without the ready module + isReady: true, + + error: function( msg ) { + throw new Error( msg ); + }, + + noop: function() {}, + + isFunction: function( obj ) { + return jQuery.type( obj ) === "function"; + }, + + isArray: Array.isArray, + + isWindow: function( obj ) { + return obj != null && obj === obj.window; + }, + + isNumeric: function( obj ) { + + // As of jQuery 3.0, isNumeric is limited to + // strings and numbers (primitives or objects) + // that can be coerced to finite numbers (gh-2662) + var type = jQuery.type( obj ); + return ( type === "number" || type === "string" ) && + + // parseFloat NaNs numeric-cast false positives ("") + // ...but misinterprets leading-number strings, particularly hex literals ("0x...") + // subtraction forces infinities to NaN + !isNaN( obj - parseFloat( obj ) ); + }, + + isPlainObject: function( obj ) { + var proto, Ctor; + + // Detect obvious negatives + // Use toString instead of jQuery.type to catch host objects + if ( !obj || toString.call( obj ) !== "[object Object]" ) { + return false; + } + + proto = getProto( obj ); + + // Objects with no prototype (e.g., `Object.create( null )`) are plain + if ( !proto ) { + return true; + } + + // Objects with prototype are plain iff they were constructed by a global Object function + Ctor = hasOwn.call( proto, "constructor" ) && proto.constructor; + return typeof Ctor === "function" && fnToString.call( Ctor ) === ObjectFunctionString; + }, + + isEmptyObject: function( obj ) { + + /* eslint-disable no-unused-vars */ + // See https://github.com/eslint/eslint/issues/6125 + var name; + + for ( name in obj ) { + return false; + } + return true; + }, + + type: function( obj ) { + if ( obj == null ) { + return obj + ""; + } + + // Support: Android <=2.3 only (functionish RegExp) + return typeof obj === "object" || typeof obj === "function" ? + class2type[ toString.call( obj ) ] || "object" : + typeof obj; + }, + + // Evaluates a script in a global context + globalEval: function( code ) { + DOMEval( code ); + }, + + // Convert dashed to camelCase; used by the css and data modules + // Support: IE <=9 - 11, Edge 12 - 13 + // Microsoft forgot to hump their vendor prefix (#9572) + camelCase: function( string ) { + return string.replace( rmsPrefix, "ms-" ).replace( rdashAlpha, fcamelCase ); + }, + + nodeName: function( elem, name ) { + return elem.nodeName && elem.nodeName.toLowerCase() === name.toLowerCase(); + }, + + each: function( obj, callback ) { + var length, i = 0; + + if ( isArrayLike( obj ) ) { + length = obj.length; + for ( ; i < length; i++ ) { + if ( callback.call( obj[ i ], i, obj[ i ] ) === false ) { + break; + } + } + } else { + for ( i in obj ) { + if ( callback.call( obj[ i ], i, obj[ i ] ) === false ) { + break; + } + } + } + + return obj; + }, + + // Support: Android <=4.0 only + trim: function( text ) { + return text == null ? + "" : + ( text + "" ).replace( rtrim, "" ); + }, + + // results is for internal usage only + makeArray: function( arr, results ) { + var ret = results || []; + + if ( arr != null ) { + if ( isArrayLike( Object( arr ) ) ) { + jQuery.merge( ret, + typeof arr === "string" ? + [ arr ] : arr + ); + } else { + push.call( ret, arr ); + } + } + + return ret; + }, + + inArray: function( elem, arr, i ) { + return arr == null ? -1 : indexOf.call( arr, elem, i ); + }, + + // Support: Android <=4.0 only, PhantomJS 1 only + // push.apply(_, arraylike) throws on ancient WebKit + merge: function( first, second ) { + var len = +second.length, + j = 0, + i = first.length; + + for ( ; j < len; j++ ) { + first[ i++ ] = second[ j ]; + } + + first.length = i; + + return first; + }, + + grep: function( elems, callback, invert ) { + var callbackInverse, + matches = [], + i = 0, + length = elems.length, + callbackExpect = !invert; + + // Go through the array, only saving the items + // that pass the validator function + for ( ; i < length; i++ ) { + callbackInverse = !callback( elems[ i ], i ); + if ( callbackInverse !== callbackExpect ) { + matches.push( elems[ i ] ); + } + } + + return matches; + }, + + // arg is for internal usage only + map: function( elems, callback, arg ) { + var length, value, + i = 0, + ret = []; + + // Go through the array, translating each of the items to their new values + if ( isArrayLike( elems ) ) { + length = elems.length; + for ( ; i < length; i++ ) { + value = callback( elems[ i ], i, arg ); + + if ( value != null ) { + ret.push( value ); + } + } + + // Go through every key on the object, + } else { + for ( i in elems ) { + value = callback( elems[ i ], i, arg ); + + if ( value != null ) { + ret.push( value ); + } + } + } + + // Flatten any nested arrays + return concat.apply( [], ret ); + }, + + // A global GUID counter for objects + guid: 1, + + // Bind a function to a context, optionally partially applying any + // arguments. + proxy: function( fn, context ) { + var tmp, args, proxy; + + if ( typeof context === "string" ) { + tmp = fn[ context ]; + context = fn; + fn = tmp; + } + + // Quick check to determine if target is callable, in the spec + // this throws a TypeError, but we will just return undefined. + if ( !jQuery.isFunction( fn ) ) { + return undefined; + } + + // Simulated bind + args = slice.call( arguments, 2 ); + proxy = function() { + return fn.apply( context || this, args.concat( slice.call( arguments ) ) ); + }; + + // Set the guid of unique handler to the same of original handler, so it can be removed + proxy.guid = fn.guid = fn.guid || jQuery.guid++; + + return proxy; + }, + + now: Date.now, + + // jQuery.support is not used in Core but other projects attach their + // properties to it so it needs to exist. + support: support +} ); + +if ( typeof Symbol === "function" ) { + jQuery.fn[ Symbol.iterator ] = arr[ Symbol.iterator ]; +} + +// Populate the class2type map +jQuery.each( "Boolean Number String Function Array Date RegExp Object Error Symbol".split( " " ), +function( i, name ) { + class2type[ "[object " + name + "]" ] = name.toLowerCase(); +} ); + +function isArrayLike( obj ) { + + // Support: real iOS 8.2 only (not reproducible in simulator) + // `in` check used to prevent JIT error (gh-2145) + // hasOwn isn't used here due to false negatives + // regarding Nodelist length in IE + var length = !!obj && "length" in obj && obj.length, + type = jQuery.type( obj ); + + if ( type === "function" || jQuery.isWindow( obj ) ) { + return false; + } + + return type === "array" || length === 0 || + typeof length === "number" && length > 0 && ( length - 1 ) in obj; +} + +return jQuery; +} ); diff --git a/public/vendor/jquery/dist/jquery.js b/public/vendor/jquery/dist/jquery.js index 5c3c456ac48..f2fc2747874 100644 --- a/public/vendor/jquery/dist/jquery.js +++ b/public/vendor/jquery/dist/jquery.js @@ -1,20 +1,23 @@ +/*eslint-disable no-unused-vars*/ /*! - * jQuery JavaScript Library v2.2.4 - * http://jquery.com/ + * jQuery JavaScript Library v3.1.0 + * https://jquery.com/ * * Includes Sizzle.js - * http://sizzlejs.com/ + * https://sizzlejs.com/ * * Copyright jQuery Foundation and other contributors * Released under the MIT license - * http://jquery.org/license + * https://jquery.org/license * - * Date: 2016-05-20T17:23Z + * Date: 2016-07-07T21:44Z */ +( function( global, factory ) { -(function( global, factory ) { + "use strict"; if ( typeof module === "object" && typeof module.exports === "object" ) { + // For CommonJS and CommonJS-like environments where a proper `window` // is present, execute the factory and get jQuery. // For environments that do not have a `window` with a `document` @@ -35,17 +38,20 @@ } // Pass this if window is not defined yet -}(typeof window !== "undefined" ? window : this, function( window, noGlobal ) { +} )( typeof window !== "undefined" ? window : this, function( window, noGlobal ) { + +// Edge <= 12 - 13+, Firefox <=18 - 45+, IE 10 - 11, Safari 5.1 - 9+, iOS 6 - 9.1 +// throw exceptions when non-strict code (e.g., ASP.NET 4.5) accesses strict mode +// arguments.callee.caller (trac-13335). But as of jQuery 3.0 (2016), strict mode should be common +// enough that all such attempts are guarded in a try block. +"use strict"; -// Support: Firefox 18+ -// Can't be in strict mode, several libs including ASP.NET trace -// the stack via arguments.caller.callee and Firefox dies if -// you try to trace through "use strict" call chains. (#13335) -//"use strict"; var arr = []; var document = window.document; +var getProto = Object.getPrototypeOf; + var slice = arr.slice; var concat = arr.concat; @@ -60,12 +66,30 @@ var toString = class2type.toString; var hasOwn = class2type.hasOwnProperty; +var fnToString = hasOwn.toString; + +var ObjectFunctionString = fnToString.call( Object ); + var support = {}; + function DOMEval( code, doc ) { + doc = doc || document; + + var script = doc.createElement( "script" ); + + script.text = code; + doc.head.appendChild( script ).parentNode.removeChild( script ); + } +/* global Symbol */ +// Defining this global in .eslintrc would create a danger of using the global +// unguarded in another place, it seems safer to define global only for this module + + + var - version = "2.2.4", + version = "3.1.0", // Define a local copy of jQuery jQuery = function( selector, context ) { @@ -75,13 +99,13 @@ var return new jQuery.fn.init( selector, context ); }, - // Support: Android<4.1 + // Support: Android <=4.0 only // Make sure we trim BOM and NBSP rtrim = /^[\s\uFEFF\xA0]+|[\s\uFEFF\xA0]+$/g, // Matches dashed string for camelizing rmsPrefix = /^-ms-/, - rdashAlpha = /-([\da-z])/gi, + rdashAlpha = /-([a-z])/g, // Used by jQuery.camelCase as callback to replace() fcamelCase = function( all, letter ) { @@ -95,9 +119,6 @@ jQuery.fn = jQuery.prototype = { constructor: jQuery, - // Start with an empty selector - selector: "", - // The default length of a jQuery object is 0 length: 0, @@ -126,7 +147,6 @@ jQuery.fn = jQuery.prototype = { // Add the old object onto the stack (as a reference) ret.prevObject = this; - ret.context = this.context; // Return the newly-formed element set return ret; @@ -267,41 +287,45 @@ jQuery.extend( { isNumeric: function( obj ) { - // parseFloat NaNs numeric-cast false positives (null|true|false|"") - // ...but misinterprets leading-number strings, particularly hex literals ("0x...") - // subtraction forces infinities to NaN - // adding 1 corrects loss of precision from parseFloat (#15100) - var realStringObj = obj && obj.toString(); - return !jQuery.isArray( obj ) && ( realStringObj - parseFloat( realStringObj ) + 1 ) >= 0; + // As of jQuery 3.0, isNumeric is limited to + // strings and numbers (primitives or objects) + // that can be coerced to finite numbers (gh-2662) + var type = jQuery.type( obj ); + return ( type === "number" || type === "string" ) && + + // parseFloat NaNs numeric-cast false positives ("") + // ...but misinterprets leading-number strings, particularly hex literals ("0x...") + // subtraction forces infinities to NaN + !isNaN( obj - parseFloat( obj ) ); }, isPlainObject: function( obj ) { - var key; + var proto, Ctor; - // Not plain objects: - // - Any object or value whose internal [[Class]] property is not "[object Object]" - // - DOM nodes - // - window - if ( jQuery.type( obj ) !== "object" || obj.nodeType || jQuery.isWindow( obj ) ) { + // Detect obvious negatives + // Use toString instead of jQuery.type to catch host objects + if ( !obj || toString.call( obj ) !== "[object Object]" ) { return false; } - // Not own constructor property must be Object - if ( obj.constructor && - !hasOwn.call( obj, "constructor" ) && - !hasOwn.call( obj.constructor.prototype || {}, "isPrototypeOf" ) ) { - return false; + proto = getProto( obj ); + + // Objects with no prototype (e.g., `Object.create( null )`) are plain + if ( !proto ) { + return true; } - // Own properties are enumerated firstly, so to speed up, - // if last one is own, then all properties are own - for ( key in obj ) {} - - return key === undefined || hasOwn.call( obj, key ); + // Objects with prototype are plain iff they were constructed by a global Object function + Ctor = hasOwn.call( proto, "constructor" ) && proto.constructor; + return typeof Ctor === "function" && fnToString.call( Ctor ) === ObjectFunctionString; }, isEmptyObject: function( obj ) { + + /* eslint-disable no-unused-vars */ + // See https://github.com/eslint/eslint/issues/6125 var name; + for ( name in obj ) { return false; } @@ -313,7 +337,7 @@ jQuery.extend( { return obj + ""; } - // Support: Android<4.0, iOS<6 (functionish RegExp) + // Support: Android <=2.3 only (functionish RegExp) return typeof obj === "object" || typeof obj === "function" ? class2type[ toString.call( obj ) ] || "object" : typeof obj; @@ -321,32 +345,11 @@ jQuery.extend( { // Evaluates a script in a global context globalEval: function( code ) { - var script, - indirect = eval; - - code = jQuery.trim( code ); - - if ( code ) { - - // If the code includes a valid, prologue position - // strict mode pragma, execute code by injecting a - // script tag into the document. - if ( code.indexOf( "use strict" ) === 1 ) { - script = document.createElement( "script" ); - script.text = code; - document.head.appendChild( script ).parentNode.removeChild( script ); - } else { - - // Otherwise, avoid the DOM node creation, insertion - // and removal by using an indirect global eval - - indirect( code ); - } - } + DOMEval( code ); }, // Convert dashed to camelCase; used by the css and data modules - // Support: IE9-11+ + // Support: IE <=9 - 11, Edge 12 - 13 // Microsoft forgot to hump their vendor prefix (#9572) camelCase: function( string ) { return string.replace( rmsPrefix, "ms-" ).replace( rdashAlpha, fcamelCase ); @@ -377,7 +380,7 @@ jQuery.extend( { return obj; }, - // Support: Android<4.1 + // Support: Android <=4.0 only trim: function( text ) { return text == null ? "" : @@ -406,6 +409,8 @@ jQuery.extend( { return arr == null ? -1 : indexOf.call( arr, elem, i ); }, + // Support: Android <=4.0 only, PhantomJS 1 only + // push.apply(_, arraylike) throws on ancient WebKit merge: function( first, second ) { var len = +second.length, j = 0, @@ -510,15 +515,9 @@ jQuery.extend( { support: support } ); -// JSHint would error on this code due to the Symbol not being defined in ES5. -// Defining this global in .jshintrc would create a danger of using the global -// unguarded in another place, it seems safer to just disable JSHint for these -// three lines. -/* jshint ignore: start */ if ( typeof Symbol === "function" ) { jQuery.fn[ Symbol.iterator ] = arr[ Symbol.iterator ]; } -/* jshint ignore: end */ // Populate the class2type map jQuery.each( "Boolean Number String Function Array Date RegExp Object Error Symbol".split( " " ), @@ -528,7 +527,7 @@ function( i, name ) { function isArrayLike( obj ) { - // Support: iOS 8.2 (not reproducible in simulator) + // Support: real iOS 8.2 only (not reproducible in simulator) // `in` check used to prevent JIT error (gh-2145) // hasOwn isn't used here due to false negatives // regarding Nodelist length in IE @@ -544,14 +543,14 @@ function isArrayLike( obj ) { } var Sizzle = /*! - * Sizzle CSS Selector Engine v2.2.1 - * http://sizzlejs.com/ + * Sizzle CSS Selector Engine v2.3.0 + * https://sizzlejs.com/ * * Copyright jQuery Foundation and other contributors * Released under the MIT license * http://jquery.org/license * - * Date: 2015-10-17 + * Date: 2016-01-04 */ (function( window ) { @@ -592,9 +591,6 @@ var i, return 0; }, - // General-purpose constants - MAX_NEGATIVE = 1 << 31, - // Instance methods hasOwn = ({}).hasOwnProperty, arr = [], @@ -603,7 +599,7 @@ var i, push = arr.push, slice = arr.slice, // Use a stripped-down indexOf as it's faster than native - // http://jsperf.com/thor-indexof-vs-for/5 + // https://jsperf.com/thor-indexof-vs-for/5 indexOf = function( list, elem ) { var i = 0, len = list.length; @@ -623,7 +619,7 @@ var i, whitespace = "[\\x20\\t\\r\\n\\f]", // http://www.w3.org/TR/CSS21/syndata.html#value-def-identifier - identifier = "(?:\\\\.|[\\w-]|[^\\x00-\\xa0])+", + identifier = "(?:\\\\.|[\\w-]|[^\0-\\xa0])+", // Attribute selectors: http://www.w3.org/TR/selectors/#attribute-selectors attributes = "\\[" + whitespace + "*(" + identifier + ")(?:" + whitespace + @@ -680,9 +676,9 @@ var i, rquickExpr = /^(?:#([\w-]+)|(\w+)|\.([\w-]+))$/, rsibling = /[+~]/, - rescape = /'|\\/g, - // CSS escapes http://www.w3.org/TR/CSS21/syndata.html#escaped-characters + // CSS escapes + // http://www.w3.org/TR/CSS21/syndata.html#escaped-characters runescape = new RegExp( "\\\\([\\da-f]{1,6}" + whitespace + "?|(" + whitespace + ")|.)", "ig" ), funescape = function( _, escaped, escapedWhitespace ) { var high = "0x" + escaped - 0x10000; @@ -698,13 +694,39 @@ var i, String.fromCharCode( high >> 10 | 0xD800, high & 0x3FF | 0xDC00 ); }, + // CSS string/identifier serialization + // https://drafts.csswg.org/cssom/#common-serializing-idioms + rcssescape = /([\0-\x1f\x7f]|^-?\d)|^-$|[^\x80-\uFFFF\w-]/g, + fcssescape = function( ch, asCodePoint ) { + if ( asCodePoint ) { + + // U+0000 NULL becomes U+FFFD REPLACEMENT CHARACTER + if ( ch === "\0" ) { + return "\uFFFD"; + } + + // Control characters and (dependent upon position) numbers get escaped as code points + return ch.slice( 0, -1 ) + "\\" + ch.charCodeAt( ch.length - 1 ).toString( 16 ) + " "; + } + + // Other potentially-special ASCII characters get backslash-escaped + return "\\" + ch; + }, + // Used for iframes // See setDocument() // Removing the function wrapper causes a "Permission Denied" // error in IE unloadHandler = function() { setDocument(); - }; + }, + + disabledAncestor = addCombinator( + function( elem ) { + return elem.disabled === true; + }, + { dir: "parentNode", next: "legend" } + ); // Optimize for push.apply( _, NodeList ) try { @@ -736,7 +758,7 @@ try { } function Sizzle( selector, context, results, seed ) { - var m, i, elem, nid, nidselect, match, groups, newSelector, + var m, i, elem, nid, match, groups, newSelector, newContext = context && context.ownerDocument, // nodeType defaults to 9, since context defaults to document @@ -829,7 +851,7 @@ function Sizzle( selector, context, results, seed ) { // Capture the context ID, setting it first if necessary if ( (nid = context.getAttribute( "id" )) ) { - nid = nid.replace( rescape, "\\$&" ); + nid = nid.replace( rcssescape, fcssescape ); } else { context.setAttribute( "id", (nid = expando) ); } @@ -837,9 +859,8 @@ function Sizzle( selector, context, results, seed ) { // Prefix every selector in the list groups = tokenize( selector ); i = groups.length; - nidselect = ridentifier.test( nid ) ? "#" + nid : "[id='" + nid + "']"; while ( i-- ) { - groups[i] = nidselect + " " + toSelector( groups[i] ); + groups[i] = "#" + nid + " " + toSelector( groups[i] ); } newSelector = groups.join( "," ); @@ -900,22 +921,22 @@ function markFunction( fn ) { /** * Support testing using an element - * @param {Function} fn Passed the created div and expects a boolean result + * @param {Function} fn Passed the created element and returns a boolean result */ function assert( fn ) { - var div = document.createElement("div"); + var el = document.createElement("fieldset"); try { - return !!fn( div ); + return !!fn( el ); } catch (e) { return false; } finally { // Remove from its parent by default - if ( div.parentNode ) { - div.parentNode.removeChild( div ); + if ( el.parentNode ) { + el.parentNode.removeChild( el ); } // release memory in IE - div = null; + el = null; } } @@ -942,8 +963,7 @@ function addHandle( attrs, handler ) { function siblingCheck( a, b ) { var cur = b && a, diff = cur && a.nodeType === 1 && b.nodeType === 1 && - ( ~b.sourceIndex || MAX_NEGATIVE ) - - ( ~a.sourceIndex || MAX_NEGATIVE ); + a.sourceIndex - b.sourceIndex; // Use IE sourceIndex if available on both nodes if ( diff ) { @@ -984,6 +1004,34 @@ function createButtonPseudo( type ) { }; } +/** + * Returns a function to use in pseudos for :enabled/:disabled + * @param {Boolean} disabled true for :disabled; false for :enabled + */ +function createDisabledPseudo( disabled ) { + // Known :disabled false positives: + // IE: *[disabled]:not(button, input, select, textarea, optgroup, option, menuitem, fieldset) + // not IE: fieldset[disabled] > legend:nth-of-type(n+2) :can-disable + return function( elem ) { + + // Check form elements and option elements for explicit disabling + return "label" in elem && elem.disabled === disabled || + "form" in elem && elem.disabled === disabled || + + // Check non-disabled form elements for fieldset[disabled] ancestors + "form" in elem && elem.disabled === false && ( + // Support: IE6-11+ + // Ancestry is covered for us + elem.isDisabled === disabled || + + // Otherwise, assume any non-