IntenseWebs/grafana
3
0
Fork 0
mirror of https://github.com/grafana/grafana.git synced 2025-02-16 02:23:31 -06:00
Code Issues Packages Projects Releases Wiki Activity
15,491 Commits 5,453 Branches 554 Tags 1.9 GiB
13921902b5
Commit Graph

1432 Commits

Author SHA1 Message Date
Marcus Efraimsson
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
Torkel Ödegaard
4f704cec53 fix: ds_proxy test not initiating header 2018-08-14 09:18:23 +02:00
Torkel Ödegaard
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
Marcus Efraimsson
d110343e53
Merge pull request #12838 from grafana/12476-show-teams-on-profile 
show teams on profile
 2018-08-13 15:16:04 +02:00
Marcus Efraimsson
beddfdd86b
add api route for retrieving teams of signed in user 2018-08-08 10:26:05 +02:00
Marcus Efraimsson
eb1b9405b2
return proper payload from api when updating datasource 2018-08-07 17:56:02 +02:00
Torkel Ödegaard
276a5e6eb5 fix: test data api route used old name for test data datasource, fixes #12773 2018-07-31 17:29:02 +02:00
Mitsuhiro Tanda
d9bf894383 return 400 if user input error 2018-07-24 17:06:55 +09:00
David
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
Augustin
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
David Kaltschmidt
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
Torkel Ödegaard
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
Leonard Gram
5e08bf5130 test: fixed usage of wrap in tests. 2018-07-02 17:13:59 +02:00
Torkel Ödegaard
6286c31d4b refactoring: making api wrap public 2018-07-02 14:13:18 +02:00
Torkel Ödegaard
b8724ae0c4
refactoring: enterprise build/hooks refactorings (#12478) 2018-07-02 04:33:39 -07:00
Torkel Ödegaard
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
Carl Bergquist
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
Augustin
ef0bf9f701 ensure that if the dasboardID is negative, it will not bypass the checking of the right (#12398) 2018-06-26 05:12:20 -07:00
bergquist
f83306bb5b removes unused return object 2018-06-26 09:22:31 +02:00
Carl Bergquist
175e95abb0
Merge pull request #12396 from bergquist/routing 
routing: allows routes to be added to existing groups
 2018-06-25 17:17:14 +02:00
bergquist
4a46dd886b routing: raise panic if duplicate routes are added 2018-06-25 16:58:49 +02:00
bergquist
dbfafa1cb5 routing: allows routes to be added to existing groups 
this enables services to add routing to ex /api
without causing conflicts.
 2018-06-25 16:50:27 +02:00
Marcus Efraimsson
f106de0efd
enhance error message if phantomjs executable is not found 
if arm build, explain that phantomjs is not included by default in arm
builds. If not explain that phantom js isn't installed correctly
 2018-06-25 16:06:52 +02:00
Torkel Ödegaard
132df4553c fix: annnotation api & sql issue 2018-06-25 16:03:38 +02:00
Augustin
eb4d860fcb Light improve of massive delete annotation api (#12390) 
* fix delete annotations

* fix self assignment

* add right unit test using admin role
 2018-06-25 04:58:49 -07:00
Austin Winstanley
defb0396b7 Return a 404 when deleting a datasource through the API if it doesn't exist and add a test for it to confirm #12313 2018-06-22 21:15:36 -05:00
Carl Bergquist
828fb39ee2
Merge pull request #11643 from mrsiano/generic_oauth 
Pass configured/auth headers to a Datasource.
 2018-06-21 14:21:59 +02:00
mrsiano
cc1e3a0e3c Pass configured/auth headers to a Datasource. 
In some setups (ex openshift), the Datasource will require Grafana
to pass oauth token as header when sending queries.
Also, this PR allow to send any header which is something
Grafana currently does not support.
 2018-06-21 14:58:05 +03:00
bergquist
503c8cd8ef tech: adds comments about route register code 2018-06-20 16:55:42 +02:00
David Kaltschmidt
d5196ab322 remove internal influx ifql datasource 2018-06-14 20:42:33 +01:00
Marcus Efraimsson
284045748c
Merge pull request #12243 from grafana/12236-ds-proxy-tokens 
dsproxy: allow multiple access tokens per datasource
 2018-06-14 14:03:08 +02:00
Daniel Lee
10d30f0b73 dsproxy: move http client variable back 
After refactoring to be able to mock the client in
a test, the client wasn't a global variable anymore.
This change moves the client back to being a package-
level variable.
 2018-06-14 13:39:46 +02:00
Marcus Efraimsson
2288e01752
Merge pull request #12169 from alexanderzobnin/feat-10796 
Import dashboard to folder
 2018-06-13 13:10:52 +02:00
Alexander Zobnin
25504e84ed
dashboard import to folder: minor fixes 2018-06-13 10:44:37 +03:00
Daniel Lee
719ebdc24d dsproxy: allow multiple access tokens per datasource 
Changes the cache key for tokens to cache on datasource id +
route path + http method instead of just datasource id.
 2018-06-12 17:39:38 +02:00
Alexander Zobnin
9460063ab5
show import menu in sidenav, dashboard search and manage dashboards page 
if user has editor permissions for at least one folder
 2018-06-06 13:55:00 +03:00
David Kaltschmidt
661503f828 Respect explore settings in config ini 
Previous explore restrictions only took permissions into consideration.

* add `exploreEnabled` to global settings
* only bind `x` if enabled
* only show explore in panel menu if enabled
 2018-06-06 10:50:47 +02:00
Alexander Zobnin
4063ae37a4
dashboard: import to folder 2018-06-05 19:23:09 +03:00
David
45a156577c
Merge pull request #12143 from grafana/davkal/ifql-datasource 
InfluxDB IFQL datasource (beta)
 2018-06-05 14:23:21 +02:00
Marcus Efraimsson
962f996799
always show server admin link in sidenav if grafana admin 2018-06-04 19:28:01 +02:00
pari-
9680a3d44d Gravatar fallback does not respect 'AppSubUrl'-setting (#12149) 
Closes #12148
 2018-06-04 16:03:59 +02:00
David
b5c53aae97
Merge pull request #12108 from grafana/davkal/12001-explore-permissions 
Restrict Explore UI to Editor and Admin roles
 2018-06-04 16:01:39 +02:00
David Kaltschmidt
08ee1da6b1 InfluxDB IFQL datasource 2018-06-04 12:24:47 +02:00
Alexander Zobnin
13c6f37ea5
alerting: show alerts for user with Viewer role 
changelog: add notes about closing #11167

remove changelog note

reformat alert_test.go
 2018-06-04 12:34:30 +03:00
Patrick O'Carroll
0c269d64d0 Alert panel filters (#11712) 
alert list panel: filter alerts by name, dashboard, folder, tags
 2018-06-01 14:36:40 +02:00
David Kaltschmidt
0c45ee63a9 Guard /explore by editor role on the backend 2018-05-31 11:26:24 +02:00
David Kaltschmidt
f69654fcd5 Restrict Explore UI to Editor and Admin roles 
Access is restricted via not showing in the following places:

* hide from sidemenu
* hide from panel header menu
* disable keybinding `x`

Also adds a `roles` property to reactContainer routes that will be
checked if `roles` is set, and on failure redirects to `/`.
 2018-05-30 13:13:29 +02:00
Carl Bergquist
813a9a975f
Merge pull request #12090 from grafana/11858_create_dashboard_link 
Show create dashboard link if at least editor in one folder
 2018-05-29 17:18:41 +02:00
Marcus Efraimsson
1bc94c7d5a
Merge pull request #12088 from thurt/12087-better-error-when-smtp-not-configured 
inviting users: show friendlier error message when smtp is not configured
 2018-05-29 10:46:46 +02:00
bergquist
d7b5fb4604 go fmt fixes 2018-05-28 20:48:01 +02:00