From 55645c7e73f43183ef62ceebc47e9d4ce09b8d31 Mon Sep 17 00:00:00 2001 From: Pavlo Shchelokovskyy Date: Tue, 19 Feb 2019 17:42:11 +0200 Subject: [PATCH] Explicitly set datefmt for logging the defaults in Python [0] and oslo.log [1] are such that when using separate config file for logging configuration (log-config-append) the log fomat of dates containes miliseconds twice (as in sec,ms.ms) which is exactly what is currently seen in logs of OpenStack services deployed by openstack-helm. When not provided with datefmt log formatter option, Python effectively uses '%Y-%m-%d %H:%M:%S,%f' [0] as a default time formatting string to render `%(asctime)s`, but the defaults in oslo.log add another `.%f` to it [1]. Since `log-date-format` oslo.log option has no effect when using log-config-append, we need to explicitly set date format to avoid double miliseconds rendering in date of log entries. [0] https://github.com/python/cpython/blob/6ee41793d2204c54bdf8f477ae61d016a7eca932/Lib/logging/__init__.py#L427-L428 [1] http://git.openstack.org/cgit/openstack/oslo.log/tree/oslo_log/_options.py?id=7c5f8362b26313217b6c248e77be3dc8e2ef74a5#n148 Change-Id: I47aa7ce96770d94b905b56d6fe4abad428f01047 --- barbican/values.yaml | 2 ++ cinder/values.yaml | 2 ++ congress/values.yaml | 2 ++ glance/values.yaml | 2 ++ heat/values.yaml | 2 ++ ironic/values.yaml | 2 ++ keystone/values.yaml | 2 ++ magnum/values.yaml | 2 ++ mistral/values.yaml | 2 ++ neutron/values.yaml | 2 ++ nova/values.yaml | 2 ++ senlin/values.yaml | 2 ++ tools/deployment/armada/manifests/armada-osh.yaml | 12 ++++++++++++ 13 files changed, 36 insertions(+) diff --git a/barbican/values.yaml b/barbican/values.yaml index ab1daf3228..56b54a5561 100644 --- a/barbican/values.yaml +++ b/barbican/values.yaml @@ -507,8 +507,10 @@ conf: formatter: context formatter_context: class: oslo_log.formatters.ContextFormatter + datefmt: "%Y-%m-%d %H:%M:%S" formatter_default: format: "%(message)s" + datefmt: "%Y-%m-%d %H:%M:%S" # Names of secrets used by bootstrap and environmental checks secrets: diff --git a/cinder/values.yaml b/cinder/values.yaml index e225130bd3..43d9260cae 100644 --- a/cinder/values.yaml +++ b/cinder/values.yaml @@ -811,8 +811,10 @@ conf: formatter: context formatter_context: class: oslo_log.formatters.ContextFormatter + datefmt: "%Y-%m-%d %H:%M:%S" formatter_default: format: "%(message)s" + datefmt: "%Y-%m-%d %H:%M:%S" rabbitmq: #NOTE(rk760n): adding rmq policy to mirror messages from notification queues and set expiration time for the ones policies: diff --git a/congress/values.yaml b/congress/values.yaml index c90d3a1bf9..7d1d94ad25 100644 --- a/congress/values.yaml +++ b/congress/values.yaml @@ -426,8 +426,10 @@ conf: formatter: context formatter_context: class: oslo_log.formatters.ContextFormatter + datefmt: "%Y-%m-%d %H:%M:%S" formatter_default: format: "%(message)s" + datefmt: "%Y-%m-%d %H:%M:%S" paste: composite:congress: use: egg:Paste#urlmap diff --git a/glance/values.yaml b/glance/values.yaml index aa5cf7212f..f7c3cefcc8 100644 --- a/glance/values.yaml +++ b/glance/values.yaml @@ -344,8 +344,10 @@ conf: formatter: context formatter_context: class: oslo_log.formatters.ContextFormatter + datefmt: "%Y-%m-%d %H:%M:%S" formatter_default: format: "%(message)s" + datefmt: "%Y-%m-%d %H:%M:%S" paste_registry: pipeline:glance-registry: pipeline: healthcheck osprofiler unauthenticated-context registryapp diff --git a/heat/values.yaml b/heat/values.yaml index fd02006bed..446c186d34 100644 --- a/heat/values.yaml +++ b/heat/values.yaml @@ -514,8 +514,10 @@ conf: formatter: context formatter_context: class: oslo_log.formatters.ContextFormatter + datefmt: "%Y-%m-%d %H:%M:%S" formatter_default: format: "%(message)s" + datefmt: "%Y-%m-%d %H:%M:%S" rabbitmq: #NOTE(rk760n): adding rmq policy to mirror messages from notification queues and set expiration time for the ones diff --git a/ironic/values.yaml b/ironic/values.yaml index eafebacc29..7d9a8838f7 100644 --- a/ironic/values.yaml +++ b/ironic/values.yaml @@ -194,8 +194,10 @@ conf: formatter: context formatter_context: class: oslo_log.formatters.ContextFormatter + datefmt: "%Y-%m-%d %H:%M:%S" formatter_default: format: "%(message)s" + datefmt: "%Y-%m-%d %H:%M:%S" network: pxe: diff --git a/keystone/values.yaml b/keystone/values.yaml index 383b861ea6..59eed8850e 100644 --- a/keystone/values.yaml +++ b/keystone/values.yaml @@ -967,8 +967,10 @@ conf: formatter: context formatter_context: class: oslo_log.formatters.ContextFormatter + datefmt: "%Y-%m-%d %H:%M:%S" formatter_default: format: "%(message)s" + datefmt: "%Y-%m-%d %H:%M:%S" # Names of secrets used by bootstrap and environmental checks secrets: diff --git a/magnum/values.yaml b/magnum/values.yaml index aaf0712a2e..27bdc4c85d 100644 --- a/magnum/values.yaml +++ b/magnum/values.yaml @@ -191,8 +191,10 @@ conf: formatter: context formatter_context: class: oslo_log.formatters.ContextFormatter + datefmt: "%Y-%m-%d %H:%M:%S" formatter_default: format: "%(message)s" + datefmt: "%Y-%m-%d %H:%M:%S" network: api: diff --git a/mistral/values.yaml b/mistral/values.yaml index afaba51513..0296859b0d 100644 --- a/mistral/values.yaml +++ b/mistral/values.yaml @@ -522,8 +522,10 @@ conf: formatter: context formatter_context: class: oslo_log.formatters.ContextFormatter + datefmt: "%Y-%m-%d %H:%M:%S" formatter_default: format: "%(message)s" + datefmt: "%Y-%m-%d %H:%M:%S" pod: user: diff --git a/neutron/values.yaml b/neutron/values.yaml index 548c7c0cc6..f6647fbfe9 100644 --- a/neutron/values.yaml +++ b/neutron/values.yaml @@ -1535,8 +1535,10 @@ conf: formatter: context formatter_context: class: oslo_log.formatters.ContextFormatter + datefmt: "%Y-%m-%d %H:%M:%S" formatter_default: format: "%(message)s" + datefmt: "%Y-%m-%d %H:%M:%S" plugins: ml2_conf: ml2: diff --git a/nova/values.yaml b/nova/values.yaml index 6558182ac4..eda7025b81 100644 --- a/nova/values.yaml +++ b/nova/values.yaml @@ -1566,8 +1566,10 @@ conf: formatter: context formatter_context: class: oslo_log.formatters.ContextFormatter + datefmt: "%Y-%m-%d %H:%M:%S" formatter_default: format: "%(message)s" + datefmt: "%Y-%m-%d %H:%M:%S" rabbitmq: #NOTE(rk760n): adding rmq policy to mirror messages from notification queues and set expiration time for the ones policies: diff --git a/senlin/values.yaml b/senlin/values.yaml index faa5378ac9..b77ed952d4 100644 --- a/senlin/values.yaml +++ b/senlin/values.yaml @@ -236,8 +236,10 @@ conf: formatter: context formatter_context: class: oslo_log.formatters.ContextFormatter + datefmt: "%Y-%m-%d %H:%M:%S" formatter_default: format: "%(message)s" + datefmt: "%Y-%m-%d %H:%M:%S" network: api: diff --git a/tools/deployment/armada/manifests/armada-osh.yaml b/tools/deployment/armada/manifests/armada-osh.yaml index 91d21a9d7d..0b1df33545 100644 --- a/tools/deployment/armada/manifests/armada-osh.yaml +++ b/tools/deployment/armada/manifests/armada-osh.yaml @@ -338,8 +338,10 @@ data: formatter: context formatter_context: class: oslo_log.formatters.ContextFormatter + datefmt: "%Y-%m-%d %H:%M:%S" formatter_default: format: "%(message)s" + datefmt: "%Y-%m-%d %H:%M:%S" endpoints: fluentd: namespace: osh-infra @@ -540,8 +542,10 @@ data: formatter: context formatter_context: class: oslo_log.formatters.ContextFormatter + datefmt: "%Y-%m-%d %H:%M:%S" formatter_default: format: "%(message)s" + datefmt: "%Y-%m-%d %H:%M:%S" endpoints: fluentd: namespace: osh-infra @@ -732,8 +736,10 @@ data: formatter: context formatter_context: class: oslo_log.formatters.ContextFormatter + datefmt: "%Y-%m-%d %H:%M:%S" formatter_default: format: "%(message)s" + datefmt: "%Y-%m-%d %H:%M:%S" cinder: DEFAULT: backup_driver: cinder.backup.drivers.swift @@ -1018,8 +1024,10 @@ data: formatter: context formatter_context: class: oslo_log.formatters.ContextFormatter + datefmt: "%Y-%m-%d %H:%M:%S" formatter_default: format: "%(message)s" + datefmt: "%Y-%m-%d %H:%M:%S" nova: neutron: metadata_proxy_shared_secret: ${METADATA_PROXY_SHARED_SECRET} @@ -1200,8 +1208,10 @@ data: formatter: context formatter_context: class: oslo_log.formatters.ContextFormatter + datefmt: "%Y-%m-%d %H:%M:%S" formatter_default: format: "%(message)s" + datefmt: "%Y-%m-%d %H:%M:%S" neutron: DEFAULT: l3_ha: True @@ -1317,8 +1327,10 @@ data: formatter: context formatter_context: class: oslo_log.formatters.ContextFormatter + datefmt: "%Y-%m-%d %H:%M:%S" formatter_default: format: "%(message)s" + datefmt: "%Y-%m-%d %H:%M:%S" endpoints: fluentd: namespace: osh-infra