diff -Nru ceilometer-10.0.1/debian/changelog ceilometer-10.0.1/debian/changelog --- ceilometer-10.0.1/debian/changelog 2018-06-28 23:42:51.000000000 +0000 +++ ceilometer-10.0.1/debian/changelog 2019-02-01 11:30:24.000000000 +0000 @@ -1,8 +1,15 @@ -ceilometer (1:10.0.1-0ubuntu0.18.04.1~cloud0) xenial-queens; urgency=medium +ceilometer (1:10.0.1-0ubuntu0.18.04.2~cloud0) xenial-queens; urgency=medium - * New upstream release for the Ubuntu Cloud Archive. + * New update for the Ubuntu Cloud Archive. - -- Openstack Ubuntu Testing Bot Thu, 28 Jun 2018 23:42:51 +0000 + -- Openstack Ubuntu Testing Bot Fri, 01 Feb 2019 11:30:24 +0000 + +ceilometer (1:10.0.1-0ubuntu0.18.04.2) bionic; urgency=medium + + * Backport fix to only log polling.yaml contents as DEBUG (LP: #1811098) + - d/p/Only-print-polling.yaml-file-contents-as-DEBUG.patch + + -- Edward Hope-Morley Fri, 11 Jan 2019 18:16:31 +0000 ceilometer (1:10.0.1-0ubuntu0.18.04.1) bionic; urgency=medium diff -Nru ceilometer-10.0.1/debian/patches/Only-print-polling.yaml-file-contents-as-DEBUG.patch ceilometer-10.0.1/debian/patches/Only-print-polling.yaml-file-contents-as-DEBUG.patch --- ceilometer-10.0.1/debian/patches/Only-print-polling.yaml-file-contents-as-DEBUG.patch 1970-01-01 00:00:00.000000000 +0000 +++ ceilometer-10.0.1/debian/patches/Only-print-polling.yaml-file-contents-as-DEBUG.patch 2019-01-11 18:16:31.000000000 +0000 @@ -0,0 +1,37 @@ +From 7238e15354ee1d196e00ee3908cbd67e30198016 Mon Sep 17 00:00:00 2001 +From: Edward Hope-Morley +Date: Thu, 10 Jan 2019 16:15:16 +0000 +Subject: [PATCH] Only print polling.yaml file contents as DEBUG + +Since this file can contain sensitive information such +as admin credentials of target resources (e.g. snmp) it +is not a good idea to print this log as INFO since admins +might want to have INFO level logging but without the risk +of it containing this kind of information. + +We might want to consider remmoving this log altogether. + +Closes-Bug: #1811098 +(cherry picked from commit 8881a42af169a2d7c912b1434911f978883c83f3) +(cherry picked from commit 50f268f23852af2b1bc5f1aed4405786a47b7839) +Change-Id: Iff5fcc4b6c30142f2c5c9ad26027dc5a6542a881 +--- + ceilometer/agent.py | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/ceilometer/agent.py b/ceilometer/agent.py +index c5a15fd..f722177 100644 +--- a/ceilometer/agent.py ++++ b/ceilometer/agent.py +@@ -67,7 +67,7 @@ class ConfigManagerBase(object): + conf = yaml.safe_load(data) + self.cfg_mtime = self.get_cfg_mtime() + self.cfg_hash = self.get_cfg_hash() +- LOG.info("Config file: %s", conf) ++ LOG.debug("Config file: %s", conf) + return conf + + def get_cfg_mtime(self): +-- +2.7.4 + diff -Nru ceilometer-10.0.1/debian/patches/series ceilometer-10.0.1/debian/patches/series --- ceilometer-10.0.1/debian/patches/series 1970-01-01 00:00:00.000000000 +0000 +++ ceilometer-10.0.1/debian/patches/series 2019-01-11 18:16:31.000000000 +0000 @@ -0,0 +1 @@ +Only-print-polling.yaml-file-contents-as-DEBUG.patch