Torkel Ödegaard
51ec64f872
fix: reduced team name column length, fixes #10244
2017-12-18 13:38:29 +01:00
Torkel Ödegaard
8905c8e5fb
Merge branch 'team_member_count' of https://github.com/bergquist/grafana into develop
2017-12-15 11:53:47 +01:00
Daniel Lee
2b814738c1
dashfolder: change to migration text
...
First index for the dashboard_acl table had the word
unique in the migration description even though the
index is not unique
2017-12-15 11:35:14 +01:00
bergquist
256f7176a2
teams: add team count when searching for team
...
closes #10207
2017-12-15 11:08:06 +01:00
Torkel Ödegaard
a7645b710d
Merge remote-tracking branch 'origin/master' into develop
2017-12-13 19:18:10 +01:00
Carl Bergquist
35106537f2
Replace Read Only Editor role with ViewersCanEdit setting ( #10166 )
...
* removes readonly editor role
* adds viewersCanEdit setting
This enable you to allow viewers to edit/inspect
dashboards in grafana in their own browser without
allowing them to save dashboards
* remove read only editor option from all dropdowns
* migrates all read only viewers to viewers
* docs: replace readOnlyEditor with viewersCanEdit
2017-12-13 18:53:42 +01:00
Torkel Ödegaard
313735bd75
search: worked on search results
2017-12-13 15:51:59 +01:00
Torkel Ödegaard
67f1435dc7
minor fix for #10136
2017-12-12 17:18:25 +01:00
Torkel Ödegaard
05cc1f85c3
Merge branch 'refactor-user-group-to-team' of https://github.com/alexanderzobnin/grafana into user-group-to-team
2017-12-12 17:07:00 +01:00
Torkel Ödegaard
cafed8ce8f
Merge branch 'master' into develop
2017-12-12 13:19:07 +01:00
Alexander Zobnin
26281dd9d8
refactor: format files by gofmt
2017-12-11 19:46:05 +03:00
Alexander Zobnin
5d3bfee2f1
refactor: user groups to teams, rename backend files
2017-12-08 18:51:59 +03:00
Alexander Zobnin
d8612380e9
refactor: rename User Groups to Teams
2017-12-08 18:25:45 +03:00
bergquist
099178466d
dashboards as cfg: wire up dashboard repo
2017-12-07 15:27:01 +01:00
bergquist
d69b63cbc0
dashboards as cfg: read first cfg version
2017-12-07 15:27:01 +01:00
Torkel Ödegaard
beb9f8ee74
Merge remote-tracking branch 'origin/master' into develop
2017-12-07 14:14:50 +01:00
Marcus Efraimsson
1e10fcad83
test: fix failing postgres test
...
Should use case insensitive matching when searching for users
2017-11-29 15:17:31 +01:00
Daniel Lee
4356e980f0
dashfolders: create app folder on dashboard import
2017-11-27 17:08:39 +01:00
Torkel Ödegaard
b7a8db4937
Merge branch 'develop' of github.com:grafana/grafana into develop
2017-11-22 14:51:53 +01:00
Daniel Lee
3dc2e06a33
dashboard: fix test for folderIds
2017-11-21 16:41:08 +01:00
Torkel Ödegaard
9fc22e5a66
Merge branch 'master' of github.com:grafana/grafana into develop
2017-11-21 16:05:18 +01:00
Torkel Ödegaard
ccbdb29f07
fixed unit tests
2017-11-21 11:53:56 +01:00
Torkel Ödegaard
0d12b37dfd
fix: alert list panel now works correctly after adding manual annotation on dashboard, fixes #9951
2017-11-21 11:28:17 +01:00
Torkel Ödegaard
fc1d8416a7
working on dashboard search
2017-11-20 12:47:03 +01:00
Torkel Ödegaard
7b17d134fc
Merge branch 'develop' of github.com:grafana/grafana into develop
2017-11-17 15:49:47 +01:00
Torkel Ödegaard
0e44fe082b
Merge branch 'master' into develop
2017-11-17 15:49:17 +01:00
Daniel Lee
7c74111187
search: add expanded folders
2017-11-17 15:30:21 +01:00
Torkel Ödegaard
98b4074c16
refactoring: minor refactor of clean up dashboard history PR #9882
2017-11-17 14:41:44 +01:00
Torkel Ödegaard
aaa465a100
Merge branch 'feat-9671' of https://github.com/alexanderzobnin/grafana into alexanderzobnin-feat-9671
2017-11-17 14:16:49 +01:00
Alexander Zobnin
a55be07ea5
dashboard history clean up: avoid potential SQL injections
2017-11-17 10:51:50 +03:00
Daniel Lee
f47673ab5c
search: refactor search sql into a builder class
2017-11-17 00:16:33 +01:00
Marcus Efraimsson
540d540ea9
fix: return id from api when creating new annotation/graphite annotation, fixes #9798
...
When creating a region annotation the response will include both
id (region start id) and endId (region end id), if not only id.
2017-11-16 16:19:01 +01:00
bergquist
ebbfc529e0
datasource as cfg: support globbing
2017-11-15 14:30:32 +01:00
bergquist
0f136a940c
datasource as cfg: enable editable ds's
2017-11-15 14:30:32 +01:00
bergquist
36676e23c1
datasource as cfg: adds readonly datasources
2017-11-15 14:30:32 +01:00
bergquist
0f29b8ac83
datasources as cfg: tests for insert/updating datasources
2017-11-15 14:30:32 +01:00
Alexander Zobnin
59d89e422b
dashboard history clean up: add tests
2017-11-15 13:38:44 +03:00
Alexander Zobnin
a0a1f4aacd
dashboard history: refactor after review
2017-11-15 13:36:36 +03:00
Torkel Ödegaard
ba8c02f594
refactor: changed string slicing to strings.TrimPrefix, #9862
2017-11-15 10:48:03 +01:00
Alexander Zobnin
08e2bbef83
dashboard history: clean up dashboard version history
2017-11-14 18:22:18 +03:00
Patrick O'Carroll
9ad186bcc9
not ok option to alert list, fixes : #9754
2017-11-13 10:30:11 +01:00
Furtchet
a51b1e8951
Update the config key to database_log_queries so it is more descriptive, as suggested in #9785 .
2017-11-06 08:01:31 -06:00
Furtchet
5fdfa3ff7e
MySQL Performance when using GF_DATABASE_URL
...
Set MaxIdleConn and MaxOpenConn when using the GF_DATABASE_URL configuration. Also added GF_DATABASE_DEBUG flag to print SQL statements and SQL execution times.
See #9784 for the details.
2017-11-03 14:05:32 -05:00
Torkel Ödegaard
9605ab4475
Merge branch 'master' into develop
2017-10-26 15:59:50 +02:00
bergquist
d68bfaa8be
datasource as cfg: typo
2017-10-25 12:21:06 +02:00
bergquist
da6430ac01
datasource as cfg: explain why cmd.version can be higher
2017-10-25 09:39:27 +02:00
bergquist
89923bf77a
datasources: change to optimisic concurrency
...
prerequisite for #9504
2017-10-23 07:55:16 +02:00
Torkel Ödegaard
d8230f8fa7
Merge branch 'master' into develop
2017-10-17 11:17:28 +02:00
krise3k
45a572ebd8
annotations: quote reserved fields ( #9550 )
2017-10-17 11:03:19 +02:00
Torkel Ödegaard
88ceb19d96
Merge branch 'master' into develop
2017-10-12 16:32:44 +02:00
