From 5717989110e09bb02b3c9e242f93bde0a13d31b5 Mon Sep 17 00:00:00 2001 From: Emma Foley Date: Mon, 17 Jul 2017 16:45:14 +0000 Subject: [PATCH] Modifies metername and resource_id * Changes metername value: . -> . e.g. cpu.cpu -> cpu.nice * Changes resource_id value -- -> -- e.g. localhost-0-nice -> localhost-cpu-0 * Changes metername in gnocchi/writer metername -> @ * Supports multi-host deployment Change-Id: If4cbff1c624ceb1e46b86bf999559b159ee78a04 --- collectd_ceilometer/common/meters/base.py | 4 ++-- collectd_ceilometer/gnocchi/writer.py | 4 +++- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/collectd_ceilometer/common/meters/base.py b/collectd_ceilometer/common/meters/base.py index 0d5bc19..ce1b06f 100644 --- a/collectd_ceilometer/common/meters/base.py +++ b/collectd_ceilometer/common/meters/base.py @@ -32,7 +32,7 @@ class Meter(object): def meter_name(self, vl): """Return meter name.""" # pylint: disable=no-self-use - resources = [vl.plugin, vl.type] + resources = [vl.type, vl.type_instance] return '.'.join([i for i in resources if i]) def hostname(self, vl): @@ -42,7 +42,7 @@ class Meter(object): def resource_id(self, vl): """Get resource ID.""" - resources = [self.hostname(vl), vl.plugin_instance, vl.type_instance] + resources = [self.hostname(vl), vl.plugin, vl.plugin_instance] return '-'.join([i for i in resources if i]) def unit(self, vl): diff --git a/collectd_ceilometer/gnocchi/writer.py b/collectd_ceilometer/gnocchi/writer.py index f0551a9..25cf424 100644 --- a/collectd_ceilometer/gnocchi/writer.py +++ b/collectd_ceilometer/gnocchi/writer.py @@ -57,7 +57,9 @@ class Writer(object): # take the plugin (specialized or default) for parsing the data plugin = self._meters.get(vl.plugin) # prepare all data related to the sample - metername = plugin.meter_name(vl) + metername = "{}@{}".format( + plugin.resource_id(vl), plugin.meter_name(vl)) + unit = plugin.unit(vl) timestamp = datetime.datetime.utcfromtimestamp(vl.time).isoformat()