Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Document smtp_hello parameter #988

Merged
merged 2 commits into from
Mar 16, 2018

Conversation

simonpasquier
Copy link
Member

@@ -65,6 +65,8 @@ global:
[ smtp_from: <tmpl_string> ]
# The default SMTP smarthost used for sending emails.
[ smtp_smarthost: <string> ]
# The default hostname to identify to the SMTP server.
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think we should mention the default behaviour of using localhost here somehow.

@@ -65,6 +65,9 @@ global:
[ smtp_from: <tmpl_string> ]
# The default SMTP smarthost used for sending emails.
[ smtp_smarthost: <string> ]
# The default hostname to identify to the SMTP server. If not specified,
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

We usually do this as | default = "localhost", and it might be worth making that explicit over in the am code.

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Makes sense

@@ -301,6 +306,8 @@ to: <tmpl_string>

# The HTML body of the email notification.
[ html: <tmpl_string> | default = '{{ template "email.default.html" . }}' ]
# The text body of the email notification.
[ text: <tmpl_string> ]
Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This parameter has been added in prometheus/alertmanager#934.

@brian-brazil brian-brazil merged commit 68f3eaa into prometheus:master Mar 16, 2018
@simonpasquier simonpasquier deleted the update-email-cfg branch March 16, 2018 16:22
aylei pushed a commit to aylei/docs that referenced this pull request Oct 28, 2019
* op-guide: update monitor format

* op-guide: update punctuation
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants