From a91bd53a340570706fa8c7463578b4dccaa856c0 Mon Sep 17 00:00:00 2001 From: Marcus Efraimsson Date: Thu, 8 Feb 2018 14:25:23 +0100 Subject: [PATCH 01/13] dashboard: fix delete of folder from folder settings tab. Fixes #10821 --- public/app/stores/FolderStore/FolderStore.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/public/app/stores/FolderStore/FolderStore.ts b/public/app/stores/FolderStore/FolderStore.ts index e4533f6a3a9..46010475622 100644 --- a/public/app/stores/FolderStore/FolderStore.ts +++ b/public/app/stores/FolderStore/FolderStore.ts @@ -53,6 +53,6 @@ export const FolderStore = types deleteFolder: flow(function* deleteFolder() { const backendSrv = getEnv(self).backendSrv; - return backendSrv.deleteDashboard(self.folder.url); + return backendSrv.deleteDashboard(self.folder.uid); }), })); From 8921b0b51703ef3c889f8a6682d50cda1f941664 Mon Sep 17 00:00:00 2001 From: Marcus Efraimsson Date: Thu, 8 Feb 2018 19:16:45 +0100 Subject: [PATCH 02/13] db test: allow use of env variable for database engine to run tests for --- pkg/services/sqlstore/datasource_test.go | 31 +++++++++++++++++++++--- 1 file changed, 28 insertions(+), 3 deletions(-) diff --git a/pkg/services/sqlstore/datasource_test.go b/pkg/services/sqlstore/datasource_test.go index e6f0114ab4d..28f5b8eba9d 100644 --- a/pkg/services/sqlstore/datasource_test.go +++ b/pkg/services/sqlstore/datasource_test.go @@ -1,6 +1,8 @@ package sqlstore import ( + "os" + "strings" "testing" "github.com/go-xorm/xorm" @@ -11,10 +13,33 @@ import ( "github.com/grafana/grafana/pkg/services/sqlstore/sqlutil" ) +var ( + dbSqlite = "sqlite" + dbMySql = "mysql" + dbPostgres = "postgres" +) + func InitTestDB(t *testing.T) *xorm.Engine { - x, err := xorm.NewEngine(sqlutil.TestDB_Sqlite3.DriverName, sqlutil.TestDB_Sqlite3.ConnStr) - //x, err := xorm.NewEngine(sqlutil.TestDB_Mysql.DriverName, sqlutil.TestDB_Mysql.ConnStr) - //x, err := xorm.NewEngine(sqlutil.TestDB_Postgres.DriverName, sqlutil.TestDB_Postgres.ConnStr) + selectedDb := dbSqlite + //selectedDb := dbMySql + //selectedDb := dbPostgres + + var x *xorm.Engine + var err error + + // environment variable present for test db? + if db, present := os.LookupEnv("GRAFANA_TEST_DB"); present { + selectedDb = db + } + + switch strings.ToLower(selectedDb) { + case dbMySql: + x, err = xorm.NewEngine(sqlutil.TestDB_Mysql.DriverName, sqlutil.TestDB_Mysql.ConnStr) + case dbPostgres: + x, err = xorm.NewEngine(sqlutil.TestDB_Postgres.DriverName, sqlutil.TestDB_Postgres.ConnStr) + default: + x, err = xorm.NewEngine(sqlutil.TestDB_Sqlite3.DriverName, sqlutil.TestDB_Sqlite3.ConnStr) + } // x.ShowSQL() From a86f2fa34b9ccd2e3f573238199200a53e9cf3b3 Mon Sep 17 00:00:00 2001 From: Marcus Efraimsson Date: Fri, 9 Feb 2018 10:42:37 +0100 Subject: [PATCH 03/13] user picker should only include users from current org (#10845) --- pkg/api/org_users.go | 18 +++++++------ pkg/models/org_user.go | 5 +++- pkg/services/sqlstore/org_test.go | 25 +++++++++++++++++++ pkg/services/sqlstore/org_users.go | 24 +++++++++++++++++- .../app/core/components/Picker/UserPicker.tsx | 8 +++--- 5 files changed, 67 insertions(+), 13 deletions(-) diff --git a/pkg/api/org_users.go b/pkg/api/org_users.go index 57a15bd8db5..433b9f2bd66 100644 --- a/pkg/api/org_users.go +++ b/pkg/api/org_users.go @@ -46,26 +46,30 @@ func addOrgUserHelper(cmd m.AddOrgUserCommand) Response { // GET /api/org/users func GetOrgUsersForCurrentOrg(c *middleware.Context) Response { - return getOrgUsersHelper(c.OrgId) + return getOrgUsersHelper(c.OrgId, c.Params("query"), c.ParamsInt("limit")) } // GET /api/orgs/:orgId/users func GetOrgUsers(c *middleware.Context) Response { - return getOrgUsersHelper(c.ParamsInt64(":orgId")) + return getOrgUsersHelper(c.ParamsInt64(":orgId"), "", 0) } -func getOrgUsersHelper(orgId int64) Response { - query := m.GetOrgUsersQuery{OrgId: orgId} +func getOrgUsersHelper(orgId int64, query string, limit int) Response { + q := m.GetOrgUsersQuery{ + OrgId: orgId, + Query: query, + Limit: limit, + } - if err := bus.Dispatch(&query); err != nil { + if err := bus.Dispatch(&q); err != nil { return ApiError(500, "Failed to get account user", err) } - for _, user := range query.Result { + for _, user := range q.Result { user.AvatarUrl = dtos.GetGravatarUrl(user.Email) } - return Json(200, query.Result) + return Json(200, q.Result) } // PATCH /api/org/users/:userId diff --git a/pkg/models/org_user.go b/pkg/models/org_user.go index 9379625d458..ca32cc50060 100644 --- a/pkg/models/org_user.go +++ b/pkg/models/org_user.go @@ -95,7 +95,10 @@ type UpdateOrgUserCommand struct { // QUERIES type GetOrgUsersQuery struct { - OrgId int64 + OrgId int64 + Query string + Limit int + Result []*OrgUserDTO } diff --git a/pkg/services/sqlstore/org_test.go b/pkg/services/sqlstore/org_test.go index 59d96c4f8ca..5322dfd4748 100644 --- a/pkg/services/sqlstore/org_test.go +++ b/pkg/services/sqlstore/org_test.go @@ -123,6 +123,31 @@ func TestAccountDataAccess(t *testing.T) { So(query.Result[0].Role, ShouldEqual, "Admin") }) + Convey("Can get organization users with query", func() { + query := m.GetOrgUsersQuery{ + OrgId: ac1.OrgId, + Query: "ac1", + } + err := GetOrgUsers(&query) + + So(err, ShouldBeNil) + So(len(query.Result), ShouldEqual, 1) + So(query.Result[0].Email, ShouldEqual, ac1.Email) + }) + + Convey("Can get organization users with query and limit", func() { + query := m.GetOrgUsersQuery{ + OrgId: ac1.OrgId, + Query: "ac", + Limit: 1, + } + err := GetOrgUsers(&query) + + So(err, ShouldBeNil) + So(len(query.Result), ShouldEqual, 1) + So(query.Result[0].Email, ShouldEqual, ac1.Email) + }) + Convey("Can set using org", func() { cmd := m.SetUsingOrgCommand{UserId: ac2.Id, OrgId: ac1.Id} err := SetUsingOrg(&cmd) diff --git a/pkg/services/sqlstore/org_users.go b/pkg/services/sqlstore/org_users.go index 2c2a51fd362..79745c30386 100644 --- a/pkg/services/sqlstore/org_users.go +++ b/pkg/services/sqlstore/org_users.go @@ -2,6 +2,7 @@ package sqlstore import ( "fmt" + "strings" "time" "github.com/grafana/grafana/pkg/bus" @@ -69,9 +70,30 @@ func UpdateOrgUser(cmd *m.UpdateOrgUserCommand) error { func GetOrgUsers(query *m.GetOrgUsersQuery) error { query.Result = make([]*m.OrgUserDTO, 0) + sess := x.Table("org_user") sess.Join("INNER", "user", fmt.Sprintf("org_user.user_id=%s.id", x.Dialect().Quote("user"))) - sess.Where("org_user.org_id=?", query.OrgId) + + whereConditions := make([]string, 0) + whereParams := make([]interface{}, 0) + + whereConditions = append(whereConditions, "org_user.org_id = ?") + whereParams = append(whereParams, query.OrgId) + + if query.Query != "" { + queryWithWildcards := "%" + query.Query + "%" + whereConditions = append(whereConditions, "(user.email "+dialect.LikeStr()+" ? OR user.name "+dialect.LikeStr()+" ? OR user.login "+dialect.LikeStr()+" ?)") + whereParams = append(whereParams, queryWithWildcards, queryWithWildcards, queryWithWildcards) + } + + if len(whereConditions) > 0 { + sess.Where(strings.Join(whereConditions, " AND "), whereParams...) + } + + if query.Limit > 0 { + sess.Limit(query.Limit, 0) + } + sess.Cols("org_user.org_id", "org_user.user_id", "user.email", "user.login", "org_user.role", "user.last_seen_at") sess.Asc("user.email", "user.login") diff --git a/public/app/core/components/Picker/UserPicker.tsx b/public/app/core/components/Picker/UserPicker.tsx index 5c36505aeaa..77bf6c1fe15 100644 --- a/public/app/core/components/Picker/UserPicker.tsx +++ b/public/app/core/components/Picker/UserPicker.tsx @@ -31,7 +31,7 @@ class UserPicker extends Component { this.debouncedSearch = debounce(this.search, 300, { leading: true, - trailing: false, + trailing: true, }); } @@ -39,10 +39,10 @@ class UserPicker extends Component { const { toggleLoading, backendSrv } = this.props; toggleLoading(true); - return backendSrv.get(`/api/users/search?perpage=10&page=1&query=${query}`).then(result => { - const users = result.users.map(user => { + return backendSrv.get(`/api/org/users?query=${query}&limit=10`).then(result => { + const users = result.map(user => { return { - id: user.id, + id: user.userId, label: `${user.login} - ${user.email}`, avatarUrl: user.avatarUrl, login: user.login, From 41a6e7c2c86be7810032e40fe6816cf2c945493e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Torkel=20=C3=96degaard?= Date: Fri, 9 Feb 2018 12:39:03 +0100 Subject: [PATCH 04/13] docs: updated docs landing page --- docs/sources/index.md | 134 ++++++++++++++++++++++++++++++------------ 1 file changed, 97 insertions(+), 37 deletions(-) diff --git a/docs/sources/index.md b/docs/sources/index.md index c1072db47a5..2a047b5257d 100644 --- a/docs/sources/index.md +++ b/docs/sources/index.md @@ -1,6 +1,6 @@ +++ -title = "Docs Home" -description = "Install guide for Grafana" +title = "Grafana documentation" +description = "Guides, Installation & Feature Documentation" keywords = ["grafana", "installation", "documentation"] type = "docs" aliases = ["v1.1", "guides/reference/admin"] @@ -8,42 +8,102 @@ aliases = ["v1.1", "guides/reference/admin"] # Welcome to the Grafana Documentation -Grafana is an open source metric analytics & visualization suite. It is most commonly used for -visualizing time series data for infrastructure and application analytics but many use it in -other domains including industrial sensors, home automation, weather, and process control. +Grafana is an open source metric analytics & visualization platform. It is most commonly used for visualizing time series data for infrastructure and application analytics but many use it in other domains including industrial sensors, home automation, weather, and process control. -## Installing Grafana -- [Installing on Debian / Ubuntu](installation/debian) -- [Installing on RPM-based Linux (CentOS, Fedora, OpenSuse, RedHat)](installation/rpm) -- [Installing on Mac OS X](installation/mac) -- [Installing on Windows](installation/windows) -- [Installing on Docker](installation/docker) -- [Installing using Provisioning (Chef, Puppet, Salt, Ansible, etc)](administration/provisioning#configuration-management-tools) -- [Nightly Builds](https://grafana.com/grafana/download) +

