diff --git a/docs/sources/http_api/alerting.md b/docs/sources/http_api/alerting.md index b58a177fecd..cc7ce4c2650 100644 --- a/docs/sources/http_api/alerting.md +++ b/docs/sources/http_api/alerting.md @@ -87,7 +87,7 @@ This API can also be used to create, update and delete alert notifications. { "alertId": 1, - "paused: true + "paused": true } **Example Response**: diff --git a/pkg/services/alerting/notifiers/opsgenie.go b/pkg/services/alerting/notifiers/opsgenie.go index 742aeb922b6..6792702b539 100644 --- a/pkg/services/alerting/notifiers/opsgenie.go +++ b/pkg/services/alerting/notifiers/opsgenie.go @@ -30,7 +30,7 @@ func init() { label="Auto close incidents" label-class="width-14" checked="ctrl.model.settings.autoClose" - tooltip="Automatically close alerts in OpseGenie once the alert goes back to ok."> + tooltip="Automatically close alerts in OpsGenie once the alert goes back to ok."> `, diff --git a/public/app/features/panel/panel_directive.ts b/public/app/features/panel/panel_directive.ts index d2708ff73bb..0482abc0437 100644 --- a/public/app/features/panel/panel_directive.ts +++ b/public/app/features/panel/panel_directive.ts @@ -160,6 +160,7 @@ module.directive('grafanaPanel', function($rootScope, $document) { classes: ctrl.error ? 'drop-error' : 'drop-help', openOn: 'hover', hoverOpenDelay: 100, + constrainToScrollParent: false, }); } }