common/borgbackup/templates/borgbackup-create.sh

@@ -11,7 +11,7 @@ export LAST_BACKUPS_PROM="/var/lib/prometheus/node-exporter/lastbackup.prom"
 
 echo "===[ Create Backup: {{ item.value.repo }} ]===" \
 && \
-borg create $1 $2 $3 --info --show-rc --stats --compression {{ item.value.compression }} {{ item.value.options }} {{ item.value.repo }}::$BACKUP_DATE \
+borg create $1 $2 $3 --info --show-rc --stats --exclude *lost+found --compression {{ item.value.compression }} {{ item.value.options }} {{ item.value.repo }}::$BACKUP_DATE \
 {% for directory in borgbackup_directories %}
 {{ directory }} \
 {% endfor %} \

common/docker/templates/daemon.json

@@ -6,7 +6,7 @@
       "max-file": "5"
     },
     "metrics-addr": "{{int_ip4}}:9323",
-    "experimental": true
-
+    "experimental": true,
+    "ip6tables": true
 }
 

common/docker_traefik/tasks/main.yml

@@ -37,11 +37,19 @@
     dest: "{{ basedir }}/{{ item }}"
   with_items:
     - docker-compose.yml
-    - traefik.yml 
-    - dynamic/redirect-default.yml
+    - traefik.yml
     - dynamic/tls.yml
   register: config
 
+- name: redirect-default ersstellen, wenn domain_default definiert ist
+  template:
+    src: "{{ item }}"
+    dest: "{{ basedir }}/{{ item }}"
+  with_items:
+    - dynamic/redirect-default.yml
+  when: domain_default is defined
+  register: config
+
 - name: "stop {{ servicename}} docker"
   docker_compose:
     project_src: "{{ basedir }}"

common/docker_traefik/templates/docker-compose.yml

@@ -3,7 +3,7 @@ version: '2.4'
 services:
 
     app:
-        image: traefik:v2.9.8
+        image: traefik:v3.0
         restart: always
         ports:
             - "80:80"

common/docker_traefik/templates/dynamic/tls.yml

@@ -14,7 +14,6 @@ tls:
     options:
         default:
             sniStrict: true
-            preferServerCipherSuites: true
             minVersion: "VersionTLS12"
             curvePreferences:
                 - "secp521r1"

group_vars/prod

@@ -35,37 +35,37 @@ mail_domains:
     maildomain: warpzone.ms 
     mxserver: mailserver.warpzone.ms
     mxhostname: webserver
-    spf: v=spf1 mx ~all
-    dmarc: v=DMARC1; p=none;
+    spf: "v=spf1 mx a:{{ mail_domains.warpzonems.mxserver }} ip4:{{ hostvars['webserver'].ext_ip4 }} ip6:{{ hostvars['webserver'].ext_ip6 }} -all"
+    dmarc: "v=DMARC1; p=none;"
     dkim:
-      - { selector: "dkim", value: "v=DKIM1;k=rsa;t=s;s=email;p=MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA+ZvoSoa2LwBbzQMD9laVy8hUGbvhe1LkL/6SIk3Ks8GfiT7p+hdlbcvo+noBR4gvbmSWwn3yBxOnGCtSH+iP0q7HHrmeEXJqGkLK25zZh1EO8bZqIHi2NX/LnN7dJTO8C27CRLME+YtWdrDaerIWXsHk7U+qD1ZuM5Q+FgAzsQ5uxQVlD6sO3IU" }
+      - { selector: "dkim", value: "v=DKIM1; k=rsa; p=MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAxNnNZElbWq9EonFULbr8vWWykKmZEylRwjo4lYx/lXsGDFWBuNh2s6gFF10OuHWtavokjvh/7sFidNaRYQkn3uwHmylBWFn7Jr2lPWY8PBEoIeAZZx5qHaDWxJVgzE7maFyXAswDGXcR/DRTn2xR6osNXOovjGeYXq/atR/45iwfgkhqAaXaV1uP/K9y\" \"y2sZ2dRtGEwCKsWbP26cOZ6MUcADszgUTEp59iKey79m0uwi0IpA8WjEKVwbMcf/6fBw1ejIEjVUX+bami2fQ6RPl4uEyloco4paV3w/vww2hh4VchCFLYAEKMkZOZs/eTDGsjaMguwHbPeVJjkpX2T6WQIDAQAB" }
   member_warpzonems:
