IntenseWebs/grafana
3
0
Fork 0
mirror of https://github.com/grafana/grafana.git synced 2026-07-30 08:18:10 -05:00
Code Issues Packages Projects Releases Wiki Activity
13,080 Commits 1,121 Branches 715 Tags
a7114dcec1c2ee42ec592cfa0d54646f1ea1c408
Commit Graph
13080 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Carl Bergquist a7114dcec1 Merge pull request #10722 from AlexandreRio/patch-1 
Update search datasource by name API path
 2018-02-01 20:43:28 +01:00
Marcus Efraimsson 744f402a96 db: fix failing integration tests for mysql and postgresql 2018-02-01 17:27:29 +01:00
Alexandre Rio 8ced9f6462 Update search datasource by name API path 
Correct path for search by name endpoint is /api/datasources/:name
 2018-02-01 16:41:33 +01:00
Torkel Ödegaard 5171d7e285 Merge branch 'master' of github.com:grafana/grafana 2018-02-01 15:45:59 +01:00
Torkel Ödegaard c3181552f8 ux: added max width to dashboard settings views 2018-02-01 15:45:15 +01:00
bergquist 734a2e59aa add gofmt as precommit hook 2018-02-01 15:23:52 +01:00
Daniel Lee 22a349051c Merge pull request #10719 from grafana/add_permissions_10676 
Grafana 5.0: Add permissions modal for the permissions pages
 2018-02-01 14:20:04 +00:00
