carbon_return.py.diff

-    for key, val in saltdata.items():
-        # XXX: force datatype, needs typechecks, etc
-        try:
-            val = float(val)
-            metrics.append((metric_base + '.' + key, val, timestamp))
-        except TypeError:
-            log.info('Error in carbon returner, when trying to convert metric:{0}, with val:{1}'.format(key, val))
+    for name, vals in saltdata.items():
+        for key, val in vals.items():
+            # XXX: force datatype, needs typechecks, etc
+            try:
+                val = float(val)
+                metrics.append((metric_base + '.' + _formatHostname(name) + '.' + key, val, timestamp))
+            except TypeError:
+                log.info('Error in carbon returner, when trying to convert metric:{0}, with val:{1}'.format(key, val)