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
Daniel Lee
9b90b835b2
Merge remote-tracking branch 'origin/master' into stackdriver-plugin
2018-09-28 16:20:40 +02:00
Daniel Lee
d11f67eb25
stackdriver: change info logging to debug logging
2018-09-28 16:16:27 +02:00
