From 2d72c74c7aef98218e50dc62da779ce35c95d124 Mon Sep 17 00:00:00 2001 From: Sheppy Date: Fri, 21 Jul 2023 15:41:40 +0000 Subject: [PATCH] feat: new smart-send event gate --- group_vars/all.yaml | 4 ++++ .../{event-dispatchers.yaml => event-dispatcher.yaml} | 7 ++++--- roles/monitoring-master/tasks/icinga.yaml | 8 ++++++++ .../monitoring-master/templates/dispatcher-pass-file.txt | 2 ++ roles/web1/tasks/main.yaml | 8 ++++++++ 5 files changed, 26 insertions(+), 3 deletions(-) rename roles/docker-deployments/templates/{event-dispatchers.yaml => event-dispatcher.yaml} (56%) create mode 100644 roles/monitoring-master/templates/dispatcher-pass-file.txt diff --git a/group_vars/all.yaml b/group_vars/all.yaml index 31b9ba4..2247b91 100644 --- a/group_vars/all.yaml +++ b/group_vars/all.yaml @@ -12,6 +12,10 @@ icinga_api_pass: "HISTORY_PURGED_SECRET" icinga_api_url: "https://192.168.122.107:5665" icinga_web_url: "https://icinga.atlantishq.de/" +event_dispatcher_address: https://dispatcher.atlantishq.de +event_dispatcher_user: dispatch +event_dispatcher_pass: HISTORY_PURGED_SECRET + ldap_password: flanigan ldap_dc: "atlantishq" ldap_org: "atlantishq de" diff --git a/roles/docker-deployments/templates/event-dispatchers.yaml b/roles/docker-deployments/templates/event-dispatcher.yaml similarity index 56% rename from roles/docker-deployments/templates/event-dispatchers.yaml rename to roles/docker-deployments/templates/event-dispatcher.yaml index 33b0d84..bd4d846 100644 --- a/roles/docker-deployments/templates/event-dispatchers.yaml +++ b/roles/docker-deployments/templates/event-dispatcher.yaml @@ -1,12 +1,13 @@ event-dispatcher: ports: - 5007:5000 - image: registry.atlantishq.de/event-dispatcher + image: registry.atlantishq.de/athq/event-dispatcher restart: always volumes: - - "/data/event-dispatcher/instance/":"/app/instance/" + - "/data/event-dispatcher/instance/:/app/instance/" environment: - LDAP_SERVER : "{{ ldap_connection_url_ext }}" + SIGNAL_API_PASS: "{{ event_dispatcher_pass }}" + LDAP_SERVER : "{{ ldap_connection_url }}" LDAP_BIND_DN : "{{ ldap_bind_dn }}" LDAP_BIND_PW : "{{ ldap_password }}" LDAP_BASE_DN : "{{ ldap_user_dn }}" diff --git a/roles/monitoring-master/tasks/icinga.yaml b/roles/monitoring-master/tasks/icinga.yaml index 8028e29..c957c16 100644 --- a/roles/monitoring-master/tasks/icinga.yaml +++ b/roles/monitoring-master/tasks/icinga.yaml @@ -179,3 +179,11 @@ - config.ini - authentication.ini - groups.ini + +- name: Template dispatcher gateway passfile + template: + src: dispatcher-pass-file.txt + dest: /etc/icinga2/dispatcher-pass-file.txt + mode: 0660 + owner: root + group: nagios diff --git a/roles/monitoring-master/templates/dispatcher-pass-file.txt b/roles/monitoring-master/templates/dispatcher-pass-file.txt new file mode 100644 index 0000000..1ccac03 --- /dev/null +++ b/roles/monitoring-master/templates/dispatcher-pass-file.txt @@ -0,0 +1,2 @@ +{{ event_dispatcher_user }} +{{ event_dispatcher_pass }} diff --git a/roles/web1/tasks/main.yaml b/roles/web1/tasks/main.yaml index 3895a64..454e205 100644 --- a/roles/web1/tasks/main.yaml +++ b/roles/web1/tasks/main.yaml @@ -135,3 +135,11 @@ - serien-ampel - simple-log-server - soundlib-interface + +- name: event poller cronjob + cron: + user: sheppy + hour: "*" + minute: "*" + name: Poll Notifications from Dispatch (signal) + job: "/home/sheppy/signal-http-gateway/signal-query-dispatch.py --target {{ event_dispatcher_address }} --user {{ event_dispatcher_user }} --password {{ event_dispatcher_pass }} --signal-cli-bin /home/sheppy/signal-cli/bin/signal-cli"