bc68aa99b2
add the trailing slash
2018-09-18 11:16:09 -07:00
71dfeff782
add a test
2018-09-17 12:28:36 -07:00
f22f1d46c8
Merge pull request #10163 from grafana/9587_annotation_tags_wih_temp_var
...
annotations: allows template variables to be used in tag filter
2018-09-17 10:34:38 +02:00
9a6446c2b5
new column for team_member table
2018-09-14 17:27:36 +02:00
982e095f85
dsproxy: add mutex protection to the token caches
2018-09-14 11:13:09 +02:00
56e8e50497
Stackdriver: Use ds_auth_provider in stackdriver. This will make sure the token is renewed when it has exporired
2018-09-14 09:38:16 +02:00
db170845b0
Stackdriver: Restructured ds proxy tests
2018-09-14 09:38:16 +02:00
05f6710454
stackdriver: fix test
2018-09-14 09:38:16 +02:00
1725940ab9
Stackdriver: Add new file
2018-09-14 09:38:16 +02:00
6a610558c4
Stackdriver: Start breaking out apply route to its own file
2018-09-14 09:38:16 +02:00
23339e4322
Stackdriver: Use new access token API
2018-09-14 09:35:28 +02:00
71af62e741
Stackdriver: Temporary exporting token lookup
2018-09-14 09:35:28 +02:00
92d631986f
Stackdriver: Removed debug logging
2018-09-14 09:35:27 +02:00
e7648c4070
dsproxy: implements support for plugin routes with jwt file
...
Google Cloud service accounts use a JWT token to get an
oauth access token. This adds support for that.
2018-09-14 09:35:27 +02:00
a4ef4792bc
Stackdriver: Add scope for google resource manager
2018-09-14 09:35:26 +02:00
350bcf4f56
Fixed broken if statement
2018-09-14 09:35:26 +02:00
7197a4c17f
Adds jwt token signing google auth
2018-09-14 09:35:26 +02:00
ef3beb1f0e
Adds poc code for retrieving google auth accesstoken
2018-09-14 09:33:50 +02:00
0e9a6dcedc
Use datasource cache for backend tsdb/query endpoint ( #13266 )
...
fix: use datasource cache for backend datasources
2018-09-14 09:30:32 +02:00
bff350166e
disabling internal metrics disables /metric endpoint
...
but we will still keep sending metrics to graphite
closes #10638
2018-09-13 16:09:52 +02:00
aed8208d78
renames PartialMatch to MatchAny
2018-09-13 15:15:42 +02:00
835a75335c
Merge branch 'master' into 9587_annotation_tags_wih_temp_var
...
* master:
fix theme parameter not working problem while prefer theme set to light (#13232 )
fix: added type export to fix failing test
fix: fixed typescript test error
another circleci fix
Another circleci fix
changed gometalinter to use github master
commented out metalinter as gopkg is having issues
Fix prometheus label filtering for comparison queries (#13213 )
Upgrade react and enzyme (#13224 )
Teams page replace mobx (#13219 )
upgrade of typescript and tslint and jest (#13223 )
fix nil pointer dereference (#13221 )
2018-09-12 09:23:54 +02:00
1786198558
fix theme parameter not working problem while prefer theme set to light ( #13232 )
2018-09-12 06:52:38 +02:00
1638c6bea1
enable partial tag matches for annotations
2018-09-11 15:50:04 +02:00
3c0b1ef581
Merge pull request #13170 from bergquist/alerting_default_setting
...
make default values for alerting configurable
2018-09-06 13:26:42 +02:00
3ce89cad71
make default values for alerting configurable
2018-09-06 11:26:14 +02:00
5d87aa2fa4
Merge pull request #13031 from bergquist/golang_1.11
...
upgrade to golang 1.11
2018-09-05 15:31:43 +02:00
12c9860882
string formating fixes
2018-08-28 22:33:38 +02:00
34e448c6d4
Merge remote-tracking branch 'origin/master' into alerting_reminder
2018-08-22 18:08:50 +02:00
92ed1f04af
sql: added code migration type
2018-08-21 13:53:04 +02:00
86bc462bc1
remove unnecessary conversion (metalinter)
2018-08-20 13:35:36 +02:00
6d2136b853
Merge remote-tracking branch 'origin/master' into alerting_reminder
2018-08-20 13:29:30 +02:00
c75e071213
dsproxy: interpolate route url
...
Allows for dynamic urls for plugin routes. There are a few plugins
where the route url should be configurable and this change allows
using jsonData fields in the url field for a route in the
plugin.json file for a plugin.
2018-08-18 16:02:49 +02:00
13921902b5
Set User-Agent header in all proxied datasource requests
...
Header value will be Grafana/%version%, i.e. Grafana/5.3.0
2018-08-15 09:46:59 +02:00
4f704cec53
fix: ds_proxy test not initiating header
2018-08-14 09:18:23 +02:00
2459b177f9
change: Set User-Agent to Grafana/%Version% Proxied-DS-Request %DS-Type% in all proxied ds requests
2018-08-13 18:09:01 +02:00
d110343e53
Merge pull request #12838 from grafana/12476-show-teams-on-profile
...
show teams on profile
2018-08-13 15:16:04 +02:00
beddfdd86b
add api route for retrieving teams of signed in user
2018-08-08 10:26:05 +02:00
eb1b9405b2
return proper payload from api when updating datasource
2018-08-07 17:56:02 +02:00
276a5e6eb5
fix: test data api route used old name for test data datasource, fixes #12773
2018-07-31 17:29:02 +02:00
d9bf894383
return 400 if user input error
2018-07-24 17:06:55 +09:00
21e5d61de6
Merge pull request #12631 from grafana/davkal/explore-url-encoding
...
Use url params for explore state
2018-07-17 16:49:13 +02:00
05e060dee0
HTTP API documentation +fix when updating a playlist ( #12612 )
...
* get id from path param when updating a playlist
* add playlist http api documentation
* remove required condition for the id in update cmd
2018-07-17 07:45:38 -07:00
c6e9ffb168
Use url params for explore state
...
- putting state in the path components led to 400 on reload
- use `/explore?state=JSON` instead
2018-07-17 12:56:05 +02:00
c03764ff8a
Refactor team pages to react & design change ( #12574 )
...
* Rewriting team pages in react
* teams to react progress
* teams: getting team by id returns same DTO as search, needed for AvatarUrl
* teams: progress on new team pages
* fix: team test
* listing team members and removing team members now works
* teams: team member page now works
* ux: fixed adding team member issue
* refactoring TeamPicker to conform to react coding styles better
* teams: very close to being done with team page rewrite
* minor style tweak
* ux: polish to team pages
* feature: team pages in react & everything working
* fix: removed flickering when changing tabs by always rendering PageHeader
2018-07-11 11:23:07 -07:00
5e08bf5130
test: fixed usage of wrap in tests.
2018-07-02 17:13:59 +02:00
6286c31d4b
refactoring: making api wrap public
2018-07-02 14:13:18 +02:00
b8724ae0c4
refactoring: enterprise build/hooks refactorings ( #12478 )
2018-07-02 04:33:39 -07:00
10e86eda69
fix : #12461 introduced issues with route registration ordering, adding plugin static routes before plugins package had been initiated ( #12474 )
2018-07-01 23:35:50 -07:00
861af4cb97
Improve extensions build. ( #12461 )
...
* enable ee build on pr/master
* step1: of including group sync
* disable commit pinning for now
* fixes broken build
* enable team to ldap group sync
* avoid returning error for missing external handler
* services: allow routes to be added before http server start
* services: allows services to add their own migrations
* moves db migrations to ee code base
* build using master branch in ee
* disable enterprise build in .bra.toml
[skip ci]
* removes team sync extensions
* removes commented line
2018-07-01 07:01:43 -07:00
Ryan McKinley
Carl Bergquist
Marcus Efraimsson
Daniel Lee
Erik Sundell
Torkel Ödegaard
bergquist
qhyou11
Leonard Gram
Mitsuhiro Tanda
David
Augustin