Compare commits
10 Commits
669fecb290
...
24cea3f16d
| Author | SHA1 | Date | |
|---|---|---|---|
|
24cea3f16d | ||
|
|
0463cc2d96 | ||
|
|
eb675bc951 | ||
|
|
74ee6c5081 | ||
|
|
75fbc79182 | ||
|
|
fe16165b74 | ||
|
|
eb2016b741 | ||
|
|
4044b8ccdb | ||
|
|
2f3d180c2f | ||
|
|
edb924e83d |
273
0001-add-diana-sql-script.patch
Normal file
273
0001-add-diana-sql-script.patch
Normal file
@ -0,0 +1,273 @@
|
|||||||
|
From 0298776c0ae0ce230d2993b570abc68c9b3f9f42 Mon Sep 17 00:00:00 2001
|
||||||
|
From: gongzt <gong_zhengtang@163.com>
|
||||||
|
Date: Tue, 19 Sep 2023 10:29:18 +0800
|
||||||
|
Subject: [PATCH 1/1] add the sql script
|
||||||
|
MIME-Version: 1.0
|
||||||
|
Content-Type: text/plain; charset=UTF-8
|
||||||
|
Content-Transfer-Encoding: 8bit
|
||||||
|
|
||||||
|
---
|
||||||
|
aops-diana.spec | 10 ++-
|
||||||
|
database/diana.sql | 88 ++++++++++++++++++++++++
|
||||||
|
doc/design/aops-diana数据库设计.sql | 54 +++++++--------
|
||||||
|
setup.py | 3 +-
|
||||||
|
4 files changed, 122 insertions(+), 33 deletions(-)
|
||||||
|
create mode 100644 database/diana.sql
|
||||||
|
|
||||||
|
diff --git a/aops-diana.spec b/aops-diana.spec
|
||||||
|
index 259956e..ef6fcd2 100644
|
||||||
|
--- a/aops-diana.spec
|
||||||
|
+++ b/aops-diana.spec
|
||||||
|
@@ -1,5 +1,5 @@
|
||||||
|
Name: aops-diana
|
||||||
|
-Version: v1.2.0
|
||||||
|
+Version: v1.3.0
|
||||||
|
Release: 1
|
||||||
|
Summary: An intelligent abnormal detection framework of aops
|
||||||
|
License: MulanPSL2
|
||||||
|
@@ -9,7 +9,7 @@ Source0: %{name}-%{version}.tar.gz
|
||||||
|
BuildRequires: python3-setuptools
|
||||||
|
Requires: aops-vulcanus >= v1.2.0
|
||||||
|
Requires: python3-requests python3-flask python3-flask-restful python3-marshmallow >= 3.13.0
|
||||||
|
-Requires: python3-numpy python3-pandas python3-prometheus-api-client
|
||||||
|
+Requires: python3-numpy python3-pandas python3-prometheus-api-client python3-uWSGI
|
||||||
|
Requires: python3-sqlalchemy python3-PyMySQL python3-Flask-APScheduler >= 1.11.0
|
||||||
|
Requires: python3-scipy python3-adtk
|
||||||
|
Provides: aops-diana
|
||||||
|
@@ -30,6 +30,8 @@ An intelligent abnormal detection framework of aops
|
||||||
|
|
||||||
|
# install for aops-diana
|
||||||
|
%py3_install
|
||||||
|
+mkdir -p %{buildroot}/opt/aops/
|
||||||
|
+cp -r database %{buildroot}/opt/aops/
|
||||||
|
|
||||||
|
|
||||||
|
%files
|
||||||
|
@@ -42,9 +44,13 @@ An intelligent abnormal detection framework of aops
|
||||||
|
%attr(0755,root,root) /usr/lib/systemd/system/aops-diana.service
|
||||||
|
%{python3_sitelib}/aops_diana*.egg-info
|
||||||
|
%{python3_sitelib}/diana/*
|
||||||
|
+%attr(0755, root, root) /opt/aops/database/*
|
||||||
|
|
||||||
|
|
||||||
|
%changelog
|
||||||
|
+* Mon Sep 18 2023 gongzhengtang<gong_zhengtang@163.com> - v1.3.0-1
|
||||||
|
+- Support sql script to create tables
|
||||||
|
+
|
||||||
|
* Fri Mar 24 2023 gongzhengtang<gong_zhengtang@163.com> - v1.2.0-1
|
||||||
|
- update the structure of response body; update how to get session used to
|
||||||
|
- connect to the database
|
||||||
|
diff --git a/database/diana.sql b/database/diana.sql
|
||||||
|
new file mode 100644
|
||||||
|
index 0000000..d4452c4
|
||||||
|
--- /dev/null
|
||||||
|
+++ b/database/diana.sql
|
||||||
|
@@ -0,0 +1,88 @@
|
||||||
|
+use aops;
|
||||||
|
+
|
||||||
|
+CREATE TABLE IF NOT EXISTS `domain_check_result` (
|
||||||
|
+ `alert_id` CHAR(32) NOT NULL,
|
||||||
|
+ `domain` CHAR(20) NOT NULL,
|
||||||
|
+ `alert_name` CHAR(50) NULL,
|
||||||
|
+ `time` INT(11) NULL,
|
||||||
|
+ `workflow_name` CHAR(50) NULL,
|
||||||
|
+ `workflow_id` CHAR(32) NULL,
|
||||||
|
+ `username` CHAR(20) NULL,
|
||||||
|
+ `level` CHAR(20) NULL,
|
||||||
|
+ `confirmed` TINYINT(1) NULL,
|
||||||
|
+ PRIMARY KEY (`alert_id`)
|
||||||
|
+) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_general_ci ROW_FORMAT=DYNAMIC ;
|
||||||
|
+
|
||||||
|
+CREATE TABLE IF NOT EXISTS `alert_host` (
|
||||||
|
+ `alert_id` CHAR(32) NOT NULL,
|
||||||
|
+ `host_id` CHAR(32) NOT NULL,
|
||||||
|
+ `host_ip` CHAR(32) NULL,
|
||||||
|
+ `host_name` CHAR(50) NULL,
|
||||||
|
+ PRIMARY KEY (`host_id`,`alert_id`),
|
||||||
|
+ KEY `FK__alert_id_auto_index` (`alert_id`),
|
||||||
|
+ KEY `FK_alert_with_host_host_id_auto_index` (`host_id`),
|
||||||
|
+ CONSTRAINT `FK_alert_host_alert_id` FOREIGN KEY (`alert_id`) REFERENCES `domain_check_result` (`alert_id`) ON DELETE RESTRICT ON UPDATE RESTRICT
|
||||||
|
+) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_general_ci ROW_FORMAT=DYNAMIC ;
|
||||||
|
+
|
||||||
|
+CREATE TABLE IF NOT EXISTS `algorithm` (
|
||||||
|
+ `algo_id` INT(11) NOT NULL,
|
||||||
|
+ `path` CHAR(150) NULL,
|
||||||
|
+ `username` CHAR(10) NULL,
|
||||||
|
+ `algo_name` CHAR(20) NOT NULL,
|
||||||
|
+ `field` CHAR(20) NOT NULL,
|
||||||
|
+ `description` LONGTEXT NULL,
|
||||||
|
+ PRIMARY KEY (`algo_id`)
|
||||||
|
+) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_general_ci ROW_FORMAT=DYNAMIC ;
|
||||||
|
+
|
||||||
|
+CREATE TABLE IF NOT EXISTS `host_check_result` (
|
||||||
|
+ `id` INT(11) NOT NULL,
|
||||||
|
+ `time` INT(11) NOT NULL,
|
||||||
|
+ `is_root` TINYINT(1) NULL,
|
||||||
|
+ `host_id` CHAR(32) NOT NULL,
|
||||||
|
+ `metric_name` CHAR(50) NULL,
|
||||||
|
+ `alert_id` CHAR(32) NOT NULL,
|
||||||
|
+ `metric_label` CHAR(255) NULL,
|
||||||
|
+ PRIMARY KEY (`id`),
|
||||||
|
+ KEY `host_id_auto_index` (`host_id`),
|
||||||
|
+ KEY `alert_id_auto_index` (`alert_id`),
|
||||||
|
+ CONSTRAINT `FK_host_check_result_host_id` FOREIGN KEY (`host_id`) REFERENCES `alert_host` (`host_id`) ON DELETE RESTRICT ON UPDATE RESTRICT ,
|
||||||
|
+ CONSTRAINT `FK_host_check_result_alert_id` FOREIGN KEY (`alert_id`) REFERENCES `domain_check_result` (`alert_id`) ON DELETE RESTRICT ON UPDATE RESTRICT
|
||||||
|
+) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_general_ci ROW_FORMAT=DYNAMIC ;
|
||||||
|
+
|
||||||
|
+CREATE TABLE IF NOT EXISTS `model` (
|
||||||
|
+ `model_id` INT(11) NOT NULL,
|
||||||
|
+ `username` CHAR(40) NULL,
|
||||||
|
+ `model_name` CHAR(10) NULL,
|
||||||
|
+ `tag` CHAR(255) NULL,
|
||||||
|
+ `algo_id` INT(11) NULL,
|
||||||
|
+ `create_time` INT(11) NULL,
|
||||||
|
+ `file_path` CHAR(64) NULL,
|
||||||
|
+ `precision` DOUBLE NULL,
|
||||||
|
+ PRIMARY KEY (`model_id`),
|
||||||
|
+ KEY `algo_id_auto_index` (`algo_id`),
|
||||||
|
+ CONSTRAINT `FK_model_algo_id` FOREIGN KEY (`algo_id`) REFERENCES `algorithm` (`algo_id`) ON DELETE RESTRICT ON UPDATE RESTRICT
|
||||||
|
+) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_general_ci ROW_FORMAT=DYNAMIC ;
|
||||||
|
+
|
||||||
|
+CREATE TABLE IF NOT EXISTS `workflow` (
|
||||||
|
+ `workflow_id` CHAR(20) NOT NULL,
|
||||||
|
+ `workflow_name` CHAR(10) NOT NULL,
|
||||||
|
+ `status` CHAR(12) NOT NULL,
|
||||||
|
+ `description` CHAR(50) NULL,
|
||||||
|
+ `app_name` CHAR(10) NOT NULL,
|
||||||
|
+ `app_id` CHAR(10) NOT NULL,
|
||||||
|
+ `step` INT(11) NOT NULL,
|
||||||
|
+ `period` INT(11) NOT NULL,
|
||||||
|
+ `domain` CHAR(20) NOT NULL,
|
||||||
|
+ `username` CHAR(40) NOT NULL,
|
||||||
|
+ PRIMARY KEY (`workflow_id`)
|
||||||
|
+) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_general_ci ROW_FORMAT=DYNAMIC ;
|
||||||
|
+
|
||||||
|
+CREATE TABLE IF NOT EXISTS `workflow_host` (
|
||||||
|
+ `host_id` CHAR(32) NOT NULL,
|
||||||
|
+ `workflow_id` CHAR(10) NULL,
|
||||||
|
+ `host_name` CHAR(20) NULL,
|
||||||
|
+ `host_ip` CHAR(16) NULL,
|
||||||
|
+ PRIMARY KEY (`host_id`),
|
||||||
|
+ KEY `workflow_id_auto_index` (`workflow_id`),
|
||||||
|
+ CONSTRAINT `FK_workflow_workflow_id` FOREIGN KEY (`workflow_id`) REFERENCES `workflow` (`workflow_id`) ON DELETE RESTRICT ON UPDATE RESTRICT
|
||||||
|
+) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_general_ci ROW_FORMAT=DYNAMIC ;
|
||||||
|
diff --git a/doc/design/aops-diana数据库设计.sql b/doc/design/aops-diana数据库设计.sql
|
||||||
|
index 33e05f8..d4452c4 100644
|
||||||
|
--- a/doc/design/aops-diana数据库设计.sql
|
||||||
|
+++ b/doc/design/aops-diana数据库设计.sql
|
||||||
|
@@ -1,3 +1,18 @@
|
||||||
|
+use aops;
|
||||||
|
+
|
||||||
|
+CREATE TABLE IF NOT EXISTS `domain_check_result` (
|
||||||
|
+ `alert_id` CHAR(32) NOT NULL,
|
||||||
|
+ `domain` CHAR(20) NOT NULL,
|
||||||
|
+ `alert_name` CHAR(50) NULL,
|
||||||
|
+ `time` INT(11) NULL,
|
||||||
|
+ `workflow_name` CHAR(50) NULL,
|
||||||
|
+ `workflow_id` CHAR(32) NULL,
|
||||||
|
+ `username` CHAR(20) NULL,
|
||||||
|
+ `level` CHAR(20) NULL,
|
||||||
|
+ `confirmed` TINYINT(1) NULL,
|
||||||
|
+ PRIMARY KEY (`alert_id`)
|
||||||
|
+) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_general_ci ROW_FORMAT=DYNAMIC ;
|
||||||
|
+
|
||||||
|
CREATE TABLE IF NOT EXISTS `alert_host` (
|
||||||
|
`alert_id` CHAR(32) NOT NULL,
|
||||||
|
`host_id` CHAR(32) NOT NULL,
|
||||||
|
@@ -5,7 +20,8 @@ CREATE TABLE IF NOT EXISTS `alert_host` (
|
||||||
|
`host_name` CHAR(50) NULL,
|
||||||
|
PRIMARY KEY (`host_id`,`alert_id`),
|
||||||
|
KEY `FK__alert_id_auto_index` (`alert_id`),
|
||||||
|
- KEY `FK_alert_with_host_host_id_auto_index` (`host_id`)
|
||||||
|
+ KEY `FK_alert_with_host_host_id_auto_index` (`host_id`),
|
||||||
|
+ CONSTRAINT `FK_alert_host_alert_id` FOREIGN KEY (`alert_id`) REFERENCES `domain_check_result` (`alert_id`) ON DELETE RESTRICT ON UPDATE RESTRICT
|
||||||
|
) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_general_ci ROW_FORMAT=DYNAMIC ;
|
||||||
|
|
||||||
|
CREATE TABLE IF NOT EXISTS `algorithm` (
|
||||||
|
@@ -18,19 +34,6 @@ CREATE TABLE IF NOT EXISTS `algorithm` (
|
||||||
|
PRIMARY KEY (`algo_id`)
|
||||||
|
) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_general_ci ROW_FORMAT=DYNAMIC ;
|
||||||
|
|
||||||
|
-CREATE TABLE IF NOT EXISTS `domain_check_result` (
|
||||||
|
- `alert_id` CHAR(32) NOT NULL,
|
||||||
|
- `domain` CHAR(20) NOT NULL,
|
||||||
|
- `alert_name` CHAR(50) NULL,
|
||||||
|
- `time` INT(11) NULL,
|
||||||
|
- `workflow_name` CHAR(50) NULL,
|
||||||
|
- `workflow_id` CHAR(32) NULL,
|
||||||
|
- `username` CHAR(20) NULL,
|
||||||
|
- `level` CHAR(20) NULL,
|
||||||
|
- `confirmed` TINYINT(1) NULL,
|
||||||
|
- PRIMARY KEY (`alert_id`)
|
||||||
|
-) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_general_ci ROW_FORMAT=DYNAMIC ;
|
||||||
|
-
|
||||||
|
CREATE TABLE IF NOT EXISTS `host_check_result` (
|
||||||
|
`id` INT(11) NOT NULL,
|
||||||
|
`time` INT(11) NOT NULL,
|
||||||
|
@@ -41,7 +44,9 @@ CREATE TABLE IF NOT EXISTS `host_check_result` (
|
||||||
|
`metric_label` CHAR(255) NULL,
|
||||||
|
PRIMARY KEY (`id`),
|
||||||
|
KEY `host_id_auto_index` (`host_id`),
|
||||||
|
- KEY `alert_id_auto_index` (`alert_id`)
|
||||||
|
+ KEY `alert_id_auto_index` (`alert_id`),
|
||||||
|
+ CONSTRAINT `FK_host_check_result_host_id` FOREIGN KEY (`host_id`) REFERENCES `alert_host` (`host_id`) ON DELETE RESTRICT ON UPDATE RESTRICT ,
|
||||||
|
+ CONSTRAINT `FK_host_check_result_alert_id` FOREIGN KEY (`alert_id`) REFERENCES `domain_check_result` (`alert_id`) ON DELETE RESTRICT ON UPDATE RESTRICT
|
||||||
|
) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_general_ci ROW_FORMAT=DYNAMIC ;
|
||||||
|
|
||||||
|
CREATE TABLE IF NOT EXISTS `model` (
|
||||||
|
@@ -54,7 +59,8 @@ CREATE TABLE IF NOT EXISTS `model` (
|
||||||
|
`file_path` CHAR(64) NULL,
|
||||||
|
`precision` DOUBLE NULL,
|
||||||
|
PRIMARY KEY (`model_id`),
|
||||||
|
- KEY `algo_id_auto_index` (`algo_id`)
|
||||||
|
+ KEY `algo_id_auto_index` (`algo_id`),
|
||||||
|
+ CONSTRAINT `FK_model_algo_id` FOREIGN KEY (`algo_id`) REFERENCES `algorithm` (`algo_id`) ON DELETE RESTRICT ON UPDATE RESTRICT
|
||||||
|
) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_general_ci ROW_FORMAT=DYNAMIC ;
|
||||||
|
|
||||||
|
CREATE TABLE IF NOT EXISTS `workflow` (
|
||||||
|
@@ -77,18 +83,6 @@ CREATE TABLE IF NOT EXISTS `workflow_host` (
|
||||||
|
`host_name` CHAR(20) NULL,
|
||||||
|
`host_ip` CHAR(16) NULL,
|
||||||
|
PRIMARY KEY (`host_id`),
|
||||||
|
- KEY `workflow_id_auto_index` (`workflow_id`)
|
||||||
|
+ KEY `workflow_id_auto_index` (`workflow_id`),
|
||||||
|
+ CONSTRAINT `FK_workflow_workflow_id` FOREIGN KEY (`workflow_id`) REFERENCES `workflow` (`workflow_id`) ON DELETE RESTRICT ON UPDATE RESTRICT
|
||||||
|
) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_general_ci ROW_FORMAT=DYNAMIC ;
|
||||||
|
-
|
||||||
|
-ALTER TABLE alert_host
|
||||||
|
-ADD CONSTRAINT `FK_alert_with_host_alert_id` FOREIGN KEY (`alert_id`) REFERENCES `domain_check_result` (`alert_id`) ON DELETE RESTRICT ON UPDATE RESTRICT ;
|
||||||
|
-
|
||||||
|
-ALTER TABLE host_check_result
|
||||||
|
-ADD CONSTRAINT `host_id` FOREIGN KEY (`host_id`) REFERENCES `alert_host` (`host_id`) ON DELETE RESTRICT ON UPDATE RESTRICT ,
|
||||||
|
-ADD CONSTRAINT `alert_id` FOREIGN KEY (`alert_id`) REFERENCES `domain_check_result` (`alert_id`) ON DELETE RESTRICT ON UPDATE RESTRICT ;
|
||||||
|
-
|
||||||
|
-ALTER TABLE model
|
||||||
|
-ADD CONSTRAINT `algo_id` FOREIGN KEY (`algo_id`) REFERENCES `algorithm` (`algo_id`) ON DELETE RESTRICT ON UPDATE RESTRICT ;
|
||||||
|
-
|
||||||
|
-ALTER TABLE workflow_host
|
||||||
|
-ADD CONSTRAINT `workflow_id` FOREIGN KEY (`workflow_id`) REFERENCES `workflow` (`workflow_id`) ON DELETE RESTRICT ON UPDATE RESTRICT ;
|
||||||
|
\ No newline at end of file
|
||||||
|
diff --git a/setup.py b/setup.py
|
||||||
|
index fe81380..78b696a 100644
|
||||||
|
--- a/setup.py
|
||||||
|
+++ b/setup.py
|
||||||
|
@@ -3,7 +3,7 @@
|
||||||
|
from setuptools import setup, find_packages
|
||||||
|
|
||||||
|
NAME = "aops-diana"
|
||||||
|
-VERSION = "1.1.0"
|
||||||
|
+VERSION = "1.3.0"
|
||||||
|
|
||||||
|
# To install the library, run the following
|
||||||
|
#
|
||||||
|
@@ -60,6 +60,7 @@ setup(
|
||||||
|
('/etc/aops/algorithm/intelligent/lvs', ['conf/model/intelligent/lvs/rule1_gala_gopher_cpu_net_rx']),
|
||||||
|
('/etc/aops/algorithm/intelligent/lvs', ['conf/model/intelligent/lvs/rule2_gala_gopher_nic_tc_backlog']),
|
||||||
|
('/usr/lib/systemd/system', ['aops-diana.service']),
|
||||||
|
+ ("/opt/aops/database", ["database/diana.sql"]),
|
||||||
|
],
|
||||||
|
scripts=['aops-diana'],
|
||||||
|
zip_safe=False,
|
||||||
|
--
|
||||||
|
2.33.1.windows.1
|
||||||
|
|
||||||
@ -1,34 +0,0 @@
|
|||||||
From 7c959cb4b2683b23832e8a78835b57d8b9ad7bcc Mon Sep 17 00:00:00 2001
|
|
||||||
From: zhu-yuncheng <zhuyuncheng@huawei.com>
|
|
||||||
Date: Wed, 7 Dec 2022 21:43:20 +0800
|
|
||||||
Subject: [PATCH] update default model for multicheck
|
|
||||||
|
|
||||||
---
|
|
||||||
diana/core/rule/model_assign.py | 10 +++++-----
|
|
||||||
1 file changed, 5 insertions(+), 5 deletions(-)
|
|
||||||
|
|
||||||
diff --git a/diana/core/rule/model_assign.py b/diana/core/rule/model_assign.py
|
|
||||||
index 6868f99..fe24557 100644
|
|
||||||
--- a/diana/core/rule/model_assign.py
|
|
||||||
+++ b/diana/core/rule/model_assign.py
|
|
||||||
@@ -27,12 +27,12 @@ METRIC_MODEL_MAP = {
|
|
||||||
}
|
|
||||||
|
|
||||||
SCENE_MODEL_MAP = {
|
|
||||||
- "default_model": "intelligent-1", # intelligent
|
|
||||||
+ "default_model": "intelligent-for-mysql", # intelligent model for mysql
|
|
||||||
"model_info": {
|
|
||||||
- "big_data": "intelligent-1", # intelligent
|
|
||||||
- "web": "intelligent-1", # intelligent
|
|
||||||
- "edge": "intelligent-1", # intelligent
|
|
||||||
- "cloud": "intelligent-1", # intelligent
|
|
||||||
+ "big_data": "intelligent-for-mysql", # intelligent model for mysql
|
|
||||||
+ "web": "intelligent-for-mysql", # intelligent model for mysql
|
|
||||||
+ "edge": "intelligent-for-mysql", # intelligent model for mysql
|
|
||||||
+ "cloud": "intelligent-for-mysql", # intelligent model for mysql
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
--
|
|
||||||
2.33.0
|
|
||||||
|
|
||||||
@ -1,63 +0,0 @@
|
|||||||
From 36de2919c2d9f6ea3bc893ec7d0e72750b1e4805 Mon Sep 17 00:00:00 2001
|
|
||||||
From: zhu-yuncheng <zhuyuncheng@huawei.com>
|
|
||||||
Date: Thu, 8 Dec 2022 22:01:31 +0800
|
|
||||||
Subject: [PATCH] better ai model logic and fix count alert error
|
|
||||||
|
|
||||||
---
|
|
||||||
.../experiment/algorithm/multi_item_check/intelligent.py | 8 +++++++-
|
|
||||||
diana/core/rule/workflow.py | 2 +-
|
|
||||||
diana/database/dao/result_dao.py | 3 +--
|
|
||||||
3 files changed, 9 insertions(+), 4 deletions(-)
|
|
||||||
|
|
||||||
diff --git a/diana/core/experiment/algorithm/multi_item_check/intelligent.py b/diana/core/experiment/algorithm/multi_item_check/intelligent.py
|
|
||||||
index fc4b223..c96f011 100644
|
|
||||||
--- a/diana/core/experiment/algorithm/multi_item_check/intelligent.py
|
|
||||||
+++ b/diana/core/experiment/algorithm/multi_item_check/intelligent.py
|
|
||||||
@@ -125,7 +125,13 @@ class Intelligent(BaseMultiItemAlgorithmTwo):
|
|
||||||
if fusion_strategy == 'intersection':
|
|
||||||
for column in concat_result.columns:
|
|
||||||
concat_result['total'] = concat_result['total'] & concat_result[column]
|
|
||||||
- if concat_result[concat_result['total'] == True].shape[0] > 0:
|
|
||||||
+
|
|
||||||
+ time = pd.to_datetime(time_range[1] - 600, unit='s')
|
|
||||||
+ index = concat_result.index
|
|
||||||
+ select_index = index[index > time]
|
|
||||||
+ select_result = concat_result.loc[select_index]
|
|
||||||
+
|
|
||||||
+ if select_result[select_result['total'] == True].shape[0] > 0:
|
|
||||||
return True
|
|
||||||
|
|
||||||
return False
|
|
||||||
diff --git a/diana/core/rule/workflow.py b/diana/core/rule/workflow.py
|
|
||||||
index 475378e..47df2f8 100644
|
|
||||||
--- a/diana/core/rule/workflow.py
|
|
||||||
+++ b/diana/core/rule/workflow.py
|
|
||||||
@@ -205,7 +205,7 @@ class Workflow:
|
|
||||||
return DATABASE_CONNECT_ERROR
|
|
||||||
|
|
||||||
# data time range should based on the algorithm in the future
|
|
||||||
- data_time_range = [time_range[1]-900, time_range[1]]
|
|
||||||
+ data_time_range = [time_range[1]-1500, time_range[1]]
|
|
||||||
data_status, monitor_data = data_dao.query_data(
|
|
||||||
time_range=data_time_range, host_list=hosts)
|
|
||||||
|
|
||||||
diff --git a/diana/database/dao/result_dao.py b/diana/database/dao/result_dao.py
|
|
||||||
index 347e2c5..45428d6 100644
|
|
||||||
--- a/diana/database/dao/result_dao.py
|
|
||||||
+++ b/diana/database/dao/result_dao.py
|
|
||||||
@@ -306,11 +306,10 @@ class ResultDao(MysqlProxy):
|
|
||||||
try:
|
|
||||||
fliters = {
|
|
||||||
DomainCheckResult.username == data['username'],
|
|
||||||
- DomainCheckResult.alert_id == AlertHost.alert_id,
|
|
||||||
DomainCheckResult.confirmed == 0
|
|
||||||
}
|
|
||||||
alert_count_query = self.session.query(
|
|
||||||
- func.count(AlertHost.alert_id)).filter(*fliters).scalar()
|
|
||||||
+ func.count(DomainCheckResult.alert_id)).filter(*fliters).scalar()
|
|
||||||
|
|
||||||
except SQLAlchemyError as error:
|
|
||||||
LOGGER.error(error)
|
|
||||||
--
|
|
||||||
2.33.0
|
|
||||||
|
|
||||||
201
0002-fix-database-type-error.patch
Normal file
201
0002-fix-database-type-error.patch
Normal file
@ -0,0 +1,201 @@
|
|||||||
|
From d29fa8f2fa6e5f23d9462b438a3dd5cf29a4bb02 Mon Sep 17 00:00:00 2001
|
||||||
|
From: gongzt <gong_zhengtang@163.com>
|
||||||
|
Date: Mon, 25 Sep 2023 18:30:28 +0800
|
||||||
|
Subject: fix database type error
|
||||||
|
MIME-Version: 1.0
|
||||||
|
Content-Type: text/plain; charset=UTF-8
|
||||||
|
Content-Transfer-Encoding: 8bit
|
||||||
|
|
||||||
|
---
|
||||||
|
database/diana.sql | 146 +++++++++++++++++-----------------
|
||||||
|
diana/database/dao/app_dao.py | 4 +-
|
||||||
|
2 files changed, 75 insertions(+), 75 deletions(-)
|
||||||
|
|
||||||
|
diff --git a/database/diana.sql b/database/diana.sql
|
||||||
|
index d4452c4..a251f21 100644
|
||||||
|
--- a/database/diana.sql
|
||||||
|
+++ b/database/diana.sql
|
||||||
|
@@ -1,88 +1,88 @@
|
||||||
|
use aops;
|
||||||
|
|
||||||
|
CREATE TABLE IF NOT EXISTS `domain_check_result` (
|
||||||
|
- `alert_id` CHAR(32) NOT NULL,
|
||||||
|
- `domain` CHAR(20) NOT NULL,
|
||||||
|
- `alert_name` CHAR(50) NULL,
|
||||||
|
- `time` INT(11) NULL,
|
||||||
|
- `workflow_name` CHAR(50) NULL,
|
||||||
|
- `workflow_id` CHAR(32) NULL,
|
||||||
|
- `username` CHAR(20) NULL,
|
||||||
|
- `level` CHAR(20) NULL,
|
||||||
|
- `confirmed` TINYINT(1) NULL,
|
||||||
|
- PRIMARY KEY (`alert_id`)
|
||||||
|
-) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_general_ci ROW_FORMAT=DYNAMIC ;
|
||||||
|
+ `alert_id` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NOT NULL,
|
||||||
|
+ `domain` varchar(20) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NOT NULL,
|
||||||
|
+ `alert_name` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NULL DEFAULT NULL,
|
||||||
|
+ `time` int NOT NULL,
|
||||||
|
+ `workflow_name` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NOT NULL,
|
||||||
|
+ `workflow_id` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NOT NULL,
|
||||||
|
+ `username` varchar(20) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NULL DEFAULT NULL,
|
||||||
|
+ `level` varchar(20) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NULL DEFAULT NULL,
|
||||||
|
+ `confirmed` tinyint(1) NULL DEFAULT NULL,
|
||||||
|
+ PRIMARY KEY (`alert_id`) USING BTREE
|
||||||
|
+) ENGINE = InnoDB CHARACTER SET = utf8mb4 COLLATE = utf8mb4_unicode_ci ROW_FORMAT = Dynamic;
|
||||||
|
|
||||||
|
CREATE TABLE IF NOT EXISTS `alert_host` (
|
||||||
|
- `alert_id` CHAR(32) NOT NULL,
|
||||||
|
- `host_id` CHAR(32) NOT NULL,
|
||||||
|
- `host_ip` CHAR(32) NULL,
|
||||||
|
- `host_name` CHAR(50) NULL,
|
||||||
|
- PRIMARY KEY (`host_id`,`alert_id`),
|
||||||
|
- KEY `FK__alert_id_auto_index` (`alert_id`),
|
||||||
|
- KEY `FK_alert_with_host_host_id_auto_index` (`host_id`),
|
||||||
|
- CONSTRAINT `FK_alert_host_alert_id` FOREIGN KEY (`alert_id`) REFERENCES `domain_check_result` (`alert_id`) ON DELETE RESTRICT ON UPDATE RESTRICT
|
||||||
|
-) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_general_ci ROW_FORMAT=DYNAMIC ;
|
||||||
|
+ `host_id` int NOT NULL,
|
||||||
|
+ `alert_id` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NOT NULL,
|
||||||
|
+ `host_ip` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NOT NULL,
|
||||||
|
+ `host_name` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NOT NULL,
|
||||||
|
+ PRIMARY KEY (`host_id`, `alert_id`) USING BTREE,
|
||||||
|
+ INDEX `alert_id`(`alert_id`) USING BTREE,
|
||||||
|
+ CONSTRAINT `alert_host_ibfk_1` FOREIGN KEY (`alert_id`) REFERENCES `domain_check_result` (`alert_id`) ON DELETE CASCADE ON UPDATE RESTRICT
|
||||||
|
+) ENGINE = InnoDB CHARACTER SET = utf8mb4 COLLATE = utf8mb4_unicode_ci ROW_FORMAT = Dynamic;
|
||||||
|
|
||||||
|
CREATE TABLE IF NOT EXISTS `algorithm` (
|
||||||
|
- `algo_id` INT(11) NOT NULL,
|
||||||
|
- `path` CHAR(150) NULL,
|
||||||
|
- `username` CHAR(10) NULL,
|
||||||
|
- `algo_name` CHAR(20) NOT NULL,
|
||||||
|
- `field` CHAR(20) NOT NULL,
|
||||||
|
- `description` LONGTEXT NULL,
|
||||||
|
- PRIMARY KEY (`algo_id`)
|
||||||
|
-) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_general_ci ROW_FORMAT=DYNAMIC ;
|
||||||
|
+ `algo_id` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NOT NULL,
|
||||||
|
+ `algo_name` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NULL DEFAULT NULL,
|
||||||
|
+ `field` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NULL DEFAULT NULL,
|
||||||
|
+ `description` varchar(100) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NULL DEFAULT NULL,
|
||||||
|
+ `path` varchar(150) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NOT NULL,
|
||||||
|
+ `username` varchar(40) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NOT NULL,
|
||||||
|
+ PRIMARY KEY (`algo_id`) USING BTREE
|
||||||
|
+) ENGINE = InnoDB CHARACTER SET = utf8mb4 COLLATE = utf8mb4_unicode_ci ROW_FORMAT = Dynamic;
|
||||||
|
|
||||||
|
CREATE TABLE IF NOT EXISTS `host_check_result` (
|
||||||
|
- `id` INT(11) NOT NULL,
|
||||||
|
- `time` INT(11) NOT NULL,
|
||||||
|
- `is_root` TINYINT(1) NULL,
|
||||||
|
- `host_id` CHAR(32) NOT NULL,
|
||||||
|
- `metric_name` CHAR(50) NULL,
|
||||||
|
- `alert_id` CHAR(32) NOT NULL,
|
||||||
|
- `metric_label` CHAR(255) NULL,
|
||||||
|
- PRIMARY KEY (`id`),
|
||||||
|
- KEY `host_id_auto_index` (`host_id`),
|
||||||
|
- KEY `alert_id_auto_index` (`alert_id`),
|
||||||
|
- CONSTRAINT `FK_host_check_result_host_id` FOREIGN KEY (`host_id`) REFERENCES `alert_host` (`host_id`) ON DELETE RESTRICT ON UPDATE RESTRICT ,
|
||||||
|
- CONSTRAINT `FK_host_check_result_alert_id` FOREIGN KEY (`alert_id`) REFERENCES `domain_check_result` (`alert_id`) ON DELETE RESTRICT ON UPDATE RESTRICT
|
||||||
|
-) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_general_ci ROW_FORMAT=DYNAMIC ;
|
||||||
|
+ `id` int NOT NULL AUTO_INCREMENT,
|
||||||
|
+ `host_id` int NULL DEFAULT NULL,
|
||||||
|
+ `alert_id` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NULL DEFAULT NULL,
|
||||||
|
+ `time` int NOT NULL,
|
||||||
|
+ `is_root` tinyint(1) NULL DEFAULT NULL,
|
||||||
|
+ `metric_name` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NULL DEFAULT NULL,
|
||||||
|
+ `metric_label` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NULL DEFAULT NULL,
|
||||||
|
+ PRIMARY KEY (`id`) USING BTREE,
|
||||||
|
+ INDEX `host_id`(`host_id`) USING BTREE,
|
||||||
|
+ INDEX `alert_id`(`alert_id`) USING BTREE,
|
||||||
|
+ CONSTRAINT `host_check_result_ibfk_1` FOREIGN KEY (`host_id`) REFERENCES `alert_host` (`host_id`) ON DELETE CASCADE ON UPDATE RESTRICT,
|
||||||
|
+ CONSTRAINT `host_check_result_ibfk_2` FOREIGN KEY (`alert_id`) REFERENCES `domain_check_result` (`alert_id`) ON DELETE CASCADE ON UPDATE RESTRICT
|
||||||
|
+) ENGINE = InnoDB CHARACTER SET = utf8mb4 COLLATE = utf8mb4_unicode_ci ROW_FORMAT = Dynamic;
|
||||||
|
|
||||||
|
CREATE TABLE IF NOT EXISTS `model` (
|
||||||
|
- `model_id` INT(11) NOT NULL,
|
||||||
|
- `username` CHAR(40) NULL,
|
||||||
|
- `model_name` CHAR(10) NULL,
|
||||||
|
- `tag` CHAR(255) NULL,
|
||||||
|
- `algo_id` INT(11) NULL,
|
||||||
|
- `create_time` INT(11) NULL,
|
||||||
|
- `file_path` CHAR(64) NULL,
|
||||||
|
- `precision` DOUBLE NULL,
|
||||||
|
- PRIMARY KEY (`model_id`),
|
||||||
|
- KEY `algo_id_auto_index` (`algo_id`),
|
||||||
|
- CONSTRAINT `FK_model_algo_id` FOREIGN KEY (`algo_id`) REFERENCES `algorithm` (`algo_id`) ON DELETE RESTRICT ON UPDATE RESTRICT
|
||||||
|
-) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_general_ci ROW_FORMAT=DYNAMIC ;
|
||||||
|
+ `model_id` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NOT NULL,
|
||||||
|
+ `model_name` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NOT NULL,
|
||||||
|
+ `tag` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NULL DEFAULT NULL,
|
||||||
|
+ `algo_id` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NOT NULL,
|
||||||
|
+ `create_time` int NOT NULL,
|
||||||
|
+ `file_path` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NULL DEFAULT NULL,
|
||||||
|
+ `precision` float NULL DEFAULT NULL,
|
||||||
|
+ `username` varchar(40) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NOT NULL,
|
||||||
|
+ PRIMARY KEY (`model_id`) USING BTREE,
|
||||||
|
+ INDEX `algo_id`(`algo_id`) USING BTREE,
|
||||||
|
+ CONSTRAINT `model_ibfk_1` FOREIGN KEY (`algo_id`) REFERENCES `algorithm` (`algo_id`) ON DELETE RESTRICT ON UPDATE RESTRICT
|
||||||
|
+) ENGINE = InnoDB CHARACTER SET = utf8mb4 COLLATE = utf8mb4_unicode_ci ROW_FORMAT = Dynamic;
|
||||||
|
|
||||||
|
CREATE TABLE IF NOT EXISTS `workflow` (
|
||||||
|
- `workflow_id` CHAR(20) NOT NULL,
|
||||||
|
- `workflow_name` CHAR(10) NOT NULL,
|
||||||
|
- `status` CHAR(12) NOT NULL,
|
||||||
|
- `description` CHAR(50) NULL,
|
||||||
|
- `app_name` CHAR(10) NOT NULL,
|
||||||
|
- `app_id` CHAR(10) NOT NULL,
|
||||||
|
- `step` INT(11) NOT NULL,
|
||||||
|
- `period` INT(11) NOT NULL,
|
||||||
|
- `domain` CHAR(20) NOT NULL,
|
||||||
|
- `username` CHAR(40) NOT NULL,
|
||||||
|
- PRIMARY KEY (`workflow_id`)
|
||||||
|
-) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_general_ci ROW_FORMAT=DYNAMIC ;
|
||||||
|
+ `workflow_id` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NOT NULL,
|
||||||
|
+ `workflow_name` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NOT NULL,
|
||||||
|
+ `description` varchar(100) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NOT NULL,
|
||||||
|
+ `create_time` int NOT NULL,
|
||||||
|
+ `status` varchar(20) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NOT NULL,
|
||||||
|
+ `app_name` varchar(20) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NOT NULL,
|
||||||
|
+ `app_id` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NOT NULL,
|
||||||
|
+ `step` int NULL DEFAULT NULL,
|
||||||
|
+ `period` int NULL DEFAULT NULL,
|
||||||
|
+ `domain` varchar(20) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NULL DEFAULT NULL,
|
||||||
|
+ `username` varchar(40) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NULL DEFAULT NULL,
|
||||||
|
+ PRIMARY KEY (`workflow_id`) USING BTREE
|
||||||
|
+) ENGINE = InnoDB CHARACTER SET = utf8mb4 COLLATE = utf8mb4_unicode_ci ROW_FORMAT = Dynamic;
|
||||||
|
|
||||||
|
CREATE TABLE IF NOT EXISTS `workflow_host` (
|
||||||
|
- `host_id` CHAR(32) NOT NULL,
|
||||||
|
- `workflow_id` CHAR(10) NULL,
|
||||||
|
- `host_name` CHAR(20) NULL,
|
||||||
|
- `host_ip` CHAR(16) NULL,
|
||||||
|
- PRIMARY KEY (`host_id`),
|
||||||
|
- KEY `workflow_id_auto_index` (`workflow_id`),
|
||||||
|
- CONSTRAINT `FK_workflow_workflow_id` FOREIGN KEY (`workflow_id`) REFERENCES `workflow` (`workflow_id`) ON DELETE RESTRICT ON UPDATE RESTRICT
|
||||||
|
-) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_general_ci ROW_FORMAT=DYNAMIC ;
|
||||||
|
+ `host_id` int NOT NULL,
|
||||||
|
+ `host_name` varchar(20) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NOT NULL,
|
||||||
|
+ `host_ip` varchar(16) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NOT NULL,
|
||||||
|
+ `workflow_id` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NOT NULL,
|
||||||
|
+ PRIMARY KEY (`host_id`, `workflow_id`) USING BTREE,
|
||||||
|
+ INDEX `workflow_id`(`workflow_id`) USING BTREE,
|
||||||
|
+ CONSTRAINT `workflow_host_ibfk_1` FOREIGN KEY (`workflow_id`) REFERENCES `workflow` (`workflow_id`) ON DELETE CASCADE ON UPDATE RESTRICT
|
||||||
|
+) ENGINE = InnoDB CHARACTER SET = utf8mb4 COLLATE = utf8mb4_unicode_ci ROW_FORMAT = Dynamic;
|
||||||
|
diff --git a/diana/database/dao/app_dao.py b/diana/database/dao/app_dao.py
|
||||||
|
index 653eb17..e5bce31 100644
|
||||||
|
--- a/diana/database/dao/app_dao.py
|
||||||
|
+++ b/diana/database/dao/app_dao.py
|
||||||
|
@@ -96,12 +96,12 @@ class AppDao(ElasticsearchProxy):
|
||||||
|
return SUCCEED, result
|
||||||
|
|
||||||
|
total_count = count_res[1]
|
||||||
|
- paginate = dict(page=data["page"], size=data["per_page"])
|
||||||
|
+ paginate = dict(page=int(data["page"]), size=int(data["per_page"]))
|
||||||
|
self._make_es_paginate_body(paginate, query_body)
|
||||||
|
res = self.query(index, query_body, ["app_id", "version", "app_name", "description"])
|
||||||
|
if res[0]:
|
||||||
|
LOGGER.debug("query app list succeed")
|
||||||
|
- result["total_page"] = (total_count + data["per_page"] - 1) / data["per_page"]
|
||||||
|
+ result["total_page"] = (total_count + int(data["per_page"]) - 1) / int(data["per_page"])
|
||||||
|
result["total_count"] = total_count
|
||||||
|
for item in res[1]['hits']['hits']:
|
||||||
|
result["app_list"].append(item['_source'])
|
||||||
|
--
|
||||||
|
Gitee
|
||||||
|
|
||||||
Binary file not shown.
BIN
aops-diana-v1.3.0.tar.gz
Normal file
BIN
aops-diana-v1.3.0.tar.gz
Normal file
Binary file not shown.
@ -1,16 +1,17 @@
|
|||||||
Name: aops-diana
|
Name: aops-diana
|
||||||
Version: v1.1.3
|
Version: v1.3.0
|
||||||
Release: 3
|
Release: 4
|
||||||
Summary: An intelligent abnormal detection framework of aops
|
Summary: An intelligent abnormal detection framework of aops
|
||||||
License: MulanPSL2
|
License: MulanPSL2
|
||||||
URL: https://gitee.com/openeuler/%{name}
|
URL: https://gitee.com/openeuler/%{name}
|
||||||
Source0: %{name}-%{version}.tar.gz
|
Source0: %{name}-%{version}.tar.gz
|
||||||
Patch0001: 0001-update-default-model-for-multicheck.patch
|
Patch0001: 0001-add-diana-sql-script.patch
|
||||||
Patch0002: 0002-better-ai-model-logic-and-fix-count-alert-error.patch
|
Patch0002: 0002-fix-database-type-error.patch
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
BuildRequires: python3-setuptools
|
BuildRequires: python3-setuptools
|
||||||
Requires: aops-vulcanus >= v1.0.0
|
Requires: aops-vulcanus >= v1.3.0
|
||||||
Requires: python3-requests python3-flask python3-flask-restful python3-marshmallow >= 3.13.0
|
Requires: python3-requests python3-flask python3-flask-restful python3-marshmallow >= 3.13.0
|
||||||
Requires: python3-numpy python3-pandas python3-prometheus-api-client
|
Requires: python3-numpy python3-pandas python3-prometheus-api-client
|
||||||
Requires: python3-sqlalchemy python3-PyMySQL python3-Flask-APScheduler >= 1.11.0
|
Requires: python3-sqlalchemy python3-PyMySQL python3-Flask-APScheduler >= 1.11.0
|
||||||
@ -33,6 +34,8 @@ An intelligent abnormal detection framework of aops
|
|||||||
|
|
||||||
# install for aops-diana
|
# install for aops-diana
|
||||||
%py3_install
|
%py3_install
|
||||||
|
mkdir -p %{buildroot}/opt/aops/
|
||||||
|
cp -r database %{buildroot}/opt/aops/
|
||||||
|
|
||||||
|
|
||||||
%files
|
%files
|
||||||
@ -40,13 +43,34 @@ An intelligent abnormal detection framework of aops
|
|||||||
%attr(0644,root,root) %{_sysconfdir}/aops/diana.ini
|
%attr(0644,root,root) %{_sysconfdir}/aops/diana.ini
|
||||||
%attr(0644,root,root) %{_sysconfdir}/aops/diana_hosts.json
|
%attr(0644,root,root) %{_sysconfdir}/aops/diana_hosts.json
|
||||||
%attr(0644,root,root) %{_sysconfdir}/aops/algorithm/*.json
|
%attr(0644,root,root) %{_sysconfdir}/aops/algorithm/*.json
|
||||||
|
%attr(0644,root,root) %{_sysconfdir}/aops/algorithm/intelligent/*
|
||||||
%attr(0755,root,root) %{_bindir}/aops-diana
|
%attr(0755,root,root) %{_bindir}/aops-diana
|
||||||
%attr(0755,root,root) /usr/lib/systemd/system/aops-diana.service
|
%attr(0755,root,root) /usr/lib/systemd/system/aops-diana.service
|
||||||
%{python3_sitelib}/aops_diana*.egg-info
|
%{python3_sitelib}/aops_diana*.egg-info
|
||||||
%{python3_sitelib}/diana/*
|
%{python3_sitelib}/diana/*
|
||||||
|
%attr(0755, root, root) /opt/aops/database/*
|
||||||
|
|
||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
|
* Mon Sep 25 2023 gongzhengtang<gong_zhengtang@163.com> - v1.3.0-4
|
||||||
|
- fix database type error
|
||||||
|
|
||||||
|
* Thu Sep 21 2023 wenxin<shusheng.wen@outlook.com> - v1.3.0-3
|
||||||
|
- update spec requires
|
||||||
|
|
||||||
|
* Tue Sep 19 2023 wenxin<shusheng.wen@outlook.com> - v1.3.0-2
|
||||||
|
- add the sql script
|
||||||
|
|
||||||
|
* Mon Sep 11 2023 zhuyuncheng<zhuyuncheng@huawei.com> - v1.3.0-1
|
||||||
|
- update to v1.3.0
|
||||||
|
|
||||||
|
* Mon Apr 17 2023 gongzhengtang<gong_zhengtang@163.com> - v1.2.0-1
|
||||||
|
- update the structure of response body; update how to get session used to
|
||||||
|
- connect to the database
|
||||||
|
|
||||||
|
* Mon Dec 19 2022 wangguangge<wangguangge@huawei.com> - v1.1.4-1
|
||||||
|
- Bugfix: fix ai configuration error
|
||||||
|
|
||||||
* Thu Dec 8 2022 zhuyuncheng<zhuyuncheng@huawei.com> - v1.1.3-3
|
* Thu Dec 8 2022 zhuyuncheng<zhuyuncheng@huawei.com> - v1.1.3-3
|
||||||
- Bugfix: fix the alert count error
|
- Bugfix: fix the alert count error
|
||||||
- Bugfix: for ai model, increase queried data length and add
|
- Bugfix: for ai model, increase queried data length and add
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user