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
Torkel Ödegaard b1a2344be1 added bundled dashboards 2017-11-30 16:51:06 +01:00
Carl Bergquist 142c3a6bc2 Merge pull request #10042 from andrei-kolosok/master 
grafana-10039: fix query time range ends in the past
 2017-11-30 16:41:43 +01:00
Torkel Ödegaard b2add1977a ux: progress on new page header 2017-11-30 16:35:27 +01:00
Marcus Efraimsson d83692aa80 dashboard: when changing route, scroll to top 2017-11-30 15:59:53 +01:00
Andrei Kalasok 68d4211c50 grafana-10039: fix query time range ends in the past 2017-11-30 15:50:35 +01:00
Torkel Ödegaard 74ceb76ec0 ux: work on page header 2017-11-30 15:37:03 +01:00
Carl Bergquist 603725aeb0 Merge pull request #10041 from grafana/revert-9983-prometheus_nested 
Revert "prometheus nested query support"
 2017-11-30 15:06:16 +01:00
Carl Bergquist af5ced0e18 Revert "prometheus nested query support" 2017-11-30 15:06:02 +01:00
Carl Bergquist 98f0305e68 Merge pull request #9983 from mtanda/prometheus_nested 
prometheus nested query support
 2017-11-30 14:57:34 +01:00
Torkel Ödegaard 645f49eda4 ux: updating header design for pages 2017-11-30 11:31:38 +01:00
Marcus Efraimsson 1db9aeaac3 fix: when navigating, scroll to top 2017-11-30 10:50:10 +01:00
Alexander Zobnin 88760983ab repeat row: add more tests 2017-11-30 10:42:53 +03:00
Torkel Ödegaard 47f11c26c0 ux: new page header design 2017-11-30 08:18:23 +01:00
Trent White 66831fb0cd tweak background size 2017-11-29 16:43:06 -05:00
Trent White 583a4f5314 new test svg background, minor form tweaks 2017-11-29 16:41:48 -05:00
Torkel Ödegaard 3d2d789ca2 ux: search filter box 2017-11-29 17:15:27 +01:00
Torkel Ödegaard 8141987303 Merge branch 'develop' of github.com:grafana/grafana into develop 2017-11-29 15:26:37 +01:00
Torkel Ödegaard c9be5c21ae ux: changed body default font size to 13px 2017-11-29 15:26:16 +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
Matt ce494fbedb Added border radius and tightened up the folder boxes. Still needs to have the bottom margin expanded to 8px when in opened state (this needs @torkelo) 2017-11-29 14:45:12 +01:00
Marcus Efraimsson c8ac6add16 test: speedup mysql and postgres integration tests by 10-20x 
Use docker tmpfs mounts for mysql and postgres data volumes
 2017-11-29 14:40:23 +01:00
Alexander Zobnin 36ef186587 repeat row: expose scopedVars to row panels 2017-11-29 16:40:13 +03:00
Torkel Ödegaard d981fe4f04 ux: search design update 2017-11-29 13:21:42 +01:00
Alexander Zobnin dd9c727e60 repeat row: handle collapsed rows 2017-11-29 14:14:43 +03:00
Daniel Lee 554c7ba96f notifier: Fixes path for uploaded image for Slack notifier 
Fixes #10012
 2017-11-29 11:16:45 +01:00
Daniel Lee e6bf266c4b formatting in build file 2017-11-29 11:15:27 +01:00
Alexander Zobnin 08d470d76a dashboard: initial repeat row implementation 2017-11-29 12:51:14 +03:00
Mitsuhiro Tanda 98bb8bf761 prometheus nested query support 2017-11-29 18:34:44 +09:00
jomenxiao 3f95180c98 fix render http[get] params error 2017-11-28 22:20:22 +08:00
bergquist c0e087640b test: close file before deleting 2017-11-28 15:05:53 +01:00
Carl Bergquist 2bc91c8660 Merge pull request #10013 from grafana/view-json-template 
export view json now templatized, fixes #10001
 2017-11-28 15:02:26 +01:00
Marcus Efraimsson 6c5748203d Restore Page Footer after migration to new scrollbar #9652 2017-11-28 14:17:53 +01:00
Patrick O'Carroll afd0fc3652 export view json now templatized, fixes #10001 2017-11-28 13:27:43 +01:00
Marcus Efraimsson a335150ad1 dashfolders: Add a helper for creating a dashboard folder 2017-11-28 12:51:40 +01:00
Marcus Efraimsson 82cd24491e dashfolders: revert automatic creation of folders for plugins 2017-11-28 12:51:40 +01:00
Patrick O'Carroll b19b68df08 styling changes for light theme 2017-11-28 11:27:29 +01:00
Alexander Zobnin 852218e834 grid: use single column layout for mobile devices (#9999) 2017-11-28 09:38:35 +01:00
Alexander Zobnin b97ad93be1 fix panel solo mode (#10002) 2017-11-28 09:38:28 +01:00
Marcus Efraimsson 8f4ad1e496 dashlist: handle recent dashboards removed from backend 2017-11-28 09:07:28 +01:00
Marcus Efraimsson 368a4d7aed dashfolders: don't create app folder on dashboard import if already exists 2017-11-27 18:23:57 +01:00
Daniel Lee 4356e980f0 dashfolders: create app folder on dashboard import 2017-11-27 17:08:39 +01:00
Daniel Lee 07cd182617 datasource: fix merge conflict - restore dashboards tab 2017-11-27 15:17:50 +01:00
Torkel Ödegaard 7f3a3b9e55 search fix and update buttons on dashboard list page 2017-11-27 14:49:31 +01:00
Torkel Ödegaard c38a64e4cc Merge remote-tracking branch 'origin/migrate-view-state' into develop 2017-11-27 13:37:12 +01:00
Torkel Ödegaard 734aa37434 fix: removed table background 2017-11-27 13:36:25 +01:00
Torkel Ödegaard fdb217c283 build: fixed lint issue 2017-11-27 13:19:33 +01:00
Patrick O'Carroll be74957a60 fixed link i specs-file 2017-11-27 12:29:20 +01:00
Alexander Zobnin 24fe3af20f Improve dashboard grid layout migration WIP (#9943) 
* grid: fix small panels migration and make panel height closer to row height

* grid: migrate rows

* grid: increase min panel height

* grid: fix panel placement for complex layouts

* dashboard migration: refactor

* dashboard migration: add tests for grid layout

* dashboard: fix complex layout migration

* dashboard migration fix: fill current row if it possible

* test: fix karma tests by setting default panel span

* dashboard: fix migration when panel height more than row height

* dashboard: fix migration for collapsed rows

* grid: add all rows if even one collapsed or titled row is present
 2017-11-27 12:22:52 +01:00
Torkel Ödegaard adfb87e811 Merge branch 'develop' into alexanderzobnin-feat-9932 2017-11-27 12:19:07 +01:00
Torkel Ödegaard df2d49da33 test fix 2017-11-27 12:16:40 +01:00