public/grafana
1
0 Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
13,856 Commits 655 Branches 650 Tags
d95eabfeec00a2386a64db9461e119ff0c8ac4f6
Commit Graph
13856 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Daniel Lee a906dd8157 docs: add spaces to timeseries example 2018-02-03 16:21:23 +01:00
Torkel Ödegaard 162f4941f0 fix: restored tags to search 2018-02-03 10:14:45 +01:00
Marcus Efraimsson 4b64c1d0d4 fix frontend validation for creating new folder and import dashboard (#10737) 
Fixes #10731
 2018-02-03 10:03:01 +01:00
Tyler Tolley ca3c1d8c63 #10724 Fix whitespace 2018-02-02 09:31:05 -07:00
Tyler Tolley bde5499552 #10724 Fix finding the x bucket 2018-02-02 07:29:54 -07:00
Marcus Efraimsson 3a906ea335 Merge branch 'master' into 10630_folder_api 2018-02-02 14:34:10 +01:00
Leonard Gram a0d8e96fd1 docs: dashboard provisioning 2018-02-02 11:17:52 +01:00
bergquist 130a2b6499 handle new error message 2018-02-02 11:06:32 +01:00
bergquist 0c98c4db30 removes uid when using 'save as' 
closes #10720
 2018-02-02 10:59:31 +01:00
Daniel Lee 512f6992f1 dashfolders: rename Root folder to General. Closes #10692 2018-02-02 10:39:26 +01:00
Marcus Efraimsson f158a604a0 Merge pull request #10683 from grafana/7883_new_url_structure 
New dashboard/folder url structure
 2018-02-02 10:23:03 +01:00
Patrick O'Carroll d2827a0005 Light theme icon color (#10730) 
* working on new colors for icons in light theme

* more work on icon colors

* changed colors of icons for light theme
 2018-02-02 10:18:45 +01:00
Marcus Efraimsson 20dbc40411 Merge branch '10630_folder_api' of github.com:grafana/grafana into 10630_folder_api 2018-02-01 22:34:58 +01:00
Marcus Efraimsson d217688d5e folders: use new folder api in frontend 2018-02-01 22:32:26 +01:00
Marcus Efraimsson 04a9a650e7 folders: changes and updated tests after merging permissions and new url structure 2018-02-01 22:07:27 +01:00
Marcus Efraimsson 773fff9f1a folders: changes and updated tests after merging permissions and new url structure 2018-02-01 21:00:37 +01:00
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 5912cf4dc2 folders: rename api files 2018-02-01 18:41:50 +01:00
Marcus Efraimsson 4e0542d740 dashboards: revert logic of returning 404 in dashboard api if it's a folder for now 2018-02-01 18:41:04 +01:00
Marcus Efraimsson b07ac3c054 Merge branch '7883_new_url_structure' into 10630_folder_api 2018-02-01 18:29:00 +01:00
Marcus Efraimsson cd61d2b237 Merge branch 'master' into 7883_new_url_structure 2018-02-01 17:32:43 +01:00
Marcus Efraimsson 744f402a96 db: fix failing integration tests for mysql and postgresql 2018-02-01 17:27:29 +01:00
Daniel Lee 65bb6cc728 docs: add examples for dashboard permissions 2018-02-01 16:53:39 +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
Marcus Efraimsson cef910dd78 Merge branch '7883_new_url_structure' of github.com:grafana/grafana into 7883_new_url_structure 2018-02-01 16:32:33 +01:00
Marcus Efraimsson 3db328f516 fix for dashboard/folder url's when having a sub path in root_url config 2018-02-01 16:30:48 +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
Carl Bergquist 3b4e487662 Merge pull request #10715 from grafana/7883_alerting 
Implement new url format in alerting
 2018-02-01 14:38:28 +01:00
Daniel Lee cc55ab6bc8 dashfolders: adds permission modal to dashboard settings 2018-02-01 14:32:19 +01:00
bergquist 90207bcb7d register handler for get dashboards by slug 2018-02-01 14:17:14 +01:00
bergquist fcd86fb24f make it easier for dashboards to generate ur; 2018-02-01 14:08:51 +01:00
bergquist 74ca6f6dbf changes dashboard url in alertlist 2018-02-01 14:08:51 +01:00
bergquist 992fd37010 alert: use new url format 2018-02-01 14:08:51 +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
Marcus Efraimsson d8d82c1769 Merge pull request #10706 from grafana/7883_frontend_step2 
WIP: Dashboard & Persistent urls - Frontend Step 2
 2018-02-01 13:55:03 +01:00
Marcus Efraimsson cdf2fd64b7 route params from angular to view store should be updated on routeChangeSuccess 2018-02-01 13:28:04 +01:00
Alexander Zobnin 16e1640ba4 repeat panel: process repeats when row is expanding (#10712) 2018-02-01 13:23:45 +01:00
Marcus Efraimsson ee9c408188 folders: changes needed due to merge 2018-02-01 13:21:24 +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
Marcus Efraimsson ef90b3e49c Merge branch '7883_new_url_structure' into 7883_frontend_step2 2018-02-01 11:08:39 +01:00
Mitsuhiro Tanda cf1be5fdfc support multiple histogram series 2018-02-01 19:06:35 +09:00
Torkel Ödegaard b55ce1dd72 docs: moved whats new article to master 2018-02-01 10:55:29 +01:00
Torkel Ödegaard 8bbbaad497 Merge branch 'master' into docs_v5.0 2018-02-01 10:49:26 +01:00
Marcus Efraimsson b135df9a6c Merge remote-tracking branch 'upstream/master' into 7883_new_url_structure 2018-02-01 10:48:06 +01:00