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
4 changes: 4 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,9 @@
# Changelog

## v1.2.24
- Added a number box input for configuring the update interval during setup and in the options flow.
- Parallelized initial coordinator refreshes to speed up startup when multiple servers are configured.

## v1.2.10
- Dynamically create container CPU and RAM sensors when new Docker containers appear on a monitored server.
- Mark removed containers as unavailable so they disappear automatically after reloading the integration configuration.
Expand Down
12 changes: 9 additions & 3 deletions custom_components/vserver_ssh_stats/config_flow.py
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,11 @@ def _build_server_schema(

schema: dict[Any, Any] = {}
if include_interval:
schema[vol.Required("interval", default=defaults.get("interval", interval_default))] = int
schema[vol.Required("interval", default=defaults.get("interval", interval_default))] = (
selector.NumberSelector(
selector.NumberSelectorConfig(min=1, step=1, mode=selector.NumberSelectorMode.BOX)
)
)

schema[vol.Required("name", default=defaults.get("name", default_name))] = str
schema[vol.Required("host", default=defaults.get("host", default_host))] = host_field
Expand Down Expand Up @@ -255,8 +259,10 @@ async def async_step_init(self, user_input: dict[str, Any] | None = None):
step_id="init",
data_schema=vol.Schema(
{
vol.Required("interval", default=self._interval): vol.All(
vol.Coerce(int), vol.Range(min=1)
vol.Required("interval", default=self._interval): selector.NumberSelector(
selector.NumberSelectorConfig(
min=1, step=1, mode=selector.NumberSelectorMode.BOX
)
),
vol.Optional("reconfigure_servers", default=False): bool,
}
Expand Down
22 changes: 14 additions & 8 deletions custom_components/vserver_ssh_stats/sensor.py
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
"""Sensor platform for VServer SSH Stats."""
from __future__ import annotations

import asyncio
import logging
import re
import socket
Expand Down Expand Up @@ -269,22 +270,28 @@ async def async_setup_entry(
servers = data.get("servers", [])
interval = data.get("interval", 30)
entities: list[VServerSensor] = []
coordinators: list[VServerCoordinator] = []
registries: list[tuple[ServerContainerRegistry, ServerDiskRegistry, str]] = []
for srv in servers:
name = srv.get("name")
if not name:
continue
coordinator = VServerCoordinator(hass, srv, interval)
await coordinator.async_config_entry_first_refresh()
coordinators.append(coordinator)
container_registry = ServerContainerRegistry(coordinator, name)
disk_registry = ServerDiskRegistry(coordinator, name)
registries.append((container_registry, disk_registry, name))
for description in SENSORS:
entities.append(VServerSensor(coordinator, name, description))
initial_stats: Iterable[Dict[str, Any]] | None = None
if coordinator.data:
initial_stats = coordinator.data.get("container_stats")
disk_initial_stats: Iterable[Dict[str, Any]] | None = None
if coordinator.data:
disk_initial_stats = coordinator.data.get("disk_stats")
if coordinators:
await asyncio.gather(
*(coordinator.async_config_entry_first_refresh() for coordinator in coordinators)
)
for container_registry, disk_registry, _name in registries:
coordinator = container_registry.coordinator
stats = coordinator.data if isinstance(coordinator.data, dict) else {}
initial_stats = stats.get("container_stats")
disk_initial_stats = stats.get("disk_stats")
entities.extend(container_registry.create_entities_from_stats(initial_stats))
entities.extend(disk_registry.create_entities_from_stats(disk_initial_stats))

Expand All @@ -310,4 +317,3 @@ def _handle_update() -> None:
)
entry.async_on_unload(remove_listener)
async_add_entities(entities, update_before_add=True)