Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions apps/daas/src/i18n/langs/en.js
Original file line number Diff line number Diff line change
Expand Up @@ -793,6 +793,8 @@ export default {
setting_lagTime: 'incremental lag decision time (seconds)',
setting_Task_CPU_and_Memory_Metrics_Statistics:
'Task CPU and Memory Metrics Statistics',
setting_Monitoring_task_upper_limit:
'Monitoring task upper limit for Task CPU and Memory Metrics Statistics',
setting_connection_schema_update_hour: 'Data source schema update time',
setting_connection_schema_update_interval:
'Data source schema update interval (days)',
Expand Down
1 change: 1 addition & 0 deletions apps/daas/src/i18n/langs/zh-CN.js
Original file line number Diff line number Diff line change
Expand Up @@ -753,6 +753,7 @@ export default {
setting_job_cdc_record_ttl_doc: ' 增量事件保存时长(天)',
setting_lagTime: '增量滞后判定时间(秒)',
setting_Task_CPU_and_Memory_Metrics_Statistics: '任务CPU&内存指标统计',
setting_Monitoring_task_upper_limit: '任务CPU&内存指标的监控任务上限',
setting_connection_schema_update_hour: '数据源schema更新时间',
setting_connection_schema_update_interval: '数据源schema更新周期(天)',
setting_creatDuplicateSource: ' 允许创建重复数据源',
Expand Down
1 change: 1 addition & 0 deletions apps/daas/src/i18n/langs/zh-TW.js
Original file line number Diff line number Diff line change
Expand Up @@ -750,6 +750,7 @@ export default {
setting_job_cdc_record_ttl_doc: ' 增量事件保存時長(天)',
setting_lagTime: '增量滯後判定時間(秒)',
setting_Task_CPU_and_Memory_Metrics_Statistics: '任務CPU&記憶體名額統計',
setting_Monitoring_task_upper_limit: '任務CPU&記憶體名額統計的監控任務上限',
setting_connection_schema_update_hour: '數據源schema更新時間',
setting_connection_schema_update_interval: '數據源schema更新周期(天)',
setting_creatDuplicateSource: ' 允許創建重複數據源',
Expand Down
81 changes: 81 additions & 0 deletions apps/daas/src/utils/setting-dependency.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,81 @@
export interface DependentSetting {
key?: string
value?: unknown
default_value?: unknown
open?: unknown
parent_key?: string
parent_value?: unknown
}

function getSettingValue(setting: DependentSetting) {
const value = Object.prototype.hasOwnProperty.call(setting, 'open')
? setting.open
: setting.value

return value === undefined || value === null || value === ''
? setting.default_value
: value
}

export function isSettingDependencyVisible(
setting: DependentSetting,
settingsByKey: Record<string, DependentSetting>,
) {
if (!setting.parent_key) {
return true
}

const parent = settingsByKey[setting.parent_key]
if (!parent) {
return false
}

const expectedValue = setting.parent_value ?? 'true'
return String(getSettingValue(parent)) === String(expectedValue)
}

export function orderSettingsByDependency<T extends DependentSetting>(
settings: T[],
) {
const settingsByKey = new Map<string, T>()
const childrenByParent = new Map<string, T[]>()
const orderedSettings: T[] = []
const visited = new Set<T>()

settings.forEach((setting) => {
if (setting.key) {
settingsByKey.set(setting.key, setting)
}
})

settings.forEach((setting) => {
if (!setting.parent_key || !settingsByKey.has(setting.parent_key)) {
return
}

const children = childrenByParent.get(setting.parent_key) || []
children.push(setting)
childrenByParent.set(setting.parent_key, children)
})

const appendSettingAndChildren = (setting: T) => {
if (visited.has(setting)) {
return
}

visited.add(setting)
orderedSettings.push(setting)
;(childrenByParent.get(setting.key || '') || []).forEach(
appendSettingAndChildren,
)
}

settings.forEach((setting) => {
if (!setting.parent_key || !settingsByKey.has(setting.parent_key)) {
appendSettingAndChildren(setting)
}
})

settings.forEach(appendSettingAndChildren)
return orderedSettings
}
26 changes: 23 additions & 3 deletions apps/daas/src/views/setting/Setting.vue
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,10 @@ import { setSettings } from '@tap/shared/src/settings'
import { downloadJson } from '@tap/shared/src/util'
import { find, uniq } from 'lodash-es'
import i18n from '@/i18n'
import {
isSettingDependencyVisible,
orderSettingsByDependency,
} from '@/utils/setting-dependency'

export default {
name: 'Setting',
Expand All @@ -41,6 +45,7 @@ export default {
formData: {
items: [],
},
allSettings: [],
activeTab: 0,
activePanel: 'Log',
lang: getCurrentLanguage(),
Expand Down Expand Up @@ -142,6 +147,15 @@ export default {
}
return result
},

settingsByKey() {
return this.allSettings.reduce((result, item) => {
if (item.key) {
result[item.key] = item
}
return result
}, {})
},
},
watch: {
formData: {
Expand Down Expand Up @@ -185,6 +199,9 @@ export default {
this.activePanel = item.category
this.formItems = item.items || []
},
isSettingVisible(setting) {
return isSettingDependencyVisible(setting, this.settingsByKey)
},
// 获取设置数据
getData() {
let auth_data = []
Expand All @@ -196,6 +213,7 @@ export default {
const itemsCategories = []
const cat = []
data = data || []
this.allSettings = data
items = data.map((item) => {
if (item.documentation) {
item.documentationKey = item.documentation
Expand Down Expand Up @@ -238,8 +256,9 @@ export default {
values.sort((a, b) => {
return a.sort < b.sort ? -1 : 1
})
const orderedValues = orderSettingsByDependency(values)
if (values.length > 0) {
itemsCategories.push({ category: item, items: values })
itemsCategories.push({ category: item, items: orderedValues })
cat.push(item)
}
})
Expand Down Expand Up @@ -694,8 +713,9 @@ export default {
<el-col :span="24">
<el-form-item
v-if="
childItem.key_label !== 'Ldap SSL Cert' ||
ldapForm.Ldap_SSL_Enable
(childItem.key_label !== 'Ldap SSL Cert' ||
ldapForm.Ldap_SSL_Enable) &&
isSettingVisible(childItem)
"
>
<template #label>
Expand Down
18 changes: 18 additions & 0 deletions apps/daas/tests/setting-dependency.test.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
import assert from 'node:assert/strict'
import test from 'node:test'
import { orderSettingsByDependency } from '../src/utils/setting-dependency.ts'

test('places a child setting directly after its parent', () => {
const settings = [
{ key: 'other', sort: '1' },
{ key: 'child', parent_key: 'parent', sort: '2' },
{ key: 'parent', sort: '3' },
]

const result = orderSettingsByDependency(settings)

assert.deepEqual(
result.map((setting) => setting.key),
['other', 'parent', 'child'],
)
})
2 changes: 2 additions & 0 deletions packages/api/src/core/settings.ts
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,8 @@ export interface Setting {
hot_reloading: boolean
id: string
key: string
parent_key?: string
parent_value?: string | number | boolean
key_label: string
last_update: string
scope: string
Expand Down
28 changes: 28 additions & 0 deletions packages/business/src/shared/task-metric.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,28 @@
import dayjs from 'dayjs'
import relativeTime from 'dayjs/plugin/relativeTime.js'
import { isNumber } from 'lodash-es'

dayjs.extend(relativeTime)

export function formatTaskMetricInfo(
metricInfo: Record<string, any>,
translate: (key: string, params: Record<string, any>) => string,
formatMemory: (value: any, type: string, fix: number) => string,
now = Date.now(),
) {
const day = dayjs(metricInfo.lastUpdateTime)

return {
...metricInfo,
cpuUsage: isNumber(metricInfo.cpuUsage)
? `${Number(metricInfo.cpuUsage.toFixed(2))}%`
: '--',
memoryUsage: isNumber(metricInfo.memoryUsage)
? formatMemory(metricInfo.memoryUsage, 'b', 2)
: '--',
lastUpdateTime: translate('public_updated_from_now', {
time: day.fromNow(),
}),
hasWarning: now - day.valueOf() > 60000,
}
}
35 changes: 33 additions & 2 deletions packages/business/src/views/shared-mining/List.vue
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ import { requestClient, withPassive } from '@tap/api/src/request'
import { VTable } from '@tap/component/src/base/v-table'
import { FilterBar } from '@tap/component/src/filter-bar'
import { useI18n } from '@tap/i18n'
import { calcTimeUnit, openUrl } from '@tap/shared'
import { calcTimeUnit, calcUnit, openUrl } from '@tap/shared'
import dayjs from 'dayjs'
import { ElMessage, ElMessageBox } from 'element-plus'
import { escapeRegExp, uniqBy } from 'lodash-es'
Expand All @@ -37,6 +37,7 @@ import PageContainer from '../../components/PageContainer.vue'
import TablePage from '../../components/TablePage.vue'
import TaskStatus from '../../components/TaskStatus.vue'
import { makeStatusAndDisabled } from '../../shared'
import { formatTaskMetricInfo } from '../../shared/task-metric'
import Editor from './Editor.vue'

const { t } = useI18n()
Expand Down Expand Up @@ -208,6 +209,9 @@ const getData = async ({
if (item.status === 'edit') {
item.btnDisabled.start = false
}
if (item.metricInfo) {
item.metricInfo = formatTaskMetricInfo(item.metricInfo, t, calcUnit)
}
return item
}),
}
Expand Down Expand Up @@ -433,7 +437,34 @@ onUnmounted(() => {
:show-overflow-tooltip="true"
>
<template #default="scope">
{{ scope.row.name }}
<div>{{ scope.row.name }}</div>
<div class="fs-8 font-color-sslight lh-base flex align-center">
<template
v-if="scope.row.status === 'running' && scope.row.metricInfo"
>
<el-tooltip
:content="scope.row.metricInfo.lastUpdateTime"
:enterable="false"
:disabled="!scope.row.metricInfo.hasWarning"
>
<div class="flex align-center gap-1">
<el-icon
v-if="scope.row.metricInfo.hasWarning"
class="color-warning"
><i-lucide-triangle-alert
/></el-icon>
<span class="font-color-sslight">CPU:</span>
<span class="fw-sub">{{
scope.row.metricInfo.cpuUsage
}}</span>
<span class="font-color-sslight ml-2">MEM:</span>
<span class="fw-sub">{{
scope.row.metricInfo.memoryUsage
}}</span>
</div>
</el-tooltip>
</template>
</div>
</template>
</el-table-column>
<el-table-column
Expand Down
18 changes: 5 additions & 13 deletions packages/business/src/views/task/List.vue
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,7 @@ import UpgradeFee from '../../components/UpgradeFee.vue'
import Upload from '../../components/UploadDialog.vue'
import syncTaskAgent from '../../mixins/syncTaskAgent'
import { makeStatusAndDisabled, MILESTONE_TYPE, STATUS_MAP } from '../../shared'
import { formatTaskMetricInfo } from '../../shared/task-metric'
import BatchAlarmEmailDialog from './BatchAlarmEmailDialog.vue'
import EditInfoDialog from './EditInfoDialog.vue'
import SkipError from './SkipError.vue'
Expand Down Expand Up @@ -340,20 +341,11 @@ export default {
}

if (item.metricInfo) {
const day = dayjs(item.metricInfo.lastUpdateTime)
item.metricInfo.cpuUsage = isNumber(item.metricInfo.cpuUsage)
? `${Number(item.metricInfo.cpuUsage.toFixed(2))}%`
: '--'
item.metricInfo.memoryUsage = isNumber(item.metricInfo.memoryUsage)
? calcUnit(item.metricInfo.memoryUsage, 'b', 2)
: '--'
item.metricInfo.lastUpdateTime = this.$t(
'public_updated_from_now',
{
time: day.fromNow(),
},
item.metricInfo = formatTaskMetricInfo(
item.metricInfo,
this.$t,
calcUnit,
)
item.metricInfo.hasWarning = Date.now() - day.valueOf() > 60000
}
return item
})
Expand Down
22 changes: 22 additions & 0 deletions packages/business/tests/task-metric.test.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
import assert from 'node:assert/strict'
import test from 'node:test'
import { formatTaskMetricInfo } from '../src/shared/task-metric.ts'

test('formats task CPU and memory metrics for list display', () => {
const now = Date.now()
const metricInfo = formatTaskMetricInfo(
{
cpuUsage: 12.3456,
memoryUsage: 1024,
lastUpdateTime: now - 61_000,
},
(key, params) => `${key}:${params.time}`,
(value, type, fix) => `${value}-${type}-${fix}`,
now,
)

assert.equal(metricInfo.cpuUsage, '12.35%')
assert.equal(metricInfo.memoryUsage, '1024-b-2')
assert.match(metricInfo.lastUpdateTime, /^public_updated_from_now:/)
assert.equal(metricInfo.hasWarning, true)
})
Loading