Commit Graph

84 Commits

Author SHA1 Message Date
likexuan
1799d2120c NEZ-1849 feat :alert message列表页面 增加 acknowledge 状态及按钮 2022-05-06 14:17:03 +08:00
likexuan
4916f7eef3 NEZ-1849 feat :alert message列表页面 增加 acknowledge 状态及按钮 2022-05-06 10:30:38 +08:00
zhangyu
257814f6b0 Merge branch 'dev-3.2' of https://git.mesalab.cn/nezha/nezha-fronted into dev-3.3
# Conflicts:
#	nezha-fronted/src/components/charts/chart-alert-list.vue
#	nezha-fronted/src/components/common/bottomBox/tabs/endpointQueryTab.vue
#	nezha-fronted/src/components/common/table/alert/alertMessageTable.vue
2022-04-12 10:46:19 +08:00
zhangyu
87c48a8f35 perf:删除没有用到的代码 2022-04-12 10:30:33 +08:00
zhangyu
f0b5f13a70 fix: 修改未执行eslint的代码 2022-04-11 17:24:10 +08:00
zhangyu
9c4e2a9525 feat:alertMessage 添加 info 2022-04-01 15:43:14 +08:00
zhangyu
67b74fef67 feat:添加时间轴 2022-03-31 19:07:46 +08:00
zhangyu
0c662135b4 feat : 添加alertMessageinfo detail 2022-03-31 10:45:20 +08:00
zhangyu
bb3e330d97 fix:处理 表格tooltip 调用两次接口的问题 2022-03-09 19:32:04 +08:00
zhangyu
2e7d217f0e fix:修改 alertMessage 默认时间为7天 隐藏lastAt 2022-03-09 18:59:29 +08:00
zhangyu
24ed289135 fix:修改详情页面报错的问题 2022-03-07 09:37:27 +08:00
zhangyu
be959ad26b NEZ-1631 fix:列表页面 默认排序字段 初始化状态修复 2022-03-04 13:59:25 +08:00
zhangyu
c429a830f2 fix:alertMessage 页面初始状态修改 2022-03-03 09:54:59 +08:00
zhangyu
0ae42c50fd fix:去除 alertMessage lastAt的排序 2022-03-02 18:29:02 +08:00
zhangyu
c0921fd850 fix:去除 alertmessage state的排序 2022-03-02 18:27:54 +08:00
zhangyu
c45397d407 fix:去除alertMessage state 排序 2022-03-02 18:27:11 +08:00
zhangyu
0a5209971d fix:alertMessage 添加 lastAt 2022-03-02 17:26:40 +08:00
zhangyu
677e14a7a9 NEZ-1618 feat: alert message 列表页面修改 2022-03-02 16:05:27 +08:00
zhangyu
94cf807332 fix:修改alertMessage 没有滚动条的问题 2022-03-02 11:32:42 +08:00
zhangyu
ec71a59e42 fix:修改alertMessage lables tooltip 接口调用两次的问题 2022-03-01 16:39:26 +08:00
@changcode
7ed10d2de5 fix: 修复页面权限错误问题 2022-01-12 11:31:04 +08:00
zhangyu
2ccd8ff66c fix:优化 alertmessage tooltip 显示位置问题 2021-12-31 10:15:36 +08:00
chenjinsong
7581b30f2c Merge remote-tracking branch 'origin/dev-3.1' into dev-3.2
# Conflicts:
#	nezha-fronted/src/assets/css/common/rightBoxCommon.scss
#	nezha-fronted/src/assets/css/components/common/project/topology.scss
#	nezha-fronted/src/components/common/bottomBox/tabs/chartTempPreview.vue
#	nezha-fronted/src/components/common/bottomBox/tabs/panelTabNew.vue
#	nezha-fronted/src/components/common/bottomBox/tabs/terminalLogCMDTab.vue
#	nezha-fronted/src/components/common/bottomBox/tabs/terminalLogRecordTab.vue
#	nezha-fronted/src/components/common/bottomBox/tabs/terminalLogTab.vue
#	nezha-fronted/src/components/common/popBox/selectPanel.vue
#	nezha-fronted/src/components/common/project/popData/Info.vue
#	nezha-fronted/src/components/common/project/topologyL5.vue
#	nezha-fronted/src/components/common/rightBox/alertRuleBox.vue
#	nezha-fronted/src/components/common/rightBox/setting/globalizationBox.vue
#	nezha-fronted/src/components/page/config/changePin.vue
#	nezha-fronted/src/components/page/dashboard/explore/editor.vue
#	nezha-fronted/src/components/page/dashboard/metricPreview.vue
#	nezha-fronted/src/components/page/dashboard/panel.vue
#	nezha-fronted/src/permission.js
#	nezha-fronted/src/store/user.js
2021-11-29 16:19:13 +08:00
zhangyu
d3dff4c5fe NEZ-1322 fix: Endpoint查看表达式图表时,切换时间图表没有变化,切换回原时间,图像显示不一致 2021-11-26 14:30:55 +08:00
zhangyu
8ce68e6871 fix: 修改 alertmeessage alertRule 首字符大写的问题 2021-11-25 16:14:57 +08:00
zhangyu
7cf4a696e9 NEZ-1332 feat: alert message 查看请求参数调整(metrics,logs) 2021-11-24 20:27:15 +08:00
chenjinsong
f27b6c2606 Merge remote-tracking branch 'origin/dev-3.1' into dev-3.1.1_theme
# Conflicts:
#	nezha-fronted/src/components/common/i18n.js
#	nezha-fronted/src/components/common/pagination.vue
#	nezha-fronted/src/components/common/searchInput.vue
#	nezha-fronted/src/components/common/table/settings/endpointTable.vue
#	nezha-fronted/src/components/page/dashboard/overview/overview2.vue
2021-11-15 14:06:42 +08:00
@changcode
d4dd85ee8e NEZ-1218 fix: alert message 查看按钮 增加判断条件 当 rule_type 未logs时禁用 2021-11-11 13:55:04 +08:00
chenjinsong
a0dcb8d877 Merge remote-tracking branch 'origin/dev-3.1' into dev-3.1.1_theme
# Conflicts:
#	nezha-fronted/src/components/cli/webSSH.vue
#	nezha-fronted/src/components/common/alert/alertLabel2.vue
#	nezha-fronted/src/components/common/detailView/list/asset/assetDetail.vue
#	nezha-fronted/src/components/common/popBox/topToolMoreOptions.vue
#	nezha-fronted/src/components/common/rightBox/editEndpointBoxNew.vue
#	nezha-fronted/src/components/common/rightBox/moduleBox.vue
#	nezha-fronted/src/components/page/config/system.vue
#	nezha-fronted/src/components/page/monitor/project/index.vue
2021-11-11 11:28:19 +08:00
zhangyu
897fb7673c fix: 处理国际化的问题 2021-11-04 18:21:20 +08:00
chenjinsong
a709585a9f Merge remote-tracking branch 'origin/dev-3.1' into dev-3.1.1_theme
# Conflicts:
#	nezha-fronted/src/components/common/alert/alertLabel.vue
#	nezha-fronted/src/components/common/detailView/detailViewTopSearch.vue
#	nezha-fronted/src/components/common/i18n.js
#	nezha-fronted/src/components/common/labelFilter/clickSearch.vue
#	nezha-fronted/src/components/common/login.vue
#	nezha-fronted/src/components/common/popBox/topToolMoreOptions.vue
2021-11-04 14:49:40 +08:00
@changcode
efb0996777 fix: alertLabel页面增加判断,区分alertMessage页面,和chart-alert-lis全屏t页面 2021-11-02 10:17:26 +08:00
chenjinsong
ef664be5ef Merge remote-tracking branch 'origin/dev-3.1' into dev-3.1.1_theme
# Conflicts:
#	nezha-fronted/src/assets/css/common.scss
#	nezha-fronted/src/assets/css/common/tableCommon.scss
#	nezha-fronted/src/assets/stylus/main.scss
#	nezha-fronted/src/components/charts/chart-list.vue
#	nezha-fronted/src/components/charts/logs.vue
#	nezha-fronted/src/components/common/alert/alertLabel.vue
#	nezha-fronted/src/components/common/alert/alertRuleInfo.vue
#	nezha-fronted/src/components/common/bottomBox/bottomBox.vue
#	nezha-fronted/src/components/common/bottomBox/tabs/endpointQuery.vue
#	nezha-fronted/src/components/common/bottomBox/tabs/endpointQueryTab.vue
#	nezha-fronted/src/components/common/bottomBox/tabs/logBottomTab.vue
#	nezha-fronted/src/components/common/bottomBox/tabs/panelTabNew.vue
#	nezha-fronted/src/components/common/detailView/list/alertRule/alertRuleDetail.vue
#	nezha-fronted/src/components/common/detailView/list/asset/assetDetail.vue
#	nezha-fronted/src/components/common/detailView/list/dc/dcDetail.vue
#	nezha-fronted/src/components/common/detailView/list/endpoint/endpointDetail.vue
#	nezha-fronted/src/components/common/detailView/list/module/moduleDetail.vue
#	nezha-fronted/src/components/common/detailView/nzDetailView.vue
#	nezha-fronted/src/components/common/detailView/view/detailViewRight.vue
#	nezha-fronted/src/components/common/labelFilter/clickSearch.vue
#	nezha-fronted/src/components/common/multipleTime.vue
#	nezha-fronted/src/components/common/pickTime.vue
#	nezha-fronted/src/components/common/popBox/topToolMoreOptions.vue
#	nezha-fronted/src/components/common/project/L5/topoTooltip.vue
#	nezha-fronted/src/components/common/project/popData/Info.vue
#	nezha-fronted/src/components/common/rightBox/alertRuleBox.vue
#	nezha-fronted/src/components/common/table/alert/alertRuleTable.vue
#	nezha-fronted/src/components/common/table/alert/alertSilenceTable.vue
#	nezha-fronted/src/components/common/table/settings/userTable.vue
#	nezha-fronted/src/components/layout/header.vue
#	nezha-fronted/src/components/page/alert/alertMessage.vue
#	nezha-fronted/src/components/page/alert/nzAlertTag.vue
#	nezha-fronted/src/components/page/asset/components/operation.vue
#	nezha-fronted/src/components/page/config/mibBrowser.vue
#	nezha-fronted/src/components/page/dashboard/explore/exploreItem.vue
#	nezha-fronted/src/components/page/dashboard/explore/logTab.vue
#	nezha-fronted/src/components/page/dashboard/explore/promqlInput.vue
#	nezha-fronted/src/components/page/dashboard/overview/overview2.vue
#	nezha-fronted/src/components/page/dashboard/panel.vue
2021-11-01 18:24:01 +08:00
chenjinsong
914c096463 NEZ-1072 feat: 主题切换 2021-11-01 17:23:01 +08:00
@changcode
7dfc34f9c2 NEZ-1145 fix: System node exporter alert nums页面存在两个悬浮框 2021-11-01 16:35:58 +08:00
@changcode
47d1863111 style: 优化select公用样式,及类名 2021-10-29 12:02:34 +08:00
@changcode
ab87e01394 style: table列表样式调整 2021-10-28 17:53:27 +08:00
@changcode
5a831004f5 NEZ-1080 style: 鼠标悬浮样式调整 2021-10-26 17:47:49 +08:00
@changcode
9e82c52436 NEZ-1079 perf: 将各处列表、dashboard等页面中多处下拉框的弹出触发方式统一为点击触发 2021-10-25 17:16:40 +08:00
@changcode
bbe760999d style: 样式调整 2021-10-25 14:45:28 +08:00
@changcode
2351baa8f3 fix: 列表no data样式展示异常问题 2021-10-22 19:39:49 +08:00
@changcode
ad8bef81ec NEZ-1075 feat: state 样式调整 2021-10-22 17:47:42 +08:00
@changcode
9542e1a63a style: Box 样式调整 2021-09-26 18:14:47 +08:00
@changcode
5879ca0c8a style:下拉选择器样式统一 2021-09-26 11:56:36 +08:00
zhangyu
278c91338b fix; 处理啊alertRule 删除时alertMessage有时会空白的问题 2021-09-22 17:47:17 +08:00
zhangyu
37e95e1518 NEZ-997 fix:NEZHA 搜索框 删除子选项时 会导致其他选项重复 以及 alertMeaasge dc不显示详情的问题 2021-09-14 15:36:55 +08:00
zhangyu
e6a35e3fc9 NEZ-994 fix: alert message label x修改 2021-09-14 14:19:38 +08:00
zhangyu
b829effcae feat: alertRuletooltip 样式调整 2021-09-10 11:00:37 +08:00
zhangyu
d75ae40c19 feat:alertMessage 添加 Trouble shooting按钮 2021-09-09 16:00:37 +08:00
zhangyu
07a1d6f234 fix; 修改 alertMessage 不显示图标的问题 , alert rule的校验问题以及 alertRuleTanle的翻页功能 2021-09-09 10:30:03 +08:00