diff --git a/group_vars/test b/group_vars/test
index fe91cb64888560fc6ba41ed0d4b51e577e8339aa..13266484ab87c0c55163d6d4b8f2a9774a1469af 100644
--- a/group_vars/test
+++ b/group_vars/test
@@ -42,4 +42,11 @@ oauth_global:
token_url: https://uffd.test-warpzone.de/oauth2/token
userinfo_url: https://uffd.test-warpzone.de/oauth2/userinfo
logout_url: https://uffd.test-warpzone.de/logout
- metrics_url: https://uffd.test-warpzone.de/metrics
\ No newline at end of file
+ metrics_url: https://uffd.test-warpzone.de/metrics
+
+# Matrix Settings
+matrix:
+ domain: matrix.warpzone.ms
+ public_url: https://matrix.warpzone.ms
+ identity_server: https://matrix.warpzone.ms
+ notifications_room_id: "!QxrpmOPYwofaPFqKMY:matrix.warpzone.ms"
\ No newline at end of file
diff --git a/site.yml b/site.yml
index e56f37687fdbd7c4e2f646653ddecf5e33a41b2f..656163a7fc5f97ec2f2bbe7a498a4221934555e4 100644
--- a/site.yml
+++ b/site.yml
@@ -69,7 +69,6 @@
servicename: icinga,
basedir: "/srv/{{ servicename }}",
domain: "icinga.test-warpzone.de",
- groupname: test,
api_port: 5665,
mysql_port: 33306
}
@@ -251,7 +250,6 @@
servicename: icinga,
basedir: /srv/icinga,
domain: icinga.warpzone.ms,
- groupname: prod,
api_port: 5665,
mysql_port: 33306
}
diff --git a/testserver/docker_icinga/tasks/main.yml b/testserver/docker_icinga/tasks/main.yml
index 5ff983b5d804a9b5be654866dd890cbe61ed5d66..63db1a4afcd1b11f9e68496731b0d03999493faf 100644
--- a/testserver/docker_icinga/tasks/main.yml
+++ b/testserver/docker_icinga/tasks/main.yml
@@ -9,6 +9,7 @@
- { path: "{{ basedir }}/secrets/icinga_api_pass", length: 8 }
- { path: "{{ basedir }}/secrets/mysql_admin_pass", length: 12 }
- { path: "{{ basedir }}/secrets/mysql_user_pass", length: 12 }
+ - { path: "{{ basedir }}/secrets/matrix_notification_access_token", length: -1 }
- name: Setup OAuth Client Info
@@ -98,7 +99,6 @@
- etc/icinga/conf.d/api-users.conf
- etc/icinga/conf.d/commands2.conf
- etc/icinga/conf.d/groups.conf
- - etc/icinga/conf.d/hosts_manual.conf
- etc/icinga/conf.d/hosts.conf
# - etc/icinga/conf.d/notifications_pushover.conf
- etc/icinga/conf.d/notifications.conf
@@ -124,5 +124,4 @@
- name: "start {{ servicename }} docker"
community.docker.docker_compose_v2:
project_src: "{{ basedir }}"
- state: present
- build: "{{ dockerconfig.changed }}"
+ state: present
\ No newline at end of file
diff --git a/testserver/docker_icinga/templates/etc/icinga/conf.d/hosts.conf b/testserver/docker_icinga/templates/etc/icinga/conf.d/hosts.conf
index 897910a33d3cf581ef9daf8767b86a0161f0b735..db49029be3bb535ec25d637a9b1661020e97c4e7 100644
--- a/testserver/docker_icinga/templates/etc/icinga/conf.d/hosts.conf
+++ b/testserver/docker_icinga/templates/etc/icinga/conf.d/hosts.conf
@@ -1,5 +1,5 @@
-{% for host in groups['{{ groupname }}'] %}
+{% for host in groups['test'] %}
{% if hostvars[host].alert is defined and hostvars[host].alert %}
@@ -16,10 +16,6 @@ object Host "{{ host }}" {
vars.ext_ip6 = "{{ hostvars[host].ext_ip6 }}"
{% endif %}
- {% if host in monitoring.internal_ldap_servers %}
- vars.is_ldapserver = "True"
- {% endif %}
-
vars.os = "Linux"
vars.prometheus = true
}
diff --git a/testserver/docker_icinga/templates/etc/icinga/conf.d/hosts_manual.conf b/testserver/docker_icinga/templates/etc/icinga/conf.d/hosts_manual.conf
deleted file mode 100644
index d1f7c2a8deb2ff0018286d160004e2afc6b88b25..0000000000000000000000000000000000000000
--- a/testserver/docker_icinga/templates/etc/icinga/conf.d/hosts_manual.conf
+++ /dev/null
@@ -1,83 +0,0 @@
-
-object Host "wz-router" {
- import "generic-host"
-
- address = "192.168.0.1"
-
- groups = [ "network" ]
-}
-
-object Host "wz-sw-core" {
- import "generic-host"
-
- 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 "eq3max-cube" {
- import "generic-host"
-
- address = "{{ eq3max.cube_host }}"
-
- groups = [ "network" ]
-}
diff --git a/testserver/docker_icinga/templates/etc/icinga/conf.d/services_backup.conf b/testserver/docker_icinga/templates/etc/icinga/conf.d/services_backup.conf
index ebca4c1b97f7beeafd6d6208f59096bbdb812fcd..56a343717529cf8d3c3ce614da6c2f9f0376af10 100644
--- a/testserver/docker_icinga/templates/etc/icinga/conf.d/services_backup.conf
+++ b/testserver/docker_icinga/templates/etc/icinga/conf.d/services_backup.conf
@@ -1,5 +1,5 @@
-{% for host in groups['{{ groupname }}'] %}
+{% for host in groups['test'] %}
{% if hostvars[host].borgbackup_repos is defined %}
{% for repo in hostvars[host].borgbackup_repos %}
diff --git a/testserver/docker_icinga/templates/etc/icinga/conf.d/services_container.conf b/testserver/docker_icinga/templates/etc/icinga/conf.d/services_container.conf
index 018b15201d211822c1954aecd08a4fb026dbab0b..66ccb33e16d568b8e5626e9199b3cc2be1adb67c 100644
--- a/testserver/docker_icinga/templates/etc/icinga/conf.d/services_container.conf
+++ b/testserver/docker_icinga/templates/etc/icinga/conf.d/services_container.conf
@@ -1,5 +1,5 @@
-{% for host in groups['{{ groupname }}'] %}
+{% for host in groups['test'] %}
{% if hostvars[host].alert is defined and hostvars[host].alert %}
{% if hostvars[host].alert.containers is defined %}
diff --git a/testserver/docker_icinga/templates/etc/icinga/conf.d/services_domains.conf b/testserver/docker_icinga/templates/etc/icinga/conf.d/services_domains.conf
index 3e93a245c012c5c7c24e81f950dcf6c240be9886..e0218e99fd8e3273d484d2fa7641d642bbc45e40 100644
--- a/testserver/docker_icinga/templates/etc/icinga/conf.d/services_domains.conf
+++ b/testserver/docker_icinga/templates/etc/icinga/conf.d/services_domains.conf
@@ -1,5 +1,5 @@
-{% for host in groups['{{ groupname }}'] %}
+{% for host in groups['test'] %}
{% if hostvars[host].ext_ip4 is defined and hostvars[host].ext_ip6 is defined and hostvars[host].webserver_domains is defined %}
{% for domain in hostvars[host].webserver_domains %}
diff --git a/testserver/docker_icinga/templates/etc/icinga/conf.d/services_exporters.conf b/testserver/docker_icinga/templates/etc/icinga/conf.d/services_exporters.conf
index b0de0314c4bb4895897c46a96465bbd665382258..55ea364e459daaf4f719e97b4f1ec9cb3c62fec1 100644
--- a/testserver/docker_icinga/templates/etc/icinga/conf.d/services_exporters.conf
+++ b/testserver/docker_icinga/templates/etc/icinga/conf.d/services_exporters.conf
@@ -1,5 +1,5 @@
-{% for host in groups['{{ groupname }}'] %}
+{% for host in groups['test'] %}
{% if hostvars[host].alert is defined and hostvars[host].alert %}
apply Service "node-exporter" {
diff --git a/testserver/docker_icinga/templates/etc/icinga/conf.d/services_system.conf b/testserver/docker_icinga/templates/etc/icinga/conf.d/services_system.conf
index 0c94052ca8f6848372ee8b15e2a809d18b993b98..01d0ae78032c6b1246e90a7820dc3a1d0cb8bd29 100644
--- a/testserver/docker_icinga/templates/etc/icinga/conf.d/services_system.conf
+++ b/testserver/docker_icinga/templates/etc/icinga/conf.d/services_system.conf
@@ -1,5 +1,5 @@
-{% for host in groups['{{ groupname }}'] %}
+{% for host in groups['test'] %}
{% if hostvars[host].alert is defined and hostvars[host].alert %}
apply Service "node_metrics" {