Commit Graph

19924 Commits

Author SHA1 Message Date
Marcus Efraimsson
8678620730
move UserToken and UserTokenService to models package 2019-02-06 16:55:12 +01:00
Marcus Efraimsson
a60124a88c
change UserToken from interface to struct 2019-02-06 16:30:50 +01:00
Marcus Efraimsson
85ef2ca738
fix spelling 2019-02-06 09:43:45 +01:00
Marcus Efraimsson
44275d9660
middleware fix 2019-02-06 08:45:01 +01:00
Marcus Efraimsson
d8658a765c
enhanced expiration logic for lookup token
tokens are not expired if created_at > now - LoginMaxLifetimeDays and
rotated_at > now - LoginMaxInactiveLifetimeDays
2019-02-06 08:30:14 +01:00
Marcus Efraimsson
9483506590
auth token clean up job now runs on schedule and deletes all expired tokens
delete tokens having created_at <= LoginMaxLifetimeDays or
rotated_at <= LoginMaxInactiveLifetimeDays
2019-02-05 21:20:11 +01:00
Marcus Efraimsson
871c84d195
changes needed for api/middleware due to configuration settings 2019-02-05 21:14:23 +01:00
Marcus Efraimsson
0915f931ae
change configuration settings in auth package 2019-02-05 21:12:30 +01:00
Marcus Efraimsson
80d0943d9d
document login, short-lived tokens and secure cookie configurations 2019-02-05 21:10:56 +01:00
Marcus Efraimsson
3c2fd02bc0
refactor login/auth token configuration settings
remove login section and reuse existing sections security and auth
2019-02-05 21:09:55 +01:00
Marcus Efraimsson
1d1b617cee
remove unused code 2019-02-05 21:08:55 +01:00
Marcus Efraimsson
d53e64a32c
move auth token middleware/hooks to middleware package
fix/adds auth token middleware tests
2019-02-05 00:21:05 +01:00
Marcus Efraimsson
7cd3cd6cd4
auth package refactoring
moving middleware/hooks away from package
exposing public struct UserToken accessible from other packages
fix debug log lines so the same order and naming are used
2019-02-05 00:10:56 +01:00
Marcus Efraimsson
57457e2aa4
Merge pull request #15170 from bergquist/delete_session_on_logout
deletes auth token on signout
2019-02-04 21:37:58 +01:00
Torkel Ödegaard
7d5becceb5
Merge pull request #15206 from grafana/storybook/valuemappingseditor
Adding ValueMappingsEditor to Storybook
2019-02-04 21:09:26 +01:00
Marcus Efraimsson
fb3c510178
Merge branch 'master' into delete_session_on_logout 2019-02-04 20:23:05 +01:00
Torkel Ödegaard
3b1da3758d
Merge pull request #15234 from grafana/15222-explore-query-wrapping
Explore: Fix issue with wrapping on long queries
2019-02-04 18:43:42 +01:00
Torkel Ödegaard
60d7d9c691
Merge pull request #15181 from marefr/fix_ping_unauthorized
auth: /api/login/ping fixes
2019-02-04 18:41:35 +01:00
Marcus Efraimsson
cfd8eb5167
now /api/login/ping returns Response 2019-02-04 17:37:07 +01:00
Johannes Schill
9ab5eeb7f3 fix: Explore: Query wrapping on long queries #15222 2019-02-04 17:26:20 +01:00
Torkel Ödegaard
d4ecba5235
Merge pull request #15178 from marefr/loki_blocks_fixes
devenv: various fixes for Loki docker block
2019-02-04 16:26:33 +01:00
Torkel Ödegaard
3ceb436462
Merge pull request #15232 from grafana/15122-ace-editor-issues
Ace editor issues
2019-02-04 16:24:47 +01:00
Johannes Schill
648bec1807 fix: Set ace editor min height to avoid problem with scrollbar overlapping ace content #15122 2019-02-04 15:19:23 +01:00
Johannes Schill
bc21c9520f fix: Data source picker in panel queries options should overlap content below, including ace scrollbar #15122 2019-02-04 15:07:11 +01:00
Torkel Ödegaard
b58a3c939c
Merge pull request #15194 from grafana/explore/url
Explore - UI panels state persistance in url
2019-02-04 14:10:50 +01:00
Torkel Ödegaard
09708dfe20
Merge pull request #15226 from grafana/15189_fix
fix util for splitting host and port
2019-02-04 13:39:00 +01:00
Marcus Efraimsson
d433ca7d40
fix util for splitting host and port
Now you can provide both a default host and a default port
2019-02-04 13:10:32 +01:00
Marcus Efraimsson
eb8dfefb23
changelog: add notes about closing #14231 2019-02-04 11:16:11 +01:00
Marcus Efraimsson
7436723686
Merge pull request #15214 from tcpatterson/cloudwatch-neptune-metrics
Add support for AWS/Neptune in Cloudwatch
2019-02-04 11:12:49 +01:00
Peter Holmberg
c61e905434 fixing logging action 2019-02-04 10:22:45 +01:00
Torkel Ödegaard
c15ab1b2bc
Merge pull request #15219 from grafana/fix-provisioned-modal
Fix save provisioned dashboard modal
2019-02-04 10:18:22 +01:00
Marcus Efraimsson
fdd5ac1895
devenv: switching back using loki master plus various fixes 2019-02-04 09:55:23 +01:00
Torkel Ödegaard
f5084045f2 Fix save provisioned dashboard modal 2019-02-04 09:32:39 +01:00
Connor Patterson
48c8ff8899 Add AWS/Neptune to metricsMap and dimensionsMap 2019-02-03 16:29:35 -05:00
Peter Holmberg
9ac960a803 did not add file, removing centerered 2019-02-02 00:48:13 +01:00
Peter Holmberg
a4d35e2fbc Merge branch 'master' into storybook/valuemappingseditor 2019-02-02 00:31:48 +01:00
Torkel Ödegaard
9e33f8b7c4
Merge pull request #15203 from jsferrei/optimize_legend
Legend toggle should only trigger a re-render, not a refresh
2019-02-01 20:57:29 +01:00
Jon Ferreira
e2c958eb43 Legend toggle should only trigger a re-render, not a refresh 2019-02-01 14:16:27 -05:00
Torkel Ödegaard
cab6a872cf
Merge pull request #15200 from grafana/fix/add-pointer-to-color-picker
Add pointer cursor to colorpicker
2019-02-01 16:05:33 +01:00
Peter Holmberg
bd6fed54de first stuff 2019-02-01 15:45:47 +01:00
Torkel Ödegaard
35693d3b23
Merge pull request #15199 from grafana/fix/label-margin-datasource-list
setting margin on label in datasourcelist
2019-02-01 15:43:28 +01:00
Torkel Ödegaard
16f30664f5 Merge branch 'collapseable-panel-option-groups' 2019-02-01 15:39:47 +01:00
Torkel Ödegaard
59dfe794f5 updated snapshot 2019-02-01 15:39:20 +01:00
Torkel Ödegaard
3a5f03c772
Merge pull request #15191 from bergquist/samesite_for_cookies
introduce samesite setting for login cookie
2019-02-01 15:37:43 +01:00
Torkel Ödegaard
3f1fd6c6f2
Merge pull request #15193 from w4tsn/patch-1
Clearify the Run from master instructions
2019-02-01 15:37:04 +01:00
Torkel Ödegaard
116e70740c
Merge pull request #15012 from grafana/loki-query-editor
WIP: Loki query editor for dashboard panels
2019-02-01 15:33:23 +01:00
Peter Holmberg
7d958080c1 Adding pointer to colorpicker 2019-02-01 15:31:42 +01:00
Dominik Prokop
1a0b21b8d1 Minor post review changes 2019-02-01 15:27:02 +01:00
Torkel Ödegaard
24ccfb9ccc More style tweaks to panel option group add button 2019-02-01 15:23:32 +01:00
Torkel Ödegaard
3be1deea44 Made some style tweaks 2019-02-01 15:19:18 +01:00