bergquist
93e1546f73
alerting: handle invalid json format
...
closes #11003
2018-04-10 22:22:12 +02:00
Marcus Efraimsson
be4b715aad
docker: change mysql container so that it uses utc
2018-04-10 16:59:48 +02:00
Marcus Efraimsson
6cb891dca8
mysql: use a datetime column with microsecond precision in test
2018-04-10 16:37:39 +02:00
Marcus Efraimsson
97f67ddcb8
tsdb: improved floating point support when converting sql time column to epoch (ms)
2018-04-10 16:36:00 +02:00
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
bergquist
f424d13b53
provisioning: dont override permissions
2018-04-10 12:35:06 +02:00
bergquist
949484b949
provisioning: simplify db query
...
the GetProvisionedDashboardQuery wasent used for anything
else than check if a dashboard is provisioned or not. So
we simplified this query to make it more maintainable.
2018-04-10 12:30:37 +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
bergquist
0f9b592428
provisioning: fixes broken tests
2018-04-10 10:48:10 +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
bergquist
77e7887e5e
provisioning: check provisiong before saveCmd
2018-04-10 09:35:54 +02:00
bergquist
7845eab502
provisioning: fixes typo
2018-04-10 09:32:05 +02:00
bergquist
bcbe7a1c55
provisioning: adds error handling
2018-04-10 09:31:35 +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
Patrick O'Carroll
77b8ccd7f5
removed console.log
2018-04-09 17:01:58 +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
Marcus Efraimsson
f3e1557761
guardian: when updating permissions should verify existing permissions
...
Before in CheckPermissionBeforeUpdate, access was verified for updated
permissions. Now access is verified for existing permissions.
Refactored guardian tests to cover more test cases for org admin, editor
and viewer roles
2018-04-08 15:06:22 +02:00
Marcus Efraimsson
84d034c688
api: allow authenticated users to search current org users and teams
...
Any authenticated user of an organization should be able to
- search its organization's users
- search its organization's users
- retrieve a single user of its organization (this how it was
implemented earlier)
2018-04-07 10:39:28 +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
Patrick O'Carroll
0203e7afd5
Merge branch 'dashboard-acl-ux2' of github.com:grafana/grafana into dashboard-acl-ux2
2018-04-06 09:50:36 +02:00
Patrick O'Carroll
b363e160d9
added icons for viewer and editor, fixed add permission team avatar
2018-04-06 09:43:59 +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
Marcus Efraimsson
f619dd579e
provisioning: fix tests for save provisioned dashboard modal
2018-04-05 20:51:47 +02:00
Marcus Efraimsson
6bbeb723ca
Merge branch 'master' into readonly_dashboards
2018-04-05 20:30:27 +02:00
