summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorZuul <zuul@review.opendev.org>2022-10-26 16:41:15 +0000
committerGerrit Code Review <review@openstack.org>2022-10-26 16:41:15 +0000
commit78dbc8b09f62ae96c0dc0f694330836596347c31 (patch)
tree6fa6ffa83fd0be3569f3fc4dd47c617db2b5bba0
parent8fcb3804b58d9b13383d4b7263c46bb158726181 (diff)
parent44caf759d09eea7a55f4f1aeccea8e257b357e13 (diff)
downloadceilometer-78dbc8b09f62ae96c0dc0f694330836596347c31.tar.gz
Merge "Fix the handle of plain text outputs"
-rw-r--r--ceilometer/polling/dynamic_pollster.py6
1 files changed, 4 insertions, 2 deletions
diff --git a/ceilometer/polling/dynamic_pollster.py b/ceilometer/polling/dynamic_pollster.py
index 0030c607..07edc5ee 100644
--- a/ceilometer/polling/dynamic_pollster.py
+++ b/ceilometer/polling/dynamic_pollster.py
@@ -66,11 +66,11 @@ class JsonResponseHandler(object):
class PlainTextResponseHandler(object):
- """This response handler converts a string to a dict {'out'=<string>}"""
+ """Response handler converts string to a list of dict [{'out'=<string>}]"""
@staticmethod
def handle(response):
- return {'out': str(response)}
+ return [{'out': str(response)}]
VALID_HANDLERS = {
@@ -218,6 +218,8 @@ class PollsterSampleExtractor(object):
extra_metadata = self.definitions.retrieve_extra_metadata(
kwargs['manager'], pollster_sample, kwargs['conf'])
+ LOG.debug("Extra metadata [%s] collected for sample [%s].",
+ extra_metadata, pollster_sample)
for key in extra_metadata.keys():
if key in metadata.keys():
LOG.warning("The extra metadata key [%s] already exist in "