diff --git a/LibreNMS/Data/Metrics/MetricEntry.php b/LibreNMS/Data/Metrics/MetricEntry.php index 67b795b7db836f981d1a5e940447a915c384ae84..b35669afe978ff8d55623d05b1d98f78b8955a25 100644 --- a/LibreNMS/Data/Metrics/MetricEntry.php +++ b/LibreNMS/Data/Metrics/MetricEntry.php @@ -5,13 +5,14 @@ namespace LibreNMS\Data\Metrics; readonly class MetricEntry { /** - * @param string $metric metric name + * @param string $metric metric name * @param array $fields - * @param array $tags + * @param array $tags */ public function __construct( public string $metric, public array $fields, public array $tags, - ) {} + ) { + } } diff --git a/LibreNMS/Data/Metrics/MetricWriter.php b/LibreNMS/Data/Metrics/MetricWriter.php index 32911e6b1091e6111fe59d21845ed982a7db1cda..f8009e43a3f2d7938f8c7ac39d8443ba28b81f82 100644 --- a/LibreNMS/Data/Metrics/MetricWriter.php +++ b/LibreNMS/Data/Metrics/MetricWriter.php @@ -9,7 +9,8 @@ class MetricWriter public function __construct( private readonly MetricCollector $collector, private readonly WriteInterface $writer, - ) {} + ) { + } public function writeMetrics(): void { @@ -20,7 +21,7 @@ class MetricWriter public function writeMetric(string $metric, array $meta = []): void { - foreach($this->collector->forMetric($metric) as $entry) { + foreach ($this->collector->forMetric($metric) as $entry) { $meta['rrd_name'] = $metric . '-' . implode('-', $entry->tags); $this->writer->write($metric, $entry->fields, $entry->tags, $meta); diff --git a/LibreNMS/Interfaces/Polling/VmPortPolling.php b/LibreNMS/Interfaces/Polling/VmPortPolling.php index 28c795753790f72dd5890a37b6c265181e31588d..2235d0740bbfce9741b1b6a46614755de7eaf78b 100644 --- a/LibreNMS/Interfaces/Polling/VmPortPolling.php +++ b/LibreNMS/Interfaces/Polling/VmPortPolling.php @@ -1,6 +1,5 @@ record($vm, 'vm.diskio', $this->aggregateDiskStats($status)); - // Disk usage // prefer guest agent (accurate per-filesystem data), // fall back to hypervisor-level values if agent is absent/unavailable. $fsInfo = $api->getVmFsInfo($vm->vmwVmVMID); - if (!empty($fsInfo)) { + if (! empty($fsInfo)) { // Aggregate across all real filesystems, skipping pseudo-mounts $skipTypes = ['tmpfs', 'devtmpfs', 'squashfs', 'overlay', 'proc', 'sysfs', 'cgroup', 'cgroup2']; - $diskUsed = 0; + $diskUsed = 0; $diskTotal = 0; foreach ($fsInfo as $fs) { if (in_array($fs['type'] ?? '', $skipTypes, true)) { continue; } - $diskUsed += $fs['used-bytes'] ?? 0; + $diskUsed += $fs['used-bytes'] ?? 0; $diskTotal += $fs['total-bytes'] ?? 0; } $metrics->record($vm, 'vm.disk', [ - 'used' => $diskUsed, + 'used' => $diskUsed, 'total' => $diskTotal, ]); } else { diff --git a/app/ApiClients/ProxmoxApi.php b/app/ApiClients/ProxmoxApi.php index 5d2c816081085420f0681f19da5eed6d33c256bd..462de76d7902aa38efd5580e3a4d31d9676e483b 100644 --- a/app/ApiClients/ProxmoxApi.php +++ b/app/ApiClients/ProxmoxApi.php @@ -15,7 +15,7 @@ readonly class ProxmoxApi public function __construct( private string $hostname, private int $timeout = 10, - ){ + ) { $this->base_uri = "https://$this->hostname:8006/api2/json"; $this->tokenName = LibrenmsConfig::get('proxmox.token_id'); $this->tokenSecret = LibrenmsConfig::get('proxmox.secret'); diff --git a/includes/html/graphs/vminfo/diskio_bits.inc.php b/includes/html/graphs/vminfo/diskio_bits.inc.php index 410b0bb92d591ce920d9e270bc467c14e9e93bb1..bdd378deffea8eee16c454e745ada63f4db78e0a 100644 --- a/includes/html/graphs/vminfo/diskio_bits.inc.php +++ b/includes/html/graphs/vminfo/diskio_bits.inc.php @@ -1,6 +1,6 @@ tags()]); +$rrd_filename = Rrd::name($device['hostname'], ['vm.diskio', ...$vminfo->tags()]); if (! Rrd::checkRrdExists($rrd_filename)) { throw new \LibreNMS\Exceptions\RrdGraphException('No Data'); @@ -15,5 +15,4 @@ $colour_line_in = '990000'; $colour_area_out = '00FF00'; $colour_line_out = '009900'; - require 'includes/html/graphs/generic_duplex.inc.php'; diff --git a/includes/html/graphs/vminfo/diskio_ops.inc.php b/includes/html/graphs/vminfo/diskio_ops.inc.php index 87343bc9388c36f38f9d8028ee1a959b4f57da31..ab718804f76abf8b8696452d46c9e81c91132492 100644 --- a/includes/html/graphs/vminfo/diskio_ops.inc.php +++ b/includes/html/graphs/vminfo/diskio_ops.inc.php @@ -11,7 +11,6 @@ $colour_line_in = '990000'; $colour_area_out = '00FF00'; $colour_line_out = '009900'; - $ds_in = 'read_ops'; $ds_out = 'write_ops'; $unit_text = 'Ops/sec'; diff --git a/includes/html/graphs/vminfo/net.inc.php b/includes/html/graphs/vminfo/net.inc.php index 76b90c2f45b190b036b39f97d5d4bbe0e70398a2..d503350f0593790969659fa0f1751c0f514cb02a 100644 --- a/includes/html/graphs/vminfo/net.inc.php +++ b/includes/html/graphs/vminfo/net.inc.php @@ -14,7 +14,6 @@ $colour_line_out = '009900'; $ds_in = 'in'; $ds_out = 'out'; - $unit_text = 'Bits/sec'; $multiplier = 8;