32264c61c4
Merge branch 'master' into dashboard-acl-ux2
2018-03-29 11:32:24 +02:00
9e2e6fc586
add fallback for gravatar in org/admin view
...
closes #11095
2018-03-27 22:52:29 +02:00
627df67992
dashboards: reject updates of provisioned dashboards
2018-03-27 15:12:47 +02:00
d6faa3d06f
provisioning: improve UX when saving provisioned dashboards
2018-03-26 15:08:46 +02:00
71ef9b6db5
Merge remote-tracking branch 'grafana/master' into annotations-created
...
* grafana/master: (26 commits)
notes about closing #11306
cleanup
changelog: unix socket permissions
Adjust permissions of unix socket
docs: tweaks
changelog: adds note about closing #5855
legend: small refactoring
Make golint happier
mysql: skip tests by default
mssql: update query editor help
mysql: fix precision for the time column in table/annotation query mode
postgres: fix precision for the time column in table/annotation query mode
mssql: fix precision for the time column in table/annotation query mode
mssql: remove UTC conversion in macro functions
mssql: fix timeGroup macro so that it properly creates correct groups
small screen legend right also work like legend under in render + set scrollbar to undefined in destroyScrollbar so it doesnt become disabled when toggeling between right and under
fixed so legend right works like legend under on small screens
Alerting: move getNewState to EvalContext
graphite: adds more traces for alerting
sql datasource: extract common logic for converting time column to epoch time in ms
...
2018-03-24 11:39:35 +01:00
980e078222
Merge pull request #11326 from bergquist/more_traces
...
dataproxy: adds dashboardid and panelid as tags
2018-03-23 17:13:15 +01:00
6f363153d7
Adjust permissions of unix socket
...
fixes #8358
2018-03-23 16:09:04 +01:00
7defb1adf5
remove dashboardId check... i can't figure out how the tests work
2018-03-23 12:54:53 +01:00
e92ea79524
get circle to run tests again
2018-03-23 12:48:03 +01:00
2116152295
add dashboardId to test
2018-03-23 12:35:39 +01:00
a58b4ff2d6
remove api tests
2018-03-23 12:13:38 +01:00
b39fb7fdd5
fix operator
2018-03-23 12:01:21 +01:00
db92a96067
move dashboard error to API (not sql)
2018-03-23 11:36:44 +01:00
0a415c50d0
Make golint happier
2018-03-22 22:38:44 +01:00
20353db966
convert epoch to milliseconds
2018-03-22 16:21:47 +01:00
a2bbd89a9e
adding updated column
2018-03-22 15:52:09 +01:00
df94b380f4
Merge remote-tracking branch 'grafana/master' into annotations-created
...
* grafana/master:
Make golint happier
2018-03-22 14:59:14 +01:00
7aab6a8887
Make golint happier
2018-03-22 12:40:21 +01:00
3898ea02e6
adding created column
2018-03-22 02:22:58 +01:00
f142548969
dataproxy: adds dashboardid and panelid as tags
...
closes #11315
2018-03-20 22:23:28 +01:00
1cef373d16
Merge remote-tracking branch 'upstream/master' into update-xorm
2018-03-20 19:21:58 +01:00
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
a04c4ba454
allow any database for influx proxy
2018-03-15 13:01:17 +01:00
ad88e5398c
remove
2018-03-15 12:57:09 +01:00
5669596518
add regex search of username and password in urls, which are replaced by strings.Replace
2018-03-15 10:50:57 +01:00
4f8ee9f5a7
merge with master
2018-03-14 23:52:24 +01:00
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
3f2c086e6f
teams: removes quota on route
...
Got added by mistake a year ago.
2018-03-13 10:56:35 +01:00
a83ede0193
support POST for query and query_range
2018-03-12 13:25:05 +09:00
bbd6adabbf
move quota to dedicated service
2018-03-07 17:19:35 -05:00
c0ecdee375
rename Context to ReqContext
2018-03-07 11:54:50 -05:00
338655dd37
move Context and session out of middleware
2018-03-06 18:16:49 -05:00
5934521137
fixes invalid link to profile pic when gravatar is disabled
...
closes #11097
2018-03-06 11:46:50 +01:00
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
ecf438f8d0
dashboard: add permission check for diff api route
...
ref #10770
2018-02-27 17:53:30 +01:00
f76b98d252
dashboards: change dashboard/folder permission error messages
2018-02-27 16:04:45 +01:00
03f8eff880
dashboards: handle new guardian error responses and update tests
...
Using a mocked guardian instead and relies on the actual guardian tests for verifying
permission handling correctness
2018-02-27 16:04:45 +01:00
3c14cecd50
folders: handle new guardian error responses and add tests
2018-02-27 16:04:45 +01:00
3b836c9c5f
Merge pull request #10996 from grafana/snapshot_permissions
...
Snapshot fixes and changes to snapshot list
2018-02-23 09:17:59 +01:00
3f3175972e
dashboards: fix batch dashboard/folder delete response
...
Use message returned from backend and use that as alert success response to user
2018-02-21 16:38:09 +01:00
7d9a9fa29c
snapshots: change to snapshot list query
...
Admins can see all snapshots. Other roles can only see their own
snapshots.
Added permission check for deleting snapshots - admins can delete
any snapshot, other roles can delete their own snapshots or
snapshots that they have access to via dashboard permissions.
2018-02-21 13:39:08 +01:00
9889c92083
fix typos in api, acl to permissions
2018-02-21 11:50:32 +01:00
3df8ae2306
folders: rename folder_acl in api to folder_permission
2018-02-21 11:45:19 +01:00
d68099bc4a
dashboards: change api route for dashboard permissions
...
From /api/dashboards/id/:id/acl to /api/dashboards/id/:id/permissions
2018-02-21 11:42:54 +01:00
a167e19b37
folders: folder api tests
2018-02-21 11:24:54 +01:00
417541c77f
folders: folder permissions api tests
2018-02-20 18:11:50 +01:00
892bdecb19
folders: folder permission api routes
2018-02-20 15:25:16 +01:00
717d8d0c45
folders: fix api error mapping
2018-02-20 15:01:20 +01:00
ea7998ca8e
folders: use new folder service in folder api routes
2018-02-20 13:57:32 +01:00
fce1e3f7f1
Merge branch 'master' into 10630_folder_api
2018-02-19 13:32:45 +01:00
Daniel Lee
bergquist
ryan
Carl Bergquist
Julian Kornberger
Mitja Zivkovic
Marcus Efraimsson
Mitsuhiro Tanda
Dan Cech