Marcus Efraimsson
8678620730
move UserToken and UserTokenService to models package
2019-02-06 16:55:12 +01:00
Marcus Efraimsson
a60124a88c
change UserToken from interface to struct
2019-02-06 16:30:50 +01:00
Marcus Efraimsson
d53e64a32c
move auth token middleware/hooks to middleware package
...
fix/adds auth token middleware tests
2019-02-05 00:21:05 +01:00
Daniel Lee
a3e09d8bbc
azuremonitor: fixes merge conflict in yarn.lock
2019-01-29 15:35:43 +01:00
Daniel Lee
e4f4cb814c
Merge branch 'master' into azure-monitor
2019-01-28 19:23:34 +01:00
bergquist
6a8643b3d1
Merge branch 'master' into configurable-alert-notification
...
* master: (250 commits)
Firing off an action instead of listening to location changes
Changes after PR Comments
Made ExplorerToolbar connected and refactored away responsabilities from Explore
Removed some split complexity
Fixed some more styling
Fixed close split look and feel
Fixed position of Closesplit
Fixed small issue with TimePicker dropdown position
Simplified some styles and dom elements
Fixed some more with the sidemenu open and smaller screens
Fixed so heading looks good with closed sidemenu
Restructure of component and styling
Refactored out ExploreToolbar from Explore
Fixed reinitialise of Explore
changelog: add notes about closing #13929
changelog: add notes about closing #14558
changelog: add notes about closing #14484
changelog: add notes about closing #13765
changelog: add notes about closing #11503
changelog: add notes about closing #4075
...
2019-01-28 14:16:43 +01:00
bergquist
5998646da5
restrict session usage to auth_proxy
2019-01-23 14:56:48 +01:00
Marcus Efraimsson
4096449aec
extract auth token interface and remove auth token from context
2019-01-22 12:00:33 +01:00
bergquist
c2accfa4c0
inital code for rotate
2019-01-17 17:11:52 +01:00
Daniel Lee
dd96f2a522
azuremonitor: move files into grafana
...
Initial port of the code from the plugin - lots of small things to fix.
2019-01-17 10:55:03 +01:00
Pavel Bakulev
f132e929ce
Added uid for alert notifications
2019-01-16 16:50:00 +02:00
Pierre GIRAUD
a881497908
Max number of repeated panels per row
...
Instead of min width
2019-01-09 08:01:42 +01:00
Victor Cinaglia
9d6da10e82
snapshots: Move external snapshot creation to backend
2018-12-10 16:36:32 -05:00
danielbh
d1b8f13c66
feat: #11067 prevent removing last grafana admin permissions
2018-12-03 20:05:52 -05:00
Marcus Efraimsson
36aec52c08
return actual error if failing to update alert data
2018-11-22 11:19:08 +01:00
Carl Bergquist
6049855dc7
Merge pull request #13947 from bergquist/alerting_for
...
Introduce alert debouncing
2018-11-19 10:38:02 +01:00
Marcus Efraimsson
5f9fecd254
feat: team preferences
2018-11-12 20:01:53 +01:00
Marcus Efraimsson
9e0da02b6a
refactor dashboard alert extractor
2018-11-05 14:25:19 +01:00
bergquist
ccd89eee97
renames debouceduration to for
2018-11-05 11:05:30 +01:00
Marcus Efraimsson
5882e5bb46
Merge pull request #13900 from marefr/ds_cache_refactor
...
Datasource proxy cache refactor
2018-11-05 11:02:31 +01:00
bergquist
d25284a364
introduce state unknown for rules that have not been evaluated yet
2018-11-05 10:50:28 +01:00
bergquist
2d3a575489
adds db migration for debounce_duration
2018-11-05 10:50:28 +01:00
Torkel Ödegaard
b415d82611
fixed to template PR issues, #13938
2018-11-02 10:49:46 +01:00
Marcus Efraimsson
2332b3e205
remove unused code
2018-10-30 09:34:09 +01:00
Marcus Efraimsson
70ddf93688
include teams on signed in user
2018-10-30 09:32:32 +01:00
Marcus Efraimsson
cfb061ddab
refactor datasource caching
2018-10-30 09:31:56 +01:00
Marcus Efraimsson
da89c27caf
Merge pull request #13702 from grafana/data-source-instance-to-react
...
Support Data source permissions
2018-10-17 16:54:57 +02:00
Leonard Gram
3245227016
permissions: cleanup.
2018-10-17 15:58:52 +02:00
bergquist
70385119bc
removes d in disableResolvedMessage
2018-10-17 10:41:18 +02:00
Dave Waters
c4dcf5a4ee
fix gofmt, add test, correct noted concerns with default value
2018-10-16 17:33:38 -04:00
Peter Holmberg
ee0cc9bd77
Merge branch 'master' into data-source-instance-to-react
2018-10-16 12:14:11 +02:00
Dave Waters
6376154b16
add channel option to disable the resolved alert (OK Message) that is sent when condition returns to normal.
2018-10-15 17:16:14 -04:00
Torkel Ödegaard
ec4698fb96
alerting: propagate alert validation issues to the user instead of just 'invalid alert data' message
2018-10-12 23:03:54 -07:00
Torkel Ödegaard
b671b9704f
changed property name to UserWasDeleted and added an assert for it
2018-10-11 12:20:53 -07:00
Torkel Ödegaard
9585dc7825
added the UserWasRemoved flag to make api aware of what happened to return correct message to UI
2018-10-11 07:58:22 +02:00
Torkel Ödegaard
5b5cb6622d
Remove user form org now completely removes the user from the system if the user is orphaned
2018-10-11 07:48:35 +02:00
Leonard Gram
ccfcf02e33
Refactors ds permissions to a filter.
2018-10-10 14:25:57 +02:00
Marcus Efraimsson
17a5e32f23
remove datasource permission admin for now
2018-10-09 15:23:28 +02:00
Marcus Efraimsson
4d719b0d05
Merge remote-tracking branch 'origin/master' into noop-services-poc
2018-10-08 16:02:44 +02:00
Marcus Efraimsson
9af809ff8a
Merge pull request #13440 from grafana/reminder_refactoring
...
Transaction issues for alert reminder
2018-10-02 15:55:18 +02:00
bergquist
9022e871e3
avoid sending full notification state to pending/complete
2018-10-02 13:57:41 +02:00
bergquist
341d8af637
rename GetNotificationStateQuery to GetOrCreateNotificationStateQuery
2018-10-02 11:23:40 +02:00
bergquist
7f1d7cefc0
reminder: uses UpdatedAt to track state changes.
2018-10-02 11:19:09 +02:00
Torkel Ödegaard
162a95bff9
wip: going in circles
2018-10-01 19:31:03 +02:00
bergquist
75f832cda8
use alert state changes counter as secondary version
2018-10-01 15:58:30 +02:00
Torkel Ödegaard
b3c78f1265
wip: data source permissions hooks
2018-10-01 15:38:55 +02:00
Marcus Efraimsson
5ec086dc56
don't notify if notification state pending
...
If notification state is pending and last update of state was made
less than a minute ago. In the case of a grafana instance is shut down/crashes
between setting pending state and before sending the notification/marks as complete
this logic should allow the notification to be sent after some time instead of
being left in an inconsistent state where no notifications are being sent.
2018-09-30 21:52:50 +02:00
Marcus Efraimsson
d412aafb7e
remove unused code
2018-09-30 20:16:01 +02:00
Marcus Efraimsson
c1763508e0
handle pending and completed state for alert notifications
2018-09-28 14:22:03 +02:00
Marcus Efraimsson
88bbc452a7
wip: send and mark as complete
2018-09-28 11:14:36 +02:00
