X-Git-Url: https://gerrit.fd.io/r/gitweb?a=blobdiff_plain;f=resources%2Flibraries%2Fpython%2FTelemetryUtil.py;h=c978441d72ed79b7dfbacfa53c67b5baffce88ac;hb=5cd951da85f1d57451c1043c38162dccbb67a3e9;hp=3031647915b57385a0f50c2aaf5357347c19b40b;hpb=d255d2545ee6cdc871bc35314fad72c3c48b225b;p=csit.git

diff --git a/resources/libraries/python/TelemetryUtil.py b/resources/libraries/python/TelemetryUtil.py
index 3031647915..c978441d72 100644
--- a/resources/libraries/python/TelemetryUtil.py
+++ b/resources/libraries/python/TelemetryUtil.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:
@@ -11,9 +11,13 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-"""Linux perf utility."""
+"""Telemetry utility."""
+
+from robot.api import logger
+from time import sleep
 
 from resources.libraries.python.Constants import Constants
+from resources.libraries.python.VppCounters import VppCounters
 from resources.libraries.python.OptionString import OptionString
 from resources.libraries.python.ssh import exec_cmd, exec_cmd_no_error
 from resources.libraries.python.topology import NodeType
@@ -104,9 +108,18 @@ class TelemetryUtil:
         cd_cmd += f"{Constants.RESOURCES_TOOLS}"
 
         bin_cmd = f"python3 -m telemetry --config {config} --hook {hook}\""
+        hostname = node[u"host"]
 
         exec_cmd_no_error(node, f"{cd_cmd} && {bin_cmd}", sudo=True)
-        exec_cmd_no_error(node, f"cat /tmp/metric.prom", sudo=True)
+        stdout, _ = exec_cmd_no_error(
+            node, u"cat /tmp/metric.prom", sudo=True, log_stdout_err=False
+        )
+        logger.info(
+            u"# TYPE target info\n"
+            u"# HELP target Target metadata\n"
+            f"target_info{{hostname=\"{hostname}\",hook=\"{hook}\"}} 1\n"
+            f"{stdout}"
+        )
 
     @staticmethod
     def run_telemetry_on_all_duts(nodes, profile):
@@ -122,7 +135,7 @@ class TelemetryUtil:
         for node in nodes.values():
             if node[u"type"] == NodeType.DUT:
                 try:
-                    for socket in node[u"sockets"][u"PAPI"].values():
+                    for socket in node[u"sockets"][u"CLI"].values():
                         TelemetryUtil.run_telemetry(
                             node, profile=profile, hook=socket
                         )