Torkel Ödegaard
7ed2ed71f0
ux: dashboard stuff
2017-08-17 18:50:46 +02:00
Torkel Ödegaard
637ff61f90
Merge branch 'develop' into develop-newgrid-rows
2017-08-17 15:56:38 +02:00
Torkel Ödegaard
11f6c4eb28
ux: minor changes
2017-08-17 15:52:22 +02:00
Torkel Ödegaard
d4a231fe09
ux: fixed sidenav issues
2017-08-17 14:59:10 +02:00
Torkel Ödegaard
4dd4631b87
ux: sidemenu toggling
2017-08-17 14:00:41 +02:00
Torkel Ödegaard
6609dbff90
ux: sidenav fixes and dashboard search changes
2017-08-17 12:06:51 +02:00
Torkel Ödegaard
a4da0adf38
ux: switching orgs now works through modal
2017-08-16 15:37:13 +02:00
Torkel Ödegaard
95f5c84a57
ux: making org visibile in profile view
2017-08-16 15:03:49 +02:00
Torkel Ödegaard
7f0f0eb617
ux: more nav work
2017-08-16 11:28:52 +02:00
Torkel Ödegaard
5405736321
ux: nav fixes & polish
2017-08-15 23:17:34 +02:00
Torkel Ödegaard
d659a5d79f
ux: more nav work
2017-08-15 20:53:31 +02:00
Torkel Ödegaard
0bc226d760
ux: more nav work
2017-08-15 20:24:16 +02:00
Torkel Ödegaard
1eab771231
ux: navigation work
2017-08-15 17:52:52 +02:00
Torkel Ödegaard
db54416deb
ux: sidenav fixes and dashboard search changes
2017-08-15 15:25:18 +02:00
Torkel Ödegaard
63424f9866
ux: more work on sidemenu
2017-08-15 14:49:12 +02:00
Torkel Ödegaard
7bf6904119
ux: scrollbar stuff
2017-08-15 11:51:47 +02:00
Torkel Ödegaard
27d6492f40
ux: removed custom scrollbar look
2017-08-15 09:10:39 +02:00
Torkel Ödegaard
e81cb9c929
ux: testing fixed sidemenu and breadcrumbs
2017-08-14 22:44:01 +02:00
Torkel Ödegaard
097fa74390
ux: minor navbar update
2017-08-14 21:43:24 +02:00
Torkel Ödegaard
8aa73401a9
ux: new breadcrumb progress
2017-08-14 19:47:40 +02:00
Torkel Ödegaard
8d6a1cdbb4
ux: wip
2017-08-14 18:11:35 +02:00
Torkel Ödegaard
78ea1dc87d
ux: new page header look wip
2017-08-14 16:06:20 +02:00
Torkel Ödegaard
f02be0251b
ux: use flexbox for sidenav, put logo in sidenav
2017-08-14 12:26:24 +02:00
Torkel Ödegaard
1dab313ca3
Merge branch 'master' into develop
2017-08-14 10:30:36 +02:00
Torkel Ödegaard
17cb3f6e6a
fix: graph fix for decimals, bug introduced by #61313478063b0e0721f204847f3c0298ea8f593f
2017-08-11 16:20:36 +02:00
Torkel Ödegaard
d4dd0222fa
fix: prometheus does not have two editor modes, fixes #9025
2017-08-11 12:33:56 +02:00
Torkel Ödegaard
8f2975c69b
moving panels betwen rows are starting to work
2017-08-11 12:12:17 +02:00
Daniel Lee
02248273ae
mysqlds: remove alpha state from plugin.json
2017-08-11 10:25:37 +02:00
Torkel Ödegaard
9f945578b8
grid: progress on row support
2017-08-10 17:17:15 +02:00
Torkel Ödegaard
61459b287c
grid: new grid fixes
2017-08-10 15:29:40 +02:00
Torkel Ödegaard
7cb6093dba
new-grid: fixed destory issues
2017-08-10 15:08:53 +02:00
Torkel Ödegaard
23666c0f78
grid: remove panel works
2017-08-10 14:54:56 +02:00
Daniel Lee
b716a2595a
mysqlds: add support for key/value template variables
...
If the template variable query has two columns named __text and __value
then return a list of key values. The value is used when the variable is
interpolated in the query. Allows mapping of texts to ids.
2017-08-10 14:42:27 +02:00
Torkel Ödegaard
c7959ff06e
fix: Using table cell links and ad hoc filters together now works & looks correct, fixes #8052
2017-08-10 14:12:31 +02:00
Torkel Ödegaard
d2437d3cf1
fix: ad-hoc filters now works with data source variables, fixes #8052
2017-08-10 12:04:46 +02:00
Daniel Lee
1105bb371f
mysqlds: adds support for template variables
...
Fixes #8855
2017-08-09 19:32:53 +02:00
Torkel Ödegaard
a2a4325b6e
Merge branch 'develop-newgrid' of github.com:grafana/grafana into develop-newgrid
2017-08-09 15:35:06 +02:00
Torkel Ödegaard
77b42220f4
feat: new grid fixes
2017-08-09 15:33:19 +02:00
Daniel Lee
59513ff963
tempvar: bug fix for duplicate template var
...
and a fix for when selecting the same value twice in
a template variable if it is not multi select. It threw an
exception on the second selection
2017-08-09 14:28:23 +02:00
Torkel Ödegaard
d25dae9b58
Merge branch 'master' into develop-newgrid
2017-08-09 14:07:06 +02:00
Torkel Ödegaard
668cb3c1ef
Merge branch 'v4.4.x'
2017-08-09 10:37:06 +02:00
Torkel Ödegaard
e8a20643d6
feat: store last seen date for users and present in stats and user lists, closes #9007
2017-08-09 10:36:41 +02:00
Torkel Ödegaard
68c4ce34d5
fix: templating issue with data source variables, can now be used right away in other query variables and panels (without page reload), fixes #7510
2017-08-08 17:08:35 +02:00
Brad Lhotsky
a8ac215039
Add a few more MySQL macros:
...
* $__timeFrom() -> Returns the dashboard 'from' suitable for use querying
against a MySQL TIMESTAMP field.
* $__timeTo() -> Returns the dashboard 'to' suitable for use querying
against a MySQL TIMESTAMP field.
* $__unixEpochFiler(column) -> If you store timestamps as UNIX epoch's,
this builds: column > 'from' AND column < 'to'
* $__unixEpochFrom() -> Returns the dashboard 'from' suitable for use querying
against a MySQL integer field (UNIX epochs)
* $__unixEpochTo() -> Returns the dashboard 'to' suitable for use querying
against a MySQL integer field (UNIX epochs)
2017-08-08 14:40:27 +02:00
Torkel Ödegaard
d3680d290c
fix: graphite issue with metricFind and sending from/until in normal format, fixes #8997
2017-08-08 13:51:54 +02:00
Torkel Ödegaard
83beff300b
Merge branch 'v4.4.x'
2017-08-08 11:26:45 +02:00
Torkel Ödegaard
64b5153e7d
fix: change view json to use the grafana built json viewer, fixes #9002
2017-08-08 11:26:16 +02:00
Torkel Ödegaard
781dd25c82
Merge branch 'elasticsearch-filtering'
2017-08-08 11:09:00 +02:00
Torkel Ödegaard
f979e95820
tablepanel: minor update to table panel, #8052
2017-08-08 11:08:51 +02:00
Torkel Ödegaard
1507c02ebb
Merge branch 'feat-8539' of https://github.com/alexanderzobnin/grafana
2017-08-08 09:33:23 +02:00
