Filter out empty labels from ovs_parse_bridge script metrics
Change-Id: I53ad1ed611953db4c8b503d90045719765ac500d
Related-bug: PROD-33136
diff --git a/telegraf/files/script/ovs_parse_bridge.py b/telegraf/files/script/ovs_parse_bridge.py
index 19fc8f4..c694dfd 100644
--- a/telegraf/files/script/ovs_parse_bridge.py
+++ b/telegraf/files/script/ovs_parse_bridge.py
@@ -50,18 +50,16 @@
interface = interfaces[port['interfaces'][0][1]]
label_obj = {
- "bridge": bridge.get('name', '""'),
- "port": port.get('name', '""'),
- "interface": interface.get('name', '""'),
- "type": interface.get('type', '""'),
- "peer": interface.get('options', {}).get('peer', '""'),
+ "bridge": bridge.get('name'),
+ "port": port.get('name'),
+ "interface": interface.get('name'),
+ "type": interface.get('type'),
+ "peer": interface.get('options', {}).get('peer'),
}
- if label_obj['peer'] == '""':
- label_obj.pop('peer')
-
labels = ','.join(["{}={}".format(key, value)
- for key, value in label_obj.iteritems()])
+ for key, value in label_obj.iteritems()
+ if not (value is None or len(value) == 0)])
if interface['link_state'] == "up":
status = 1