Skip to content

Commit fc5bd85

Browse files
RodrigoDLopezLopez
andauthored
Improves CPU usage info (#6784)
* improve CPU usage info * Update ResourceStatsInfo.vue remove extra comma * fixes missing chart message * fix typo Co-authored-by: Lopez <rodrigo@scclouds.com.br>
1 parent 8fd4ed8 commit fc5bd85

File tree

4 files changed

+19
-6
lines changed

4 files changed

+19
-6
lines changed

ui/public/locales/en.json

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -766,6 +766,7 @@
766766
"label.glustervolume": "Volume",
767767
"label.go.back": "Go back",
768768
"label.gpu": "GPU",
769+
"label.chart.info": "Information about the charts",
769770
"label.group": "Group",
770771
"label.group.optional": "Group (Optional)",
771772
"label.gslb": "GSLB",
@@ -1561,6 +1562,7 @@
15611562
"label.see.more.info.memory.usage": "See more info about memory usage",
15621563
"label.see.more.info.network.usage": "See more info about network usage",
15631564
"label.see.more.info.disk.usage": "See more info about disk usage",
1565+
"label.see.more.info.shown.charts": "See more info about the shown charts",
15641566
"label.select-view": "Select view",
15651567
"label.select.a.zone": "Select a zone",
15661568
"label.select.deployment.infrastructure": "Select deployment infrastructure",
@@ -2178,8 +2180,7 @@
21782180
"message.confirm.start.lb.vm": "Please confirm you want to start LB VM.",
21792181
"message.confirm.sync.storage": "Please confirm you want to sync the storage pool",
21802182
"message.confirm.upgrade.router.newer.template": "Please confirm that you want to upgrade router to use newer template.",
2181-
"message.cpu.usage.info.multi.cpu": "The CPU usage percentage can exceed 100% if the VM has more than 1 vCPU or when CPU Cap is not enabled. This behavior happens according to how the hypervisor being used accounts the stats.",
2182-
"message.cpu.usage.info.cpu.cap": "If a VM has only 1 vCPU and the CPU Cap on its compute offering is disabled, then the percentage of CPU usage can also go over 100%. This happens because the VM can use more CPUs than it has been allocated.",
2183+
"message.cpu.usage.info": "The CPU usage percentage can exceed 100% if the VM has more than 1 vCPU or when CPU Cap is not enabled. This behavior happens according to the hypervisor being used (e.g: in KVM), due to how they account the stats",
21832184
"message.create.compute.offering": "Compute offering created",
21842185
"message.create.internallb": "Creating internal LB",
21852186
"message.create.internallb.failed": "Failed to create internal LB.",
@@ -2412,6 +2413,7 @@
24122413
"message.failed.to.assign.vms": "Failed to assign VMs",
24132414
"message.failed.to.remove": "Failed to remove",
24142415
"message.generate.keys": "Please confirm that you would like to generate new keys for this user.",
2416+
"message.chart.statistic.info": "The shown charts are self-adjustable, that means, if the value gets close to the limit or overpass it, it will grow to adjust the shown value",
24152417
"message.guest.traffic.in.advanced.zone": "Guest network traffic is communication between end-user virtual machines. Specify a range of VLAN IDs or VXLAN network identifiers (VNIs) to carry guest traffic for each physical network.",
24162418
"message.guest.traffic.in.basic.zone": "Guest network traffic is communication between end-user virtual machines. Specify a range of IP addresses that CloudStack can assign to guest VMs. Make sure this range does not overlap the reserved system IP range.",
24172419
"message.host.dedicated": "Host Dedicated",

ui/public/locales/pt_BR.json

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -698,6 +698,7 @@
698698
"label.glustervolume": "Disco",
699699
"label.go.back": "Voltar",
700700
"label.gpu": "GPU",
701+
"label.chart.info": "Informa\u00E7\u00F5es sobre os gr\u00E1ficos",
701702
"label.group": "Grupo",
702703
"label.group.optional": "Grupo (opcional)",
703704
"label.gslb": "GSLB",
@@ -1425,6 +1426,7 @@
14251426
"label.see.more.info.memory.usage": "Ver mais informa\u00e7\u00f5es sobre o uso de mem\u00f3ria",
14261427
"label.see.more.info.network.usage": "Ver mais informa\u00e7\u00f5es sobre o uso de rede",
14271428
"label.see.more.info.disk.usage": "Ver mais informa\u00e7\u00f5es sobre o uso de disco",
1429+
"label.see.more.info.shown.charts": "Ver mais informa\u00E7\u00F5es sobre os gr\u00E1ficos mostrados",
14281430
"label.select": "Selecionar",
14291431
"label.select-view": "Selecionar visualiza\u00e7\u00e3o",
14301432
"label.select.a.zone": "Selecione uma zona",
@@ -1972,8 +1974,7 @@
19721974
"message.confirm.start.lb.vm": "Confirme que voc\u00ea deseja iniciar esta LB VM",
19731975
"message.confirm.sync.storage": "Por favor, confirme que voc\u00ea gostaria de sincronizar o pool de armazenamento",
19741976
"message.confirm.upgrade.router.newer.template": "Por favor confirme que voc\u00ea deseja atualizar o roteador para usar o template mais recente.",
1975-
"message.cpu.usage.info.multi.cpu": "O percentual de uso de CPU pode passar de 100% quando uma VM possui mais de 1 vCPU. Isso pode acontecer dependendo da forma que o virtualizador contabiliza as estat\u00edsticas.",
1976-
"message.cpu.usage.info.cpu.cap": "Se uma VM possui apenas 1 vCPU e o CPU Cap da oferta de computa\u00e7\u00e3o estiver desabilitado, o percentual de uso de CPU tamb\u00e9m pode passar de 100%. Isso porque a VM pode utilizar mais CPUs do que lhe foi atribu\u00eddo",
1977+
"message.cpu.usage.info": "A porcentagem de uso da CPU pode exceder 100% se a VM tiver mais de 1 vCPU ou quando o CPU Cap n\u00E3o estiver habilitado. Este comportamento acontece de acordo com o hypervisor que est\u00E1 sendo utilizado (ex: no KVM), devido \u00E0 forma como contabilizam as estat\u00EDsticas",
19771978
"message.create.compute.offering": "Oferta de computa\u00e7\u00e3o criada",
19781979
"message.create.internallb": "Criando LB interno",
19791980
"message.create.internallb.failed": "Falha ao criar LB interno",
@@ -2180,6 +2181,7 @@
21802181
"message.failed.to.assign.vms": "Falha ao atribuir VMs",
21812182
"message.failed.to.remove": "Falha ao remover",
21822183
"message.generate.keys": "Por favor confirme que voc\u00ea deseja gerar novas chaves para este usu\u00e1rio.",
2184+
"message.chart.statistic.info": "Os gr\u00E1ficos mostrados s\u00E3o autoajust\u00E1veis, ou seja, se o valor se aproximar ou passar do limite, ele crescer\u00E1 para ajustar o valor mostrado",
21832185
"message.guest.traffic.in.advanced.zone": "O tr\u00e1fego de rede guest \u00e9 para comunica\u00e7\u00e3o entre m\u00e1quinas virtuais do usu\u00e1rio final. Especifique um intervalo de IDs de VLAN para transportar o tr\u00e1fego do guest para cada rede f\u00edsica.",
21842186
"message.guest.traffic.in.basic.zone": "O tr\u00e1fego de rede guest \u00e9 para comunica\u00e7\u00e3o entre m\u00e1quinas virtuais do usu\u00e1rio final. Especifique um intervalo de endere\u00e7os IP para que CloudStack possa atribuir \u00e0s VMs. Certifique-se que este intervalo n\u00e3o se sobreponha o range de IPs reservados do sistema.",
21852187
"message.host.dedicated": "Host dedicado",

ui/src/components/view/StatsTab.vue

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -42,6 +42,7 @@
4242
</a-button>
4343
<span v-html="formatedPeriod"></span>
4444
</span>
45+
<InfoCircleOutlined class="info-icon" :title="$t('label.see.more.info.shown.charts')" @click="onClickShowResourceInfoModal('CHART')"/>
4546
</a-col>
4647
</a-row>
4748
<div v-if="loaded">
@@ -316,6 +317,9 @@ export default {
316317
},
317318
onClickShowResourceInfoModal (resource) {
318319
switch (resource) {
320+
case 'CHART':
321+
this.resourceInfoModalTitle = this.$t('label.chart.info')
322+
break
319323
case 'CPU':
320324
this.resourceInfoModalTitle = this.$t('label.cpu.usage.info')
321325
break

ui/src/components/view/stats/ResourceStatsInfo.vue

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -47,11 +47,16 @@ export default {
4747
data () {
4848
return {
4949
info: [
50+
{
51+
resourceType: 'CHART',
52+
messageList: [
53+
this.$t('message.chart.statistic.info')
54+
]
55+
},
5056
{
5157
resourceType: 'CPU',
5258
messageList: [
53-
this.$t('message.cpu.usage.info.multi.cpu'),
54-
this.$t('message.cpu.usage.info.cpu.cap')
59+
this.$t('message.cpu.usage.info')
5560
]
5661
},
5762
{

0 commit comments

Comments
 (0)