-    maildomain: member.warpzone.ms 
-    mxserver: mailserver.warpzone.ms
-    mxhostname: webserver
-    spf: v=spf1 mx ~all
-    dmarc: v=DMARC1; p=none;
+    maildomain: "member.{{ mail_domains.warpzonems.maildomain }}" 
+    mxserver: "{{ mail_domains.warpzonems.mxserver }}"
+    mxhostname: "{{ mail_domains.warpzonems.mxhostname }}"
+    spf: "{{ mail_domains.warpzonems.spf }}"
     dkim:
-      - { selector: "dkim", value: "v=DKIM1;k=rsa;t=s;s=email;p=MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA8lZDykC3gbxSHMwTNO7QrDytlO9Sg66nEXpIv1/GqQrj3T1i3tTn05XxpJbRXUMuooaP6xZqt2OR3f/Wex6d4WwHH4Z1YuvyKDUWewynGZ3Ge+Vca8T0LBdDw7DZWtkXv94SHPWLyPWuuBXQs2nAgrMn3rtlwKovEsOqg85mFNb1EVm9Rgj9TB2" }
+      - { selector: "dkim", value: "v=DKIM1; k=rsa; p=MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAu334a+uJ5b7D8UTz3Up6A8EjZhEnXaIpiIcKAGPXXD2ZBGmkWfUNcwDcfMoDErH6ntXzf0uH2VMvaajB/wdKLyly1irDKoyjLA3hJb5wnF9Gh0anL1qxY6UA189vWsw+2JlZJWyQ3IcaQ720SM3OrrK4AL3gRItieSEQ+23m5aW0P6sgUuMXTmmKLbd4\" \"DzZ14Emw293TD2p4gJtgxW/6EfIfcUU+/jP1NNm9gksyzynH1pJXPwVruo9u4QujEQiPqtVsVtrtUm1kbnW+pexj3eKOLLEHGZ+p5AZ/jtALk9pJfNumm/XHFK5PTZDBIipXOYvuG8RdwsaCQRezGKy04QIDAQAB" }
   lists_warpzonems:
-    maildomain: lists.warpzone.ms 
-    mxserver: mailserver.warpzone.ms
-    mxhostname: webserver
-    spf: v=spf1 mx ~all
-    dmarc: v=DMARC1; p=none;
+    maildomain: "lists.{{ mail_domains.warpzonems.maildomain }}" 
+    mxserver: "{{ mail_domains.warpzonems.mxserver }}"
+    mxhostname: "{{ mail_domains.warpzonems.mxhostname }}"
+    spf: "{{ mail_domains.warpzonems.spf }}"
+    dkim:
+      - { selector: "dkim", value: "v=DKIM1; k=rsa; p=MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAoO7SXkUkM17Y1Vi/cvO48IJmlReGWSaYHY+wEldLHt80TiXP0AGZ8nG+DshXi1J2D5xjn8cJu4VqgDrLFnsRJyGYKmi7yVukANVg6gjYlET4y5+UU7Vk2W3xhN2U/8F0rcyynALzQa8i4Y/wEI0qkgHyE6+lITmglJvlj6tgp4YYK2TBH3Zo//PukOmU\" \"6gG/qu0+6p+CepvqzfGT2l1duov5a2+DJJzlJTULJ5D5Blsmg/0GeC81gZ4QDC3S8aaM5Pw3I3lQCSJT4Q4Ge6Ues4ccagNrdnZhtHNaVFGdL1mR1k+G784gpMZphPj5MylNEpA3V4bD7/Ygf4GuAvHdMwIDAQAB" }
 #  chaostreffmuensterde:
 #    maildomain: chaostreff-muenster.de 
