diff options
| author | Éric Lemoine <elemoine@mirantis.com> | 2016-02-19 08:13:34 -0800 |
|---|---|---|
| committer | Éric Lemoine <elemoine@mirantis.com> | 2016-02-22 08:53:20 -0800 |
| commit | e6a9b9627a2baced96aab77f4c141af39814161e (patch) | |
| tree | b9f9f0acf75549334de2e32601edd00336f63482 /ansible | |
| parent | 0e67afb73bf27ce3e0f5b0325c9394e5c8aa3be5 (diff) | |
| download | kolla-e6a9b9627a2baced96aab77f4c141af39814161e.tar.gz kolla-e6a9b9627a2baced96aab77f4c141af39814161e.zip | |
Fix Swift logging
Swift uses Syslog, but it uses a custom log format. So this commit
adds a specific Heka decoder for Swift.
It also increases the log level from "warning" to "info" to make
Swift more verbose. Note that "info" is the default log level in
Swift.
And it disables the Heka configuration for Swift when "enable_swift"
is set to "no". This prevents Heka from creating 15 empty Swift log
files in the logs volume.
Partially implements: blueprint heka
Change-Id: If7a7d0707e71be2957178e2d45b5de51b788232e
Diffstat (limited to 'ansible')
| -rw-r--r-- | ansible/roles/common/templates/heka-global.toml.j2 | 13 | ||||
| -rw-r--r-- | ansible/roles/common/templates/heka.json.j2 | 2 | ||||
| -rw-r--r-- | ansible/roles/swift/templates/account.conf.j2 | 2 | ||||
| -rw-r--r-- | ansible/roles/swift/templates/container.conf.j2 | 2 | ||||
| -rw-r--r-- | ansible/roles/swift/templates/object.conf.j2 | 2 | ||||
| -rw-r--r-- | ansible/roles/swift/templates/proxy-server.conf.j2 | 2 |
6 files changed, 17 insertions, 6 deletions
diff --git a/ansible/roles/common/templates/heka-global.toml.j2 b/ansible/roles/common/templates/heka-global.toml.j2 index c9fbc1e7e..5e325026a 100644 --- a/ansible/roles/common/templates/heka-global.toml.j2 +++ b/ansible/roles/common/templates/heka-global.toml.j2 @@ -11,9 +11,20 @@ filename = "lua_decoders/os_syslog.lua" [syslog_log_decoder.config] hostname = "{{ ansible_hostname }}" +[swift_log_decoder] +type = "SandboxDecoder" +filename = "lua_decoders/os_swift_log.lua" + [swift_log_decoder.config] + hostname = "{{ ansible_hostname }}" + +[multi_log_decoder] +type = "MultiDecoder" +subs = ["syslog_log_decoder", "swift_log_decoder"] +cascade_strategy = "first-wins" + [syslog_input] type = "UdpInput" net = "unixgram" address = "/var/lib/kolla/heka/log" -decoder = "syslog_log_decoder" +decoder = "multi_log_decoder" splitter = "NullSplitter" diff --git a/ansible/roles/common/templates/heka.json.j2 b/ansible/roles/common/templates/heka.json.j2 index 30ed99880..34471008d 100644 --- a/ansible/roles/common/templates/heka.json.j2 +++ b/ansible/roles/common/templates/heka.json.j2 @@ -46,7 +46,7 @@ "perm": "0600" } {%- if not loop.last %},{% endif %} -{% endfor %} +{% endfor -%} ] } diff --git a/ansible/roles/swift/templates/account.conf.j2 b/ansible/roles/swift/templates/account.conf.j2 index d3c2f2644..ad54582cc 100644 --- a/ansible/roles/swift/templates/account.conf.j2 +++ b/ansible/roles/swift/templates/account.conf.j2 @@ -6,7 +6,7 @@ mount_check = false log_address = /var/lib/kolla/heka/log log_name = {{ service_name }} log_facility = LOG_LOCAL0 -log_level = warning +log_level = INFO [pipeline:main] pipeline = account-server diff --git a/ansible/roles/swift/templates/container.conf.j2 b/ansible/roles/swift/templates/container.conf.j2 index 879dd9c3c..55e0976dd 100644 --- a/ansible/roles/swift/templates/container.conf.j2 +++ b/ansible/roles/swift/templates/container.conf.j2 @@ -6,7 +6,7 @@ mount_check = false log_address = /var/lib/kolla/heka/log log_name = {{ service_name }} log_facility = LOG_LOCAL0 -log_level = warning +log_level = INFO [pipeline:main] pipeline = container-server diff --git a/ansible/roles/swift/templates/object.conf.j2 b/ansible/roles/swift/templates/object.conf.j2 index b3856228c..7499bbfd2 100644 --- a/ansible/roles/swift/templates/object.conf.j2 +++ b/ansible/roles/swift/templates/object.conf.j2 @@ -7,7 +7,7 @@ mount_check = false log_address = /var/lib/kolla/heka/log log_name = {{ service_name }} log_facility = LOG_LOCAL0 -log_level = warning +log_level = INFO [pipeline:main] {% if service_name == 'swift-object-expirer' %} diff --git a/ansible/roles/swift/templates/proxy-server.conf.j2 b/ansible/roles/swift/templates/proxy-server.conf.j2 index e8ea502e2..cf9de196f 100644 --- a/ansible/roles/swift/templates/proxy-server.conf.j2 +++ b/ansible/roles/swift/templates/proxy-server.conf.j2 @@ -5,7 +5,7 @@ bind_port = {{ swift_proxy_server_port }} log_address = /var/lib/kolla/heka/log log_name = {{ service_name }} log_facility = LOG_LOCAL0 -log_level = warning +log_level = INFO [pipeline:main] pipeline = catch_errors gatekeeper healthcheck cache container_sync bulk ratelimit authtoken keystoneauth slo dlo proxy-server |
