From eeb07576f4cfe130ec0837f5588c4a948bce85ac Mon Sep 17 00:00:00 2001 From: Nicole Albee <2642763+a03nikki@users.noreply.github.com> Date: Tue, 25 Jan 2022 10:31:50 -0600 Subject: [PATCH 1/3] Update docs for Watcher notification settings to include default xpack.notification.reporting.warning.kbn-csv-contains-formulas.text value and link to the Kibana documentation. --- .../settings/notification-settings.asciidoc | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/docs/reference/settings/notification-settings.asciidoc b/docs/reference/settings/notification-settings.asciidoc index 874b41eb6b096..dc13178f09fb9 100644 --- a/docs/reference/settings/notification-settings.asciidoc +++ b/docs/reference/settings/notification-settings.asciidoc @@ -264,6 +264,13 @@ HTML feature groups>>. Set to `false` to completely disable HTML sanitation. Not recommended. Defaults to `true`. +`xpack.notification.reporting.warning.kbn-csv-contains-formulas.text`:: +(<>) +Specifies a custom message to be sent if the formula verification criteria +for CSV files, from {kib}'s {kib-ref}/reporting-settings-kb.html#reporting-csv-settings[`xpack.reporting.csv.checkForFormulas`], is true. +Use %s in the message as a placeholder for the filename. +Defaults to `Warning: The attachment [%s] contains characters which spreadsheet applications may interpret as formulas. Please ensure that the attachment is safe prior to opening.` + [[ssl-notification-smtp-settings]] :ssl-prefix: xpack.notification.email :component: {watcher} Email @@ -273,12 +280,6 @@ Defaults to `true`. include::ssl-settings.asciidoc[] -`xpack.notification.reporting.warning.kbn-csv-contains-formulas.text`:: -(<>) -Specifies a custom message to be sent if the formula verification criteria -for CSV files, from kibana `xpack.reporting.csv.checkForFormulas`, is true. -Use %s in the message as a placeholder for the filename. - [[slack-notification-settings]] ==== Slack Notification Settings You can configure the following Slack notification settings in From e5586ad7fb2b4fcf7fcc9847790b638c105ced4c Mon Sep 17 00:00:00 2001 From: Nicole Albee <2642763+a03nikki@users.noreply.github.com> Date: Wed, 26 Jan 2022 08:25:48 -0600 Subject: [PATCH 2/3] Apply suggestions from code review Co-authored-by: Adam Locke --- docs/reference/settings/notification-settings.asciidoc | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/docs/reference/settings/notification-settings.asciidoc b/docs/reference/settings/notification-settings.asciidoc index dc13178f09fb9..751f817f6c204 100644 --- a/docs/reference/settings/notification-settings.asciidoc +++ b/docs/reference/settings/notification-settings.asciidoc @@ -267,8 +267,8 @@ Defaults to `true`. `xpack.notification.reporting.warning.kbn-csv-contains-formulas.text`:: (<>) Specifies a custom message to be sent if the formula verification criteria -for CSV files, from {kib}'s {kib-ref}/reporting-settings-kb.html#reporting-csv-settings[`xpack.reporting.csv.checkForFormulas`], is true. -Use %s in the message as a placeholder for the filename. +for CSV files, from {kib}'s {kibana-ref}/reporting-settings-kb.html#reporting-csv-settings[`xpack.reporting.csv.checkForFormulas`], is true. +Use `%s` in the message as a placeholder for the filename. Defaults to `Warning: The attachment [%s] contains characters which spreadsheet applications may interpret as formulas. Please ensure that the attachment is safe prior to opening.` [[ssl-notification-smtp-settings]] From b8d6c38d240821b5ec3e844af139f5e7e7de919f Mon Sep 17 00:00:00 2001 From: Nicole Albee <2642763+a03nikki@users.noreply.github.com> Date: Thu, 27 Jan 2022 07:22:18 -0600 Subject: [PATCH 3/3] Apply suggestions from code review Co-authored-by: Adam Locke --- docs/reference/settings/notification-settings.asciidoc | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/docs/reference/settings/notification-settings.asciidoc b/docs/reference/settings/notification-settings.asciidoc index 751f817f6c204..44447deeba75d 100644 --- a/docs/reference/settings/notification-settings.asciidoc +++ b/docs/reference/settings/notification-settings.asciidoc @@ -266,8 +266,8 @@ Defaults to `true`. `xpack.notification.reporting.warning.kbn-csv-contains-formulas.text`:: (<>) -Specifies a custom message to be sent if the formula verification criteria -for CSV files, from {kib}'s {kibana-ref}/reporting-settings-kb.html#reporting-csv-settings[`xpack.reporting.csv.checkForFormulas`], is true. +Specifies a custom message, which is sent if the formula verification criteria +for CSV files from {kib}'s {kibana-ref}/reporting-settings-kb.html#reporting-csv-settings[`xpack.reporting.csv.checkForFormulas`] is `true`. Use `%s` in the message as a placeholder for the filename. Defaults to `Warning: The attachment [%s] contains characters which spreadsheet applications may interpret as formulas. Please ensure that the attachment is safe prior to opening.`