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
23 changes: 10 additions & 13 deletions agent/app/service/monitor.go
Original file line number Diff line number Diff line change
Expand Up @@ -635,21 +635,18 @@
}
}
func loadGPUInfoInt(val string) int {
valItem := strings.ReplaceAll(val, "MiB", "")
valItem = strings.ReplaceAll(valItem, "C", "")
valItem = strings.ReplaceAll(valItem, "%", "")
valItem = strings.TrimSpace(valItem)
data, _ := strconv.Atoi(valItem)
val = strings.TrimSuffix(val, "%")
val = strings.TrimSpace(val)
data, _ := strconv.Atoi(val)

Check failure on line 640 in agent/app/service/monitor.go

View check run for this annotation

SonarQubeCloud / SonarCloud Code Analysis

Handle this error explicitly or document why it can be safely ignored.

See more on https://sonarcloud.io/project/issues?id=1Panel-dev_1Panel&issues=AZrEk7JtxjLtBHAHMRNP&open=AZrEk7JtxjLtBHAHMRNP&pullRequest=11103
return data
}
func loadGPUInfoFloat(val string) float64 {
valItem := strings.ReplaceAll(val, "W", "")
valItem = strings.ReplaceAll(valItem, "MB", "")
valItem = strings.ReplaceAll(valItem, "MiB", "")
valItem = strings.ReplaceAll(valItem, "C", "")
valItem = strings.ReplaceAll(valItem, "°C", "")
valItem = strings.ReplaceAll(valItem, "%", "")
valItem = strings.TrimSpace(valItem)
data, _ := strconv.ParseFloat(valItem, 64)
val = strings.TrimSpace(val)
suffixes := []string{"W", "MB", "MiB", "°C", "C", "%"}
for _, suffix := range suffixes {
val = strings.TrimSuffix(val, suffix)
}
val = strings.TrimSpace(val)
data, _ := strconv.ParseFloat(val, 64)

Check failure on line 650 in agent/app/service/monitor.go

View check run for this annotation

SonarQubeCloud / SonarCloud Code Analysis

Handle this error explicitly or document why it can be safely ignored.

See more on https://sonarcloud.io/project/issues?id=1Panel-dev_1Panel&issues=AZrEk7JtxjLtBHAHMRNQ&open=AZrEk7JtxjLtBHAHMRNQ&pullRequest=11103
return data
}
1 change: 1 addition & 0 deletions frontend/src/lang/modules/en.ts
Original file line number Diff line number Diff line change
Expand Up @@ -1210,6 +1210,7 @@ const message = {
defaultIO: 'Default Disk',
defaultIOHelper: 'Default disk option displayed in monitoring and overview interfaces',
cleanMonitor: 'Clear Monitoring Records',
cleanHelper: 'This operation will clear all monitoring records including GPU. Continue?',

avgLoad: 'Load average',
loadDetail: 'Load detail',
Expand Down
1 change: 1 addition & 0 deletions frontend/src/lang/modules/es-es.ts
Original file line number Diff line number Diff line change
Expand Up @@ -1218,6 +1218,7 @@ const message = {
defaultIO: 'Disco Predeterminado',
defaultIOHelper: 'Opción de disco predeterminada mostrada en las interfaces de monitoreo y resumen',
cleanMonitor: 'Limpiar Registros de Monitoreo',
cleanHelper: 'Esta operación borrará todos los registros de monitoreo, incluidos los de GPU. ¿Continuar?',

avgLoad: 'Carga promedio',
loadDetail: 'Detalle de carga',
Expand Down
1 change: 1 addition & 0 deletions frontend/src/lang/modules/ja.ts
Original file line number Diff line number Diff line change
Expand Up @@ -1174,6 +1174,7 @@ const message = {
defaultIO: 'デフォルトディスク',
defaultIOHelper: '監視および概要インターフェースに表示されるデフォルトのディスクオプション',
cleanMonitor: '監視記録をクリア',
cleanHelper: 'この操作により、GPUを含むすべての監視記録がクリアされます。続行しますか?',

avgLoad: 'ロード平均',
loadDetail: '詳細を読み込みます',
Expand Down
1 change: 1 addition & 0 deletions frontend/src/lang/modules/ko.ts
Original file line number Diff line number Diff line change
Expand Up @@ -1166,6 +1166,7 @@ const message = {
defaultIO: '기본 디스크',
defaultIOHelper: '모니터링 및 개요 인터페이스에 표시되는 기본 디스크 옵션',
cleanMonitor: '모니터링 기록 지우기',
cleanHelper: '이 작업은 GPU를 포함한 모든 모니터링 기록을 지웁니다. 계속하시겠습니까?',

avgLoad: '평균 부하',
loadDetail: '부하 세부사항',
Expand Down
1 change: 1 addition & 0 deletions frontend/src/lang/modules/ms.ts
Original file line number Diff line number Diff line change
Expand Up @@ -1204,6 +1204,7 @@ const message = {
defaultIO: 'Cakera Lalai',
defaultIOHelper: 'Pilihan cakera lalai yang dipaparkan dalam antara muka pemantauan dan gambaran keseluruhan',
cleanMonitor: 'Kosongkan Rekod Pemantauan',
cleanHelper: 'Operasi ini akan membersihkan semua rekod pemantauan termasuk GPU. Teruskan?',

avgLoad: 'Purata beban',
loadDetail: 'Butiran beban',
Expand Down
1 change: 1 addition & 0 deletions frontend/src/lang/modules/pt-br.ts
Original file line number Diff line number Diff line change
Expand Up @@ -1198,6 +1198,7 @@ const message = {
defaultIO: 'Disco Padrão',
defaultIOHelper: 'Opção de disco padrão exibida nas interfaces de monitoramento e visão geral',
cleanMonitor: 'Limpar Registros de Monitoramento',
cleanHelper: 'Esta operação limpará todos os registros de monitoramento, incluindo GPU. Continuar?',

avgLoad: 'Média de carga',
loadDetail: 'Detalhes da carga',
Expand Down
1 change: 1 addition & 0 deletions frontend/src/lang/modules/ru.ts
Original file line number Diff line number Diff line change
Expand Up @@ -1200,6 +1200,7 @@ const message = {
defaultIO: 'Диск по Умолчанию',
defaultIOHelper: 'Опция диска по умолчанию, отображаемая в интерфейсах мониторинга и обзора',
cleanMonitor: 'Очистить Записи Мониторинга',
cleanHelper: 'Эта операция очистит все записи мониторинга, включая GPU. Продолжить?',

avgLoad: 'Средняя нагрузка',
loadDetail: 'Детали нагрузки',
Expand Down
1 change: 1 addition & 0 deletions frontend/src/lang/modules/tr.ts
Original file line number Diff line number Diff line change
Expand Up @@ -1225,6 +1225,7 @@ const message = {
defaultIO: 'Varsayılan Disk',
defaultIOHelper: 'İzleme ve genel bakış arayüzlerinde görüntülenen varsayılan disk seçeneği',
cleanMonitor: 'İzleme Kayıtlarını Temizle',
cleanHelper: 'Bu işlem GPU dahil tüm izleme kayıtlarını temizleyecektir. Devam etmek istiyor musunuz?',

avgLoad: 'Ortalama yük',
loadDetail: 'Yük detayı',
Expand Down
1 change: 1 addition & 0 deletions frontend/src/lang/modules/zh-Hant.ts
Original file line number Diff line number Diff line change
Expand Up @@ -1145,6 +1145,7 @@ const message = {
defaultIO: '預設磁碟',
defaultIOHelper: '預設監控和概覽介面顯示的磁碟選項',
cleanMonitor: '清空監控記錄',
cleanHelper: '該操作將清空包括 GPU 在內的所有監控記錄,是否繼續?',

avgLoad: '平均負載',
loadDetail: '負載詳情',
Expand Down
1 change: 1 addition & 0 deletions frontend/src/lang/modules/zh.ts
Original file line number Diff line number Diff line change
Expand Up @@ -1151,6 +1151,7 @@ const message = {
defaultIO: '默认磁盘',
defaultIOHelper: '默认监控和概览界面显示的磁盘选项',
cleanMonitor: '清空监控记录',
cleanHelper: '该操作将清空包括 GPU 在内的所有监控记录,是否继续?',

avgLoad: '平均负载',
loadDetail: '负载详情',
Expand Down
6 changes: 6 additions & 0 deletions frontend/src/views/ai/gpu/index.vue
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,7 @@
<el-option v-for="item in options" :key="item" :label="item" :value="item" />
</el-select>
<TableRefresh class="float-right" @search="search()" />
<el-button icon="Setting" class="float-right mr-2" @click="quickJump()" />
</div>
</el-card>
</div>
Expand Down Expand Up @@ -154,6 +155,7 @@ import { GlobalStore } from '@/store';
import { shortcuts } from '@/utils/shortcuts';
import { Host } from '@/api/interface/host';
import i18n from '@/lang';
import { routerToName } from '@/utils/router';

const globalStore = GlobalStore();

Expand Down Expand Up @@ -292,6 +294,10 @@ function initPowerCharts(baseDate: any, items: any) {
};
}

const quickJump = () => {
routerToName('HostMonitorSetting');
};

function initXpuPowerCharts(baseDate: any, items: any) {
let list = items.map(function (item: any) {
return { value: Number(item.used.toFixed(2)), data: item };
Expand Down
2 changes: 1 addition & 1 deletion frontend/src/views/host/monitor/setting/index.vue
Original file line number Diff line number Diff line change
Expand Up @@ -142,7 +142,7 @@ const onChangeIO = () => {
};
const onClean = async () => {
ElMessageBox.confirm(i18n.global.t('commons.msg.clean'), i18n.global.t('monitor.cleanMonitor'), {
ElMessageBox.confirm(i18n.global.t('monitor.cleanHelper'), i18n.global.t('monitor.cleanMonitor'), {
confirmButtonText: i18n.global.t('commons.button.confirm'),
cancelButtonText: i18n.global.t('commons.button.cancel'),
type: 'info',
Expand Down
Loading