Dan Cech
33760b5c3b
make sure user's default org is kept up to date
2018-04-17 16:51:05 -04:00
Dan Cech
00e74990ed
remove old comment
2018-04-17 14:06:25 -04:00
Dan Cech
857830d981
org role sync tests
2018-04-17 14:06:25 -04:00
Dan Cech
52503d9cb5
refactor authproxy & ldap integration, address comments
2018-04-17 14:06:25 -04:00
Dan Cech
c8a0c1e6b8
pass DN in ldap test
2018-04-17 14:06:25 -04:00
Dan Cech
daeba40b3b
tests for user auth module
2018-04-17 14:06:25 -04:00
Dan Cech
59f83ca5d8
fix ldap test
2018-04-17 14:06:25 -04:00
Dan Cech
e53e039b1b
restructure GetUserByAuthInfo
2018-04-17 14:06:25 -04:00
Dan Cech
c4168c2396
error handling
2018-04-17 14:06:25 -04:00
Dan Cech
65847da1df
use Result in GetAuthInfoQuery
2018-04-17 14:06:25 -04:00
Dan Cech
d837be91ec
switch to passing ReqContext as a property
2018-04-17 14:06:25 -04:00
Dan Cech
e53315dce8
cleanup
2018-04-17 14:06:25 -04:00
Dan Cech
a1b1d2fe80
switch to Result
2018-04-17 14:06:25 -04:00
Dan Cech
d5dd1c9bca
update auth proxy
2018-04-17 14:06:25 -04:00
Dan Cech
23f163e8cf
fixes
2018-04-17 14:06:25 -04:00
Dan Cech
d2eab2ff4c
fix tests
2018-04-17 14:06:25 -04:00
Dan Cech
1c5afa731f
shared library for managing external user accounts
2018-04-17 14:06:25 -04:00
Marcus Efraimsson
d7688241c6
Merge branch 'master' into readonly_dashboards
2018-04-17 16:27:51 +02:00
Daniel Lee
26bb22bffa
Merge pull request #11554 from grafana/11553_viewer_general_access
...
User with org viewer role permission fixes
2018-04-17 13:50:45 +02:00
Daniel Lee
b3acbb9995
Merge pull request #11526 from grafana/11173_folder_admin
...
A folder admin should be able to add permissions for folder/its dashboards
2018-04-17 13:42:38 +02:00
Marcus Efraimsson
8a5cb088d3
Merge branch 'master' into readonly_dashboards
2018-04-17 10:50:04 +02:00
Dan Cech
e07de80b75
Fix issues with metric reporting ( #11518 )
...
* report active users in graphite stats
* use bus to publish system stats
* metrics: avoid using events unless we have to
this commit also changes the default interval
for updating the stats gauges. Seems like the old values
was a product of previous metrics implementation
2018-04-17 10:20:01 +02:00
Marcus Efraimsson
92768d5a2b
Merge branch 'master' into dashboard-acl-ux2
2018-04-17 09:19:36 +02:00
Carl Bergquist
ea56288f4a
Merge pull request #11611 from mjtrangoni/fix-unconvert-issues
...
fix unconvert issues
2018-04-17 09:06:39 +02:00
Sven Klemm
5dc36afe71
calculate datetime for timeFrom and timeTo macro in go
2018-04-16 23:02:24 +02:00
Marcus Efraimsson
bc8353ae14
Merge branch 'master' into dashboard-acl-ux2
2018-04-16 21:19:01 +02:00
Mario Trangoni
ce941a004d
fix unconvert issues
2018-04-16 20:04:58 +02:00
Sven Klemm
a2a7d3d436
add GetFromAsTimeUTC and GetToAsTimeUTC and use them in timeFilter macro
2018-04-16 19:38:35 +02:00
Sven Klemm
7ab0a54f4b
Merge remote-tracking branch 'upstream/master' into postgres-timefilter-macro
2018-04-16 19:23:08 +02:00
Daniel Lee
34455c0598
Merge pull request #11583 from grafana/11556-org-switch-order
...
ordered user orgs alphabeticaly
2018-04-16 17:09:36 +02:00
Daniel Lee
bb7a6a0153
Merge pull request #11595 from kichristensen/DeleteEmptyPlaylist
...
Support deleting empty playlist
2018-04-16 17:06:59 +02:00
David
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
David Kaltschmidt
5a29c17282
moved version in help menu to top
2018-04-16 16:25:28 +02:00
David Kaltschmidt
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
Daniel Lee
9337972a0f
sqlds: fix text in comments for tests
2018-04-16 12:55:27 +02:00
Daniel Lee
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
Carl Bergquist
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
Daniel Lee
67daa9b058
Merge pull request #11588 from mjtrangoni/fix-codespell-issues
...
Fix codespell issues
2018-04-16 09:12:49 +02:00
Sven Klemm
6d3da9a73d
remove postgresversion and convert unix timestamp in go
2018-04-15 22:14:13 +02:00
Kim Christensen
7534f0bff6
Support deleting empty playlist
2018-04-15 21:37:34 +02:00
Matthew McGinn
ee623e2091
Grafana-CLI: mention the plugins directory is not writable on failure
2018-04-15 13:44:59 -04:00
Sven Klemm
9b61ffb48a
make timefilter macro aware of pg version
2018-04-15 18:38:20 +02:00
Daniel Lee
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
Mario Trangoni
91fb2e07ce
pkg: fix codespell issues
2018-04-13 20:31:29 +02:00
Daniel Lee
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
Marcus Efraimsson
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
Marcus Efraimsson
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
Marcus Efraimsson
4f44376564
remove comment/unused variable
2018-04-13 17:11:52 +02:00
Marcus Efraimsson
4a26797cdd
Merge branch 'master' into readonly_dashboards
2018-04-13 17:03:00 +02:00
Patrick O'Carroll
9ad8a77a21
ordered user orgs alphabeticaly fixes #11556
2018-04-13 14:53:36 +02:00
