Patrick O'Carroll
5f67d4268d
added @ngInject
2018-04-10 15:48:51 +02:00
Daniel Lee
9e1a1ed572
Merge pull request #11501 from grafana/metric-segment-to-ts
...
migrated metric_segment to ts
2018-04-10 12:41:58 +02:00
Marcus Efraimsson
9d84e6f31f
mssql: fix precision for time columns in time series query mode
2018-04-10 11:10:56 +02:00
Marcus Efraimsson
0317ecbf0d
postgres: support running multiple postgres integration tests
...
Makes it possible to run mysql integration tests for both
grafana config db and tsdb at the same time using
GRAFANA_TEST_DB=postgres go test ./pkg/...
2018-04-10 11:08:30 +02:00
Marcus Efraimsson
1783c534fd
postgres: fix precision for time columns in time series query mode
2018-04-10 11:07:01 +02:00
Marcus Efraimsson
af62646624
mysql: fix precision for time columns in time series query mode
2018-04-10 11:01:43 +02:00
Marcus Efraimsson
5c120c2c11
mysql: mysql tests should use a db server with UTC
...
To get rid of issues involving date/time when testing.
Also, makes it possible to run mysql integration tests for both
grafana config db and tsdb at the same time using
GRAFANA_TEST_DB=mysql go test ./pkg/...
2018-04-10 10:58:45 +02:00
Daniel Lee
63dab4ffe4
Merge branch 'fix-11053' of https://github.com/alexanderzobnin/grafana into alexanderzobnin-fix-11053
2018-04-10 10:33:47 +02:00
Marcus Efraimsson
a314890f89
tsdb: add support for more data types when converting sql time column to epoch (ms)
2018-04-10 10:33:23 +02:00
Patrick O'Carroll
6719bdf9bd
added @ngInject
2018-04-10 09:24:54 +02:00
Carl Bergquist
b610f77bd6
Merge pull request #11541 from calebtote/patch-1
...
Update annotations.md to contain correct annotations api path
2018-04-10 09:07:11 +02:00
Daniel Lee
c860f21052
playlist: add missing nginject attribute
2018-04-09 21:33:18 +02:00
Caleb Tote
5f47523d76
Update annotations.md to contain correct annotations api path
2018-04-09 15:09:37 -04:00
Daniel Lee
d39dac10a6
docs: update after #11531
2018-04-09 15:19:41 +02:00
bergquist
2889a405a7
docs: improves provisoning example text
2018-04-09 14:56:42 +02:00
Daniel Lee
23ed5dfc8a
Merge pull request #11531 from grafana/11391_access
...
Rename direct/proxy access mode to browser/server
2018-04-09 14:48:29 +02:00
ryan
1c9ebd5bd8
fix test
2018-04-09 14:01:09 +02:00
ryan
920a0c4fec
skip mssql fix
2018-04-09 13:49:13 +02:00
ryan
7d6c8aa612
add mssql and mysql
2018-04-09 13:34:35 +02:00
ryan
113bfb3d3e
don't convert to uint64
2018-04-09 13:28:32 +02:00
Alexander Zobnin
d9ba16f550
scrollbar: fix phantomjs rendering error
2018-04-09 14:21:20 +03:00
Sven Klemm
00524e6827
prevent angular from evaluating {{hostname}} in tooltip ( #11514 )
2018-04-09 12:51:17 +02:00
Marcus Efraimsson
95132165f8
data source: rename direct/proxy access mode in data source settings
...
Changes access drop down options names:
- proxy -> Server (Default)
- direct -> Browser
Replace access drop down info icon/tooltip with expandable/collapsable
help section.
2018-04-09 12:47:19 +02:00
bergquist
25be937bfa
docs: fixes typo
2018-04-09 09:55:10 +02:00
Torkel Ödegaard
d60c7b2013
docs: updated debian distro in install docs to stretch, closes #11527
2018-04-09 08:18:58 +02:00
Daniel Lee
ce787b88bf
css: quick fix after IE11 changes
...
Temporary fix so that the add panel panel works properly. This will
break a3f15ced68
2018-04-06 21:29:42 +02:00
Alexander Zobnin
41e5d66e39
scrollbar: fix add panel height bug
2018-04-06 20:31:44 +03:00
Alexander Zobnin
d3d64337b4
scrollbar: styles cleanup
2018-04-06 20:00:03 +03:00
Daniel Lee
817b8d3946
Merge pull request #11511 from grafana/side-menu-icon-fix
...
fixed sidemenu icon issue created by earlier pr
2018-04-06 17:53:50 +02:00
Daniel Lee
3fd9c787cf
Merge pull request #11497 from grafana/dash-class-to-ts
...
migrated dash_class to ts
2018-04-06 17:48:18 +02:00
Patrick O'Carroll
c7cd754a94
migrating to ts
2018-04-06 15:02:32 +02:00
Daniel Lee
51148709bb
Merge pull request #11496 from grafana/segment-srv-to-ts
...
migrated segment_srv to ts
2018-04-06 11:18:51 +02:00
Patrick O'Carroll
6d6ecbd458
fixed sidemenu icon issue created by earlier pr
2018-04-06 10:54:06 +02:00
Daniel Lee
4ac290215e
Merge branch 'fix-11053' of https://github.com/alexanderzobnin/grafana into alexanderzobnin-fix-11053
2018-04-05 22:30:13 +02:00
Patrick O'Carroll
35bc4e4632
migrated metric_segment to ts
2018-04-05 17:10:32 +02:00
Alexander Zobnin
9f07ae72ee
scrollbar: fix search scroller in mobile view
2018-04-05 16:47:20 +03:00
Alexander Zobnin
d6233714d2
Merge remote-tracking branch 'upstream/master' into fix-11053
2018-04-05 16:30:46 +03:00
Marcus Efraimsson
166778b32a
Merge pull request #11439 from grafana/ldap-block
...
docker: add users and groups to ldap block
2018-04-05 15:30:11 +02:00
Alexander Zobnin
fa43782299
scrollbar: fix graph legend height
2018-04-05 16:28:12 +03:00
Marcus Efraimsson
94d1a9fd83
Merge pull request #11430 from grafana/11332_esc_timepicker
...
Enable closing timepicker using escape key
2018-04-05 15:11:34 +02:00
Daniel Lee
fcfc33ee57
changelog: adds note for #11165
2018-04-05 15:02:54 +02:00
Patrick O'Carroll
714d555e36
migrated dash_class to ts
2018-04-05 14:33:27 +02:00
Patrick O'Carroll
7083e8a0a9
migrated segment_srv to ts
2018-04-05 14:09:32 +02:00
Daniel Lee
32b833e488
Merge pull request #11271 from grafana/11073_dashboard_folder_indent
...
added indent to dashboards inside folder in search dropdown…
2018-04-05 11:12:17 +02:00
Patrick O'Carroll
b321a21cb5
removed indent for manage dashboards
2018-04-05 11:00:15 +02:00
Alexander Zobnin
b4ef55f5d0
scrollbar: fix potential memory leaks in event handlers
2018-04-05 11:51:32 +03:00
Daniel Lee
088720cf2b
Merge pull request #11417 from grafana/ie11_alerting_style_fix
...
removed padding for icons and added margin
2018-04-04 23:24:41 +02:00
Daniel Lee
2d1f2f3636
Merge pull request #11480 from grafana/graph_tooltip_to_ts
...
Graph tooltip to ts
2018-04-04 23:03:31 +02:00
Daniel Lee
28849bbd57
Merge pull request #11481 from grafana/all-js-to-ts
...
migrated last all.js to ts
2018-04-04 22:09:10 +02:00
Daniel Lee
dc4cb0d565
Merge pull request #11483 from grafana/playlist-routes-to-ts
...
migrated playlist-routes to ts
2018-04-04 22:02:02 +02:00