Installing Grafana

+
+ }}" class="nav-cards__item nav-cards__item--install"> +
+
+
Installing on Linux
+ + }}" class="nav-cards__item nav-cards__item--install"> +
+
+
Installing on Mac OS X
+ + }}" class="nav-cards__item nav-cards__item--install"> +
+
+
Installing on Windows
+ + +
+
+
Grafana Cloud
+ + +
+
+
Nightly Builds
+ +
+
For other platforms Read the }}">build from source + instructions for more information.
+
+
-For other platforms Read the [build from source]({{< relref "project/building_from_source.md" >}}) -instructions for more information. +

Guides

-## Configuring Grafana +
+ +

What is Grafana?

+

Grafana feature highlights.

+ + }}" class="nav-cards__item nav-cards__item--guide"> +

Configure Grafana

+

Article on all the Grafana configuration and setup options.

+ + }}" class="nav-cards__item nav-cards__item--guide"> +

Getting Started

+

A guide that walks you through the basics of using Grafana

+ + }}" class="nav-cards__item nav-cards__item--guide"> +

Provisioning

+

A guide to help you automate your Grafana setup & configuration.

+ + }}" class="nav-cards__item nav-cards__item--guide"> +

What's new in v5.0

+

Article on all the new cool features and enhancements in v5.0

