1604 Commits

Author SHA1 Message Date
d53e64a32c move auth token middleware/hooks to middleware package
fix/adds auth token middleware tests
2019-02-05 00:21:05 +01:00
fb3c510178 Merge branch 'master' into delete_session_on_logout 2019-02-04 20:23:05 +01:00
cfd8eb5167 now /api/login/ping returns Response 2019-02-04 17:37:07 +01:00
dd5a8275f1 must return json response from /api/login/ping
Even though http error 401 was returned, the result was still a http 200
2019-02-01 01:21:23 +01:00
88ca54eba9 renames signout function 2019-01-31 16:26:36 +01:00
43ac79685a delete auth token on signout 2019-01-31 16:13:35 +01:00
416562bd90 Merge pull request #15102 from mjtrangoni/fix-golint-issues
Fix golint issues
2019-01-29 21:12:34 +01:00
c6f80ecec2 Merge pull request #14229 from pbakulev/configurable-alert-notification
Configurable alert notification
2019-01-28 22:47:12 +01:00
8261613b51 pkg/util/{ip.go,url.go}: Fix some golint issues
See,
$ gometalinter --vendor --deadline 10m --disable-all --enable=golint  ./...
ip.go:8:6⚠️ func SplitIpPort should be SplitIPPort (golint)
url.go:14:6⚠️ func NewUrlQueryReader should be NewURLQueryReader (golint)
url.go:9:6⚠️ type UrlQueryReader should be URLQueryReader (golint)
url.go:37:6⚠️ func JoinUrlFragments should be JoinURLFragments (golint)
2019-01-28 22:29:20 +01:00
f701c610fb Merge pull request #15054 from RangerRick/master
add global datasource proxy timeout setting
2019-01-28 18:21:27 +01:00
2dc2471b5c Revert "Updated home dashboard, removed home dashboard header"
This reverts commit 0151846e1e0c624f2490dcf0bfbead5d0a8e9218.
2019-01-28 15:01:42 +01:00
6a8643b3d1 Merge branch 'master' into configurable-alert-notification
* master: (250 commits)
  Firing off an action instead of listening to location changes
  Changes after PR Comments
  Made ExplorerToolbar connected and refactored away responsabilities from Explore
  Removed some split complexity
  Fixed some more styling
  Fixed close split look and feel
  Fixed position of Closesplit
  Fixed small issue with TimePicker dropdown position
  Simplified some styles and dom elements
  Fixed some more with the sidemenu open and smaller screens
  Fixed so heading looks good with closed sidemenu
  Restructure of component and styling
  Refactored out ExploreToolbar from Explore
  Fixed reinitialise of Explore
  changelog: add notes about closing #13929
  changelog: add notes about closing #14558
  changelog: add notes about closing #14484
  changelog: add notes about closing #13765
  changelog: add notes about closing #11503
  changelog: add notes about closing #4075
  ...
2019-01-28 14:16:43 +01:00
b5572b23b6 Merge branch 'master' into poc_token_auth
* master: (32 commits)
  Fixed react key warning for loki start page
  Disable query should trigger refresh
  added docs entry for check_for_updates config flag, fixes ##14940
  Explore: Fix scanning for logs
  Moved ad hoc filters and upload directive
  Moved dashboard srv and snapshot ctrl
  Moved share modal
  Moved dashboard save modals to components folder
  Moved unsaved changes service and modal
  Removed unused alertingSrv
  Moved view state srv to services
  Moved timepicker to components
  Moved submenu into components dir
  Moved dashboard settings to components
  Moved dashboard permissions into components dir
  Moved history component, added start draft of frontend code style guide
  fix: Use custom whitelist for XSS sanitizer to allow class and style attributes
  Began work on improving structure and organization of components under features/dashboard, #14062
  Fix a typo in changelog
  Update ROADMAP.md
  ...