-#    mxserver: mailserver.warpzone.ms
-#    mxhostname: webserver
-#    spf: v=spf1 mx ~all
+#    mxserver: "{{ mail_domains.warpzonems.mxserver }}"
+#    mxhostname: "{{ mail_domains.warpzonems.mxhostname }}"
+#    spf: "{{ mail_domains.warpzonems.spf }}"
 #    dmarc: v=DMARC1; p=none;
 #    dkim:
 #      - { selector: "dkim", value: "v=DKIM1;k=rsa;t=s;s=email;p=MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAz/OBnxYygjhKeZVyvhDAO1/O1XwyYEhQx3bW/rO/Wmp8ZzP/eQh3dljDEibj1KsfdUhfgTIU8CnTKLayb8B07MMzhBklpg8WUV2LrDmpndfhixizjaxzwBj/dhtiZE7e4BwhOPOmdBQ0cCIvNhMcQcCa1RgCpX/g5Ii0AtQ2zCPMTSOW5YWn+VY" }
 #  lists_chaostreffmuensterde:
-#    maildomain: lists.chaostreff-muenster.de 
-#    mxserver: mailserver.warpzone.ms
-#    mxhostname: webserver
-#    spf: v=spf1 mx ~all
+#    maildomain: "lists.{{ mail_domains.chaostreffmuensterde.maildomain }}"
+#    mxserver: "{{ mail_domains.chaostreffmuensterde.mxserver }}"
+#    mxhostname: "{{ mail_domains.chaostreffmuensterde.mxhostname }}"
+#    spf: "{{ mail_domains.chaostreffmuensterde.spf }}"
 #    dmarc: v=DMARC1; p=none;
 
 
@@ -113,3 +113,9 @@ esphome_devices:
   - { id: "lounge",        name: "Lounge",        groups: "gLounge",        sensors: [ "Temp", "pressure", "humidity" ] }
   - { id: "status",        name: "Status/Strom",  groups: "gHauptraum",     sensors: [ "stromverbrauch", "warpzone_status" ] }
   - { id: "vortragsraum",  name: "Vortragsraum",  groups: "gVortragsraum",  sensors: [ "Temp", "pressure", "humidity" ] }
+
+#Global Homematic configuration 
+homematic:
+  ccu2_host: 192.168.0.15
+  devices_heizung:
+    - { name: "HeizungKlo", id: "OEQ0663079" }

host_vars/carrot

@@ -35,8 +35,8 @@ administratorenteam:
 # Monitoring aktivieren
 alert:
   load:
-    warn: 2
-    crit: 4
+    warn: 15
+    crit: 30
   disks:
     - { mountpoint: "/", warn: "5 GB", crit: "1 GB" }
 

host_vars/ogg

@@ -49,8 +49,8 @@ docker:
 # Monitoring aktivieren
 alert:
   load:
-    warn: 2
-    crit: 4
+    warn: 15
+    crit: 30
   containers:
     - { name: "dockerstats_app_1" }    
     - { name: "esphome_app_1" }    
@@ -63,6 +63,9 @@ alert:
     - { name: "heimdall_app_1" }    
     - { name: "homeassistant_app_1" }    
     - { name: "homeassistant_influxdb_1" }    
+    - { name: "homematic_app_1" }    
+    - { name: "homematic_influxdb_1" }    
+    - { name: "homematic_telegraf_1" }    
     - { name: "mqtt_app_1" } 
     - { name: "mqtt_influxdb_1" } 
     - { name: "mqtt_tgbinary_1" } 
@@ -83,21 +86,21 @@ borgbackup_repos:
   borgbase:
 
     # URL des Repos
-    repo: "juxt0t1v@juxt0t1v.repo.borgbase.com:repo"
+    repo: "apu4cibr@apu4cibr.repo.borgbase.com:repo"
 
     # Repo-spezifische Optionen zum Aufruf von Borgbackup
     # z.B. bei Sicherungen zu rsync.net ist --remote-path=borg1 erforderlich
     options: ""
 
     # Compression Options, z,b. "zlib,5, "zstd,5"
-    compression: "zlib,5"
+    compression: "zstd,5"
 
     # Prune Optionen
     prune: "--keep-within=2d --keep-daily=7 --keep-weekly=4 --keep-monthly=6"
 
     # Backup Schedule
     weekday: "*"