+ + }}" class="nav-cards__item nav-cards__item--guide"> +

Screencasts

+

Video tutorials & guides

+ +
-The back-end web server has a number of configuration options. Go the -[Configuration]({{< relref "installation/configuration.md" >}}) page for details on all -those options. - - -## Getting Started - -- [Getting Started]({{< relref "guides/getting_started.md" >}}) -- [Basic Concepts]({{< relref "guides/basic_concepts.md" >}}) -- [Screencasts]({{< relref "tutorials/screencasts.md" >}}) - -## Data Source Guides - -- [Graphite]({{< relref "features/datasources/graphite.md" >}}) -- [Elasticsearch]({{< relref "features/datasources/elasticsearch.md" >}}) -- [InfluxDB]({{< relref "features/datasources/influxdb.md" >}}) -- [Prometheus]({{< relref "features/datasources/prometheus.md" >}}) -- [OpenTSDB]({{< relref "features/datasources/opentsdb.md" >}}) -- [MySQL]({{< relref "features/datasources/mysql.md" >}}) -- [Postgres]({{< relref "features/datasources/postgres.md" >}}) -- [Cloudwatch]({{< relref "features/datasources/cloudwatch.md" >}}) +

Data Source Guides

+
+ }}" class="nav-cards__item nav-cards__item--ds"> + +
Graphite
+ + }}" class="nav-cards__item nav-cards__item--ds"> + +
Elasticsearch
+ + }}" class="nav-cards__item nav-cards__item--ds"> + +
InfluxDB
+ + }}" class="nav-cards__item nav-cards__item--ds"> + +
Prometheus
+ + }}" class="nav-cards__item nav-cards__item--ds"> + +
OpenTSDB
+ + }}" class="nav-cards__item nav-cards__item--ds"> + +
MySQL
+ + }}" class="nav-cards__item nav-cards__item--ds"> + +
Postgres
+ + }}" class="nav-cards__item nav-cards__item--ds"> + +
Cloudwatch
+ +
From e672604835cbf0edca56d80ed3c4eecdccdf79fd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Torkel=20=C3=96degaard?= Date: Fri, 9 Feb 2018 12:53:07 +0100 Subject: [PATCH 05/13] docs: minor docs update --- docs/sources/index.md | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/docs/sources/index.md b/docs/sources/index.md index 2a047b5257d..3c59b9baba0 100644 --- a/docs/sources/index.md +++ b/docs/sources/index.md @@ -6,9 +6,7 @@ type = "docs" aliases = ["v1.1", "guides/reference/admin"] +++ -# Welcome to the Grafana Documentation - -Grafana is an open source metric analytics & visualization platform. It is most commonly used for visualizing time series data for infrastructure and application analytics but many use it in other domains including industrial sensors, home automation, weather, and process control. +# Grafana Documentation

