From a6767d746dc42caabdfc62be99585d21c64955ee Mon Sep 17 00:00:00 2001 From: fuwx Date: Tue, 4 Mar 2025 16:46:58 +0800 Subject: [PATCH] fix timeseries --- .../builtin_tool/providers/apo_analysis/tools/threshold.py | 2 +- .../builtin_tool/providers/apo_select/tools/container_cpu.py | 4 +++- .../builtin_tool/providers/apo_select/tools/container_rss.py | 4 +++- .../builtin_tool/providers/apo_select/tools/container_rtt.py | 4 +++- .../builtin_tool/providers/apo_select/tools/select_cpu.py | 4 +++- 5 files changed, 13 insertions(+), 5 deletions(-) diff --git a/api/core/tools/builtin_tool/providers/apo_analysis/tools/threshold.py b/api/core/tools/builtin_tool/providers/apo_analysis/tools/threshold.py index b6f0dd029e..4fa50ff47f 100644 --- a/api/core/tools/builtin_tool/providers/apo_analysis/tools/threshold.py +++ b/api/core/tools/builtin_tool/providers/apo_analysis/tools/threshold.py @@ -19,7 +19,7 @@ class ThresholdTool(BuiltinTool): metric_data = json.loads(metric) threshold = float(tool_parameters.get('threshold')) res = [] - for serie in metric_data['data']: + for serie in metric_data['data']['timeseries']: tmpres = { "name": serie['legend'], "data": {}, diff --git a/api/core/tools/builtin_tool/providers/apo_select/tools/container_cpu.py b/api/core/tools/builtin_tool/providers/apo_select/tools/container_cpu.py index 1f64477139..40d2641ca2 100644 --- a/api/core/tools/builtin_tool/providers/apo_select/tools/container_cpu.py +++ b/api/core/tools/builtin_tool/providers/apo_select/tools/container_cpu.py @@ -38,6 +38,8 @@ class SelectContainerCPUTool(BuiltinTool): 'type': 'cpu', 'display': True, 'unit': list['unit'], - 'data': list['timeseries'] + 'data': { + "timeseries": list['timeseries'] + } }) yield self.create_text_message(list) \ No newline at end of file diff --git a/api/core/tools/builtin_tool/providers/apo_select/tools/container_rss.py b/api/core/tools/builtin_tool/providers/apo_select/tools/container_rss.py index fedd516ddc..ca0e85c687 100644 --- a/api/core/tools/builtin_tool/providers/apo_select/tools/container_rss.py +++ b/api/core/tools/builtin_tool/providers/apo_select/tools/container_rss.py @@ -38,6 +38,8 @@ class SelectContainerRSSTool(BuiltinTool): 'type': 'memory', 'display': True, 'unit': list['unit'], - 'data': list['timeseries'] + 'data': { + "timeseries": list['timeseries'] + } }) yield self.create_text_message(list) \ No newline at end of file diff --git a/api/core/tools/builtin_tool/providers/apo_select/tools/container_rtt.py b/api/core/tools/builtin_tool/providers/apo_select/tools/container_rtt.py index 82c898c261..2911fbd4fd 100644 --- a/api/core/tools/builtin_tool/providers/apo_select/tools/container_rtt.py +++ b/api/core/tools/builtin_tool/providers/apo_select/tools/container_rtt.py @@ -38,6 +38,8 @@ class ContainerRTTTool(BuiltinTool): 'type': 'memory', 'display': True, 'unit': list['unit'], - 'data': list['timeseries'] + 'data': { + "timeseries": list['timeseries'] + } }) yield self.create_text_message(list) \ No newline at end of file diff --git a/api/core/tools/builtin_tool/providers/apo_select/tools/select_cpu.py b/api/core/tools/builtin_tool/providers/apo_select/tools/select_cpu.py index 0917427054..bb437db254 100644 --- a/api/core/tools/builtin_tool/providers/apo_select/tools/select_cpu.py +++ b/api/core/tools/builtin_tool/providers/apo_select/tools/select_cpu.py @@ -36,6 +36,8 @@ class SelectCPUTool(BuiltinTool): 'type': 'cpu', 'display': True, 'unit': list['unit'], - 'data': list['timeseries'] + 'data': { + "timeseries": list['timeseries'] + } }) yield self.create_text_message(list) \ No newline at end of file