/', views.ReleaseHotfixListAPIView.as_view({'patch': 'update_released_hotfix_record'})),
path('api/v1/', include(router.urls)),
]
diff --git a/sysom_server/sysom_hotfix/apps/hotfix/views.py b/sysom_server/sysom_hotfix/apps/hotfix/views.py
index 2f7b325fdd9ab3fe773eca48df6f5b6119d482be..268d81cec4a1579dde75809cd55886ac7b69322a 100644
--- a/sysom_server/sysom_hotfix/apps/hotfix/views.py
+++ b/sysom_server/sysom_hotfix/apps/hotfix/views.py
@@ -16,11 +16,14 @@ from django_filters.rest_framework import DjangoFilterBackend
from rest_framework.exceptions import ValidationError
from django.conf import settings
from rest_framework.viewsets import GenericViewSet
-import re
+import sys
+import pandas as pd
from apps.hotfix import serializer
-from apps.hotfix.models import HotfixModel, OSTypeModel, KernelVersionModel
+from apps.hotfix.models import HotfixModel, OSTypeModel, KernelVersionModel, ReleasedHotfixListModule
+from apps.hotfix.filters import HotfixReleasedFilter
from lib.response import *
+from lib.paginations import Pagination
from lib.utils import human_datetime, datetime, datetime_str
from lib.exception import APIException
from lib.base_view import CommonModelViewSet
@@ -91,7 +94,6 @@ class SaveUploadFile(APIView):
raise APIException(message=f"Upload Failed: {e}")
return success(result={"patch_name":patch_file_name}, message="Upload success")
-
class HotfixAPIView(GenericViewSet,
mixins.ListModelMixin,
mixins.RetrieveModelMixin,
@@ -446,7 +448,7 @@ class HotfixAPIView(GenericViewSet,
debuginfo_link = request.data['debuginfo_link']
os_type = request.data['os_type']
image = request.data['image']
- use_source = request.data['use_source']
+ use_src_package = request.data['use_src_package']
if len(kernel_version)>0 and len(source)>0 and len(devel_link)>0 and len(debuginfo_link)>0 and len(os_type)>0 and len(image) > 0:
try:
@@ -459,7 +461,7 @@ class HotfixAPIView(GenericViewSet,
devel_link = devel_link,
debuginfo_link = debuginfo_link,
image = image,
- use_source = use_source
+ use_src_package = use_src_package
)
else:
return other_response(message="same kernel version found in record...")
@@ -558,14 +560,6 @@ class HotfixAPIView(GenericViewSet,
os_type_object.source_debuginfo = request.data['source_debuginfo']
# src_pkg_mark = request.data.get("src_pkg_mark", None)
git_rule = request.data.get("git_rule", None)
- logger.info(os_type_object.git_rule)
- logger.info(git_rule)
- if git_rule != os_type_object.git_rule:
- patch_file_repo = os.path.join(settings.HOTFIX_FILE_BRANCH_RULE)
- file_path = os.path.join(patch_file_repo, git_rule)
- logger.info(file_path)
- os.remove(file_path)
- os_type_object.git_rule = request.data['git_rule']
os_type_object.save()
thread_runner = threading.Thread(target=self.function.sync_kernel, name="sync_kernel",args=(os_type_object.id,))
thread_runner.start()
@@ -608,4 +602,67 @@ class HotfixAPIView(GenericViewSet,
class HealthViewset(CommonModelViewSet):
def health_check(self, request, *args, **kwargs):
- return success(result={})
\ No newline at end of file
+ return success(result={})
+
+
+class ReleaseHotfixListAPIView(GenericViewSet,
+ mixins.ListModelMixin,
+ mixins.RetrieveModelMixin,
+ mixins.CreateModelMixin,
+ mixins.UpdateModelMixin,
+ mixins.DestroyModelMixin):
+ queryset = ReleasedHotfixListModule.objects.all()
+ pagination_class = Pagination
+ serializer_class = serializer.ReleasedHotfixSerializer
+ filter_class = HotfixReleasedFilter
+ filter_backends = [DjangoFilterBackend]
+ http_method_names = ['get', 'post', 'patch', 'put', 'delete']
+
+ def get_serializer_class(self):
+ """appoint method serializer"""
+ request_method_dict = {
+ "POST": serializer.CreateReleasedHotfixSerializer,
+ "PUT": serializer.UpdatePutReleasedHotfixSerializer,
+ "PATCH": serializer.UpdateReleasedHotfixSerializer,
+ "GET": serializer.ReleasedHotfixSerializer,
+ }
+ return request_method_dict[self.request.method]
+
+ """this function returns the filtered records in the database
+ """
+ def get_filter_released_hotfixs(self, request: Request, *args, **kwargs):
+ queryset = self.filter_queryset(self.get_queryset())
+ if not queryset:
+ return success([], total=0)
+ return super().list(request, *args, **kwargs)
+
+ """insert one released hotfix record into database
+ """
+ def add_one_released_hotfix(self, request, *args, **kwarg):
+ create_serializer = self.get_serializer(data=request.data)
+ create_serializer.is_valid(raise_exception=True)
+ self.perform_create(create_serializer)
+
+ ser = serializer.ReleasedHotfixSerializer(create_serializer.instance)
+ return success(result=ser.data)
+
+ """this function is used to update one hotfix record
+ However, the information inside just can update, but cannot delete!
+ You can update it into blank message " ", but I hope this message should never be deleted!
+ """
+ def update_released_hotfix_record(self, request, *args, **kwargs):
+ """appoint patch method"""
+ partial = kwargs.pop('partial', False)
+ instance = self.get_object()
+ update_serializer = self.get_serializer(instance, data=request.data, partial=partial)
+ update_serializer.is_valid(raise_exception=True)
+ self.perform_update(update_serializer)
+
+ ser = serializer.ReleasedHotfixSerializer(update_serializer.instance, many=False)
+ return success(result=ser.data)
+
+ def import_from_table_v2(self, request):
+ ser = serializer.BulkImportHotfixReleasedSerializer(data=request.data)
+ ser.is_valid(raise_exception=True)
+ self.perform_create(ser)
+ return success(result={},message="save files successful!")
diff --git a/sysom_server/sysom_hotfix/lib/function.py b/sysom_server/sysom_hotfix/lib/function.py
index 63c3a3687349cfcc69f87db4903de34abfd7ba5d..4ab2867937f99252653a270443f5adf3b4f48cd9 100644
--- a/sysom_server/sysom_hotfix/lib/function.py
+++ b/sysom_server/sysom_hotfix/lib/function.py
@@ -11,7 +11,7 @@ import requests
import json
import time
-from apps.hotfix.models import HotfixModel, OSTypeModel, KernelVersionModel
+from apps.hotfix.models import HotfixModel, OSTypeModel, KernelVersionModel, ReleasedHotfixListModule
from cec_base.producer import dispatch_producer, Producer
from cec_base.consumer import Consumer, dispatch_consumer
from cec_base.admin import dispatch_admin
@@ -426,6 +426,27 @@ class FunctionClass():
os_type_object.save()
except Exception as e:
logger.error(e)
+
+ def query_released_hotfix_by_para(self, search_hotfix_id,search_kernel_version,
+ search_serious, search_released_time, search_fix_system):
+ try:
+ objects = ReleasedHotfixListModule.objects.all()
+ if search_hotfix_id is not None:
+ objects = objects.filter(hotfix_id=search_hotfix_id)
+ if search_kernel_version is not None:
+ objects = objects.filter(released_kernel_version=search_kernel_version)
+ if search_serious is not None:
+ objects = objects.filter(serious=search_serious)
+ if search_released_time is not None:
+ objects = objects.filter(released_time = search_released_time)
+ if search_fix_system is not None:
+ objects = objects.filter(fix_system=search_fix_system)
+ return objects
+ except Exception as e:
+ logger.error("Error when filtering released hotfix database")
+ logger.error("query_released_hotfix_by_para: %s " % str(e))
+ return None
+
"""
CECListener listen topic of hotfix_msg, which is send by builder
@@ -533,4 +554,15 @@ class CECListener():
except Exception as e:
logger.error(str(e))
-
\ No newline at end of file
+
+"""
+Hotfix Server Exception
+"""
+class HotfixServerException(Exception):
+
+ def __init__(self, *args: object) -> None:
+ super().__init__(*args)
+
+ @staticmethod
+ def msg(self, msg: str) -> str:
+ return msg
\ No newline at end of file
diff --git a/sysom_server/sysom_monitor_server/config.yml b/sysom_server/sysom_monitor_server/config.yml
index b96a9c04d545240d27d4ef227183a79ff8716990..0e941feda96e08753606e7263e997f29310c0d1c 100644
--- a/sysom_server/sysom_monitor_server/config.yml
+++ b/sysom_server/sysom_monitor_server/config.yml
@@ -1,8 +1,8 @@
vars:
NODE_EXPORT_BASE_DOWNLOAD_URL: &NODE_EXPORT_BASE_DOWNLOAD_URL https://sysom.oss-cn-beijing.aliyuncs.com/monitor/
NODE_EXPORT_VERSION: &NODE_EXPORT_VERSION 1.5.0
- SYSAK_DOWNLOAD_URL: &SYSAK_DOWNLOAD_URL https://mirrors.openanolis.cn/sysak/packages/release-v2.2.0/
- SYSAK_VERSION: &SYSAK_VERSION 2.2.0-1
+ SYSAK_DOWNLOAD_URL: &SYSAK_DOWNLOAD_URL https://mirrors.openanolis.cn/sysak/packages/release-v2.4.0/
+ SYSAK_VERSION: &SYSAK_VERSION 2.4.0-1
SERVICE_NAME: &SERVICE_NAME sysom_monitor_server
SERVICE_CONSUMER_GROUP:
!concat &SERVICE_CONSUMER_GROUP [*SERVICE_NAME, "_consumer_group"]
diff --git a/sysom_server/sysom_monitor_server/scripts/node_init.sh b/sysom_server/sysom_monitor_server/scripts/node_init.sh
index 8f292ebdaac7cd6a197a6221d2114f84e7caae9e..efbff7a97c37e789205685d8db8487bf55c19c4d 100755
--- a/sysom_server/sysom_monitor_server/scripts/node_init.sh
+++ b/sysom_server/sysom_monitor_server/scripts/node_init.sh
@@ -2,7 +2,7 @@
RESOURCE_DIR=${NODE_HOME}/${SERVICE_NAME}
if [ "$SYSAK_VERTION" == "" ]; then
- export SYSAK_VERTION=2.2.0-1
+ export SYSAK_VERTION=2.4.0-1
fi
if [ "$NODE_EXPORT_VERSION" == "" ]; then
export NODE_EXPORT_VERSION=1.5.0
diff --git a/sysom_server/sysom_vul/apps/vul/async_fetch.py b/sysom_server/sysom_vul/apps/vul/async_fetch.py
index 56df8b4b27d9f46cd753b9ce526b6f6b51b470f6..1eb8a46f50fe1072e5835ea7f8fd035265da1ac1 100644
--- a/sysom_server/sysom_vul/apps/vul/async_fetch.py
+++ b/sysom_server/sysom_vul/apps/vul/async_fetch.py
@@ -110,6 +110,7 @@ class FetchVulData:
'params': json.loads(instance.params),
'auth': auth
}
+ 返回参数对象
"""
kwargs = dict()
@@ -132,6 +133,14 @@ class FetchVulData:
@classmethod
def _get_page_total_num(cls, kwargs) -> Union[bool, int]:
+ """向漏洞库请求数据
+
+ Args:
+ kwargs (_type_): 创建的结构化参数
+
+ Returns:
+ Union[bool, int]: 如果请求成功,返回请求数据的从页;失败返回False
+ """
response = requests.request(**kwargs)
if response.status_code == 200:
result = response.json()
diff --git a/sysom_server/sysom_vul/apps/vul/vul.py b/sysom_server/sysom_vul/apps/vul/vul.py
index aaf7289a7a933ad25d1556d37eb6cfd6961aef6a..c470c8ef954ce8e21ff236d261d6e28a4ee4785d 100644
--- a/sysom_server/sysom_vul/apps/vul/vul.py
+++ b/sysom_server/sysom_vul/apps/vul/vul.py
@@ -39,21 +39,23 @@ def update_vul_db():
更新漏洞数据库数据
"""
logger.info("Begin to get vul db address")
- vul_addrs = VulAddrModel.objects.all()
+ vul_addrs = VulAddrModel.objects.all() # 获取漏洞数据库中所有的漏洞库信息
for vul_addr in vul_addrs:
logger.info("Try to get vul db info")
- vul_addr_obj = VulDataParse(vul_addr)
+ vul_addr_obj = VulDataParse(vul_addr) # 生成漏洞库操作实例
try:
- for res in vul_addr_obj._get_vul_data():
+ for res in vul_addr_obj._get_vul_data(): # 获取每一项cve数据,解析返回数据,根据cve是否存在进行更新或者插入
vul_addr_obj.parse_and_store_vul_data(res)
except Exception as e:
logger.warning(e)
logger.warning(f"failed in {vul_addr.url}")
-
+ """
+ VulDataParse:CVE漏洞库操作实例
+ """
class VulDataParse(object):
def __init__(self, vul_addr_obj: VulAddrModel):
- self.vul_addr_obj = vul_addr_obj
+ self.vul_addr_obj = vul_addr_obj
self.cve_data_path = list(filter(None, self._parser_cve_item_path))
@property
diff --git a/sysom_web/config/routes.js b/sysom_web/config/routes.js
index 1fc6070cbecc0c920343da21a353cf3249a4aec3..3232d8ccd3538f0352fa2b5da7c6533f998dd040 100644
--- a/sysom_web/config/routes.js
+++ b/sysom_web/config/routes.js
@@ -157,29 +157,34 @@ export default [
name: 'app_observable',
access: 'canAdmin',
routes: [
- {
- path: '/app_observable',
- redirect: "/app_observable/net_topo",
- },
- {
- path: '/app_observable/net_topo',
- name: 'net_topo',
- component: "./app_observable/net_topo"
- },
- {
- path: '/app_observable/mysql',
- name: 'mysql',
- component: "./app_observable/mysql"
- },
- {
- path: "/app_observable/java",
- redirect: '/app_observable/process',
- },
- {
- path: "/app_observable/process",
- name: "process",
- component: "./app_observable/process"
- }
+ // {
+ // path: '/app_observable',
+ // redirect: "/app_observable/net_topo",
+ // },
+ // {
+ // path: '/app_observable/net_topo',
+ // name: 'net_topo',
+ // component: "./app_observable/net_topo"
+ // },
+ // {
+ // path: '/app_observable/mysql',
+ // name: 'mysql',
+ // component: "./app_observable/mysql"
+ // },
+ // {
+ // path: "/app_observable/java",
+ // redirect: '/app_observable/process',
+ // },
+ // {
+ // path: "/app_observable/process",
+ // name: "process",
+ // component: "./app_observable/process"
+ // },
+ // {
+ // path: "/app_observable/nginx",
+ // name: "nginx",
+ // component: "./app_observable/nginx"
+ // }
],
},
{
@@ -221,69 +226,18 @@ export default [
routes: [
{
path: '/diagnose',
- redirect: '/diagnose/oscheck',
- },
- {
- path: '/diagnose/oscheck',
- name: 'oscheck',
- component: './diagnose/oscheck',
- },
- {
- path: '/diagnose/cpu',
- name: 'cpu',
- routes: [
- {
- path: '/diagnose/cpu',
- redirect: '/diagnose/cpu/loadtask',
- }
- ]
- },
- {
- path: '/diagnose/storage',
- name: 'storage',
- routes: [
- {
- path: '/diagnose/storage',
- redirect: '/diagnose/storage/iolatency',
- }
- ]
- },
- {
- path: '/diagnose/net',
- name: 'net',
- routes: [
- {
- path: '/diagnose/net',
- redirect: '/diagnose/net/pingtrace',
- },
- ]
- },
- {
- path: '/diagnose/memory',
- name: 'memory',
- routes: [
- {
- path: '/diagnose/memory',
- redirect: '/diagnose/memory/memgraph',
- }
- ]
+ redirect: '/diagnose/ossre',
},
{
path: '/diagnose/detail/:task_id?',
layout: false,
component: "./diagnose/detail"
},
- // {
- // path: '/diagnose/custom',
- // name: 'custom',
- // routes: [
- // {
- // path: '/diagnose/custom/pannel',
- // name: 'pannel',
- // component: './diagnose/generate/Pannel/index',
- // }
- // ]
- // }
+ {
+ path: '/diagnose/query',
+ name: 'query',
+ component: './diagnose/query'
+ },
],
},
{
@@ -362,6 +316,11 @@ export default [
component: './hotfix/Version/VersionCustomize',
},
]
+ },
+ {
+ path: '/hotfix/released',
+ name: 'released_hotfix',
+ component: './hotfix/Released'
}
]
},
diff --git a/sysom_web/cypress.config.js b/sysom_web/cypress.config.js
index d2a8834d6a638638d768631b1b35fd91ac3e4e44..4499d57c9075d74d0938f9e957854f5a54818323 100644
--- a/sysom_web/cypress.config.js
+++ b/sysom_web/cypress.config.js
@@ -5,9 +5,12 @@ module.exports = defineConfig({
baseUrl: "http://localhost:8000",
// baseUrl: "http://sysom_dev.qjm253.cn",
experimentalStudio: true,
+ chromeWebSecurity: false,
env: {
SYSOM_ACCOUNT_USERNAME: "admin",
- SYSOM_ACCOUNT_PASSWORD: "123456"
+ SYSOM_ACCOUNT_PASSWORD: "123456",
+ HOSTS: ['127.0.0.1', '127.0.0.1'],
+ DEFAULT_HOST_PASSWORD: "123456"
},
setupNodeEvents(on, config) {
// implement node event listeners here
diff --git a/sysom_web/cypress/e2e/account/login.cy.js b/sysom_web/cypress/e2e/account/login.cy.js
index 2e676dafcfef0634961f414b48edfcfd2451b9cf..e1380737f672678ce2e364ad086e1352885d9e0e 100644
--- a/sysom_web/cypress/e2e/account/login.cy.js
+++ b/sysom_web/cypress/e2e/account/login.cy.js
@@ -1,13 +1,5 @@
///
describe("SysOM Login Page Test", () => {
- it("login failed", () => {
- cy.visit("/user/login")
- cy.get("#username").focus().type("admin")
- cy.get("#password").focus().type("123456")
- cy.get("button").contains("登录").click()
-
- cy.get("button").contains("忽 略").click()
- // cy.get("#username").focus()
- })
+ it("login failed", () => { cy.login() })
})
\ No newline at end of file
diff --git a/sysom_web/cypress/e2e/alarm/alarm_list.cy.js b/sysom_web/cypress/e2e/alarm/alarm_list.cy.js
new file mode 100644
index 0000000000000000000000000000000000000000..3f5f023befb16b53d6f72c017a143d980fdbbe29
--- /dev/null
+++ b/sysom_web/cypress/e2e/alarm/alarm_list.cy.js
@@ -0,0 +1,86 @@
+///
+
+
+describe("SysOM Alarm Manager Test", () => {
+ beforeEach(() => {
+ cy.login()
+ })
+ it.only("alarm list", () => {
+ cy.intercept("GET", "/api/v1/alarm/list?*").as("getAlarmList")
+
+ cy.visit("alarm/list")
+
+ cy.wait("@getAlarmList").then((interception) => {
+ expect(interception).to.have.property('response')
+ expect(interception.response?.body.code, 'code').to.equal(200)
+ expect(interception.response.statusCode).to.equal(200)
+
+ // cy.get('.ant-table-tbody').find('tr').should("have.length.gte", 0)
+ cy.wait(1000)
+ cy.get('.ant-table-content').find('table').then(($el) => {
+ if ($el.text().includes("No data")) {
+ cy.wrap($el).contains("No data")
+ } else {
+ // 断言告警列表数据内容大于等于1
+ cy.wrap($el).find('.ant-table-tbody').find('tr').should('have.length.gte', 1)
+
+ // 断言告警表格有11个字段
+ cy.wrap($el).find('.ant-table-tbody').find('tr').eq(0).find('td').should('have.length.gte', 9)
+
+ const td = cy.wrap($el).find('.ant-table-tbody').find('tr').eq(0).find('td')
+ // 断言告警ID格式是否为UUID V4
+ cy.wrap($el).find('.ant-table-tbody').find('tr').eq(0).find('td').eq(2).find('span').invoke('text').should('match', /^[0-9a-z]{8}-[0-9a-z]{4}-[0-9a-z]{4}-[0-9a-z]{4}-[0-9a-f]{12}$/i)
+
+ // 断言告警级别是否在枚举类型中
+ cy.wrap($el).find('.ant-table-tbody').find('tr').eq(0).find('td').eq(5).invoke("text").then((text) => {
+ expect(text.trim()).to.be.oneOf(['监控告警', '应用告警', '其他告警'])
+ })
+
+ // 断言告警级别是否在枚举类型中
+ cy.wrap($el).find('.ant-table-tbody').find('tr').eq(0).find('td').eq(6).invoke("text").then((text) => {
+ expect(text.trim()).to.be.oneOf(['严重', '警告', '错误'])
+ })
+
+ // 断言告警处理状态是否在枚举类型中
+ cy.wrap($el).find('.ant-table-tbody').find('tr').eq(0).find('td').eq(8).invoke("text").then((text) => {
+ expect(text.trim()).to.be.oneOf(['已读', '未读'])
+ })
+
+ // 断言告警时间格式是否正确
+ cy.wrap($el).find('.ant-table-tbody').find('tr').eq(0).find('td').eq(9).invoke("text").should('match', /^\d{4}-\d{2}-\d{2} \d{2}:\d{2}:\d{2}$/)
+ }
+ })
+ })
+
+ cy.wait(1000)
+ cy.get('.ant-pro-form-collapse-button').contains("展开").click()
+
+ cy.get('#alert_level').click()
+ cy.get(".rc-virtual-list-holder-inner").contains("警告").click()
+
+ cy.get('#alert_category').click()
+ cy.get(".rc-virtual-list-holder-inner").contains("应用告警").click()
+
+ cy.get('#deal_status').click()
+ cy.get(".rc-virtual-list-holder-inner").contains("未读").click()
+
+ // 点击查询
+ cy.get(':nth-child(2) > .ant-btn').click()
+
+ cy.wait(1000)
+
+ cy.get('.ant-table-tbody').then(($el) => {
+ if ($el.text().includes("No data")) {
+ cy.wrap($el).contains("No data")
+ } else {
+ cy.wrap($el).find("tr").should("have.length.gte", 1)
+ cy.wrap($el).find("tr").eq(0).contains("标记已读").click()
+ }
+ })
+
+ // 点击重置
+ cy.get('.ant-space > :nth-child(1) > .ant-btn').click()
+ // 点击收起
+ cy.get('.ant-pro-form-collapse-button').contains("收起").click()
+ })
+})
\ No newline at end of file
diff --git a/sysom_web/cypress/e2e/app_observable/java_process.cy.js b/sysom_web/cypress/e2e/app_observable/java_process.cy.js
new file mode 100644
index 0000000000000000000000000000000000000000..629f88b0b4ff8a9170c50f5f0ed6686773493a5e
--- /dev/null
+++ b/sysom_web/cypress/e2e/app_observable/java_process.cy.js
@@ -0,0 +1,142 @@
+///
+
+describe("SysOM Migration Monitor Dashboard Test", () => {
+ beforeEach(() => {
+ cy.login()
+ })
+
+ it("Migration monitor test", () => {
+ // 1. 访问java可观测
+ cy.visit("/app_observable/process_app");
+
+ // 2. 等待页面加载完成
+ cy.wait(1000);
+
+ // 运行时间（Stat面板数值类型）
+ cy.getPannelContentByTitle("运行时间")
+ .then(($el) => {
+ if ($el.text().includes("No data")) {
+ // 面板没有数据的情况
+ cy.wrap($el).contains("No data");
+ }
+ else {
+ const num = parseInt($el.text());
+ expect(num).to.be.greaterThan(0);
+ }
+ });
+
+ // 虚拟内存（Stat面板数值类型）
+ cy.getPannelContentByTitle("虚拟内存")
+ .then(($el) => {
+ if ($el.text().includes("No data")) {
+ // 面板没有数据的情况
+ cy.wrap($el).contains("No data");
+ }
+ else {
+ const num = parseInt($el.text());
+ expect(num).to.be.greaterThan(0);
+ }
+ });
+
+ // 最大时延（Stat面板数值类型）
+ cy.getPannelContentByTitle("最大延时")
+ .then(($el) => {
+ if ($el.text().includes("No data")) {
+ // 面板没有数据的情况
+ cy.wrap($el).contains("No data");
+ }
+ else {
+ const num = parseInt($el.text());
+ expect(num).to.be.greaterThan(0);
+ }
+ });
+
+ // cpu（Pie Chart）
+ cy.getPannelContentByTitle("cpu").find("ul li").should("have.length.gte", 1); // Legend 至少有一列
+
+ // 内存（Pie Chart）
+ cy.getPannelContentByTitle("内存").find("ul li").should("have.length.gte", 1); // Legend 至少有一列
+
+ // cpu占用率（Pie Chart）
+ cy.getPannelContentByTitle("cpu占比").find("ul li").should("have.length.gte", 1); // Legend 至少有一列
+
+ // IO 吞吐量（Time series 面板）
+ cy.getPannelContentByTitle("IO 吞吐量").find("tbody tr").should("have.length", 2); // Legend 有两列
+ cy.getPannelContentByTitle("IO 吞吐量").find("tbody tr").eq(0).find("td").eq(0).contains("read_bytes"); // 第一列的第一行是 read_bytes
+ cy.getPannelContentByTitle("IO 吞吐量").find("tbody tr").eq(0).find("td").eq(1).contains(/\d+/).then(($el) => { // 第二列的第二行是数值
+ const num = parseFloat($el.text());
+ expect(num).to.be.least(0);
+ });
+ cy.getPannelContentByTitle("IO 吞吐量").find("tbody tr").eq(1).find("td").eq(0).contains("write_bytes"); // 第一列的第二行是 write_bytes
+ cy.getPannelContentByTitle("IO 吞吐量").find("tbody tr").eq(1).find("td").eq(1).contains(/\d+/).then(($el) => { // 第二列的第二行是数值
+ const num = parseFloat($el.text());
+ expect(num).to.be.least(0);
+ });
+
+
+ // cpu占用率（Time series 面板）
+ cy.getPannelContentByTitle("cpu占用率折线图").find("tbody tr").should("have.length", 2); // Legend 有两列
+ cy.getPannelContentByTitle("cpu占用率折线图").find("tbody tr").eq(0).find("td").eq(0).contains("内核态cpu_sys"); // 第一列的第一行是 内核态cpu_sys
+ cy.getPannelContentByTitle("cpu占用率折线图").find("tbody tr").eq(0).find("td").eq(1).contains(/\d+/).then(($el) => { // 第二列的第二行是数值
+ const num = parseFloat($el.text());
+ expect(num).to.be.least(0);
+ });
+ cy.getPannelContentByTitle("cpu占用率折线图").find("tbody tr").eq(1).find("td").eq(0).contains("用户态cpu_user"); // 第一列的第二行是 用户态cpu_user
+ cy.getPannelContentByTitle("cpu占用率折线图").find("tbody tr").eq(1).find("td").eq(1).contains(/\d+/).then(($el) => { // 第二列的第二行是数值
+ const num = parseFloat($el.text());
+ expect(num).to.be.least(0);
+ });
+
+
+ // 进程主次缺页次数（Time series 面板）
+ cy.getPannelContentByTitle("进程主次缺页次数").find("tbody tr").should("have.length", 2); // Legend 有两列
+ cy.getPannelContentByTitle("进程主次缺页次数").find("tbody tr").eq(0).find("td").eq(0).contains("主缺页次数majflt"); // 第一列的第一行是 主缺页次数majflt
+ cy.getPannelContentByTitle("进程主次缺页次数").find("tbody tr").eq(0).find("td").eq(1).contains(/\d+/).then(($el) => { // 第二列的第二行是数值
+ const num = parseFloat($el.text());
+ expect(num).to.be.least(0);
+ });
+ cy.getPannelContentByTitle("进程主次缺页次数").find("tbody tr").eq(1).find("td").eq(0).contains("次缺页次数minflt"); // 第一列的第二行是 次缺页次数minflt
+ cy.getPannelContentByTitle("进程主次缺页次数").find("tbody tr").eq(1).find("td").eq(1).contains(/\d+/).then(($el) => { // 第二列的第二行是数值
+ const num = parseFloat($el.text());
+ expect(num).to.be.least(0);
+ });
+
+
+ // IO延迟（Time series 面板）
+ cy.getPannelContentByTitle("IO延迟").find("tbody tr").should("have.length", 1); // Legend 有两列
+ cy.getPannelContentByTitle("IO延迟").find("tbody tr").eq(0).find("td").eq(0).contains("IO延迟"); // 第一列的第一行是 IO延迟
+ cy.getPannelContentByTitle("IO延迟").find("tbody tr").eq(0).find("td").eq(1).contains(/\d+/).then(($el) => { // 第二列的第二行是数值
+ const num = parseFloat($el.text());
+ expect(num).to.be.least(0);
+ });
+
+
+ // 进程切换（Time series 面板）
+ cy.getPannelContentByTitle("进程切换").find("tbody tr").should("have.length", 2); // Legend 有两列
+ cy.getPannelContentByTitle("进程切换").find("tbody tr").eq(0).find("td").eq(0).contains("进程自主切换"); // 第一列的第一行是 进程自主切换
+ cy.getPannelContentByTitle("进程切换").find("tbody tr").eq(0).find("td").eq(1).contains(/\d+/).then(($el) => { // 第二列的第二行是数值
+ const num = parseFloat($el.text());
+ expect(num).to.be.least(0);
+ });
+ cy.getPannelContentByTitle("进程切换").find("tbody tr").eq(1).find("td").eq(0).contains("进程非自主切换"); // 第一列的第二行是 进程非自主切换
+ cy.getPannelContentByTitle("进程切换").find("tbody tr").eq(1).find("td").eq(1).contains(/\d+/).then(($el) => { // 第二列的第二行是数值
+ const num = parseFloat($el.text());
+ expect(num).to.be.least(0);
+ });
+
+
+ // 进程调度状态（Time series 面板）
+ cy.getPannelContentByTitle("进程调度状态").find("tbody tr").should("have.length", 2); // Legend 有两列
+ cy.getPannelContentByTitle("进程调度状态").find("tbody tr").eq(0).find("td").eq(0).contains("运行时间time"); // 第一列的第一行是 运行时间time
+ cy.getPannelContentByTitle("进程调度状态").find("tbody tr").eq(0).find("td").eq(1).contains(/\d+/).then(($el) => { // 第二列的第二行是数值
+ const num = parseFloat($el.text());
+ expect(num).to.be.least(0);
+ });
+ cy.getPannelContentByTitle("进程调度状态").find("tbody tr").eq(1).find("td").eq(0).contains("调度延迟delay"); // 第一列的第二行是 调度延迟delay
+ cy.getPannelContentByTitle("进程调度状态").find("tbody tr").eq(1).find("td").eq(1).contains(/\d+/).then(($el) => { // 第二列的第二行是数值
+ const num = parseFloat($el.text());
+ expect(num).to.be.least(0);
+ });
+
+ })
+})
\ No newline at end of file
diff --git a/sysom_web/cypress/e2e/diagnosis/colocation_cpi.cy.js b/sysom_web/cypress/e2e/diagnosis/colocation_cpi.cy.js
new file mode 100644
index 0000000000000000000000000000000000000000..9e48a65fcc1fe947f59f809edeffed6129295a17
--- /dev/null
+++ b/sysom_web/cypress/e2e/diagnosis/colocation_cpi.cy.js
@@ -0,0 +1,29 @@
+///
+
+describe("SysOM Cluster Manager Test", () => {
+ beforeEach(() => {
+ // 自动登录
+ cy.login()
+ })
+ it("Invoke colocation cpi diagnosis, and check result", () => {
+ cy.sysomDiagnosisCheck(
+ // 诊断前端url
+ "/diagnose/colocation/cpi",
+
+ // 诊断参数
+ {
+ "instance": "127.0.0.1",
+ "moment": "2024-03-07 10:59:58",
+ },
+
+ // 诊断结果处理（在此处判断诊断的结果数据是否符合预期）
+ (result) => {
+ cy.get('.ant-pro-card').eq(3).contains('诊断结果汇总')
+ cy.get('.ant-pro-card').eq(3).find(".ant-pro-card-body").contains('结论')
+ cy.get('.ant-pro-card').eq(3).find(".ant-pro-card-body").contains('修复建议')
+ cy.get('.ant-pro-card').eq(4).contains('容器信息')
+ cy.get('.ant-pro-card').eq(6).contains('时序信息')
+ // cy.get('.ant-pro-card-border.ant-pro-card-contain-card > .ant-pro-card-header > .ant-pro-card-title').should("contain.text", "Event overview");
+ })
+ })
+})
diff --git a/sysom_web/cypress/e2e/diagnosis/colocation_servutil.cy.js b/sysom_web/cypress/e2e/diagnosis/colocation_servutil.cy.js
new file mode 100644
index 0000000000000000000000000000000000000000..3fef58ec2e503d1db466398062ef596b73756f90
--- /dev/null
+++ b/sysom_web/cypress/e2e/diagnosis/colocation_servutil.cy.js
@@ -0,0 +1,28 @@
+///
+
+describe("SysOM Cluster Manager Test", () => {
+ beforeEach(() => {
+ // 自动登录
+ cy.login()
+ })
+ it("Invoke colocation cpi diagnosis, and check result", () => {
+ cy.sysomDiagnosisCheck(
+ // 诊断前端url
+ "/diagnose/colocation/serveutil",
+
+ // 诊断参数
+ {
+ "instance": "127.0.0.1",
+ "moment": "2024-03-05 14:15:49",
+ },
+
+ // 诊断结果处理（在此处判断诊断的结果数据是否符合预期）
+ (result) => {
+ cy.get('.ant-pro-card').eq(3).contains('诊断结果汇总')
+ cy.get('.ant-pro-card').eq(3).find(".ant-pro-card-body").contains('结论')
+ cy.get('.ant-pro-card').eq(3).find(".ant-pro-card-body").contains('修复建议')
+ cy.get('.ant-pro-card').eq(4).contains('受干扰容器详情')
+ // cy.get('.ant-pro-card-border.ant-pro-card-contain-card > .ant-pro-card-header > .ant-pro-card-title').should("contain.text", "Event overview");
+ })
+ })
+})
diff --git a/sysom_web/cypress/e2e/diagnosis/custom_command.cy.js b/sysom_web/cypress/e2e/diagnosis/custom_command.cy.js
deleted file mode 100644
index 3a6d6946d68485431d58abac3cde87c36b401b86..0000000000000000000000000000000000000000
--- a/sysom_web/cypress/e2e/diagnosis/custom_command.cy.js
+++ /dev/null
@@ -1,81 +0,0 @@
-///
-
-describe("SysOM Cluster Manager Test", () => {
- beforeEach(() => {
- // 自动登录
- cy.login()
- })
- it.only("Invoke command diagnosis, and check result", () => {
- cy.sysomDiagnosisCheck(
- // 诊断前端url
- "/diagnose/custom/command",
-
- // 诊断参数
- {
- "instance": "127.0.0.1",
- "command": "ls -ltrh"
- },
-
- // 诊断结果处理（在此处判断诊断的结果数据是否符合预期）
- // {
- // "id": 83,
- // "created_at": "2023-09-11 17:34:59",
- // "updated_at": "2023-09-11 17:34:59",
- // "task_id": "d4KvXgub",
- // "status": "Success",
- // "service_name": "command",
- // "code": 0,
- // "err_msg": "",
- // "result": {
- // "CommandResult": {
- // "data": [
- // {
- // "key": "",
- // "value": "total 600M\n-rw-r--r-- 1 root root 45M Jun 26 22:17 sysom.tar.gz\ndrwxr-xr-x 14 root root 4.0K Aug"
- // }
- // ]
- // }
- // },
- // "params": {
- // "service_name": "command",
- // "instance": "127.0.0.1",
- // "command": "ls -ltrh"
- // },
- // "created_by": 1,
- // "url": "/diagnose/detail/d4KvXgub"
- // }
- (result) => {
- // result => 包含诊断API返回的诊断详情数据
-
- ////////////////////////////////////////////////////////////
- // 在此处补充诊断详情渲染后的前端页面是否符合预期
- // 断言文档：https://docs.cypress.io/guides/references/assertions#Text-Content
- ////////////////////////////////////////////////////////////
- /* ==== Generated with Cypress Studio ==== */
- cy.get('.ant-statistic-content-value').should("contain.text", "total")
- cy.get('.ant-statistic-content-value').should(($element) => {
- // total 600M
- // -rw-r--r-- 1 root root 45M Jun 26 22:17 sysom.tar.gz
- // drwxr-xr-x 14 root root 4.0K Aug 2 11:36 sysom-2.2
- // -rw-r--r-- 1 root root 238M Aug 2 11:38 sysom-2.2.tar.gz
- // drwxr-xr-x 14 root root 4.0K Aug 2 14:53 sysom-3.0
- // drwxr-xr-x 8 root root 4.0K Aug 2 14:55 rpmbuild
- // -rw-r--r-- 1 root root 238M Aug 2 14:56 sysom-3.0.tar.gz
- // drwxr-xr-x 14 root root 4.0K Sep 11 20:31 sysom
- let lines = $element.text().split("\n")
-
- // 断言结果文本至少大于 1 行
- expect(lines.length).to.be.gt(1)
-
- // total 600M
- let first_line = lines[0]
- first_line = first_line.replace("total ", "")
-
- // 断言总文件大小至少大于0
- expect(parseInt(first_line)).to.be.gt(0)
- })
- cy.get('.ant-pro-card-border > .ant-pro-card-header > .ant-pro-card-title').should("contain.text", "Command Result")
- /* ==== End Cypress Studio ==== */
- })
- })
-})
\ No newline at end of file
diff --git a/sysom_web/cypress/e2e/diagnosis/diagnose_query.cy.js b/sysom_web/cypress/e2e/diagnosis/diagnose_query.cy.js
new file mode 100644
index 0000000000000000000000000000000000000000..a1b5428c658d62b3ac9a01a8cf8d9014dd6b7dc6
--- /dev/null
+++ b/sysom_web/cypress/e2e/diagnosis/diagnose_query.cy.js
@@ -0,0 +1,103 @@
+/*
+ * @Author: wb-msm241621
+ * @Date: 2024-03-11 17:40:55
+ * @LastEditTime: 2024-03-14 17:24:51
+ * @Description:
+ */
+///
+
+Cypress.on('uncaught:exception', (err, runnable) => {
+ // return false to prevent the error from failing the test if it matches
+ // the specific error message
+ if (err.message.includes('ResizeObserver loop completed with undelivered notifications')) {
+ return false;
+ }
+ // else let Cypress handle the exception as it normally does
+ return true;
+});
+
+describe("SysOM Diagnosis Test -- Query", () => {
+ beforeEach(() => {
+ // 自动登录
+ cy.login()
+ })
+ it("Invoke diagnose query, and check result", () => {
+ cy.intercept("GET", "/api/v1/tasks/?*").as("getDiagnoseTaskList")
+
+ // 1. 访问诊断查询页面
+ cy.visit("diagnose/query")
+
+ cy.wait("@getDiagnoseTaskList", { timeout: 10000 }).then((interception) => {
+ expect(interception).to.have.property('response')
+ expect(interception.response?.body.code, 'code').to.equal(200)
+ expect(interception.response.statusCode).to.equal(200)
+
+ // cy.get('.ant-table-tbody').find('tr').should("have.length.gte", 0)
+ cy.wait(1000)
+ cy.get('.ant-table-content').find('table').then(($el) => {
+ if ($el.text().includes("No data")) {
+ cy.wrap($el).contains("No data")
+ } else {
+ // 断言告警列表数据内容大于等于1
+ cy.wrap($el).find('.ant-table-tbody').find('tr').should('have.length.gte', 1)
+ // 断言表头字段数量是否等于5
+ cy.wrap($el).find('.ant-table-tbody').find('tr').eq(0).find('td').should('have.length.gte', 5)
+
+ // 断言诊断ID是否为UUID
+ cy.wrap($el).find(".ant-table-tbody").find('tr').eq(0).find('td').eq(1).invoke("text").then((text) => {
+ expect(text).to.match(/[a-zA-Z0-9]{8}/);
+ })
+
+ // 断言诊断时间格式
+ cy.wrap($el).find(".ant-table-tbody").find('tr').eq(0).find('td').eq(2).invoke("text").then((text) => {
+ const data = new Date(text);
+ expect(data.toString()).not.to.equal('Invalid Date!')
+ })
+
+ // 断言诊断状态是否在枚举类型中
+ cy.wrap($el).find('.ant-table-tbody').find('tr').eq(0).find('td').eq(3).invoke("text").then((text) => {
+ expect(text.trim()).to.be.oneOf(["诊断完毕", "异常", "准备中", "运行中"])
+ })
+
+ // 断言诊断参数是否大于1
+ cy.wrap($el).find('.ant-table-tbody').find('tr').eq(0).find('td').eq(4).find("span").should('have.length.gt', 1)
+ }
+ })
+ })
+
+ cy.wait(2000)
+
+ // 2. 诊断查询参数悬着ssh通道
+ cy.get('#channel').click({force: true})
+ cy.get(".rc-virtual-list-holder-inner").contains("SSH通道").click()
+
+ cy.get(':nth-child(2) > .ant-btn').click()
+ cy.wait(2000)
+
+ // 3.
+ cy.get(".ant-table-content").find("table").then(($el) => {
+ if ($el.text().includes("No data")) {
+ cy.wrap($el).contains("No data")
+ } else {
+ cy.wrap($el).find(".ant-table-tbody").find('tr').eq(0).find('td').eq(5).find('.ant-space-item').eq(0).then(($el) => {
+ if ($el.text().includes("查看出错信息")) {
+ // 诊断失败后查看错误信息
+ cy.wrap($el).get("a").contains("查看出错信息").click()
+ cy.wait(1000)
+ } else {
+ // 诊断成功后查看诊断结果
+ cy.wrap($el).get("a").contains("查看诊断结果").click()
+ cy.wait(1000)
+
+ cy.get(".ant-pro-card-header").eq(0).scrollIntoView()
+ cy.get(".ant-pro-card-header").should("contain.text", "诊断结果")
+ }
+ })
+ }
+ })
+ cy.wait(1500)
+ cy.scrollTo("top")
+
+ cy.get('.ant-pro-card-body > .ant-form > .ant-space-align-center > :nth-child(1) > .ant-btn').click()
+ })
+})
diff --git a/sysom_web/cypress/e2e/diagnosis/filecache.cy.js b/sysom_web/cypress/e2e/diagnosis/filecache.cy.js
index 8076c18af93591a8634a2198dbe185aa255f6a1b..659b6f5b1e7b985b3e06bba2a13bbb4e71ab67a0 100644
--- a/sysom_web/cypress/e2e/diagnosis/filecache.cy.js
+++ b/sysom_web/cypress/e2e/diagnosis/filecache.cy.js
@@ -12,7 +12,7 @@ describe("SysOM Diagnosis Test -- filecache", () => {
// 诊断参数
{
- "instance": "127.0.0.1",
+ "instance": Cypress.env("HOSTS")[0],
//"value": "",
"type": "all"
},
@@ -85,33 +85,30 @@ describe("SysOM Diagnosis Test -- filecache", () => {
// cy.get('.ant-statistic-content-value').click()
//cy.get('.ant-table-thead').should("contain.text", "请求时间")
/* ==== End Cypress Studio ==== */
+ cy.wait(1000)
+ cy.get('.ant-pro-card-title > div').scrollIntoView()
+ cy.get('.ant-pro-card-title > div').should('contain.text', '诊断结果')
+ cy.get('.ant-table-content').last().find('table').then(($el) => {
+ if ($el.text().includes("No data")) {
+ cy.wrap($el).contains("No data")
+ } else {
+ const dataList = result.result?.podmem?.data
+ if (dataList && dataList.length > 0) {
+ const rowItem = dataList[0]
+ const rowNames = Object.keys(rowItem)
+ const thNames = rowNames.filter(item => item != "key")
+
+ cy.get('table').last().find('thead').find('tr').find('th').should('have.length.gte', 6)
+ thNames.forEach((name, index) => {
+ cy.get('table').last().find('thead').find('tr').find('th').eq(index).should('contain.text', name)
+ })
+ }
+ }
+ })
})
/* ==== Generated with Cypress Studio ==== */
-
- cy.get('[style="padding: 0px;"] > .ant-pro-table > \
- .ant-pro-card > .ant-pro-card-body > .ant-table-wrapper > \
- .ant-spin-nested-loading > .ant-spin-container > .ant-table > \
- .ant-table-container > .ant-table-content > table > .ant-table-thead > \
- tr > :nth-child(1)').should("contain.text", "POD");
-
- cy.get('[style="padding: 0px;"] > .ant-pro-table > .ant-pro-card > \
- .ant-pro-card-body > .ant-table-wrapper > .ant-spin-nested-loading > \
- .ant-spin-container > .ant-table > .ant-table-container > \
- .ant-table-content > table > .ant-table-thead > tr > :nth-child(2)')
- .should("contain.text", "Container");
- cy.get('[style="padding: 0px;"] > .ant-pro-table > .ant-pro-card > \
- .ant-pro-card-body > .ant-table-wrapper > .ant-spin-nested-loading > \
- .ant-spin-container > .ant-table > .ant-table-container > \
- .ant-table-content > table > .ant-table-thead > tr > :nth-child(3)')
- .should("contain.text", "Filename");
-
- cy.get('[style="padding: 0px;"] > .ant-pro-table > .ant-pro-card > \
- .ant-pro-card-body > .ant-table-wrapper > .ant-spin-nested-loading > \
- .ant-spin-container > .ant-table > .ant-table-container > \
- .ant-table-content > table > .ant-table-thead > tr > :nth-child(5)')
- .should("contain.text", "Cached");
/* ==== End Cypress Studio ==== */
})
@@ -122,7 +119,7 @@ describe("SysOM Diagnosis Test -- filecache", () => {
// 诊断参数
{
- "instance": "192.168.0.136",
+ "instance": Cypress.env("HOSTS")[0],
//"value": "",
"type": "host"
},
@@ -187,19 +184,25 @@ describe("SysOM Diagnosis Test -- filecache", () => {
// cy.get('.ant-statistic-content-value').click()
//cy.get('.ant-table-thead').should("contain.text", "请求时间")
/* ==== End Cypress Studio ==== */
-
+ cy.get('.ant-pro-card-title > div').scrollIntoView()
+ cy.get('.ant-pro-card-title > div').should('contain.text', '诊断结果')
+ cy.get('.ant-table-content').last().find('table').then(($el) => {
+ if ($el.text().includes("No data")) {
+ cy.wrap($el).contains("No data")
+ } else {
+ const dataList = result.result?.podmem?.data
+ if (dataList && dataList.length > 0) {
+ const rowItem = dataList[0]
+ const rowNames = Object.keys(rowItem)
+ const thNames = rowNames.filter(item => item != "key")
+
+ cy.get('table').last().find('thead').find('tr').find('th').should('have.length.gte', 6)
+ thNames.forEach((name, index) => {
+ cy.get('table').last().find('thead').find('tr').find('th').eq(index).should('contain.text', name)
+ })
+ }
+ }
+ })
})
- /* ==== Generated with Cypress Studio ==== */
- cy.get('[style="padding: 0px;"] > .ant-pro-table > .ant-pro-card > \
- .ant-pro-card-body > .ant-table-wrapper > .ant-spin-nested-loading > \
- .ant-spin-container > .ant-table > .ant-table-container > \
- .ant-table-content > table > .ant-table-thead > tr > :nth-child(1)')
- .should("contain.text", "Filename");
- cy.get('[style="padding: 0px;"] > .ant-pro-table > .ant-pro-card > \
- .ant-pro-card-body > .ant-table-wrapper > .ant-spin-nested-loading > \
- .ant-spin-container > .ant-table > .ant-table-container > \
- .ant-table-content > table > .ant-table-thead > tr > :nth-child(3)')
- .should("contain.text", "Cached");
- /* ==== End Cypress Studio ==== */
})
})
diff --git a/sysom_web/cypress/e2e/diagnosis/iofsstat_test.cy.js b/sysom_web/cypress/e2e/diagnosis/iofsstat_test.cy.js
index c0462370553d64d74eae8fe9d22d9a93ced13ef2..cc3fbee5aabdfb784b7d6c3e852a804b629691ca 100644
--- a/sysom_web/cypress/e2e/diagnosis/iofsstat_test.cy.js
+++ b/sysom_web/cypress/e2e/diagnosis/iofsstat_test.cy.js
@@ -13,7 +13,7 @@ describe("SysOM Diagnosis Test -- iofsstat", () => {
// 诊断参数
{
- "instance": "127.0.0.1",
+ "instance": Cypress.env("HOSTS")[0],
"timeout": "5",
},
(result) => {
diff --git a/sysom_web/cypress/e2e/diagnosis/iohang_test.cy.js b/sysom_web/cypress/e2e/diagnosis/iohang_test.cy.js
index 28f955005afeaacfd7728c47291544c48a82a36c..f004950a47e059ef32770038ea6606a132e6986a 100644
--- a/sysom_web/cypress/e2e/diagnosis/iohang_test.cy.js
+++ b/sysom_web/cypress/e2e/diagnosis/iohang_test.cy.js
@@ -13,7 +13,7 @@ describe("SysOM Diagnosis Test -- iohang", () => {
// 诊断参数
{
- "instance": "127.0.0.1",
+ "instance": Cypress.env("HOSTS")[0],
"threshold": "1",
"timeout": "10",
},
@@ -26,9 +26,11 @@ describe("SysOM Diagnosis Test -- iohang", () => {
////////////////////////////////////////////////////////////
/* ==== Generated with Cypress Studio ==== */
// cy.get('.ant-statistic-content-value').click()
- cy.get('.ant-pro-card-border.ant-pro-card-contain-card > .ant-pro-card-header > .ant-pro-card-title').should("contain.text", "IO HANG overview");
- cy.get(':nth-child(1) > .ant-pro-card > .ant-pro-card-body > .ant-statistic > .ant-statistic-content > .ant-statistic-content-value').invoke('text').should("match", /normal|abnormal/);
- cy.get(':nth-child(2) > .ant-pro-card-header > .ant-pro-card-title').should("contain.text", "More details of TOP 10 IO");
+ cy.diagnosisTaskResultHandler(result, () => {
+ cy.get('.ant-pro-card-border.ant-pro-card-contain-card > .ant-pro-card-header > .ant-pro-card-title').should("contain.text", "IO HANG overview");
+ cy.get(':nth-child(1) > .ant-pro-card > .ant-pro-card-body > .ant-statistic > .ant-statistic-content > .ant-statistic-content-value').invoke('text').should("match", /normal|abnormal/);
+ cy.get(':nth-child(2) > .ant-pro-card-header > .ant-pro-card-title').should("contain.text", "More details of TOP 10 IO");
+ })
//cy.get('.ant-statistic-content-value').should("contain.text", "total")
/* ==== End Cypress Studio ==== */
})
diff --git a/sysom_web/cypress/e2e/diagnosis/iolatency_test.cy.js b/sysom_web/cypress/e2e/diagnosis/iolatency_test.cy.js
index 0f8499bfe2783bed8ae5fde5ef1e8d65e9548db3..f398d8c6a74e393684841ac42fc3a0820fe4f4d9 100644
--- a/sysom_web/cypress/e2e/diagnosis/iolatency_test.cy.js
+++ b/sysom_web/cypress/e2e/diagnosis/iolatency_test.cy.js
@@ -13,7 +13,7 @@ describe("SysOM Diagnosis Test -- iolatency", () => {
// 诊断参数
{
- "instance": "127.0.0.1",
+ "instance": Cypress.env("HOSTS")[0],
"timeout": "5",
"threshold": "1"
},
@@ -27,11 +27,16 @@ describe("SysOM Diagnosis Test -- iolatency", () => {
////////////////////////////////////////////////////////////
/* ==== Generated with Cypress Studio ==== */
// cy.get('.ant-statistic-content-value').click()
- cy.get('.ant-pro-card-border.ant-pro-card-contain-card > .ant-pro-card-header > .ant-pro-card-title').should("contain.text", "Iolatency overview");
- cy.get(':nth-child(1) > .ant-pro-card > .ant-pro-card-body > .ant-statistic > .ant-statistic-content > .ant-statistic-content-value').invoke('text').should("match", /normal|abnormal/);
- cy.get(':nth-child(2) > .ant-pro-card-header').should("contain.text", "Overall delay distribution");
- cy.get(':nth-child(3) > .ant-pro-card-header').should("contain.text", "Single IO delay metrics display");
- cy.get(':nth-child(4) > .ant-pro-card-header > .ant-pro-card-title').should("contain.text", "More details of TOP 10 IO");
+ if (result.status == "Fail") {
+ cy.get('.ant-modal-confirm-title').should("contain.text", "诊断失败")
+ cy.get('.ant-modal-confirm-btns > .ant-btn > span').click()
+ } else {
+ cy.get('.ant-pro-card-border.ant-pro-card-contain-card > .ant-pro-card-header > .ant-pro-card-title').should("contain.text", "Iolatency overview");
+ cy.get(':nth-child(1) > .ant-pro-card > .ant-pro-card-body > .ant-statistic > .ant-statistic-content > .ant-statistic-content-value').invoke('text').should("match", /normal|abnormal/);
+ cy.get(':nth-child(2) > .ant-pro-card-header').should("contain.text", "Overall delay distribution");
+ cy.get(':nth-child(3) > .ant-pro-card-header').should("contain.text", "Single IO delay metrics display");
+ cy.get(':nth-child(4) > .ant-pro-card-header > .ant-pro-card-title').should("contain.text", "More details of TOP 10 IO");
+ }
//cy.get('.ant-statistic-content-value').should("contain.text", "total")
/* ==== End Cypress Studio ==== */
})
diff --git a/sysom_web/cypress/e2e/diagnosis/jitter.cy.js b/sysom_web/cypress/e2e/diagnosis/jitter.cy.js
index 39fbe2fc9bd56a48d05e51a73e05caad4e7e7d7c..e18cd06cf17e1464a7acd6580916823ca797b948 100644
--- a/sysom_web/cypress/e2e/diagnosis/jitter.cy.js
+++ b/sysom_web/cypress/e2e/diagnosis/jitter.cy.js
@@ -12,7 +12,7 @@ describe("SysOM Diagnosis Test -- jitter", () => {
// 诊断参数
{
- "instance": "127.0.0.1",
+ "instance": Cypress.env("HOSTS")[0],
},
// "result": {
@@ -54,9 +54,11 @@ describe("SysOM Diagnosis Test -- jitter", () => {
(result) => {
// cy.get(':nth-child(1) > .ant-pro-card-header > .ant-pro-card-title').should("contain.text", "发送端报文路径");
/* ==== Generated with Cypress Studio ==== */
- cy.get(':nth-child(1) > .ant-pro-card-header > .ant-pro-card-title').should("contain.text", "发送端报文路径");
- cy.get(':nth-child(2) > .ant-pro-card-header > .ant-pro-card-title').should("contain.text", "接收端报文路径");
- /* ==== End Cypress Studio ==== */
+ if (result.status === "Success") {
+ cy.get(':nth-child(1) > .ant-pro-card-header > .ant-pro-card-title').should("contain.text", "发送端报文路径");
+ cy.get(':nth-child(2) > .ant-pro-card-header > .ant-pro-card-title').should("contain.text", "接收端报文路径");
+ /* ==== End Cypress Studio ==== */
+ }
})
})
})
diff --git a/sysom_web/cypress/e2e/diagnosis/load_diagnosis_test.cy.js b/sysom_web/cypress/e2e/diagnosis/load_diagnosis_test.cy.js
index c59110f3d6dee1c7580f1e2eedcd103555fce46f..b850b70620c7834eb1b03ed99810e6850f960c2e 100644
--- a/sysom_web/cypress/e2e/diagnosis/load_diagnosis_test.cy.js
+++ b/sysom_web/cypress/e2e/diagnosis/load_diagnosis_test.cy.js
@@ -13,7 +13,7 @@ describe("SysOM Diagnosis Test -- loadtask", () => {
// 诊断参数
{
- "instance": "127.0.0.1"
+ "instance": Cypress.env("HOSTS")[0]
},
// 诊断结果处理（在此处判断诊断的结果数据是否符合预期）
diff --git a/sysom_web/cypress/e2e/diagnosis/memgraph.cy.js b/sysom_web/cypress/e2e/diagnosis/memgraph.cy.js
index 054f6919ef1d03fa894768dac243b44f7a1fcabb..ae849e167c4285892081178b28c360a98077cc7e 100644
--- a/sysom_web/cypress/e2e/diagnosis/memgraph.cy.js
+++ b/sysom_web/cypress/e2e/diagnosis/memgraph.cy.js
@@ -12,7 +12,7 @@ describe("SysOM Diagnosis Test -- memgraph", () => {
// 诊断参数
{
- "instance": "127.0.0.1"
+ "instance": Cypress.env("HOSTS")[0]
},
// 诊断结果处理（在此处判断诊断的结果数据是否符合预期）
@@ -259,7 +259,11 @@ describe("SysOM Diagnosis Test -- memgraph", () => {
// 断言文档：https://docs.cypress.io/guides/references/assertions#Text-Content
////////////////////////////////////////////////////////////
/* ==== Generated with Cypress Studio ==== */
- cy.get(':nth-child(1) > .ant-pro-card > .ant-pro-card-body > .ant-statistic > .ant-statistic-content > .ant-statistic-content-value').invoke('text').should('match',/^[0-9]*%$/);
+ // cy.get(':nth-child(1) > .ant-pro-card > .ant-pro-card-body > .ant-statistic > .ant-statistic-content > .ant-statistic-content-value').invoke('text').should('match',/^[0-9]*%$/);
+ cy.get(':nth-child(1) > .ant-pro-card > .ant-pro-card-body > .ant-statistic > .ant-statistic-content > .ant-statistic-content-value').contains(/\d+/).then(($el) => {
+ const num = parseInt($el.text());
+ expect(num).to.be.gt(0);
+ })
cy.get(':nth-child(2) > .ant-pro-card > .ant-pro-card-body > .ant-statistic > .ant-statistic-content > .ant-statistic-content-value').invoke('text').should('match',/NG|OK/);
cy.get(':nth-child(3) > .ant-pro-card > .ant-pro-card-body > .ant-statistic > .ant-statistic-content > .ant-statistic-content-value').invoke('text').should('match',/NG|OK/);
cy.get(':nth-child(4) > .ant-pro-card > .ant-pro-card-body > .ant-statistic > .ant-statistic-content > .ant-statistic-content-value').invoke('text').should('match',/NG|OK/);
diff --git a/sysom_web/cypress/e2e/diagnosis/oomcheck.cy.js b/sysom_web/cypress/e2e/diagnosis/oomcheck.cy.js
index 116d0fd13a4dbc383d8036c1e32eb096532a9534..c38a62a946d95281466ebeead7feba86c67ff46b 100644
--- a/sysom_web/cypress/e2e/diagnosis/oomcheck.cy.js
+++ b/sysom_web/cypress/e2e/diagnosis/oomcheck.cy.js
@@ -13,7 +13,7 @@ describe("SysOM Diagnosis Test -- oomcheck", () => {
// 诊断参数
{
- "instance": "127.0.0.1"
+ "instance": Cypress.env("HOSTS")[0]
},
// 诊断结果处理（在此处判断诊断的结果数据是否符合预期）
diff --git a/sysom_web/cypress/e2e/diagnosis/packetdrop.cy.js b/sysom_web/cypress/e2e/diagnosis/packetdrop.cy.js
index 4bfd4545a790b3855fa302a8e375f4a5730373b6..710bac0b9669d544d0a08e298ec3b63eef503f82 100644
--- a/sysom_web/cypress/e2e/diagnosis/packetdrop.cy.js
+++ b/sysom_web/cypress/e2e/diagnosis/packetdrop.cy.js
@@ -12,7 +12,7 @@ describe("SysOM Diagnosis Test -- packetdrop", () => {
// 诊断参数
{
- "instance": "127.0.0.1",
+ "instance": Cypress.env("HOSTS")[0],
},
// result {
@@ -49,8 +49,10 @@ describe("SysOM Diagnosis Test -- packetdrop", () => {
// 断言文档：https://docs.cypress.io/guides/references/assertions#Text-Content
////////////////////////////////////////////////////////////
/* ==== Generated with Cypress Studio ==== */
- cy.get(':nth-child(1) > .ant-pro-card > .ant-pro-card-body > .ant-statistic > .ant-statistic-title').should("contain.text", "tcp");
- cy.get(':nth-child(3) > .ant-pro-card-header > .ant-pro-card-title').should("contain.text", "丢包详情列表");
+ cy.diagnosisTaskResultHandler(result, () => {
+ cy.get(':nth-child(1) > .ant-pro-card > .ant-pro-card-body > .ant-statistic > .ant-statistic-title').should("contain.text", "tcp");
+ cy.get(':nth-child(3) > .ant-pro-card-header > .ant-pro-card-title').should("contain.text", "丢包详情列表");
+ })
/* ==== End Cypress Studio ==== */
})
})
diff --git a/sysom_web/cypress/e2e/diagnosis/retran.cy.js b/sysom_web/cypress/e2e/diagnosis/retran.cy.js
index 6f5d6cbc0194e4e5922f4f0b7a98f2ff9b05b0ed..c5a3ef36b981c11805703bf4dfee785087c644c0 100644
--- a/sysom_web/cypress/e2e/diagnosis/retran.cy.js
+++ b/sysom_web/cypress/e2e/diagnosis/retran.cy.js
@@ -12,7 +12,7 @@ describe("SysOM Diagnosis Test -- retran", () => {
// 诊断参数
{
- "instance": "127.0.0.1",
+ "instance": Cypress.env("HOSTS")[0],
},
@@ -124,12 +124,14 @@ describe("SysOM Diagnosis Test -- retran", () => {
// cy.get('.ant-statistic-content-value').click()
// cy.get(':nth-child(1) > .ant-pro-card-header > .ant-pro-card-title').should("contain.text", "发送端报文路径");
/* ==== Generated with Cypress Studio ==== */
- cy.get('.ant-pro-card-border.ant-pro-card-contain-card > .ant-pro-card-header > .ant-pro-card-title').should("contain.text", "retran overview");
- cy.get(':nth-child(2) > [style="margin-right: -8px; margin-left: -8px;"] > :nth-child(1) > .ant-pro-card-border > [style="padding: 0px;"] > .ant-pro-card > .ant-pro-card-header > .ant-pro-card-title').should("contain.text", "sourcePortDistribution");
- cy.get(':nth-child(2) > [style="margin-right: -8px; margin-left: -8px;"] > :nth-child(2) > .ant-pro-card-border > [style="padding: 0px;"] > .ant-pro-card > .ant-pro-card-header > .ant-pro-card-title').should("contain.text", "destPortDistribution");
- cy.get(':nth-child(3) > [style="margin-right: -8px; margin-left: -8px;"] > :nth-child(1) > .ant-pro-card-border > [style="padding: 0px;"] > .ant-pro-card > .ant-pro-card-header > .ant-pro-card-title').should("contain.text", "sourceIpDistribution");
- cy.get(':nth-child(3) > [style="margin-right: -8px; margin-left: -8px;"] > :nth-child(2) > .ant-pro-card-border > [style="padding: 0px;"] > .ant-pro-card > .ant-pro-card-header > .ant-pro-card-title').should("contain.text", "destIpDistribution");
- cy.get(':nth-child(4) > .ant-pro-card-header > .ant-pro-card-title').should("contain.text", "重传详情列表");
+ cy.diagnosisTaskResultHandler(result, () => {
+ cy.get('.ant-pro-card-border.ant-pro-card-contain-card > .ant-pro-card-header > .ant-pro-card-title').should("contain.text", "retran overview");
+ cy.get(':nth-child(2) > [style="margin-right: -8px; margin-left: -8px;"] > :nth-child(1) > .ant-pro-card-border > [style="padding: 0px;"] > .ant-pro-card > .ant-pro-card-header > .ant-pro-card-title').should("contain.text", "sourcePortDistribution");
+ cy.get(':nth-child(2) > [style="margin-right: -8px; margin-left: -8px;"] > :nth-child(2) > .ant-pro-card-border > [style="padding: 0px;"] > .ant-pro-card > .ant-pro-card-header > .ant-pro-card-title').should("contain.text", "destPortDistribution");
+ cy.get(':nth-child(3) > [style="margin-right: -8px; margin-left: -8px;"] > :nth-child(1) > .ant-pro-card-border > [style="padding: 0px;"] > .ant-pro-card > .ant-pro-card-header > .ant-pro-card-title').should("contain.text", "sourceIpDistribution");
+ cy.get(':nth-child(3) > [style="margin-right: -8px; margin-left: -8px;"] > :nth-child(2) > .ant-pro-card-border > [style="padding: 0px;"] > .ant-pro-card > .ant-pro-card-header > .ant-pro-card-title').should("contain.text", "destIpDistribution");
+ cy.get(':nth-child(4) > .ant-pro-card-header > .ant-pro-card-title').should("contain.text", "重传详情列表");
+ })
/* ==== End Cypress Studio ==== */
})
})
diff --git a/sysom_web/cypress/e2e/diagnosis/rtdelay.cy.js b/sysom_web/cypress/e2e/diagnosis/rtdelay.cy.js
index af3f98d400aaae08293d60978f46bd3e21e56275..b7a1b5ea2af76d93fd14c845b28f1bb525395c6d 100644
--- a/sysom_web/cypress/e2e/diagnosis/rtdelay.cy.js
+++ b/sysom_web/cypress/e2e/diagnosis/rtdelay.cy.js
@@ -12,7 +12,7 @@ describe("SysOM Diagnosis Test -- rtdelay", () => {
// 诊断参数
{
- "instance": "127.0.0.1",
+ "instance": Cypress.env("HOSTS")[0],
"pid": "-1",
"time": "2"
},
@@ -61,7 +61,10 @@ describe("SysOM Diagnosis Test -- rtdelay", () => {
////////////////////////////////////////////////////////////
/* ==== Generated with Cypress Studio ==== */
// cy.get('.ant-statistic-content-value').click()
- cy.get('.ant-table-thead').should("contain.text", "请求时间")
+
+ cy.diagnosisTaskResultHandler(result, ()=> {
+ cy.get('.ant-table-thead').should("contain.text", "请求时间")
+ })
/* ==== End Cypress Studio ==== */
})
})
diff --git a/sysom_web/cypress/e2e/diagnosis/schedmoni.cy.js b/sysom_web/cypress/e2e/diagnosis/schedmoni.cy.js
index 9eb29356899688963c0f93d051e43b8b6602f262..a93c53eb7ea785f6b1a7b6ee2f290a90c2d4f01a 100644
--- a/sysom_web/cypress/e2e/diagnosis/schedmoni.cy.js
+++ b/sysom_web/cypress/e2e/diagnosis/schedmoni.cy.js
@@ -12,19 +12,30 @@ describe("SysOM Cluster Manager Test", () => {
// 诊断参数
{
- "instance": "127.0.0.1",
+ "instance": Cypress.env("HOSTS")[0],
"timeout": "1",
- "threshold": "1"
+ "threshold": "1"
},
// 诊断结果处理（在此处判断诊断的结果数据是否符合预期）
(result) => {
- cy.get('.ant-pro-card-border.ant-pro-card-contain-card > .ant-pro-card-header > .ant-pro-card-title').should("contain.text", "Event overview");
- cy.get(':nth-child(1) > .ant-pro-card > .ant-pro-card-body > .ant-statistic > .ant-statistic-content > .ant-statistic-content-value').invoke('text').should("match", /emergency|warning|normal/);
- cy.get(':nth-child(2) > .ant-pro-card > .ant-pro-card-body > .ant-statistic > .ant-statistic-content > .ant-statistic-content-value').invoke('text').should("match", /emergency|warning|normal/);
- cy.get(':nth-child(3) > .ant-pro-card > .ant-pro-card-body > .ant-statistic > .ant-statistic-content > .ant-statistic-content-value').invoke('text').should("match", /emergency|warning|normal/);
- cy.get(':nth-child(2) > .ant-pro-card-header').should("contain.text", "Timeline Diagram");
- cy.get(':nth-child(3) > .ant-pro-card-header > .ant-pro-card-title').should("contain.text", "Scheduling Jitter Details");
+ cy.get('.ant-pro-card-title > div').scrollIntoView()
+ cy.get('.ant-pro-card-title > div').should('contain.text', '诊断结果')
+ cy.diagnosisTaskResultHandler(result, () => {
+ cy.get(':nth-child(1) > .ant-pro-card-header > .ant-pro-card-title').should("contain.text", "Event overview");
+ cy.get(':nth-child(1) > .ant-pro-card > .ant-pro-card-body').then(($el) => {
+ if ($el.text().includes("no data")){
+ cy.wrap($el).contains("no data")
+ } else {
+ cy.get(':nth-child(1) > .ant-pro-card > .ant-pro-card-body > .ant-statistic > .ant-statistic-content > .ant-statistic-content-value').invoke('text').should("match", /emergency|warning|normal/);
+ cy.get(':nth-child(2) > .ant-pro-card > .ant-pro-card-body > .ant-statistic > .ant-statistic-content > .ant-statistic-content-value').invoke('text').should("match", /emergency|warning|normal/);
+ cy.get(':nth-child(3) > .ant-pro-card > .ant-pro-card-body > .ant-statistic > .ant-statistic-content > .ant-statistic-content-value').invoke('text').should("match", /emergency|warning|normal/);
+ }
+ })
+
+ cy.get(':nth-child(2) > .ant-pro-card-header').should("contain.text", "Timeline Diagram");
+ cy.get(':nth-child(3) > .ant-pro-card-header > .ant-pro-card-title').should("contain.text", "Scheduling Jitter Details");
+ })
})
})
})
diff --git a/sysom_web/cypress/e2e/diagnosis/system_health_test.cy.js b/sysom_web/cypress/e2e/diagnosis/system_health_test.cy.js
index 3f361d95fa6a2884623026051b3e65fb7ab1e90f..94191c0258669393859d035e326dfc974a5acfc6 100644
--- a/sysom_web/cypress/e2e/diagnosis/system_health_test.cy.js
+++ b/sysom_web/cypress/e2e/diagnosis/system_health_test.cy.js
@@ -9,7 +9,7 @@ describe("SysOM Diagnosis Test -- system health", () => {
//cy.wait(5000)
cy.sysomDiagnosisCheck(
// 诊断前端url
- "diagnose/oscheck",
+ "diagnose/ossre",
// 诊断参数
{
@@ -39,4 +39,4 @@ describe("SysOM Diagnosis Test -- system health", () => {
/* ==== End Cypress Studio ==== */
})
})
-})
\ No newline at end of file
+})
diff --git a/sysom_web/cypress/e2e/host/host.cy.js b/sysom_web/cypress/e2e/host/host.cy.js
index f9b01b29c5f33d5b3be9bac221bf89c81890d3fd..73b50e2b87665ec7005d0b492c638227d68b6c82 100644
--- a/sysom_web/cypress/e2e/host/host.cy.js
+++ b/sysom_web/cypress/e2e/host/host.cy.js
@@ -5,6 +5,8 @@ describe("SysOM Host Manager Test", () => {
cy.login()
})
it("Crate and delete host", () => {
+ cy.intercept("GET", "/api/v1/host/")
+ .as("getHostList")
cy.intercept("POST", "/api/v1/host/")
.as("createHost")
@@ -14,39 +16,45 @@ describe("SysOM Host Manager Test", () => {
// 1. 访问主机列表也米娜
cy.visit("/host/list")
- // 2. 点击新建主机打开模块框
- cy.get("button").contains("新建主机").click()
-
- // 3. 在模态框内部填充字段
- cy.get(".ant-modal-content").first().within(() => {
- // 3.1 cluster
- cy.get("#cluster").focus().type("default").type("{enter}")
-
- // 3.2 hostname
- cy.get("#hostname").focus().clear().type("local")
-
- // 3.3 username
- cy.get("#username").focus().clear().type("root")
-
- // 3.4 password
- cy.get("#host_password").focus().clear().type("alios#123")
-
- // 3.5 ip
- cy.get("#ip").focus().clear().type("127.0.0.1")
-
- // 3.6 port
- cy.get("#port").focus().clear().type("22")
-
- // 3.7 确认
- cy.get("button").contains("确 认").click()
+ cy.wait('@getHostList', { timeout: 10000 })
+ .then((interception) => {
+ expect(interception).to.have.property('response')
+ expect(interception.response?.body.code, 'code').to.equal(200)
+ expect(interception.response.statusCode).to.equal(200)
+
+ const { data } = interception.response.body
+ const ipList = data.map((item) => { return item.ip })
+ const defaultHostIpOne = Cypress.env("HOSTS")[0]
+
+ // 判断主机列表是否已存在默认测试主机
+ if (ipList.includes(defaultHostIpOne)) {
+
+ // 找到默认的主机，并点击删除按钮
+ cy.get("td")
+ .contains(defaultHostIpOne)
+ .parent()
+ .within(() => {
+ cy.get("td").contains("删除").click()
+ })
+
+ // 点击删除按钮之后需要在弹出的浮窗中点击OK确认
+ cy.get(".ant-popover-buttons").find("button").contains("OK").click()
+ // 确认删除接口调用结果为 200
+ cy.wait('@deleteHost')
+ .then((interception) => {
+ cy.wrap({
+ statusCode: interception.response?.statusCode
+ }).its("statusCode").should("eq", 200)
+ })
+ }
+ })
- // 3.8 等待新建主机请求结束，判断请求是否成功
- // 检查状态码返回是否是200（如果集群已经存在会返回400）
- cy.wait('@createHost').its("response.statusCode").should("eq", 200)
- })
+ // 2. 点击新建主机并开始添加
+ cy.addDefaultHost()
// 创建完主机后等待一秒钟，一秒钟后执行删除操作
cy.wait(1000)
+
// 找到最新创建的主机，并点击删除按钮
cy.get("td")
@@ -55,10 +63,9 @@ describe("SysOM Host Manager Test", () => {
.within(() => {
cy.get("td").contains("删除").click()
})
-
+
// 点击删除按钮之后需要在弹出的浮窗中点击OK确认
cy.get(".ant-popover-buttons").find("button").contains("OK").click()
-
// 确认删除接口调用结果为 200
cy.wait('@deleteHost')
.then((interception) => {
@@ -66,5 +73,6 @@ describe("SysOM Host Manager Test", () => {
statusCode: interception.response?.statusCode
}).its("statusCode").should("eq", 200)
})
+
})
})
\ No newline at end of file
diff --git a/sysom_web/cypress/e2e/hotfix/configurekernel.cy.js b/sysom_web/cypress/e2e/hotfix/configurekernel.cy.js
index 1f45d699d347c612eed3104c9bf31ceeeac2c4cf..664e3064bba7af1c410c0e422dc9467fbb411c0f 100644
--- a/sysom_web/cypress/e2e/hotfix/configurekernel.cy.js
+++ b/sysom_web/cypress/e2e/hotfix/configurekernel.cy.js
@@ -1,4 +1,8 @@
/* ==== Test Created with Cypress Studio ==== */
+/**
+ * This js is use for automaticly test the function
+ * of kernel version and os type configuration test.
+ */
it('ostest', function() {
cy.login()
/** test for OSType configure */
@@ -23,12 +27,13 @@ it('ostest', function() {
cy.get(':nth-child(1) > .ant-pro-table-list-toolbar-setting-item > :nth-child(1) > .anticon > svg').click();
/** change information of an OSType */
cy.get('table').within(() => {
- cy.get('tr').eq(1).contains('修改').click({force: true})
- })
- cy.get(".ant-modal-content").first().within(() => {
- cy.get("#os_type_name").focus().clear().type("alinux3_x86").type("{enter}")
- cy.get("button").contains("确 认").click()
+ cy.get('tr').eq(1).contains('编辑').click({force: true})
})
+ cy.get('tr:first-child td:first-child input').clear().type('x86');
+ cy.get('table').within(() => {
+ cy.get('tr').eq(1).contains('保存').click({force: true})
+ })
+ //cy.get('.ant-typography').contains("保存").click()
/* test for Kernel Version Page */
cy.visit('/hotfix/version/customize');
cy.get('#os_type').click();
@@ -41,20 +46,21 @@ it('ostest', function() {
cy.get('#devel_link').type('c');
cy.get('#debuginfo_link').clear('d');
cy.get('#debuginfo_link').type('d');
- cy.get(':nth-child(6) > .ant-btn').click();
- /* fix the record of a kernel version */
+ cy.get('#image').type('image')
+ cy.get(':nth-child(8) > .ant-btn').click();
+ /* fix the record of a kernel version */
cy.wait(1000)
cy.get('table').within(() => {
- cy.get('tr').eq(1).contains('修改').click({force: true})
- })
- cy.get(".ant-modal-content").first().within(() => {
- cy.get("#kernel_version").focus().clear().type("cccc").type("{enter}")
- cy.get("button").contains("确 认").click()
+ cy.get('tr').eq(1).contains('编辑').click({force: true})
})
- /** delete this record */
+ cy.get('tr:first-child td:first-child input').clear().type('ccccc');
+ cy.get('table').within(() => {
+ cy.get('tr').eq(1).contains('保存').click({force: true})
+ })
+ /** delete this record */
cy.get('table').within(() => {
cy.get('tr').eq(1).contains('删除').click({force: true})
})
cy.get('.ant-popover-buttons').contains('OK').click();
});
-
\ No newline at end of file
+
diff --git a/sysom_web/cypress/e2e/hotfix/formal.cy.js b/sysom_web/cypress/e2e/hotfix/formal.cy.js
index c72ffaeb28592b39764c02faf601bdb4f8b1da16..2c0c02f982acadc77a551d054a669dd8465aa3b6 100644
--- a/sysom_web/cypress/e2e/hotfix/formal.cy.js
+++ b/sysom_web/cypress/e2e/hotfix/formal.cy.js
@@ -1,7 +1,9 @@
/* ==== Test Created with Cypress Studio ==== */
-/**Before this test case begins, there should be one successfully built.
-And this hotfix should be changed into formal, so that there is a record
-for formal hotfix test */
+
+/**
+ * This is a one singal formal hotfix list test.
+ * This test dont need any successfully build.
+ */
it('formal hotfix test', function() {
cy.login()
@@ -12,8 +14,9 @@ it('formal hotfix test', function() {
cy.get(':nth-child(1) > .ant-btn > span').click({multiple: true});
cy.get('#hotfix_name').clear('te');
cy.get('#hotfix_name').type('test');
+ cy.get('#patch_file').type('patch_file_0001.patch');
+ cy.get('#rc_select_1').type('5.10.112-11.1.al8.x86_64');
cy.get(':nth-child(2) > .ant-btn > span').click();
- cy.get('.ant-btn > .anticon > svg').click();
- cy.get('.ant-space > :nth-child(2) > span > a').click();
+
/* ==== End Cypress Studio ==== */
});
diff --git a/sysom_web/cypress/e2e/hotfix/formallist.cy.js b/sysom_web/cypress/e2e/hotfix/formallist.cy.js
deleted file mode 100644
index c2c027c3036bda93c7910c78ea0cdc5de7f4f349..0000000000000000000000000000000000000000
--- a/sysom_web/cypress/e2e/hotfix/formallist.cy.js
+++ /dev/null
@@ -1,19 +0,0 @@
-/* ==== Test Created with Cypress Studio ==== */
-/**Before this test case begins, there should be one successfully built.
-And this hotfix should be changed into formal, so that there is a record
-for formal hotfix test */
-
-it('formal hotfix test', function() {
- cy.login()
- /* ==== Generated with Cypress Studio ==== */
- cy.visit('/hotfix/formal_hotfix');
- cy.get('#created_at').click();
- cy.get('.ant-picker-today-btn').click();
- cy.get(':nth-child(1) > .ant-btn > span').click({multiple: true});
- cy.get('#hotfix_name').clear('te');
- cy.get('#hotfix_name').type('test');
- cy.get(':nth-child(2) > .ant-btn > span').click();
- cy.get('.ant-btn > .anticon > svg').click();
- cy.get('.ant-space > :nth-child(2) > span > a').click();
- /* ==== End Cypress Studio ==== */
- });
\ No newline at end of file
diff --git a/sysom_web/cypress/e2e/hotfix/formalproduction.cy.js b/sysom_web/cypress/e2e/hotfix/formalproduction.cy.js
index 1f782c85688c4cc23064b0e2e494353c46d31d93..fa0c09cec46e3a568a65ab3c6b8c4e92ba981a6e 100644
--- a/sysom_web/cypress/e2e/hotfix/formalproduction.cy.js
+++ b/sysom_web/cypress/e2e/hotfix/formalproduction.cy.js
@@ -1,118 +1,135 @@
///
-describe("SysOM Host Manager Test", () => {
-
- it("login success", () => {
- cy.login()
-
- cy.intercept("POST", "api/v1/hotfix/upload_patch/")
- .as("upload_patch")
-
-
- cy.intercept("POST", "api/v1/hotfix/create_hotfix/")
- .as("create")
-
- cy.intercept("GET", "api/v1/hotfix/get_hotfix_list/?*")
- .as("gethotfixtasks")
-
- cy.intercept("POST", "api/v1/hotfix/set_formal/")
- .as("set_formal")
-
- cy.intercept("DELETE", "api/v1/hotfix/delete_hotfix/")
- .as("delete_hotfix")
-
- const getAndCheckTaskResult = (task_id) => {
- // 1.点击一下刷新按钮
- cy.get('span[aria-label="reload"]').click()
- cy.wait('@gethotfixtasks').its("response.statusCode").should("eq", 200)
- cy.wait(100)
- cy.get(".ant-table-tbody > tr:nth-child(1)").then($el => {
- let current_text = $el.text()
- if (current_text.indexOf("等待构建") != -1 || current_text.indexOf("正在构建") != -1) {
- //2.诊断运行中，等待一分钟后再次检查
- cy.wait(1000*60)
- getAndCheckTaskResult(task_id)
- } else {
- if (current_text.indexOf("构建成功") != -1) {
-
- cy.get(".ant-table-tbody > tr:nth-child(1) > td:nth-child(8)").click()
-
- //3.转正式包的确认
- cy.get(".ant-popover-content").first().within(() => {
- cy.get("div.ant-popover-buttons > button.ant-btn.ant-btn-primary.ant-btn-sm").first().click()
- })
-
- //4.转正式包接口结果判断
- cy.wait('@set_formal')
- .then((interception) => {
- cy.wrap({
- statusCode: interception.response?.statusCode
- }).its("statusCode").should("eq", 200)
- })
-
-
- //5.点击下载按钮
- cy.get(".ant-table-tbody > tr:nth-child(1) > td:nth-child(9) > div").click()
-
-
- //6.点击第一条数据删除
- cy.get('table').within(() => {
- cy.get('tr').eq(1).contains("删除").click();
- })
-
- //7.点击确认删除
- cy.get(".ant-popover-buttons > button.ant-btn.ant-btn-primary.ant-btn-sm").last().click()
-
-
- //8.删除接口结果判断
- cy.wait('@delete_hotfix')
- .then((interception) => {
- cy.wrap({
- statusCode: interception.response?.statusCode
- }).its("statusCode").should("eq", 200)
- })
- }
-
- }
- })
- }
-
- // 1. 访问主机列表列表
- cy.visit("/hotfix/make")
-
- //2. 点击安全中心打开模块框
- cy.get('#kernel_version').type('5.10.112-11.1.al8.x86_64');
- cy.get('#hotfix_name').type('test');
-
- //3.上传文件
- cy.get("#patch").selectFile('cypress/e2e/hotfix/5.10-new-globals.patch',{force: true})
-
-
- //4.文件结果判断
- cy.wait('@upload_patch')
- .then((interception) => {
- cy.wrap({
- statusCode: interception.response?.statusCode
- }).its("statusCode").should("eq", 200)
- })
-
- //5.点击创建
- cy.get("#root > div > section > div > main > div > div.ant-pro-grid-content > div > div > div.ant-pro-page-container-children-content > div > div.ant-pro-card.ant-pro-table-search.ant-pro-table-search-query-filter > form > div > div.ant-col.ant-col-8.ant-col-offset-16 > div > div > div.ant-col.ant-form-item-control > div > div > div > div > div > div:nth-child(2) > button > span").click()
-
- //6.创建任务触发构建判断
- cy.wait('@create')
- .then((interception) => {
- cy.wrap({
- statusCode: interception.response?.statusCode
- }).its("statusCode").should("eq", 200)
- expect(interception.response.body.data).to.have.property("id")
-
- // 得到构建 ID
- let id = interception.response?.body.data.id
- getAndCheckTaskResult(id)
-
- })
-
- })
-
-})
\ No newline at end of file
+/**
+ * This test is used for hotfix build test.
+ * It test hotfix build, convert to formal
+ * wait, refresh state function.
+ * Once the hotfix build success, change to
+ * formal hotfix list for futher testing.
+ */
+it("login success", function() {
+ cy.login()
+
+ cy.intercept("POST", "api/v1/hotfix/upload_patch/")
+ .as("upload_patch")
+
+
+ cy.intercept("POST", "api/v1/hotfix/create_hotfix/")
+ .as("create")
+
+ cy.intercept("GET", "api/v1/hotfix/get_hotfix_list/?*")
+ .as("gethotfixtasks")
+
+ cy.intercept("POST", "api/v1/hotfix/set_formal/")
+ .as("set_formal")
+
+ cy.intercept("DELETE", "api/v1/hotfix/delete_hotfix/")
+ .as("delete_hotfix")
+
+ const getAndCheckTaskResult = (task_id) => {
+ // 1.点击一下刷新按钮
+ cy.get('span[aria-label="reload"]').click()
+ cy.wait('@gethotfixtasks').its("response.statusCode").should("eq", 200)
+ cy.wait(100)
+ cy.get(".ant-table-tbody > tr:nth-child(1)").then($el => {
+ let current_text = $el.text()
+ if (current_text.indexOf("等待构建") != -1 || current_text.indexOf("正在构建") != -1) {
+ //2.诊断运行中，等待一分钟后再次检查
+ cy.wait(1000*60)
+ getAndCheckTaskResult(task_id)
+ } else {
+ if (current_text.indexOf("构建成功") != -1) {
+
+ cy.get(".ant-table-tbody > tr:nth-child(1) > td:nth-child(8)").click()
+
+ //3.转正式包的确认
+ cy.get(".ant-popover-content").first().within(() => {
+ cy.get("div.ant-popover-buttons > button.ant-btn.ant-btn-primary.ant-btn-sm").first().click()
+ })
+
+ //4.转正式包接口结果判断
+ cy.wait('@set_formal')
+ .then((interception) => {
+ cy.wrap({
+ statusCode: interception.response?.statusCode
+ }).its("statusCode").should("eq", 200)
+ })
+
+
+ //5.点击下载按钮
+ cy.get(".ant-table-tbody > tr:nth-child(1) > td:nth-child(9) > div").click()
+
+ // 7. 构建任务成功以后，前往正式热补丁列表执行操作
+ cy.visit('/hotfix/formal_hotfix');
+ cy.get('#created_at').click();
+ cy.get('.ant-picker-today-btn').click();
+ //cy.get(':nth-child(1) > .ant-btn > span').click({multiple: true});
+ cy.get('#hotfix_name').clear();
+ cy.get('#hotfix_name').type('test');
+ cy.get(':nth-child(2) > .ant-btn > span').click();
+ cy.get('.ant-btn > .anticon > svg').click({multiple: true});
+ cy.get('.ant-space > :nth-child(2) > span > a').click();
+
+ // 访问热补丁制作页面
+ cy.visit("/hotfix/make")
+
+
+ //6.点击第一条数据删除
+ cy.get('table').within(() => {
+ cy.get('tr').eq(1).contains("删除").click();
+ })
+
+ //7.点击确认删除
+ cy.get(".ant-popover-buttons > button.ant-btn.ant-btn-primary.ant-btn-sm").last().click()
+
+
+ //8.删除接口结果判断
+ cy.wait('@delete_hotfix')
+ .then((interception) => {
+ cy.wrap({
+ statusCode: interception.response?.statusCode
+ }).its("statusCode").should("eq", 200)
+ })
+ }
+
+ }
+ })
+ }
+
+ // 1. 访问热补丁中心构建页面
+ cy.visit("/hotfix/make")
+
+ //2. 填入参数
+ cy.get('#kernel_version').type('5.10.112-11.1.al8.x86_64');
+ cy.get('#hotfix_name').type('test');
+
+ //3.上传文件
+ cy.get("#patch").selectFile('cypress/e2e/hotfix/5.10-new-globals.patch',{force: true})
+
+
+ //4.文件结果判断
+ cy.wait('@upload_patch')
+ .then((interception) => {
+ cy.wrap({
+ statusCode: interception.response?.statusCode
+ }).its("statusCode").should("eq", 200)
+ })
+
+ //5.点击创建
+ cy.get("#root > div > section > div > main > div > div.ant-pro-grid-content > div > div > div.ant-pro-page-container-children-content > div > div.ant-pro-card.ant-pro-table-search.ant-pro-table-search-query-filter > form > div > div.ant-col.ant-col-8.ant-col-offset-16 > div > div > div.ant-col.ant-form-item-control > div > div > div > div > div > div:nth-child(2) > button > span").click()
+
+ //6.创建任务触发构建判断
+ cy.wait('@create')
+ .then((interception) => {
+ cy.wrap({
+ statusCode: interception.response?.statusCode
+ }).its("statusCode").should("eq", 200)
+ expect(interception.response.body.data).to.have.property("id")
+
+ // 得到构建 ID
+ let id = interception.response?.body.data.id
+ getAndCheckTaskResult(id)
+
+ })
+
+})
diff --git a/sysom_web/cypress/e2e/log/audit_log.cy.js b/sysom_web/cypress/e2e/log/audit_log.cy.js
new file mode 100644
index 0000000000000000000000000000000000000000..84e6002e621a0f5c5f0dd540947b6e6a71463c23
--- /dev/null
+++ b/sysom_web/cypress/e2e/log/audit_log.cy.js
@@ -0,0 +1,16 @@
+///
+
+
+describe("SysOM Log Manager Test", () => {
+ beforeEach(() => {
+ cy.login()
+ })
+ it.only("select audit log and filter audit log", () => {
+ cy.sysomLogSelectOrFilter("journal/audit", {
+ ip: '127.0.0.1',
+ path: '/api/v1/host/',
+ methond: 'GET',
+ request_type: 'operate'
+ }, true)
+ })
+})
\ No newline at end of file
diff --git a/sysom_web/cypress/e2e/log/node_log.cy.js b/sysom_web/cypress/e2e/log/node_log.cy.js
new file mode 100644
index 0000000000000000000000000000000000000000..094814f2daee43197fb816e1b0120308574880dc
--- /dev/null
+++ b/sysom_web/cypress/e2e/log/node_log.cy.js
@@ -0,0 +1,11 @@
+///
+
+
+describe("SysOM Log Manager Test", () => {
+ beforeEach(() => {
+ cy.login()
+ })
+ it.only("select node log and filter node log", () => {
+ cy.sysomLogSelectOrFilter("journal/node", { instance: '192.168.0.137' }, false)
+ })
+})
\ No newline at end of file
diff --git a/sysom_web/cypress/e2e/log/task_log.cy.js b/sysom_web/cypress/e2e/log/task_log.cy.js
new file mode 100644
index 0000000000000000000000000000000000000000..606a2e734dc8aacb56dcb7cd92f21f645ed16517
--- /dev/null
+++ b/sysom_web/cypress/e2e/log/task_log.cy.js
@@ -0,0 +1,14 @@
+///
+
+
+describe("SysOM Log Manager Test", () => {
+ beforeEach(() => {
+ cy.login()
+ })
+ it.only("select task log and filter task log", () => {
+ cy.sysomLogSelectOrFilter("journal/task", {
+ task_id: 'YqS7Lr9P',
+ },
+ false)
+ })
+})
\ No newline at end of file
diff --git a/sysom_web/cypress/e2e/monitor/MySQL_observer.cy.js b/sysom_web/cypress/e2e/monitor/MySQL_observer.cy.js
new file mode 100644
index 0000000000000000000000000000000000000000..a056945b371bc67110412e85d79c317c705fa0a7
--- /dev/null
+++ b/sysom_web/cypress/e2e/monitor/MySQL_observer.cy.js
@@ -0,0 +1,149 @@
+///
+
+describe("SysOM MySQL Observer Dashboard Test", () => {
+ beforeEach(() => {
+ cy.login();
+ })
+
+ it("MySQL Observer test", () => {
+ // 1. 访问集群监控页面
+ cy.visit("app_observable/mysql");
+
+ // 2. 等待页面加载完成
+ cy.wait(2000);
+
+ cy.getPannelContentByTitle("异常告警分布（次数）").contains("MySQL Error Alarm");
+ cy.getPannelContentByTitle("异常告警分布（次数）").contains("MySQL Slow_Sql Alarm");
+ cy.getPannelContentByTitle("异常告警分布（次数）").contains("MySQL Net_Drops Alarm");
+ cy.getPannelContentByTitle("异常告警分布（次数）").contains("MySQL OOM Alarm");
+ cy.getPannelContentByTitle("异常告警分布（次数）").contains("MySQL RT Alarm");
+ cy.getPannelContentByTitle("异常告警分布（次数）").contains("MySQL Sched_Delay Alarm");
+ cy.getPannelContentByTitle("异常告警分布（次数）").contains("MySQL Long_Time_D Alarm");
+ cy.getPannelContentByTitle("异常告警分布（次数）").contains("Mysql CPU_High Alarm");
+
+ cy.getPannelContentByTitle("mySQL 连接线程池使用").then(($el) => {
+ if ($el.text().includes("No data")) {
+ cy.wrap($el).contains("No data");
+ } else {
+
+ }
+ })
+
+ cy.getPannelContentByTitle("MySQL CPU占用率").find("tbody tr").should("have.length.gte", 1);
+ cy.getPannelContentByTitle("MySQL CPU占用率").find("tbody tr").eq(0).find("td").eq(0).contains("user");
+ cy.getPannelContentByTitle("MySQL CPU占用率").find("tbody tr").eq(1).find("td").eq(0).contains("sys");
+ cy.getPannelContentByTitle("MySQL CPU占用率").find("tbody tr").eq(2).find("td").eq(0).contains("total");
+
+ cy.getPannelContentByTitle("MySQL CPU让出率").find("tbody tr").should("have.length.gte", 1);
+ cy.getPannelContentByTitle("MySQL CPU让出率").find("tbody tr").eq(0).find("td").eq(0).contains("让出率");
+
+
+
+ cy.getPannelContentByTitle("MySQL Undolog链表长度&长事务").then(($el) => {
+ if ($el.text().includes("No data")) {
+ cy.wrap($el).contains("No data");
+ } else {
+
+ }
+ })
+ cy.getPannelContentByTitle("MySQL 内存缓存池使用").then(($el) => {
+ if ($el.text().includes("No data")) {
+ cy.wrap($el).contains("No data");
+ } else {
+
+ }
+ })
+ cy.getPannelContentByTitle("MySQL OS内存使用分布").find("tbody tr").should("have.length.gte", 1); // Legend 至少有一列
+ cy.getPannelContentByTitle("MySQL Redolog使用量").then(($el) => {
+ if ($el.text().includes("No data")) {
+ cy.wrap($el).contains("No data");
+ } else {
+
+ }
+ })
+ cy.getPannelContentByTitle("MySQL RT").find("tbody tr").should("have.length.gte", 1);
+ cy.getPannelContentByTitle("MySQL RT").find("tbody tr").eq(0).find("td").eq(0).contains("Avg");
+
+ cy.getPannelContentByTitle("MySQL请求详情").then(($el) => {
+ if ($el.text().includes("No data")) {
+ cy.wrap($el).contains("No data");
+ } else {
+
+ }
+ })
+
+ cy.getPannelContentByTitle("MySQL 等待IO资源延迟(平均每秒)").find("tbody tr").should("have.length.gte", 1);
+ cy.getPannelContentByTitle("MySQL 等待IO资源延迟(平均每秒)").find("tbody tr").eq(0).find("td").eq(0).contains("iowait");
+
+ cy.getPannelContentByTitle("MySQL申请OS内存延迟").find("tbody tr").should("have.length.gte", 1);
+ cy.getPannelContentByTitle("MySQL申请OS内存延迟").find("tbody tr").eq(0).find("td").eq(0).contains("memAllocDelay");
+
+ cy.getPannelContentByTitle("MySQL OS调度延迟").find("tbody tr").should("have.length.gte", 1);
+ cy.getPannelContentByTitle("MySQL OS调度延迟").find("tbody tr").eq(0).find("td").eq(0).contains("调度延迟");
+
+ cy.getPannelContentByTitle("MySQL数据IO处理延迟分布").then(($el) => {
+ if ($el.text().includes("No data")) {
+ cy.wrap($el).contains("No data");
+ } else {
+ cy.getPannelContentByTitle("MySQL数据IO处理延迟分布").find("tbody tr").should("have.length.gte", 1);
+ cy.getPannelContentByTitle("MySQL数据IO处理延迟分布").find("tbody tr").eq(0).find("td").eq(0).contains("MySQL.Total_delay");
+ cy.getPannelContentByTitle("MySQL数据IO处理延迟分布").find("tbody tr").eq(1).find("td").eq(0).contains("MySQL.Disk_delay");
+ cy.getPannelContentByTitle("MySQL数据IO处理延迟分布").find("tbody tr").eq(2).find("td").eq(0).contains("MySQL.OS_delay_by_io_block");
+ cy.getPannelContentByTitle("MySQL数据IO处理延迟分布").find("tbody tr").eq(3).find("td").eq(0).contains("MySQL.OS_delay_by_disk_driver");
+ cy.getPannelContentByTitle("MySQL数据IO处理延迟分布").find("tbody tr").eq(4).find("td").eq(0).contains("MySQL.OS_delay_by_io_complete");
+ cy.getPannelContentByTitle("MySQL数据IO处理延迟分布").find("tbody tr").eq(5).find("td").eq(0).contains("MySQL.OS_delay_by_io_done");
+ }
+ })
+
+ cy.getPannelContentByTitle("MySQL 磁盘各队列级IO延迟分布").then(($el) => {
+ if ($el.text().includes("No data")) {
+ cy.wrap($el).contains("No data");
+ } else {
+ cy.getPannelContentByTitle("MySQL 磁盘各队列级IO延迟分布").find("tbody tr").should("have.length.gte", 1);
+ cy.getPannelContentByTitle("MySQL 磁盘各队列级IO延迟分布").find("tbody tr").eq(0).find("td").eq(0).contains(/[a-z]+\.Qid[0-9]+\.Total_delay/);
+ cy.getPannelContentByTitle("MySQL 磁盘各队列级IO延迟分布").find("tbody tr").eq(1).find("td").eq(0).contains(/[a-z]+\.Qid[0-9]+\.Disk_delay/);
+ cy.getPannelContentByTitle("MySQL 磁盘各队列级IO延迟分布").find("tbody tr").eq(2).find("td").eq(0).contains(/[a-z]+\.Qid[0-9]+\.OS_delay/);
+ }
+ })
+
+ cy.getPannelContentByTitle("MySQL 磁盘级IO延迟分布").then(($el) => {
+ if ($el.text().includes("No data")) {
+ cy.wrap($el).contains("No data");
+ } else {
+ cy.getPannelContentByTitle("MySQL 磁盘级IO延迟分布").find("tbody tr").should("have.length.gte", 1);
+ cy.getPannelContentByTitle("MySQL 磁盘级IO延迟分布").find("tbody tr").eq(0).find("td").eq(0).contains(/[a-z]+\.Total_delay/);
+ cy.getPannelContentByTitle("MySQL 磁盘级IO延迟分布").find("tbody tr").eq(1).find("td").eq(0).contains(/[a-z]+\.Disk_delay/);
+ cy.getPannelContentByTitle("MySQL 磁盘级IO延迟分布").find("tbody tr").eq(2).find("td").eq(0).contains(/[a-z]+\.OS_delay/);
+ }
+ })
+
+ cy.getPannelContentByTitle("MySQL每CPU生产IO请求热力分布").then(($el) => {
+ if ($el.text().includes("No data")) {
+ cy.wrap($el).contains("No data");
+ } else {
+ }
+ })
+
+ cy.getPannelContentByTitle("MySQL每CPU处理IO中断热力分布").then(($el) => {
+ if ($el.text().includes("No data")) {
+ cy.wrap($el).contains("No data");
+ } else {
+ }
+ })
+
+ cy.getPannelContentByTitle("MySQL IO吞吐").find("tbody tr").should("have.length.gte", 1);
+ cy.getPannelContentByTitle("MySQL IO吞吐").find("tbody tr").eq(0).find("td").eq(0).contains("rBPS");
+ cy.getPannelContentByTitle("MySQL IO吞吐").find("tbody tr").eq(1).find("td").eq(0).contains("wBPS");
+
+ cy.getPannelContentByTitle("MySQL OS脏页量").find("tbody tr").should("have.length.gte", 1);
+ cy.getPannelContentByTitle("MySQL OS脏页量").find("tbody tr").eq(0).find("td").eq(0).contains("Dirty Pages");
+ cy.getPannelContentByTitle("MySQL OS脏页量").find("tbody tr").eq(1).find("td").eq(0).contains("Dirty Thresh");
+
+ cy.getPannelContentByTitle("MySQL网络吞吐").find("tbody tr").should("have.length.gte", 1);
+ cy.getPannelContentByTitle("MySQL网络吞吐").find("tbody tr").eq(0).find("td").eq(0).contains("netRecTraffic");
+ cy.getPannelContentByTitle("MySQL网络吞吐").find("tbody tr").eq(1).find("td").eq(0).contains("netSendTraffic");
+
+ cy.getPannelContentByTitle("MySQL请求数").find("tbody tr").should("have.length.gte", 1);
+ cy.getPannelContentByTitle("MySQL请求数").find("tbody tr").eq(0).find("td").eq(0).contains("mysql requestCnt");
+ })
+})
\ No newline at end of file
diff --git a/sysom_web/cypress/e2e/monitor/cluster_monitor.cy.js b/sysom_web/cypress/e2e/monitor/cluster_monitor.cy.js
new file mode 100644
index 0000000000000000000000000000000000000000..fc67781e494307502a27e5e5aa5a024b77e2d700
--- /dev/null
+++ b/sysom_web/cypress/e2e/monitor/cluster_monitor.cy.js
@@ -0,0 +1,134 @@
+///
+
+describe("SysOM Cluster Monitor Dashboard Test", () => {
+ beforeEach(() => {
+ cy.login();
+ })
+
+ it("Cluster monitor test", () => {
+ // 1. 访问集群监控页面
+ cy.visit("/monitor/cluster_monitor");
+
+ // 2. 等待页面加载完成
+ cy.wait(2000);
+
+ // assert health score below 100
+ cy.getPannelContentByTitle("Cluster Health").then(($el) => {
+ if ($el.text().includes("No data")) {
+ cy.wrap($el).contains("No data");
+ } else {
+ cy.wrap($el).contains(/\d+/).then(($el) => {
+ const num = parseInt($el.text());
+ expect(num).to.be.lte(100);
+ expect(num).to.be.gte(0);
+ })
+ }
+ })
+
+ cy.getPannelContentByTitle("Errors Health").then(($el) => {
+ if ($el.text().includes("N/A")) {
+ cy.wrap($el).contains("N/A");
+ } else {
+ cy.wrap($el).contains(/\d+/).then(($el) => {
+ const num = parseInt($el.text());
+ expect(num).to.be.lte(100);
+ expect(num).to.be.gte(0);
+ })
+ }
+ })
+
+ cy.getPannelContentByTitle("Latency Health").then(($el) => {
+ if ($el.text().includes("N/A")) {
+ cy.wrap($el).contains("N/A");
+ } else {
+ cy.wrap($el).contains(/\d+/).then(($el) => {
+ const num = parseInt($el.text());
+ expect(num).to.be.lte(100);
+ expect(num).to.be.gte(0);
+ })
+ }
+ })
+
+ cy.getPannelContentByTitle("Load(Traffic) Health").then(($el) => {
+ if ($el.text().includes("N/A")) {
+ cy.wrap($el).contains("N/A");
+ } else {
+ cy.wrap($el).contains(/\d+/).then(($el) => {
+ const num = parseInt($el.text());
+ expect(num).to.be.lte(100);
+ expect(num).to.be.gte(0)
+ })
+ }
+ })
+
+ cy.getPannelContentByTitle("集群总CPU核数/节点数").contains("cores");
+ cy.getPannelContentByTitle("集群总CPU核数/节点数").contains("nodes");
+
+ cy.getPannelContentByTitle("集群CPU利用率分布").find("ul li").should("have.length.gte", 1); // Legend 至少有一列
+
+ cy.getPannelContentByTitle("集群内存使用分布").find("ul li").should("have.length.gte", 1); // Legend 至少有一列
+
+ cy.getPannelContentByTitle("集群内存总量").contains(/\d+/).then(($el) => {
+ const num = parseInt($el.text());
+ expect(num).to.be.least(0);
+ })
+
+ cy.getPannelContentByTitle("节点内存延时诊断").then(($el) => {
+ if ($el.text().includes("No data")) {
+ cy.wrap($el).contains("No data");
+ } else {
+
+ }
+ })
+
+ cy.getPannelContentByTitle("容器内存延时诊断").then(($el) => {
+ if ($el.text().includes("No data")) {
+ cy.wrap($el).contains("No data");
+ } else {
+
+ }
+ })
+
+ cy.getPannelContentByTitle("节点内存使用率诊断").find("tbody tr").should("have.length.gte", 1); // Legend 至少有一列
+
+ cy.getPannelContentByTitle("节点CPU利用率诊断").find("tbody tr").should("have.length.gte", 1); // Legend 至少有一列
+
+ cy.getPannelContentByTitle("节点CPU延时诊断").find("tbody tr").should("have.length.gte", 1); // Legend 至少有一列
+
+ cy.getPannelContentByTitle("集群平均 CPU利用率").find("tbody tr").should("have.length.gte", 1); // Legend 至少有一列
+
+ cy.getPannelContentByTitle("集群平均内存使用率").find("ul li").should("have.length.gte", 1); // Legend 至少有一列
+
+ cy.getPannelContentByTitle("集群平均CPU利用率分布情况").find("tbody tr").should("have.length.gte", 1);
+ cy.getPannelContentByTitle("集群平均CPU利用率分布情况").find("tbody tr").eq(0).find("td").eq(0).contains("user");
+ cy.getPannelContentByTitle("集群平均CPU利用率分布情况").find("tbody tr").eq(1).find("td").eq(0).contains("nice");
+ cy.getPannelContentByTitle("集群平均CPU利用率分布情况").find("tbody tr").eq(2).find("td").eq(0).contains("sys");
+ cy.getPannelContentByTitle("集群平均CPU利用率分布情况").find("tbody tr").eq(3).find("td").eq(0).contains("softirq");
+ cy.getPannelContentByTitle("集群平均CPU利用率分布情况").find("tbody tr").eq(4).find("td").eq(0).contains("iowait");
+
+ cy.getPannelContentByTitle("总内存使用情况").find("tbody tr").should("have.length.gte", 1);
+ cy.getPannelContentByTitle("总内存使用情况").find("tbody tr").eq(0).find("td").eq(0).contains("free");
+ cy.getPannelContentByTitle("总内存使用情况").find("tbody tr").eq(1).find("td").eq(0).contains("used");
+ cy.getPannelContentByTitle("总内存使用情况").find("tbody tr").eq(2).find("td").eq(0).contains("cache+buffer");
+ cy.getPannelContentByTitle("总内存使用情况").find("tbody tr").eq(3).find("td").eq(0).contains("total");
+
+ cy.getPannelContentByTitle("集群平均调度延迟").find("tbody tr").should("have.length.gte", 1);
+ cy.getPannelContentByTitle("集群平均调度延迟").find("tbody tr").eq(0).find("td").eq(0).contains("调度延迟");
+
+ cy.getPannelContentByTitle("集群用户态内存使用情况").find("ul li").should("have.length.gte", 1);
+
+ cy.getPannelContentByTitle("集群节点平均load1").find("tbody tr").should("have.length.gte", 1);
+
+ cy.getPannelContentByTitle("集群内核态内存使用情况").find("ul li").should("have.length.gte", 1);
+
+ cy.getPannelContentByTitle("集群节点任务统计信息").find("tbody tr").should("have.length.gte", 1);
+ cy.getPannelContentByTitle("集群节点任务统计信息").find("tbody tr").eq(0).find("td").eq(0).contains("nr_forks");
+ cy.getPannelContentByTitle("集群节点任务统计信息").find("tbody tr").eq(1).find("td").eq(0).contains("nr_blocked");
+
+ cy.getPannelContentByTitle("集群app与kernel内存对比").find("ul li").should("have.length.gte", 1);
+
+ cy.getPannelContentByTitle("容器大盘").contains("容器大盘详情");
+
+ cy.getPannelContentByTitle("节点大盘").contains("节点大盘详情");
+ })
+})
\ No newline at end of file
diff --git a/sysom_web/cypress/e2e/monitor/container_monitor.cy.js b/sysom_web/cypress/e2e/monitor/container_monitor.cy.js
new file mode 100644
index 0000000000000000000000000000000000000000..d2102a0c24fc471005d6863ff47eebb790ecee1f
--- /dev/null
+++ b/sysom_web/cypress/e2e/monitor/container_monitor.cy.js
@@ -0,0 +1,158 @@
+///
+
+describe("SysOM Container Monitor Dashboard Test", () => {
+ beforeEach(() => {
+ cy.login();
+ })
+
+ it("Container Monitor", () => {
+ cy.wait(2000)
+
+ // 1. 访问集群监控页面
+ cy.visit("/monitor/container_monitor");
+
+ // 2. 等待页面加载完成
+ cy.wait(2000)
+
+ /*
+ * Pod Health
+ */
+
+ // assert health score below 100
+ cy.getPannelContentByTitle("Pod Health").then(($el) => {
+ if ($el.text().includes("No data")) {
+ cy.wrap($el).contains("No data");
+ } else {
+ cy.wrap($el).contains(/\d+/).then(($el) => {
+ const num = parseInt($el.text());
+ expect(num).to.be.lte(100);
+ expect(num).to.be.gte(0);
+ })
+ }
+ })
+
+ cy.getPannelContentByTitle("Errors Health").then(($el) => {
+ if ($el.text().includes("N/A")) {
+ cy.wrap($el).contains("N/A");
+ } else {
+ cy.wrap($el).contains(/\d+/).then(($el) => {
+ const num = parseInt($el.text());
+ expect(num).to.be.lte(100);
+ expect(num).to.be.gte(0);
+ })
+ }
+ })
+
+ cy.getPannelContentByTitle("Latency Health").then(($el) => {
+ if ($el.text().includes("N/A")) {
+ cy.wrap($el).contains("N/A");
+ } else {
+ cy.wrap($el).contains(/\d+/).then(($el) => {
+ const num = parseInt($el.text());
+ expect(num).to.be.lte(100);
+ expect(num).to.be.gte(0);
+ })
+ }
+ })
+
+ cy.getPannelContentByTitle("Load(Traffic) Health").then(($el) => {
+ if ($el.text().includes("N/A")) {
+ cy.wrap($el).contains("N/A");
+ } else {
+ cy.wrap($el).contains(/\d+/).then(($el) => {
+ const num = parseInt($el.text());
+ expect(num).to.be.lte(100);
+ expect(num).to.be.gte(0)
+ })
+ }
+ })
+
+ /*
+ * Pod Memory Monitor
+ */
+ cy.openMainLabel("Pod Memory Monitor")
+ cy.openMainLabel("Pod Memory Monitor")
+
+ // 当前面板Pod Cache Usage
+ cy.panelAtagValueGteOrNoDataTest("Pod Memory Usage (top 5)")
+
+ // 当前面板Pod Cache Usage
+ cy.panelAtagValueGteOrNoDataTest("Pod Cache Usage (top 5)")
+
+ // 当前面板Pod Mem Stat
+ cy.panelAtagValueGteOrNoDataTest("Pod Mem Stat")
+
+ // 当前面板Pod Cached File
+ cy.panelAtagValueGteOrNoDataTest("Pod Cached File (top 5)")
+
+ // 当前面板Pod Mem Event
+ cy.panelAtagValueGteOrNoDataTest("Pod Mem Event")
+
+ // 当前面板Pod Memory Rate
+ cy.panelAtagValueGteOrNoDataTest("Memory Rate")
+
+ // 当前面板Memory Global Direct Reclaim Latency
+ cy.panelAtagValueGteOrNoDataTest("Memory Global Direct Reclaim Latency")
+
+ // 当前面板Memory Direct Reclaim Latency
+ cy.panelAtagValueGteOrNoDataTest("Memory Direct Reclaim Latency")
+
+ // 当前面板Memory Compact Latency
+ cy.panelAtagValueGteOrNoDataTest("Memory Compact Latency")
+
+ /*
+ * Pod CPU Monitor
+ */
+
+ cy.openMainLabel("Pod CPU Monitor")
+ cy.openMainLabel("Pod CPU Monitor")
+
+ // 当前面板Pod CPU Usage
+ cy.panelAtagValueGteOrNoDataTest("Pod CPU Usage")
+
+ // 当前面板Pod CPU nr_throttled
+ cy.panelAtagValueGteOrNoDataTest("Pod CPU nr_throttled")
+
+ // 当前面板Pod wait_latency
+ cy.panelAtagValueGteOrNoDataTest("Pod wait_latency")
+
+ // 当前面板Pod cfs_quota
+ cy.panelAtagValueGteOrNoDataTest("Pod cfs_quota")
+
+ /*
+ * Pod Network Monitor
+ */
+
+ cy.openMainLabel("Pod Network Monitor")
+ cy.openMainLabel("Pod Network Monitor")
+
+ // 当前面板Pod Network Traffic by Bytes
+ cy.panelAtagValueGteOrNoDataTest("Pod Network Traffic by Bytes")
+
+ // 当前面板Pod Network Traffic by Packets
+ cy.panelAtagValueGteOrNoDataTest("Pod Network Traffic by Packets")
+
+ // 当前面板Pod Network Traffic Drop
+ cy.panelAtagValueGteOrNoDataTest("Pod Network Traffic Drop")
+
+ /*
+ * Pod IO Monitor
+ */
+
+ cy.openMainLabel("Pod IO Monitor")
+ cy.openMainLabel("Pod IO Monitor")
+
+ // 当前面板Pod Writes/Reads Bytes Rates
+ cy.panelAtagValueGteOrNoDataTest("Pod Writes/Reads Bytes Rates");
+
+ // 当前面板Pod Writes/Reads IOs Rates
+ cy.panelAtagValueGteOrNoDataTest("Pod Writes/Reads IOs Rates");
+
+ // 当前面板Pod IO Queued
+ cy.panelAtagValueGteOrNoDataTest("Pod IO Queued");
+
+ // 当前面板Pod IO Wait Time
+ cy.panelAtagValueGteOrNoDataTest("Pod IO Wait Time");
+ })
+
+})
\ No newline at end of file
diff --git a/sysom_web/cypress/e2e/monitor/dashboard.cy.js b/sysom_web/cypress/e2e/monitor/dashboard.cy.js
new file mode 100644
index 0000000000000000000000000000000000000000..4500c60d4da65bd37c048cd920f9a8c7e9b26760
--- /dev/null
+++ b/sysom_web/cypress/e2e/monitor/dashboard.cy.js
@@ -0,0 +1,690 @@
+/*
+ * @Author: wb-msm241621
+ * @Date: 2023-12-20 17:15:53
+ * @LastEditTime: 2023-12-22 15:54:55
+ * @Description:
+ */
+///
+
+
+describe("SysOM dashboard Monitor Dashboard Test", () => {
+ beforeEach(() => {
+ cy.login();
+ })
+
+ it("Dashboard monitor test", () => {
+ // 1. 访问集群监控页面
+ cy.visit("/monitor/dashboard");
+
+ // 2. 等待页面加载完成
+ cy.wait(2000)
+
+ /* Quick CPU / Mem / Disk */
+ // 当前面板 CPU Busy
+ cy.panelNumericalValueGteTest("CPU Busy")
+
+ // 当前面板Sys Load (5m avg)
+ cy.panelNumericalValueGteTest("Sys Load (5m avg)")
+
+ // 当前面板Sys Load (15m avg)
+ cy.panelNumericalValueGteTest("Sys Load (15m avg)")
+
+ // 当前面板RAM Used
+ cy.panelNumericalValueGteTest("RAM Used")
+
+ // 当前面板SWAP Used
+ cy.panelNumericalValueGteTest("SWAP Used")
+
+ // 当前面板Root FS Used
+ cy.panelNumericalValueGteTest("Root FS Used")
+
+ // 当前面板 CPU Cores
+ cy.panelNumericalValueGteTest("CPU Cores")
+
+ // 当前面板 Uptime
+ cy.panelNumericalValueGteTest("Uptime")
+
+ // 当前面板 RootFS Total
+ cy.panelNumericalValueGteTest("RootFS Total")
+
+ // 当前面板 RAM Total
+ cy.panelNumericalValueGteTest("RAM Total")
+
+ // 当前面板 SWAP Total
+ cy.panelNumericalValueGteTest("SWAP Total")
+ })
+
+ it("Basic CPU / Mem / Net / Disk Test", () => {
+ /*
+ * Basic CPU / Mem / Net / Disk
+ */
+
+ // 1. 访问集群监控页面
+ cy.visit("/monitor/dashboard");
+
+ // 2. 等待页面加载完成
+ cy.wait(2000)
+
+ // 3. 关闭Quick CPU / Mem / Disk标签
+ cy.openMainLabel("Quick CPU / Mem / Disk")
+
+ // 当前面板 CPU Basic
+ cy.panelAtagValueGteTest("CPU Basic")
+
+ // 当前面板Memory Basic
+ cy.panelAtagValueGteTest("Memory Basic")
+
+ // 当前面板 Network Traffic Basic
+ cy.panelAtagValueGteTest("Network Traffic Basic")
+
+ // 当前面板 Disk Space Used Basic
+ cy.panelAtagValueGteTest("Disk Space Used Basic")
+ })
+
+ it("CPU / Memory / Net / Disk Test", () => {
+ // 1. 访问集群监控页面
+ cy.visit("/monitor/dashboard");
+
+ // 2. 等待页面加载完成
+ cy.wait(2000)
+
+ // 3. 关闭Quick CPU / Mem / Disk标签
+ cy.openMainLabel("Quick CPU / Mem / Disk")
+
+ // 4. 打开CPU / Memory / Net / Disk 标签
+ cy.openMainLabel("CPU / Memory / Net / Disk")
+
+ // 当前面板 CPU
+ const cpuPropertys = [
+ // 'System - Processes executing in kernel mode',
+ // 'User - Normal processes executing in user mode',
+ // 'Nice - Niced processes executing in user mode',
+ // 'Idle - Waiting for something to happen',
+ // 'Iowait - Waiting for I/O to complete',
+ // 'Irq - Servicing interrupts',
+ // 'Softirq - Servicing softirqs',
+ // 'Steal - Time spent in other operating systems when running in a virtualized environment'
+ ]
+ cy.panelFoldLineTableGteTest('CPU')
+
+ // 当前面板 Memory Stack
+ // const memoryStackPropertys = [
+ // 'Apps - Memory used by user-space applications',
+ // 'PageTables - Memory used to map between virtual and physical memory addresses',
+ // 'SwapCache - Memory that keeps track of pages that have been fetched from swap but not yet been modified',
+ // 'Slab - Memory used by the kernel to cache data structures for its own use (caches like inode, dentry, etc)',
+ // 'Cache - Parked file data (file content) cache',
+ // 'Buffers - Block device (e.g. harddisk) cache',
+ // 'Unused - Free memory unassigned',
+ // 'Swap - Swap space used',
+ // 'Hardware Corrupted - Amount of RAM that the kernel identified as corrupted / not working',
+ // ]
+ const memoryStackPropertys = []
+ cy.panelFoldLineTableGteTest('Memory Stack', memoryStackPropertys)
+
+ // 当前面板 Network Traffic
+ const networkTrafficPropertys = [
+ // 'eth0 - Receive',
+ // 'lo - Receive',
+ // 'eth0 - Transmit',
+ // 'lo - Transmit',
+ ]
+ cy.panelFoldLineTableGteTest('Network Traffic', networkTrafficPropertys)
+
+ // 当前面板 Disk Space Used
+ const diskSpaceUsedPropertys = [
+ // '/run/user/0',
+ // '/run',
+ // '/usr/local/sysom/server/builder/hotfix',
+ // '/',
+ ]
+ cy.panelFoldLineTableGteTest('Disk Space Used', diskSpaceUsedPropertys)
+
+ // 当前面板 Disk IOps
+ const diskIopsPropertys = [
+ // 'vda - Writes completed'
+ ]
+ cy.panelFoldLineTableGteTest('Disk IOps', diskIopsPropertys)
+
+ // 当前面板 I/O Usage Read / Write
+ const ioUsageReadWritePropertys = [
+ // 'vda - Successfully read bytes',
+ // 'vda - Successfully written bytes'
+ ]
+ cy.panelFoldLineTableGteTest('I/O Usage Read / Write', ioUsageReadWritePropertys)
+
+ // 当前面板 I/O Utilization
+ const ioUtilizationPropertys = [
+ // 'vda'
+ ]
+ cy.panelFoldLineTableGteTest('I/O Utilization', ioUtilizationPropertys)
+
+
+ })
+
+ it("Memory Meminfo Test", () => {
+ // 1. 访问集群监控页面
+ cy.visit("/monitor/dashboard");
+
+ // 2. 等待页面加载完成
+ cy.wait(2000)
+
+ // 3. 关闭Quick CPU / Mem / Disk标签
+ cy.openMainLabel("Quick CPU / Mem / Disk")
+
+ // 4. 打开 Memory Meminfo 标签
+ cy.openMainLabel("Memory Meminfo")
+
+ // 当前面板 Memory Active / Inactive
+ const memoryActivePropertys = [
+ // 'Inactive - Memory which has been less recently used. It is more eligible to be reclaimed for other purposes',
+ // 'Active - Memory that has been used more recently and usually not reclaimed unless absolutely necessary'
+ ]
+ cy.panelFoldLineTableGteTest('Memory Active / Inactive', memoryActivePropertys)
+
+ // 当前面板 Memory Commited
+ const memoryCommitedPropertys = [
+ // 'Committed_AS - Amount of memory presently allocated on the system',
+ // 'CommitLimit - Amount of memory currently available to be allocated on the system'
+ ]
+ cy.panelFoldLineTableGteTest('Memory Commited', memoryCommitedPropertys)
+
+ // 当前面板 Memory Active / Inactive Detail
+ const memoryActiveDetailPropertys = [
+ // 'Inactive_file - File-backed memory on inactive LRU list',
+ // 'Inactive_anon - Anonymous and swap cache on inactive LRU list, including tmpfs (shmem)',
+ // 'Active_file - File-backed memory on active LRU list',
+ // 'Active_anon - Anonymous and swap cache on active least-recently-used (LRU) list, including tmpfs'
+ ]
+ cy.panelFoldLineTableGteTest('Memory Active / Inactive Detail', memoryActiveDetailPropertys)
+
+ // 当前面板 Memory Writeback and Dirty
+ const memoryWritebackAndDirtyPropertys = [
+ // 'Writeback - Memory which is actively being written back to disk',
+ // 'WritebackTmp - Memory used by FUSE for temporary writeback buffers',
+ // 'Dirty - Memory which is waiting to get written back to the disk'
+ ]
+ cy.panelFoldLineTableGteTest('Memory Writeback and Dirty', memoryWritebackAndDirtyPropertys)
+
+ // 当前面板 Memory Shared and Mapped
+ const memorySharedAndMappedPropertys = [
+ // 'Mapped - Used memory in mapped pages files which have been mmaped, such as libraries',
+ // 'Shmem - Used shared memory (shared between several processes, thus including RAM disks)',
+ // 'ShmemHugePages - Memory used by shared memory (shmem) and tmpfs allocated with huge pages',
+ // 'ShmemPmdMapped - Ammount of shared (shmem/tmpfs) memory backed by huge pages'
+ ]
+ cy.panelFoldLineTableGteTest('Memory Shared and Mapped', memorySharedAndMappedPropertys)
+
+ // 当前面板 Memory Slab
+ const memorySlabPropertys = [
+ // 'SUnreclaim - Part of Slab, that cannot be reclaimed on memory pressure',
+ // 'SReclaimable - Part of Slab, that might be reclaimed, such as caches'
+ ]
+ cy.panelFoldLineTableGteTest('Memory Slab', memorySlabPropertys)
+
+ // 当前面板 Memory Vmalloc
+ const memoryVmallocPropertys = [
+ // "VmallocChunk - Largest contigious block of vmalloc area which is free",
+ // "VmallocTotal - Total size of vmalloc memory area",
+ // "VmallocUsed - Amount of vmalloc area which is used"
+ ]
+ cy.panelFoldLineTableGteTest('Memory Vmalloc', memoryVmallocPropertys)
+
+ // 当前面板 Memory Bounce
+ const memoryBouncePropertys = [
+ // 'Bounce - Memory used for block device bounce buffers'
+ ]
+ cy.panelFoldLineTableGteTest('Memory Bounce', memoryBouncePropertys)
+
+ // 当前面板 Memory Anonymous
+ const memoryAnonymousPropertys = [
+ // 'AnonHugePages - Memory in anonymous huge pages',
+ // 'AnonPages - Memory in user pages not backed by files'
+ ]
+ cy.panelFoldLineTableGteTest('Memory Anonymous', memoryAnonymousPropertys)
+
+ // 当前面板 Memory Kernel / CPU
+ const memoryKernelCPUPropertys = [
+ // 'KernelStack - Kernel memory stack. This is not reclaimable',
+ // 'PerCPU - Per CPU memory allocated dynamically by loadable modules'
+ ]
+ cy.panelFoldLineTableGteTest('Memory Kernel / CPU', memoryKernelCPUPropertys)
+
+ // 当前面板 Memory HugePages Counter
+ const MemoryHugePagesCounterpropertys = [
+ // 'HugePages_Free - Huge pages in the pool that are not yet allocated',
+ // 'HugePages_Rsvd - Huge pages for which a commitment to allocate from the pool has been made, but no allocation has yet been made',
+ // 'HugePages_Surp - Huge pages in the pool above the value in /proc/sys/vm/nr_hugepages'
+ ]
+ cy.panelFoldLineTableGteTest('Memory HugePages Counter', MemoryHugePagesCounterpropertys)
+
+ // 当前面板 Memory HugePages Size
+ const MemoryHugePagesSizePropertys = [
+ // 'HugePages - Total size of the pool of huge pages',
+ // 'Hugepagesize - Huge Page size'
+ ]
+ cy.panelFoldLineTableGteTest('Memory HugePages Size', MemoryHugePagesSizePropertys)
+
+ // 当前面板 Memory DirectMap
+ const MemoryDirectMapPropertys = [
+ // 'DirectMap1G - Amount of pages mapped as this size',
+ // 'DirectMap2M - Amount of pages mapped as this size',
+ // 'DirectMap4K - Amount of pages mapped as this size'
+ ]
+ cy.panelFoldLineTableGteTest('Memory DirectMap', MemoryDirectMapPropertys)
+
+ // 当前面板 Memory Unevictable and MLocked
+ const MemoryUnevictableandMLockedPropertys = [
+ // "Unevictable - Amount of unevictable memory that can't be swapped out for a variety of reasons",
+ // "MLocked - Size of pages locked to memory using the mlock() system call"
+ ]
+ cy.panelFoldLineTableGteTest('Memory Unevictable and MLocked', MemoryUnevictableandMLockedPropertys)
+
+ // 当前面板 Memory NFS
+ const MemoryNFSPropertys = [
+ // "NFS Unstable - Memory in NFS pages sent to the server, but not yet commited to the storage"
+ ]
+ cy.panelFoldLineTableGteTest('Memory NFS')
+ })
+
+ it("Memory Vmstat Test", () => {
+ // 1. 访问集群监控页面
+ cy.visit("/monitor/dashboard");
+
+ // 2. 等待页面加载完成
+ cy.wait(2000)
+
+ // 3. 关闭Quick CPU / Mem / Disk标签
+ cy.openMainLabel("Quick CPU / Mem / Disk")
+
+ // 4. 打开 Memory Vmstat 标签
+ cy.openMainLabel("Memory Vmstat")
+
+ // 当前面板 Memory Pages In / Out
+ cy.panelFoldLineTableGteTest('Memory Pages In / Out')
+
+ // 当前面板 Memory Pages Swap In / Out
+ cy.panelFoldLineTableGteTest('Memory Pages Swap In / Out')
+
+ // 当前面板 Memory Page Faults
+ cy.panelFoldLineTableGteTest('Memory Page Faults')
+
+ // 当前面板OOM Killer
+ cy.panelFoldLineTableGteTest('OOM Killer')
+ })
+
+ it("System Timesync Test", () => {
+ // 1. 访问集群监控页面
+ cy.visit("/monitor/dashboard");
+
+ // 2. 等待页面加载完成
+ cy.wait(2000)
+
+ // 3. 关闭Quick CPU / Mem / Disk标签
+ cy.openMainLabel("Quick CPU / Mem / Disk")
+
+ // 4. 打开 System Timesync 标签
+ cy.openMainLabel("System Timesync")
+
+ // 当前面板 Time Syncronized Drift
+ cy.panelFoldLineTableGteTest('Time Syncronized Drift')
+
+ // 当前面板 Time PLL Adjust
+ cy.panelFoldLineTableGteTest('Time PLL Adjust')
+
+ // 当前面板 Time Syncronized Status
+ cy.panelFoldLineTableGteTest('Time Syncronized Status')
+
+ // 当前面板 Time Misc
+ cy.panelFoldLineTableGteTest('Time Misc')
+ })
+
+ it("System Processes Test", () => {
+ // 1. 访问集群监控页面
+ cy.visit("/monitor/dashboard");
+
+ // 2. 等待页面加载完成
+ cy.wait(2000)
+
+ // 3. 关闭Quick CPU / Mem / Disk标签
+ cy.openMainLabel("Quick CPU / Mem / Disk")
+
+ // 4. 打开 标签
+ cy.openMainLabel("System Processes")
+
+ // 当前面板 Processes Status
+ cy.panelFoldLineTableGteTest('Processes Status')
+
+ // 当前面板 Processes State
+ cy.panelNoDataTest('Processes State')
+
+ // 当前面板 Processes Forks
+ cy.panelFoldLineTableGteTest('Processes Forks')
+
+ // 当前面板 Processes Memory
+ cy.panelFoldLineTableGteTest('Processes Memory')
+
+ // 当前面板 PIDs Number and Limit
+ cy.panelNoDataTest('PIDs Number and Limit')
+ // cy.getPannelContentByTitle("PIDs Number and Limit").find("tbody tr").should("have.length.gte", 1)
+
+ // 当前面板 Process schedule stats Running / Waiting
+ cy.panelFoldLineTableGteTest('Process schedule stats Running / Waiting')
+
+ // 当前面板 Threads Number and Limit
+ cy.panelNoDataTest('Threads Number and Limit')
+ })
+
+ it("System Misc Test", () => {
+ // 1. 访问集群监控页面
+ cy.visit("/monitor/dashboard");
+
+ // 2. 等待页面加载完成
+ cy.wait(2000)
+
+ // 3. 关闭Quick CPU / Mem / Disk标签
+ cy.openMainLabel("Quick CPU / Mem / Disk")
+
+ // 4. 打开 System Misc 标签
+ cy.openMainLabel("System Misc")
+
+ // 当前面板 Context Switches / Interrupts
+ cy.panelFoldLineTableGteTest("Context Switches / Interrupts")
+
+ // 当前面板 System Load
+ cy.panelFoldLineTableGteTest("System Load")
+
+ // 当前面板 Interrupts Detail
+ cy.panelNoDataTest("Interrupts Detail")
+
+ // 当前面板 Schedule timeslices executed by each cpu
+ cy.panelFoldLineTableGteTest("Schedule timeslices executed by each cpu")
+
+ // 当前面板 Entropy
+ cy.panelFoldLineTableGteTest("Entropy")
+
+ // 当前面板 CPU time spent in user and system contexts
+ cy.panelFoldLineTableGteTest("CPU time spent in user and system contexts")
+
+ // 当前面板 File Descriptors
+ cy.panelFoldLineTableGteTest("File Descriptors")
+ })
+
+ it("Hardware Misc Test", () => {
+ // 1. 访问集群监控页面
+ cy.visit("/monitor/dashboard");
+
+ // 2. 等待页面加载完成
+ cy.wait(2000)
+
+ // 3. 关闭Quick CPU / Mem / Disk标签
+ cy.openMainLabel("Quick CPU / Mem / Disk")
+
+ // 4. 打开 Hardware Misc 标签
+ cy.openMainLabel("Hardware Misc")
+
+ // 当前面板 Hardware temperature monitor
+ cy.panelNoDataTest("Hardware temperature monitor")
+
+ // 当前面板 Throttle cooling device
+ cy.panelFoldLineTableGteTest("Throttle cooling device")
+
+ // 当前面板 Power supply
+ cy.panelNoDataTest("Power supply")
+ })
+
+ it("Systemd Test", () => {
+ // 1. 访问集群监控页面
+ cy.visit("/monitor/dashboard");
+
+ // 2. 等待页面加载完成
+ cy.wait(2000)
+
+ // 3. 关闭Quick CPU / Mem / Disk标签
+ cy.openMainLabel("Quick CPU / Mem / Disk")
+
+ // 4. 打开 Systemd 标签
+ cy.openMainLabel("Systemd")
+
+ // 当前面板 Systemd Sockets
+ cy.panelNoDataTest("Systemd Sockets")
+
+ // 当前面板 Systemd Units State
+ cy.panelNoDataTest("Systemd Units State")
+ })
+
+ it("Storage Disk Test", () => {
+ // 1. 访问集群监控页面
+ cy.visit("/monitor/dashboard");
+
+ // 2. 等待页面加载完成
+ cy.wait(2000)
+
+ // 3. 关闭Quick CPU / Mem / Disk标签
+ cy.openMainLabel("Quick CPU / Mem / Disk")
+
+ // 4. 打开 Storage Disk 标签
+ cy.openMainLabel("Storage Disk")
+
+ // 当前面板 Disk IOps Completed
+ cy.panelFoldLineTableGteTest("Disk IOps Completed")
+
+ // 当前面板 Disk R/W Data
+ cy.panelFoldLineTableGteTest("Disk R/W Data")
+
+ // 当前面板 Disk Average Wait Time
+ cy.panelFoldLineTableGteTest("Disk Average Wait Time")
+
+ // 当前面板 Average Queue Size
+ cy.panelFoldLineTableGteTest("Average Queue Size")
+
+ // 当前面板 Disk R/W Merged
+ cy.panelFoldLineTableGteTest("Disk R/W Merged")
+
+ // 当前面板 Time Spent Doing I/Os
+ cy.panelFoldLineTableGteTest("Time Spent Doing I/Os")
+
+ // 当前面板 Instantaneous Queue Size
+ cy.getPannelContentByTitle("Instantaneous Queue Size").find("canvas").should("have.length.gte", 1)
+ cy.getPannelContentByTitle("Instantaneous Queue Size").find("tbody").should("have.length.gte", 1)
+
+ // 当前面板 Disk IOps Discards completed / merged
+ cy.getPannelContentByTitle("Disk IOps Discards completed / merged").find("canvas").should("have.length.gte", 1)
+ cy.getPannelContentByTitle("Disk IOps Discards completed / merged").find("tbody").should("have.length.gte", 1)
+ })
+
+ it("Storage Filesystem Test", () => {
+ // 1. 访问集群监控页面
+ cy.visit("/monitor/dashboard");
+
+ // 2. 等待页面加载完成
+ cy.wait(2000)
+
+ // 3. 关闭Quick CPU / Mem / Disk标签
+ cy.openMainLabel("Quick CPU / Mem / Disk")
+
+ // 4. 打开 Storage Filesystem 标签
+
+ cy.openMainLabel("Storage Filesystem")
+
+ // 当前面板 Filesystem space available
+ cy.panelFoldLineTableGteTest("Filesystem space available")
+
+ // 当前面板 File Nodes Free
+ cy.panelFoldLineTableGteTest("File Nodes Free")
+
+ // 当前面板 File Descriptor
+ cy.panelFoldLineTableGteTest("File Descriptor")
+
+ // 当前面板 File Nodes Size
+ cy.panelFoldLineTableGteTest("File Nodes Size")
+
+ // 当前面板 Filesystem in ReadOnly / Error
+ // cy.panelFoldLineTableGteTest("Filesystem in ReadOnly / Error")
+ cy.getPannelContentByTitle("Filesystem in ReadOnly / Error").find("canvas").should('be.empty')
+ cy.getPannelContentByTitle("Filesystem in ReadOnly / Error").find('tbody').should('be.empty')
+ })
+
+ it("Network Traffic Test", () => {
+ // 1. 访问集群监控页面
+ cy.visit("/monitor/dashboard");
+
+ // 2. 等待页面加载完成
+ cy.wait(2000)
+
+ // 3. 关闭Quick CPU / Mem / Disk标签
+ cy.openMainLabel("Quick CPU / Mem / Disk")
+
+ // 4. 打开 Network Traffic 标签
+ cy.openMainLabel("Network Traffic")
+
+ // 当前面板 Network Traffic by Packets
+ cy.panelFoldLineTableGteTest("Network Traffic by Packets")
+
+ // 当前面板 Network Traffic Errors
+ cy.panelFoldLineTableGteTest("Network Traffic Errors")
+
+ // 当前面板 Network Traffic Drop
+ cy.panelFoldLineTableGteTest("Network Traffic Drop")
+
+ // 当前面板 Network Traffic Compressed
+ cy.panelFoldLineTableGteTest("Network Traffic Compressed")
+
+ // 当前面板 Network Traffic Multicast
+ cy.panelFoldLineTableGteTest("Network Traffic Multicast")
+
+ // 当前面板 Network Traffic Fifo
+ cy.panelFoldLineTableGteTest("Network Traffic Fifo")
+
+ // 当前面板 Network Traffic Frame
+ cy.panelFoldLineTableGteTest("Network Traffic Frame")
+
+ // 当前面板 Network Traffic Carrier
+ cy.panelFoldLineTableGteTest("Network Traffic Carrier")
+
+ // 当前面板 Network Traffic Colls
+ cy.panelFoldLineTableGteTest("Network Traffic Colls")
+
+ // 当前面板 NF Contrack
+ cy.panelNoDataTest("NF Contrack")
+ cy.wait(4000)
+
+ // 当前面板 ARP Entries
+ cy.panelFoldLineTableGteTest("ARP Entries")
+
+ // 当前面板 MTU
+ cy.panelFoldLineTableGteTest("MTU")
+
+ // 当前面板 Speed
+ cy.panelFoldLineTableGteTest("Speed")
+
+ // 当前面板 Queue Length
+ cy.panelFoldLineTableGteTest("Queue Length")
+
+ // 当前面板 Softnet Packets
+ cy.panelFoldLineTableGteTest("Softnet Packets")
+
+ // 当前面板 Softnet Out of Quota
+ cy.panelFoldLineTableGteTest("Softnet Out of Quota")
+
+ // 当前面板 Network Operational Status
+ cy.panelFoldLineTableGteTest("Network Operational Status")
+
+ })
+
+ it("Network Sockstat Test", () => {
+ // 1. 访问集群监控页面
+ cy.visit("/monitor/dashboard");
+
+ // 2. 等待页面加载完成
+ cy.wait(2000)
+
+ // 3. 关闭Quick CPU / Mem / Disk标签
+ cy.openMainLabel("Quick CPU / Mem / Disk")
+
+ // 4. 打开 Network Sockstat 标签
+ cy.openMainLabel("Network Sockstat")
+
+ // 当前面板 Sockstat TCP
+ cy.panelFoldLineTableGteTest("Sockstat TCP")
+
+ // 当前面板 Sockstat UDP
+ cy.panelFoldLineTableGteTest("Sockstat UDP")
+
+ // 当前面板 Sockstat Used
+ cy.panelFoldLineTableGteTest("Sockstat Used")
+
+ // 当前面板 Sockstat Memory Size
+ cy.panelFoldLineTableGteTest("Sockstat Memory Size")
+
+ // 当前面板 Sockstat FRAG / RAW
+ cy.panelFoldLineTableGteTest("Sockstat FRAG / RAW")
+ })
+
+ it("Network Netstat Test", () => {
+ // 1. 访问集群监控页面
+ cy.visit("/monitor/dashboard");
+
+ // 2. 等待页面加载完成
+ cy.wait(2000)
+
+ // 3. 关闭Quick CPU / Mem / Disk标签
+ cy.openMainLabel("Quick CPU / Mem / Disk")
+
+ // 4. 打开 Network Netstat 标签
+ cy.openMainLabel("Network Netstat")
+
+ // 当前面板 Netstat IP In / Out Octets
+ cy.panelFoldLineTableGteTest("Netstat IP In / Out Octets")
+
+ // 当前面板 Netstat IP Forwarding
+ cy.panelFoldLineTableGteTest("Netstat IP Forwarding")
+
+ // 当前面板 ICMP In / Out
+ cy.panelFoldLineTableGteTest("ICMP In / Out")
+
+ // 当前面板 ICMP Errors
+ cy.panelFoldLineTableGteTest("ICMP Errors")
+
+ // 当前面板 UDP In / Out
+ cy.panelFoldLineTableGteTest("UDP In / Out")
+
+ // 当前面板 UDP Errors
+ cy.panelFoldLineTableGteTest("UDP Errors")
+
+ // 当前面板 TCP In / Out
+ cy.panelFoldLineTableGteTest("TCP In / Out")
+
+ // 当前面板 TCP Errors
+ cy.panelFoldLineTableGteTest("TCP Errors")
+
+ // 当前面板 TCP Connections
+ cy.panelFoldLineTableGteTest("TCP Connections")
+
+ // 当前面板 TCP SynCookie
+ cy.panelFoldLineTableGteTest("TCP SynCookie")
+
+ // 当前面板 TCP Direct Transition
+ cy.panelFoldLineTableGteTest("TCP Direct Transition")
+ })
+
+ it("Node Exporter Test", () => {
+ // 1. 访问集群监控页面
+ cy.visit("/monitor/dashboard");
+
+ // 2. 等待页面加载完成
+ cy.wait(2000)
+
+ // 3. 关闭Quick CPU / Mem / Disk标签
+ cy.openMainLabel("Quick CPU / Mem / Disk")
+
+ // 4. 打开 Node Exporter 标签
+ cy.openMainLabel("Node Exporter")
+
+ // 当前面板 Node Exporter Scrape Time
+ cy.panelFoldLineTableGteTest("Node Exporter Scrape Time")
+
+ // 当前面板 Node Exporter Scrape
+ cy.panelFoldLineTableGteTest("Node Exporter Scrape")
+ })
+})
diff --git a/sysom_web/cypress/e2e/monitor/migrate_monitor.cy.js b/sysom_web/cypress/e2e/monitor/migrate_monitor.cy.js
new file mode 100644
index 0000000000000000000000000000000000000000..b8d3088b055c11d04765abc86ad55d7ca12878b3
--- /dev/null
+++ b/sysom_web/cypress/e2e/monitor/migrate_monitor.cy.js
@@ -0,0 +1,253 @@
+///
+
+describe("SysOM Migration Monitor Dashboard Test", () => {
+ beforeEach(() => {
+ cy.login()
+ })
+
+ it("Migration monitor test", () => {
+ // 1. 访问主机列表也米娜
+ cy.visit("/monitor/migration");
+
+ // 2. 等待页面加载完成
+ cy.wait(2000);
+
+ // 当前内核版本（Stat面板数值类型）
+ cy.getPannelContentByTitle("当前内核版本").contains(/\d+/).then(($el) => {
+ const num = parseInt($el.text());
+ expect(num).to.be.greaterThan(0);
+ });
+
+ // 当前内存可用总量（Stat面板数值类型）
+ cy.getPannelContentByTitle("当前内存可用总量").contains(/\d+/).then(($el) => {
+ const num = parseFloat($el.text());
+ expect(num).to.be.greaterThan(0);
+ });
+
+ // 当前大页内存总量（Stat面板数值类型）
+ cy.getPannelContentByTitle("当前大页内存总量").contains(/\d+/).then(($el) => {
+ const num = parseFloat($el.text());
+ expect(num).to.be.gte(0);
+ });
+
+ // 当前磁盘可用空间总量（Stat面板数值类型）
+ cy.getPannelContentByTitle("当前磁盘可用空间总量").contains(/\d+/).then(($el) => {
+ const num = parseFloat($el.text());
+ expect(num).to.be.greaterThan(0);
+ });
+
+ // 当前磁盘个数（Stat面板数值类型）
+ cy.getPannelContentByTitle("当前磁盘个数").contains(/\d+/).then(($el) => {
+ const num = parseInt($el.text());
+ expect(num).to.be.greaterThan(0);
+ });
+
+ // 当前网卡数量（Stat面板数值类型）
+ cy.getPannelContentByTitle("当前网卡数量").contains(/\d+/).then(($el) => {
+ const num = parseInt($el.text());
+ expect(num).to.be.greaterThan(0);
+ });
+
+ // 当前启用网卡数量（Stat面板数值类型）
+ cy.getPannelContentByTitle("当前启用网卡数量").contains(/\d+/).then(($el) => {
+ const num = parseInt($el.text());
+ expect(num).to.be.greaterThan(0);
+ });
+
+ // 可用内存（Time series 面板）
+ cy.getPannelContentByTitle("可用内存").find("tbody tr").should("have.length", 2); // Legend 有两列
+ cy.getPannelContentByTitle("可用内存").find("tbody tr").eq(0).find("td").eq(0).contains("total"); // 第一列的第一行是 total
+ cy.getPannelContentByTitle("可用内存").find("tbody tr").eq(0).find("td").eq(1).contains(/\d+/).then(($el) => { // 第二列的第二行是数值
+ const num = parseFloat($el.text());
+ expect(num).to.be.greaterThan(0);
+ });
+ cy.getPannelContentByTitle("可用内存").find("tbody tr").eq(1).find("td").eq(0).contains("free"); // 第一列的第二行是 free
+ cy.getPannelContentByTitle("可用内存").find("tbody tr").eq(1).find("td").eq(1).contains(/\d+/).then(($el) => { // 第二列的第二行是数值
+ const num = parseFloat($el.text());
+ expect(num).to.be.greaterThan(0);
+ });
+
+ // 可用磁盘空间（Time series 面板）
+ cy.getPannelContentByTitle("可用磁盘空间").find("tbody tr").should("have.length", 2); // Legend 有两列
+ cy.getPannelContentByTitle("可用磁盘空间").find("tbody tr").eq(0).find("td").eq(0).contains("total"); // 第一列的第一行是 total
+ cy.getPannelContentByTitle("可用磁盘空间").find("tbody tr").eq(0).find("td").eq(1).contains(/\d+/).then(($el) => { // 第二列的第二行是数值
+ const num = parseFloat($el.text());
+ expect(num).to.be.greaterThan(0);
+ });
+ cy.getPannelContentByTitle("可用磁盘空间").find("tbody tr").eq(1).find("td").eq(0).contains("avaliable"); // 第一列的第二行是 avaliable
+ cy.getPannelContentByTitle("可用磁盘空间").find("tbody tr").eq(1).find("td").eq(1).contains(/\d+/).then(($el) => { // 第二列的第二行是数值
+ const num = parseFloat($el.text());
+ expect(num).to.be.greaterThan(0);
+ });
+
+ // CPUs（Stat面板数值类型）
+ cy.getPannelContentByTitle("CPUs").contains(/\d+/).then(($el) => {
+ const num = parseInt($el.text());
+ expect(num).to.be.greaterThan(0);
+ });
+
+ // CPU 利用率（Time series 面板）
+ cy.getPannelContentByTitle("CPU 利用率").find("tbody tr").should("have.length.gte", 1); // Legend 至少有一列
+ cy.getPannelContentByTitle("CPU 利用率").find("tbody tr").eq(0).find("td").eq(0).contains("今日"); // 第一列的第一行是 “今日”
+ cy.getPannelContentByTitle("CPU 利用率").find("tbody tr").eq(0).find("td").eq(1).contains(/\d+/).then(($el) => { // 第一列的第二行是数值
+ const num = parseFloat($el.text());
+ expect(num).to.be.greaterThan(0);
+ });
+
+ // CPU 利用率两日差值（Time series 面板）=> 如果无数据也是正常的，可以用下列这种方式分情况判断
+ cy.getPannelContentByTitle("CPU 利用率两日差值")
+ .then(($el) => {
+ if ($el.text().includes("No data")) {
+ // 面板没有数据的情况
+ cy.wrap($el).contains("No data");
+ } else {
+ // 如果面板有数据的情况
+ cy.wrap($el).find("tbody tr").should("have.length.gte", 1); // Legend 至少有1列
+ cy.wrap($el).find("tbody tr").eq(0).find("td").eq(0).contains("CPU 利用率差值"); // 第一列的第一行是 “CPU 利用率差值”
+ cy.wrap($el).find("tbody tr").eq(0).find("td").eq(1).contains(/\d+/).then(($el) => { // 第一列的第二行是数值
+ const num = parseFloat($el.text());
+ expect(num).to.be.greaterThan(0);
+ });
+ // cy.wrap($el).find("tbody tr").eq(1).find("td").eq(0).contains("stdvar"); // 第二列的第一行是 “CPU 利用率差值”
+ // cy.wrap($el).find("tbody tr").eq(1).find("td").eq(1).contains(/\d+/).then(($el) => { // 第二列的第二行是数值
+ // const num = parseFloat($el.text());
+ // expect(num).to.be.gte(0);
+ // });
+ }
+ });
+
+ // 实时 CPU 利用率（Gauge）
+ cy.getPannelContentByTitle("实时 CPU 利用率").contains(/\d+/).then(($el) => {
+ const num = parseFloat($el.text());
+ expect(num).to.be.greaterThan(0);
+ });
+
+ // CPU 利用率两日分布（Histogram）
+ cy.getPannelContentByTitle("CPU 利用率两日分布").find("tbody tr").should("have.length.gte", 1); // Legend 至少有一列
+ cy.getPannelContentByTitle("CPU 利用率两日分布").find("tbody tr").eq(0).find("td").eq(0).contains("今日"); // 第一列的第一行是 “今日”
+ cy.getPannelContentByTitle("CPU 利用率两日分布").find("tbody tr").eq(0).find("td").eq(1).contains(/\d+/).then(($el) => { // 第一列的第二行是数值
+ const num = parseFloat($el.text());
+ expect(num).to.be.greaterThan(0);
+ });
+
+ // CPU利用率波动（Time series 面板）
+ cy.getPannelContentByTitle("CPU利用率波动").find("tbody tr").should("have.length", 1); // Legend 有一列
+ cy.getPannelContentByTitle("CPU利用率波动").find("tbody tr").eq(0).find("td").eq(0).contains("标准差"); // 第一列的第一行是 “标准差”
+ cy.getPannelContentByTitle("CPU利用率波动").find("tbody tr").eq(0).find("td").eq(1).contains(/\d+/).then(($el) => { // 第二列的第二行是数值
+ const num = parseFloat($el.text());
+ expect(num).to.be.gte(0);
+ });
+
+ // 实时内存使用率（Gauge）
+ cy.getPannelContentByTitle("实时内存使用率").contains(/\d+/).then(($el) => {
+ const num = parseFloat($el.text());
+ expect(num).to.be.greaterThan(0);
+ });
+
+ // 内存使用率（Memory Usage）（Time series 面板）
+ cy.getPannelContentByTitle("内存使用率（Memory Usage）").find("tbody tr").should("have.length", 1); // Legend 有一列
+ cy.getPannelContentByTitle("内存使用率（Memory Usage）").find("tbody tr").eq(0).find("td").eq(0).contains("Memory utilization rate"); // 第一列的第一行是 “Memory utilization rate”
+ cy.getPannelContentByTitle("内存使用率（Memory Usage）").find("tbody tr").eq(0).find("td").eq(1).contains(/\d+/).then(($el) => { // 第二列的第二行是数值
+ const num = parseFloat($el.text());
+ expect(num).to.be.greaterThan(0);
+ });
+
+ // 内存使用率波动（Memory Usage Rate Fluctuation）（Time series 面板）
+ cy.getPannelContentByTitle("内存使用率波动（Memory Usage Rate Fluctuation）").find("tbody tr").should("have.length", 1); // Legend 有一列
+ cy.getPannelContentByTitle("内存使用率波动（Memory Usage Rate Fluctuation）").find("tbody tr").eq(0).find("td").eq(0).contains("标准差(stddev)"); // 第一列的第一行是 “标准差”
+ cy.getPannelContentByTitle("内存使用率波动（Memory Usage Rate Fluctuation）").find("tbody tr").eq(0).find("td").eq(1).contains(/\d+/).then(($el) => { // 第二列的第二行是数值
+ const num = parseFloat($el.text());
+ expect(num).to.be.gte(0);
+ });
+
+ // 磁盘空间总额（Pie Chart）
+ cy.getPannelContentByTitle("磁盘空间总额").find("ul li").should("have.length.gte", 1); // Legend 至少有一列
+
+ // 磁盘空间使用率（Time series 面板）
+ cy.getPannelContentByTitle("磁盘空间使用率").find("ul li").should("have.length.gte", 1); // Legend 至少有一列
+
+ // Disk Read IOps （Time series 面板）
+ cy.getPannelContentByTitle("Disk Read IOps").find("tbody tr").should("have.length.gte", 1); // Legend 至少有一列
+
+ // Disk R/W Data （Time series 面板）
+ cy.getPannelContentByTitle("Disk R/W Data").find("tbody tr").should("have.length.gte", 1); // Legend 至少有一列
+
+ //////////////////////////////////////////////////////////////////////////////////////////////////
+ // Network
+ //////////////////////////////////////////////////////////////////////////////////////////////////
+
+ // 实时接收速率（Stat面板）
+ cy.getPannelContentByTitle("实时接收速率").contains(/\d+/).then(($el) => {
+ const num = parseFloat($el.text());
+ expect(num).to.be.gte(0);
+ });
+
+ // 网络流量监控
+ cy.getPannelContentByTitle("网络流量监控").find("tbody tr").should("have.length", 2); // Legend 有两列
+ cy.getPannelContentByTitle("网络流量监控").find("tbody tr").eq(0).find("td").eq(0).contains("接收速率"); // 第一列的第一行是 “接收速率”
+ cy.getPannelContentByTitle("网络流量监控").find("tbody tr").eq(0).find("td").eq(1).contains(/\d+/).then(($el) => { // 第一列的第二行是数值
+ const num = parseFloat($el.text());
+ expect(num).to.be.gte(0);
+ });
+ cy.getPannelContentByTitle("网络流量监控").find("tbody tr").eq(1).find("td").eq(0).contains("发送速率"); // 第二列的第一行是 “发送速率”
+ cy.getPannelContentByTitle("网络流量监控").find("tbody tr").eq(1).find("td").eq(1).contains(/\d+/).then(($el) => { // 第二列的第二行是数值
+ const num = parseFloat($el.text());
+ expect(num).to.be.lte(0);
+ });
+
+ // 网络流量波动监测
+ cy.getPannelContentByTitle("网络流量波动监测").find("tbody tr").should("have.length", 2); // Legend 有两列
+ cy.getPannelContentByTitle("网络流量波动监测").find("tbody tr").eq(0).find("td").eq(0).contains("接收速率标准差"); // 第一列的第一行是 “接收速率标准差”
+ cy.getPannelContentByTitle("网络流量波动监测").find("tbody tr").eq(0).find("td").eq(1).contains(/\d+/).then(($el) => { // 第一列的第二行是数值
+ const num = parseFloat($el.text());
+ expect(num).to.be.gte(0);
+ });
+ cy.getPannelContentByTitle("网络流量波动监测").find("tbody tr").eq(1).find("td").eq(0).contains("发送速率标准差"); // 第二列的第一行是 “发送速率标准差”
+ cy.getPannelContentByTitle("网络流量波动监测").find("tbody tr").eq(1).find("td").eq(1).contains(/\d+/).then(($el) => { // 第二列的第二行是数值
+ const num = parseFloat($el.text());
+ expect(num).to.be.lte(0);
+ });
+
+ // 实时发送速率（Stat面板）
+ cy.getPannelContentByTitle("实时发送速率").contains(/\d+/).then(($el) => {
+ const num = parseFloat($el.text());
+ expect(num).to.be.gte(0);
+ });
+
+ //////////////////////////////////////////////////////////////////////////////////////////////////
+ // System Load
+ //////////////////////////////////////////////////////////////////////////////////////////////////
+
+ // 实时系统负载（1分钟）（Gauge）
+ cy.getPannelContentByTitle("实时系统负载（1分钟）").contains(/\d+/).then(($el) => {
+ const num = parseFloat($el.text());
+ expect(num).to.be.gte(0);
+ });
+
+ // 系统负载（Time series 面板）
+ cy.getPannelContentByTitle("系统负载").find("tbody tr").should("have.length", 3); // Legend 有三列
+ cy.getPannelContentByTitle("系统负载").find("tbody tr").eq(0).find("td").eq(0).contains("1分钟内负载（Load1）"); // 第一列的第一行是 "1分钟内负载（Load1）"
+ cy.getPannelContentByTitle("系统负载").find("tbody tr").eq(0).find("td").eq(1).contains(/\d+/).then(($el) => { // 第一列的第二行是数值
+ const num = parseFloat($el.text());
+ expect(num).to.be.gte(0);
+ });
+ cy.getPannelContentByTitle("系统负载").find("tbody tr").eq(1).find("td").eq(0).contains("5分钟内负载（Load5）"); // 第二列的第一行是 "5分钟内负载（Load5）"
+ cy.getPannelContentByTitle("系统负载").find("tbody tr").eq(1).find("td").eq(1).contains(/\d+/).then(($el) => { // 第二列的第二行是数值
+ const num = parseFloat($el.text());
+ expect(num).to.be.gte(0);
+ });
+ cy.getPannelContentByTitle("系统负载").find("tbody tr").eq(2).find("td").eq(0).contains("15分钟内负载（Load15）"); // 第三列的第一行是 "15分钟内负载（Load15）"
+ cy.getPannelContentByTitle("系统负载").find("tbody tr").eq(2).find("td").eq(1).contains(/\d+/).then(($el) => { // 第三列的第二行是数值
+ const num = parseFloat($el.text());
+ expect(num).to.be.gte(0);
+ });
+
+ // 系统负载波动（Load1）（Time series 面板）
+ cy.getPannelContentByTitle("系统负载波动（Load1）").find("tbody tr").should("have.length", 1); // Legend 有一列
+ cy.getPannelContentByTitle("系统负载波动（Load1）").find("tbody tr").eq(0).find("td").eq(0).contains("标准差"); // 第一列的第一行是 “标准差”
+ cy.getPannelContentByTitle("系统负载波动（Load1）").find("tbody tr").eq(0).find("td").eq(1).contains(/\d+/).then(($el) => { // 第二列的第二行是数值
+ const num = parseFloat($el.text());
+ expect(num).to.be.gte(0);
+ });
+ })
+})
\ No newline at end of file
diff --git a/sysom_web/cypress/e2e/monitor/nginx_monitor.cy.js b/sysom_web/cypress/e2e/monitor/nginx_monitor.cy.js
new file mode 100644
index 0000000000000000000000000000000000000000..3c824c352aad266c00ba3206e6c8048f2525ab0c
--- /dev/null
+++ b/sysom_web/cypress/e2e/monitor/nginx_monitor.cy.js
@@ -0,0 +1,136 @@
+///
+
+describe("SysOM Nginx Observer Dashboard Test", () => {
+ beforeEach(() => {
+ cy.login();
+ })
+
+ it("Nginx Observer test", () => {
+ // 1. 访问集群监控页面
+ cy.visit("app_observable/Nginx");
+
+ // 2. 等待页面加载完成
+ cy.wait(2000);
+
+ // 3. 检查异常告警pannel
+ cy.getPannelContentByTitle("异常告警分布（次数）").then($el => {
+ if ($el.text().includes("No data")) {
+ cy.wrap($el).contains("No data")
+ } else {
+ cy.wrap($el).contains("请求抖动")
+ cy.wrap($el).contains("请求4xx")
+ cy.wrap($el).contains("请求5xx")
+ cy.wrap($el).contains("错误日志")
+ }
+ });
+
+ // 4. 检查请求数pannel
+ cy.getPannelContentByTitle("请求数").then($el => {
+ if ($el.text().includes("No data")) {
+ cy.wrap($el).contains("No data")
+ } else {
+ cy.wrap($el).find("ul li").should("have.length.gte", 1);
+ cy.wrap($el).find("ul li").eq(0).contains("requests");
+ }
+ });
+
+ // 5. 检查http status分布pannel
+ cy.getPannelContentByTitle("http status分布").then($el => {
+ if ($el.text().includes("No data")) {
+ cy.wrap($el).contains("No data")
+ } else {
+ cy.wrap($el).find("ul li").should("have.length.gte", 1);
+ cy.wrap($el).find("ul li").eq(0).contains("status_1xx");
+ cy.wrap($el).find("ul li").eq(1).contains("status_2xx");
+ cy.wrap($el).find("ul li").eq(2).contains("status_3xx");
+ cy.wrap($el).find("ul li").eq(3).contains("status_4xx");
+ cy.wrap($el).find("ul li").eq(4).contains("status_5xx");
+ }
+ });
+
+
+ // 6. 检查响应时延pannel
+ cy.getPannelContentByTitle("响应时延").then($el => {
+ if ($el.text().includes("No data")) {
+ cy.wrap($el).contains("No data")
+ } else {
+ cy.wrap($el).find("ul li").should("have.length.gte", 1);
+ cy.wrap($el).find("ul li").eq(0).contains("requestTime");
+ cy.wrap($el).find("ul li").eq(1).contains("upstreamTime");
+ cy.wrap($el).find("ul li").eq(2).contains("maxRequestTime");
+ cy.wrap($el).find("ul li").eq(3).contains("maxUpstreamTime");
+ }
+ });
+
+ // 7. 检查workers数量pannel
+ cy.getPannelContentByTitle("workers数量").then($el => {
+ if ($el.text().includes("No data")) {
+ cy.wrap($el).contains("No data")
+ } else {
+ cy.wrap($el).find("ul li").find("ul li").should("have.length.gte", 1);
+ cy.wrap($el).find("ul li").find("ul li").eq(0).contains("workersCount");
+ }
+ });
+
+ // 8. 检查活跃的连接数pannel
+ cy.getPannelContentByTitle("活跃的连接数").then($el => {
+ if ($el.text().includes("No data")) {
+ cy.wrap($el).contains("No data")
+ } else {
+ cy.wrap($el).find("ul li").should("have.length.gte", 1);
+ cy.wrap($el).find("ul li").eq(0).contains("activeConnections");
+ }
+ });
+
+ // 9. 检查nginx进程cpu利用率pannel
+ cy.getPannelContentByTitle("nginx进程cpu利用率").then($el => {
+ if ($el.text().includes("No data")) {
+ cy.wrap($el).contains("No data")
+ } else {
+ cy.wrap($el).find("ul li").should("have.length.gte", 1);
+ cy.wrap($el).find("ul li").eq(0).contains(/\d+/).then(($el) => {
+ const num = parseFloat($el.text());
+ expect(num).to.be.gte(0);
+ });
+ cy.wrap($el).find("ul li").eq(1).contains(/\d+/).then(($el) => {
+ const num = parseFloat($el.text());
+ expect(num).to.be.gte(0);
+ });
+ }
+ });
+
+ // 10. 检查nginx进程内存利用率pannel
+ cy.getPannelContentByTitle("nginx进程内存利用率").then($el => {
+ if ($el.text().includes("No data")) {
+ cy.wrap($el).contains("No data")
+ } else {
+ cy.wrap($el).find("ul li").should("have.length.gte", 1);
+ cy.wrap($el).find("ul li").eq(0).contains(/\d+/).then(($el) => {
+ const num = parseFloat($el.text());
+ expect(num).to.be.gte(0);
+ });
+ cy.wrap($el).find("ul li").eq(1).contains(/\d+/).then(($el) => {
+ const num = parseFloat($el.text());
+ expect(num).to.be.gte(0);
+ });
+ }
+ });
+
+ // 11. 检查nginx进程网络流量pannel
+ cy.getPannelContentByTitle("nginx进程网络流量").then($el => {
+ if ($el.text().includes("No data")) {
+ cy.wrap($el).contains("No data")
+ } else {
+ cy.wrap($el).find("ul li").should("have.length.gte", 1);
+ cy.wrap($el).find("ul li").eq(0).contains(/\d+/).then(($el) => {
+ const num = parseFloat($el.text());
+ expect(num).to.be.gte(0);
+ });
+ cy.wrap($el).find("ul li").eq(1).contains(/\d+/).then(($el) => {
+ const num = parseFloat($el.text());
+ expect(num).to.be.gte(0);
+ });
+ }
+ });
+ })
+})
\ No newline at end of file
diff --git a/sysom_web/cypress/e2e/vmcore/vmcore_config.cy.js b/sysom_web/cypress/e2e/vmcore/vmcore_config.cy.js
new file mode 100644
index 0000000000000000000000000000000000000000..306789faf7aa5cb00527e0b9c7a0bb22a6f13e02
--- /dev/null
+++ b/sysom_web/cypress/e2e/vmcore/vmcore_config.cy.js
@@ -0,0 +1,24 @@
+///
+
+describe("vmcore list page", () => {
+ it("show vmcore list", () => {
+ cy.intercept("POST","/api/v1/vmcore/vmcore_config_test").as("vmcoreTest")
+ cy.login()
+ cy.visit("/vmcore/config")
+ /* ==== Generated with Cypress Studio ==== */
+ cy.get('#name').clear();
+ cy.get('#name').type("testconfig");
+ cy.get('#server_host').clear();
+ cy.get('#server_host').type("127.0.0.1");
+ cy.get('#mount_point').clear();
+ cy.get('#mount_point').type("/tmp/vmcore-nfs");
+ cy.get('#days').clear();
+ /* ==== Generated with Cypress Studio ==== */
+ cy.get('.ml20___wnEIC').click();
+ cy.get(':nth-child(1) > .ant-descriptions-item > .ant-descriptions-item-container > .ant-descriptions-item-content').should('have.text',"testconfig");
+ cy.get(':nth-child(2) > .ant-descriptions-item > .ant-descriptions-item-container > .ant-descriptions-item-content').should('have.text',"127.0.0.1");
+ cy.get(':nth-child(3) > .ant-descriptions-item > .ant-descriptions-item-container > .ant-descriptions-item-content').should('have.text',"/tmp/vmcore-nfs");
+ //cy.get('.configleft17___1xVO3').click();
+ /* ==== End Cypress Studio ==== */
+ })
+})
diff --git a/sysom_web/cypress/e2e/vmcore/vmcore_list.cy.js b/sysom_web/cypress/e2e/vmcore/vmcore_list.cy.js
new file mode 100644
index 0000000000000000000000000000000000000000..93269ba35edbbcf1077fa1ee346a4e1e9d8817a2
--- /dev/null
+++ b/sysom_web/cypress/e2e/vmcore/vmcore_list.cy.js
@@ -0,0 +1,14 @@
+///
+
+describe("vmcore list page", () => {
+ it("show vmcore list", () => {
+ cy.login()
+ cy.visit("/vmcore/list")
+ /* ==== Generated with Cypress Studio ==== */
+ cy.get(':nth-child(1) > .ant-pro-card > .ant-pro-card-body > .ant-statistic > .ant-statistic-content > .ant-statistic-content-value > .ant-statistic-content-value-int').invoke('text').should('match',/^\d+/);
+ cy.get(':nth-child(3) > .ant-pro-card > .ant-pro-card-body > .ant-statistic > .ant-statistic-content > .ant-statistic-content-value > .ant-statistic-content-value-int').invoke('text').should('match',/^\d+/);
+ cy.get(':nth-child(5) > .ant-pro-card > .ant-pro-card-body > .ant-statistic > .ant-statistic-content > .ant-statistic-content-value ').invoke('text').should('match',/^\d+\.\d+$/);
+ cy.get(':nth-child(7) > .ant-pro-card > .ant-pro-card-body > .ant-statistic > .ant-statistic-content > .ant-statistic-content-value ').invoke('text').should('match',/^\d+\.\d+$/);
+ /* ==== End Cypress Studio ==== */
+ })
+})
diff --git a/sysom_web/cypress/e2e/vmcore/vmcore_match.cy.js b/sysom_web/cypress/e2e/vmcore/vmcore_match.cy.js
new file mode 100644
index 0000000000000000000000000000000000000000..f7c1825a4f8850e48f509ca92686337828656da9
--- /dev/null
+++ b/sysom_web/cypress/e2e/vmcore/vmcore_match.cy.js
@@ -0,0 +1,17 @@
+///
+
+describe("vmcore list page", () => {
+ it("show vmcore list", () => {
+ cy.login()
+ cy.visit("/vmcore/match")
+ /* ==== Generated with Cypress Studio ==== */
+ cy.get('#similar_dmesg').clear();
+ //let inputText = " [6231329.685410] Kernel panic - not syncing: sysrq triggered crash \n[6231329.685933] CPU: 3 PID: 514785 Comm: bash Kdump: loaded Tainted: G W E 5.10.134-14.an8.x86_64 #1 \n[6231329.686813] Hardware name: Alibaba Cloud Alibaba Cloud ECS, BIOS 449e491 04/01/2014 \n[6231329.687515] Call Trace: \n[6231329.687759] dump_stack+0x57/0x6e\n [6231329.688070] panic+0x10d/0x2e9 \n[6231329.688392] sysrq_handle_crash+0x16/0x20\n [6231329.688759] __handle_sysrq.cold.18+0x7a/0xe8\n [6231329.689159] write_sysrq_trigger+0x2b/0x40 \n [6231329.689548] proc_reg_write+0x3b/0x80 \n[6231329.689887] vfs_write+0xb5/0x260 \n[6231329.690203] ksys_write+0x49/0xc0 \n[6231329.690523] do_syscall_64+0x33/0x40 \n[6231329.690853] entry_SYSCALL_64_after_hwframe+0x61/0xc6 \n[6231329.691325] RIP: 0033:0x7f4d40d205a8 ";
+ //cy.get("#similar_dmesg").invoke('val', inputText)
+ //cy.get('#similar_dmesg').type( " [6231329.685410] Kernel panic - not syncing: sysrq triggered crash \n[6231329.685933] CPU: 3 PID: 514785 Comm: bash Kdump: loaded Tainted: G W E 5.10.134-14.an8.x86_64 #1 \n[6231329.686813] Hardware name: Alibaba Cloud Alibaba Cloud ECS, BIOS 449e491 04/01/2014 \n[6231329.687515] Call Trace: \n[6231329.687759] dump_stack+0x57/0x6e\n [6231329.688070] panic+0x10d/0x2e9 \n[6231329.688392] sysrq_handle_crash+0x16/0x20\n [6231329.688759] __handle_sysrq.cold.18+0x7a/0xe8\n [6231329.689159] write_sysrq_trigger+0x2b/0x40 \n [6231329.689548] proc_reg_write+0x3b/0x80 \n[6231329.689887] vfs_write+0xb5/0x260 \n[6231329.690203] ksys_write+0x49/0xc0 \n[6231329.690523] do_syscall_64+0x33/0x40 \n[6231329.690853] entry_SYSCALL_64_after_hwframe+0x61/0xc6 \n[6231329.691325] RIP: 0033:0x7f4d40d205a8 ");
+ cy.get('#similar_dmesg').type("123")
+ cy.get(':nth-child(2) > .ant-btn').click();
+ cy.get('table > tbody').eq(0).children().should('have.length.of.at.least',1)
+ /* ==== End Cypress Studio ==== */
+ })
+})
diff --git a/sysom_web/cypress/e2e/vul/repair.cy.js b/sysom_web/cypress/e2e/vul/repair.cy.js
index 159c68945cb33430b187e7cdf1969796d7e231df..aed8320e238c4ae3940ba341cf28c6557bbf52a7 100644
--- a/sysom_web/cypress/e2e/vul/repair.cy.js
+++ b/sysom_web/cypress/e2e/vul/repair.cy.js
@@ -1,16 +1,16 @@
///
describe("SysOM Vul Manager Test", () => {
-
- it("login failed", () => {
-
- cy.login()
+ beforeEach(() => {
+ cy.login()
+ })
+ it("repair test", () => {
cy.intercept("POST", "api/v1/vul/")
.as("repair")
// 1. 访问安全中心列表
- cy.visit("security/list")
+ cy.visit("/security/list")
//2.选择第一条数据，点击修复按钮
cy.get('table').within(() => {
diff --git a/sysom_web/cypress/support/commands.js b/sysom_web/cypress/support/commands.js
index 8bc4b4defe6a036da3913be8979ff5b4d0a44673..e141dfc21b4b1499b42dab0d10cfb1def65f4130 100644
--- a/sysom_web/cypress/support/commands.js
+++ b/sysom_web/cypress/support/commands.js
@@ -24,12 +24,66 @@
// -- This will overwrite an existing command --
// Cypress.Commands.overwrite('visit', (originalFn, url, options) => { ... })
+Cypress.on('uncaught:exception', (err, runnable) => {
+ // return false to prevent the error from failing the test if it matches
+ // the specific error message
+ if (err.message.includes('ResizeObserver loop completed with undelivered notifications')) {
+ return false;
+ }
+ // else let Cypress handle the exception as it normally does
+ return true;
+});
+
+
Cypress.Commands.add("login", () => {
cy.visit("/user/login")
cy.get("#username").focus().clear().type(Cypress.env("SYSOM_ACCOUNT_USERNAME"))
cy.get("#password").focus().clear().type(Cypress.env("SYSOM_ACCOUNT_PASSWORD"))
+ let password = Cypress.env("SYSOM_ACCOUNT_PASSWORD")
cy.get("button").contains("登录").click()
- cy.get("button").contains("忽 略").click()
+ if (password == "123456") {
+ cy.get("button").contains("忽 略").click()
+ } else {
+ cy.wait(2000)
+ }
+})
+
+Cypress.Commands.add('addDefaultHost', () => {
+ cy.intercept("POST", "/api/v1/host/")
+ .as("createHost")
+
+ // 1. 点击新建主机打开模块框
+ cy.get("button").contains("新建主机").click()
+
+ // 2. 在模态框内部填充字段
+ cy.get(".ant-modal-content").first().within(() => {
+ // 1.1 cluster
+ // cy.get("#cluster").focus().type("default")
+ cy.get('#cluster').type("default").type("{enter}", {force: true})
+
+ // 2.2 hostname
+ cy.get("#hostname").focus().clear().type("local")
+
+ // 2.3 username
+ cy.get("#username").focus().clear().type("root")
+
+ // 2.4 password
+ const default_host_password = Cypress.env("DEFAULT_HOST_PASSWORD")
+ cy.get("#host_password").focus().clear().type(default_host_password)
+
+ // 2.5 ip
+ cy.get("#ip").focus().clear().type("127.0.0.1")
+
+ // 2.6 port
+ cy.get("#port").focus().clear().type("22")
+
+ // 2.7 确认
+ cy.get("button").contains("确 认").click()
+
+ // 2.8 等待新建主机请求结束，判断请求是否成功
+ // 检查状态码返回是否是200（如果集群已经存在会返回400）
+ cy.wait('@createHost').its("response.statusCode").should("eq", 200)
+ })
})
/**
@@ -39,6 +93,8 @@ Cypress.Commands.add("login", () => {
* @param {*} resultCheckCallback 诊断结果处理（在此处判断诊断结果是否符合预期）
*/
Cypress.Commands.add("sysomDiagnosisCheck", (pageUrl, params, resultCheckCallback) => {
+ cy.intercept("GET", "/api/v1/host")
+ .as("getHostList")
cy.intercept("POST", "/api/v1/tasks/")
.as("createDiagnosisTask")
@@ -50,11 +106,44 @@ Cypress.Commands.add("sysomDiagnosisCheck", (pageUrl, params, resultCheckCallbac
// 1. 访问自定义诊断页面
cy.visit(pageUrl)
+ cy.wait(1000)
+
+ cy.wait('@getHostList')
+ .then((interception) => {
+ expect(interception).to.have.property('response')
+ expect(interception.response?.body.code, 'code').to.equal(200)
+ expect(interception.response.statusCode).to.equal(200)
+ const { data } = interception.response.body
+ const ipList = data.map((item) => {
+ return item.ip
+ })
+
+ const defaultHostIpOne = Cypress.env("HOSTS")[0]
+ const defaultHostIpTwo = Cypress.env("HOSTS")[1]
+
+ if (ipList.includes(defaultHostIpOne) && ipList.includes(defaultHostIpTwo)) {
+ expect(defaultHostIpOne).to.be.oneOf(ipList)
+ expect(defaultHostIpTwo).to.be.oneOf(ipList)
+ } else {
+ // 1. 跳转到主机列表页面
+ cy.visit("/host/list")
+ cy.wait(1000)
+
+ // 2. 添加默认主机
+ cy.addDefaultHost()
+ cy.wait(1000)
+
+ // 返回当前页面
+ cy.visit(pageUrl)
+ cy.wait(30000)
+ }
+ })
// 2 输入instance参数
for (let k in params) {
if (k.indexOf("instance") != -1) {
cy.get(`#${k}`).parent().parent().click()
+ cy.get(`#${k}`).type(params[k])
cy.get(".rc-virtual-list-holder-inner").contains(params[k]).click()
} else {
cy.get(`#${k}`).invoke("attr", "readonly").then(res => {
@@ -63,7 +152,7 @@ Cypress.Commands.add("sysomDiagnosisCheck", (pageUrl, params, resultCheckCallbac
cy.get(`#${k}`).parent().parent().click()
cy.get(".rc-virtual-list-holder-inner").contains(params[k]).click()
} else {
- cy.get(`#${k}`).focus().clear().type(params[k], {force: true})
+ cy.get(`#${k}`).focus().clear().type(params[k], { force: true })
}
})
}
@@ -78,7 +167,8 @@ Cypress.Commands.add("sysomDiagnosisCheck", (pageUrl, params, resultCheckCallbac
const getAndCheckTaskResult = (task_id) => {
// 点击一下刷新按钮
- cy.get('span[aria-label="reload"]').click()
+ //cy.get('span[aria-label="reload"]').click({"multiple": true})
+ cy.get('svg[data-icon="reload"]').first().click({"multiple": true})
cy.wait("@getDiagnosisTasks").its("response.statusCode").should("eq", 200)
cy.wait(100)
cy.get("td")
@@ -123,4 +213,155 @@ Cypress.Commands.add("sysomDiagnosisCheck", (pageUrl, params, resultCheckCallbac
// 轮询获取诊断结果
getAndCheckTaskResult(task_id)
})
-})
\ No newline at end of file
+});
+
+Cypress.Commands.add("getIframeBody", (iframe_selector = "iframe") => {
+ cy.get(iframe_selector)
+ // Cypress yields jQuery element, which has the real
+ // DOM element under property "0".
+ // From the real DOM iframe element we can get
+ // the "document" element, it is stored in "contentDocument" property
+ // Cypress "its" command can access deep properties using dot notation
+ // https://on.cypress.io/its
+ .its('0.contentDocument')
+ .should('exist')
+ // automatically retries until body is loaded
+ .its('body').should('not.be.undefined')
+ // wraps "body" DOM element to allow
+ // chaining more Cypress commands, like ".find(...)"
+ // https://on.cypress.io/wrap
+ .then((body) => cy.wrap(body, { log: false }))
+});
+
+Cypress.Commands.add("getPannelByTitle", (title) => {
+ return cy.getIframeBody()
+ .find("div.react-grid-layout")
+ .find("div.react-grid-item")
+ .find("div.panel-header")
+ .filter((_, element) => {
+ return Cypress.$(element).text().trim() == title
+ })
+ .parents("div.react-grid-item")
+});
+
+Cypress.Commands.add("getPannelHeaderByTitle", (title) => {
+ return cy.getPannelByTitle(title).find("div.panel-header")
+});
+
+Cypress.Commands.add("getPannelContentByTitle", (title) => {
+ return cy.getPannelByTitle(title).find("div.panel-content").scrollIntoView();
+});
+
+/**
+ * SysOM 日志模块测试封装
+ * @param {*} pageUrl 页面地址
+ * @param {*} params 列表过滤参数
+ * @param {*} resultCallback 结果回调, 返回结果是否达到预期
+ */
+Cypress.Commands.add("sysomLogSelectOrFilter", (pageUrl, params, isSelect) => {
+ // 1. 跳转到自定义log页面
+ cy.visit(pageUrl)
+
+ // 2. 等待页面加载完成
+ cy.wait(2000)
+
+ // 3. 查找filter展开按钮并点击，若没有则跳过
+ if (isSelect) {
+ const el_show = 'a[class="ant-pro-form-collapse-button"]'
+ cy.get(el_show).contains("展开").click()
+ }
+
+ // 4. 输入查询参数
+ for (let param in params) {
+ cy.get(`input[id=${param}]`).focus().type(params[param], {force: true})
+ }
+
+ // 5. 点击查询按钮
+ cy.get(':nth-child(2) > .ant-btn > span').click()
+
+ // 6. table 内容断言
+ cy.get('.ant-table-tbody').find('tr').should("have.length.gte", 1)
+
+})
+
+/**
+ * 打开闭合的主标签
+ * @param {*} title panel tag
+ */
+Cypress.Commands.add("openMainLabel", (title) => {
+ cy.getIframeBody()
+ .find("div.react-grid-layout")
+ .find("div.react-grid-item")
+ .find("a")
+ .contains(title).click()
+})
+
+/*
+* 面板数值大于等于 0
+* @param {*} title panel tag
+*/
+Cypress.Commands.add("panelNumericalValueGteTest", (title) => {
+ cy.getPannelContentByTitle(title).contains(/\d+/).then(($el) => {
+ const num = parseInt($el.text());
+ expect(num).to.be.gte(0);
+ })
+})
+
+/**
+ * 面板取a便签数 大于等于 0
+ * @param {*} title panel tag
+ */
+
+Cypress.Commands.add("panelAtagValueGteTest", (title) => {
+ cy.getPannelContentByTitle(title).find("a").should("have.length.gte", 0)
+})
+
+/**
+ * 面板取a便签数 大于等于 0, 无数据时显示No data
+ * @param {*} title panel tag
+ */
+Cypress.Commands.add("panelAtagValueGteOrNoDataTest", (title) => {
+ cy.getPannelContentByTitle(title)
+ .then(($el) => {
+ if ($el.text().includes("No data")) {
+ cy.wrap($el).contains("No data");
+ } else {
+ cy.wrap($el).find("a").should("have.length.gte", 0)
+ }
+ })
+})
+
+/**
+ * 面板取折线统计图且具有Table
+ * @params {*} title panel tag
+ * @items {*} items 属性名称 列表
+ */
+Cypress.Commands.add("panelFoldLineTableGteTest", (title, Array) => {
+ cy.getPannelContentByTitle(title).find("tbody tr").should("have.length.gt", 0)
+ if (Array !== undefined) {
+ Array.forEach((item, index) => {
+ cy.getPannelContentByTitle(title).find("tbody tr").eq(index).find("td").eq(0).contains(item)
+ })
+ }
+})
+
+Cypress.Commands.add("panelNoDataTest", (title) => {
+ cy.getPannelContentByTitle(title).then(($el) => {
+ console.log($el.text())
+ if ($el.text().includes("No data")) {
+ cy.wrap($el).contains("No data");
+ } else {
+ cy.getPannelContentByTitle(title).find("canvas").should('be.empty')
+ }
+ })
+})
+
+Cypress.Commands.add("diagnosisTaskResultHandler", (result, callback) => {
+ if (result.status === "Success") {
+ callback && callback()
+ } else {
+ cy.get('.ant-modal-confirm-title').should("include.text", "诊断失败")
+ cy.get("button").should("include.text", "OK")
+ cy.get("button").contains("OK").click()
+ }
+})
diff --git a/sysom_web/package.json b/sysom_web/package.json
index cc68dd05f33fcd4176291e274161604a107e083e..a361f2f06d727013961819753f7c9e78d5abb7b7 100644
--- a/sysom_web/package.json
+++ b/sysom_web/package.json
@@ -85,7 +85,8 @@
"xterm": "^5.1.0",
"xterm-addon-attach": "^0.8.0",
"xterm-addon-fit": "^0.7.0",
- "xterm-addon-web-links": "^0.8.0"
+ "xterm-addon-web-links": "^0.8.0",
+ "zustand": "^4.4.7"
},
"devDependencies": {
"@types/express": "^4.17.0",
diff --git a/sysom_web/public/resource/app_observable/v1/locales.json b/sysom_web/public/resource/app_observable/v1/locales.json
new file mode 100644
index 0000000000000000000000000000000000000000..bce29568b96435066acbf3428e39f36331a8ed69
--- /dev/null
+++ b/sysom_web/public/resource/app_observable/v1/locales.json
@@ -0,0 +1,27 @@
+{
+ "version": 1.0,
+ "menus": [
+ "menu.app_observable.ntopo",
+ "menu.app_observable.mysql",
+ "menu.app_observable.nginx",
+ "menu.app_observable.process_app"
+ ],
+ "locales": {
+ "zh-CN": {
+ "menu.app_observable.mysql": "MySQL应用观测",
+ "menu.app_observable.nginx": "Nginx应用观测",
+ "menu.app_observable.ntopo": "网络拓扑",
+ "menu.app_observable.process_app": "Java可观测",
+ "pages.app_observable.monitor_dashboard": "监控面板",
+ "pages.app_observable.abnormal_events": "异常事件"
+ },
+ "en-US": {
+ "menu.app_observable.ntopo": "Network Topology",
+ "menu.app_observable.mysql": "MySQL Observability",
+ "menu.app_observable.nginx": "Nginx Observability",
+ "menu.app_observable.process_app": "Java Observability",
+ "pages.app_observable.monitor_dashboard": "Monitor Dashboard",
+ "pages.app_observable.abnormal_events": "Abnormal Events"
+ }
+ }
+}
\ No newline at end of file
diff --git a/sysom_web/public/resource/app_observable/v1/mysql.json b/sysom_web/public/resource/app_observable/v1/mysql.json
new file mode 100644
index 0000000000000000000000000000000000000000..4ae4d13d5b9b5e7449376f88d6d814404ad817a6
--- /dev/null
+++ b/sysom_web/public/resource/app_observable/v1/mysql.json
@@ -0,0 +1,16 @@
+{
+ "menuName": "menu.app_observable.mysql",
+ "type": "multiGrafanaPannel",
+ "config": [
+ {
+ "pannelId": "mysql_monitor",
+ "pannelName": "pages.app_observable.monitor_dashboard",
+ "pannelUrl": "/grafana/d/hOk70b34k/app-mysql"
+ },
+ {
+ "pannelId": "mysql_event",
+ "pannelName": "pages.app_observable.abnormal_events",
+ "pannelUrl": "/grafana/d/Ub__1x3Vz/app-mysql-events"
+ }
+ ]
+}
\ No newline at end of file
diff --git a/sysom_web/public/resource/app_observable/v1/nginx.json b/sysom_web/public/resource/app_observable/v1/nginx.json
new file mode 100644
index 0000000000000000000000000000000000000000..8a2c4e2073d40da999ff311b12606aa9b153ee0b
--- /dev/null
+++ b/sysom_web/public/resource/app_observable/v1/nginx.json
@@ -0,0 +1,16 @@
+{
+ "menuName": "menu.app_observable.nginx",
+ "type": "multiGrafanaPannel",
+ "config": [
+ {
+ "pannelId": "nginx_monitor",
+ "pannelName": "pages.app_observable.monitor_dashboard",
+ "pannelUrl": "/grafana/d/6Mztrm4Ik/nginx"
+ },
+ {
+ "pannelId": "nginx_event",
+ "pannelName": "pages.app_observable.abnormal_events",
+ "pannelUrl": "/grafana/d/HtuWUeSSz/nginx-event"
+ }
+ ]
+}
\ No newline at end of file
diff --git a/sysom_web/public/resource/app_observable/v1/ntopo.json b/sysom_web/public/resource/app_observable/v1/ntopo.json
new file mode 100644
index 0000000000000000000000000000000000000000..a32715844c5946adad8ae3e2a41286207268dabf
--- /dev/null
+++ b/sysom_web/public/resource/app_observable/v1/ntopo.json
@@ -0,0 +1,9 @@
+{
+ "menuName": "menu.app_observable.ntopo",
+ "type": "singleGrafanaPannel",
+ "config": {
+ "pannelId": "ntopo",
+ "pannelName": "",
+ "pannelUrl": "/grafana/d/H04tHN34k/ntopo"
+ }
+}
\ No newline at end of file
diff --git a/sysom_web/public/resource/app_observable/v1/process_app.json b/sysom_web/public/resource/app_observable/v1/process_app.json
new file mode 100644
index 0000000000000000000000000000000000000000..c9fd381596c2bfd7162b7e49c56aadabef593345
--- /dev/null
+++ b/sysom_web/public/resource/app_observable/v1/process_app.json
@@ -0,0 +1,9 @@
+{
+ "menuName": "menu.app_observable.process_app",
+ "type": "singleGrafanaPannel",
+ "config": {
+ "pannelId": "process_app",
+ "pannelName": "",
+ "pannelUrl": "/grafana/d/FP_k0bqVz/process_app"
+ }
+}
\ No newline at end of file
diff --git a/sysom_web/public/resource/diagnose/v1/link/procdiag.json b/sysom_web/public/resource/diagnose/v1/link/procdiag.json
new file mode 100644
index 0000000000000000000000000000000000000000..8d39c9be0a903d668df3fb2173e61ecc169804f6
--- /dev/null
+++ b/sysom_web/public/resource/diagnose/v1/link/procdiag.json
@@ -0,0 +1,38 @@
+{
+ "servicename": "procdiag",
+ "version":1.0,
+ "taskform": [
+ {
+ "type": "select_host",
+ "name": "instance",
+ "initialValue": "",
+ "label": "实例IP",
+ "tooltips": "请输入你要诊断的IP"
+ },
+ {
+ "type": "text",
+ "name": "ipport",
+ "initialValue": "",
+ "label": "IP:Port",
+ "tooltips": "目标IP:端口"
+ },
+ {
+ "type": "text",
+ "name": "time",
+ "initialValue": "60",
+ "label": "诊断时长",
+ "tooltips": "输入诊断时间长度，单位秒"
+ }
+
+ ],
+ "variables": [],
+ "pannels": [
+ {
+ "key": "progdiag_data",
+ "type": "markdown",
+ "title": "应用诊断",
+ "datasource": "procdiag_data"
+ }
+ ]
+}
+
diff --git a/sysom_web/public/resource/diagnose/v1/locales.json b/sysom_web/public/resource/diagnose/v1/locales.json
index ffe97d45c6ed3d326fa0dde78df094cfd3b23906..c66977bcfd0422f64c2e83dd03ff90f49d8d8241 100644
--- a/sysom_web/public/resource/diagnose/v1/locales.json
+++ b/sysom_web/public/resource/diagnose/v1/locales.json
@@ -18,6 +18,7 @@
"menu.diagnose.storage.iolatency": "IO时延分析",
"menu.diagnose.storage.iofsstat": "IO流量分析",
"menu.diagnose.storage.iohang": "IO HANG诊断",
+ "menu.diagnose.storage.iodiagnose": "IO 一键诊断",
"menu.diagnose.custom.command": "命令诊断",
"menu.diagnose.custom.rca": "指标异常分析",
"menu.diagnose.net.packetdrop": "丢包诊断",
@@ -25,6 +26,7 @@
"menu.diagnose.net.retran": "重传诊断",
"menu.diagnose.net.pingtrace": "时延诊断",
"menu.diagnose.link.rtdelay": "RT时延分析",
- "menu.diagnose.link.jruntime": "java运行时分析"
+ "menu.diagnose.link.jruntime": "java运行时分析",
+ "menu.diagnose.link.procdiag": "应用抖动诊断"
}
}
diff --git a/sysom_web/public/resource/diagnose/v1/storage/iodiagnose.json b/sysom_web/public/resource/diagnose/v1/storage/iodiagnose.json
new file mode 100644
index 0000000000000000000000000000000000000000..3c43d716038546cf2bf91325e8a6c31a2a6bbbdd
--- /dev/null
+++ b/sysom_web/public/resource/diagnose/v1/storage/iodiagnose.json
@@ -0,0 +1,28 @@
+{
+ "servicename": "iodiagnose",
+ "version":1.0,
+ "taskform": [
+ {
+ "type": "select_host",
+ "name": "instance",
+ "initialValue": "",
+ "label": "实例IP",
+ "tooltips": "请输入你要诊断的IP,我们将在会这台机器内部发起IO诊断"
+ },
+ {
+ "type": "text",
+ "name": "timeout",
+ "initialValue": "30",
+ "label": "诊断时长",
+ "tooltips": "诊断时长,也是IO诊断统计周期,单位秒,不建议低于20秒"
+ }
+ ],
+ "pannels": [
+ {
+ "key": "overview",
+ "type": "table",
+ "title": "diagnose result",
+ "datasource": "overview"
+ }
+ ]
+}
diff --git a/sysom_web/public/resource/diagnose/v1/storage/iolatency.json b/sysom_web/public/resource/diagnose/v1/storage/iolatency.json
index df3d060fc68a8525953e7e4ed3661e84e108fac8..2e578b57887ae8e2dd7f849df395956472fd6ee7 100644
--- a/sysom_web/public/resource/diagnose/v1/storage/iolatency.json
+++ b/sysom_web/public/resource/diagnose/v1/storage/iolatency.json
@@ -55,8 +55,8 @@
"thresholds": {
"mode": "absolute",
"steps": [
- { "color": "red", "value": 1 },
- { "color": "green", "value": 0 }
+ { "color": "red", "value": 0 },
+ { "color": "green", "value": -1 }
]
}
}
diff --git a/sysom_web/public/resource/diagnose/v2/colocation/cpi.json b/sysom_web/public/resource/diagnose/v2/colocation/cpi.json
new file mode 100644
index 0000000000000000000000000000000000000000..f2b1acd79fe4e2b38add069f4311b66553e30ba8
--- /dev/null
+++ b/sysom_web/public/resource/diagnose/v2/colocation/cpi.json
@@ -0,0 +1,43 @@
+{
+ "servicename": "colocation_cpi",
+ "version": 1.0,
+ "taskform": [
+ {
+ "type": "select_host",
+ "name": "instance",
+ "initialValue": "",
+ "label": "实例IP",
+ "tooltips": "请输入你要诊断的IP， 我们将对这台机器的发起历史现场诊断"
+ },
+ {
+ "type": "text",
+ "name": "moment",
+ "initialValue": "",
+ "label": "时刻",
+ "tooltips": "我们将对该时刻的前5分钟内的混部CPI干扰进行诊断，不填写则对当前时刻进行诊断。时间字符串格式参考 '2024-01-01 00:00:00'"
+ }
+ ],
+ "variables": [],
+ "pannels": [
+ {
+ "key": "overview",
+ "type": "markdown",
+ "title": "诊断结果汇总",
+ "datasource": "overview"
+ },
+ {
+ "key": "container-table",
+ "type": "table",
+ "title": "容器信息",
+ "datasource": "container-table",
+ "tooltips": "容器维度干扰信息汇总 用于检查容器的受损程度以及受损原因"
+ },
+ {
+ "key": "disturb-timeseries",
+ "title": "时序信息",
+ "tooltips": "时序维度干扰信息汇总 用于对LLC以及内存带宽资源与干扰次数进行关联分析",
+ "datasource": "disturb-timeseries",
+ "type": "timeseries"
+ }
+ ]
+}
\ No newline at end of file
diff --git a/sysom_web/public/resource/diagnose/v2/colocation/serveutil.json b/sysom_web/public/resource/diagnose/v2/colocation/serveutil.json
new file mode 100644
index 0000000000000000000000000000000000000000..6b2d4785129ad3d442edba40d9f61ee9535d3e9e
--- /dev/null
+++ b/sysom_web/public/resource/diagnose/v2/colocation/serveutil.json
@@ -0,0 +1,36 @@
+{
+ "servicename": "colocation_serveutil",
+ "version": 1.0,
+ "taskform": [
+ {
+ "type": "select_host",
+ "name": "instance",
+ "initialValue": "",
+ "label": "实例IP",
+ "tooltips": "请输入你要诊断的IP， 我们将对这台机器发起历史现场诊断"
+ },
+ {
+ "type": "text",
+ "name": "moment",
+ "initialValue": "",
+ "label": "时刻",
+ "tooltips": "我们将对该时刻满足率干扰进行诊断，不填写则对当前时刻进行诊断。时间字符串格式为参考 '2024-01-01 00:00:00'"
+ }
+ ],
+ "variables": [],
+ "pannels": [
+ {
+ "key": "overview",
+ "type": "markdown",
+ "title": "诊断结果汇总",
+ "datasource": "overview"
+ },
+ {
+ "key": "container-table",
+ "type": "table",
+ "title": "受干扰容器详情",
+ "datasource": "container-table",
+ "tooltips": "受干扰容器详情"
+ }
+ ]
+}
\ No newline at end of file
diff --git a/sysom_web/public/resource/diagnose/v2/cpu/cpuhigh.json b/sysom_web/public/resource/diagnose/v2/cpu/cpuhigh.json
new file mode 100644
index 0000000000000000000000000000000000000000..d0d4b4031f57cf3f8bffab115f6b8d1850e48093
--- /dev/null
+++ b/sysom_web/public/resource/diagnose/v2/cpu/cpuhigh.json
@@ -0,0 +1,35 @@
+{
+ "servicename": "cpuhigh",
+ "version":1.0,
+ "taskform": [
+ {
+ "type": "select_host",
+ "name": "instance",
+ "initialValue": "",
+ "label": "实例IP",
+ "tooltips": "请输入你要诊断的IP， 我们将在会这台机器内部发起SysAK诊断"
+ },
+ {
+ "type": "text",
+ "name": "moment",
+ "initialValue": "2023-08-12 00:00:00",
+ "label": "时间",
+ "tooltips": "CPU冲高发生的时间点"
+ }
+ ],
+ "variables": [],
+ "pannels": [
+ {
+ "key": "cpuhighEvent",
+ "type": "stat",
+ "title": "Event overview",
+ "datasource": "cpuhighEventSummary"
+ },
+ {
+ "key": "cpuhighTable",
+ "type": "table",
+ "title": "cpu high Details",
+ "datasource": "cpuhighTable"
+ }
+ ]
+}
diff --git a/sysom_web/public/resource/diagnose/v2/cpu/loadtask.json b/sysom_web/public/resource/diagnose/v2/cpu/loadtask.json
new file mode 100644
index 0000000000000000000000000000000000000000..7d4fd02f8597fb36088a0a55a71f0bcb1b13b9d2
--- /dev/null
+++ b/sysom_web/public/resource/diagnose/v2/cpu/loadtask.json
@@ -0,0 +1,86 @@
+{
+ "servicename": "loadtask",
+ "version":1.0,
+ "taskform": [
+ {
+ "type": "select_host",
+ "name": "instance",
+ "initialValue": "",
+ "label": "实例IP",
+ "tooltips": "请输入你要诊断的IP， 我们将在会这台机器内部发起SysAK诊断"
+ }
+ ],
+ "variables": [],
+ "pannels": [
+ {
+ "key": "事件总览",
+ "type": "stat",
+ "title": "事件总览",
+ "datasource": "dataresult",
+ "fieldConfig": {
+ "mappings": [
+ {
+ "type": "value",
+ "options": {
+ "true": {
+ "color": "red",
+ "text": "异常"
+ },
+ "false": {
+ "color": "green",
+ "text": "正常"
+ }
+ }
+ }
+ ],
+ "thresholds": {
+ "mode": "absolute",
+ "steps": [
+ {
+ "color": "red",
+ "value": 20
+ },
+ {
+ "color": "green",
+ "value": 0
+ }
+ ]
+ },
+ "unit": ""
+ }
+ },
+ {
+ "key": "pieRow",
+ "type": "row",
+ "title": "测试行",
+ "datasource": "",
+ "children": [
+ {
+ "key": "alltasks",
+ "type": "piechart",
+ "title": "R/D状态进程数量",
+ "datasource": "datataskcount"
+ },
+ {
+ "key": "dtasks",
+ "type": "piechart",
+ "title": "D状态负载影响度",
+ "datasource": "datauninterruptload"
+ },
+ {
+ "key": "rtasks",
+ "type": "piechart",
+ "title": "R状态负载影响度",
+ "datasource": "datarunningload"
+ }
+ ]
+ },
+ {
+ "key": "火焰图",
+ "type": "svg",
+ "title": "调度火焰图",
+ "datasource": "dataflamegraph"
+ }
+ ]
+
+}
diff --git a/sysom_web/public/resource/diagnose/v2/cpu/readme b/sysom_web/public/resource/diagnose/v2/cpu/readme
new file mode 100644
index 0000000000000000000000000000000000000000..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391
diff --git a/sysom_web/public/resource/diagnose/v2/cpu/schedmoni.json b/sysom_web/public/resource/diagnose/v2/cpu/schedmoni.json
new file mode 100644
index 0000000000000000000000000000000000000000..9ea76e476ee4468729fc74b93dcd93183d3ba301
--- /dev/null
+++ b/sysom_web/public/resource/diagnose/v2/cpu/schedmoni.json
@@ -0,0 +1,49 @@
+{
+ "servicename": "schedmoni",
+ "version":1.0,
+ "taskform": [
+ {
+ "type": "select_host",
+ "name": "instance",
+ "initialValue": "",
+ "label": "实例IP",
+ "tooltips": "请输入你要诊断的IP， 我们将在会这台机器内部发起SysAK诊断"
+ },
+ {
+ "type": "text",
+ "name": "timeout",
+ "initialValue": "20",
+ "label": "诊断时间",
+ "tooltips": "本次的期望的诊断时间，默认20秒"
+ },
+ {
+ "type": "text",
+ "name": "threshold",
+ "initialValue": "20",
+ "label": "诊断阈值",
+ "tooltips": "延迟的阈值，超过这个阈值就记录，默认20ms"
+ }
+ ],
+ "variables": [],
+ "pannels": [
+ {
+ "key": "jitterEvent",
+ "type": "stat",
+ "title": "Event overview",
+ "datasource": "jitterEventSummary"
+ },
+ {
+ "key": "timeseriesTable",
+ "type": "timeseries",
+ "title": "Timeline Diagram",
+ "datasource": "jitterTimeSeries"
+ },
+ {
+ "key": "jitterTable",
+ "type": "table",
+ "title": "Scheduling Jitter Details",
+ "datasource": "jitterTable"
+ }
+ ]
+
+}
diff --git a/sysom_web/public/resource/diagnose/v2/cpu/taskprofile.json b/sysom_web/public/resource/diagnose/v2/cpu/taskprofile.json
new file mode 100644
index 0000000000000000000000000000000000000000..48c259cf803d8464f2d29c662bd169f02adf38e6
--- /dev/null
+++ b/sysom_web/public/resource/diagnose/v2/cpu/taskprofile.json
@@ -0,0 +1,29 @@
+{
+ "servicename": "taskprofile",
+ "version":1.0,
+ "taskform": [
+ {
+ "type": "select_host",
+ "name": "instance",
+ "initialValue": "",
+ "label": "实例IP",
+ "tooltips": "请输入你要诊断的IP,我们将在会这台机器内部发起应用占用cpu统计"
+ },
+ {
+ "type": "text",
+ "name": "timeout",
+ "initialValue": "5",
+ "label": "诊断时长",
+ "tooltips": "诊断时长,也是各应用占用cpu统计周期,单位分,建议不超过10分钟"
+ }
+ ],
+ "variables": [],
+ "pannels": [
+ {
+ "key": "appProfile",
+ "type": "table",
+ "title": "App profile result",
+ "datasource": "appProfile"
+ }
+ ]
+}
diff --git a/sysom_web/public/resource/diagnose/v2/custom/rca.json b/sysom_web/public/resource/diagnose/v2/custom/rca.json
new file mode 100644
index 0000000000000000000000000000000000000000..96560aef0b4def28601633f7da0c5e2dc6cfd3e6
--- /dev/null
+++ b/sysom_web/public/resource/diagnose/v2/custom/rca.json
@@ -0,0 +1,37 @@
+{
+ "servicename": "rca",
+ "version":1.0,
+ "taskform": [
+ {
+ "type": "select_host",
+ "name": "instance",
+ "initialValue": "",
+ "label": "实例IP",
+ "tooltips": "请输入你要诊断的IP"
+ },
+ {
+ "type": "text",
+ "name": "base_item",
+ "initialValue": "test_RT",
+ "label": "异常指标",
+ "tooltips": "异常指标的名字，如用户RT"
+ },
+ {
+ "type": "text",
+ "name": "time",
+ "initialValue": "",
+ "label": "异常时刻",
+ "tooltips": "请输入异常时间点，格式：2023-07-08 12:23:33"
+ }
+ ],
+ "variables": [],
+ "pannels": [
+ {
+ "key": "rca_result",
+ "type": "markdown",
+ "title": "",
+ "datasource": "RcaResult"
+ }
+ ]
+}
+
diff --git a/sysom_web/public/resource/diagnose/v2/link/jruntime.json b/sysom_web/public/resource/diagnose/v2/link/jruntime.json
new file mode 100644
index 0000000000000000000000000000000000000000..67f1b3ef3470819a07fa1c99abbf4260d1cb76c2
--- /dev/null
+++ b/sysom_web/public/resource/diagnose/v2/link/jruntime.json
@@ -0,0 +1,61 @@
+{
+ "servicename": "jruntime",
+ "version":1.0,
+ "taskform": [
+ {
+ "type": "select_host",
+ "name": "instance",
+ "initialValue": "",
+ "label": "实例IP",
+ "tooltips": "请输入你要诊断的IP"
+ },
+ {
+ "type": "text",
+ "name": "nums",
+ "initialValue": "3",
+ "label": "进程数量",
+ "tooltips": "请输入你需要诊断的进程数量,"
+ },
+ {
+ "type": "text",
+ "name": "pids",
+ "initialValue": "",
+ "label": "进程列表",
+ "tooltips": "进程列表，要用逗号隔开，进程数量和进程列表仅有一个参数有效"
+ },
+ {
+ "type": "select",
+ "name": "global",
+ "initialValue": "on",
+ "label": "全局热点",
+ "tooltips": "是否需要全局热点",
+ "options": [
+ {
+ "value": "on",
+ "label": "开启"
+ },
+ {
+ "value": "off",
+ "label": "关闭"
+ }
+ ]
+ }
+
+ ],
+ "variables": [],
+ "pannels": [
+ {
+ "key": "jruntime_data",
+ "type": "markdown",
+ "title": "",
+ "datasource": "jruntime_data"
+ },
+ {
+ "key": "jruntime_set",
+ "type": "svg",
+ "title": "运行时诊断结果",
+ "datasource": "svgdata"
+ }
+ ]
+}
+
diff --git a/sysom_web/public/resource/diagnose/v2/link/procdiag.json b/sysom_web/public/resource/diagnose/v2/link/procdiag.json
new file mode 100644
index 0000000000000000000000000000000000000000..8d39c9be0a903d668df3fb2173e61ecc169804f6
--- /dev/null
+++ b/sysom_web/public/resource/diagnose/v2/link/procdiag.json
@@ -0,0 +1,38 @@
+{
+ "servicename": "procdiag",
+ "version":1.0,
+ "taskform": [
+ {
+ "type": "select_host",
+ "name": "instance",
+ "initialValue": "",
+ "label": "实例IP",
+ "tooltips": "请输入你要诊断的IP"
+ },
+ {
+ "type": "text",
+ "name": "ipport",
+ "initialValue": "",
+ "label": "IP:Port",
+ "tooltips": "目标IP:端口"
+ },
+ {
+ "type": "text",
+ "name": "time",
+ "initialValue": "60",
+ "label": "诊断时长",
+ "tooltips": "输入诊断时间长度，单位秒"
+ }
+
+ ],
+ "variables": [],
+ "pannels": [
+ {
+ "key": "progdiag_data",
+ "type": "markdown",
+ "title": "应用诊断",
+ "datasource": "procdiag_data"
+ }
+ ]
+}
+
diff --git a/sysom_web/public/resource/diagnose/v2/link/rtdelay.json b/sysom_web/public/resource/diagnose/v2/link/rtdelay.json
new file mode 100644
index 0000000000000000000000000000000000000000..1ab6b88e71d2b93d734ff41c9dee936cdaa1f0ee
--- /dev/null
+++ b/sysom_web/public/resource/diagnose/v2/link/rtdelay.json
@@ -0,0 +1,46 @@
+{
+ "servicename": "rtdelay",
+ "version":1.0,
+ "taskform": [
+ {
+ "type": "select_host",
+ "name": "instance",
+ "initialValue": "",
+ "label": "实例IP",
+ "tooltips": "请输入你要诊断的IP"
+ },
+ {
+ "type": "text",
+ "name": "pid",
+ "initialValue": "",
+ "label": "应用进程号",
+ "tooltips": "请输入你需要诊断的应用进程号"
+ },
+ {
+ "type": "text",
+ "name": "server_pid",
+ "initialValue": "-1",
+ "label": "服务端进程号",
+ "tooltips": "请输入该应用访问的服务端进程号（-1为不跟踪服务端)"
+ },
+ {
+ "type": "text",
+ "name": "time",
+ "initialValue": "30",
+ "label": "诊断时长",
+ "tooltips": "请输入你需要诊断时长，单位秒"
+ }
+ ],
+ "variables": [],
+ "pannels": [
+ {
+ "key": "rt_request_set",
+ "type": "table",
+ "title": "请求RT时延分析",
+ "datasource": "request_set",
+ "tooltips": "时间单位为微秒"
+ }
+ ]
+}
+
+
diff --git a/sysom_web/public/resource/diagnose/v2/locales.json b/sysom_web/public/resource/diagnose/v2/locales.json
new file mode 100644
index 0000000000000000000000000000000000000000..9d01653b9029e1891eed4e1240eaee22373ee896
--- /dev/null
+++ b/sysom_web/public/resource/diagnose/v2/locales.json
@@ -0,0 +1,100 @@
+{
+ "version": 1.0,
+ "menus": [
+ "menu.diagnose.ossre",
+ "menu.diagnose.memory.memgraph",
+ "menu.diagnose.memory.filecache",
+ "menu.diagnose.memory.oomcheck",
+ "menu.diagnose.memory.clustermem",
+ "menu.diagnose.cpu.schedmoni",
+ "menu.diagnose.cpu.loadtask",
+ "menu.diagnose.storage.iolatency",
+ "menu.diagnose.storage.iofsstat",
+ "menu.diagnose.storage.iohang",
+ "menu.diagnose.storage.iodiagnose",
+ "menu.diagnose.net.packetdrop",
+ "menu.diagnose.net.jitter",
+ "menu.diagnose.net.retran",
+ "menu.diagnose.net.pingtrace",
+ "menu.diagnose.link.rtdelay",
+ "menu.diagnose.link.procdiag",
+ "menu.diagnose.link.jruntime",
+ "menu.diagnose.custom.rca",
+ "menu.diagnose.colocation.cpi",
+ "menu.diagnose.colocation.serveutil"
+ ],
+ "locales": {
+ "zh-CN": {
+ "menu.diagnose.ossre":"系统健康检查",
+ "menu.diagnose.memory": "内存诊断中心",
+ "menu.diagnose.storage": "存储诊断中心",
+ "menu.diagnose.net": "网络诊断中心",
+ "menu.diagnose.cpu": "调度诊断中心",
+ "menu.diagnose.link": "链路诊断中心",
+ "menu.diagnose.custom": "自定义诊断中心",
+ "menu.diagnose.colocation" : "混部诊断中心",
+ "menu.diagnose.memory.memgraph": "内存大盘",
+ "menu.diagnose.memory.filecache": "Cache分析",
+ "menu.diagnose.memory.oomcheck": "OOM诊断",
+ "menu.diagnose.memory.clustermem": "内存异常诊断",
+ "menu.diagnose.cpu.schedmoni": "调度抖动诊断",
+ "menu.diagnose.cpu.loadtask": "系统负载诊断",
+ "menu.diagnose.storage.iolatency": "IO时延分析",
+ "menu.diagnose.storage.iofsstat": "IO流量分析",
+ "menu.diagnose.storage.iohang": "IO HANG诊断",
+ "menu.diagnose.storage.iodiagnose": "IO 一键诊断",
+ "menu.diagnose.net.packetdrop": "丢包诊断",
+ "menu.diagnose.net.jitter": "抖动诊断",
+ "menu.diagnose.net.retran": "重传诊断",
+ "menu.diagnose.net.pingtrace": "时延诊断",
+ "menu.diagnose.link.rtdelay": "RT时延分析",
+ "menu.diagnose.link.jruntime": "java运行时分析",
+ "menu.diagnose.link.procdiag": "应用抖动诊断",
+ "menu.diagnose.custom.rca": "指标异常分析",
+ "menu.diagnose.colocation.cpi": "混部CPI干扰诊断",
+ "menu.diagnose.colocation.serveutil": "混部CFS满足率干扰诊断",
+
+ "pages.diagnose.ossre.ossre_result.inspect_items": "检查项目",
+ "pages.diagnose.ossre.ossre_result.status": "状态",
+ "pages.diagnose.ossre.ossre_result.abnormal_count": "异常数",
+ "pages.diagnose.ossre.ossre_result.inspect_result": "检查结果",
+ "pages.diagnose.ossre.ossre_result.options": "操作"
+ },
+ "en-US": {
+ "menu.diagnose.ossre":"System Diagnosis",
+ "menu.diagnose.memory": "Memory Diagnosis Center",
+ "menu.diagnose.storage": "Storage Diagnosis Center",
+ "menu.diagnose.net": "Network Diagnosis Center",
+ "menu.diagnose.cpu": "Scheduling Diagnosis Center",
+ "menu.diagnose.link": "Link Diagnosis Center",
+ "menu.diagnose.custom": "Custom Diagnosis Center",
+ "menu.diagnose.colocation": "Colocation Diagnosis Center",
+ "menu.diagnose.memory.memgraph": "Memory Graph",
+ "menu.diagnose.memory.filecache": "Cache Analysis",
+ "menu.diagnose.memory.oomcheck": "OOM Diagnosis",
+ "menu.diagnose.memory.clustermem": "Memory Exception Diagnosis",
+ "menu.diagnose.cpu.schedmoni": "Scheduling Jitter Diagnosis",
+ "menu.diagnose.cpu.loadtask": "Loadtask Diagnosis",
+ "menu.diagnose.storage.iolatency": "IO Latency Analysis",
+ "menu.diagnose.storage.iofsstat": "IO Traffic Analysis",
+ "menu.diagnose.storage.iohang": "IO HANG Diagnosis",
+ "menu.diagnose.storage.iodiagnose": "IO One-Click Diagnosis",
+ "menu.diagnose.net.packetdrop": "Packet Loss Diagnosis",
+ "menu.diagnose.net.jitter": "Jitter Diagnosis",
+ "menu.diagnose.net.retran": "Retransmission Diagnosis",
+ "menu.diagnose.net.pingtrace": "Latency Diagnosis",
+ "menu.diagnose.link.rtdelay": "RT Latency Analysis",
+ "menu.diagnose.link.jruntime": "Java Runtime Analysis",
+ "menu.diagnose.link.procdiag": "Application jitter Diagnosis",
+ "menu.diagnose.custom.rca": "Metric Exception Analysis",
+ "menu.diagnose.colocation.cpi": "Colocation CPI Disturb Diagnosis",
+ "menu.diagnose.colocation.serveutil": "Colocation CFS Satisfication Disturb Diagnosis",
+
+ "pages.diagnose.ossre.ossre_result.inspect_items": "Inspect Items",
+ "pages.diagnose.ossre.ossre_result.status": "Status",
+ "pages.diagnose.ossre.ossre_result.abnormal_count": "Abnormal Count",
+ "pages.diagnose.ossre.ossre_result.inspect_result": "Inspect Result",
+ "pages.diagnose.ossre.ossre_result.options": "Options"
+ }
+ }
+}
\ No newline at end of file
diff --git a/sysom_web/public/resource/diagnose/v2/memory/clustermem.json b/sysom_web/public/resource/diagnose/v2/memory/clustermem.json
new file mode 100644
index 0000000000000000000000000000000000000000..a2cd7d94d0a616619ca845c13e1f0b299100dab9
--- /dev/null
+++ b/sysom_web/public/resource/diagnose/v2/memory/clustermem.json
@@ -0,0 +1,64 @@
+{
+ "servicename": "clustermem",
+ "version":1.0,
+ "taskform": [
+ {
+ "type": "select_host",
+ "name": "instance",
+ "initialValue": "",
+ "label": "实例IP",
+ "tooltips": "请输入你要诊断的IP， 我们将会发起节点内存异常诊断"
+ },
+ {
+ "type": "text",
+ "name": "pod_name",
+ "initialValue": "",
+ "label": "Pod",
+ "tooltips": "请输入你要诊断的pod名字，我们将会发起pod内存异常诊断"
+ },
+ {
+ "type": "text",
+ "name": "time",
+ "initialValue": "",
+ "label": "异常时刻",
+ "tooltips": "请输入异常时间点，格式：2023-07-08 12:23:33"
+ },
+ {
+ "type": "text",
+ "name": "diagnosis_type",
+ "initialValue": "",
+ "label": "诊断类型",
+ "tooltips": "请输入诊断类型，内存高诊断/内存延时诊断"
+ }
+ ],
+ "variables": [],
+ "pannels": [
+ {
+ "key": "clustermem",
+ "type": "markdown",
+ "title": "诊断结果",
+ "datasource": "ClustermemResult"
+ },
+ {
+ "key": "mem_usage",
+ "type": "stat",
+ "title": "节点/Pod已用内存构成",
+ "datasource": "UsageResult",
+ "fieldConfig": {
+ "unit": "%"
+ }
+ },
+ {
+ "key": "podmem",
+ "type": "table",
+ "title": "缓存排序",
+ "datasource": "podmem",
+ "fieldConfig": {
+ "unit": "KB"
+ },
+ "tableConfig": {
+ "enableSortColumn": ["文件Cached大小"]
+ }
+ }
+ ]
+}
\ No newline at end of file
diff --git a/sysom_web/public/resource/diagnose/v2/memory/filecache.json b/sysom_web/public/resource/diagnose/v2/memory/filecache.json
new file mode 100644
index 0000000000000000000000000000000000000000..6462917dfd513d11a9569abb456d6e1fc3b23216
--- /dev/null
+++ b/sysom_web/public/resource/diagnose/v2/memory/filecache.json
@@ -0,0 +1,41 @@
+{
+ "servicename": "filecache",
+ "version":1.0,
+ "taskform": [
+ {
+ "type": "select_host",
+ "name": "instance",
+ "initialValue": "",
+ "label": "实例IP",
+ "tooltips": "请输入你要诊断的IP， 我们将在会这台机器内部发起SysAK诊断"
+ },
+ {
+ "type": "text",
+ "name": "value",
+ "initialValue": "",
+ "label": "容器",
+ "tooltips": "请输入你要诊断的容器ID,Pod名,cgroup"
+ },
+ {
+ "type": "select",
+ "name": "type",
+ "initialValue": "all",
+ "label": "诊断类型",
+ "tooltips": "请输入需要诊断的类型(容器,POD,cgroup, host, all(所有容器))",
+ "options":[{"value":"pod", "label":"pod"}, {"value":"container", "label":"container"},{"value":"cgroup", "label":"cgroup"}, {"value":"host", "label":"host"},{"value":"all", "label":"all"}]
+ }
+ ],
+ "variables": [],
+ "pannels": [
+ {
+ "key": "podmem",
+ "type": "table",
+ "title": "缓存排序",
+ "datasource": "podmem",
+ "fieldConfig": {
+ "unit": "KB"
+ }
+ }
+ ]
+
+}
diff --git a/sysom_web/public/resource/diagnose/v2/memory/memgraph.json b/sysom_web/public/resource/diagnose/v2/memory/memgraph.json
new file mode 100644
index 0000000000000000000000000000000000000000..83a28d31edc2686dbce233957f29dd58de495986
--- /dev/null
+++ b/sysom_web/public/resource/diagnose/v2/memory/memgraph.json
@@ -0,0 +1,95 @@
+{
+ "servicename": "memgraph",
+ "version":1.0,
+ "taskform": [
+ {
+ "type": "select_host",
+ "name": "instance",
+ "initialValue": "",
+ "label": "实例IP",
+ "tooltips": "请输入你要诊断的IP， 我们将在会这台机器内部发起SysAK诊断"
+ }
+ ],
+ "variables": [],
+ "pannels": [
+ {
+ "key": "memEvent",
+ "type": "stat",
+ "title": "MemEvent",
+ "datasource": "dataMemEvent",
+ "fieldConfig": {
+ "mappings": [
+ {
+ "type": "value",
+ "options": {
+ "OK": {
+ "color": "green",
+ "index": 0
+ },
+ "NG": {
+ "color": "red",
+ "index": 1
+ }
+ }
+ }
+ ],
+ "thresholds": {
+ "mode": "absolute",
+ "steps": [
+ {
+ "color": "red",
+ "value": 5
+ },
+ {
+ "color": "green",
+ "value": 0
+ }
+ ]
+ },
+ "unit": "%"
+ }
+ },
+ {
+ "key": "pieRow",
+ "type": "row",
+ "title": "测试行",
+ "datasource": "",
+ "children": [
+ {
+ "key": "memOverView",
+ "type": "piechart",
+ "title": "MemOverView",
+ "datasource": "dataMemOverView"
+ },
+ {
+ "key": "kerMem",
+ "type": "piechart",
+ "title": "KernelMem",
+ "datasource": "dataKerMem"
+ },
+ {
+ "key": "userMem",
+ "type": "piechart",
+ "title": "UserMem",
+ "datasource": "dataUserMem"
+ }
+ ]
+ },
+ {
+ "key": "procMemList",
+ "type": "table",
+ "title": "TaskTop",
+ "datasource": "dataProcMemList"
+ },
+ {
+ "key": "cacheList",
+ "type": "table",
+ "title": "CacheTop",
+ "datasource": "dataCacheList",
+ "fieldConfig": {
+ "unit": "KB"
+ }
+ }
+ ]
+
+}
diff --git a/sysom_web/public/resource/diagnose/v2/memory/oomcheck.json b/sysom_web/public/resource/diagnose/v2/memory/oomcheck.json
new file mode 100644
index 0000000000000000000000000000000000000000..3ba2c89d336e1c45cb72cb4c583b9588b6a50001
--- /dev/null
+++ b/sysom_web/public/resource/diagnose/v2/memory/oomcheck.json
@@ -0,0 +1,54 @@
+{
+ "servicename": "oomcheck",
+ "version":1.0,
+ "taskform": [
+ {
+ "type": "select_host",
+ "name": "instance",
+ "initialValue": "",
+ "label": "实例IP",
+ "tooltips": "请输入你要诊断的IP， 我们将在会这台机器内部发起SysAK诊断"
+ },
+ {
+ "type": "text",
+ "name": "time",
+ "initialValue": "",
+ "label": "诊断时间",
+ "tooltips": "请输入需要诊断OOM的时间点，默认为最近一次"
+ }
+ ],
+ "variables": [],
+ "pannels": [
+ {
+ "key": "oomAnalysis",
+ "type": "stat",
+ "title": "OOM Analysis",
+ "datasource": "oomAnalysis"
+ },
+ {
+ "key": "oomEvent",
+ "type": "stat",
+ "title": "OOM Diagnose Result",
+ "datasource": "oomResult"
+ },
+ {
+ "key": "oomDetail",
+ "type": "table",
+ "title": "OOM Diagnose Detail",
+ "datasource": "oomDetail",
+ "fieldConfig": {
+ "unit": "KB"
+ }
+ },
+ {
+ "key": "oomTask",
+ "type": "table",
+ "title": "OOM Tasks Detail",
+ "datasource": "oomTask",
+ "fieldConfig": {
+ "unit": "KB"
+ }
+ }
+ ]
+
+}
diff --git a/sysom_web/public/resource/diagnose/v2/multichannel.json b/sysom_web/public/resource/diagnose/v2/multichannel.json
new file mode 100644
index 0000000000000000000000000000000000000000..e30d171b977ccf3f4e60d36a2b775262ccf7945e
--- /dev/null
+++ b/sysom_web/public/resource/diagnose/v2/multichannel.json
@@ -0,0 +1,69 @@
+{
+ "version": 1.0,
+ "channels": [
+ {
+ "name": "ssh",
+ "label": "SSH通道",
+ "extra_params": {
+ "*": [
+ {
+ "type": "text",
+ "name": "channel",
+ "initialValue": "ssh",
+ "label": "通道类型",
+ "disabled": true
+ }
+ ]
+ }
+ },
+ {
+ "name": "offline",
+ "label": "离线通道",
+ "extra_params": {
+ "*": [
+ {
+ "type": "text",
+ "name": "channel",
+ "initialValue": "offline",
+ "label": "离线通道",
+ "disabled": true
+ },
+ {
+ "type": "text",
+ "name": "sysom_preprocess_post_wrapper",
+ "initialValue": "dummy",
+ "label": "命令包装器",
+ "disabled": false
+ }
+ ]
+ },
+ "override_params": {
+ "*": [
+ {
+ "type": "text",
+ "name": "instance",
+ "initialValue": "anonymous",
+ "label": "实例",
+ "tooltips": "请输入你要诊断的实例ID"
+ }
+ ],
+ "pingtrace": [
+ {
+ "type": "text",
+ "name": "origin_instance",
+ "initialValue": "anonymous",
+ "label": "源实例ID",
+ "tooltips": "请输入你要诊断的源实例ID， 我们将在会这台机器内部发起SysAK诊断"
+ },
+ {
+ "type": "text",
+ "name": "target_instance",
+ "initialValue": "anonymous",
+ "label": "目标实例ID",
+ "tooltips": "请输入你要诊断的目标实例ID， 我们将在会这台机器内部发起SysAK诊断"
+ }
+ ]
+ }
+ }
+ ]
+}
\ No newline at end of file
diff --git a/sysom_web/public/resource/diagnose/v2/net/jitter.json b/sysom_web/public/resource/diagnose/v2/net/jitter.json
new file mode 100644
index 0000000000000000000000000000000000000000..e0fe9503cf6ebca7a56c0f69b0aa3c5172a20754
--- /dev/null
+++ b/sysom_web/public/resource/diagnose/v2/net/jitter.json
@@ -0,0 +1,93 @@
+{
+ "servicename": "jitter",
+ "version": 1.0,
+ "taskform": [
+ {
+ "type": "select_host",
+ "name": "instance",
+ "initialValue": "",
+ "label": "实例IP",
+ "tooltips": "请输入你要诊断的IP， 我们将在会这台机器内部发起SysAK诊断"
+ },
+ {
+ "type": "text",
+ "name": "time",
+ "initialValue": "10",
+ "label": "运行时间",
+ "tooltips": "请输入你要诊断的时间，单位秒"
+ }
+ ],
+ "variables": [],
+ "pannels": [
+ {
+ "key": "flowchart",
+ "type": "flow",
+ "title": "发送端报文路径",
+ "flowconfigs": {
+ "nodes": [
+ {
+ "id": "send",
+ "x": "40",
+ "y": "40"
+ },
+ {
+ "id": "out",
+ "x": "340",
+ "y": "40"
+ },
+ {
+ "id" : "recv",
+ "x": "640",
+ "y": "40"
+ }
+ ],
+ "edges": [
+ {
+ "source": "send",
+ "target": {
+ "cell": "out",
+ "port": "right"
+ }
+ },
+ {
+ "source": "out",
+ "target": {
+ "cell": "recv",
+ "port": "right"
+ }
+ }
+ ]
+ },
+ "datasource": "senderflow"
+ },
+ {
+ "key": "flowchart",
+ "type": "flow",
+ "title": "接收端报文路径",
+ "flowconfigs": {
+ "nodes": [
+ {
+ "id": "recv",
+ "x": "40",
+ "y": "40"
+ },
+ {
+ "id" : "send",
+ "x": "40",
+ "y": "200"
+ }
+ ],
+ "edges": [
+ {
+ "source": "recv",
+ "target": {
+ "cell": "send",
+ "port": "top"
+ }
+ }
+ ]
+ },
+ "datasource": "receiverflow"
+ }
+ ]
+}
\ No newline at end of file
diff --git a/sysom_web/public/resource/diagnose/v2/net/packetdrop.json b/sysom_web/public/resource/diagnose/v2/net/packetdrop.json
new file mode 100644
index 0000000000000000000000000000000000000000..eaac1155a5e71e15287013e7cac94c9e30500289
--- /dev/null
+++ b/sysom_web/public/resource/diagnose/v2/net/packetdrop.json
@@ -0,0 +1,41 @@
+{
+ "servicename": "packetdrop",
+ "version": 1.0,
+ "taskform": [
+ {
+ "type": "select_host",
+ "name": "instance",
+ "initialValue": "",
+ "label": "实例IP",
+ "tooltips": "请输入你要诊断的IP， 我们将在会这台机器内部发起SysAK诊断"
+ },
+ {
+ "type": "text",
+ "name": "time",
+ "initialValue": "10",
+ "label": "运行时间",
+ "tooltips": "请输入你要诊断的时间，单位秒"
+ }
+ ],
+ "variables": [],
+ "pannels": [
+ {
+ "key": "packetDropEvent",
+ "type": "stat",
+ "title": "packetDrop overview",
+ "datasource": "packetDropSummary"
+ },
+ {
+ "key": "packetDropAnalysis",
+ "type": "table",
+ "title": "丢包根因分析",
+ "datasource": "packetDropAnalysis"
+ },
+ {
+ "key": "packetDropList",
+ "type": "table",
+ "title": "丢包详情列表",
+ "datasource": "packetDropList"
+ }
+ ]
+}
\ No newline at end of file
diff --git a/sysom_web/public/resource/diagnose/v2/net/pingtrace.json b/sysom_web/public/resource/diagnose/v2/net/pingtrace.json
new file mode 100644
index 0000000000000000000000000000000000000000..d1336128bc9e4f361924af568b6a6684a4387924
--- /dev/null
+++ b/sysom_web/public/resource/diagnose/v2/net/pingtrace.json
@@ -0,0 +1,138 @@
+{
+ "servicename": "pingtrace",
+ "version": 1.0,
+ "taskform": [
+ {
+ "type": "select_host",
+ "name": "origin_instance",
+ "initialValue": "",
+ "label": "源实例ip",
+ "tooltips": "请输入你要诊断的源实例IP， 我们将在会这台机器内部发起SysAK诊断"
+ },
+ {
+ "type": "text",
+ "name": "target_instance",
+ "initialValue": "",
+ "label": "目标实例ip",
+ "tooltips": "请输入你要诊断的目标实例IP， 我们将在会这台机器内部发起SysAK诊断"
+ },
+ {
+ "type": "text",
+ "name": "pkg_num",
+ "initialValue": "100",
+ "label": "追踪包数",
+ "tooltips": "请输入你要追踪的包数"
+ },
+ {
+ "type": "text",
+ "name": "time_gap",
+ "initialValue": "1000",
+ "label": "间隔毫秒数",
+ "tooltips": "请输入发包间隔"
+ },
+ {
+ "type": "select",
+ "name": "type",
+ "initialValue": "icmp",
+ "label": "报文协议",
+ "tooltips": "请输入报文协议(icmp,tcp,udp)",
+ "options":[{"value":"icmp", "label":"icmp"}, {"value":"tcp", "label":"tcp"},{"value":"udp", "label":"udp"}]
+ }
+ ],
+ "variables": [],
+ "pannels": [
+ {
+ "key": "pingtraceLatency",
+ "type": "flow",
+ "title": "Overall delay distribution",
+ "flowconfigs": {
+ "layout":{
+ "type": "grid",
+ "rows": "2",
+ "cols": "4"
+ },
+ "nodes": [
+ {
+ "id": "l_tx_kern",
+ "tips": "The time delay of the transmitting path in client OS kernel(unit: us)" ,
+ "col": 0,
+ "row": 0
+ },
+ {
+ "id": "l_tx_qdisc",
+ "tips":"The time delay of client OS kernel qdisc(unit: us)",
+ "col": 1,
+ "row": 0
+ },
+ {
+ "id": "l_tx_outlink",
+ "tips": "The time delay of outter link(unit: us)",
+ "col": 2,
+ "row": 0
+ },
+ {
+ "id": "r_tx_kern",
+ "tips": "The time delay of the transmitting path in server OS kernel(unit: us)",
+ "col": 3,
+ "row": 0
+ },
+ {
+ "id": "l_rx_inlink",
+ "tips": "The time delay of inner link(unit: us)",
+ "col": 3,
+ "row": 1
+ },
+ {
+ "id": "l_rx_kern",
+ "tips": "The time delay of the receiving path in client OS kernel(unit: us)",
+ "col": 2,
+ "row": 1
+ },
+ {
+ "id": "l_rx_task_waking",
+ "tips": "The time delay of pingtrace task wakeup(unit: us)",
+ "col": 1,
+ "row": 1
+ },
+ {
+ "id": "l_rx_task_queue",
+ "tips": "The time delay of pingtrace task queue(unit: us)",
+ "col": 0,
+ "row": 1
+ }
+ ],
+ "edges": [
+ {
+ "source": "l_tx_kern",
+ "target": "l_tx_qdisc"
+ },
+ {
+ "source": "l_tx_qdisc",
+ "target": "l_tx_outlink"
+ },
+ {
+ "source": "l_tx_outlink",
+ "target": "r_tx_kern"
+ },
+ {
+ "source": "r_tx_kern",
+ "target": "l_rx_inlink"
+ },
+ {
+ "source": "l_rx_inlink",
+ "target": "l_rx_kern"
+ },
+ {
+ "source": "l_rx_kern",
+ "target": "l_rx_task_waking"
+ },
+ {
+ "source": "l_rx_task_waking",
+ "target": "l_rx_task_queue"
+ }
+ ]
+ },
+ "datasource": "pingtraceFlow"
+ }
+ ]
+}
\ No newline at end of file
diff --git a/sysom_web/public/resource/diagnose/v2/net/readme b/sysom_web/public/resource/diagnose/v2/net/readme
new file mode 100644
index 0000000000000000000000000000000000000000..1080d80ef778b573d90b79c85df19015ce10a322
--- /dev/null
+++ b/sysom_web/public/resource/diagnose/v2/net/readme
@@ -0,0 +1 @@
+请在此文件夹添加网络相关的面板配置文件。
diff --git a/sysom_web/public/resource/diagnose/v2/net/retran.json b/sysom_web/public/resource/diagnose/v2/net/retran.json
new file mode 100644
index 0000000000000000000000000000000000000000..31206f18bf54a6b1b3d86429e666fe3d1d4042ab
--- /dev/null
+++ b/sysom_web/public/resource/diagnose/v2/net/retran.json
@@ -0,0 +1,75 @@
+{
+ "servicename": "retran",
+ "version": 1.0,
+ "taskform": [
+ {
+ "type": "select_host",
+ "name": "instance",
+ "initialValue": "",
+ "label": "实例IP",
+ "tooltips": "请输入你要诊断的IP， 我们将在会这台机器内部发起SysAK诊断"
+ },
+ {
+ "type": "text",
+ "name": "time",
+ "initialValue": "10",
+ "label": "运行时间",
+ "tooltips": "请输入你要诊断的时间，单位秒"
+ }
+ ],
+ "variables": [],
+ "pannels": [
+ {
+ "key": "retranSummary",
+ "type": "stat",
+ "title": "retran overview",
+ "datasource": "retranSummary"
+ },
+ {
+ "key": "portDistribution",
+ "type": "row",
+ "title": "port distribution",
+ "datasource": "portDistribution",
+ "children": [
+ {
+ "key": "sportDistribution",
+ "type": "piechart",
+ "title": "sourcePortDistribution",
+ "datasource": "sourcePortDistribution"
+ },
+ {
+ "key": "destPortDistribution",
+ "type": "piechart",
+ "title": "destPortDistribution",
+ "datasource": "destPortDistribution"
+ }
+ ]
+ },
+ {
+ "key": "ipDistribution",
+ "type": "row",
+ "title": "ip distribution",
+ "datasource": "ipDistribution",
+ "children": [
+ {
+ "key": "sourceIpDistribution",
+ "type": "piechart",
+ "title": "sourceIpDistribution",
+ "datasource": "sourceIpDistribution"
+ },
+ {
+ "key": "destIpDistribution",
+ "type": "piechart",
+ "title": "destIpDistribution",
+ "datasource": "destIpDistribution"
+ }
+ ]
+ },
+ {
+ "key": "retranList",
+ "type": "table",
+ "title": "重传详情列表",
+ "datasource": "retranList"
+ }
+ ]
+}
\ No newline at end of file
diff --git a/sysom_web/public/resource/diagnose/v2/ossre.json b/sysom_web/public/resource/diagnose/v2/ossre.json
new file mode 100644
index 0000000000000000000000000000000000000000..978352bb3a989b5e713200d1bd4d9eb1221b844c
--- /dev/null
+++ b/sysom_web/public/resource/diagnose/v2/ossre.json
@@ -0,0 +1,115 @@
+{
+ "servicename": "ossre",
+ "version": 1.0,
+ "taskform": [
+ {
+ "type": "select_host",
+ "name": "instance",
+ "initialValue": "",
+ "label": "实例IP",
+ "tooltips": "请输入你要诊断的IP"
+ }
+ ],
+ "variables": [],
+ "pannels": [
+ {
+ "key": "pieRow",
+ "type": "row",
+ "title": "总体检查情况",
+ "datasource": "",
+ "children": [
+ {
+ "key": "hostInfo",
+ "type": "markdown",
+ "title": "系统信息",
+ "datasource": "hostInfo"
+ },
+ {
+ "key": "checkItems",
+ "type": "piechart",
+ "title": "检查项",
+ "datasource": "checkItems"
+ }
+ ]
+ },
+ {
+ "key": "ossre_result",
+ "type": "table",
+ "title": "检查列表",
+ "datasource": "OssreResult",
+ "columns": [
+ {
+ "key": "inspect_items",
+ "title": "pages.diagnose.ossre.ossre_result.inspect_items",
+ "valueType": "text",
+ "width": 200
+ },
+ {
+ "key": "status",
+ "title": "pages.diagnose.ossre.ossre_result.status",
+ "valueEnum": {
+ "normal": {
+ "text": "正常",
+ "status": "Success"
+ },
+ "warning": {
+ "text": "告警",
+ "status": "Warning"
+ },
+ "error": {
+ "text": "异常",
+ "status": "Error"
+ },
+ "critical": {
+ "text": "严重异常",
+ "status": "Error"
+ }
+ },
+ "width": 100
+ },
+ {
+ "key": "abnormal_count",
+ "title": "pages.diagnose.ossre.ossre_result.abnormal_count",
+ "valueType": "digit",
+ "width": 100
+ },
+ {
+ "key": "inspect_result",
+ "title": "pages.diagnose.ossre.ossre_result.inspect_result",
+ "valueType": "text"
+ },
+ {
+ "key": "options",
+ "title": "pages.diagnose.ossre.ossre_result.options",
+ "valueType": "custom_options",
+ "width": 200
+ }
+ ],
+ "fieldConfig": {
+ "mappings": [
+ {
+ "type": "value",
+ "options": {
+ "critical": {
+ "color": "#FF000066",
+ "text": "严重异常"
+ },
+ "error": {
+ "color": "#FF663366",
+ "text": "异常"
+ },
+ "warning": {
+ "color": "#FF990066",
+ "text": "告警"
+ },
+ "normal": {
+ "color": "#00990066",
+ "text": "正常"
+ }
+ }
+ }
+ ]
+ }
+ }
+ ]
+}
diff --git a/sysom_web/public/resource/diagnose/v2/rca/.gitkeep b/sysom_web/public/resource/diagnose/v2/rca/.gitkeep
new file mode 100644
index 0000000000000000000000000000000000000000..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391
diff --git a/sysom_web/public/resource/diagnose/v2/storage/iodiagnose.json b/sysom_web/public/resource/diagnose/v2/storage/iodiagnose.json
new file mode 100644
index 0000000000000000000000000000000000000000..59ba88a6209bd84844b676ddd1f448c5b410184b
--- /dev/null
+++ b/sysom_web/public/resource/diagnose/v2/storage/iodiagnose.json
@@ -0,0 +1,35 @@
+{
+ "servicename": "iodiagnose",
+ "version":1.0,
+ "taskform": [
+ {
+ "type": "select_host",
+ "name": "instance",
+ "initialValue": "",
+ "label": "实例IP",
+ "tooltips": "请输入你要诊断的IP,我们将在会这台机器内部发起IO诊断"
+ },
+ {
+ "type": "text",
+ "name": "timeout",
+ "initialValue": "30",
+ "label": "诊断时长",
+ "tooltips": "诊断时长,也是IO诊断统计周期,单位秒,不建议低于30秒"
+ }
+ ],
+ "variables": [],
+ "pannels": [
+ {
+ "key": "iodiagnoseOverview",
+ "type": "table",
+ "title": "diagnose overview",
+ "datasource": "iodiagnoseOverview"
+ },
+ {
+ "key": "iodiagnoseDetail",
+ "type": "table",
+ "title": "diagnose result",
+ "datasource": "iodiagnoseDetail"
+ }
+ ]
+}
diff --git a/sysom_web/public/resource/diagnose/v2/storage/iofsstat.json b/sysom_web/public/resource/diagnose/v2/storage/iofsstat.json
new file mode 100644
index 0000000000000000000000000000000000000000..f63b8000c7261059faa67af7d870c2371496feed
--- /dev/null
+++ b/sysom_web/public/resource/diagnose/v2/storage/iofsstat.json
@@ -0,0 +1,60 @@
+{
+ "servicename": "iofsstat",
+ "version":1.0,
+ "taskform": [
+ {
+ "type": "select_host",
+ "name": "instance",
+ "initialValue": "",
+ "label": "实例IP",
+ "tooltips": "请输入你要诊断的IP,我们将在会这台机器内部发起IO流量统计"
+ },
+ {
+ "type": "text",
+ "name": "timeout",
+ "initialValue": "15",
+ "label": "诊断时长",
+ "tooltips": "诊断时长,也是IO流量统计周期,单位秒,建议不超过60秒"
+ },
+ {
+ "type": "text",
+ "name": "disk",
+ "initialValue": "",
+ "label": "目标磁盘",
+ "tooltips": "请输入你要诊断的磁盘,如vda,sda等等,缺省为所有磁盘"
+ }
+ ],
+ "variables": [
+ {
+ "key": "disks",
+ "label": "磁盘",
+ "datasource": "disks"
+ }
+ ],
+ "pannels": [
+ {
+ "key": "overview",
+ "type": "table",
+ "title": "diagnose result",
+ "datasource": "overview"
+ },
+ {
+ "key": "diskIOstat",
+ "type": "table",
+ "title": "Disk IO traffic analysis",
+ "datasource": "diskIOstat_${disks}"
+ },
+ {
+ "key": "taskIOstat",
+ "type": "table",
+ "title": "Process IO traffic analysis",
+ "datasource": "taskIOstat_${disks}"
+ },
+ {
+ "key": "taskIOblocksize",
+ "type": "table",
+ "title": "Process IO Block Size Distribution",
+ "datasource": "taskIOblocksize_${disks}"
+ }
+ ]
+}
diff --git a/sysom_web/public/resource/diagnose/v2/storage/iohang.json b/sysom_web/public/resource/diagnose/v2/storage/iohang.json
new file mode 100644
index 0000000000000000000000000000000000000000..cafec68a5db58e990516d0d11fad3d8c0ab0f3c5
--- /dev/null
+++ b/sysom_web/public/resource/diagnose/v2/storage/iohang.json
@@ -0,0 +1,71 @@
+{
+ "servicename": "iohang",
+ "version":1.0,
+ "taskform": [
+ {
+ "type": "select_host",
+ "name": "instance",
+ "initialValue": "",
+ "label": "实例IP",
+ "tooltips": "请输入你要诊断的IP,我们将在会这台机器内部发起IO HANG诊断"
+ },
+ {
+ "type": "text",
+ "name": "timeout",
+ "initialValue": "10",
+ "label": "诊断时长",
+ "tooltips": "请输入你要诊断的时长,单位秒"
+ },
+ {
+ "type": "text",
+ "name": "threshold",
+ "initialValue": "5000",
+ "label": "时间阈值",
+ "tooltips": "保留IO HANG住时间超过阈值的IO,单位毫秒"
+ },
+ {
+ "type": "text",
+ "name": "disk",
+ "initialValue": "",
+ "label": "目标磁盘",
+ "tooltips": "请输入你要诊断的磁盘,如vda,sda等等,缺省为所有磁盘"
+ }
+ ],
+ "variables": [
+ {
+ "key": "disks",
+ "label": "磁盘",
+ "datasource": "disks"
+ }
+ ],
+ "pannels": [
+ {
+ "key": "iohangOverview",
+ "type": "stat",
+ "title": "IO HANG overview",
+ "datasource": "iohangOverview_${disks}",
+ "fieldConfig": {
+ "mappings": [{
+ "type": "value",
+ "options": {
+ "normal": { "color": "green" },
+ "abnormal": { "color": "red" }
+ }
+ }],
+ "thresholds": {
+ "mode": "absolute",
+ "steps": [
+ { "color": "red", "value": 1 },
+ { "color": "green", "value": 0 }
+ ]
+ }
+ }
+ },
+ {
+ "key": "singleIO",
+ "type": "table",
+ "title": "More details of TOP 10 IO",
+ "datasource": "singleIO_${disks}"
+ }
+ ]
+}
diff --git a/sysom_web/public/resource/diagnose/v2/storage/iolatency.json b/sysom_web/public/resource/diagnose/v2/storage/iolatency.json
new file mode 100644
index 0000000000000000000000000000000000000000..c4b6615ef41bd0142416fd3c0635d1d0be80da3d
--- /dev/null
+++ b/sysom_web/public/resource/diagnose/v2/storage/iolatency.json
@@ -0,0 +1,128 @@
+{
+ "servicename": "iolatency",
+ "version":1.0,
+ "taskform": [
+ {
+ "type": "select_host",
+ "name": "instance",
+ "initialValue": "",
+ "label": "实例IP",
+ "tooltips": "请输入你要诊断的IP,我们将在会这台机器内部发起IO时延诊断"
+ },
+ {
+ "type": "text",
+ "name": "timeout",
+ "initialValue": "10",
+ "label": "诊断时长",
+ "tooltips": "请输入你要诊断的时长,单位秒"
+ },
+ {
+ "type": "text",
+ "name": "threshold",
+ "initialValue": "1000",
+ "label": "时间阈值",
+ "tooltips": "保留IO延迟大于设定时间阈值的IO（时间单位：ms）"
+ },
+ {
+ "type": "text",
+ "name": "disk",
+ "initialValue": "",
+ "label": "目标磁盘",
+ "tooltips": "请输入你要诊断的磁盘,如vda,sda等等,缺省为所有磁盘"
+ }
+ ],
+ "variables": [
+ {
+ "key": "disks",
+ "label": "磁盘",
+ "datasource": "disks"
+ }
+ ],
+ "pannels": [
+ {
+ "key": "iolatencyOverview",
+ "type": "stat",
+ "title": "Iolatency overview",
+ "datasource": "iolatencyOverview_${disks}",
+ "fieldConfig": {
+ "mappings": [{
+ "type": "value",
+ "options": {
+ "normal": { "color": "green" },
+ "abnormal": { "color": "red" }
+ }
+ }],
+ "thresholds": {
+ "mode": "absolute",
+ "steps": [
+ { "color": "red", "value": 0 },
+ { "color": "green", "value": -1 }
+ ]
+ }
+ }
+ },
+ {
+ "key": "iolatencyDistribution",
+ "type": "flow",
+ "title": "Overall delay distribution",
+ "flowconfigs": {
+ "layout":{
+ "type": "linear"
+ },
+ "nodes": [
+ {
+ "id": "os(block)",
+ "tips": "The time delay of the general block layer in OS kernel(unit: us)"
+ },
+ {
+ "id": "os(driver)",
+ "tips":"The time delay of OS kernel driver(unit: us)"
+ },
+ {
+ "id": "disk",
+ "tips": "The time delay of disk(unit: us)"
+ },
+ {
+ "id": "os(complete)",
+ "tips": "The time delay of io complete in OS kernel(unit: us)"
+ },
+ {
+ "id": "os(done)",
+ "tips": "The time delay of io done in OS kernel(unit: us)"
+ }
+ ],
+ "edges": [
+ {
+ "source": "os(block)",
+ "target": "os(driver)"
+ },
+ {
+ "source": "os(driver)",
+ "target": "disk"
+ },
+ {
+ "source": "disk",
+ "target": "os(complete)"
+ },
+ {
+ "source": "os(complete)",
+ "target": "os(done)"
+ }
+ ]
+ },
+ "datasource": "iolatencyDistribution_${disks}"
+ },
+ {
+ "key": "singleIOMetrics",
+ "type": "timeseries",
+ "title": "Single IO delay metrics display",
+ "datasource": "singleIOMetrics_${disks}"
+ },
+ {
+ "key": "singleIO",
+ "type": "table",
+ "title": "More details of TOP 10 IO",
+ "datasource": "singleIO_${disks}"
+ }
+ ]
+}
diff --git a/sysom_web/public/resource/diagnose/v2/storage/readme b/sysom_web/public/resource/diagnose/v2/storage/readme
new file mode 100644
index 0000000000000000000000000000000000000000..e2b3bc2b67115d2eae966922c6036e4101e248f9
--- /dev/null
+++ b/sysom_web/public/resource/diagnose/v2/storage/readme
@@ -0,0 +1 @@
+请在此文件夹添加IO相关的面板配置文件。
diff --git a/sysom_web/src/app.jsx b/sysom_web/src/app.jsx
index 56fc9cac66a5c9039e7f94ea765659f7e1f0b68e..89a200b5c2c3a834f53041617a27083186c0eb72 100644
--- a/sysom_web/src/app.jsx
+++ b/sysom_web/src/app.jsx
@@ -10,9 +10,10 @@ const loginPath = '/user/login';
const noNeedLoginRoutes = [
"/user/login",
"/diagnose/detail",
+ "/diagnose/custom/pannel",
]
-const isNeedLogin = function(path) {
+const isNeedLogin = function (path) {
return !noNeedLoginRoutes.find(item => path.startsWith(item))
}
@@ -107,6 +108,7 @@ export const layout = ({ initialState }) => {
let extraGrafanaRoutes = [];
let extraDiagnoseRoute = [];
+let extraAppObserverRoute = [];
// Saved menu_name -> service_name
// @see menuName => config/routes.js
// @see servierName => /api/v1/services/list
@@ -114,7 +116,7 @@ let menuNameMapServiceName = {
user: "sysom_api",
welcome: "sysom_api",
host: "sysom_api",
- journal: "sysom_api",
+ journal: "sysom_log",
monitor: "sysom_monitor_server",
vmcore: "sysom_vmcore",
diagnose: "sysom_diagnosis",
@@ -122,144 +124,196 @@ let menuNameMapServiceName = {
security: "sysom_vul",
hotfix: "sysom_hotfix",
alarm: "sysom_alarm",
+ app_observable: "sysom_monitor_server",
}
let enable_services = [];
-function customizer(objValue, srcValue) {
- if (_.isArray(objValue)) {
- return objValue.concat(srcValue);
+/**
+ *
+ * @param {*} routes
+ * @param {*} newRoute eg. /diagnose/cpu/schedmoni
+ */
+function addRoute(routes, newRoute, component) {
+ console.log(`Add route ${newRoute}`);
+ let rootPath = routes.find((item) => item.path == "/");
+ // filter(Boolean) is used to remove the empty string at the start
+ const parts = newRoute.split("/").filter(Boolean);
+ const paths = parts.reduce((acc, part, index) => {
+ const prevPath = index > 0 ? acc[index - 1] : '';
+ acc.push(prevPath + '/' + part);
+ return acc;
+ }, []);
+
+ let currentParent = rootPath;
+
+ // Add /diagnose, /diagnose/cpu if not exist
+ paths.forEach((path, index) => {
+ if (index < paths.length - 1) {
+ if (!_.keyBy(currentParent.routes, 'path')[path]) {
+ currentParent.routes.push({
+ path: path,
+ name: parts[index],
+ routes: [],
+ routes: [{
+ exact: true,
+ path: path,
+ redirect: paths[index + 1],
+ }],
+ });
+ console.log("redirect", {
+ path: path,
+ redirect: paths[index + 1],
+ })
+ }
+ currentParent = _.keyBy(currentParent.routes, 'path')[path];
+ }
+ });
+
+ // Add /diagnose/cpu/schedmoni
+ if (!_.keyBy(currentParent.routes, 'path')[newRoute]) {
+ currentParent.routes.push({
+ path: newRoute,
+ name: parts[parts.length - 1],
+ component: component
+ });
}
}
export function patchRoutes({ routes }) {
- //Insert the grafana dashboard item to monitor memu.
- routes.find((item) => item.path == "/").routes.find((item) => item.name == "monitor")
+ let rootPath = routes.find((item) => item.path == "/");
+
+ //Insert the grafana dashboard item to monitor memu.
+ rootPath.routes.find((item) => item.name == "monitor")
.routes.splice(-1, 0, ...extraGrafanaRoutes)
+ // Add diagnose routes
+ extraDiagnoseRoute.forEach(item => {
+ addRoute(routes, item.path, item.component)
+ });
+
+ // Add app_observer routes
+ extraAppObserverRoute.forEach(item => {
+ addRoute(routes, item.path, item.component)
+ });
+
+ // Filter the menu by enable_services
if (enable_services.length > 0) {
- let rootPath = routes.find((item) => item.path == "/")
- // for (let i = 0; i < rootPath.routes.length; i++) {
- // if (!!rootPath.routes[i].name && !!menuNameMapServiceName[rootPath.routes[i].name]) {
- // if (!enable_services.find(v => v == menuNameMapServiceName[rootPath.routes[i].name])) {
- // rootPath.routes[i].disabled = true
- // rootPath.routes[i].hideChildrenInMenu = true
- // // delete rootPath.routes[i]
- // }
- // }
- // // routes.routes = routes.routes.filter(item => !!item.name && enable_services.find(v => v == menuNameMapServiceName[item.name]))
- // }
rootPath.routes = rootPath.routes.filter(v => !menuNameMapServiceName[v.name] || enable_services.find(v2 => v2 == menuNameMapServiceName[v.name]))
}
+}
- //Find the array of diagonse's children. ex: io, net, memory
- let diagnose = routes.find((item) => item.path == "/")
- .routes.find(item => item.name == "diagnose")
+import grafanaDash from './pages/Monitor/grafana'
+import diagnose_component from './pages/diagnose/diagnose';
+import appobserver_component from './pages/app_observable';
- if (!!diagnose) {
- // Add forder
- extraDiagnoseRoute.map(item => {
- if (!_.keyBy(diagnose.routes, 'path')[item.path]) {
- // Add forder if not exist
- diagnose.routes = diagnose.routes.concat({
- ...item,
- routes: []
+export function render(oldRender) {
+ requestURL("/api/v1/cmg/services/list")
+ .then((res) => {
+ if (res.code == 200) {
+ res.data.map((item) => {
+ if (item.count > 0) { enable_services.push(item.service_name) }
})
}
+ localStorage.setItem("enableServices", enable_services)
})
-
- //Add The extraDiagnoseRoute in it.
- diagnose.routes.map(item => {
- const new_routes = _.keyBy(extraDiagnoseRoute, 'path')[item.path]?.routes
- if (item.routes && new_routes) {
- item.routes = item.routes.concat(new_routes);
-
- }
- if (!item.routes && new_routes) {
- item.routes = new_routes
+ .catch(err => {
+ message.error(err);
+ return Promise.resolve()
+ })
+ .then(() => {
+ //Add Grafana dashboard dynamically
+ const isMonitor = enable_services.find(val => {
+ return val === menuNameMapServiceName['monitor']
+ })
+ if (isMonitor) {
+ return requestURL('/api/v1/monitor/grafana/search')
+ } else {
+ return Promise.reject()
}
})
- }
-}
-
-import grafanaDash from './pages/Monitor/grafana'
-import diagnose from './pages/diagnose/diagnose';
-
-export function render(oldRender) {
- //Add Grafana dashboard dynamically
- requestURL('/api/v1/monitor/grafana/search')
.then((res) => {
- if (res["code"] != 0) {
- return Promise.reject(res["err"])
+ let arr = Object.keys(res)
+ if (arr.length > 0) {
+ if (res["code"] != 0) {
+ return Promise.reject(res["err"])
+ }
+ let datas = res["data"]
+ //Tranfrom from grafana folder&dashboard list to antd route tree.
+ extraGrafanaRoutes = datas.filter((i) => i.type == "dash-folder")
+ .map((folder) => {
+ //Add the title to locales to aviod initl FormattedMessage warning in antd core.
+ addLocale('zh-CN', { [`menu.monitor.${folder.title}`]: folder.title })
+ return {
+ path: `/monitor/${folder.uid}`,
+ name: folder.title,
+ routes: datas.filter((i) => i.type == "dash-db" && i.folderId == folder.id)
+ .map((dash) => {
+ addLocale('zh-CN', { [`menu.monitor.${folder.title}.${dash.title}`]: dash.title })
+ return {
+ name: dash.title,
+ path: `/monitor/${folder.uid}${dash.url}`,
+ component: grafanaDash
+ }
+ })
+ }
+ })
+ return Promise.resolve()
}
- let datas = res["data"]
- //Tranfrom from grafana folder&dashboard list to antd route tree.
- extraGrafanaRoutes = datas.filter((i) => i.type == "dash-folder")
- .map((folder) => {
- //Add the title to locales to aviod initl FormattedMessage warning in antd core.
- addLocale('zh-CN', { [`menu.monitor.${folder.title}`]: folder.title })
- return {
- path: `/monitor/${folder.uid}`,
- name: folder.title,
- routes: datas.filter((i) => i.type == "dash-db" && i.folderId == folder.id)
- .map((dash) => {
- addLocale('zh-CN', { [`menu.monitor.${folder.title}.${dash.title}`]: dash.title })
- return {
- name: dash.title,
- path: `/monitor/${folder.uid}${dash.url}`,
- component: grafanaDash
- }
- })
- }
- })
- return Promise.resolve()
})
.catch(err => {
- message.error("Grafana doesn't work!")
+ const isMonitor = enable_services.find(val => {
+ return val === menuNameMapServiceName['monitor']
+ })
+ if (isMonitor) { message.error("Grafana doesn't work!") }
return Promise.resolve()
})
.then(() => {
- return requestURL('/resource/diagnose/v1/locales.json')
+ return requestURL('/resource/diagnose/v2/locales.json')
})
.then((res) => {
- addLocale('zh-CN', res.folder)
- addLocale('zh-CN', res.dashboard)
- Object.entries(res.dashboard).map(item => {
- let configPath = item[0].split('.')
- configPath.shift()
+ // 1. Add diagnoses locales
+ Object.entries(res["locales"]).map(item => {
+ if (item[0] != "version") {
+ addLocale(item[0], item[1]);
+ }
+ });
- let path = []
- path.push({
+ // 2. Add diagnoses menu and components
+ extraDiagnoseRoute = [];
+ res["menus"].forEach(item => {
+ // menu.diagnose.memory.memgraph
+ let configPath = item.split('.');
+ // diagnose.memory.memgraph
+ configPath.shift();
+ console.log(configPath);
+ extraDiagnoseRoute.push({
path: `/${configPath.join('/')}`,
- name: configPath.pop(),
- f_: `/${configPath.join('/')}`,
- component: diagnose
+ component: diagnose_component
})
-
- let currentExtraDiagnoseRoute = _.chain(path).groupBy('f_').toPairs()
- .map(Item => _.merge(_.zipObject(["path", "routes"], Item), { "name": Item[0].split('/').pop() }))
- .value();
- let route_item = _.keyBy(extraDiagnoseRoute, 'path')[currentExtraDiagnoseRoute[0].path]
- if (!!route_item) {
- route_item.routes = route_item.routes.concat(currentExtraDiagnoseRoute[0].routes)
- } else {
- extraDiagnoseRoute = extraDiagnoseRoute.concat(currentExtraDiagnoseRoute)
- }
- })
- // Request services list, used to disable not running services
- return requestURL("/api/v1/monitor/services/list")
+ });
+ return requestURL("/resource/app_observable/v1/locales.json");
})
- .then(res => {
- if (res.code == 0) {
- for (let k in res.data) {
- if (res.data[k] > 0) {
- enable_services.push(k)
- }
+ .then((res) => {
+ // 1. Add app_observer locales
+ Object.entries(res["locales"]).map(item => {
+ if (item[0] != "version") {
+ addLocale(item[0], item[1]);
}
- }
- oldRender();
- })
- .catch(err => {
- console.log(err);
- oldRender();
+ });
+
+ // 2. Add app_observer menu and components
+ extraAppObserverRoute = [];
+ res["menus"].forEach(item => {
+ // menu.app_observable.ntopo
+ let configPath = item.split('.');
+ // app_observable.ntopo
+ configPath.shift();
+ console.log(configPath);
+ extraAppObserverRoute.push({
+ path: `/${configPath.join('/')}`,
+ component: appobserver_component
+ })
+ });
+ oldRender()
})
}
diff --git a/sysom_web/src/components/NoticeIcon/index.jsx b/sysom_web/src/components/NoticeIcon/index.jsx
index f3f0406af84e1d6650ff7dafb9c8d9f11d8d86d6..fc1532bfc4f34d3f41d5a5981673f08a1e0ca33d 100644
--- a/sysom_web/src/components/NoticeIcon/index.jsx
+++ b/sysom_web/src/components/NoticeIcon/index.jsx
@@ -47,6 +47,7 @@ const getNoticeData = (notices) => {
const NoticeIconView = () => {
const [socket, setSocket] = useState(null);
const [notices, setNotices] = useState([]);
+ const enableServices = localStorage.getItem("enableServices")
const initWebSocker = () => {
// 1. 获取未读告警
@@ -67,7 +68,8 @@ const NoticeIconView = () => {
}
useEffect(() => {
if (socket) { socket.colse }
- initWebSocker()
+ if (enableServices.includes("alarm")) { initWebSocker() }
+ // initWebSocker()
}, []);
if (socket) {
socket.onmessage = (e) => {
diff --git a/sysom_web/src/locales/en-US/menu.js b/sysom_web/src/locales/en-US/menu.js
index d839ba7f9032055fe88f9c37726ea0bbe3b2bbf6..b135f84835e2f8c5771902cabf07d0857fa672b1 100644
--- a/sysom_web/src/locales/en-US/menu.js
+++ b/sysom_web/src/locales/en-US/menu.js
@@ -122,7 +122,7 @@ export default {
'menu.editor.mind': 'Mind',
'menu.editor.koni': 'Koni',
'menu.diagnose': 'Diagnosis Center',
- 'menu.diagnose.oscheck': 'System Health Check',
+ // 'menu.diagnose.oscheck': 'System Health Check',
'menu.diagnose.cpu': 'Dispatch Diagnosis Center',
'menu.diagnose.cpu.loadtask': 'System Load Diagnosis',
'menu.diagnose.cpu.schedmoni': 'Scheduling Jitter Diagnosiss',
@@ -143,6 +143,7 @@ export default {
'menu.diagnose.custom.pannel': 'Task Panel Generation',
'menu.diagnose.custom': 'Custom Diagnostic Center',
'menu.diagnose.custom.command': 'Command Diagnostics',
+ 'menu.diagnose.query': 'Diagnosis Query',
'menu.journal': 'Log Center',
'menu.journal.audit': 'Audit Log',
'menu.journal.task': 'Mission Log',
@@ -156,8 +157,9 @@ export default {
'menu.diagnose.memory.market': 'RAM disk',
'menu.vmcore.analyse': 'Online Analysis',
'menu.app_observable': 'Application Observability',
- 'menu.app_observable.net_topo': 'Network Topology',
- 'menu.app_observable.mysql': 'MySQL',
- 'menu.app_observable.java': 'Java',
- 'menu.app_observable.process': 'Process Observability',
+ // 'menu.app_observable.net_topo': 'Network Topology',
+ // 'menu.app_observable.mysql': 'MySQL Observability',
+ // 'menu.app_observable.java': 'Java Observability',
+ // 'menu.app_observable.process': 'Process Observability',
+ // 'menu.app_observable.nginx': 'Nginx Observability',
};
diff --git a/sysom_web/src/locales/en-US/pages.js b/sysom_web/src/locales/en-US/pages.js
index d21b5184eadcb5cbe1a5365d2474ec0020e464c4..68ffc8ac2ece78e83f11836ec53f67cd7a64b026 100644
--- a/sysom_web/src/locales/en-US/pages.js
+++ b/sysom_web/src/locales/en-US/pages.js
@@ -128,6 +128,10 @@ export default {
'pages.alarm.list.alert_category_monitor': 'Monitor',
'pages.alarm.list.alert_category_application': 'Application',
'pages.alarm.list.alert_category_other': 'Other',
+ 'pages.alarm.list.alert_level': 'Level',
+ 'pages.alarm.list.alert_level_warning': 'Warning',
+ 'pages.alarm.list.alert_level_error': 'Error',
+ 'pages.alarm.list.alert_level_critical': 'Critical',
'pages.alarm.list.mark_as_read': 'Mark as read',
'pages.security.list.index': 'Serial Number',
'pages.security.list.cve_id': 'Serial Number',
@@ -399,6 +403,8 @@ export default {
'pages.diagnose.startdiagnosis': 'Start diagnosis',
'pages.diagnose.creationtime': 'Creation time',
'pages.diagnose.diagnosisID': 'Diagnosis ID',
+ 'pages.diagnose.diagnosisChannels': 'Diagnosis Channels',
+ 'pages.diagnose.diagnosisName': 'Diagnosis Name',
'pages.diagnose.diagnosisParams': 'Diagnosis parameters',
'pages.diagnose.diagnosisCommand': 'Diagnosis command',
'pages.diagnose.state': 'State',
@@ -406,6 +412,7 @@ export default {
'pages.diagnose.completediagnosis': 'Complete diagnosis',
'pages.diagnose.anomaly': 'Anomaly',
'pages.diagnose.operation': 'Operation',
+ 'pages.diagnose.reset': 'Reset',
'pages.diagnose.viewdiagnosisresults': 'Viewing diagnosis results',
'pages.diagnose.viewdiagnosisdetail': 'Viewing diagnosis detail',
'pages.diagnose.viewerrormessages': 'Viewing error messages',
diff --git a/sysom_web/src/locales/zh-CN/menu.js b/sysom_web/src/locales/zh-CN/menu.js
index 4c4f155135a5afb41b2c2985d3448849c2ac78e3..0ec7130147b95b2a79ba6dee8e6acedfbd96f5ed 100644
--- a/sysom_web/src/locales/zh-CN/menu.js
+++ b/sysom_web/src/locales/zh-CN/menu.js
@@ -72,7 +72,7 @@ export default {
'menu.editor.mind': '脑图编辑器',
'menu.editor.koni': '拓扑编辑器',
'menu.diagnose': '诊断中心',
- 'menu.diagnose.oscheck': '系统健康检查',
+ // 'menu.diagnose.oscheck': '系统健康检查',
'menu.diagnose.cpu': '调度诊断中心',
'menu.diagnose.cpu.loadtask': '系统负载诊断',
'menu.diagnose.cpu.schedmoni': '调度抖动诊断',
@@ -93,6 +93,7 @@ export default {
'menu.diagnose.custom.pannel': '诊断面板配置生成',
'menu.diagnose.custom': '自定义诊断中心',
'menu.diagnose.custom.command': '命令诊断',
+ 'menu.diagnose.query': '诊断查询',
'menu.journal': '日志中心',
'menu.journal.audit': '审计日志',
'menu.journal.task': '任务日志',
@@ -110,11 +111,14 @@ export default {
'menu.hotfix.formal': '热补丁列表',
'menu.hotfix.version': '自定义内核版本配置',
'menu.hotfix.selfdefine': '自定义热补丁制作',
+ 'menu.hotfix.released_hotfix': '历史发布热补丁列表',
'menu.hotfix.version.config': '操作系统配置',
'menu.hotfix.version.customize': '内核版本配置',
'menu.app_observable': '应用可观测',
- 'menu.app_observable.net_topo': '网络拓扑',
- 'menu.app_observable.mysql': 'MySQL',
- 'menu.app_observable.java': 'Java',
- 'menu.app_observable.process': '进程可观测',
+ // 'menu.app_observable.net_topo': '网络拓扑',
+ // 'menu.app_observable.mysql': 'MySQL可观测',
+ // 'menu.app_observable.java': 'Java可观测',
+ // 'menu.app_observable.process': '进程可观测',
+ // 'menu.app_observable.nginx': 'Nginx可观测',
+ // 'menu.app_observable.jitter': '抖动可观测'
};
\ No newline at end of file
diff --git a/sysom_web/src/locales/zh-CN/pages.js b/sysom_web/src/locales/zh-CN/pages.js
index 75faeb49f1a80ba7032b0a12b5ee7a1584483a52..f665e4b46d856e01203d21c9d478cd88f189bdaa 100644
--- a/sysom_web/src/locales/zh-CN/pages.js
+++ b/sysom_web/src/locales/zh-CN/pages.js
@@ -55,6 +55,7 @@ export default {
'pages.hostTable.password': '密码',
'pages.hostTable.password_required': '密码是必填项！',
'pages.hostTable.status': '主机状态',
+ 'pages.hostTable.status.ready': '准备中',
'pages.hostTable.status.offline': '离线',
'pages.hostTable.status.running': '运行中',
'pages.hostTable.status.abnormal': '异常',
@@ -129,6 +130,10 @@ export default {
'pages.alarm.list.alert_category_monitor': '监控告警',
'pages.alarm.list.alert_category_application': '应用告警',
'pages.alarm.list.alert_category_other': '其它告警',
+ 'pages.alarm.list.alert_level': '告警级别',
+ 'pages.alarm.list.alert_level_warning': '警告',
+ 'pages.alarm.list.alert_level_error': '错误',
+ 'pages.alarm.list.alert_level_critical': '严重',
'pages.alarm.list.mark_as_read': '标记已读',
'pages.security.list.index': '序号',
'pages.security.list.cve_id': '编号',
@@ -242,6 +247,17 @@ export default {
'pages.hotfix.tooltips.building_image': '请输出在构建改操作系统的热补丁时需要用到的构建镜像',
'pages.hotfix.tooltips.query_time': '输入查询时间,将会返回该时间以前所有的正式包hotfix',
'pages.hotfix.tooltips.source_code_method': '如果为git方式管理,请输入该内核版本的源码branch或tag;如果使用源码包,请填入源码包下载地址',
+ 'pages.hotfix.tooltips.hotfixid': '热补丁ID',
+ 'pages.hotfix.tooltips.released_kernelverison': '已经发布的该热补丁的内核版本号,包含架构信息',
+ 'pages.hotfix.tooltips.serious_level': '推荐安装的级别,推荐安装一般涉及到系统稳定性和安全性补丁,需要安装涉及明确和出现概率较大的系统稳定性和安全性补丁;其他级别用户可自行判断',
+ 'pages.hotfix.tooltips.fix_system': '该热补丁修复涉及的子系统',
+ 'pages.hotfix.tooltips.description': '该热补丁的发布描述',
+ 'pages.hotfix.tooltips.released_time': '该热补丁发布的时间',
+ 'pages.hotfix.tooltips.downloadlink': '补丁下载链接',
+ 'pages.hotfix.tooltips.deprecated': '如果为是,说明该热补丁已经被废弃,进一步信息可见废弃信息',
+ 'pages.hotfix.tooltips.deprecated_info': '用于描述该热补丁废弃的信息',
+ 'pages.hotfix.tooltips.modified_time': '热补丁信息修改时间',
+ 'pages.hotfix.tooltips.modufied_user': '热补丁信息修改的用户',
'pages.hotfix.confirm.cancel': '是否确定取消?',
'pages.hotfix.confirm.delete_kernelversion': '确定要删除该内核版本?',
'pages.hotfix.confirm.delete_ostype': '是否要删除该类型?注意,删除类型会连带删除该类型关联的所有内核版本!',
@@ -266,6 +282,25 @@ export default {
'pages.hotfix.building_image' : '该内核版本的构建镜像',
'pages.hotfix.use_src_rpm': '使用.src.rpm源码包',
'pages.hotfix.submit': '提交',
+ 'pages.hotfix.hotfixid': '热补丁ID',
+ 'pages.hotfix.released_kernel_version': '已发布的内核版本',
+ 'pages.hotfix.serious': '推荐级别',
+ 'pages.hotfix.description': '热补丁描述',
+ 'pages.hotfix.fix_system': '修复子系统',
+ 'pages.hotfix.released_time': '发布时间',
+ 'pages.hotfix.download_link': '下载链接',
+ 'pages.hotfix.download_link_error': '下载链接错误',
+ 'pages.hotfix.deprecated': '已废弃',
+ 'pages.hotfix.deprecated_info': '热补丁废弃信息',
+ 'pages.hotfix.modified_time': '最近修改时间',
+ 'pages.hotfix.modified_user': '修改的用户',
+ 'pages.hotfix.released_list': '已发布热补丁列表',
+ 'pages.hotfix.historicalfilter': '历史热补丁发布信息筛选',
+ 'pages.hotfix.create_hotfix_config': '添加HotFix发布信息',
+ 'pages.hotfix.create_hotfix': '添加hotfix',
+ 'pages.hotfix.serious_explain': '推荐信息简介',
+ 'pages.hotfix.edit_released_hotfix': '编辑Hotfix Released 配置',
+ 'pages.hotfix.bulk_import_hotfix_released': '批量导入hotfix released',
'pages.account.account_list': '账号列表',
'pages.account.username': '用户名',
'pages.account.password': '密码',
@@ -405,6 +440,8 @@ export default {
'pages.diagnose.startdiagnosis': '开始诊断',
'pages.diagnose.creationtime': '创建时间',
'pages.diagnose.diagnosisID': '诊断ID',
+ 'pages.diagnose.diagnosisChannels': '诊断通道',
+ 'pages.diagnose.diagnosisName': '诊断名称',
'pages.diagnose.diagnosisParams': '诊断参数',
'pages.diagnose.diagnosisCommand': '诊断命令',
'pages.diagnose.state': '状态',
@@ -412,9 +449,16 @@ export default {
'pages.diagnose.completediagnosis': '诊断完毕',
'pages.diagnose.anomaly': '异常',
'pages.diagnose.operation': '操作',
+ 'pages.diagnose.reset': '重置',
'pages.diagnose.viewdiagnosisresults': '查看诊断结果',
'pages.diagnose.viewdiagnosisdetail': '查看诊断详情',
'pages.diagnose.viewerrormessages': '查看出错信息',
+ 'page.diagnose.copycommand': 'copy 命令',
+ 'pages.diagnose.uploadtaskresult': '上传结果',
+ 'pages.diagnose.uploadtaskresultfrom': '上传任务结果表单',
+ 'pages.diagnose.offlinetaskresult': '离线任务结果',
+ 'pages.diagnose.offlinetaskresultannex': '离线任务附件',
+ 'pages.diagnose.selectencoding': '选择内容编码方式',
'pages.diagnose.nooperation': '暂无可用操作',
'pages.diagnose.checkitem': '检查项目',
'pages.diagnose.normal': '正常',
diff --git a/sysom_web/src/models/panelGenerator.js b/sysom_web/src/models/panelGenerator.js
deleted file mode 100644
index 87040551a3fe379dfc3c33e1e68042253d42bc05..0000000000000000000000000000000000000000
--- a/sysom_web/src/models/panelGenerator.js
+++ /dev/null
@@ -1,22 +0,0 @@
-import { useCallback, useState } from "react";
-
-export default () => {
- const [configStore, setConfigStore] = useState({
- servicename: 'test',
- taskform: [],
- pannels: [],
- version: 1
- })
- const [isDraggingNow, setIsDraggingNow] = useState(false)
- const changeConfigStore = useCallback((value) => {
- setConfigStore(() => {
- return value
- })
- }, [])
- return {
- configStore,
- setConfigStore,
- isDraggingNow,
- setIsDraggingNow
- }
-}
diff --git a/sysom_web/src/models/panelGeneratorGlobalVariables.js b/sysom_web/src/models/panelGeneratorGlobalVariables.js
deleted file mode 100644
index 71a0e086c16db055b0964e4cff914ad182b169db..0000000000000000000000000000000000000000
--- a/sysom_web/src/models/panelGeneratorGlobalVariables.js
+++ /dev/null
@@ -1,17 +0,0 @@
-import { useCallback, useState } from "react";
-
-export default () => {
- const [globalVariableStore, setGlobalVariableStore] = useState([{
- name: 'Example',
- value: 'Example Value'
- }])
- const changeGlobalVariableStore = useCallback((value) => {
- setGlobalVariableStore(() => {
- return value
- })
- }, [])
- return {
- globalVariableStore: globalVariableStore,
- setGlobalVariableStore: setGlobalVariableStore
- }
-}
diff --git a/sysom_web/src/models/panelGeneratorMock.js b/sysom_web/src/models/panelGeneratorMock.js
deleted file mode 100644
index 243d08524d8a5af314b1a43ee75d645a438fc99e..0000000000000000000000000000000000000000
--- a/sysom_web/src/models/panelGeneratorMock.js
+++ /dev/null
@@ -1,16 +0,0 @@
-import { useCallback, useState } from "react";
-
-export default () => {
- const [mockStore, setMockStore] = useState({
- datas:{}
- })
- const changeMockStore = useCallback((value) => {
- setMockStore(() => {
- return value
- })
- }, [])
- return {
- mockStore,
- setMockStore
- }
-}
diff --git a/sysom_web/src/pages/account/components/EditAccountModal.jsx b/sysom_web/src/pages/account/components/EditAccountModal.jsx
index b82ba45ffc3b42a483e2b56587e96163a164f4ee..3a20bce3dfea6e33b3d2e8c6befbda7e540d5d3f 100644
--- a/sysom_web/src/pages/account/components/EditAccountModal.jsx
+++ b/sysom_web/src/pages/account/components/EditAccountModal.jsx
@@ -80,12 +80,13 @@ const EditAccountModal = (props) => {
defaultMessage="username"
/>
}
- placeholder={
-
- }
+ // 国际化文件中缺少pages.account.input_username字段，导致找不到而渲染为[Object object]
+ // placeholder={
+ //
+ // }
rules={[
{
required: true,
@@ -124,12 +125,13 @@ const EditAccountModal = (props) => {
defaultMessage="description"
/>
}
- placeholder={
-
- }
+ // 国际化文件中缺少pages.account.input_description字段，导致找不到而渲染为[Object object]
+ // placeholder={
+ //
+ // }
/>
);
diff --git a/sysom_web/src/pages/alarm/list/index.jsx b/sysom_web/src/pages/alarm/list/index.jsx
index bde22ded117c06abcb3181a96749b039c1ff8e50..4361d9ae672071d1f20d2713257af40c9360e127 100644
--- a/sysom_web/src/pages/alarm/list/index.jsx
+++ b/sysom_web/src/pages/alarm/list/index.jsx
@@ -73,6 +73,31 @@ const AlarmDataList = () => {
},
},
},
+ {
+ title: ,
+ dataIndex: 'alert_level',
+ filters: true,
+ valueEnum: {
+ "WARNING": {
+ text: (
+
+ ),
+ status: 'Warning',
+ },
+ "ERROR": {
+ text: (
+
+ ),
+ status: 'Error',
+ },
+ "CRITICAL": {
+ text: (
+
+ ),
+ status: 'Error',
+ },
+ },
+ },
{
title: ,
dataIndex: 'labels',
diff --git a/sysom_web/src/pages/app_observable/components/multiGrafanaPannel.js b/sysom_web/src/pages/app_observable/components/multiGrafanaPannel.js
new file mode 100644
index 0000000000000000000000000000000000000000..e1abcb23444367e80ac244120f8f2ec4d15fc545
--- /dev/null
+++ b/sysom_web/src/pages/app_observable/components/multiGrafanaPannel.js
@@ -0,0 +1,138 @@
+import { Tabs } from 'antd';
+import { useState, useEffect, useRef} from 'react';
+import { useIntl } from 'umi';
+import GrafanaWrap from '../../Monitor/grafana'
+
+
+/**
+ * 封装 useState，使其具有 getState 方法，保证在回调函数中获取到的 state 值是最新的
+ * （由于闭包，直接在回调函数中使用state获取到的不是最新值）
+ * @param {*} initVal
+ * @reference https://www.haorooms.com/post/usegetstate_hooks
+ * @returns
+ */
+const useGetState = (initVal) => {
+ const [state, setState] = useState(initVal);
+ const ref = useRef(initVal);
+ const setStateCopy = (newVal) => {
+ ref.current = newVal;
+ setState(newVal);
+ }
+ const getState = () => ref.current;
+ return [state, setStateCopy, getState];
+}
+
+/**
+ * 多面板配置
+{
+ "menuName": "menu.app_observable.nginx",
+ "type": "multiGrafanaPannel",
+ "config": [
+ {
+ "pannelId": "nginx_monitor",
+ "pannelName": "pages.app_observable.monitor_dashboard",
+ "pannelUrl": "/grafana/d/6Mztrm4Ik/nginx"
+ },
+ {
+ "pannelId": "nginx_event",
+ "pannelName": "pages.app_observable.abnormal_events",
+ "pannelUrl": "/grafana/d/HtuWUeSSz/nginx-event"
+ }
+ ]
+}
+ * @param {*} props
+ */
+const MultiGrafanaPannel = (props) => {
+ const intl = useIntl();
+ let pannels = props.config
+ let pannelMap = {}
+ pannels.map((pannel) => {
+ pannelMap[pannel.pannelId] = pannel
+ })
+ let pannelGetter = {}
+ let pannelSetter = {}
+ pannels.map((pannel) => {
+ const [getter, setter] = useGetState(pannel.pannelUrl);
+ pannelGetter[pannel.pannelId] = getter
+ pannelSetter[pannel.pannelId] = setter
+ })
+
+ const [currentTab, setCurrentTab, getCurrentTab] = useGetState(pannels[0]["pannelId"]);
+
+ useEffect(() => {
+ const queryParams = !!props.location?.query ? props.location.query : {};
+ if ('_currentTab' in queryParams) {
+ let _currentTab = queryParams._currentTab;
+ if (_currentTab in pannelGetter) {
+ setCurrentTab(_currentTab);
+ }
+ }
+
+ // queryParams to query string
+ const queryStr = Object.keys(queryParams).map(key => key + '=' + queryParams[key]).join('&').trim();
+ if (queryStr.length > 0) {
+ for (let pannelId in pannelGetter) {
+ pannelSetter[pannelId](pannelMap[pannelId]["pannelUrl"] + `?${queryStr}`);
+ }
+ }
+ }, []);
+
+ let items = pannels.map((pannel) => {
+ return {
+ label: intl.formatMessage({
+ id: pannel.pannelName,
+ defaultMessage: pannel.pannelName,
+ }),
+ key: pannel.pannelId,
+ forceRender: true,
+ children: (
+
+ {
+ currentTab == pannel.pannelId ?
+ {
+ if (newUrl.trim() == "about:blank") {
+ return
+ }
+ if (getCurrentTab() == pannel.pannelId) {
+ let targetPannelId = pannel.pannelId;
+ for (let otherPannelId in pannelGetter) {
+ if (otherPannelId == pannel.pannelId) {
+ continue
+ }
+ pannelSetter[otherPannelId](newUrl.replace(pannelMap[pannel.pannelId]["pannelUrl"], pannelMap[otherPannelId]["pannelUrl"]));
+ if (newUrl.indexOf(pannelMap[otherPannelId]["pannelUrl"]) >= 0) {
+ targetPannelId = otherPannelId;
+ }
+ }
+ if (targetPannelId != pannel.pannelId) {
+ setCurrentTab(targetPannelId);
+ }
+ }
+ }}
+ urlChangeInvokeInterval={50}
+ />
+ :
+ {pannel.pannelId}
+ }
+
+ )
+ }
+ });
+
+ return (
+
+ {
+ setCurrentTab(key);
+ }}
+ />
+
+ )
+};
+
+export default MultiGrafanaPannel;
\ No newline at end of file
diff --git a/sysom_web/src/pages/app_observable/components/singleGrafanaPannel.js b/sysom_web/src/pages/app_observable/components/singleGrafanaPannel.js
new file mode 100644
index 0000000000000000000000000000000000000000..711014ffd67efdc0ad25779094ef722caed130f3
--- /dev/null
+++ b/sysom_web/src/pages/app_observable/components/singleGrafanaPannel.js
@@ -0,0 +1,39 @@
+import GrafanaWrap from '../../Monitor/grafana'
+
+/**
+ * 单面板配置
+{
+ "menuName": "menu.app_observable.ntopo",
+ "type": "multiGrafanaPannel",
+ "config": {
+ "pannelId": "ntopo",
+ "pannelName": "",
+ "pannelUrl": "/grafana/d/H04tHN34k/ntopo"
+ },
+ "locales": {
+ "zh-CN": {
+ "menu.app_observable.ntopo": "网络拓扑"
+ },
+ "en-US": {
+ "menu.app_observable.ntopo": "Network Topology"
+ }
+ }
+}
+ * @param {*} props
+ */
+const SingleGrafanaPannel = (props) => {
+ const queryParams = !!props.queryParams ? props.queryParams : {};
+ // queryParams to query string
+ const queryStr = Object.keys(queryParams).map(key => key + '=' + queryParams[key]).join('&').trim();
+ let targetUrl = props.config.pannelUrl;
+ if (queryStr.length > 0) {
+ targetUrl += `?${queryStr}`
+ }
+ return (
+
+
+
+ )
+};
+
+export default SingleGrafanaPannel;
\ No newline at end of file
diff --git a/sysom_web/src/pages/app_observable/index.js b/sysom_web/src/pages/app_observable/index.js
new file mode 100644
index 0000000000000000000000000000000000000000..fe85e16458d84acb173932d2e7cbd2889baa7b0f
--- /dev/null
+++ b/sysom_web/src/pages/app_observable/index.js
@@ -0,0 +1,42 @@
+import { useEffect, useState } from 'react';
+import { request } from 'umi';
+import MultiGrafanaPannel from './components/multiGrafanaPannel';
+import SingleGrafanaPannel from './components/singleGrafanaPannel';
+
+const components = {
+ "multiGrafanaPannel": MultiGrafanaPannel,
+ "singleGrafanaPannel": SingleGrafanaPannel
+}
+
+/**
+ * 应用观测动态渲染
+ * @returns
+ */
+const AppObservable = (props) => {
+ const [pannelConfig, setPannelConfig] = useState();
+ useEffect(() => {
+ console.log("useEffect");
+ // Get config
+ let urlslice = props.match.url.split("/");
+ urlslice.splice(2, 0, "v1");
+ request(`/resource${urlslice.join("/").toLowerCase()}.json`)
+ .then((res) => {
+ console.log("setPannelConfig", res);
+ setPannelConfig(res);
+ })
+ .catch((err) => {
+ console.log(err);
+ });
+ }, []);
+ if (!pannelConfig) {
+ return <>;
+ }
+ let pannelType = pannelConfig.type;
+ if (!(pannelType in components)) {
+ return <>;
+ }
+ let Component = components[pannelType];
+ return ();
+};
+
+export default AppObservable;
\ No newline at end of file
diff --git a/sysom_web/src/pages/app_observable/mysql/index.js b/sysom_web/src/pages/app_observable/mysql/index.js
index 93c1cf95b0cf2a7772971aebb2c93cb74f29953f..a7532ed8b9c750f01f5a610f6159051f4c78bd27 100644
--- a/sysom_web/src/pages/app_observable/mysql/index.js
+++ b/sysom_web/src/pages/app_observable/mysql/index.js
@@ -1,28 +1,5 @@
-import { Tabs } from 'antd';
-import { useState, useEffect, useRef } from 'react';
-import GrafanaWrap from '../../Monitor/grafana'
import { useIntl } from 'umi';
-
-const monitorPannelTargetUrlBase = '/grafana/d/hOk70b34k/app-mysql';
-const abnormalEventsTargetUrlBase = '/grafana/d/Ub__1x3Vz/app-mysql-events';
-
-/**
- * 封装 useState，使其具有 getState 方法，保证在回调函数中获取到的 state 值是最新的
- * （由于闭包，直接在回调函数中使用state获取到的不是最新值）
- * @param {*} initVal
- * @reference https://www.haorooms.com/post/usegetstate_hooks
- * @returns
- */
-const useGetState = (initVal) => {
- const [state, setState] = useState(initVal);
- const ref = useRef(initVal);
- const setStateCopy = (newVal) => {
- ref.current = newVal;
- setState(newVal);
- }
- const getState = () => ref.current;
- return [state, setStateCopy, getState];
-}
+import MultiGrafanaPannel from '../components/multiGrafanaPannel';
/**
* MySQL应用观测
@@ -30,100 +7,29 @@ const useGetState = (initVal) => {
*/
const AppObservableMysql = (props) => {
const intl = useIntl();
- const [monitorPannelTargetUrl, setMonitorPannelTargetUrl] = useState(monitorPannelTargetUrlBase);
- const [abnormalEventsTargetUrl, setAbnormalEventsTargetUrl] = useState(abnormalEventsTargetUrlBase);
- const [currentTab, setCurrentTab, getCurrentTab] = useGetState('monitor_panenl');
-
- useEffect(() => {
- const queryParams = !!props.location?.query ? props.location.query : {};
- console.log(queryParams);
- if ('_currentTab' in queryParams) {
- let _currentTab = queryParams._currentTab;
- if (_currentTab == 'abnormal_events') {
- setCurrentTab('abnormal_events');
- } else {
- setCurrentTab('monitor_panenl');
- }
- }
- // queryParams to query string
- const queryStr = Object.keys(queryParams).map(key => key + '=' + queryParams[key]).join('&').trim();
- if (queryStr.length > 0) {
- setMonitorPannelTargetUrl(monitorPannelTargetUrlBase + `?${queryStr}`);
- setAbnormalEventsTargetUrl(abnormalEventsTargetUrlBase + `?${queryStr}`);
- }
- }, []);
-
- const monitor_panenl = {
- label: intl.formatMessage({
- id: 'pages.app_observable.monitor_dashboard',
- defaultMessage: 'Monitor Dashboard',
- }),
- key: "monitor_panenl",
- forceRender: true,
- children: (
-
+ return (
+ {
- if (getCurrentTab() == 'monitor_panenl') {
- setAbnormalEventsTargetUrl(newUrl.replace(monitorPannelTargetUrlBase, abnormalEventsTargetUrlBase));
- if (newUrl.indexOf(abnormalEventsTargetUrlBase) >= 0) {
- setCurrentTab('abnormal_events');
- }
- }
- }}
- urlChangeInvokeInterval={100}
- />
- :
- monitor_panenl
- }
-
- )
- }
-
- const abnormal_events = {
- label: intl.formatMessage({
- id: 'pages.app_observable.abnormal_events',
- defaultMessage: 'Abnormal Events',
- }),
- key: "abnormal_events",
- forceRender: true,
- children: (
-
+ "pannelId": "mysql_monitor",
+ "pannelName": intl.formatMessage({
+ id: 'pages.app_observable.monitor_dashboard',
+ defaultMessage: 'Monitor Dashboard',
+ }),
+ "pannelUrl": '/grafana/d/hOk70b34k/app-mysql',
+ },
{
- currentTab == "abnormal_events" ?
- {
- if (getCurrentTab() == 'abnormal_events') {
- setMonitorPannelTargetUrl(newUrl.replace(abnormalEventsTargetUrlBase, monitorPannelTargetUrlBase));
- if (newUrl.indexOf(monitorPannelTargetUrlBase) >= 0) {
- setCurrentTab('monitor_panenl');
- }
- }
- }}
- urlChangeInvokeInterval={100}
- />
- :
- abnormal_events
+ "pannelId": "mysql_event",
+ "pannelName": intl.formatMessage({
+ id: 'pages.app_observable.abnormal_events',
+ defaultMessage: 'Abnormal Events',
+ }),
+ "pannelUrl": '/grafana/d/Ub__1x3Vz/app-mysql-events',
}
-
-
- )
- }
- return (
-
- {
- setCurrentTab(key);
- }}
- />
-
+ ]}
+ {...props}
+ />
)
};
+
export default AppObservableMysql;
\ No newline at end of file
diff --git a/sysom_web/src/pages/app_observable/nginx/index.js b/sysom_web/src/pages/app_observable/nginx/index.js
new file mode 100644
index 0000000000000000000000000000000000000000..1115344c015f273a8c07b6d9209744493934b129
--- /dev/null
+++ b/sysom_web/src/pages/app_observable/nginx/index.js
@@ -0,0 +1,34 @@
+import MultiGrafanaPannel from '../components/multiGrafanaPannel';
+import { useIntl } from 'umi';
+
+/**
+ * Nginx应用观测
+ * @returns
+ */
+const AppObservableNginx = (props) => {
+ const intl = useIntl();
+ return (
+
+ )
+};
+export default AppObservableNginx;
\ No newline at end of file
diff --git a/sysom_web/src/pages/diagnose/components/Dashboard.jsx b/sysom_web/src/pages/diagnose/components/Dashboard.jsx
index aaf7fdbb6b619b3f6c8bad397959789a050c8f35..e719cbff066f1b4fa8be69e263dfa52647cb87e8 100644
--- a/sysom_web/src/pages/diagnose/components/Dashboard.jsx
+++ b/sysom_web/src/pages/diagnose/components/Dashboard.jsx
@@ -19,7 +19,7 @@ const templateReplace = (template, Vars = []) => {
};
//parentData is for create local popup pannel by parent pannel
-const createPannel = (pannel, datas, globalVariables, showModalPannel, parentData = {},) => {
+const createPannel = (pannel, datas, globalVariables, refreshTask, showModalPannel, parentData = {}) => {
const pannelMap = {
stat: StatisticPannel,
row: RowPannel,
@@ -51,6 +51,7 @@ const createPannel = (pannel, datas, globalVariables, showModalPannel, parentDat
datas={datas}
globalVariables={globalVariables}
showModalPannel={showModalPannel}
+ refreshTask={refreshTask}
/>
)
}
@@ -69,7 +70,7 @@ const RowPannel = (props) => {
{
configs.children.map(pannel => (
- {createPannel(pannel, datas, globalVariables)}
+ {createPannel(pannel, datas, globalVariables, props.refreshTask)}
))}
@@ -139,8 +140,7 @@ const Dashboard = (props) => {
const [pannelModal, setPannelModal] = useState({ visible: false });
//parentData is for create local popup pannel by parent pannel
const showModalPannel = (pannel, parentData = {}) => {
- console.log("showModalPannel", parentData)
- const PopupModalPannel = createPannel(pannel, datas, globalVariables, showModalPannel, parentData)
+ const PopupModalPannel = createPannel(pannel, datas, globalVariables, props.refreshTask, showModalPannel, parentData)
setPannelModal({ visible: true, pannel: PopupModalPannel });
}
const handleOk = () => {
@@ -157,7 +157,7 @@ const Dashboard = (props) => {
{
pannels.map(pannel => {
const datasource = templateReplace(pannel.datasource, globalVariables)
- return createPannel(pannel, datas, globalVariables, showModalPannel)
+ return createPannel(pannel, datas, globalVariables, props.refreshTask, showModalPannel)
})
}
diff --git a/sysom_web/src/pages/diagnose/components/OfflineImportModal.jsx b/sysom_web/src/pages/diagnose/components/OfflineImportModal.jsx
index 51495a6a57f8b8a2571bacfdc84a2fb54b377870..d85190b43516c96207fc3f31c418dc53e942e7d2 100644
--- a/sysom_web/src/pages/diagnose/components/OfflineImportModal.jsx
+++ b/sysom_web/src/pages/diagnose/components/OfflineImportModal.jsx
@@ -1,4 +1,4 @@
-import { ModalForm, ProFormText, ProFormTextArea, ProFormSelect } from '@ant-design/pro-form';
+import { ModalForm, ProFormTextArea, ProFormDigit, ProFormText, ProFormSelect } from '@ant-design/pro-form';
import { forwardRef } from 'react';
import * as PropTypes from 'prop-types';
import { useIntl, FormattedMessage } from 'umi';
@@ -18,7 +18,10 @@ let OfflineImportModal = (props, ref) => {
visible,
modalWidth,
onVisibleChange,
- onFinish
+ onFinish,
+ taskForm,
+ serviceName,
+ queryParams,
} = props;
const intl = useIntl();
@@ -46,29 +49,50 @@ let OfflineImportModal = (props, ref) => {
})
}}
>
+
+ {
+ taskForm?.map(formItem => {
+ let value = formItem.name in queryParams ? queryParams[formItem.name] : ""
+ if (formItem.type == "text" || formItem.type == "select_host") {
+ return (< ProFormText
+ key={formItem.name}
+ name={formItem.name}
+ label={formItem.label}
+ value={value}
+ initialValue={!!value ? value : formItem.initialValue}
+ tooltip={formItem.tooltips}
+ disabled={!!formItem.disabled}
+ />);
+ } else if (formItem.type == "digit") {
+ return (< ProFormDigit
+ key={formItem.name}
+ name={formItem.name}
+ label={formItem.label}
+ value={value}
+ initialValue={!!value ? value : formItem.initialValue}
+ tooltip={formItem.tooltips}
+ disabled={!!formItem.disabled}
+ />);
+ } else if (formItem.type == "select") {
+ return (
+ < ProFormSelect
+ key={formItem.name}
+ name={formItem.name}
+ label={formItem.label}
+ value={value}
+ initialValue={!!value ? value : formItem.initialValue}
+ tooltip={formItem.tooltips}
+ options={formItem.options}
+ disabled={!!formItem.disabled}
+ />);
+ }
+ })
+ }
{
const configs = props.configs
const data = props.data
+ const task_data = props.datas;
+ const intl = useIntl();
+ const refreshTask = props.refreshTask;
//table background color render
- const bgColorRender = (text, record) => {
+ const bgColorRender = (elem, record) => {
+ let text = elem;
+ if (typeof (elem) === "object" && "props" in elem && "text" in elem.props && typeof (elem.props.text) === "string") {
+ text = elem.props.text;
+ }
const [value, color] = fieldModifier(configs.fieldConfig, text, record, data)
return {
@@ -22,34 +31,130 @@ const TablePannel = (props) => {
wordBreak: 'break-word'
}
},
- children: {value}
+ children: {
+ (typeof (elem) === "string") ?
+ value :
+ elem
+ }
}
}
let columns = [];
- if (!!data && data.length > 0) {
- let enableSortColumn = configs.tableConfig?.enableSortColumn;
-
- columns = data && Object.keys(data[0]).map((key) => {
- let res = {
- title: key,
- dataIndex: key,
- render: bgColorRender
+ if (!!configs.columns) {
+ columns = configs.columns;
+ for (let i = 0; i < columns.length; i++) {
+ let column = columns[i];
+ if (!column.dataIndex) {
+ column.dataIndex = column.key;
}
-
- if (!!enableSortColumn) {
- if (enableSortColumn.includes(key)) {
- res.sorter = (a, b) => a[key] - b[key]
+ if (column.title.startsWith("pages.diagnose")) {
+ column.title = intl.formatMessage({ id: column.title })
+ }
+ // column.render = bgColorRender;
+ column.render = bgColorRender;
+ if (column.valueType === "custom_options") {
+ column.render = (elem, record) => {
+ let operations = [];
+ if (column.key in record && typeof (record[column.key]) === "object") {
+ record[column.key].forEach((operation) => {
+ let key = operation.key
+ switch (operation.type) {
+ case "LINK":
+ operations.push(
+ {
+ {
+ window.open(operation.url)
+ }}>
+ {intl.formatMessage({
+ id: operation.label,
+ defaultMessage: operation.label
+ })}
+
+ }
+ )
+ break
+ case "DIAGNOSIS":
+ operations.push(
+ {
+ {
+ message.warning("Not support DIAGNOSIS opt now!")
+ }}>
+ {intl.formatMessage({
+ id: operation.label,
+ defaultMessage: operation.label
+ })}
+
+ }
+ )
+ break
+ case "INVOKE_DIAGNOSIS_HOOK":
+ // {
+ // "key":"ossre_xxx",
+ // "label":"屏蔽告警",
+ // "type":"INVOKE_DIAGNOSIS_HOOK",
+ // "params":{
+ // "xxx":"xxx"
+ // }
+ // }
+ operations.push(
+ {
+ {
+ invokeTaskHook({
+ task_id: task_data.task_id,
+ params: operation.params
+ })
+ .then(async (res) => {
+ if (refreshTask) {
+ await refreshTask(task_data)
+ }
+ })
+ .catch(err => {
+ console.log(err)
+ })
+ }}>
+ {intl.formatMessage({
+ id: operation.label,
+ defaultMessage: operation.label
+ })}
+
+ }
+ )
+ break
+ }
+ })
+ return
+ {
+ operations
+ }
+
+ }
}
}
+ }
+ } else {
+ if (!!data && data.length > 0) {
+ let enableSortColumn = configs.tableConfig?.enableSortColumn;
- return res;
- });
- }
+ columns = data && Object.keys(data[0]).map((key) => {
+ let res = {
+ title: key,
+ dataIndex: key,
+ render: bgColorRender
+ }
+
+ if (!!enableSortColumn) {
+ if (enableSortColumn.includes(key)) {
+ res.sorter = (a, b) => a[key] - b[key]
+ }
+ }
- //filter reserve keyword
- const keyword = ["key", "children"]
- columns = columns?.filter((col) => !keyword.includes(col.title))
+ return res;
+ });
+ //filter reserve keyword
+ const keyword = ["key", "children"]
+ columns = columns?.filter((col) => !keyword.includes(col.title))
+ }
+ }
return (
{
dataSource={data}
columns={columns}
search={false}
+ expandable={{
+ rowExpandable: record => record.children?.length > 0,
+ }}
style={{ marginTop: 16 }}
bordered
col
diff --git a/sysom_web/src/pages/diagnose/components/TaskForm.jsx b/sysom_web/src/pages/diagnose/components/TaskForm.jsx
index bda3278f7ab581a0745b899308cdf5c66d69a887..7f9a34af484f0d991bee6b988b9613852430c0d7 100644
--- a/sysom_web/src/pages/diagnose/components/TaskForm.jsx
+++ b/sysom_web/src/pages/diagnose/components/TaskForm.jsx
@@ -127,7 +127,7 @@ const TaskFrom = (props) => {
})
}
- */}
diff --git a/sysom_web/src/pages/diagnose/components/TaskList.jsx b/sysom_web/src/pages/diagnose/components/TaskList.jsx
index a5a1c034bc5a7cd3141d0f9084ecd6179916f858..3e6622cf9ded98de5f473430ac617fb5b520c6c0 100644
--- a/sysom_web/src/pages/diagnose/components/TaskList.jsx
+++ b/sysom_web/src/pages/diagnose/components/TaskList.jsx
@@ -2,16 +2,39 @@ import React from "react";
import ProTable from "@ant-design/pro-table";
import { useState, useRef, useImperativeHandle } from 'react';
import { getTaskList } from "../service";
-import { Tag, Space, Tabs } from 'antd';
+import { Tag, Space, Tabs, message } from 'antd';
import { useRequest, useIntl, FormattedMessage } from 'umi';
import { JsonView, allExpanded, darkStyles, defaultStyles } from 'react-json-view-lite';
+import UploadResultFormModal from './UploadResultFormModal'
import 'react-json-view-lite/dist/index.css';
import _ from "lodash";
+/**
+ * one click copy command
+ * @param {*} record data list item
+ */
+const copyCommandEvent = (record) => {
+ // Step one splicing jobs command, use '\ n' to split
+ let commandText = new String("");
+ for (let key in record.command.jobs) { commandText += `${record.command.jobs[key].cmd} \n` }
+
+ // Step two create virtually document element input
+ let oInput = document.createElement('input')
+ oInput.value = commandText;
+ document.body.appendChild(oInput)
+ oInput.select()
+ document.execCommand("Copy")
+ oInput.remove()
+
+ // Step three tip copy message
+ message.success("command copy success!")
+}
+
const TaskList = React.forwardRef((props, ref) => {
const actionRef = useRef([]);
const [listData, SetListData] = useState([])
+ const [interval, setInterval] = useState(5000);
const [currentTabs, setCurrentTabs] = useState({})
const intl = useIntl();
let columns = [
@@ -36,6 +59,7 @@ const TaskList = React.forwardRef((props, ref) => {
width: 150,
filters: true,
valueEnum: {
+ Ready: { text: , status: 'Ready' },
Running: { text: , status: 'Processing' },
Success: { text: , status: 'Success' },
Fail: { text: , status: 'Error' },
@@ -75,6 +99,15 @@ const TaskList = React.forwardRef((props, ref) => {
}}>
)
}
+ else if (record.status == "Running" && props.channel == "offline") {
+ operations.push( { ref.current?.reload() }} />)
+ // one click command copy
+ operations.push(
+ { copyCommandEvent(record) }}>
+
+
+ )
+ }
else if (record.status == "Fail") {
operations.push(
{
@@ -102,6 +135,7 @@ const TaskList = React.forwardRef((props, ref) => {
columns={columns}
pagination={{ showSizeChanger: true, pageSizeOptions: [5, 10, 20], defaultPageSize: 5 }}
search={props.search || false}
+ polling={interval}
tableStyle={{
wordWrap: 'break-word',
wordBreak: 'break-word'
@@ -109,16 +143,24 @@ const TaskList = React.forwardRef((props, ref) => {
// rowSelection={{
// defaultSelectedRowKeys: [],
// }}
- params={{ service_name: props.serviceName, channel: props.channel }}
+ params={{ service_name: props.serviceName, channel: props.channel, ...props.params }}
request={async (params, sort, filter) => {
if (Object.keys(sort).length != 0) {
const sort_key = Object.keys(sort)[0];
const _sort = sort[sort_key] === "ascend" ? sort_key : `-${sort_key}`
params['ordering'] = _sort
}
+
+ if (!_.isEmpty(params.params)) {
+ const newQueryParams = params.params.filter((item) => {
+ return !_.isEmpty(item) && !_.isEmpty(item.value)
+ })
+ params['params'] = JSON.stringify(newQueryParams)
+ }
const result = await getTaskList(params);
const tabMaps = {};
result.data.forEach(item => {
+ item.params["service_name"] = item.service_name
tabMaps[item.task_id] = "params"
})
setCurrentTabs(tabMaps)
@@ -164,27 +206,30 @@ const TaskList = React.forwardRef((props, ref) => {
})
}
return (
- {
- setCurrentTabs((preState) => {
- return {
- ...preState,
- [record.task_id]: key
- }
- });
- }}
- />
+ <>
+ {
+ setCurrentTabs((preState) => {
+ return {
+ ...preState,
+ [record.task_id]: key
+ }
+ });
+ }}
+ />
+
//
+ // }} />
)
},
showExpandColumn: true,
+ onExpand: (record, _) => { setInterval(record ? 0 : 5000) }
}}
/>
);
diff --git a/sysom_web/src/pages/diagnose/components/UploadResultFormModal.jsx b/sysom_web/src/pages/diagnose/components/UploadResultFormModal.jsx
new file mode 100644
index 0000000000000000000000000000000000000000..380f4be395d93c4ff0d4ae7cef647fc36a86d3f4
--- /dev/null
+++ b/sysom_web/src/pages/diagnose/components/UploadResultFormModal.jsx
@@ -0,0 +1,99 @@
+/*
+ * @Author: wb-msm241621
+ * @Date: 2023-12-25 11:04:40
+ * @LastEditTime: 2024-01-04 17:57:38
+ * @Description:
+ */
+
+import { ModalForm, ProFormText, ProFormTextArea, ProFormUploadDragger, ProFormSelect } from '@ant-design/pro-form'
+import { Button } from 'antd'
+import { useIntl, FormattedMessage } from 'umi';
+import { sbsOfflineTaskResult } from '../service'
+
+
+const UploadResultFormModal = (props) => {
+ const intl = useIntl()
+
+ const uploadResultEvent = async (params) => {
+ let status = true
+ if (params.content_encoding == "base64") {
+ params['results'] = btoa(params.results)
+ }
+ const formData = new FormData()
+ for (let key in params) {
+ if ('files' == key) {
+ const files = params[key].map((item) => { return item.originFileObj })
+ formData.append(key, files)
+ } else {
+ formData.append(key, params[key])
+ }
+ }
+
+ await sbsOfflineTaskResult(formData).then((res) => {
+ props.onSuccessCallBack()
+ }).catch((error) => {
+ status = false
+ })
+ return status
+ }
+
+ return
+
+ }
+ onFinish={async (params) => {
+ return await uploadResultEvent(params)
+ }}
+ >
+
+
+
+
+ { return false }
+ }}
+ />
+
+
+}
+
+export default UploadResultFormModal;
diff --git a/sysom_web/src/pages/diagnose/detail/index.jsx b/sysom_web/src/pages/diagnose/detail/index.jsx
index 0947ed535afc85c7211379a6b77935a582ef75e7..ce3687742d3aa8f1de5a03b7bb5450e52f0ac154 100644
--- a/sysom_web/src/pages/diagnose/detail/index.jsx
+++ b/sysom_web/src/pages/diagnose/detail/index.jsx
@@ -4,6 +4,7 @@ import { request } from 'umi';
import Dashboard from '../components/Dashboard';
import { getTask } from '../service'
import _ from "lodash";
+import menu from '@/locales/en-US/menu';
const DiagnoseDetai = (props) => {
const [pannelConfig, setPannelConfig] = useState({});
@@ -15,12 +16,13 @@ const DiagnoseDetai = (props) => {
const taskResult = await getTask(taskId);
const service_name = taskResult.service_name;
- const localesConfig = await request(`/resource/diagnose/v1/locales.json`)
- const dashboards = localesConfig.dashboard;
+ const localesConfig = await request(`/resource/diagnose/v2/locales.json`)
+ const menus = localesConfig.menus;
let pannelJsonUrl = ""
- for (let k in dashboards) {
- if (k.endsWith(service_name)) {
- pannelJsonUrl = `/resource/diagnose/v1${(k.split("menu.diagnose")[1].split(".")).join("/")}.json`
+ for (let i = 0; i < menus.length; i++) {
+ let menu = menus[i];
+ if (menu.endsWith(service_name)) {
+ pannelJsonUrl = `/resource/diagnose/v2${(menu.split("menu.diagnose")[1].split(".")).join("/")}.json`
break
}
}
@@ -37,6 +39,15 @@ const DiagnoseDetai = (props) => {
}, [])
+ const refreshTask = async (record) => {
+ const msg = await getTask(record.task_id);
+
+ // window.open(`/diagnose/detail/${record.task_id}`)
+
+ setData({ ...msg, ...msg.result });
+
+ }
+
return (
{
@@ -45,7 +56,9 @@ const DiagnoseDetai = (props) => {
variables={pannelConfig.variables}
serviceName={pannelConfig.servername}
pannels={pannelConfig.pannels}
- datas={data} />
+ datas={data}
+ refreshTask={refreshTask}
+ />
:
{data?.err_msg ? data.err_msg : data?.result}
}
diff --git a/sysom_web/src/pages/diagnose/diagnose.jsx b/sysom_web/src/pages/diagnose/diagnose.jsx
index 97ea0181afd4f9912251d7bbf572e638979353f6..ee4ed802ffa0f1d2d9d7a1142fa37ba54a4d44c7 100644
--- a/sysom_web/src/pages/diagnose/diagnose.jsx
+++ b/sysom_web/src/pages/diagnose/diagnose.jsx
@@ -18,8 +18,24 @@ const Diagnose = (props) => {
const refTaskList = useRef([]);
const [pannelConfig, setPannelConfig] = useState();
const [data, setData] = useState();
- const [offlineImportModalVisible, setOfflineImportModalVisible] = useState(false);
- const [offlineImportLoading, setOfflineImportLoading] = useState(false);
+ const [offlineImportModalVisible, setOfflineImportModalVisibles] = useState({
+ ssh: false
+ });
+ const setOfflineImportModalVisible = (channel, visible) => {
+ setOfflineImportModalVisibles({
+ ...offlineImportModalVisible,
+ [channel]: visible
+ })
+ };
+ const [offlineImportLoading, setOfflineImportLoadings] = useState({
+ ssh: false
+ });
+ const setOfflineImportLoading = (channel, loading) => {
+ setOfflineImportLoadings({
+ ...offlineImportLoading,
+ [channel]: loading
+ })
+ };
const [multichannelConfig, setMultichannelConfig] = useState([
{
"name": "ssh",
@@ -33,7 +49,7 @@ const Diagnose = (props) => {
const intl = useIntl();
useEffect(() => {
- request("/resource/diagnose/v1/multichannel.json")
+ request("/resource/diagnose/v2/multichannel.json")
.catch(err => {
return Promise.resolve({
"version": 1.0,
@@ -55,7 +71,7 @@ const Diagnose = (props) => {
// Get config
let urlslice = props.match.url.split("/")
- urlslice.splice(2, 0, "v1")
+ urlslice.splice(2, 0, "v2")
return request(`/resource${urlslice.join("/")}.json`)
})
.then((res) => {
@@ -78,28 +94,52 @@ const Diagnose = (props) => {
});
}
- let multiChannelTaskforms = multichannelConfig.map(item => {
- // const onListClick = async (record) => {
- // const recorded = record;
- // const msg = await getTask(record.task_id);
+ const refreshTask = async (record) => {
+ const msg = await getTask(record.task_id);
- // setData({ ...msg, ...msg.result });
+ // window.open(`/diagnose/detail/${record.task_id}`)
- // }
+ setData({ ...msg, ...msg.result });
- // const onPostTask = () => {
- // console.log("try reload", refTaskList)
- // refTaskList.current.reload();
- // }
+ }
+
+ let multiChannelTaskforms = multichannelConfig.map(item => {
+ let taskForm = [];
+ if (pannelConfig) {
+ taskForm = item.extra_params["*"].concat(pannelConfig.taskform)
+ // Whether override_params in item
+ if (item.override_params) {
+ if (item.override_params["*"]) {
+ // replace items in override_params["*"] by name
+ item.override_params["*"].forEach((item) => {
+ let index = taskForm.findIndex((i) => i.name == item.name);
+ if (index != -1) {
+ taskForm.splice(index, 1, item);
+ }
+ })
+ }
+ // traversal item.override_params except "*"
+ for (let key in item.override_params) {
+ if (key == pannelConfig.servicename) {
+ item.override_params[key].forEach((item) => {
+ let index = taskForm.findIndex((i) => i.name == item.name);
+ if (index != -1) {
+ taskForm.splice(index, 1, item);
+ }
+ })
+ }
+ }
+ }
+ }
return {
label: item.label,
key: item.name,
- forceRender: true,
+ destroyInactiveTabPane: true,
children: (
{pannelConfig && <>
{
@@ -108,21 +148,13 @@ const Diagnose = (props) => {
// refTaskList.current.reload();
}}
onOfflineLoad={() => {
- setOfflineImportModalVisible(true);
+ setOfflineImportModalVisible(item.name, true);
}}
/>
- {
- const recorded = record;
- const msg = await getTask(record.task_id);
-
- // window.open(`/diagnose/detail/${record.task_id}`)
-
- setData({ ...msg, ...msg.result });
-
- }}
+ (refTaskList.current[item.name] = el)} />
}
@@ -132,44 +164,55 @@ const Diagnose = (props) => {
variables={pannelConfig.variables}
serviceName={pannelConfig.servername}
pannels={pannelConfig.pannels}
- datas={data} />
+ datas={data}
+ refreshTask={refreshTask}
+ />
}
- {
- setOfflineImportLoading(true);
- let res = await offlineImport({
- ...value,
- "service_name": pannelConfig.servicename
- });
- if (res.code == 200) {
- message.success(
- intl.formatMessage({
- id: 'pages.diagnose.offline_import.success',
- defaultMessage: 'Import success',
- })
- );
- refTaskList.current[item.name].reload();
- } else {
- message.error(`${intl.formatMessage({
- id: 'pages.diagnose.offline_import.failed',
- defaultMessage: 'Import failed',
- })}：${res.message}`);
+ {/* {
+ pannelConfig &&
+
+ taskForm={item.extra_params["*"].concat(pannelConfig.taskform)}
+ serviceName={pannelConfig.servicename}
+ queryParams={props?.location?.query}
+ visible={!!item.name && !!offlineImportModalVisible[item.name] ? offlineImportModalVisible[item.name] : false}
+ onVisibleChange={(visible) => {
+ setOfflineImportModalVisible(item.name, visible);
+ }}
+ modalWidth="440px"
+ loading={!!item.name && !!offlineImportLoading[item.name] ? offlineImportLoading[item.name] : false}
+ onFinish={async (value) => {
+ setOfflineImportLoading(item.name, true);
+ let res = await offlineImport({
+ ...value,
+ "service_name": pannelConfig.servicename
+ });
+ if (res.code == 200) {
+ message.success(
+ intl.formatMessage({
+ id: 'pages.diagnose.offline_import.success',
+ defaultMessage: 'Import success',
+ })
+ );
+ refTaskList.current[item.name].reload();
+ } else {
+ message.error(`${intl.formatMessage({
+ id: 'pages.diagnose.offline_import.failed',
+ defaultMessage: 'Import failed',
+ })}：${res.message}`);
+ }
+ setOfflineImportLoading(item.name, false);
+ setOfflineImportModalVisible(item.name, false);
+ // setOfflineImportModalVisible(false);
+ }}
+ />
+ } */}
+ {listDom}
+ {action}
+
+ )
+ }
+ }
+ >
+
+
+ :
+
+
+
+
+
+ )
+}
diff --git a/sysom_web/src/pages/diagnose/query/index.jsx b/sysom_web/src/pages/diagnose/query/index.jsx
new file mode 100644
index 0000000000000000000000000000000000000000..cc6421ddbbffb7520ced6a1dfb233e545bedae4f
--- /dev/null
+++ b/sysom_web/src/pages/diagnose/query/index.jsx
@@ -0,0 +1,154 @@
+/*
+ * @Author: wb-msm241621
+ * @Date: 2024-03-05 17:12:08
+ * @LastEditTime: 2024-03-11 16:01:03
+ * @Description:
+ */
+import { PageContainer } from '@ant-design/pro-layout';
+import _ from 'lodash';
+import { request, FormattedMessage } from 'umi';
+import { Divider, Modal } from 'antd';
+import QueryForm from './components/QueryForm';
+import TaskList from '../components/TaskList';
+import Dashboard from '../components/Dashboard';
+import { useEffect, useState, useRef } from 'react';
+import { getTask } from '../service';
+
+
+/**
+ * @Description: 为元组插入元素到指定索引
+ * @param {*} tuple 指定元组
+ * @param {*} index 指定索引
+ * @param {*} value 需要插入的元素
+ * @return {*} newTuple 插入新元素后的元组
+ */
+function insertIntoTuple(tuple, index, value) {
+ if (index >= 0 && index <= tuple.length) {
+ let newTuple = tuple.slice();
+ newTuple.splice(index, 0, value);
+ return newTuple;
+ } else {
+ throw new Error("Error: index exceeds array range");
+ }
+}
+
+
+const DiagnoseQuery = () => {
+ const resultListRef = useRef([]);
+ const [multichannelConfig, setMultichannelConfig] = useState([
+ {
+ "name": "ssh",
+ "label": "SSH通道",
+ "extra_params": {
+ "*": []
+ }
+ }
+ ]);
+ const initialierQueryParams = {
+ task_id: "",
+ channel: "",
+ params: [{ "key": "instance", "value": "" }]
+ }
+ const [data, setData] = useState();
+ const [params, setParams] = useState(initialierQueryParams);
+ const [diagnoseMenus, setDiagnoseMenus] = useState([]);
+ const [pannelConfig, setPannelConfig] = useState();
+ const chanelEnum = new Object()
+ const [serviceNameEnum, setServiceNameEnum] = useState({})
+
+ useEffect(() => {
+ request("/resource/diagnose/v2/multichannel.json")
+ .catch(err => {
+ return new Promise.resolve({
+ "version": 1.0,
+ "channels": [
+ {
+ "name": "ssh",
+ "label": "SSH通道",
+ "extra_params": {
+ "*": []
+ }
+ }
+ ]
+ })
+ })
+ .then(res => {
+ setMultichannelConfig(res["channels"])
+ return request("/resource/diagnose/v2/locales.json")
+ })
+ .then(res => {
+ const { menus } = res;
+ const snMenu = new Object({})
+ menus.map(item => {
+ const itemTuple = _.split(item, '.')
+ const serviceName = itemTuple[itemTuple.length - 1]
+ snMenu[serviceName] = { text: }
+ })
+ setServiceNameEnum(snMenu)
+ const diagnosePaths = menus.map(item => {
+ const s = _.replace(item, "menu.", "")
+ const new_s = insertIntoTuple((_.split(s, ".")), 1, "v2")
+ return `/resource/${_.join(new_s, "/")}.json`
+ })
+ setDiagnoseMenus(diagnosePaths);
+ })
+ }, [])
+
+ multichannelConfig.map((value) => {
+ chanelEnum[value.name] = { text: value.label }
+ })
+
+ const onError = async (record) => {
+ // window.open(`/diagnose/detail/${record.task_id}`)
+ const msg = await getTask(record.task_id);
+ Modal.error({
+ title: '诊断失败',
+ content: (
+
+
错误信息: {msg?.err_msg ? msg.err_msg : msg?.result}
+
数据加载出错， 请检查后台返回
+ return
const baseconfig = {
xField: 'date',
diff --git a/sysom_web/src/pages/hotfix/FormalHotfixList/index.jsx b/sysom_web/src/pages/hotfix/FormalHotfixList/index.jsx
index d8563ede0a45b4354d29eb2be94f81d040a987af..ef17e436aac47b628b1f4b4616392575158432be 100644
--- a/sysom_web/src/pages/hotfix/FormalHotfixList/index.jsx
+++ b/sysom_web/src/pages/hotfix/FormalHotfixList/index.jsx
@@ -196,17 +196,17 @@ const FormalHotfixList = () => {
render: (_, record) => [
}
+ onFinish={ async (values) => {
+ let state = true
+ const fileObj = values.file[0].originFileObj
+ await bulkImportUploadHandler(fileObj).then((result) => {
+ successCallBack()
+ }).catch((e) => {
+ state = false
+ })
+ return state
+ }}
+ >
+
+
+ { return false }
+ }}
+ />
+
+
+
+
+
+
+
+}
+
+export default BulkImportReleased;
diff --git a/sysom_web/src/pages/hotfix/components/CreateReleasedHotFixForm.jsx b/sysom_web/src/pages/hotfix/components/CreateReleasedHotFixForm.jsx
new file mode 100644
index 0000000000000000000000000000000000000000..34728a516343f2feedf199371908a6616431e4f1
--- /dev/null
+++ b/sysom_web/src/pages/hotfix/components/CreateReleasedHotFixForm.jsx
@@ -0,0 +1,233 @@
+import { useState, useRef } from 'react';
+import { Button, Col, Row } from "antd";
+import { PlusOutlined } from "@ant-design/icons";
+import { ModalForm, ProFormText, ProFormSelect, ProFormSwitch, ProFormDateTimePicker, ProForm, ProFormTextArea } from "@ant-design/pro-form";
+import { useIntl, FormattedMessage } from 'umi';
+import { submitReleasedHotfixInfo } from '../service'
+
+
+const CreateReleasedHotFixForm = (props) => {
+ const intl = useIntl();
+ const hotfixReleasedFormRef = useRef();
+ const [isScrap, setIsScrap] = useState(true);
+ const deprecatedSwitchHandler = (e) => { setIsScrap(!isScrap) }
+ return (
+
+
+
+
+ }
+ onFinish={async (value) => {
+ const result = await submitReleasedHotfixInfo(value)
+ if (result.code === 200) {
+ hotfixReleasedFormRef.current?.resetFields()
+ props.addHotfixReleasedSuccess()
+ } else { }
+ return true
+ }}
+ >
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ ),
+ }
+ ]}
+ />
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ )
+}
+
+export default CreateReleasedHotFixForm;
\ No newline at end of file
diff --git a/sysom_web/src/pages/hotfix/components/CustomDetail.jsx b/sysom_web/src/pages/hotfix/components/CustomDetail.jsx
new file mode 100644
index 0000000000000000000000000000000000000000..cca00ce2355afa0b618a6d876ef57242410cdc1b
--- /dev/null
+++ b/sysom_web/src/pages/hotfix/components/CustomDetail.jsx
@@ -0,0 +1,39 @@
+import { useState } from 'react';
+import { Modal, Tooltip, Empty } from 'antd';
+
+/*
+ * 展示字段详情
+ * @param tableText 表格字段显示内容
+ * @param detail 需要展示的详情内容
+ * @param title 展示Modal框的标题
+ * @param isEllipsis 表格显示字段是否因太长, 使用省略号显示
+ */
+const CustomDetail = (props) => {
+ const { tableText, detail, title, isEllipsis } = props;
+ const [isOpenDetailModal, setIsOpenDetailModal] = useState(false);
+ const openDetailModalEvent = () => { setIsOpenDetailModal(true) }
+ const closeDetailModalEvent = () => { setIsOpenDetailModal(false) }
+ const style = { width: '50px', whiteSpace: 'nowrap', overflow: 'hidden', textOverflow: 'ellipsis', cursor: 'pointer', margin: '0px', padding: '0px'}
+
+ return (<>
+
+
+ { tableText }
+
+
+
+
+ { detail.length >0 ? detail : }
+
+
+ )
+}
+
+export default CustomDetail;
diff --git a/sysom_web/src/pages/hotfix/components/EditReleasedHotfixForm.jsx b/sysom_web/src/pages/hotfix/components/EditReleasedHotfixForm.jsx
new file mode 100644
index 0000000000000000000000000000000000000000..34c361779e3287d43a055cc7d5e539a3a79d63ec
--- /dev/null
+++ b/sysom_web/src/pages/hotfix/components/EditReleasedHotfixForm.jsx
@@ -0,0 +1,213 @@
+/*
+ * @Author: wb-msm241621
+ * @Date: 2023-12-06 18:07:26
+ * @LastEditTime: 2024-01-03 11:04:50
+ * @Description:
+ */
+import { useState, useRef } from 'react';
+import { Button } from "antd";
+import { EditOutlined } from "@ant-design/icons";
+import { DrawerForm, ProFormText, ProFormSelect, ProFormSwitch, ProFormDateTimePicker, ProFormTextArea } from "@ant-design/pro-form";
+import { useIntl, FormattedMessage } from 'umi';
+import { updateChangeReleasedHotfixInfo } from '../service'
+
+
+const EditReleasedHotfixForm = (props) => {
+ const intl = useIntl();
+ const editReleasedHotfixFormRef = useRef()
+ const [readonlyone, setReadonlyOne] = useState(!props.record.deprecated);
+ const KernelConfigChange = (e) => { setReadonlyOne(!e); }
+ return }>
+ {intl.formatMessage({ id: 'pages.hotfix.edit', defaultMessage: "Edit" })}
+
+ }
+ onFinish={async (value) => {
+ value['id'] = props.record.id
+ const result = await updateChangeReleasedHotfixInfo(props.record.id, value)
+ if (result.success) { props.editHotfixReleasedSuccess() } else { }
+ return true
+ }}
+ initialValues={props.record}
+ >
+
+
+
+
+
+
+
+ ),
+ }
+ ]}
+ />
+
+
+
+
+}
+
+export default EditReleasedHotfixForm;
diff --git a/sysom_web/src/pages/hotfix/components/ReleasedHotfixConfigForm.jsx b/sysom_web/src/pages/hotfix/components/ReleasedHotfixConfigForm.jsx
new file mode 100644
index 0000000000000000000000000000000000000000..cdc55c4358f485616b6ecfbbb22175ca1f4a2435
--- /dev/null
+++ b/sysom_web/src/pages/hotfix/components/ReleasedHotfixConfigForm.jsx
@@ -0,0 +1,304 @@
+import ProForm, { ProFormText, ProFormSelect, ProFormSwitch, ProFormDatePicker } from '@ant-design/pro-form';
+import React, { useRef, useState, useEffect } from 'react';
+import { Button, Divider } from 'antd';
+import { useRequest, useIntl, FormattedMessage } from 'umi';
+import ProCard from '@ant-design/pro-card';
+import { postTask } from '../../diagnose/service'
+import { submitReleasedHotfixInfo, filterReleasedHotfixInfo } from '../service'
+import { ProFormTimePicker } from '@ant-design/pro-components';
+import { UploadOutlined, DownloadOutlined, PlusOutlined } from '@ant-design/icons';
+import { Upload, Form } from 'antd';
+
+export default (props) => {
+ const intl = useIntl();
+ const formRef = useRef();
+ const [readonlyone, setReadonlyOne] = useState(false);
+ const [veroptionList,setVerOptionList] = useState([]);
+ const [dataostype, setDataOsType] = useState([]);
+ const { loading, error, run } = useRequest(submitReleasedHotfixInfo, {
+ manual: true,
+ onSuccess: (result, params) => {
+ formRef.current.resetFields();
+ props?.onSuccess?.(result, params);
+ },
+ });
+ const KernelConfigChange = (e) => {
+ setReadonlyOne(e);
+ }
+ const { filtering, filtererror, filterrun } = useRequest(filterReleasedHotfixInfo, {
+ manual: true,
+ onSuccess: (result, params) => {
+ formRef.current.resetFields();
+ props?.onSuccess?.(result, params);
+ },
+ });
+ return (
+
+ {
+ run(values)
+ }}
+ formRef={formRef}
+ submitter={{
+ submitButtonProps: {
+ style: {
+ display: 'none',
+ },
+ },
+ resetButtonProps: {
+ style: {
+ display: 'none',
+ },
+ },
+ }}
+ layout={"horizontal"}
+ autoFocusFirstInput
+ >
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ {intl.formatMessage({
+ id: 'pages.hotfix.historicalfilter',
+ defaultMessage: 'Historical Hotfix Information Filter'
+ })}
+
+
+
+
+
+
+
+
+
+
+ )
+}
diff --git a/sysom_web/src/pages/hotfix/service.js b/sysom_web/src/pages/hotfix/service.js
index 401a015c470c64a4205865d8f07096adeb6da4aa..d3f94dead424fa2733ab5a84648bdf4f7b91daae 100644
--- a/sysom_web/src/pages/hotfix/service.js
+++ b/sysom_web/src/pages/hotfix/service.js
@@ -344,4 +344,76 @@ export async function postOneclickDeployment(params, options){
},
...(options || {}),
})
-}
\ No newline at end of file
+}
+
+export async function getReleasedHotfixList(params, options){
+ const token = localStorage.getItem('token')
+ return request('/api/v1/hotfix/get_released_hotfixs/',{
+ method: 'GET',
+ headers: {
+ 'Content-Type': 'application/json',
+ 'Authorization': token,
+ },
+ params: params,
+ ...(options || {}),
+ })
+}
+
+export async function updateChangeReleasedHotfixInfo(pk, data, options){
+ const token = localStorage.getItem('token');
+ return request(`/api/v1/hotfix/update_put_released_hotfix_info/${pk}/`, {
+ method: 'PUT',
+ headers: {
+ 'Content-Type': 'application/json',
+ 'Authorization': token,
+ },
+ data: data,
+ ...(options || {}),
+ })
+}
+
+//hotfix -> 历史发布热补丁列表 -> 提交
+export async function submitReleasedHotfixInfo(data, options) {
+ const token = localStorage.getItem('token');
+ return request('/api/v1/hotfix/insert_released_hotfix_info/', {
+ method: 'POST',
+ headers: {
+ 'Content-Type': 'application/json',
+ 'Authorization': token,
+ },
+ data: data,
+ // params: params,
+ ...(options || {}),
+ });
+ }
+
+export async function filterReleasedHotfixInfo(params, options){
+ const token = localStorage.getItem('token');
+ return request('/api/v1/hotfix/get_filtered_released_hotfix/', {
+ method: 'GET',
+ headers: {
+ 'Content-Type': 'application/json',
+ 'Authorization': token,
+ },
+ params: params,
+ ...(options || {}),
+ });
+}
+
+/**
+ * 批量导入hotfix released
+ * @param {object} data
+ * @param {object} options
+ * @returns
+ */
+export async function batchAddHotfixReleased(data, options) {
+ const token = localStorage.getItem('token');
+ return request('/api/v1/hotfix/import_from_tablefiles/', {
+ method: 'post',
+ data: data,
+ headers: {
+ 'Authorization': token
+ },
+ ...(options || {})
+ })
+}
diff --git a/sysom_web/yarn.lock b/sysom_web/yarn.lock
index ff0a8679f89050b6c973f5d9302587128104a185..4a62dd20868f6686ee1138cf29ed33725bd05442 100644
--- a/sysom_web/yarn.lock
+++ b/sysom_web/yarn.lock
@@ -15309,7 +15309,7 @@ use-subscription@1.5.1:
dependencies:
object-assign "^4.1.1"
-use-sync-external-store@^1.2.0:
+use-sync-external-store@1.2.0, use-sync-external-store@^1.2.0:
version "1.2.0"
resolved "https://registry.npmmirror.com/use-sync-external-store/-/use-sync-external-store-1.2.0.tgz#7dbefd6ef3fe4e767a0cf5d7287aacfb5846928a"
integrity sha512-eEgnFxGQ1Ife9bzYs6VLi8/4X6CObHMw9Qr9tPY43iKwsPw8xE8+EFsf/2cFZ5S3esXgpWgtSCtLNS41F+sKPA==
@@ -15918,6 +15918,13 @@ zscroller@~0.4.0:
dependencies:
babel-runtime "6.x"
+zustand@^4.4.7:
+ version "4.4.7"
+ resolved "https://registry.npmmirror.com/zustand/-/zustand-4.4.7.tgz#355406be6b11ab335f59a66d2cf9815e8f24038c"
+ integrity sha512-QFJWJMdlETcI69paJwhSMJz7PPWjVP8Sjhclxmxmxv/RYI7ZOvR5BHX+ktH0we9gTWQMxcne8q1OY8xxz604gw==
+ dependencies:
+ use-sync-external-store "1.2.0"
+
zwitch@^1.0.0:
version "1.0.5"
resolved "https://registry.npmmirror.com/zwitch/-/zwitch-1.0.5.tgz#d11d7381ffed16b742f6af7b3f223d5cd9fe9920"
diff --git a/template/fastapi/scripts/template.ini b/template/fastapi/scripts/template.ini
index 7cd748edd6b1dc7c75605bf593e22a2ad07ec6ec..4f57b5f94059a62143e72ecf09c8c1cf03a3d813 100644
--- a/template/fastapi/scripts/template.ini
+++ b/template/fastapi/scripts/template.ini
@@ -4,6 +4,6 @@ command=/usr/local/sysom/environment/virtualenv/bin/gunicorn -c ./conf/gunicorn.
startsecs=3
autostart=true
autorestart=true
-environment=PATH="/usr/local/sysom/environment/virtualenv/bin/"
+environment=PATH=/usr/local/sysom/virtualenv/bin:%(ENV_PATH)s
stderr_logfile=/var/log/sysom/$TEMPLATE_SERVICE_NAME_MIDDLE-error.log
stdout_logfile=/var/log/sysom/$TEMPLATE_SERVICE_NAME_MIDDLE.log
diff --git a/template/fastapi/service/config.yml b/template/fastapi/service/config.yml
index 59df61e56c6ca16f146c3e3c5a4f31f9f9eaac7c..c2709441724ea95ce808dd6513c1e016a0c0218a 100644
--- a/template/fastapi/service/config.yml
+++ b/template/fastapi/service/config.yml
@@ -5,7 +5,7 @@ vars:
sysom_server:
cec:
- consumer_group: &SERVICE_CONSUMER_GROUP
+ consumer_group: *SERVICE_CONSUMER_GROUP
sysom_service:
service_name: *SERVICE_NAME
diff --git a/tools/convert_grafana_dashboard.py b/tools/convert_grafana_dashboard.py
new file mode 100644
index 0000000000000000000000000000000000000000..fbab0f73d17a1e52d8a1f3395743bbb4d667221d
--- /dev/null
+++ b/tools/convert_grafana_dashboard.py
@@ -0,0 +1,30 @@
+import json
+import sys
+
+
+if __name__ == "__main__":
+ if len(sys.argv) < 3:
+ print("Usage: python3 convert_grafana_dashboard.py infile outfile")
+ sys.exit(1)
+ infile = sys.argv[1]
+ outfile = sys.argv[2]
+ output_json = {"dashboard": {}}
+ with open(infile, "r") as f:
+ data = json.load(f)
+ output_json["dashboard"] = data
+ for panel in data["panels"]:
+ if "datasource" in panel and not isinstance(panel["datasource"], str):
+ panel["datasource"] = f"sysom-{panel['datasource']['type']}"
+ if "targets" in panel:
+ for item in panel["targets"]:
+ if "datasource" in item and not isinstance(item["datasource"], str):
+ item["datasource"] = f"sysom-{item['datasource']['type']}"
+ for item in data["templating"]["list"]:
+ if "datasource" in item and not isinstance(item["datasource"], str):
+ item["datasource"] = f"sysom-{item['datasource']['type']}"
+
+ data["id"] = None
+ data["editable"] = False
+
+ with open(outfile, "w") as f:
+ json.dump(output_json, f, indent=4)
diff --git a/tools/deploy/sysom.spec b/tools/deploy/sysom.spec
index 952cfffed4b95a1cef4bbb576901d71ee07aee68..93250398b47a51741bcc30ff4796e0e4b3809b99 100755
--- a/tools/deploy/sysom.spec
+++ b/tools/deploy/sysom.spec
@@ -2,11 +2,11 @@
%define debug_package %{nil}
Name: sysom
-Version: 3.0
+Version: 3.1
Release: %{anolis_release}%{?dist}
Summary: SysOM Server
License: MIT
-Source0: https://gitee.com/anolis/sysom/repository/archive/v3.0/sysom-3.0.tar.gz
+Source0: https://gitee.com/anolis/sysom/repository/archive/v3.1/sysom-3.1.tar.gz
URL: https://gitee.com/anolis/sysom
%description
@@ -192,6 +192,14 @@ fi
rm -rf /usr/local/sysom
%changelog
+* Tue Jan 16 2024 mingfeng - 3.1
+- Support for multi-channel in Diagnostic Center
+- Support for offline step-by-step diagnosis in Diagnostic Center (original offline import function), initiate diagnosis to get the command to be executed, and import it in the interface after executing the command offline
+- System health check diagnosis upgrade, support to shield check items
+- Added containerized deployment support
+- Added alarm push service
+- Support for diagnostic hook, used to support interactive capabilities for each type of diagnostic
+
* Mon Oct 16 2023 mingfeng - 3.0
- feat(diagnosis): Diagnostic Center supports new versions of pre-processing and post-processing scripts
- feat(alarm): Support for scalable alarm centers