cb223ee563
removes commented code
2018-03-07 16:40:24 +01:00
ff6108051d
removes unused variables
2018-03-07 16:40:24 +01:00
d96fbb486f
alerting: fixes validation error when saving alerts in dash
...
If a panelId in the dashboard json is set to zero then the validation
silently fails. Instead of returning an error, it just ignores alerts and
saves the dashboard.
2018-03-07 16:20:05 +01:00
c39e68de24
Merge pull request #11046 from llamashoes/master
...
Add metrics that triggered alert to description in OpsGenie.
2018-03-07 15:48:30 +01:00
3f6e525755
Merge pull request #10942 from grafana/pausing_alerts_updates_timestamp
...
Pausing/un alerts now updates new_state_date
2018-03-07 15:40:12 +01:00
338655dd37
move Context and session out of middleware
2018-03-06 18:16:49 -05:00
9d005c50a2
only use jwt token if it contains an email address
2018-03-06 14:21:36 -05:00
01582a2f12
Merge pull request #11121 from grafana/telegram-inline-image-notifications
...
alerting: Limits telegram captions to 200 chars.
2018-03-06 14:19:59 +01:00
891462b5d9
alerting: Limits telegram captions to 200 chars.
...
The caption for inline images in Telegram is
limited to 200 characters.
Fixes #10975
2018-03-06 12:38:03 +01:00
5934521137
fixes invalid link to profile pic when gravatar is disabled
...
closes #11097
2018-03-06 11:46:50 +01:00
4904a051cf
use net/url to generate postgres connection url
2018-03-05 16:06:04 +01:00
4e826ff8f7
remove spaces around arguments of macros
2018-03-02 19:24:15 +01:00
f1ba9137c0
remove spaces around arguments before calling macro expansion
2018-03-02 19:20:30 +01:00
0f931f9e5e
Merge remote-tracking branch 'upstream/master' into macroengine-interpolate
2018-03-01 18:01:54 +01:00
cc2f478792
Merge branch 'docs_v5.0'
2018-03-01 09:36:48 +01:00
49266d5150
Add metrics that triggered alert to description
2018-02-28 15:26:11 -07: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
59704ee939
Fix Github OAuth not working with private Organizations ( #11028 )
...
* Fix Github OAuth not working with private organizations
* Update documentation
2018-02-28 13:08:15 +01:00
f44e476580
permissions: fix validation of permissions before update
...
Did a bad pointer comparison so extended the tests for duplicate permissions.
2018-02-28 08:48:28 +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
955dfcc8fe
dashboards: don't allow override of permissions with a lower precedence
...
If a dashboard inherits permissions from a folder, don't allow same permission to be added
to the dashboard with a lower permission.
Add backend validation so that you cannot add same permission to folder/dashboard, for example
same user/team with different permissions
2018-02-27 16:04:45 +01:00
69006a7764
Alerting: Fix OK state doesn't show up in Microsoft Teams ( #11032 )
...
* Alerting: Fix OK state doesn't show up in Microsoft Teams
* Fix formatting
2018-02-27 15:48:36 +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
fe49182b9d
snapshots: fixes cleanup of old snapshots
...
Snapshot cleanup did not work due to time.Now syntax error. Added test
for it as well to catch any future errors.
Added error and debug logging so that it is possible to see any errors in the future.
Removed an unused configuration value and deprecated the remove expired snapshots
setting.
2018-02-22 16:12:16 +01:00
6751bbc17f
Merge branch 'master' into docs_v5.0
2018-02-22 15:55:44 +01:00
3f588b4c48
dashboards: created/updated and createdby/updatedby should be set before save
...
If creating a new folder/dashboard created/updated and createdby/updatedby should always be set.
If updating an existing folder/dashboard updated and updatedby should always be set.
2018-02-22 11:54:28 +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
8a8f3bd5bb
folders: fix typo
2018-02-21 11:28:11 +01:00
3c6bc263dc
Merge branch 'master' into 10630_folder_api
2018-02-21 11:25:56 +01:00
78283b9c77
folders: extend folder service tests
2018-02-21 11:25:21 +01:00
a167e19b37
folders: folder api tests
2018-02-21 11:24:54 +01:00
2f6e77af1e
Merge branch 'master' into docs_v5.0
2018-02-21 10:47:14 +01:00
417541c77f
folders: folder permissions api tests
2018-02-20 18:11:50 +01:00
02278f90a7
dashboards: make fake dashboard guardian available to other packages
2018-02-20 18:08:19 +01:00
3964d6b797
fix: added new known data source plugins, and minor migration fix for v1 dashboards
2018-02-20 16:08:43 +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
268fb4dc6c
folders: new folder service for managing folders
2018-02-20 13:56:22 +01:00
39aba03483
dashboards: created date should be set when creating a folder/dashboard
2018-02-20 13:54:31 +01:00
69ccbffaed
fix: fixed github oauth login with allowed orgs filter, fixes #10964 , reverts #10851
2018-02-20 11:30:18 +01:00
21d48df095
fix: plugin dashboard did not get plugin id after import
2018-02-20 11:30:18 +01:00
be2fa54459
feat(ldap): Allow use of DN in user attribute filter ( #3132 )
2018-02-20 11:15:31 +01:00
bergquist
Daniel Lee
Carl Bergquist
Dan Cech
Leonard Gram
Sven Klemm
Ryan Gifford
Marcus Efraimsson
Laurent Godet
Marcel Anacker
Torkel Ödegaard
Martin Molnar