2019-01-25 08:28:24 +01:00
9108fd1b9d add global datasource proxy timeout setting
closes grafana#5699
2019-01-24 14:06:48 -05:00
d6edaa1328 moves cookie https setting to [security] 2019-01-24 19:04:58 +01:00
9153b6ed96 improves readability of loginping handler 2019-01-24 15:17:09 +01:00
9ae306e417 use defer to make sure we always release session data 2019-01-24 13:48:36 +01:00
4626f083bb store oauth login error messages in an encrypted cookie 2019-01-23 17:01:09 +01:00
df85cc9bb1 redirect logged in users from /login to home 2019-01-23 15:28:33 +01:00
5998646da5 restrict session usage to auth_proxy 2019-01-23 14:56:48 +01:00
766122856b Merge pull request #14995 from bergquist/token_oauth
Stores hashed state code in cookie for OAuth logins.
2019-01-23 10:39:12 +01:00
0151846e1e Updated home dashboard, removed home dashboard header 2019-01-22 17:23:24 +01:00
c3ff3d644c fixes nil ref in tests 2019-01-22 16:16:32 +01:00
31b5db06f1 Merge branch 'master' into poc_token_auth
* master: (156 commits)
  Fixed issues with the sanitizie input in text panels, added docs, renamed config option
  build: removes arm32v6 docker image.
  Updated version in package.json to 6.0.0-pre1
  Update CHANGELOG.md
  build: armv6 docker image.
  build: skips building rpm for armv6.
  build: builds for armv6.
  Explore: mini styling fix for angular query editors
  Removed unused props & state in PromQueryField
  chore: Remove logging and use the updated config param
  chore: Reverse sanitize variable so it defaults to false
  feat: wip: Sanitize user input on text panel
  fix: Text panel should re-render when panel mode is changed #14922
  Minor rename of LogsProps and LogsState
  Splitted up LogLabels into LogLabelStats and LogLabel
  Refactored out LogRow to a separate file
  Removed strange edit
  Added link to side menu header and fixed styling
  Moved ValueMapping logic and tests to separate files
  Fixed data source selection in explore
  ...
2019-01-22 15:39:54 +01:00
12f8338977 stores hashed state code in cookie 2019-01-22 15:22:24 +01:00
59d0c19ba8 passing middleware tests 2019-01-22 13:51:55 +01:00
4096449aec extract auth token interface and remove auth token from context 2019-01-22 12:00:33 +01:00
f0e61af8e0 Fixed issues with the sanitizie input in text panels, added docs, renamed config option 2019-01-22 11:56:35 +01:00
1ed35f3dc1 chore: Reverse sanitize variable so it defaults to false 2019-01-22 09:36:07 +01:00
15d560a1c0 feat: wip: Sanitize user input on text panel 2019-01-22 09:36:07 +01:00
9d6ac2c3d4 fix: Viewers can edit means that viewers have acces to Explore #14281 2019-01-21 08:47:41 +01:00
81879f0162 fix broken code 2019-01-17 20:29:26 +01:00
8b3fe41b0a log fix 2019-01-17 17:32:33 +01:00
aba6148c43 login users based on token cookie 2019-01-16 16:44:40 +01:00
6a8e39ba17 Added uid to AlertNotification json 2019-01-16 16:52:00 +02:00
8764fb5aa6 inject login/logout hooks 2019-01-15 15:16:20 +01:00
8def73ba13 Fix Error 500 on unexisting /api/alert-notification/<id> 2019-01-13 21:30:20 +02:00
60ea99078e Panel help view fixes 2018-12-19 11:03:54 +01:00
854487acab Merge pull request #14441 from cinaglia/delete-external-snapshot
Add support for deleting external snapshots from Snapshots List
2018-12-18 22:43:12 +01:00
48fe92a945 snapshots: Close response body after error check 2018-12-18 08:32:49 -05:00
1ee1247912 Gauge option form markup fixes 2018-12-17 17:54:40 +01:00
411d67cae7 snapshots: Add support for deleting external snapshots 2018-12-10 18:47:23 -05:00
9d6da10e82 snapshots: Move external snapshot creation to backend 2018-12-10 16:36:32 -05:00
80d62013b2 Remove Explore > "New tab" from sidebar
- we don't support tabs yet, might as well remove the entry
2018-12-07 11:27:46 +01:00
02365514f9 redact value for plugin proxy routes 2018-12-04 22:35:00 -06:00
d1b8f13c66 feat: #11067 prevent removing last grafana admin permissions 2018-12-03 20:05:52 -05:00
95218c13ce Merge pull request #14262 from kornholi/fix/dataproxy-auth
dataproxy: Override incoming Authorization header
2018-12-03 06:49:31 -08:00
474197269e Prevent password reset when login form is disabled or either LDAP or Auth Proxy is enabled 2018-12-03 15:32:26 +02:00
0cafd9a663 dataproxy: Override incoming Authorization header 2018-11-30 12:12:55 -07:00
36aec52c08 return actual error if failing to update alert data 2018-11-22 11:19:08 +01:00