From 0b9de5bc8964eb8cecdf31dbc3dc785dea0dbf2b Mon Sep 17 00:00:00 2001
From: Ildar Svetlov <isvetlov@mirantis.com>
Date: Tue, 14 Feb 2017 14:31:46 +0400
Subject: [PATCH] Remove empty fields from resource metadata

Change-Id: I6d8b1678e2e26e541d41d5894890cad57f4488a8
---
 .../modules/telemetry/files/common/resources.lua      | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

diff --git a/deployment_scripts/puppet/modules/telemetry/files/common/resources.lua b/deployment_scripts/puppet/modules/telemetry/files/common/resources.lua
index f70cb1f..6a9e508 100644
--- a/deployment_scripts/puppet/modules/telemetry/files/common/resources.lua
+++ b/deployment_scripts/puppet/modules/telemetry/files/common/resources.lua
@@ -68,11 +68,16 @@ function add_resource_to_payload(sample, payload)
     local counter_name, _ = string.gsub(sample.counter_name, "%.", "\\")
 
     local metadata = sample.resource_metadata
+    local local_metadata = {}
+
     if type(metadata) == 'table' then
         for name, value in ipairs(metadata) do
             local transform = transform_functions[name]
-            if transform ~= nil then
-                metadata[name] = transform(value)
+            if value ~= '' and value ~= nil then
+                if transform ~= nil then
+                    value = transform(value)
+                end
+                local_metadata[name] = value
             end
         end
     end
@@ -81,7 +86,7 @@ function add_resource_to_payload(sample, payload)
         timestamp = utils.format_datetime(sample.timestamp),
         resource_id = sample.resource_id,
         source = sample.source or "",
-        metadata = sample.resource_metadata,
+        metadata = local_metadata,
         user_id = sample.user_id,
         project_id = sample.project_id,
         meter = {