diff --git a/inventory/group_vars/pdc_backend b/inventory/group_vars/pdc_backend deleted file mode 100644 index 4509bc28b4..0000000000 --- a/inventory/group_vars/pdc_backend +++ /dev/null @@ -1,41 +0,0 @@ ---- -# Define resources for this group of hosts here. -lvm_size: 20000 -mem_size: 2048 -num_cpus: 2 - -host_group: pdc-backend - -# for systems that do not match the above - specify the same parameter in -# the host_vars/$hostname file - -tcp_ports: [] - -fas_client_groups: sysadmin-noc,sysadmin-releng,sysadmin-datanommer,sysadmin-mbs,sysadmin-veteran - -# See the host_vars files for the value of fedmsg_error_recipients here - -csi_security_category: Moderate -csi_primary_contact: Ralph Bean -csi_purpose: fedmsg-hub daemon that ferries data from fedmsg to PDC. -csi_relationship: | - NOTICE - The three pdc-backend do *different* things. They all run a - fedmsg-hub daemon that loads the pdc-updater consumer plugin. However, the - pdc-updater plugin is configured to do different things in each place. - - On pdc-backend01, the compose handler is enabled which listens for new pungi - composes, and stores them in PDC. Fedora QE uses this data. The consumer - has only a single thread enabled to avoid OOMing itself with more than one - compose at a time. - - On pdc-backend02, the modularity handlers are enabled which listen for MBS - activity, and store that in PDC. pdc-backend02 also hosts the retirement - handler which listens to dist-git for new dead.package files, and propagates - the retirement to PDC (by prematurely EOLing the branch). Multiple threads are - enabled so that it can work more efficiently on these smaller tasks. - - On pdc-backend03, the dep chain handlers are enabled which listen for koji - messages and store dep chain information in PDC, like what rpms depend on what - other rpms at build time, and what containers depend on what rpms, etc.. - Multiple threads are enabled so that it can work more efficiently on these - smaller tasks. diff --git a/inventory/group_vars/pdc_backend_stg b/inventory/group_vars/pdc_backend_stg deleted file mode 100644 index f07babb410..0000000000 --- a/inventory/group_vars/pdc_backend_stg +++ /dev/null @@ -1,33 +0,0 @@ ---- -# Define resources for this group of hosts here. -lvm_size: 20000 -mem_size: 2048 -num_cpus: 1 - -host_group: pdc-backend - -# for systems that do not match the above - specify the same parameter in -# the host_vars/$hostname file - -tcp_ports: [] - -fas_client_groups: sysadmin-noc,sysadmin-releng,sysadmin-datanommer,sysadmin-mbs,sysadmin-veteran - -# See the host_vars files for the value of fedmsg_error_recipients here - -csi_security_category: Moderate -csi_primary_contact: Ralph Bean -csi_purpose: fedmsg-hub daemon that ferries data from fedmsg to PDC. -csi_relationship: | - NOTICE - pdc-backend01 and pdc-backend02 do *different* things. They both run - a fedmsg-hub daemon that loads the pdc-updater consumer plugin. However, the - pdc-updater plugin is configured to do different things in each place. - - On pdc-backend01, the compose handler is enabled which listens for new pungi - composes, and stores them in PDC. Fedora QE uses this data. The consumer - has only a single thread enabled to avoid OOMing itself with more than one - compose at a time. - - On pdc-backend02, the dep chain and modularity handlers are enabled which - listen for koji and MBS activity, and store that in PDC. Multiple threads - are enabled so that it can work more efficiently on these smaller tasks. diff --git a/inventory/inventory b/inventory/inventory index c90cb32e96..81130260e6 100644 --- a/inventory/inventory +++ b/inventory/inventory @@ -627,9 +627,6 @@ os-node05.stg.iad2.fedoraproject.org # osbs-aarch64-node01.stg.iad2.fedoraproject.org # osbs-aarch64-node02.stg.iad2.fedoraproject.org # packages03.stg.iad2.fedoraproject.org -# pdc-backend01.stg.iad2.fedoraproject.org -# pdc-backend02.stg.iad2.fedoraproject.org -# pdc-backend03.stg.iad2.fedoraproject.org # pdc-web01.stg.iad2.fedoraproject.org # pkgs01.stg.iad2.fedoraproject.org proxy01.stg.iad2.fedoraproject.org @@ -814,16 +811,6 @@ pdc-web02.iad2.fedoraproject.org [pdc_web_stg] # pdc-web01.stg.iad2.fedoraproject.org -[pdc_backend] -pdc-backend01.iad2.fedoraproject.org -pdc-backend02.iad2.fedoraproject.org -pdc-backend03.iad2.fedoraproject.org - -[pdc_backend_stg] -# pdc-backend01.stg.iad2.fedoraproject.org -# pdc-backend02.stg.iad2.fedoraproject.org -# pdc-backend03.stg.iad2.fedoraproject.org - [maintainer_test] f31-test.fedorainfracloud.org f32-test.fedorainfracloud.org @@ -1383,9 +1370,6 @@ osbs-control01.iad2.fedoraproject.org osbs-master01.iad2.fedoraproject.org osbs-node01.iad2.fedoraproject.org osbs-node02.iad2.fedoraproject.org -pdc-backend01.iad2.fedoraproject.org -pdc-backend02.iad2.fedoraproject.org -pdc-backend03.iad2.fedoraproject.org pdc-web01.iad2.fedoraproject.org pdc-web02.iad2.fedoraproject.org pkgs01.iad2.fedoraproject.org diff --git a/roles/nagios_server/files/nagios/services/iad2_internal/fedmsg.cfg b/roles/nagios_server/files/nagios/services/iad2_internal/fedmsg.cfg index a5f24caeae..28302fa64d 100644 --- a/roles/nagios_server/files/nagios/services/iad2_internal/fedmsg.cfg +++ b/roles/nagios_server/files/nagios/services/iad2_internal/fedmsg.cfg @@ -88,13 +88,6 @@ define service { # use defaulttemplate #} -define service { - host_name pdc-backend01.iad2.fedoraproject.org - service_description Check for fedmsg-hub proc - check_command check_by_nrpe!check_fedmsg_hub_proc - use defaulttemplate -} - # Odd one, check for the supybot fedmsg plugin define service { @@ -320,12 +313,6 @@ define service { # use defaulttemplate #} -define service { - host_name pdc-backend01.iad2.fedoraproject.org - service_description Check fedmsg consumers and producers hub - check_command check_by_nrpe!check_fedmsg_cp_pdc_backend - use defaulttemplate -} define service { host_name mbs-backend01.iad2.fedoraproject.org service_description Check fedmsg consumers and producers hub @@ -399,12 +386,6 @@ define service { # use defaulttemplate #} -define service { - host_name pdc-backend01.iad2.fedoraproject.org - service_description Check fedmsg-hub consumers exceptions - check_command check_by_nrpe!check_fedmsg_cexceptions_pdc_backend - use defaulttemplate -} define service { host_name mbs-backend01.iad2.fedoraproject.org service_description Check fedmsg-hub consumers exceptions @@ -479,13 +460,6 @@ define service { # use defaulttemplate #} -define service { - host_name pdc-backend01.iad2.fedoraproject.org - service_description Check fedmsg-hub consumers backlog - check_command check_by_nrpe!check_fedmsg_cbacklog_pdc_backend - use defaulttemplate -} - define service { host_name mbs-backend01.iad2.fedoraproject.org service_description Check fedmsg-hub consumers backlog