aboutsummaryrefslogtreecommitdiffstats
path: root/resources
diff options
context:
space:
mode:
authorViliam Luc <vluc@cisco.com>2022-03-31 10:48:20 +0200
committerPeter Mikus <pmikus@cisco.com>2022-03-31 12:44:44 +0000
commit333d6f613a982c73a82456fdc611077544963688 (patch)
tree0d515dc3eece613c9a8bfab47980f9ca84e19598 /resources
parente2b220824914769fd9f4b245038cc31fb8425b18 (diff)
telemetry: fix Linux bundles
Signed-off-by: Viliam Luc <vluc@cisco.com> Change-Id: I71c795c211652f353d3afd81908d04969dd3e067
Diffstat (limited to 'resources')
-rw-r--r--resources/tools/telemetry/bundle_bpf.py4
-rw-r--r--resources/tools/telemetry/serializer.py3
2 files changed, 4 insertions, 3 deletions
diff --git a/resources/tools/telemetry/bundle_bpf.py b/resources/tools/telemetry/bundle_bpf.py
index 77bc9acf91..655152cb27 100644
--- a/resources/tools/telemetry/bundle_bpf.py
+++ b/resources/tools/telemetry/bundle_bpf.py
@@ -1,4 +1,4 @@
-# Copyright (c) 2021 Cisco and/or its affiliates.
+# Copyright (c) 2022 Cisco and/or its affiliates.
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
# You may obtain a copy of the License at:
@@ -96,7 +96,7 @@ class BundleBpf:
labels = dict()
item[u"name"] = metric[u"name"]
item[u"value"] = val.value
- for label in metric[u"labels"]:
+ for label in metric[u"labelnames"]:
labels[label] = getattr(key, label)
item[u"labels"] = labels
self.api_replies_list.append(item)
diff --git a/resources/tools/telemetry/serializer.py b/resources/tools/telemetry/serializer.py
index e8315c832d..3da857c0ab 100644
--- a/resources/tools/telemetry/serializer.py
+++ b/resources/tools/telemetry/serializer.py
@@ -1,4 +1,4 @@
-# Copyright (c) 2021 Cisco and/or its affiliates.
+# Copyright (c) 2022 Cisco and/or its affiliates.
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
# You may obtain a copy of the License at:
@@ -94,6 +94,7 @@ class Serializer:
if line.labels:
llabel = []
for k, value in sorted(line.labels.items()):
+ value = str(value)
value = value.replace(u"\\", r"\\")
value = value.replace(u"\n", r"\n")
value = value.replace(u'"', r'\"')