-    hour: "*/4"
+    hour: "6"
     minute: "40"
 
     #  Zusätzliche Verzeichnisse, die nur in diesem Backup gesichtert werden sollen
@@ -105,8 +108,8 @@ borgbackup_repos:
 
     # Monitoring
     alert: true
-    warning_age: 10
-    critical_age: 20
+    warning_age: 36
+    critical_age: 60
     warning_count: 10
     critical_count: 5
 

host_vars/verwaltung

@@ -63,8 +63,8 @@ docker:
 # Monitoring aktivieren 
 alert:  
   load: 
-    warn: 8
-    crit: 16
+    warn: 5
+    crit: 10
   containers:
     - { name: "dockerstats_app_1" }
     - { name: "gitea_app_1" }

host_vars/weatherwax

@@ -32,8 +32,8 @@ administratorenteam:
 # Monitoring aktivieren
 alert:
   load:
-    warn: 4
-    crit: 8
+    warn: 20
+    crit: 40
   disks:
     - { mountpoint: "/",         warn: "10 GB", crit: "3 GB" }
     # btrfs currently no data from node exporter 

host_vars/webserver

@@ -68,8 +68,8 @@ docker:
 # Monitoring aktivieren 
 alert:  
   load: 
-    warn: 8
-    crit: 16
+    warn: 5
+    crit: 10
   containers:
     - { name: "coturn_coturn_1" }
     - { name: "dockerstats_app_1" }

intern/docker_homeassistant/templates/config/configuration.yaml

@@ -54,6 +54,33 @@ influxdb:
   token: {{ influxdb_token }}
   default_measurement: units
 
+# Homematic CCU2
+# https://www.home-assistant.io/integrations/homematic/
+homematic:
+  local_port: {{ homematic_callback_port }}
+  interfaces:
+    rf:
+      host: {{ homematic.ccu2_host }}
+      resolvenames: json
+      callback_ip: {{ int_ip4 }}
+      callback_port: {{ homematic_callback_port }}
+    ip:
+      host: {{ homematic.ccu2_host }}
+      port: 2010
+      callback_ip: {{ int_ip4 }}
+      callback_port: {{ homematic_callback_port }}
+    groups:
+      host: {{ homematic.ccu2_host }}
+      port: 9292
+      resolvenames: json
+      path: /groups
+      callback_ip: {{ int_ip4 }}
+      callback_port: {{ homematic_callback_port }}
+  hosts:
+    ccu2:
+      host: {{ homematic.ccu2_host }}
+
+
 # zonenstatus wird vom hauptschalter gesteuert, switch02 ping ist nicht mehr notwendig
 # https://www.home-assistant.io/integrations/ping/
 #binary_sensor:

intern/docker_homeassistant/templates/docker-compose.yml

@@ -5,8 +5,10 @@ services:
   
   app:
 
-    image: homeassistant/home-assistant:2023.3
+    image: homeassistant/home-assistant:2023.6
     restart: always
+    ports:
+      - "{{ int_ip4 }}:{{ homematic_callback_port }}:{{ homematic_callback_port }}"
     volumes:
       - "/etc/localtime:/etc/localtime:ro"
       - "{{ basedir }}/config:/config"

intern/docker_homematic/tasks/main.yml

+---
+
+- include: ../functions/get_secret.yml
+  with_items:
+   - { path: "{{ basedir }}/influxdb_password",            length: 12 }
+   - { path: "{{ basedir }}/influxdb_token",               length: 32 }
+
+
+- name: "create folder struct for {{ basedir }}"
+  file: 
+    path: "{{ item }}"
+    state: "directory"
+  with_items:
+    - "{{ basedir }}"
+
+
+- name: "copy config files for {{ basedir }}"
+  template:
+    src: "{{ item }}"
+    dest: "{{ basedir }}/{{ item }}"
+  with_items:
+    - docker-compose.yml
+    - telegraf.conf
+  register: config_files
+
+
+- name: "stop {{ servicename }} docker"
+  docker_compose:
+    project_src: "{{ basedir }}"
+    state: absent
+  when: config_files.changed 
+
+
+- name: "start {{ servicename }} docker"
+  docker_compose:
+    project_src: "{{ basedir }}"
+    state: present