Daniel Lee a77c656033 dashfolders: adds test for permission store 2018-02-01 14:48:11 +01:00
Daniel Lee cc55ab6bc8 dashfolders: adds permission modal to dashboard settings 2018-02-01 14:32:19 +01:00
Mikael Olenfalk c0f100f1b5 Improve logging in the phantomjs renderer (#10697) 
* Add add adapter between io.Writer and log.Logger

* Add phantomjs output to grafana log

* Unexport LogWriterImpl

* Add test for LogWriter

* Make it possible to get phantomjs debug output

* Make it possible to get the configured log level
 2018-02-01 14:04:52 +01:00
Daniel Lee 9cdc1428d7 Merge remote-tracking branch 'upstream/master' into add_permissions_10676 2018-02-01 14:02:14 +01:00
Alexander Zobnin 16e1640ba4 repeat panel: process repeats when row is expanding (#10712) 2018-02-01 13:23:45 +01:00
Torkel Ödegaard 50bd9eee55 docs: removed section with session table sql, that is not needed anymore 2018-02-01 13:16:39 +01:00
Torkel Ödegaard d08a829b69 ux: fix for responsive breakpoints and solo mode showing sidemenu 2018-02-01 11:29:04 +01:00
Torkel Ödegaard b55ce1dd72 docs: moved whats new article to master 2018-02-01 10:55:29 +01:00
Torkel Ödegaard e985a9cd7c ux: fixed issue with zoom on graph caused scroll, fixes #10696 2018-02-01 10:36:55 +01:00
Carl Bergquist 1303dc7ac0 Merge pull request #10704 from alexanderzobnin/fix-backend-plugin-table-rows 
plugins: return table with empty rows array insteaf of nil
 2018-02-01 09:17:29 +01:00
Alexander Zobnin db7890ec1e plugins: return table with empty rows array insteaf of nil 2018-01-31 19:59:15 +03:00
Johannes Schill 2e0cc2e347 ux: Change input width of UserPicker and TeamPicker in AddPermissions component #10676 2018-01-31 17:01:04 +01:00
Daniel Lee 3a0459e425 Merge branch 'dashboard_permissions' 2018-01-31 16:53:07 +01:00
Daniel Lee a5197046e8 viewstore: fix test after merge 2018-01-31 16:49:41 +01:00
Johannes Schill 780c7f8775 tests: Add TeamPicker test and update TeamPicker/UserPicker snapshots so they match the latest classNames update #10676 2018-01-31 16:48:45 +01:00
Daniel Lee a9e2273064 Merge remote-tracking branch 'upstream/master' into dashboard_permissions 2018-01-31 16:45:32 +01:00
Daniel Lee a0fc5383fd dashfolders: fix for folder picker 
If the selected folder is not in the options then manually create it. This
can happen in some edge cases (if an user has been given access to a
dashboard but does not have access to its parent folder)
 2018-01-31 16:44:55 +01:00
Johannes Schill a73af39056 ux: Add an optional className to the UserPicker and TeamPicker #10676 2018-01-31 16:44:14 +01:00
Daniel Lee 7e2e57c306 dashfolders: fixes #10671. Allow Editors default access to Root. 
Editors should be able to create dashboards in root and should be
able to create folders. They cannot administrate permissions though
and these dashboards and folders will get the default permissions.
 2018-01-31 16:43:21 +01:00
Torkel Ödegaard 4ac21d2e8f docs: added redirect from old provision page, #10691 2018-01-31 16:20:14 +01:00
Johannes Schill 20052150ba tests: Move tests from Permissions to AddPermissions #10676 2018-01-31 16:15:05 +01:00
Johannes Schill 1b9e02e4cc tests: Update tests in PermissionsStore and rem out the Permissions-tests for now #10676 2018-01-31 16:12:51 +01:00
Daniel Lee 2409d129c2 dashfolders: text change 2018-01-31 15:41:52 +01:00
Daniel Lee 9ef64d3056 dashfolders: special case for folders in root 
Allow users to change permissions inherited from root.
 2018-01-31 15:34:05 +01:00
Daniel Lee a7e57bc2f8 spelling 2018-01-31 15:07:17 +01:00
Johannes Schill 2ad4c30bc6 ux: POC - Update "Add permissions" design and add a fancy animation #10676 2018-01-31 14:19:07 +01:00
Frederic Hemberger d90dfcc203 docs: Remove obsolete Ansible rule (#10689) 
According to the author, the Ansible role is obsolete:
https://github.com/picotrading/ansible-grafana/issues/8#issuecomment-342210822
As the proposed alternative (https://github.com/jtyr/ansible-grafana/) hasn't been updated in the last two years either, I'm suggesting it should be removed altogether in favor of the role maintained by cloudalchemy.
 2018-01-31 14:15:32 +01:00
Frederic Hemberger f57e106dd5 docs: Fix outdated provisioning link (#10690) 2018-01-31 14:15:16 +01:00
Chris Rice dba93d8240 Renamed "Period" to "Min period" in CloudWatch query editor (#10665) 2018-01-31 14:14:34 +01:00
Patrick O'Carroll ad893614e1 created cta-bg variable and changed bg color on light theme (#10693) 2018-01-31 14:14:11 +01:00
Alexander Zobnin 56c526fad3 Repeat panels when row is expanding (#10679) 
* fix: repeat panels when row is expanding

* repeat panel: change test name to more clear one
 2018-01-31 14:13:47 +01:00
Daniel Lee 1cfc81de74 playlist: fixes #10254 
Closes #10254
 2018-01-31 11:07:27 +01:00
Daniel Lee 79fe01959b alerting: small refactoring 2018-01-31 10:47:31 +01:00
Johannes Schill 666d29fafa dashfolders: POC - Use separate component for "Add permission" #10676 2018-01-31 10:39:38 +01:00
bergquist 56d5ece340 plugins: return empty tables array insteaf of nil 2018-01-31 09:59:23 +01:00
Daniel Lee 816c4d2340 url: fix for boolean querystring parameters 
Without this fix then the querystring looks like ?abool=true which causes
a mismatch with the angular routing. This results in a redirect and messes
up the browser history and back button.
 2018-01-31 09:58:21 +01:00
Patrick O'Carroll 465e701b42 moved icon (#10681) 2018-01-31 09:52:29 +01:00
Daniel Lee eb765d288c alertlist: disable pause button when user does not have permission 2018-01-30 23:35:27 +01:00
Patrick O'Carroll 2c8e448559 moved icon (#10681) 2018-01-30 20:01:12 +01:00
Daniel Lee 4bc5945c17 dashfolders: remove inline styles 2018-01-30 17:26:44 +01:00
Torkel Ödegaard 7cd379ac9f docs: fixed order of sidemenu 2018-01-30 16:14:28 +01:00
bergquist 8c8328eac5 test: fixes failing test in go1.10 2018-01-30 16:00:32 +01:00
Torkel Ödegaard cca050ea14 docs: updated versions.json 2018-01-30 15:07:52 +01:00