bergquist
c22495b6f8
Merge branch 'master' into external-auth
...
* master:
changelog: adds note about closing #11613 and #11602
fix: sign in link should have target self to trigger full page reload, fixes #11626
codespell: exclude by words instead of files
Use sort.Strings() (gosimple)
Remove unused return value assignment (gosimple)
Remove unnecessary fmt.Sprintf() calls (gosimple)
Merge variable declaration with assignment (gosimple)
Use fmt.Errorf() (gosimple)
Simplify make() (gosimple)
Use raw strings to avoid double escapes (gosimple)
Simplify if expression (gosimple)
Simplify comparison to bool constant (gosimple)
Simplify error returns (gosimple)
Remove redundant break statements (gosimple)
2018-04-18 09:34:45 +02:00
Carl Bergquist
8367199a2d
Merge pull request #11613 from knweiss/gosimple
...
Code simplification (gosimple)
2018-04-17 22:40:40 +02:00
Dan Cech
d837be91ec
switch to passing ReqContext as a property
2018-04-17 14:06:25 -04:00
Dan Cech
a1b1d2fe80
switch to Result
2018-04-17 14:06:25 -04:00
Dan Cech
1c5afa731f
shared library for managing external user accounts
2018-04-17 14:06:25 -04:00
Marcus Efraimsson
d7688241c6
Merge branch 'master' into readonly_dashboards
2018-04-17 16:27:51 +02:00
Daniel Lee
b3acbb9995
Merge pull request #11526 from grafana/11173_folder_admin
...
A folder admin should be able to add permissions for folder/its dashboards
2018-04-17 13:42:38 +02:00
Marcus Efraimsson
8a5cb088d3
Merge branch 'master' into readonly_dashboards
2018-04-17 10:50:04 +02:00
Marcus Efraimsson
bc8353ae14
Merge branch 'master' into dashboard-acl-ux2
2018-04-16 21:19:01 +02:00
Karsten Weiss
4d87cb03c5
Simplify make() (gosimple)
...
This fixes:
pkg/api/http_server.go:142:89: should use make(map[string]func(*http.Server, *tls.Conn, http.Handler)) instead (S1019)
pkg/services/alerting/scheduler.go:18:30: should use make(map[int64]*Job) instead (S1019)
pkg/services/alerting/scheduler.go:26:31: should use make(map[int64]*Job) instead (S1019)
2018-04-16 21:04:57 +02:00
Karsten Weiss
be2d635078
Simplify error returns (gosimple)
...
This fixes:
pkg/api/avatar/avatar.go:261:2: 'if err != nil { return err }; return nil' can be simplified to 'return err' (S1013)
pkg/log/file.go:102:2: 'if err != nil { return err }; return nil' can be simplified to 'return err' (S1013)
pkg/metrics/graphitebridge/graphite.go:298:2: 'if err != nil { return err }; return nil' can be simplified to 'return err' (S1013)
pkg/services/provisioning/provisioning.go:23:2: 'if err != nil { return err }; return nil' can be simplified to 'return err' (S1013)
pkg/services/sqlstore/alert_notification.go:27:3: 'if err != nil { return err }; return nil' can be simplified to 'return err' (S1013)
pkg/services/sqlstore/alert_notification.go:27:3: 'if err != nil { return err }; return nil' can be simplified to 'return err' (S1013)
pkg/services/sqlstore/annotation.go:105:3: 'if err != nil { return err }; return nil' can be simplified to 'return err' (S1013)
pkg/services/sqlstore/annotation.go:105:3: 'if err != nil { return err }; return nil' can be simplified to 'return err' (S1013)
pkg/services/sqlstore/dashboard.go:351:2: 'if err != nil { return err }; return nil' can be simplified to 'return err' (S1013)
pkg/services/sqlstore/dashboard.go:435:2: 'if err != nil { return err }; return nil' can be simplified to 'return err' (S1013)
pkg/services/sqlstore/dashboard_acl.go:38:3: 'if err != nil { return err }; return nil' can be simplified to 'return err' (S1013)
pkg/services/sqlstore/dashboard_acl.go:38:3: 'if err != nil { return err }; return nil' can be simplified to 'return err' (S1013)
pkg/services/sqlstore/stats.go:22:2: 'if err != nil { return err }; return err' can be simplified to 'return err' (S1013)
pkg/services/sqlstore/team.go:213:2: 'if err != nil { return err }; return nil' can be simplified to 'return err' (S1013)
pkg/services/sqlstore/user.go:256:3: 'if err != nil { return err }; return nil' can be simplified to 'return err' (S1013)
pkg/services/sqlstore/user.go:256:3: 'if err != nil { return err }; return nil' can be simplified to 'return err' (S1013)
pkg/services/sqlstore/user.go:274:3: 'if err != nil { return err }; return nil' can be simplified to 'return err' (S1013)
pkg/services/sqlstore/user.go:274:3: 'if err != nil { return err }; return nil' can be simplified to 'return err' (S1013)
pkg/services/sqlstore/user.go:482:3: 'if err != nil { return err }; return nil' can be simplified to 'return err' (S1013)
pkg/services/sqlstore/user.go:482:3: 'if err != nil { return err }; return nil' can be simplified to 'return err' (S1013)
2018-04-16 21:04:57 +02:00
Daniel Lee
bb7a6a0153
Merge pull request #11595 from kichristensen/DeleteEmptyPlaylist
...
Support deleting empty playlist
2018-04-16 17:06:59 +02:00
David Kaltschmidt
5a29c17282
moved version in help menu to top
2018-04-16 16:25:28 +02:00
David Kaltschmidt
712212d6aa
Show Grafana version and build in Help menu
...
* establishes Help as the single place to look for the Grafana version
* version is passed as menu sub-title to side menu
* added rendering of sub-title, plus styles
* sub-title was used by profile menu (its value is the login string),
but was not shown; now showing this value on condition that login name
is different from user name
2018-04-16 13:37:05 +02:00
Daniel Lee
67daa9b058
Merge pull request #11588 from mjtrangoni/fix-codespell-issues
...
Fix codespell issues
2018-04-16 09:12:49 +02:00
Kim Christensen
7534f0bff6
Support deleting empty playlist
2018-04-15 21:37:34 +02:00
Mario Trangoni
91fb2e07ce
pkg: fix codespell issues
2018-04-13 20:31:29 +02:00
Daniel Lee
9413ce5ef6
Merge pull request #8096 from ryantxu/influx-db-query2
...
let the influxdb API set a database
2018-04-13 18:22:12 +02:00
bergquist
f424d13b53
provisioning: dont override permissions
2018-04-10 12:35:06 +02:00
bergquist
949484b949
provisioning: simplify db query
...
the GetProvisionedDashboardQuery wasent used for anything
else than check if a dashboard is provisioned or not. So
we simplified this query to make it more maintainable.
2018-04-10 12:30:37 +02:00
bergquist
0f9b592428
provisioning: fixes broken tests
2018-04-10 10:48:10 +02:00
bergquist
bcbe7a1c55
provisioning: adds error handling
2018-04-10 09:31:35 +02:00
Marcus Efraimsson
84d034c688
api: allow authenticated users to search current org users and teams
...
Any authenticated user of an organization should be able to
- search its organization's users
- search its organization's users
- retrieve a single user of its organization (this how it was
implemented earlier)
2018-04-07 10:39:28 +02:00
Marcus Efraimsson
6bbeb723ca
Merge branch 'master' into readonly_dashboards
2018-04-05 20:30:27 +02:00
Marcus Efraimsson
8f94cecf0f
permissions: return user and team avatar in folder permissions api
2018-04-04 15:51:19 +02:00
Marcus Efraimsson
ebad863f95
permission: generate team avatar url with default
2018-04-04 15:50:45 +02:00
Daniel Lee
32264c61c4
Merge branch 'master' into dashboard-acl-ux2
2018-03-29 11:32:24 +02:00
bergquist
9e2e6fc586
add fallback for gravatar in org/admin view
...
closes #11095
2018-03-27 22:52:29 +02:00
bergquist
627df67992
dashboards: reject updates of provisioned dashboards
2018-03-27 15:12:47 +02:00
bergquist
d6faa3d06f
provisioning: improve UX when saving provisioned dashboards
2018-03-26 15:08:46 +02:00
Carl Bergquist
980e078222
Merge pull request #11326 from bergquist/more_traces
...
dataproxy: adds dashboardid and panelid as tags
2018-03-23 17:13:15 +01:00
Julian Kornberger
6f363153d7
Adjust permissions of unix socket
...
fixes #8358
2018-03-23 16:09:04 +01:00
Julian Kornberger
0a415c50d0
Make golint happier
2018-03-22 22:38:44 +01:00
Julian Kornberger
7aab6a8887
Make golint happier
2018-03-22 12:40:21 +01:00
bergquist
f142548969
dataproxy: adds dashboardid and panelid as tags
...
closes #11315
2018-03-20 22:23:28 +01:00
Daniel Lee
1cef373d16
Merge remote-tracking branch 'upstream/master' into update-xorm
2018-03-20 19:21:58 +01:00
Daniel Lee
3ca1e06509
session: fork Macaron mysql session middleware
...
This changes forks the mysql part of the Macaron session middleware.
In the forked mysql file:
- takes in a config setting for SetConnMaxLifetime (this solves wait_timeout
problem if it is set to a shorter interval than wait_timeout)
- removes the panic when an error is returned in the Exist function.
- retries the exist query once
- retries the GC query once
2018-03-16 01:19:28 +01:00
ryan
a04c4ba454
allow any database for influx proxy
2018-03-15 13:01:17 +01:00
ryan
ad88e5398c
remove
2018-03-15 12:57:09 +01:00
Mitja Zivkovic
5669596518
add regex search of username and password in urls, which are replaced by strings.Replace
2018-03-15 10:50:57 +01:00
ryan
4f8ee9f5a7
merge with master
2018-03-14 23:52:24 +01:00
Marcus Efraimsson
5fbfd67b94
dashboards: should be possible to browse dashboard using only uid
...
That is, the slug part of url should be optional.
Closes #11231
2018-03-13 21:06:25 +01:00
Daniel Lee
3f2c086e6f
teams: removes quota on route
...
Got added by mistake a year ago.
2018-03-13 10:56:35 +01:00
Mitsuhiro Tanda
a83ede0193
support POST for query and query_range
2018-03-12 13:25:05 +09:00
Dan Cech
bbd6adabbf
move quota to dedicated service
2018-03-07 17:19:35 -05:00
Dan Cech
c0ecdee375
rename Context to ReqContext
2018-03-07 11:54:50 -05:00
Dan Cech
338655dd37
move Context and session out of middleware
2018-03-06 18:16:49 -05:00
bergquist
5934521137
fixes invalid link to profile pic when gravatar is disabled
...
closes #11097
2018-03-06 11:46:50 +01:00
Marcus Efraimsson
3d4e99d8be
Merge pull request #11040 from grafana/permission-checks
...
Add permission check for dashboard diff api route
2018-02-28 18:23:39 +01:00
Daniel Lee
ecf438f8d0
dashboard: add permission check for diff api route
...
ref #10770
2018-02-27 17:53:30 +01:00
