public/grafana
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
15,001 Commits 655 Branches 650 Tags
ec3a4e105f0fc0d3e4a8da3d35c857240a9d02e5
Commit Graph
1415 Commits
Author SHA1 Message Date
AugustinandTorkel Ödegaard 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 BergquistandGitHub 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
AugustinandTorkel Ödegaard 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 BergquistandGitHub 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 EfraimssonandGitHub 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 EfraimssonandGitHub 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
DavidandGitHub 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-andTorkel Ödegaard 9680a3d44d Gravatar fallback does not respect 'AppSubUrl'-setting (#12149) 
Closes #12148
 2018-06-04 16:03:59 +02:00
DavidandGitHub 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'CarrollandMarcus Efraimsson 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 BergquistandGitHub 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 EfraimssonandGitHub 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
iyeonokandbergquist bafe25fbd9 configure proxy environments for Transport property 
related issue: https://github.com/grafana/grafana/issues/9703
 2018-05-28 20:48:01 +02:00
Marcus Efraimsson 7548d6f6d1 Show create dashboard link if at least editor in one folder 2018-05-28 20:37:39 +02:00
thurt b487aa3e6a return better error message when err is ErrSmtpNotEnabled 
fixes #12087
 2018-05-28 17:49:31 +00:00
Carl BergquistandGitHub 6c259eb04d Merge pull request #12077 from roidelapluie/logout 
Fix #9847 Add a generic signout_redirect_url to enable oauth logout
 2018-05-28 08:06:00 +02:00
Julien Pivotto a5e6cb9a02 Fix #9847 Add a generic signout_redirect_url to enable oauth logout 
Signed-off-by: Julien Pivotto <roidelapluie@inuits.eu>
 2018-05-27 14:52:50 +02:00
Torkel ÖdegaardandGitHub 80d694d205 Backend image rendering as plugin (#11966) 
* rendering: headless chrome progress

* renderer: minor change

* grpc: version hell

* updated grpc libs

* wip: minor progess

* rendering: new image rendering plugin is starting to work

* feat: now phantomjs works as well and updated alerting to use new rendering service

* refactor: renamed renderer package and service to rendering to make renderer name less confusing (rendering is internal service that handles the renderer plugin now)

* rendering: now render key is passed and render auth is working in plugin mode

* removed unneeded lines from gitignore

* rendering: now plugin mode supports waiting for all panels to complete rendering

* fix: LastSeenAt fix for render calls, was not set which causes a lot of updates to Last Seen at during rendering, this should fix sqlite db locked issues in seen in previous releases

* change: changed render tz url parameter to use proper timezone name as chrome does not handle UTC offset TZ values

* fix: another update to tz param generation

* renderer: added http mode to renderer service, new ini setting [rendering] server_url
 2018-05-24 15:26:27 +02:00
Dan CechandCarl Bergquist 417db13efb Fix dashboard snapshot deletion (#12025) 
* fix issue deleting dashboard snapshots by deleteKey, add dedicated endopoint for authenticated requests, update frontend, tests & docs.
 2018-05-24 08:55:16 +02:00
Thibaut PatelandTorkel Ödegaard bdb736a9ee http_server: All files in public/build have now a huge max-age (#11536) 2018-05-08 13:54:00 +02:00
Torkel Ödegaard 23655315b8 fix: fixed race condition between http.Server ListenAndServe & Shutdown, now service crash during startup correctly closes http server every time 2018-05-02 19:56:15 +02:00
Torkel Ödegaard d04ad835e2 refactoring: lots of refactoring around server shutdown flows, making sure process is terminated when background service has crashed 2018-05-02 19:56:15 +02:00
Torkel Ödegaard 053c2039bb refactor: provisioning service refactoring 2018-05-02 19:56:15 +02:00
Marcus EfraimssonandGitHub de0d409a23 Revert "Opportunities to unindent code (unindent)" 2018-05-02 14:06:46 +02:00
Marcus EfraimssonandGitHub f17100e98e Merge pull request #11786 from marefr/11625_save_as 
dashboard: show save as button if user has edit permission

This will show the "Save As..." button in dashboard settings page if the user 
has edit permissions (org role admin/editor or viewers_can_edit enabled) 
and has at least edit permission in any folder.
 2018-05-02 11:15:22 +02:00
Carl BergquistandGitHub 6ed69e3d93 Merge pull request #11775 from knweiss/unindent 
Opportunities to unindent code (unindent)
 2018-05-01 16:03:06 +02:00
Torkel Ödegaard 13e015fe3f fix: improved handling of http server shutdown 2018-05-01 14:14:11 +02:00
Torkel ÖdegaardandGitHub fa7d7ed5df Initial Baby Step to refactoring settings from global vars to instance (#11777) 
* wip: start on refactoring settings

* settings: progress on settings refactor

* refactor: progress on settings refactoring

* fix: fixed failing test

* settings: moved smtp settings from global to instance
 2018-04-30 16:21:04 +02:00
Marcus Efraimsson 770acee56a new property for current user indicating if edit permissions in folders 2018-04-30 15:34:31 +02:00