bergquist
c22495b6f8
Merge branch 'master' into external-auth
...
* master:
changelog: adds note about closing #11613 and #11602
fix: sign in link should have target self to trigger full page reload, fixes #11626
codespell: exclude by words instead of files
Use sort.Strings() (gosimple)
Remove unused return value assignment (gosimple)
Remove unnecessary fmt.Sprintf() calls (gosimple)
Merge variable declaration with assignment (gosimple)
Use fmt.Errorf() (gosimple)
Simplify make() (gosimple)
Use raw strings to avoid double escapes (gosimple)
Simplify if expression (gosimple)
Simplify comparison to bool constant (gosimple)
Simplify error returns (gosimple)
Remove redundant break statements (gosimple)
2018-04-18 09:34:45 +02:00
bergquist
d9b3ff1952
changelog: adds note about closing #11613 and #11602
2018-04-18 09:21:51 +02:00
Dan Cech
3fedcb1e4b
cleanup, make sure users are always synced with ldap
2018-04-17 17:48:56 -04:00
ohadbenita
4664549411
Specify expected encoding for access/secret key
2018-04-17 23:55:07 +03:00
Dan Cech
33760b5c3b
make sure user's default org is kept up to date
2018-04-17 16:51:05 -04:00
Carl Bergquist
8367199a2d
Merge pull request #11613 from knweiss/gosimple
...
Code simplification (gosimple)
2018-04-17 22:40:40 +02:00
Carl Bergquist
6ba830c73b
Merge pull request #11632 from mjtrangoni/fix-codespell-circleci
...
codespell: exclude by words instead of files
2018-04-17 21:10:46 +02:00
Torkel Ödegaard
e81330abf0
fix: sign in link should have target self to trigger full page reload, fixes #11626
2018-04-17 21:01:52 +02:00
Mario Trangoni
b0217f5dd3
codespell: exclude by words instead of files
2018-04-17 20:45:46 +02: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
Torkel Ödegaard
1594ceeb6f
fix: Label font weight should be semi bold, fixes #11629
2018-04-17 19:40:44 +02:00
bergquist
fa49332915
docs: typos
2018-04-17 19:09:39 +02:00
Carl Bergquist
3801df5da8
Merge pull request #11602 from mjtrangoni/add-codespell-to-circle
...
add codespell to CircleCI
2018-04-17 19:02:32 +02:00
Daniel Lee
5b968329a0
graphite: adds tests for tags and tag_values functions
2018-04-17 18:58:47 +02:00
Marcus Efraimsson
d30835f648
docs: update provisioning documentation
...
In addition to closing #10883
2018-04-17 17:22:25 +02:00
Marcus Efraimsson
b142d6a037
Merge branch 'master' into docs-5.1
2018-04-17 16:50:26 +02:00
Marcus Efraimsson
cfef609c32
changelog: notes about closing #10883
...
[skip ci]
2018-04-17 16:45:44 +02:00
Marcus Efraimsson
c120415406
Merge pull request #11398 from bergquist/readonly_dashboards
...
improved workflow for provisioned dashboards
2018-04-17 16:42:08 +02:00
Daniel Lee
d9b5ef8f7b
changelog: adds note for #11553
2018-04-17 16:35:55 +02:00
Marcus Efraimsson
d7688241c6
Merge branch 'master' into readonly_dashboards
2018-04-17 16:27:51 +02:00
bergquist
059719104f
dev: only build server with bra run
2018-04-17 15:02:22 +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
4a842f96ac
changelog: adds note for #11173
2018-04-17 13:44:42 +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
Patrick O'Carroll
0120023aba
added forceupdate to grid item so addpanel items rezie instantly, renamed function to copyPanel, fixed panel items height issue
2018-04-17 13:10:08 +02:00
Marcus Efraimsson
2fc1558daf
revert changes of add panel button to require save permission
...
This resolves an issue where the add panel button was shown on the default home dashboard
2018-04-17 11:03:46 +02:00
Marcus Efraimsson
8a5cb088d3
Merge branch 'master' into readonly_dashboards
2018-04-17 10:50:04 +02:00
Marcus Efraimsson
e21d574814
changelog: fix typo
...
[skip ci]
2018-04-17 10:28:16 +02:00
Marcus Efraimsson
a3eff6cf25
changelog: notes about closing #11572
...
[skip ci]
2018-04-17 10:27:12 +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
ffe9b426d4
changelog: notes about closing #10747
...
[skip ci]
2018-04-17 10:00:09 +02:00
Torkel Ödegaard
85121e55c9
fix: Row state is now ignored when looking for dashboard changes ( #11608 )
...
* fix: Row state is now ignored when looking for dashboawrd changes, had to fix bug in expand logic to make fix work. Also moved the ChangeTracker to it's own file and moved tests to jest, fixes #11208
* removed commented out log calls
2018-04-17 09:41:07 +02:00
Marcus Efraimsson
9733172d3c
Merge pull request #11422 from grafana/dashboard-acl-ux2
...
improved ux for permission list
2018-04-17 09:39:39 +02:00
Marcus Efraimsson
d9799f7c13
Merge pull request #11572 from grafana/settings-icons-fix
...
ux: sizing and positioning of dashboard settings menu icons
2018-04-17 09:22:16 +02:00
Torkel Ödegaard
9ec89c1848
disable codecov comments
2018-04-17 09:20:43 +02:00