intern/docker_homematic/templates/docker-compose.yml

+
+version: "3"
+
+services:
+  
+  app:
+
+    image: sfudeus/homematic_exporter:2023-05-21
+    restart: always
+    command: "--ccu_host {{ homematic.ccu2_host }} --ccu_port 2001 --port {{ homematic_metrics_port }}"
+    ports:
+      - "{{ int_ip4 }}:{{ homematic_metrics_port }}:{{ homematic_metrics_port }}"
+    networks:
+      - default
+
+  
+  influxdb:
+
+    image: influxdb:2.6.1
+    restart: always
+    ports:
+      - "{{ int_ip4 }}:{{ influxdb_port }}:8086"
+    volumes:
+      - "{{ basedir }}/influxdb:/var/lib/influxdb2"
+    environment:
+      DOCKER_INFLUXDB_INIT_MODE: setup
+      DOCKER_INFLUXDB_INIT_USERNAME: homematic
+      DOCKER_INFLUXDB_INIT_PASSWORD: {{ influxdb_password }}
+      DOCKER_INFLUXDB_INIT_ORG: homematic
+      DOCKER_INFLUXDB_INIT_BUCKET: homematic
+      DOCKER_INFLUXDB_INIT_ADMIN_TOKEN: {{ influxdb_token }}
+    networks:
+      - default
+
+
+  telegraf:
+
+    image: telegraf:1.25.3
+    restart: always
+    depends_on: 
+      - app
+      - influxdb
+    volumes:
+      - "{{ basedir }}/telegraf.conf:/etc/telegraf/telegraf.conf:ro"

intern/docker_homematic/templates/telegraf.conf

