Skip to content

Commit

Permalink
v2024.5
Browse files Browse the repository at this point in the history
  • Loading branch information
aneisch committed Apr 27, 2024
1 parent 8ef82bd commit 20fcb84
Show file tree
Hide file tree
Showing 12 changed files with 27 additions and 27 deletions.
11 changes: 6 additions & 5 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
[![Build Status](https://github.com/aneisch/home-assistant-config/actions/workflows/check-ha-release-compatibility.yml/badge.svg)](https://github.com/aneisch/home-assistant-config/actions)
[![GitHub last commit](https://img.shields.io/github/last-commit/aneisch/home-assistant-config)](https://github.com/aneisch/home-assistant-config/commits/master)
[![GitHub commit activity](https://img.shields.io/github/commit-activity/y/aneisch/home-assistant-config)](https://github.com/aneisch/home-assistant-config/graphs/commit-activity)
[![HA Version](https://img.shields.io/badge/Running%20Home%20Assistant-2024.4.4%20(Latest)-brightgreen)](https://github.com/home-assistant/home-assistant/releases/latest)
[![HA Version](https://img.shields.io/badge/Running%20Home%20Assistant%20-2024.5.0b0%20(Out%20of%20Date)-Red)](https://github.com/home-assistant/home-assistant/releases/latest)
<br><a href="https://www.buymeacoffee.com/aneisch" target="_blank"><img src="https://cdn.buymeacoffee.com/buttons/default-black.png" width="150px" height="35px" alt="Buy Me A Coffee" style="height: 35px !important;width: 150px !important;" ></a>


Expand Down Expand Up @@ -57,18 +57,19 @@ Also using Grafana/Influx for graphing, both running in Docker containers on NUC
Description | value
-- | --
Lines of ESPHome YAML | 2801
Lines of Home Assistant YAML | 9008
[Integrations](https://www.home-assistant.io/integrations/) in use | 59
Lines of Home Assistant YAML | 9010
[Integrations](https://www.home-assistant.io/integrations/) in use | 60
Zigbee devices in [`zha`](https://www.home-assistant.io/integrations/zha/) | 26
Z-Wave devices in [`zwave_js`](https://www.home-assistant.io/integrations/zwave_js/) | 37

Description | value
-- | --
Entities in the [`automation`](https://www.home-assistant.io/components/automation) domain | 121
Entities in the [`binary_sensor`](https://www.home-assistant.io/components/binary_sensor) domain | 135
Entities in the [`binary_sensor`](https://www.home-assistant.io/components/binary_sensor) domain | 139
Entities in the [`button`](https://www.home-assistant.io/components/button) domain | 15
Entities in the [`camera`](https://www.home-assistant.io/components/camera) domain | 14
Entities in the [`climate`](https://www.home-assistant.io/components/climate) domain | 1
Entities in the [`conversation`](https://www.home-assistant.io/components/conversation) domain | 1
Entities in the [`counter`](https://www.home-assistant.io/components/counter) domain | 1
Entities in the [`cover`](https://www.home-assistant.io/components/cover) domain | 13
Entities in the [`device_tracker`](https://www.home-assistant.io/components/device_tracker) domain | 4
Expand Down Expand Up @@ -99,7 +100,7 @@ Entities in the [`update`](https://www.home-assistant.io/components/update) doma
Entities in the [`vacuum`](https://www.home-assistant.io/components/vacuum) domain | 1
Entities in the [`weather`](https://www.home-assistant.io/components/weather) domain | 1
Entities in the [`zone`](https://www.home-assistant.io/components/zone) domain | 6
**Total state objects** | **1212**
**Total state objects** | **1217**
## The HACS integrations/plugins that I use:
**Appdaemon**:<br>
[aneisch/follow_me_appdaemon](https://github.com/aneisch/follow_me_appdaemon)<br>
Expand Down
18 changes: 10 additions & 8 deletions configuration.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -71,13 +71,14 @@ config:

energy:

folder_watcher:
- folder: '/tmp'
patterns:
- "database.sqlite"
- folder: '/tmp'
patterns:
- "config.yml"
# Moved to UI v2024.5
# folder_watcher:
# - folder: '/tmp'
# patterns:
# - "database.sqlite"
# - folder: '/tmp'
# patterns:
# - "config.yml"

monitor_docker:
#scan_interval: 60
Expand Down Expand Up @@ -124,9 +125,10 @@ homekit: !include homekit.yaml
http:
use_x_forwarded_for: true
trusted_proxies:
- 172.18.0.0/24 # Nginx Proxy Manager
- 172.18.0.0/24 # Traefik
- 10.0.1.22/32 # NUC
server_port: 8123
# strict_connection: guard_page

ifttt:
key: !secret IFTTT
Expand Down
3 changes: 1 addition & 2 deletions extras/docker-compose/homeassistant/docker-compose.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ version: '3.2'
services:
homeassistant:
container_name: homeassistant
image: ghcr.io/home-assistant/home-assistant:stable
image: ghcr.io/home-assistant/home-assistant:beta
labels:
- com.centurylinklabs.watchtower.monitor-only=true
# HTTPS for CF
Expand All @@ -20,7 +20,6 @@ services:
- traefik.http.routers.assist_local.service=assist
volumes:
- /opt/homeassistant:/config
#- /opt/nginx-proxy-manager/database.sqlite:/tmp/database.sqlite
- /var/run/docker.sock:/var/run/docker.sock
- /home/aneisch/symlinks_for_rsync/hass-docker-ssh:/root/.ssh:ro
- /tmp/radar.gif:/tmp/radar.gif
Expand Down
8 changes: 3 additions & 5 deletions extras/docker-compose/other/docker-compose.yml
Original file line number Diff line number Diff line change
Expand Up @@ -488,7 +488,6 @@ services:
- EXTRA=-display none -vnc 0.0.0.0:99,password-secret=secvnc0 -object secret,id=secvnc0,data=vncpass
- TZ=America/Chicago
- ADDITIONAL_PORTS=hostfwd=tcp::1234-:1234,

devices:
- /dev/kvm
user: root
Expand Down Expand Up @@ -536,7 +535,6 @@ services:
- traefik.http.routers.go2rtc_local.tls.certResolver=le-home
- traefik.http.routers.go2rtc_local.tls.domains[0].main=*.home.domain.com
- traefik.http.routers.go2rtc_local.rule=Host(`go2rtc.home.domain.com`)

environment:
- PLUS_API_KEY=secret
- TZ=America/Chicago
Expand Down Expand Up @@ -647,6 +645,6 @@ services:
volumes:
- '/var/run/docker.sock:/var/run/docker.sock'

networks:
macos_network:
driver: bridge
# networks:
# macos_network:
# driver: bridge
2 changes: 1 addition & 1 deletion extras/docker-compose/unified/docker-compose.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ version: '3.2'
services:
homeassistant:
container_name: homeassistant
image: ghcr.io/home-assistant/home-assistant:stable
image: ghcr.io/home-assistant/home-assistant:beta
labels:
- com.centurylinklabs.watchtower.monitor-only=true
# HTTPS for CF
Expand Down
Binary file modified images/nodered_1.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified images/nodered_2.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
2 changes: 1 addition & 1 deletion packages/ups_monitor.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ automation:
data:
message: >
{% if trigger.from_state.state == "ONBATT" %}
{{ trigger.to_state.attributes.friendly_name }} {{ trigger.to_state.state }}: {{ now().strftime('%Y-%m-%d %T') }}. Outaged lasted {{ relative_time(trigger.from_state.last_changed) }}
{{ trigger.to_state.attributes.friendly_name }} {{ trigger.to_state.state }}: {{ now().strftime('%Y-%m-%d %T') }}. Outaged lasted {{ time_since(trigger.from_state.last_changed) }}
{% else %}
{{ trigger.to_state.attributes.friendly_name }} {{ trigger.to_state.state }}: {{ now().strftime('%Y-%m-%d %T') }}
{% endif %}
Expand Down
2 changes: 1 addition & 1 deletion packages/vacuum.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -113,7 +113,7 @@ sensor:
# with some other templating functions and filters.
roborock_s4_last_cleaned:
friendly_name: Relative time since last cleaning ended
value_template: "{{relative_time(strptime(as_timestamp(states('sensor.roborock_s4_last_clean_end'))|timestamp_custom('%Y-%m-%d %H:%M:%S'), '%Y-%m-%d %H:%M:%S'))}}"
value_template: "{{time_since(strptime(as_timestamp(states('sensor.roborock_s4_last_clean_end'))|timestamp_custom('%Y-%m-%d %H:%M:%S'), '%Y-%m-%d %H:%M:%S'))}}"

# roborock_s4_lifetime_cleaning_count:
# friendly_name: 'Lifetime Cleaning Count'
Expand Down
2 changes: 1 addition & 1 deletion ui-lovelace/01-home.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ cards:
cards:
- !include .cards/thermostat.yaml
- type: markdown
content: 'Last Thermostat Status Update: {{ relative_time(as_datetime(states("sensor.thermostat_last_communication"))) }} ago'
content: 'Last Thermostat Status Update: {{ time_since(as_datetime(states("sensor.thermostat_last_communication"))) }} ago'

- type: custom:vertical-stack-in-card
cards:
Expand Down
4 changes: 2 additions & 2 deletions ui-lovelace/05-server.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ cards:
cards:
- type: markdown
content: |
Last NUC Backup: {{ relative_time(strptime(states.sensor.last_nuc_backup_completed.state, '%Y-%m-%d %H:%M:%S')) }} ago
Last NUC Backup: {{ time_since(strptime(states.sensor.last_nuc_backup_completed.state, '%Y-%m-%d %H:%M:%S')) }} ago
card_mod:
style: |
@keyframes blink {
Expand All @@ -53,7 +53,7 @@ cards:
}
- type: markdown
content: |
Last VPS Backup: {{ relative_time(strptime(states.sensor.last_vps_backup_completed.state, '%Y-%m-%d %H:%M:%S')) }} ago
Last VPS Backup: {{ time_since(strptime(states.sensor.last_vps_backup_completed.state, '%Y-%m-%d %H:%M:%S')) }} ago
card_mod:
style: |
@keyframes blink {
Expand Down
2 changes: 1 addition & 1 deletion ui-lovelace/11-irrigation.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -69,7 +69,7 @@ cards:
{% for sprinkler_zone in irrigation -%}
{%- set entity_name = "input_datetime" + sprinkler_zone | regex_replace(find='switch', replace='', ignorecase=False) -%}
{% if states(sprinkler_zone) == "on" %}
<font color = blue>**{{ state_attr(sprinkler_zone, "friendly_name") | regex_replace(find='Irrigation ', replace='', ignorecase=False) }}**: Running for {{ relative_time(strptime(as_timestamp(states(entity_name+"_last_start")) | timestamp_custom('%Y-%m-%d %H:%M:%S%z'), '%Y-%m-%d %H:%M:%S%z')) }}</font>
<font color = blue>**{{ state_attr(sprinkler_zone, "friendly_name") | regex_replace(find='Irrigation ', replace='', ignorecase=False) }}**: Running for {{ time_since(strptime(as_timestamp(states(entity_name+"_last_start")) | timestamp_custom('%Y-%m-%d %H:%M:%S%z'), '%Y-%m-%d %H:%M:%S%z')) }}</font>
{% else -%}
{# Calculate relative last stop time #}
Expand Down

0 comments on commit 20fcb84

Please sign in to comment.