diff --git a/0003-adapt-to-abnormal-event-format-change.patch b/0003-adapt-to-abnormal-event-format-change.patch new file mode 100644 index 0000000000000000000000000000000000000000..3c3f5bf3f4f3cfe9aead73e648141505c4aa93ab --- /dev/null +++ b/0003-adapt-to-abnormal-event-format-change.patch @@ -0,0 +1,38 @@ +From 54a51f5aae1d8045c360fbafa9ad9705e5e95b28 Mon Sep 17 00:00:00 2001 +From: zhaoyuxing +Date: Mon, 29 Aug 2022 16:36:03 +0800 +Subject: [PATCH] adapt to abnormal event format change in gala-spider + +--- + gala-spider/cause_inference/cause_infer.py | 6 ++++-- + 1 file changed, 4 insertions(+), 2 deletions(-) + +diff --git a/gala-spider/cause_inference/cause_infer.py b/gala-spider/cause_inference/cause_infer.py +index f4b5396..9b06ec0 100644 +--- a/gala-spider/cause_inference/cause_infer.py ++++ b/gala-spider/cause_inference/cause_infer.py +@@ -67,7 +67,7 @@ def complete_key_info_of_metric(metric_labels, observe_entity): + + + def query_abnormal_topo_subgraph(abnormal_event: AbnormalEvent): +- abn_ts = int(float(abnormal_event.timestamp)) ++ abn_ts = int(float(abnormal_event.timestamp)) // 1000 + abn_metric_id = abnormal_event.abnormal_metric_id + abn_metric_labels = abnormal_event.metric_labels + +@@ -123,9 +123,11 @@ def parse_abn_evt(data) -> AbnormalEvent: + resource = data.get('Resource') + if not resource: + raise DataParseException('Atribute "Resource" required in abnormal event') ++ if not resource.get('metrics'): ++ raise DataParseException('Atribute "Resource.metrics" required in abnormal event') + abn_evt = AbnormalEvent( + data.get('Timestamp'), +- resource.get('metric_id'), ++ resource.get('metrics'), + 1.0, + resource.get('metric_label') + ) +-- +2.36.1 + diff --git a/A-Ops.spec b/A-Ops.spec index 10d0e9f162fb2dacf419be46f120dd2147313646..f71e88683a410e2d4a771c95d53a5de324131bce 100644 --- a/A-Ops.spec +++ b/A-Ops.spec @@ -14,6 +14,7 @@ patch0001: 0001-modify-to-adapt-to-oe2209-x86.patch patch0001: 0001-modify-to-adapt-to-oe2209-arm.patch %endif patch0002: 0002-fix-gopher-metadata-report.patch +patch0003: 0003-adapt-to-abnormal-event-format-change.patch # build for web @@ -175,6 +176,7 @@ tools for aops, it's about agent deploy %setup -T -D -a 1 %patch0001 -p1 %patch0002 -p1 +%patch0003 -p1 cp -rf A-Ops-web-node-modules/node_modules aops-web/ @@ -481,6 +483,9 @@ fi %changelog +* Mon Aug 29 2022 zhaoyuxing - v1.2.3-3 +- bug fix: gala-spider adapt to abnormal event format change. + * Mon Aug 29 2022 zhaoyuxing - v1.2.3-2 - bug fix: bugfix for gopher report metadata to kafka.