From 5bde27eeb052e627ac0323de1b25976e9bc13c97 Mon Sep 17 00:00:00 2001
From: XaverStiensmeier <xaverstiensmeier@gmx.de>
Date: Fri, 12 Jul 2024 12:11:56 +0200
Subject: [PATCH] updated zabbix to 7.0 service terminates

---
 .../roles/bibigrid/tasks/001-apt.yaml         |  4 +-
 .../bibigrid/tasks/011-zabbix-agent.yaml      | 51 -------------------
 2 files changed, 2 insertions(+), 53 deletions(-)

diff --git a/resources/playbook/roles/bibigrid/tasks/001-apt.yaml b/resources/playbook/roles/bibigrid/tasks/001-apt.yaml
index 0ca1c17b..eb73b974 100644
--- a/resources/playbook/roles/bibigrid/tasks/001-apt.yaml
+++ b/resources/playbook/roles/bibigrid/tasks/001-apt.yaml
@@ -48,8 +48,8 @@
 
 - name: Add zabbix repositories
   apt:
-    deb: "https://repo.zabbix.com/zabbix/6.2/{{ ansible_distribution | lower }}\
-    /pool/main/z/zabbix-release/zabbix-release_6.2-1%2B{{ ansible_distribution | lower }}\
+    deb: "https://repo.zabbix.com/zabbix/7.0/{{ ansible_distribution | lower }}\
+    /pool/main/z/zabbix-release/zabbix-release_7.0-2%2B{{ ansible_distribution | lower }}\
     {{ ansible_distribution_version }}_all.deb"
     state: present
     force: true
diff --git a/resources/playbook/roles/bibigrid/tasks/011-zabbix-agent.yaml b/resources/playbook/roles/bibigrid/tasks/011-zabbix-agent.yaml
index 9a658689..0a75e8d3 100644
--- a/resources/playbook/roles/bibigrid/tasks/011-zabbix-agent.yaml
+++ b/resources/playbook/roles/bibigrid/tasks/011-zabbix-agent.yaml
@@ -55,54 +55,3 @@
     name: zabbix-agent
     state: started
     enabled: true
-
-# --------------------------------------
-# -- Add worker node as zabbix hosts --
-# --------------------------------------
-
-- name: Add worker node to zabbix hosts
-  zabbix_host:
-    server_url: "http://127.0.0.1/zabbix/"
-    login_user: Admin
-    login_password: "{{ zabbix_conf.admin_password }}"
-    host_name: "{{ ansible_hostname }}"
-    visible_name: "{{ ansible_hostname }}"
-    description: add by ansible
-    status: enabled
-    state: present
-    host_groups:
-      - 'Linux servers'
-    link_templates:
-      - 'Linux by Zabbix Agent'
-    interfaces:
-      - type: 1 # agent
-        main: 1 # default
-        ip: "{{ ansible_default_ipv4.address }}"
-        useip: 1 # connect using host IP address
-        port: 10050
-  become: false
-  when: "'master' not in group_names"
-  delegate_to: localhost
-
-- name: Add master node to zabbix hosts
-  zabbix_host:
-    server_url: "http://127.0.0.1/zabbix/"
-    login_user: Admin
-    login_password: "{{ zabbix_conf.admin_password }}"
-    host_name: "{{ ansible_hostname }}"
-    visible_name: "{{ ansible_hostname }}"
-    description: add by ansible
-    status: enabled
-    state: present
-    host_groups:
-      - 'Linux servers'
-    link_templates:
-      - 'Linux by Zabbix Agent'
-    interfaces:
-      - type: 1 # agent
-        main: 1 # default
-        ip: "127.0.0.1"
-        useip: 1 # connect using host IP address
-        port: 10050
-  become: false
-  when: "'master' in group_names"