+# Telegraf Configuration
+#
+# Telegraf is entirely plugin driven. All metrics are gathered from the
+# declared inputs, and sent to the declared outputs.
+#
+# Plugins must be declared in here to be active.
+# To deactivate a plugin, comment out the name and any variables.
+#
+# Use 'telegraf -config telegraf.conf -test' to see what metrics a config
+# file would generate.
+#
+# Environment variables can be used anywhere in this config file, simply surround
+# them with ${}. For strings the variable must be within quotes (ie, "${STR_VAR}"),
+# for numbers and booleans they should be plain (ie, ${INT_VAR}, ${BOOL_VAR})
+
+
+# Global tags can be specified here in key="value" format.
+[global_tags]
+  # dc = "us-east-1" # will tag all metrics with dc=us-east-1
+  # rack = "1a"
+  ## Environment variables can be used as tags, and throughout the config file
+  # user = "$USER"
+
+# Configuration for telegraf agent
+[agent]
+  ## Default data collection interval for all inputs
+  interval = "5s"
+  ## Rounds collection interval to 'interval'
+  ## ie, if interval="10s" then always collect on :00, :10, :20, etc.
+  round_interval = true
+
+  ## Telegraf will send metrics to outputs in batches of at most
+  ## metric_batch_size metrics.
+  ## This controls the size of writes that Telegraf sends to output plugins.
+  metric_batch_size = 100
+
+  ## Maximum number of unwritten metrics per output.  Increasing this value
+  ## allows for longer periods of output downtime without dropping metrics at the
+  ## cost of higher maximum memory usage.
+  metric_buffer_limit = 10000
+
+  ## Collection jitter is used to jitter the collection by a random amount.
+  ## Each plugin will sleep for a random time within jitter before collecting.
+  ## This can be used to avoid many plugins querying things like sysfs at the
+  ## same time, which can have a measurable effect on the system.
+  collection_jitter = "0s"
+
+  ## Default flushing interval for all outputs. Maximum flush_interval will be
+  ## flush_interval + flush_jitter
+  flush_interval = "10s"
+  ## Jitter the flush interval by a random amount. This is primarily to avoid
+  ## large write spikes for users running a large number of telegraf instances.
+  ## ie, a jitter of 5s and interval 10s means flushes will happen every 10-15s
+  flush_jitter = "0s"
+
+  ## By default or when set to "0s", precision will be set to the same
+  ## timestamp order as the collection interval, with the maximum being 1s.
+  ##   ie, when interval = "10s", precision will be "1s"
+  ##       when interval = "250ms", precision will be "1ms"
+  ## Precision will NOT be used for service inputs. It is up to each individual
+  ## service input to set the timestamp at the appropriate precision.
+  ## Valid time units are "ns", "us" (or "µs"), "ms", "s".
+  precision = ""
+
+  ## Log at debug level.
+  # debug = false
+  ## Log only error level messages.
+  # quiet = false
+
+  ## Log target controls the destination for logs and can be one of "file",
+  ## "stderr" or, on Windows, "eventlog".  When set to "file", the output file
+  ## is determined by the "logfile" setting.
+  # logtarget = "file"
+
+  ## Name of the file to be logged to when using the "file" logtarget.  If set to
+  ## the empty string then logs are written to stderr.
+  # logfile = ""
+
+  ## The logfile will be rotated after the time interval specified.  When set
+  ## to 0 no time based rotation is performed.  Logs are rotated only when
+  ## written to, if there is no log activity rotation may be delayed.
+  # logfile_rotation_interval = "0d"
+
+  ## The logfile will be rotated when it becomes larger than the specified
+  ## size.  When set to 0 no size based rotation is performed.
+  # logfile_rotation_max_size = "0MB"
+
+  ## Maximum number of rotated archives to keep, any older logs are deleted.
+  ## If set to -1, no archives are removed.
+  # logfile_rotation_max_archives = 5
+
+  ## Pick a timezone to use when logging or type 'local' for local time.
+  ## Example: America/Chicago
+  # log_with_timezone = ""
+
+  ## Override default hostname, if empty use os.Hostname()
+  hostname = ""
+  ## If set to true, do no set the "host" tag in the telegraf agent.
+  omit_hostname = false
+
+###############################################################################
+#                            OUTPUT PLUGINS                                   #
+###############################################################################
+
+# Configuration for sending metrics to InfluxDB 2.0
+[[outputs.influxdb_v2]]
+  ## The URLs of the InfluxDB cluster nodes.
+  ##
+  ## Multiple URLs can be specified for a single cluster, only ONE of the
+  ## urls will be written to each interval.
+  ##   ex: urls = ["https://us-west-2-1.aws.cloud2.influxdata.com"]
+  urls = ["http://influxdb:8086"]
+
+  ## Token for authentication.
+  token = "{{ influxdb_token }}"
+
+  ## Organization is the name of the organization you wish to write to.
+  organization = "homematic"
+
+  ## Destination bucket to write into.
+  bucket = "homematic"
+
+  ## The value of this tag will be used to determine the bucket.  If this
+  ## tag is not set the 'bucket' option is used as the default.
+  # bucket_tag = ""
+
+  ## If true, the bucket tag will not be added to the metric.
+  # exclude_bucket_tag = false
+
+  ## Timeout for HTTP messages.
+  # timeout = "5s"
+
+  ## Additional HTTP headers
+  # http_headers = {"X-Special-Header" = "Special-Value"}
+
+  ## HTTP Proxy override, if unset values the standard proxy environment
+  ## variables are consulted to determine which proxy, if any, should be used.
+  # http_proxy = "http://corporate.proxy:3128"
+
+  ## HTTP User-Agent
+  # user_agent = "telegraf"
+
+  ## Content-Encoding for write request body, can be set to "gzip" to
+  ## compress body or "identity" to apply no encoding.
+  # content_encoding = "gzip"
+
+  ## Enable or disable uint support for writing uints influxdb 2.0.
+  # influx_uint_support = false
+
+  ## Optional TLS Config for use on HTTP connections.
+  # tls_ca = "/etc/telegraf/ca.pem"
+  # tls_cert = "/etc/telegraf/cert.pem"
+  # tls_key = "/etc/telegraf/key.pem"
+  ## Use TLS but skip chain & host verification
+  # insecure_skip_verify = false
+
+
+###############################################################################
+#                            INPUT PLUGINS                                    #
+###############################################################################
+
+# Read metrics from one or many prometheus clients
+[[inputs.prometheus]]
+  ## An array of urls to scrape metrics from.
+  urls = ["http://app:{{ homematic_metrics_port }}/metrics"]
+
+  ## Metric version controls the mapping from Prometheus metrics into Telegraf metrics.
+  ## See "Metric Format Configuration" in plugins/inputs/prometheus/README.md for details.
+  ## Valid options: 1, 2
+  # metric_version = 1
+
+  ## Url tag name (tag containing scrapped url. optional, default is "url")
+  # url_tag = "url"
+
+  ## Whether the timestamp of the scraped metrics will be ignored.
+  ## If set to true, the gather time will be used.
+  # ignore_timestamp = false
+

