bergquist
df85cc9bb1
redirect logged in users from /login to home
2019-01-23 15:28:33 +01:00
bergquist
5998646da5
restrict session usage to auth_proxy
2019-01-23 14:56:48 +01:00
Carl Bergquist
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
Torkel Ödegaard
0151846e1e
Updated home dashboard, removed home dashboard header
2019-01-22 17:23:24 +01:00
bergquist
c3ff3d644c
fixes nil ref in tests
2019-01-22 16:16:32 +01:00
bergquist
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
bergquist
12f8338977
stores hashed state code in cookie
2019-01-22 15:22:24 +01:00
Marcus Efraimsson
59d0c19ba8
passing middleware tests
2019-01-22 13:51:55 +01:00
Marcus Efraimsson
4096449aec
extract auth token interface and remove auth token from context
2019-01-22 12:00:33 +01:00
Torkel Ödegaard
f0e61af8e0
Fixed issues with the sanitizie input in text panels, added docs, renamed config option
2019-01-22 11:56:35 +01:00
Johannes Schill
1ed35f3dc1
chore: Reverse sanitize variable so it defaults to false
2019-01-22 09:36:07 +01:00
Johannes Schill
15d560a1c0
feat: wip: Sanitize user input on text panel
2019-01-22 09:36:07 +01:00
Hugo Häggmark
9d6ac2c3d4
fix: Viewers can edit means that viewers have acces to Explore #14281
2019-01-21 08:47:41 +01:00
Marcus Efraimsson
81879f0162
fix broken code
2019-01-17 20:29:26 +01:00
Marcus Efraimsson
8b3fe41b0a
log fix
2019-01-17 17:32:33 +01:00
bergquist
aba6148c43
login users based on token cookie
2019-01-16 16:44:40 +01:00
Pavel Bakulev
6a8e39ba17
Added uid to AlertNotification json
2019-01-16 16:52:00 +02:00
Marcus Efraimsson
8764fb5aa6
inject login/logout hooks
2019-01-15 15:16:20 +01:00
Sofia Papagiannaki
8def73ba13
Fix Error 500 on unexisting /api/alert-notification/<id>
2019-01-13 21:30:20 +02:00
Torkel Ödegaard
60ea99078e
Panel help view fixes
2018-12-19 11:03:54 +01:00
Carl Bergquist
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
Victor Cinaglia
48fe92a945
snapshots: Close response body after error check
2018-12-18 08:32:49 -05:00
Torkel Ödegaard
1ee1247912
Gauge option form markup fixes
2018-12-17 17:54:40 +01:00
Victor Cinaglia
411d67cae7
snapshots: Add support for deleting external snapshots
2018-12-10 18:47:23 -05:00
Victor Cinaglia
9d6da10e82
snapshots: Move external snapshot creation to backend
2018-12-10 16:36:32 -05:00
David Kaltschmidt
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
Brian Gann
02365514f9
redact value for plugin proxy routes
2018-12-04 22:35:00 -06:00
danielbh
d1b8f13c66
feat: #11067 prevent removing last grafana admin permissions
2018-12-03 20:05:52 -05:00
Marcus Efraimsson
95218c13ce
Merge pull request #14262 from kornholi/fix/dataproxy-auth
...
dataproxy: Override incoming Authorization header
2018-12-03 06:49:31 -08:00
SilverFire - Dmitry Naumenko
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
Kornelijus Survila
0cafd9a663
dataproxy: Override incoming Authorization header
2018-11-30 12:12:55 -07:00
Marcus Efraimsson
36aec52c08
return actual error if failing to update alert data
2018-11-22 11:19:08 +01:00
Carl Bergquist
db8bd8298a
Merge pull request #14077 from bobmshannon/bs/metrics_endpoint_auth
...
Add basic authentication support to metrics endpoint
2018-11-20 11:19:55 +01:00
Marcus Efraimsson
9cc6c2128a
Merge pull request #14120 from supercharlesliu/user-teams
...
Add API GET /api/users/:id/teams for GrafanaAdmin
2018-11-20 00:56:35 -08:00
Bob Shannon
16ff8a182b
Re-organize packages and add basic auth test
2018-11-19 13:54:13 -05:00
Carl Bergquist
6049855dc7
Merge pull request #13947 from bergquist/alerting_for
...
Introduce alert debouncing
2018-11-19 10:38:02 +01:00
Carl Bergquist
03ac9c5256
Merge pull request #12029 from Nick-Triller/11893_oauth_auto_login
...
11893 oauth auto login
2018-11-19 10:21:33 +01:00
supercharlesliu
215242128b
Fix param
2018-11-19 17:09:45 +08:00
supercharlesliu
fb5c59c611
Add GET /api/users/:id/teams for orgAdmin
2018-11-19 17:08:10 +08:00
Marcus Efraimsson
f560c3297e
Merge pull request #14034 from grafana/12550_team_preferences
...
Team preferences support
2018-11-15 07:35:10 -08:00
Torkel Ödegaard
480da34279
filter out alpha plugins in api call, fixes #14030
2018-11-15 11:10:47 +01:00
Bob Shannon
dcc48860b8
Fix formatting and remove enabled toggle
2018-11-14 17:37:32 -05:00
Bob Shannon
362b3740ed
Add basic authentication support to metrics endpoint
2018-11-14 16:27:41 -05:00
Marcus Efraimsson
5f9fecd254
feat: team preferences
2018-11-12 20:01:53 +01:00
Julien Pivotto
62417ca69f
Remove Origin and Referer headers while proxying requests
...
Fix #13949
Fix #13328
Signed-off-by: Julien Pivotto <roidelapluie@inuits.eu>
2018-11-08 14:57:47 +01:00
Marcus Efraimsson
9e0da02b6a
refactor dashboard alert extractor
2018-11-05 14:25:19 +01:00
Marcus Efraimsson
5882e5bb46
Merge pull request #13900 from marefr/ds_cache_refactor
...
Datasource proxy cache refactor
2018-11-05 11:02:31 +01:00
bergquist
d25284a364
introduce state unknown for rules that have not been evaluated yet
2018-11-05 10:50:28 +01:00
Torkel Ödegaard
4dad8d946e
Updated login page logo & wordmark and responsive behavior
2018-10-31 13:40:58 -07:00
Marcus Efraimsson
52d825f535
log error on datasource access denied
2018-10-30 09:32:32 +01:00
Marcus Efraimsson
cfb061ddab
refactor datasource caching
2018-10-30 09:31:56 +01:00
Nick Triller
3414be18bc
Implement oauth_auto_login setting
...
Redirect in backend
2018-10-29 18:46:52 +01:00
Erik Sundell
b02a8127ff
stackdriver: remove debug comments
2018-10-22 16:11:17 +02:00
Erik Sundell
afe0b4b8db
stackdriver: fix typo
2018-10-22 16:11:17 +02:00
Erik Sundell
b2c6c743ce
stackdriver: add debug logging
2018-10-22 16:11:17 +02:00
Erik Sundell
cd7b454e25
stackdriver: add default value for authentication type
2018-10-22 16:03:14 +02:00
Erik Sundell
823838a839
stackdriver: wip - remove debug code
2018-10-22 16:03:14 +02:00
Erik Sundell
2b1709b875
stackdriver: only get default token from metadata server when applying route
2018-10-22 16:03:13 +02:00
Erik Sundell
ff5f281508
stackdriver: wip - get metric descriptors in the backend
2018-10-22 16:03:13 +02:00
Erik Sundell
60617d0bf7
stackdriver: wip - add logic for retrieving token from gce metadata server in the auth provider
2018-10-22 16:03:13 +02:00
Erik Sundell
3f9ed2efaa
stackdriver: wip - temp remove jwt token auth
2018-10-22 16:03:12 +02:00
Erik Sundell
b2de0d8c3e
stackdriver: wip - always use gce default account for stackdriver
2018-10-22 16:03:12 +02:00
Erik Sundell
2002162073
stackdriver: wip - add scope and remove debug code
2018-10-22 16:03:12 +02:00
Erik Sundell
df215d9d09
stackdriver: WIP - test retrieving project id from gce metadata
2018-10-22 16:03:12 +02:00
Mitsuhiro Tanda
fbe0ffd10b
skip jwt token auth if privateKey is empty
2018-10-22 16:03:12 +02:00
Mitsuhiro Tanda
43aa6603a3
fetch token from GCE metadata server
2018-10-22 16:03:12 +02:00
Torkel Ödegaard
dddbe62d6c
Merge branch 'master' into react-panels-step1
2018-10-19 09:15:37 +02:00
Marcus Efraimsson
da89c27caf
Merge pull request #13702 from grafana/data-source-instance-to-react
...
Support Data source permissions
2018-10-17 16:54:57 +02:00
Leonard Gram
3245227016
permissions: cleanup.
2018-10-17 15:58:52 +02:00
bergquist
70385119bc
removes d in disableResolvedMessage
2018-10-17 10:41:18 +02:00
Dave Waters
c4dcf5a4ee
fix gofmt, add test, correct noted concerns with default value
2018-10-16 17:33:38 -04:00
Leonard Gram
1329c70965
codestyle
2018-10-16 14:22:50 +02:00
Peter Holmberg
ee0cc9bd77
Merge branch 'master' into data-source-instance-to-react
2018-10-16 12:14:11 +02:00
Dave Waters
6376154b16
add channel option to disable the resolved alert (OK Message) that is sent when condition returns to normal.
2018-10-15 17:16:14 -04:00
Torkel Ödegaard
631af46c48
Merge branch 'master' into react-panels-step1
2018-10-14 10:44:38 +02:00
Torkel Ödegaard
ec4698fb96
alerting: propagate alert validation issues to the user instead of just 'invalid alert data' message
2018-10-12 23:03:54 -07:00
Leonard Gram
97a3a4f33a
removes debug log.
2018-10-12 15:13:55 +02:00
Torkel Ödegaard
8ba865bf57
Merge branch 'master' into react-panels-step1
2018-10-12 13:31:20 +02:00
Torkel Ödegaard
8c9939df72
Adds backend hooks service so extensions can modify index data
2018-10-12 11:26:42 +02:00
Torkel Ödegaard
a69013c833
Merge pull request #13611 from grafana/remove-user-from-org-and-system
...
Remove user form org in single org setup improvement
2018-10-11 21:54:07 +02:00
Torkel Ödegaard
69e0311cbc
Merge branch '13425-team-picker-bug'
2018-10-11 12:52:48 -07:00
Dan Cech
19b69a82af
fmt
2018-10-11 15:26:06 -04:00
Torkel Ödegaard
b671b9704f
changed property name to UserWasDeleted and added an assert for it
2018-10-11 12:20:53 -07:00
Leonard Gram
d360d8cebc
Requests for ds via backend blocked for users without permissions.
2018-10-11 13:52:23 +02:00
Leonard Gram
ec9ed5c830
Removes unused code.
2018-10-11 13:52:23 +02:00
Torkel Ödegaard
abef94b0da
made it possible to have frontend code in symlinked folders that can add routes
2018-10-11 12:36:04 +02:00
Torkel Ödegaard
9585dc7825
added the UserWasRemoved flag to make api aware of what happened to return correct message to UI
2018-10-11 07:58:22 +02:00
Torkel Ödegaard
5b5cb6622d
Remove user form org now completely removes the user from the system if the user is orphaned
2018-10-11 07:48:35 +02:00
Dan Cech
a4f90fd10d
add admin page to show enterprise license status
2018-10-10 13:04:54 -04:00
Leonard Gram
721dd532e4
User without permission to a datasource won't see it.
2018-10-10 15:55:16 +02:00
Leonard Gram
ccfcf02e33
Refactors ds permissions to a filter.
2018-10-10 14:25:57 +02:00
Marcus Efraimsson
c0b7ca3902
fix /api/org/users so that query and limit querystrings works
2018-10-10 14:15:28 +02:00
Torkel Ödegaard
565edc1ed3
added setting top hide plugins in alpha state
2018-10-09 17:47:43 +02:00
Marcus Efraimsson
4d719b0d05
Merge remote-tracking branch 'origin/master' into noop-services-poc
2018-10-08 16:02:44 +02:00
Marcus Efraimsson
2b1e4d001a
Merge pull request #13326 from ryantxu/proxy-slash
...
Keep trailing slash for datasource proxy requests
2018-10-04 14:38:34 +02:00
Marcus Efraimsson
3fa8088192
dataproxy should forward a trailing slash to proxy
2018-10-03 12:55:01 +02:00
Marcus Efraimsson
8bf4d68035
add datasource proxy test to verify trailing slashes are forwarded
2018-10-03 12:28:30 +02:00
Torkel Ödegaard
162a95bff9
wip: going in circles
2018-10-01 19:31:03 +02:00
Mario Trangoni
dde650905d
Fix megacheck issue unused code.
...
I removed some code, and commented out other one.
See,
$ gometalinter --vendor --disable-all --disable=gotype --enable=megacheck --deadline 6m ./... | grep unused
pkg/api/avatar/avatar.go💯 26⚠️ func (*CacheServer).mustInt is unused (U1000) (megacheck)
pkg/api/folder_test.go:136:6⚠️ func callGetFolderByUID is unused (U1000) (megacheck)
pkg/api/folder_test.go:141:6⚠️ func callDeleteFolder is unused (U1000) (megacheck)
pkg/api/live/hub.go:40:15⚠️ func (*hub).removeConnection is unused (U1000) (megacheck)
pkg/components/imguploader/azureblobuploader.go:130:5⚠️ var client is unused (U1000) (megacheck)
pkg/middleware/middleware_test.go:438:28⚠️ func (*scenarioContext).withInvalidApiKey is unused (U1000) (megacheck)
pkg/services/alerting/ticker.go:40:18⚠️ func (*Ticker).updateOffset is unused (U1000) (megacheck)
pkg/services/notifications/notifications_test.go:12:6⚠️ type testTriggeredAlert is unused (U1000) (megacheck)
pkg/services/sqlstore/dashboard_service_integration_test.go:935:6⚠️ type scenarioContext is unused (U1000) (megacheck)
pkg/services/sqlstore/dashboard_service_integration_test.go:939:6⚠️ type scenarioFunc is unused (U1000) (megacheck)
pkg/services/sqlstore/dashboard_service_integration_test.go:941:6⚠️ func dashboardGuardianScenario is unused (U1000) (megacheck)
pkg/services/sqlstore/transactions_test.go:13:6⚠️ type testQuery is unused (U1000) (megacheck)
2018-10-01 18:23:59 +02:00
Torkel Ödegaard
b3c78f1265
wip: data source permissions hooks
2018-10-01 15:38:55 +02:00
