Zabbix: Add the rest of the previous commit that got missed

Signed-off-by: Greg Sutcliffe <fedora@emeraldreverie.org>

roles/httpd/proxy/tasks/main.yml

@@ -115,27 +115,9 @@
   notify:
   - Reload systemd
 
-# Zabbix monitoring of the proxy sites & ticketkeys
-- name: Zabbix API Block
-  vars:
-    ansible_zabbix_auth_key: "{{ zabbix_auth_key }}"
-    ansible_network_os: "{{ zabbix_network_os }}"
-    ansible_connection: "{{ zabbix_connection }}"
-    ansible_httpapi_port: "{{ zabbix_httpapi_port }}"
-    ansible_httpapi_use_ssl: "{{ zabbix_httpapi_use_ssl }}"
-    ansible_httpapi_validate_certs: "{{ zabbix_httpapi_validate_certs }}"
-    ansible_host: "{{ zabbix_server }}"
-    ansible_zabbix_url_path: "{{ zabbix_url_path }}"
+- name: Configure proxy http/misc monitoring in Zabbix
+  ansible.builtin.include_tasks: monitoring.yml
   tags:
     - httpd/proxy
+    - zabbix_agent
     - zabbix_api
-  block:
-    - name: Import Proxy checks template
-      community.zabbix.zabbix_template:
-        template_yaml: "{{ lookup('file', 'zabbix-template.yml') }}"
-        state: present
-    - name: Add self to Proxy checks template in Zabbix
-      community.zabbix.zabbix_host:
-        host_name: "{{ inventory_hostname }}"
-        link_templates: Proxy checks
-        force: false

roles/nagios_server/tasks/main.yml

@@ -379,7 +379,6 @@
   ansible.builtin.template: src=nagios/services/{{item}}.j2 dest=/etc/nagios/services/{{item}} mode=0644 owner=root group=root
   with_items:
     - ipa.cfg
-    - mirrorlist-proxies.cfg
   when: env == "production" and nagios_location == 'rdu3_internal'
   tags:
   - nagios_server

roles/nagios_server/templates/nagios/services/mirrorlist-proxies.cfg.j2

@@ -1,8 +0,0 @@
-{% for host in groups['mirrorlist_proxies'] if hostvars[host].datacenter == datacenter %}
-define service {
-  host_name             {{ host }}
-  service_description   {{ host }} mirrorlist docker container
-  check_command         check_by_nrpe!check_mirrorlist_docker_proxy
-  use                   defaulttemplate
-}
-{% endfor %}

roles/nagios_server/templates/nagios/services/websites.cfg.j2

@@ -1,17 +1,3 @@
-define service {
-  host_name             proxy01.fedoraproject.org, proxy10.fedoraproject.org
-  service_description   http-oci-registry-api
-  check_command         check_website_ssl!registry.fedoraproject.org!/v2/_catalog?last=fedora!fedora
-  use                   websitetemplate
-}
-
-define service {
-  host_name             proxy01.fedoraproject.org, proxy10.fedoraproject.org
-  service_description   http-oci-registry-webui
-  check_command         check_website_ssl!registry.fedoraproject.org!/v2/fedora/tags/list!rawhide
-  use                   websitetemplate
-}
-
 {% if vars['nagios_location'] == 'rdu3_internal' %}
 ##
 ## Other Frontend Websites
@@ -24,20 +10,6 @@ define service {
   use                   internalwebsitetemplate
 }
 
-define service {
-  hostgroup_name        proxies_ocp4
-  service_description   http-fmn-web
-  check_command         check_website_ssl!notifications.fedoraproject.org!/!FMN
-  use                   websitetemplate
-}
-
-define service {
-  hostgroup_name        proxies_ocp4
-  service_description   http-fmn-api
-  check_command         check_website_ssl!fmn-api.apps.ocp.fedoraproject.org!/api/v1/healthz/ready!OK
-  use                   websitetemplate
-}
-
 define service {
   hostgroup_name        pkgs
   service_description   http-pkgs-pagure