remote/docker_homeassistant/templates/docker-compose.yml

@@ -5,7 +5,7 @@ services:
   
   app:
 
-    image: homeassistant/home-assistant:2023.3.3
+    image: homeassistant/home-assistant:2023.6.1
     restart: always
     volumes:
       - "/etc/localtime:/etc/localtime:ro"

site.yml

@@ -92,7 +92,15 @@
         servicename: homeassistant, 
         basedir: /srv/homeassistant,
         domain: "ha.warpzone.lan",
-        influxdb_port: 38086
+        homematic_callback_port: 8060,
+        influxdb_port: 38086       
+      }
+    - { 
+        role: intern/docker_homematic, tags: homematic, 
+        servicename: homematic, 
+        basedir: /srv/homematic,
+        homematic_metrics_port: 8010,
+        influxdb_port: 48086       
       }
     - { 
         role: intern/docker_mqtt, tags: mqtt, 
@@ -268,7 +276,6 @@
         servicename: traefik,
         basedir: /srv/traefik,
         domain: "warpzone.ms",
-        domain_default: "www.warpzone.ms" 
       }      
     - { 
         role: verwaltung/docker_gitea, tags: gitea,

webserver/docker_icinga/templates/etc/icinga/conf.d/hosts_manual.conf

 
-object Host "warpfire" {
+object Host "wz-router" {
   import "generic-host"
 
   address = "192.168.0.1"
@@ -7,11 +7,77 @@ object Host "warpfire" {
   groups = [ "network" ]
 }
 
-object Host "switch-sw01-hp" {
+object Host "wz-sw-core" {
   import "generic-host"
 
-  address = "192.168.0.100"
+  address = "192.168.0.2"
 
   groups = [ "network" ]
 }
 
+object Host "wz-sw-access" {
+  import "generic-host"
+
+  address = "192.168.0.3"
+  
+  # Keine Notifications, da der Switch aus ist wenn die Zone geschlossen ist 
+  vars.enable_nofitications = false
+
+  groups = [ "network" ]
+}
+
+object Host "wz-sw-dach" {
+  import "generic-host"
+
+  address = "192.168.0.4"
+
+  groups = [ "network" ]
+}
+
+object Host "wz-ap-dach" {
+  import "generic-host"
+
+  address = "192.168.0.13"
+
+  groups = [ "network" ]
+}
+
+object Host "wz-ap-eingang" {
+  import "generic-host"
+
+  address = "192.168.0.14"
+
+  groups = [ "network" ]
+}
+
+object Host "wz-ap-lounge" {
+  import "generic-host"
+
+  address = "192.168.0.10"
+
+  groups = [ "network" ]
+}
+
+object Host "wz-ap-vortrag" {
+  import "generic-host"
+
+  address = "192.168.0.12"
+
+  groups = [ "network" ]
+}
+
+object Host "wz-ap-werkstatt" {
+  import "generic-host"
+
+  address = "192.168.0.11"
+
+  groups = [ "network" ]
+}
+
+object Host "homematic-ccu2" {
+  import "generic-host"
+
+  address = "{{ homematic.ccu2_host }}"
+
+  groups = [ "network" ]
+}

webserver/docker_icinga/templates/etc/icinga/conf.d/notifications.conf

@@ -6,7 +6,7 @@ apply Notification "matrix" to Host {
 
   interval = 4h
 
-  assign where host.address 
+  assign where host.address && host.vars.enable_nofitications != false
 }
 
 
@@ -17,6 +17,6 @@ apply Notification "matrix" to Service {
 
   interval = 4h
 
-  assign where service.name
+  assign where service.name && service.vars.enable_nofitications != false
 }