From eedfdee060b17d38b14628b7e706967cb15a35af Mon Sep 17 00:00:00 2001 From: Dina Belova Date: Tue, 24 Jun 2014 16:52:46 +0400 Subject: [PATCH] Fix Swift config for Ceilometer usage Ceilometer filter was previously removed from the Swift configuration to avoid useless Ceilometer logs in the Swift ones. This was fixed by setting only warning log level for this Ceilometer part of the pipeline to keep only important ones. Change-Id: I8c41355bb98dbf3bb59ec792221b05ea936086b7 Partial-Bug: #1294789 --- lib/swift | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/lib/swift b/lib/swift index c47b09f6d7..7b55c98d22 100644 --- a/lib/swift +++ b/lib/swift @@ -337,12 +337,12 @@ function configure_swift { iniset ${SWIFT_CONFIG_PROXY_SERVER} app:proxy-server node_timeout 120 iniset ${SWIFT_CONFIG_PROXY_SERVER} app:proxy-server conn_timeout 20 - # Skipped due to bug 1294789 - ## Configure Ceilometer - #if is_service_enabled ceilometer; then - # iniset ${SWIFT_CONFIG_PROXY_SERVER} filter:ceilometer use "egg:ceilometer#swift" - # SWIFT_EXTRAS_MIDDLEWARE_LAST="${SWIFT_EXTRAS_MIDDLEWARE_LAST} ceilometer" - #fi + # Configure Ceilometer + if is_service_enabled ceilometer; then + iniset ${SWIFT_CONFIG_PROXY_SERVER} filter:ceilometer "set log_level" "WARN" + iniset ${SWIFT_CONFIG_PROXY_SERVER} filter:ceilometer use "egg:ceilometer#swift" + SWIFT_EXTRAS_MIDDLEWARE_LAST="${SWIFT_EXTRAS_MIDDLEWARE_LAST} ceilometer" + fi # Restrict the length of auth tokens in the swift proxy-server logs. iniset ${SWIFT_CONFIG_PROXY_SERVER} filter:proxy-logging reveal_sensitive_prefix ${SWIFT_LOG_TOKEN_LENGTH}