packages/aops-hermes
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

!52 master分支更新同步解决编译失败问题

Browse Source 
From: @wkl505997900 
Reviewed-by: @zhu-yuncheng 
Signed-off-by: @zhu-yuncheng
This commit is contained in:
openeuler-ci-bot 2023-07-18 06:11:08 +00:00 committed by Gitee
commit 7ca5b1c1f4
No known key found for this signature in database
GPG Key ID: 173E9B9CA92EEF8F
8 changed files with 57 additions and 522 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

224
0001-some-bugfix-for-diana-website.patch
View File

@ -1,224 +0,0 @@
From 543e029484196a8aabf729979fbea4927f5fa261 Mon Sep 17 00:00:00 2001
From: wkl505997900 <505997900@qq.com>
Date: Fri, 9 Dec 2022 19:41:50 +0800
Subject: [PATCH] =?UTF-8?q?=E5=89=8D=E7=AB=AF=E7=AC=AC=E5=9B=9B=E6=AC=A1?=
=?UTF-8?q?=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/api/check.js | 2 +-
src/views/diagnosis/AbnormalAlert.vue | 2 +-
src/views/diagnosis/AppTemplateInfo.vue | 89 +++++++++++++++----------
src/views/diagnosis/WorkflowDetail.vue | 16 +++--
4 files changed, 67 insertions(+), 42 deletions(-)
diff --git a/src/api/check.js b/src/api/check.js
index 9ad3b1f..dce135c 100644
--- a/src/api/check.js
+++ b/src/api/check.js
@@ -341,7 +341,7 @@ export function getAlertRecordResult(parameter) {
per_page: parameter.per_page || 10,
domain: parameter.domain || [],
sort: 'time',
- direction: directionMap[parameter.direction] || 'asc'
+ direction: directionMap[parameter.direction] || 'desc'
},
/**
diff --git a/src/views/diagnosis/AbnormalAlert.vue b/src/views/diagnosis/AbnormalAlert.vue
index 06e865b..5db86e0 100644
--- a/src/views/diagnosis/AbnormalAlert.vue
+++ b/src/views/diagnosis/AbnormalAlert.vue
@@ -98,7 +98,7 @@ export default {
align: 'center',
filters: this.domainFilters,
filteredValue: filters.domain || null,
- filterMultiple: false
+ filterMultiple: true
},
{
title: '异常主机数',
diff --git a/src/views/diagnosis/AppTemplateInfo.vue b/src/views/diagnosis/AppTemplateInfo.vue
index 0a6b559..7961e30 100644
--- a/src/views/diagnosis/AppTemplateInfo.vue
+++ b/src/views/diagnosis/AppTemplateInfo.vue
@@ -40,38 +40,38 @@ import G6 from '@antv/g6';
import {getWorkflowAppExtraInfo} from '@/api/check';
import DrawerView from '@/views/utils/DrawerView';
// g6画图数据，自行编写的
-const NodeData = {
- nodes: [
- {
- id: 'node1',
- label: '单指标检测',
- x: 150,
- y: 200
- },
- {
- id: 'node2',
- label: '多指标检测',
- x: 450,
- y: 200
- },
- {
- id: 'node3',
- label: '集群故障诊断',
- x: 750,
- y: 200
- }
- ],
- edges: [
- {
- source: 'node1',
- target: 'node2'
- },
- {
- source: 'node2',
- target: 'node3'
- }
- ]
-};
+// const NodeData = {
+// nodes: [
+// {
+// id: 'node1',
+// label: '单指标检测',
+// x: 150,
+// y: 200
+// },
+// {
+// id: 'node2',
+// label: '多指标检测',
+// x: 450,
+// y: 200
+// },
+// {
+// id: 'node3',
+// label: '集群故障诊断',
+// x: 750,
+// y: 200
+// }
+// ],
+// edges: [
+// {
+// source: 'node1',
+// target: 'node2'
+// },
+// {
+// source: 'node2',
+// target: 'node3'
+// }
+// ]
+// };
const singleItemCheckColum = [
{
title: '指标名',
@@ -110,18 +110,25 @@ export default {
},
data() {
return {
+ NodeData: {},
+ abb: [],
+ add: [],
appInfo: '',
singleItemCheckColum,
multiItemCheckColum,
label: '',
- detail: []
+ detail: [],
+ detailMap: {
+ diag: '单指标检测',
+ multicheck: '多指标检测',
+ singlecheck: '集群故障诊断'
+ }
};
},
created() {
this.app_id = this.$route.params.appId;
},
mounted: function() {
- this.drawMap();
this.getAppInformation();
},
methods: {
@@ -130,6 +137,18 @@ export default {
getWorkflowAppExtraInfo(this.app_id)
.then(function(res) {
_this.appInfo = res.result;
+ _this.abb = Object.keys(res.result.detail).map((key, index) => ({
+ id: index + '',
+ label: _this.detailMap[key],
+ x: 150 + index * 300,
+ y: 200
+ }))
+ _this.add = Object.keys(res.result.detail).map((key, index) => ({
+ source: index + '',
+ target: index + 1 + ''
+ })).slice(0, -1)
+ _this.NodeData = {nodes: _this.abb, edges: _this.add};
+ _this.drawMap();
})
.catch(function(err) {
_this.$message.error(err.response.data.msg);
@@ -166,7 +185,7 @@ export default {
}
}
});
- graph.data(NodeData);
+ graph.data(this.NodeData);
graph.render();
}
}
diff --git a/src/views/diagnosis/WorkflowDetail.vue b/src/views/diagnosis/WorkflowDetail.vue
index 30e148b..26b1d4f 100644
--- a/src/views/diagnosis/WorkflowDetail.vue
+++ b/src/views/diagnosis/WorkflowDetail.vue
@@ -51,10 +51,8 @@
</a-col>
</a-row>
<a-row class="tab-container">
- <a-tabs default-active-key="1" @change="callback">
- <a-tab-pane key="singlecheck" tab="单指标检测"> </a-tab-pane>
- <a-tab-pane key="multicheck" tab="多指标检测"> </a-tab-pane>
- <a-tab-pane key="diag" tab="集群故障诊断"> </a-tab-pane>
+ <a-tabs :default-active-key="key" @change="callback">
+ <a-tab-pane v-for="item in detailMap" :key="item" :tab="detailStatusMap[item]"> </a-tab-pane>
</a-tabs>
</a-row>
</a-card>
@@ -178,6 +176,12 @@ export default {
},
data() {
return {
+ detailStatusMap: {
+ diag: '单指标检测',
+ multicheck: '多指标检测',
+ singlecheck: '集群故障诊断'
+ },
+ detailMap: [],
workflow: {},
statusMap,
hostcheckColums,
@@ -187,7 +191,7 @@ export default {
multicheckColumns,
pagination: defaultPagination,
tableIsLoading: false,
- key: 'singlecheck',
+ key: 'multicheck',
singlecheckModel: [],
singlecheck: [],
multicheck: [],
@@ -257,6 +261,8 @@ export default {
getWorkflowDatail(this.workflow_id)
.then(function(res) {
_this.workflow = res.result;
+ _this.key = Object.keys(res.result.detail)[0];
+ _this.detailMap = Object.keys(res.result.detail);
const tempArr = [];
for (const modelId in _this.workflow.model_info) {
if (modelId === _this.workflow.detail.diag) {
--
2.33.0

24
0002-bugfix-alarm-number-not-update-synchronously.patch
View File

@ -1,24 +0,0 @@
From ba2cedb6dced8f685a78ecac5c00eaa8fc02c873 Mon Sep 17 00:00:00 2001
From: wkl505997900 <505997900@qq.com>
Date: Tue, 13 Dec 2022 11:58:46 +0800
Subject: [PATCH] xiugaiwenti2
---
src/views/diagnosis/AbnormalAlert.vue | 1 +
1 file changed, 1 insertion(+)
diff --git a/src/views/diagnosis/AbnormalAlert.vue b/src/views/diagnosis/AbnormalAlert.vue
index 5db86e0..216e1c6 100644
--- a/src/views/diagnosis/AbnormalAlert.vue
+++ b/src/views/diagnosis/AbnormalAlert.vue
@@ -195,6 +195,7 @@ export default {
this.pagination = pagination;
this.filters = filters;
this.sorter = sorter;
+ store.dispatch('updateCount');
this.getAlertRecordResult();
},
getDomainFilters() {
--
Gitee

217
0003-fix-bugs-that-are-found.patch
View File

@ -1,217 +0,0 @@
From d9b57b55a80c9a411e13839205ed425834ae06b3 Mon Sep 17 00:00:00 2001
From: wkl505997900 <505997900@qq.com>
Date: Wed, 14 Dec 2022 20:05:48 +0800
Subject: [PATCH] =?UTF-8?q?=E5=89=8D=E7=AB=AF=E7=AC=AC=E4=BA=94=E6=AC=A1?=
=?UTF-8?q?=E9=97=AE=E9=A2=98=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../ant-design-pro/layouts/UserLayout.vue | 4 +--
src/views/leaks/CVEsManagement.vue | 8 ++++--
src/views/leaks/LeakTaskList.vue | 2 +-
src/views/leaks/components/AddRepoModal.vue | 2 +-
.../components/CreateRepairTaskDrawer.vue | 3 +++
src/views/leaks/components/CvesTable.vue | 3 ---
src/views/leaks/components/HostTable.vue | 25 ++++++++++++++++---
src/views/user/Login.vue | 4 +--
8 files changed, 36 insertions(+), 15 deletions(-)
diff --git a/src/vendor/ant-design-pro/layouts/UserLayout.vue b/src/vendor/ant-design-pro/layouts/UserLayout.vue
index 8a83eca..1166136 100644
--- a/src/vendor/ant-design-pro/layouts/UserLayout.vue
+++ b/src/vendor/ant-design-pro/layouts/UserLayout.vue
@@ -18,7 +18,7 @@
</div>
</div>
<router-view />
- <div class="footer">
+ <!-- <div class="footer">
<div class="links">
<a href="_self">帮助</a>
<a href="_self">隐私</a>
@@ -27,7 +27,7 @@
<div class="copyright">
Copyright &copy;
</div>
- </div>
+ </div> -->
</a-col>
</a-row>
</div>
diff --git a/src/views/leaks/CVEsManagement.vue b/src/views/leaks/CVEsManagement.vue
index 4692a4a..46ea0e9 100644
--- a/src/views/leaks/CVEsManagement.vue
+++ b/src/views/leaks/CVEsManagement.vue
@@ -1,7 +1,7 @@
<template>
<page-header-wrapper :breadcrumb="breadcrumb">
<a-card :bordered="false" class="aops-theme">
- <div>
+ <div class="cvebox">
<cves-table standalone />
</div>
</a-card>
@@ -51,4 +51,8 @@ export default {
};
</script>
-<style lang="less" scoped></style>
+<style lang="less" scoped>
+.cvebox{
+ overflow: auto;
+}
+</style>
diff --git a/src/views/leaks/LeakTaskList.vue b/src/views/leaks/LeakTaskList.vue
index cc755aa..168ea83 100644
--- a/src/views/leaks/LeakTaskList.vue
+++ b/src/views/leaks/LeakTaskList.vue
@@ -422,7 +422,7 @@ export default {
<style lang="less" scoped>
.leakbox {
- overflow: hidden;
+ overflow: auto;
}
.status-icon {
margin: 0 2px;
diff --git a/src/views/leaks/components/AddRepoModal.vue b/src/views/leaks/components/AddRepoModal.vue
index f0ade94..f76a569 100644
--- a/src/views/leaks/components/AddRepoModal.vue
+++ b/src/views/leaks/components/AddRepoModal.vue
@@ -22,7 +22,7 @@
<a-form-item label="REPO内容">
<div>
<a-textarea
- :style="`${visible ? '' : 'height: 346px;'}`"
+ style="resize: none;"
v-decorator="['repoData', {rules: [{ required: true, message: '请输入REPO描述' }]}]"
:rows="16"
:maxLength="512"
diff --git a/src/views/leaks/components/CreateRepairTaskDrawer.vue b/src/views/leaks/components/CreateRepairTaskDrawer.vue
index 49633f7..3a9d7e2 100644
--- a/src/views/leaks/components/CreateRepairTaskDrawer.vue
+++ b/src/views/leaks/components/CreateRepairTaskDrawer.vue
@@ -357,6 +357,9 @@ export default {
// 每次展开抽屉时触发，替代mounted
handleOpen() {
// inital defualt data
+ if (this.taskType === 'repo set') {
+ this.$emit('getAllHost')
+ }
this.visible = true;
this.cveList = this.cveListProps;
this.isResetChecked = true;
diff --git a/src/views/leaks/components/CvesTable.vue b/src/views/leaks/components/CvesTable.vue
index 44deb18..c48712c 100644
--- a/src/views/leaks/components/CvesTable.vue
+++ b/src/views/leaks/components/CvesTable.vue
@@ -500,7 +500,4 @@ export default {
</script>
<style lang="less" scoped>
- .ant-table-wrapper {
- overflow: hidden;
- }
</style>
diff --git a/src/views/leaks/components/HostTable.vue b/src/views/leaks/components/HostTable.vue
index 4387d91..ad4768b 100644
--- a/src/views/leaks/components/HostTable.vue
+++ b/src/views/leaks/components/HostTable.vue
@@ -1,5 +1,5 @@
<template>
- <div>
+ <div class="hostbox">
<div class="mesinfo">
<a-row
v-if="standalone && scanningHostIds.length > 0 && scanStatusloading"
@@ -40,6 +40,7 @@
:hostList="selectedRowsAll"
:repoList="repoListProps"
@createSuccess="handleTaskCreateSuccess"
+ @getAllHost="getAllHost"
/>
</a-col>
<a-col v-if="standalone && selectedRowKeys.length === 0">
@@ -50,6 +51,7 @@
:hostList="hostListAll"
:repoList="repoListProps"
@createSuccess="handleTaskCreateSuccess"
+ @getAllHost="getAllHost"
/>
</a-col>
<a-col v-if="standalone && selectedRowKeys.length !== 0">
@@ -206,7 +208,7 @@ export default {
{
dataIndex: 'cve_num',
key: 'cve_num',
- title: 'CVE 个数',
+ title: '受影响CVE个数',
sorter: true
},
{
@@ -311,6 +313,18 @@ export default {
};
},
methods: {
+ getAllHost() {
+ this.getHostList();
+ this.getHostGroup();
+ if (this.standalone) {
+ // 主机列表页面中要自行获取全量主机和扫描状态
+ this.getScanStatusAll([]);
+ this.getHostListAll();
+ } else {
+ // 主机详情页面中要自行获取repo列表
+ this.getRepoList();
+ }
+ },
handleExport() {
if (this.selectedRowKeys.length !== 0) {
console.log(this.selectedRowKeys);
@@ -504,6 +518,9 @@ export default {
this.selectedRowKeys = [];
this.selectedRows = [];
this.getHostList();
+ if (this.standalone) {
+ this.getHostListAll();
+ }
},
handleReset() {
this.pagination = defaultPagination;
@@ -682,7 +699,7 @@ export default {
font-size: 16px;
margin: 0 6px;
}
-.ant-table-wrapper {
- overflow: hidden;
+.hostbox{
+ overflow: auto;
}
</style>
diff --git a/src/views/user/Login.vue b/src/views/user/Login.vue
index 92d16cd..388e7e0 100644
--- a/src/views/user/Login.vue
+++ b/src/views/user/Login.vue
@@ -45,7 +45,7 @@
</a-form-item>
</a-tab-pane>
- <a-tab-pane key="tab2" :tab="$t('user.login.gitee-login-credentials')">
+ <!-- <a-tab-pane key="tab2" :tab="$t('user.login.gitee-login-credentials')">
<a-alert
v-if="isLoginError"
type="error"
@@ -82,7 +82,7 @@
<a-icon slot="prefix" type="lock" :style="{color: 'rgba(0,0,0,.25)'}" />
</a-input-password>
</a-form-item>
- </a-tab-pane>
+ </a-tab-pane> -->
</a-tabs>
<a-form-item style="margin-top:24px">
--
Gitee

46
0004-fix-bug-the-task-report-is-not-displayed.patch
View File

@ -1,46 +0,0 @@
From 9c88fc94b1a0231527ab5af4c72db78a4b3adfc1 Mon Sep 17 00:00:00 2001
From: wkl505997900 <505997900@qq.com>
Date: Fri, 23 Dec 2022 15:30:54 +0800
Subject: [PATCH] =?UTF-8?q?=E5=89=8D=E7=AB=AF=E7=AC=AC=E5=85=AD=E6=AC=A1?=
=?UTF-8?q?=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/views/leaks/LeakTaskDetail.vue | 12 ++++++++++++
1 file changed, 12 insertions(+)
diff --git a/src/views/leaks/LeakTaskDetail.vue b/src/views/leaks/LeakTaskDetail.vue
index c8f98db..2094efe 100644
--- a/src/views/leaks/LeakTaskDetail.vue
+++ b/src/views/leaks/LeakTaskDetail.vue
@@ -445,6 +445,17 @@ export default {
_this.progressLoading = false;
});
},
+ getVisible(statusMap) {
+ for (const key in statusMap) {
+ if (key === 'running') {
+ if (statusMap[key] === '1') {
+ return true
+ } else {
+ return false
+ }
+ }
+ }
+ },
prgressFinishedCheck(statusMap) {
for (const taskId in statusMap) {
if (statusMap[taskId]['running']) {
@@ -571,6 +582,7 @@ export default {
pageSize: pagination.pageSize,
total: res.total_count || (res.total_count === 0 ? 0 : pagination.total)
};
+ _this.reportvisible = !_this.hostRepostatusCheck(res.result)
if (_this.hostRepostatusCheck(res.result)) {
setTimeout(function() {
_this.getHostList();
--
Gitee

BIN
aops-hermes-v1.1.2.tar.gz
View File

Binary file not shown.

BIN
aops-hermes-v1.2.2.tar.gz Normal file
View File

Binary file not shown.

68
aops-hermes.spec
View File

@ -1,17 +1,13 @@
%define debug_package %{nil} %define debug_package %{nil}
Name: aops-hermes Name: aops-hermes
Version: v1.1.2 Version: v1.2.2
Release: 5 Release: 1
Summary: Web for an intelligent diagnose frame Summary: Web for an intelligent diagnose frame
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
Source1: node-modules.tar.gz Source1: node_modules.tar.gz
Patch0001: 0001-some-bugfix-for-diana-website.patch
Patch0002: 0002-bugfix-alarm-number-not-update-synchronously.patch
Patch0003: 0003-fix-bugs-that-are-found.patch
Patch0004: 0004-fix-bug-the-task-report-is-not-displayed.patch
BuildRequires: nodejs node-gyp nodejs-yarn BuildRequires: nodejs node-gyp nodejs-yarn
@ -23,11 +19,14 @@ Web for an intelligent diagnose frame
%prep %prep
%autosetup -n %{name}-%{version} -p1 %autosetup -n %{name}-%{version}
%setup -T -D -a 1 %setup -T -D -a 1
%build %build
export NODE_OPTIONS=--openssl-legacy-provider
ls ./.npmrc
cat ./.npmrc
yarn build yarn build
@ -47,8 +46,55 @@ cp -r deploy/aops-hermes.service %{buildroot}/usr/lib/systemd/system/
%changelog %changelog
* Sat Dec 24 2022 wenxin<shusheng.wen@outlook.com> - v1.1.2-5 * Tue Jul 18 2023 wangkunlong<505997900@qq.com> - v1.2.2-1
- Fix the problem that the task report is not displayed after the repo-set task is completed - Solved the problem of nodejs being unable to build successfully in the 23.03 environment on the master branch
- Modify the front-end tab icon to the openeuler icon
- Fix the issue of selecting a fixed cold patch for rollback operation, with incorrect prompts in the previous paragraph
* Wed Jun 14 2023 wangkunlong<505997900@qq.com> - v1.2.1-7
- The host list under cve has been fixed and the hot patch repair column has been changed to support hot patches
- The CVE list under the host list has-not been fixed and the hot patch support has been changed-to support hot patches
- Generate support for hot patches in the CVE repair task and add tooltip help text after accepting or not
* Fri Jun 9 2023 wangkunlong<505997900@qq.com> - v1.2.1-6
- Fix-token-refresh-issue
- Solve-the-issue-of-unreasonable-layout-in-the-CVE-detail-interface
- Resolve-the-issue-of-incorrect-task-list-filtering
* Fri Jun 2 2023 wangkunlong<505997900@qq.com> - v1.2.1-5
- Add host under cve hotpatch Filtering function
* Fri Jun 2 2023 wangkunlong<505997900@qq.com> - v1.2.1-4
- Add Hot patch Filtering function
* Fri Jun 2 2023 wangkunlong<505997900@qq.com> - v1.2.1-3
- Add the 'accepted' parameter to the interface for creating cve repair tasks
- Modify the cve list under the host and the hot patch support in the affected host list under cve to display two fields: hot patch repair and status
- Modify the display of host status in the host management interface
* Thu Jun 1 2023 wangkunlong<505997900@qq.com> - v1.2.1-2
- Resolve the issue of abnormal page display when switching host details
- Resolve the issue of host details and hot patch support column filtering failure
- Resolve the issue of incorrect filtering conditions in the "Rollback Status" column of the CVE list for task details
- Resolve the issue of incorrect display of the latest status of the host on the task details pag
* Tue May 23 2023 wangkunlong<505997900@qq.com> - v1.2.1-1
- Vulnerability Management Part Code Hot Update Function Update
* Fri Apr 28 2023 wangkunlong<505997900@qq.com> - v1.2.0-2
- Optimize page loading speed
- Optimize routing
- Optimize login and exit interface
- Solve the inconsistency in verifying the host name field between the front and back ends when adding hosts in a single and batch manner
- Optimize login interface UI display
- Resolve the display of registration interface icons and text
- Solve legacy issues with batch adding hosts and editing host interfaces
- Optimize CVE list refresh logic
- Add exit interface
- Optimize Gitee authorization login jump logic
* Mon Apr 17 2023 wangkunlong<505997900@qq.com> - v1.2.0-1
- add host interfaces, optimize the display effect of some interfaces
* Mon Dec 19 2022 wenxin<shusheng.wen@outlook.com> - v1.1.2-4 * Mon Dec 19 2022 wenxin<shusheng.wen@outlook.com> - v1.1.2-4
- Fix the bugs that are found - Fix the bugs that are found
@ -75,4 +121,4 @@ cp -r deploy/aops-hermes.service %{buildroot}/usr/lib/systemd/system/
- Fix the bug of cve vulnerability management module - Fix the bug of cve vulnerability management module
* Tue Nov 22 2022 zhuyuncheng<zhuyuncheng@huawei.com> - v1.0.0-1 * Tue Nov 22 2022 zhuyuncheng<zhuyuncheng@huawei.com> - v1.0.0-1
- Package init - Package init

BIN
node-modules.tar.gz → node_modules.tar.gz
View File

Binary file not shown.