Zabbix: fix more hosts/groups for apache-status

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

inventory/group_vars/batcave

@@ -51,6 +51,9 @@ tcp_ports: [80, 443, 8442, 8443]
 vpn: true
 nagios_Check_Services:
     swap: false
+zabbix_macros:
+  'APACHE.STATUS.PORT': 443     # Proxies appear to ignore port 80 for apache-status
+  'APACHE.STATUS.SCHEME': https # but https://localhost seems to work instead
 
 notes: |
   Central management host for ansible

inventory/group_vars/download

@@ -113,3 +113,6 @@ nagios_Check_Services:
 nft_block_rules:
   - 'add rule ip filter INPUT ip saddr 212.143.41.0/24 counter reject'
 primary_auth_source: ipa
+zabbix_macros:
+  'APACHE.STATUS.PORT': 443     # Proxies appear to ignore port 80 for apache-status
+  'APACHE.STATUS.SCHEME': https # but https://localhost seems to work instead

inventory/group_vars/proxies

@@ -177,11 +177,9 @@ tcp_ports: [
 varnish_group: proxies
 # Proxies are (mostly) external, use vpn for monitoring
 zabbix_host: zabbix01.vpn.fedoraproject.org
-zabbix_templates:
-  - group: "proxies" # Ansible group
-    template: "external_hosts_http.json" # Template name in roles/zabbix/zabbix_templates/files/templatename.json
-    custom_template: true # Is the template official template bundled with Zabbix or one of our custom templates
-    hostgroup: "fedora external hosts" # Zabbix hostgroup
+zabbix_macros:
+  'APACHE.STATUS.PORT': 443     # Proxies appear to ignore port 80 for apache-status
+  'APACHE.STATUS.SCHEME': https # but https://localhost seems to work instead
 
 notes: |
   * Provides frontend (reverse) proxy for most web applications

inventory/group_vars/proxies_stg

@@ -99,7 +99,8 @@ tcp_ports: [
 ]
 varnish_group: proxies
 zabbix_macros:
-  'SWAP.PFREE.MIN.WARN': 30 # typically seems to run at ~42%
+  'APACHE.STATUS.PORT': 443     # Proxies appear to ignore port 80 for apache-status
+  'APACHE.STATUS.SCHEME': https # but https://localhost seems to work instead
 
 notes: |
   * Provides frontend (reverse) proxy for most web applications

inventory/group_vars/torrent

@@ -20,6 +20,9 @@ num_cpus: 2
 primary_auth_source: ipa
 tcp_ports: [53, 80, 443, 873, "6881-6999"]
 udp_ports: [53]
+zabbix_macros:
+  'APACHE.STATUS.PORT': 443     # Proxies appear to ignore port 80 for apache-status
+  'APACHE.STATUS.SCHEME': https # but https://localhost seems to work instead
 
 notes: |
   Torrent master server for Fedora distribution

inventory/host_vars/noc02.fedoraproject.org

@@ -56,4 +56,6 @@ vpn: true
 zabbix_host: zabbix01.vpn.fedoraproject.org
 zabbix_macros:
   'VFS.DEV.WRITE.AWAIT.WARN': 80
+  'APACHE.STATUS.PORT': 443     # Proxies appear to ignore port 80 for apache-status
+  'APACHE.STATUS.SCHEME': https # but https://localhost seems to work instead
 notes: "This is an external nagios server located outside of PHX. It monitors our user websites/applications (fedoraproject.org, FAS, PackageDB, Bodhi/Updates)."

roles/apache/tasks/main.yml

@@ -87,3 +87,34 @@
   tags:
   - config
   - apache
+
+# HTTPd monitoring for Fedora Zabbix
+- 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 }}"
+  tags:
+    - apache
+    - zabbix_api
+  block:
+    - name: Import HTTPd template file
+      community.zabbix.zabbix_template:
+        template_yaml: "{{ lookup('file', 'zabbix/apache-template.yml') }}"
+        state: present
+    - name: Ensure HTTPd hostgroup is present
+      community.zabbix.zabbix_group:
+        host_groups:
+          - HTTPd servers
+        state: present
+    - name: Add self to HTTPd in Zabbix
+      community.zabbix.zabbix_host:
+        host_name: "{{ inventory_hostname }}"
+        host_groups: HTTPd servers
+        link_templates: HTTPd Status Monitoring
+        force: false

roles/copr/backend/templates/copr-be.conf.j2

@@ -41,7 +41,7 @@ sleeptime=20
 builds_max_workers={{ max_workers }}
 
 # Maximum number of concurrently running tasks per architecture.  Since we
-# emulate s390x and armhfp on x86_64, we give it ~25% of the x86_64 quota.
+# emulate s390x, armhfp and riscv64 on x86_64, we give it ~25% of the x86_64 quota.
 # The 32bit x86 variants (i386, i586 and i686) are in minority now, so let's
 # limit them as well.
 builds_max_workers_arch=
@@ -52,7 +52,8 @@ builds_max_workers_arch=
     i386={{ (max_x86_64_workers|int / 5)|int }},
     i586={{ (max_x86_64_workers|int / 4)|int }},
     i686={{ (max_x86_64_workers|int / 5)|int }},
-    ppc64le={{ max_ppc64le_workers }}
+    ppc64le={{ max_ppc64le_workers }},
+    riscv64={{ (max_x86_64_workers|int / 5)|int }}
 
 # Do not let one user waste the whole architecture capacity
 builds_max_workers_arch_per_owner=s390x=4

roles/copr/backend/templates/resalloc/pools.yaml.j2

@@ -54,6 +54,8 @@ aws_{{ arch }}_{{ on_demand + '_' if on_demand is not none else '' }}{% if spot
     - arch_i686_native
     - arch_armhfp
     - arch_armhfp_emulated
+    - arch_riscv64
+    - arch_riscv64_emulated
 {% else %}
     - arch_aarch64
     - arch_aarch64_native
@@ -214,6 +216,8 @@ vmhost_x86_{{ hv }}_{% if devel %}dev{% else %}prod{% endif %}:
     - arch_i686_native
     - arch_armhfp
     - arch_armhfp_emulated
+    - arch_riscv64
+    - arch_riscv64_emulated
     - hypervisor
     - hypervisor_x86_64
     - hypervisor_x86_64_{{ hv }}

roles/copr/frontend/files/chroots.conf

@@ -15,4 +15,8 @@ config["rules"] = [{
         "match_type": "arch",
         "match": ["armhfp"],
         "comment": "An emulated chroot. Builds are done on x86_64.",
+}, {
+        "match_type": "arch",
+        "match": ["riscv64"],
+        "comment": "An emulated chroot. Builds are done on x86_64 using QEMU.",
 }]