diff --git a/pkg/services/ngalert/notifier/channels_config/available_channels.go b/pkg/services/ngalert/notifier/channels_config/available_channels.go index b1df07f320a..1bbb5997eaa 100644 --- a/pkg/services/ngalert/notifier/channels_config/available_channels.go +++ b/pkg/services/ngalert/notifier/channels_config/available_channels.go @@ -1529,7 +1529,7 @@ func GetAvailableNotifiers() []*NotifierPlugin { }, InputType: InputTypeText, Placeholder: "json", - Description: "The format of the message to be sent. If set to 'json', the message will be sent as a JSON object. If set to 'text', the message will be sent as a plain text string. By default json is used.", + Description: "If set to 'json', the notification message is the default JSON payload, and the Message field sets only the message field in the payload. If set to 'text', the Message field defines the entire payload. The default is 'json'.", PropertyName: "messageFormat", Required: false, }, @@ -1545,6 +1545,7 @@ func GetAvailableNotifiers() []*NotifierPlugin { { Label: "Message", Element: ElementTypeTextArea, + Description: "In 'json' Message format, sets the message field of the default JSON payload. In 'text' Message format, defines the entire payload.", Placeholder: alertingTemplates.DefaultMessageEmbed, PropertyName: "message", }, diff --git a/public/app/features/alerting/unified/mockGrafanaNotifiers.ts b/public/app/features/alerting/unified/mockGrafanaNotifiers.ts index 687beb86a9d..08bc5d4d90d 100644 --- a/public/app/features/alerting/unified/mockGrafanaNotifiers.ts +++ b/public/app/features/alerting/unified/mockGrafanaNotifiers.ts @@ -2976,7 +2976,7 @@ export const grafanaAlertNotifiers: Record = { inputType: 'text', label: 'Message format', description: - "The format of the message to be sent. If set to 'json', the message will be sent as a JSON object. If set to 'text', the message will be sent as a plain text string. By default json is used.", + "If set to 'json', the notification message is the default JSON payload, and the Message field sets only the message field in the payload. If set to 'text', the Message field defines the entire payload. The default is 'json'.", placeholder: 'json', propertyName: 'messageFormat', selectOptions: [ @@ -3019,7 +3019,8 @@ export const grafanaAlertNotifiers: Record = { element: 'textarea', inputType: '', label: 'Message', - description: '', + description: + "In 'json' Message format, sets the message field of the default JSON payload. In 'text' Message format, defines the entire payload.", placeholder: '{{ template "default.message" . }}', propertyName: 'message', selectOptions: null,