From b5311f63dbf5787bda3495a58c8ef7a6a557daa4 Mon Sep 17 00:00:00 2001 From: gh159m Date: Wed, 10 Feb 2016 10:36:59 -0600 Subject: [PATCH] Removed default value for log_statsd_host Multiple files and documents showed that log_statsd_host had a default value, usually localhost. This was incorrect, instead setting a value for log_statsd_host enables statsd logging. Removed any reference of log_statsd_host having a default value. Also changed descriptions to show setting a value enables logging. Change-Id: I3ca5c0e8b8e4981de3aa6db0c476072b5a59723d Closes-Bug: #1542227 --- doc/saio/swift/container-reconciler.conf | 2 +- doc/saio/swift/object-expirer.conf | 2 +- doc/source/deployment_guide.rst | 20 ++++++++++++++++---- etc/account-server.conf-sample | 2 +- etc/container-reconciler.conf-sample | 2 +- etc/container-server.conf-sample | 2 +- etc/internal-client.conf-sample | 2 +- etc/object-expirer.conf-sample | 4 ++-- etc/object-server.conf-sample | 2 +- etc/proxy-server.conf-sample | 4 ++-- swift/container/sync.py | 2 +- 11 files changed, 28 insertions(+), 16 deletions(-) diff --git a/doc/saio/swift/container-reconciler.conf b/doc/saio/swift/container-reconciler.conf index 09261d294b..8dcb92f8f8 100644 --- a/doc/saio/swift/container-reconciler.conf +++ b/doc/saio/swift/container-reconciler.conf @@ -17,7 +17,7 @@ user = # log_udp_port = 514 # # You can enable StatsD logging here: -# log_statsd_host = localhost +# log_statsd_host = # log_statsd_port = 8125 # log_statsd_default_sample_rate = 1.0 # log_statsd_sample_rate_factor = 1.0 diff --git a/doc/saio/swift/object-expirer.conf b/doc/saio/swift/object-expirer.conf index 6e77e9cdf7..0d52fddba6 100644 --- a/doc/saio/swift/object-expirer.conf +++ b/doc/saio/swift/object-expirer.conf @@ -17,7 +17,7 @@ log_level = INFO # log_udp_port = 514 # # You can enable StatsD logging here: -# log_statsd_host = localhost +# log_statsd_host = # log_statsd_port = 8125 # log_statsd_default_sample_rate = 1.0 # log_statsd_sample_rate_factor = 1.0 diff --git a/doc/source/deployment_guide.rst b/doc/source/deployment_guide.rst index 89f90f10fa..9ed83e4a30 100644 --- a/doc/source/deployment_guide.rst +++ b/doc/source/deployment_guide.rst @@ -478,7 +478,7 @@ log_custom_handlers None Comma-separated list of functions t to setup custom log handlers. log_udp_host Override log_address log_udp_port 514 UDP log port -log_statsd_host localhost StatsD logging; IPv4/IPv6 +log_statsd_host None Enables StatsD logging; IPv4/IPv6 address or a hostname. If a hostname resolves to an IPv4 and IPv6 address, the IPv4 address will be @@ -794,7 +794,11 @@ log_custom_handlers None Comma-separated list of functions t to setup custom log handlers. log_udp_host Override log_address log_udp_port 514 UDP log port -log_statsd_host localhost StatsD logging +log_statsd_host None Enables StatsD logging; IPv4/IPv6 + address or a hostname. If a + hostname resolves to an IPv4 and IPv6 + address, the IPv4 address will be + used. log_statsd_port 8125 log_statsd_default_sample_rate 1.0 log_statsd_sample_rate_factor 1.0 @@ -1005,7 +1009,11 @@ log_custom_handlers None Comma-separated list of functions t to setup custom log handlers. log_udp_host Override log_address log_udp_port 514 UDP log port -log_statsd_host localhost StatsD logging +log_statsd_host None Enables StatsD logging; IPv4/IPv6 + address or a hostname. If a + hostname resolves to an IPv4 and IPv6 + address, the IPv4 address will be + used. log_statsd_port 8125 log_statsd_default_sample_rate 1.0 log_statsd_sample_rate_factor 1.0 @@ -1233,7 +1241,11 @@ log_custom_handlers None Comma separated handlers. log_udp_host Override log_address log_udp_port 514 UDP log port -log_statsd_host localhost StatsD logging +log_statsd_host None Enables StatsD logging; IPv4/IPv6 + address or a hostname. If a + hostname resolves to an IPv4 and IPv6 + address, the IPv4 address will be + used. log_statsd_port 8125 log_statsd_default_sample_rate 1.0 log_statsd_sample_rate_factor 1.0 diff --git a/etc/account-server.conf-sample b/etc/account-server.conf-sample index 280961c0ae..9fa98c6f20 100644 --- a/etc/account-server.conf-sample +++ b/etc/account-server.conf-sample @@ -35,7 +35,7 @@ bind_port = 6002 # log_udp_port = 514 # # You can enable StatsD logging here: -# log_statsd_host = localhost +# log_statsd_host = # log_statsd_port = 8125 # log_statsd_default_sample_rate = 1.0 # log_statsd_sample_rate_factor = 1.0 diff --git a/etc/container-reconciler.conf-sample b/etc/container-reconciler.conf-sample index 4301641ac4..6e8f109f5d 100644 --- a/etc/container-reconciler.conf-sample +++ b/etc/container-reconciler.conf-sample @@ -17,7 +17,7 @@ # log_udp_port = 514 # # You can enable StatsD logging here: -# log_statsd_host = localhost +# log_statsd_host = # log_statsd_port = 8125 # log_statsd_default_sample_rate = 1.0 # log_statsd_sample_rate_factor = 1.0 diff --git a/etc/container-server.conf-sample b/etc/container-server.conf-sample index b525b7927e..5927f5e230 100644 --- a/etc/container-server.conf-sample +++ b/etc/container-server.conf-sample @@ -41,7 +41,7 @@ bind_port = 6001 # log_udp_port = 514 # # You can enable StatsD logging here: -# log_statsd_host = localhost +# log_statsd_host = # log_statsd_port = 8125 # log_statsd_default_sample_rate = 1.0 # log_statsd_sample_rate_factor = 1.0 diff --git a/etc/internal-client.conf-sample b/etc/internal-client.conf-sample index 2d25d448b6..916e424afc 100644 --- a/etc/internal-client.conf-sample +++ b/etc/internal-client.conf-sample @@ -17,7 +17,7 @@ # log_udp_port = 514 # # You can enable StatsD logging here: -# log_statsd_host = localhost +# log_statsd_host = # log_statsd_port = 8125 # log_statsd_default_sample_rate = 1.0 # log_statsd_sample_rate_factor = 1.0 diff --git a/etc/object-expirer.conf-sample b/etc/object-expirer.conf-sample index 6276fd5cfa..4b161de1d5 100644 --- a/etc/object-expirer.conf-sample +++ b/etc/object-expirer.conf-sample @@ -20,7 +20,7 @@ # log_udp_port = 514 # # You can enable StatsD logging here: -# log_statsd_host = localhost +# log_statsd_host = # log_statsd_port = 8125 # log_statsd_default_sample_rate = 1.0 # log_statsd_sample_rate_factor = 1.0 @@ -80,7 +80,7 @@ use = egg:swift#proxy_logging # access_log_udp_port = 514 # # You can use log_statsd_* from [DEFAULT] or override them here: -# access_log_statsd_host = localhost +# access_log_statsd_host = # access_log_statsd_port = 8125 # access_log_statsd_default_sample_rate = 1.0 # access_log_statsd_sample_rate_factor = 1.0 diff --git a/etc/object-server.conf-sample b/etc/object-server.conf-sample index fb9f296b8c..3c7732416e 100644 --- a/etc/object-server.conf-sample +++ b/etc/object-server.conf-sample @@ -44,7 +44,7 @@ bind_port = 6000 # log_udp_port = 514 # # You can enable StatsD logging here: -# log_statsd_host = localhost +# log_statsd_host = # log_statsd_port = 8125 # log_statsd_default_sample_rate = 1.0 # log_statsd_sample_rate_factor = 1.0 diff --git a/etc/proxy-server.conf-sample b/etc/proxy-server.conf-sample index 59c5cc02aa..2c16a56bb4 100644 --- a/etc/proxy-server.conf-sample +++ b/etc/proxy-server.conf-sample @@ -63,7 +63,7 @@ bind_port = 8080 # log_udp_port = 514 # # You can enable StatsD logging here: -# log_statsd_host = localhost +# log_statsd_host = # log_statsd_port = 8125 # log_statsd_default_sample_rate = 1.0 # log_statsd_sample_rate_factor = 1.0 @@ -569,7 +569,7 @@ use = egg:swift#proxy_logging # access_log_udp_port = 514 # # You can use log_statsd_* from [DEFAULT] or override them here: -# access_log_statsd_host = localhost +# access_log_statsd_host = # access_log_statsd_port = 8125 # access_log_statsd_default_sample_rate = 1.0 # access_log_statsd_sample_rate_factor = 1.0 diff --git a/swift/container/sync.py b/swift/container/sync.py index ef9543883a..34cbff82b9 100644 --- a/swift/container/sync.py +++ b/swift/container/sync.py @@ -65,7 +65,7 @@ ic_conf_body = """ # log_udp_port = 514 # # You can enable StatsD logging here: -# log_statsd_host = localhost +# log_statsd_host = # log_statsd_port = 8125 # log_statsd_default_sample_rate = 1.0 # log_statsd_sample_rate_factor = 1.0