Installing Grafana

From fae9eb546ef6188d5ff008728aec4cda843748f2 Mon Sep 17 00:00:00 2001 From: Marcus Efraimsson Date: Fri, 9 Feb 2018 13:31:37 +0100 Subject: [PATCH 06/13] update README.md regarding running tests [skip ci] --- README.md | 19 +++++++++++++++++-- 1 file changed, 17 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index 80a80b694c1..7a2f45a5009 100644 --- a/README.md +++ b/README.md @@ -80,8 +80,11 @@ In your custom.ini uncomment (remove the leading `;`) sign. And set `app_mode = ### Running tests -- You can run backend Golang tests using "go test ./pkg/...". -- Execute all frontend tests with "npm run test" +#### Frontend +Execute all frontend tests +```bash +$ npm run test +``` Writing & watching frontend tests (we have two test runners) @@ -92,6 +95,18 @@ Writing & watching frontend tests (we have two test runners) - Start watcher: `npm run karma` - Karma+Mocha runs all files that end with the name "_specs.ts". +#### Backend +```bash +# Run Golang tests using sqlite3 as database (default) +$ go test ./pkg/... + +# Run Golang tests using mysql as database - convenient to use /docker/block/mysql_tests +$ GRAFANA_TEST_DB=mysql go test ./pkg/... + +# Run Golang tests using postgres as database - convenient to use /docker/blocks/postgres_tests +$ GRAFANA_TEST_DB=postgres go test ./pkg/... +``` + ## Contribute If you have any idea for an improvement or found a bug, do not hesitate to open an issue. From e429cd83336ea3982914d3e401828e3cd0d755c8 Mon Sep 17 00:00:00 2001 From: Marcus Efraimsson Date: Fri, 9 Feb 2018 13:34:10 +0100 Subject: [PATCH 07/13] update README.md regarding running tests [skip ci] --- README.md | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/README.md b/README.md index 7a2f45a5009..81fb1f8d42b 100644 --- a/README.md +++ b/README.md @@ -83,7 +83,7 @@ In your custom.ini uncomment (remove the leading `;`) sign. And set `app_mode = #### Frontend Execute all frontend tests ```bash -$ npm run test +npm run test ``` Writing & watching frontend tests (we have two test runners) @@ -98,13 +98,13 @@ Writing & watching frontend tests (we have two test runners) #### Backend ```bash # Run Golang tests using sqlite3 as database (default) -$ go test ./pkg/... +go test ./pkg/... -# Run Golang tests using mysql as database - convenient to use /docker/block/mysql_tests -$ GRAFANA_TEST_DB=mysql go test ./pkg/... +# Run Golang tests using mysql as database - convenient to use /docker/blocks/mysql_tests +GRAFANA_TEST_DB=mysql go test ./pkg/... # Run Golang tests using postgres as database - convenient to use /docker/blocks/postgres_tests -$ GRAFANA_TEST_DB=postgres go test ./pkg/... +GRAFANA_TEST_DB=postgres go test ./pkg/... ``` ## Contribute From c01b80522eeb717c010db4ba73ae982ce9391156 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Torkel=20=C3=96degaard?= Date: Fri, 9 Feb 2018 16:13:20 +0100 Subject: [PATCH 08/13] fix: clear items list before fetching permissions list --- public/app/stores/PermissionsStore/PermissionsStore.ts | 2 ++ 1 file changed, 2 insertions(+) diff --git a/public/app/stores/PermissionsStore/PermissionsStore.ts b/public/app/stores/PermissionsStore/PermissionsStore.ts index 02413f6b0a1..a7c90d13da0 100644 --- a/public/app/stores/PermissionsStore/PermissionsStore.ts +++ b/public/app/stores/PermissionsStore/PermissionsStore.ts @@ -108,6 +108,8 @@ export const PermissionsStore = types self.isFolder = isFolder; self.isInRoot = isInRoot; self.dashboardId = dashboardId; + self.items.clear(); + const res = yield backendSrv.get(`/api/dashboards/id/${dashboardId}/acl`); const items = prepareServerResponse(res, dashboardId, isFolder, isInRoot); self.items = items; From 111b32290a9291900dfb02950b5e71fb76a895c4 Mon Sep 17 00:00:00 2001 From: Alexander Zobnin Date: Fri, 9 Feb 2018 18:20:30 +0300 Subject: [PATCH 09/13] Fixes for graphite tags editor (#10861) * graphite: don't fetch tags on editor init * add debounce option to query editor directives * graphite: debounce tag queries --- public/app/core/components/form_dropdown/form_dropdown.ts | 6 ++++++ .../app/core/components/query_part/query_part_editor.ts | 6 ++++++ public/app/core/directives/metric_segment.js | 6 ++++++ .../datasource/graphite/partials/query.editor.html | 8 +++----- 4 files changed, 21 insertions(+), 5 deletions(-) diff --git a/public/app/core/components/form_dropdown/form_dropdown.ts b/public/app/core/components/form_dropdown/form_dropdown.ts index cf9c6b5efe0..7ac55e54cf1 100644 --- a/public/app/core/components/form_dropdown/form_dropdown.ts +++ b/public/app/core/components/form_dropdown/form_dropdown.ts @@ -34,6 +34,7 @@ export class FormDropdownCtrl { lookupText: boolean; placeholder: any; startOpen: any; + debounce: number; /** @ngInject **/ constructor(private $scope, $element, private $sce, private templateSrv, private $q) { @@ -72,6 +73,10 @@ export class FormDropdownCtrl { this.source(this.query, this.process.bind(this)); }; + if (this.debounce) { + typeahead.lookup = _.debounce(typeahead.lookup, 500, { leading: true }); + } + this.linkElement.keydown(evt => { // trigger typeahead on down arrow or enter key if (evt.keyCode === 40 || evt.keyCode === 13) { @@ -263,6 +268,7 @@ export function formDropdownDirective() { lookupText: '@', placeholder: '@', startOpen: '@', + debounce: '@', }, }; } diff --git a/public/app/core/components/query_part/query_part_editor.ts b/public/app/core/components/query_part/query_part_editor.ts index 138da186238..5fd6e16c466 100644 --- a/public/app/core/components/query_part/query_part_editor.ts +++ b/public/app/core/components/query_part/query_part_editor.ts @@ -23,11 +23,13 @@ export function queryPartEditorDirective($compile, templateSrv) { scope: { part: '=', handleEvent: '&', + debounce: '@', }, link: function postLink($scope, elem) { var part = $scope.part; var partDef = part.def; var $paramsContainer = elem.find('.query-part-parameters'); + var debounceLookup = $scope.debounce; $scope.partActions = []; @@ -128,6 +130,10 @@ export function queryPartEditorDirective($compile, templateSrv) { var items = this.source(this.query, $.proxy(this.process, this)); return items ? this.process(items) : items; }; + + if (debounceLookup) { + typeahead.lookup = _.debounce(typeahead.lookup, 500, { leading: true }); + } } $scope.showActionsMenu = function() { diff --git a/public/app/core/directives/metric_segment.js b/public/app/core/directives/metric_segment.js index 2754f8d8c6e..7ba4a5a5259 100644 --- a/public/app/core/directives/metric_segment.js +++ b/public/app/core/directives/metric_segment.js @@ -22,6 +22,7 @@ function (_, $, coreModule) { segment: "=", getOptions: "&", onChange: "&", + debounce: "@", }, link: function($scope, elem) { var $input = $(inputTemplate); @@ -30,6 +31,7 @@ function (_, $, coreModule) { var options = null; var cancelBlur = null; var linkMode = true; + var debounceLookup = $scope.debounce; $input.appendTo(elem); $button.appendTo(elem); @@ -135,6 +137,10 @@ function (_, $, coreModule) { return items ? this.process(items) : items; }; + if (debounceLookup) { + typeahead.lookup = _.debounce(typeahead.lookup, 500, {leading: true}); + } + $button.keydown(function(evt) { // trigger typeahead on down arrow or enter key if (evt.keyCode === 40 || evt.keyCode === 13) { diff --git a/public/app/plugins/datasource/graphite/partials/query.editor.html b/public/app/plugins/datasource/graphite/partials/query.editor.html index 6414a39c94f..51c25100c1e 100755 --- a/public/app/plugins/datasource/graphite/partials/query.editor.html +++ b/public/app/plugins/datasource/graphite/partials/query.editor.html @@ -13,9 +13,9 @@