Skip to content

Commit

Permalink
Merge pull request #176 from ualex73/master
Browse files Browse the repository at this point in the history
Merge 1.20b3 features/fixes
  • Loading branch information
ualex73 authored Jan 19, 2025
2 parents 5995d0d + b7fcc86 commit e03e942
Show file tree
Hide file tree
Showing 4 changed files with 13 additions and 2 deletions.
6 changes: 6 additions & 0 deletions custom_components/monitor_docker/const.py
Original file line number Diff line number Diff line change
Expand Up @@ -71,6 +71,7 @@
CONTAINER_INFO_NETWORK_AVAILABLE = "network_available"
CONTAINER_INFO_UPTIME = "uptime"
CONTAINER_INFO_IMAGE = "image"
CONTAINER_INFO_IMAGE_HASH = "image_hash"
CONTAINER_STATS_CPU_PERCENTAGE = "cpu_percentage"
CONTAINER_STATS_1CPU_PERCENTAGE = "1cpu_percentage"
CONTAINER_STATS_MEMORY = "memory"
Expand Down Expand Up @@ -177,6 +178,11 @@
name="Image",
icon="mdi:information-outline",
),
CONTAINER_INFO_IMAGE_HASH: SensorEntityDescription(
key=CONTAINER_INFO_IMAGE_HASH,
name="Image Hash",
icon="mdi:pound-box-outline",
),
CONTAINER_STATS_CPU_PERCENTAGE: SensorEntityDescription(
key=CONTAINER_STATS_CPU_PERCENTAGE,
name="CPU",
Expand Down
4 changes: 3 additions & 1 deletion custom_components/monitor_docker/helpers.py
Original file line number Diff line number Diff line change
Expand Up @@ -44,6 +44,7 @@
CONTAINER,
CONTAINER_INFO_HEALTH,
CONTAINER_INFO_IMAGE,
CONTAINER_INFO_IMAGE_HASH,
CONTAINER_INFO_NETWORK_AVAILABLE,
CONTAINER_INFO_STATE,
CONTAINER_INFO_STATUS,
Expand All @@ -70,7 +71,7 @@
PRECISION,
)

VERSION = "1.20b2"
VERSION = "1.20b3"

_LOGGER = logging.getLogger(__name__)

Expand Down Expand Up @@ -1005,6 +1006,7 @@ async def _run_container_info(self) -> None:

self._info[CONTAINER_INFO_STATE] = raw["State"]["Status"]
self._info[CONTAINER_INFO_IMAGE] = raw["Config"]["Image"]
self._info[CONTAINER_INFO_IMAGE_HASH] = raw["Image"]

if self._network_error <= 5:
if CONTAINER_INFO_NETWORK_AVAILABLE not in self._info:
Expand Down
2 changes: 1 addition & 1 deletion custom_components/monitor_docker/manifest.json
Original file line number Diff line number Diff line change
Expand Up @@ -7,5 +7,5 @@
"iot_class": "local_polling",
"issue_tracker": "https://github.com/ualex73/monitor_docker/issues",
"requirements": ["aiodocker==0.24.0", "python-dateutil==2.9.0.post0"],
"version": "1.20b2"
"version": "1.20b3"
}
3 changes: 3 additions & 0 deletions custom_components/monitor_docker/sensor.py
Original file line number Diff line number Diff line change
Expand Up @@ -38,6 +38,7 @@
CONTAINER_INFO_ALLINONE,
CONTAINER_INFO_HEALTH,
CONTAINER_INFO_IMAGE,
CONTAINER_INFO_IMAGE_HASH,
CONTAINER_INFO_NETWORK_AVAILABLE,
CONTAINER_INFO_STATE,
CONTAINER_INFO_STATUS,
Expand Down Expand Up @@ -423,6 +424,7 @@ def event_callback(self, name="", remove=False) -> None:
if cond in [
CONTAINER_INFO_STATUS,
CONTAINER_INFO_IMAGE,
CONTAINER_INFO_IMAGE_HASH,
CONTAINER_INFO_HEALTH,
CONTAINER_INFO_UPTIME,
]:
Expand All @@ -435,6 +437,7 @@ def event_callback(self, name="", remove=False) -> None:
elif self.entity_description.key in [
CONTAINER_INFO_STATE,
CONTAINER_INFO_IMAGE,
CONTAINER_INFO_IMAGE_HASH,
CONTAINER_INFO_HEALTH,
]:
state = info.get(self.entity_description.key)
Expand Down

0 comments on commit e03e942

Please sign in to comment.