Merge pull request #17 in OVZ/vzstat from ~FEDYA/vzstat:master to master* commit '207d45953123d91de3613fdddf31746d99952324':
Add -Wno-format-truncation to CFLAGS, to prevent format truncating errors introduced in gcc8
fix Werror=format-string to prevent #PSBM-105164
Fixed comp[ilation warningsrc/vzstat.c:2144:8: error: ignoring return value of 'fscanf', declared with attribute warn_unused_result [-Werror=unused-result]
Signed-off-by: Igor Sukhih <igor@virtuozzo.com>
Merge pull request #16 in OVZ/vzstat from ~IGOR/vzstat:master to master* commit 'deef6c4f830664a3edbfd088bf5d73a3ac3d97cd':
vzstat do not show actual IO and IOPS limits #PSBM-101150
vzstat do not show actual IO and IOPS limits #PSBM-101150Get iolimits from cgroup
beancounter.iolimit.speed
beancounter.iopslimit.speed
Signed-off-by: Igor Sukhih <igor@virtuozzo.com>
Merge pull request #15 in OVZ/vzstat from ~PVOKHMYANIN/vzstat-psbm-97932:master to master* commit '8d96b60a4da68c4e402ba0af3ef72f5d73df583e':
Fix total processes sort #PSBM-97932
Fix running process counting #PSBM-97932
Fix total processes sort #PSBM-97932"next_id" truct ield is processed when displaying available sort options,
but is not processed when sort mode is passed to getch(). Add missing logic.
Signed-off-by: Pavel Vokhmyanin <pvokhmyanin@virtuozzo.com>
Fix running process counting #PSBM-97932Fix wrong path to cgoup.procs, should be pointing to .../ve/, not .../memory/
Signed-off-by: Pavel Vokhmyanin <pvokhmyanin@virtuozzo.com>
Merge pull request #14 in OVZ/vzstat from ~IGOR/vzstat:master to master* commit '0c400209c2f5cc43b1f14c54449cc1a6b4a1e533':
man/vzstat.8: add -c description #PSBM-95655
vzstat: -p option does not work #PSBM-95655
Merge pull request #12 in OVZ/vzstat from ~IGOR/vzstat:master to master* commit '2185299481bf525307f338f8446e86952e8a3784':
AUTO Version bump to 7.0.17
process CT cpu weight parameter #PSBM-76790
process CT cpu weight parameter #PSBM-76790Read cpu weight from /sys/fs/cgroup/cpuacct/machine.slice/$CTID/cpu.shares
Signed-off-by: Igor Sukhih <igor@virtuozzo.com>
Merge pull request #11 in OVZ/vzstat from ~IGOR/vzstat:master to master* commit 'f3c870e460bb8de6268476d611742a6101ea2989':
CT id is truncated #PSBM-76801
CT id is truncated #PSBM-76801CT id in uuid format is truncated to reduceline length, lets display
full ctid in the batch mode
Signed-off-by: Igor Sukhih <igor@virtuozzo.com>
Merge pull request #10 in OVZ/vzstat from ~ABONDROV/vzstat:master to master* commit '0b9a6488e48d7275d48d2439775942381d880165':
Don't ignore fscanf return value
Fixed path to CT cpu.proc.stat,cpu.delayacct.totalCT cpu cgroup placed under machine.slice
/sys/fs/cgroup/cpu/$CTID/machine.slice/cpu.proc.stat
/sys/fs/cgroup/cpu/$CTID/machine.slice/cpu.delayacct.total
Signed-off-by: Igor Sukhih <igor@virtuozzo.com>
Merge pull request #9 in OVZ/vzstat from ~IPYASS/vzstat:master to master* commit 'af2e962ea7fb2375d8e7d2158f931156cd09a6eb':
Fix terminal color corruption
Fix terminal color corruptionvzstat corrupts terminal color after exit - if it was previously white, then it'll remain black
This patch removes unneccessary color setting. PSBM-65422
Merge pull request #7 in OVZ/vzstat from ~WOLF/vzstat:master to master* commit '185610960665d89879d10896d7e2d076e279f875':
Added rebrand defines, see #PSBM-58317