Skip to content

Commit 9155d0e

Browse files
committed
Migrate docker monitored group to switch group integration
1 parent 8a973de commit 9155d0e

4 files changed

Lines changed: 14 additions & 15 deletions

File tree

config/dashboards/infrastructure/partials/docker_containers_sections.yaml

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -194,11 +194,10 @@
194194
card_param: cards
195195
filter:
196196
include:
197-
- group: group.docker_monitored_containers
197+
- group: switch.docker_monitored_containers
198198
options:
199199
type: custom:button-card
200200
template: bearstone_infra_container_row
201201
icon: mdi:docker
202202
sort:
203203
method: name
204-

config/dashboards/infrastructure/partials/home_sections.yaml

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -449,7 +449,7 @@
449449
card_param: cards
450450
filter:
451451
include:
452-
- group: group.docker_monitored_containers
452+
- group: switch.docker_monitored_containers
453453
options:
454454
type: custom:button-card
455455
template: bearstone_infra_container_row
@@ -636,4 +636,3 @@
636636
name: Download
637637
- entity: sensor.speedtest_upload
638638
name: Upload
639-

config/dashboards/infrastructure/templates/button_card_templates.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -614,7 +614,7 @@ bearstone_infra_container_row:
614614
}
615615
const switchEntity = key ? `switch.${key}_container` : '';
616616
const switchEntityAlt = key ? `switch.${key}_container_2` : '';
617-
const monitored = states['group.docker_monitored_containers']?.attributes?.entity_id || [];
617+
const monitored = states['switch.docker_monitored_containers']?.attributes?.entity_id || [];
618618
const restartCandidates = key ? [
619619
`button.${key}_restart_container`,
620620
`button.${key}_restart_container_2`,

config/packages/docker_infrastructure.yaml

Lines changed: 11 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,9 @@
44
# Original Repo : https://github.com/CCOSTAN/Home-AssistantConfig
55
# -------------------------------------------------------------------
66
# Docker Infrastructure - Host patching and container alerts
7+
# Related Issue: 1632, 1584
78
# APT webhook results (docker_10/14/17/69) and container down repairs.
89
# -------------------------------------------------------------------
9-
# Related Issue: 1584
1010
# Notes: Hosts run weekly Wed 12:00 APT job and POST JSON to webhooks.
1111
# Notes: Reboots are handled directly on each host by apt_weekly.sh.
1212
# Notes: Reboot staggering: docker_14 first, docker_69 second, docker_10 third.
@@ -66,9 +66,10 @@ input_text:
6666
name: "docker_69 APT last result"
6767
max: 255
6868

69-
group:
70-
docker_monitored_containers:
69+
switch:
70+
- platform: group
7171
name: Docker Monitored Containers
72+
unique_id: docker_monitored_containers
7273
entities:
7374
- switch.cloudflared_kch_container
7475
- switch.cloudflared_wp_container
@@ -206,14 +207,14 @@ template:
206207
unique_id: docker_monitored_container_count
207208
icon: mdi:format-list-numbered
208209
state: >-
209-
{{ state_attr('group.docker_monitored_containers', 'entity_id') | default([], true) | count }}
210+
{{ state_attr('switch.docker_monitored_containers', 'entity_id') | default([], true) | count }}
210211
211212
- name: "Docker Monitored Unavailable Count"
212213
unique_id: docker_monitored_unavailable_count
213214
icon: mdi:lan-disconnect
214215
state: >-
215216
{% set ns = namespace(keys=[], unavailable=0) %}
216-
{% set monitored = state_attr('group.docker_monitored_containers', 'entity_id') | default([], true) %}
217+
{% set monitored = state_attr('switch.docker_monitored_containers', 'entity_id') | default([], true) %}
217218
{% for switch_entity in monitored %}
218219
{% set key = switch_entity | replace('switch.', '') | regex_replace('_container(?:_2)?$', '') %}
219220
{% if key not in ns.keys %}
@@ -257,7 +258,7 @@ template:
257258
icon: mdi:docker
258259
state: >-
259260
{% set ns = namespace(keys=[], down=[]) %}
260-
{% set monitored = state_attr('group.docker_monitored_containers', 'entity_id') | default([], true) | list %}
261+
{% set monitored = state_attr('switch.docker_monitored_containers', 'entity_id') | default([], true) | list %}
261262
{% set telemetry_degraded = is_state('binary_sensor.docker_container_telemetry_degraded', 'on') %}
262263
{% for switch_entity in monitored %}
263264
{% set key = switch_entity | replace('switch.', '') | regex_replace('_container(?:_2)?$', '') %}
@@ -301,7 +302,7 @@ template:
301302
attributes:
302303
down_containers: >-
303304
{% set ns = namespace(keys=[], down=[]) %}
304-
{% set monitored = state_attr('group.docker_monitored_containers', 'entity_id') | default([], true) | list %}
305+
{% set monitored = state_attr('switch.docker_monitored_containers', 'entity_id') | default([], true) | list %}
305306
{% set telemetry_degraded = is_state('binary_sensor.docker_container_telemetry_degraded', 'on') %}
306307
{% for switch_entity in monitored %}
307308
{% set key = switch_entity | replace('switch.', '') | regex_replace('_container(?:_2)?$', '') %}
@@ -437,7 +438,7 @@ script:
437438
status_entity_alt: "binary_sensor.{{ container_key }}_status_2"
438439
state_entity: "sensor.{{ container_key }}_state"
439440
state_entity_alt: "sensor.{{ container_key }}_state_2"
440-
monitored_switches: "{{ state_attr('group.docker_monitored_containers', 'entity_id') | default([], true) }}"
441+
monitored_switches: "{{ state_attr('switch.docker_monitored_containers', 'entity_id') | default([], true) }}"
441442
tracked_container: "{{ switch_entity in monitored_switches or switch_entity_alt in monitored_switches }}"
442443
effective_entity: >-
443444
{% if expand(status_entity) | count > 0 %}
@@ -798,7 +799,7 @@ automation:
798799
entity_id: "{{ trigger.event.data.entity_id | default('') }}"
799800
old_state: "{{ (trigger.event.data.old_state.state if trigger.event.data.old_state is not none else '') | lower }}"
800801
new_state: "{{ (trigger.event.data.new_state.state if trigger.event.data.new_state is not none else '') | lower }}"
801-
monitored_switches: "{{ state_attr('group.docker_monitored_containers', 'entity_id') | default([], true) | list }}"
802+
monitored_switches: "{{ state_attr('switch.docker_monitored_containers', 'entity_id') | default([], true) | list }}"
802803
is_monitored_container_event: >-
803804
{% set ent = entity_id %}
804805
{% if ent.startswith('switch.') and (ent.endswith('_container') or ent.endswith('_container_2')) %}
@@ -888,7 +889,7 @@ automation:
888889
minutes: "/55"
889890
action:
890891
- variables:
891-
monitored_switches: "{{ state_attr('group.docker_monitored_containers', 'entity_id') | default([], true) | list }}"
892+
monitored_switches: "{{ state_attr('switch.docker_monitored_containers', 'entity_id') | default([], true) | list }}"
892893
- repeat:
893894
for_each: "{{ monitored_switches }}"
894895
sequence:

0 commit comments

Comments
 (0)