7ab0a54f4b
Merge remote-tracking branch 'upstream/master' into postgres-timefilter-macro
2018-04-16 19:23:08 +02:00
34455c0598
Merge pull request #11583 from grafana/11556-org-switch-order
...
ordered user orgs alphabeticaly
2018-04-16 17:09:36 +02:00
bb7a6a0153
Merge pull request #11595 from kichristensen/DeleteEmptyPlaylist
...
Support deleting empty playlist
2018-04-16 17:06:59 +02:00
ed44face0e
Merge pull request #11605 from grafana/davkal/show-version-in-help
...
Show Grafana version and build in Help menu
2018-04-16 16:58:18 +02:00
5a29c17282
moved version in help menu to top
2018-04-16 16:25:28 +02:00
712212d6aa
Show Grafana version and build in Help menu
...
* establishes Help as the single place to look for the Grafana version
* version is passed as menu sub-title to side menu
* added rendering of sub-title, plus styles
* sub-title was used by profile menu (its value is the login string),
but was not shown; now showing this value on condition that login name
is different from user name
2018-04-16 13:37:05 +02:00
9337972a0f
sqlds: fix text in comments for tests
2018-04-16 12:55:27 +02:00
ee303c03e9
Merge pull request #11550 from grafana/sql_ts_precision
...
sql tsdb: fix precision and data type support for time columns
2018-04-16 11:04:46 +02:00
a140296633
Merge pull request #11594 from xginn8/writable_plugins
...
Grafana-CLI: mention the plugins directory is not writable on failure
2018-04-16 09:27:19 +02:00
67daa9b058
Merge pull request #11588 from mjtrangoni/fix-codespell-issues
...
Fix codespell issues
2018-04-16 09:12:49 +02:00
6d3da9a73d
remove postgresversion and convert unix timestamp in go
2018-04-15 22:14:13 +02:00
7534f0bff6
Support deleting empty playlist
2018-04-15 21:37:34 +02:00
ee623e2091
Grafana-CLI: mention the plugins directory is not writable on failure
2018-04-15 13:44:59 -04:00
9b61ffb48a
make timefilter macro aware of pg version
2018-04-15 18:38:20 +02:00
d70cacc364
Merge pull request #11532 from ryantxu/sql-uint64
...
PostgreSQL should not cast all times to uint64
2018-04-14 17:56:39 +02:00
91fb2e07ce
pkg: fix codespell issues
2018-04-13 20:31:29 +02:00
9413ce5ef6
Merge pull request #8096 from ryantxu/influx-db-query2
...
let the influxdb API set a database
2018-04-13 18:22:12 +02:00
ff4e38c1d8
provisioned dashboard validation should be made when importing a dashboard
...
Had to add the validate before save command before validating provisioned dashboard
so that the import would get a proper dashboard id
2018-04-13 17:54:41 +02:00
79d8937ce5
provisioned dashboard validation should not be made from provisioning service
...
Provisioned dashboard validation should not be made when creating/updating a folder or
when provisioning service are trying to provision/create/update dashboard
2018-04-13 17:45:32 +02:00
4f44376564
remove comment/unused variable
2018-04-13 17:11:52 +02:00
4a26797cdd
Merge branch 'master' into readonly_dashboards
2018-04-13 17:03:00 +02:00
9ad8a77a21
ordered user orgs alphabeticaly fixes #11556
2018-04-13 14:53:36 +02:00
a86ee304ff
tsdb: remove unnecessary type casts in sql data sources macro engines
2018-04-12 19:08:35 +02:00
f5586b1270
tsdb: sql data sources should handle time ranges before epoch start correctly
2018-04-12 18:53:12 +02:00
a3874ce2c7
Merge branch 'master' into sql-uint64
2018-04-12 18:49:27 +02:00
74f570fdf4
change annotation limit from 10 to 100
2018-04-12 17:38:10 +02:00
b4863002c9
permission: fix user with org viewer save/move permissions
...
User with org viewer role should not be able to save/move dashboards
in/to general folder.
2018-04-11 00:23:50 +02:00
93e1546f73
alerting: handle invalid json format
...
closes #11003
2018-04-10 22:22:12 +02:00
6cb891dca8
mysql: use a datetime column with microsecond precision in test
2018-04-10 16:37:39 +02:00
97f67ddcb8
tsdb: improved floating point support when converting sql time column to epoch (ms)
2018-04-10 16:36:00 +02:00
f424d13b53
provisioning: dont override permissions
2018-04-10 12:35:06 +02:00
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
9d84e6f31f
mssql: fix precision for time columns in time series query mode
2018-04-10 11:10:56 +02:00
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
1783c534fd
postgres: fix precision for time columns in time series query mode
2018-04-10 11:07:01 +02:00
af62646624
mysql: fix precision for time columns in time series query mode
2018-04-10 11:01:43 +02:00
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
0f9b592428
provisioning: fixes broken tests
2018-04-10 10:48:10 +02:00
a314890f89
tsdb: add support for more data types when converting sql time column to epoch (ms)
2018-04-10 10:33:23 +02:00
77e7887e5e
provisioning: check provisiong before saveCmd
2018-04-10 09:35:54 +02:00
7845eab502
provisioning: fixes typo
2018-04-10 09:32:05 +02:00
bcbe7a1c55
provisioning: adds error handling
2018-04-10 09:31:35 +02:00
1c9ebd5bd8
fix test
2018-04-09 14:01:09 +02:00
5ca972542b
convert graphite epoch to ms
2018-04-09 13:58:09 +02:00
920a0c4fec
skip mssql fix
2018-04-09 13:49:13 +02:00
7d6c8aa612
add mssql and mysql
2018-04-09 13:34:35 +02:00
113bfb3d3e
don't convert to uint64
2018-04-09 13:28:32 +02:00
60816f5fc2
using millis for annotations too
2018-04-09 12:48:01 +02:00
fbed72c89c
Merge branch 'master' into feature/add_es_alerting
2018-04-09 14:00:28 +08:00
697a3eaa43
Fix after merge
2018-04-08 20:31:17 +02:00
Sven Klemm
Daniel Lee
David
Carl Bergquist
Kim Christensen
Matthew McGinn
Mario Trangoni
Marcus Efraimsson
Patrick O'Carroll
flopp999
bergquist
ryan
Penghan Wang
Andrzej Ressel