diff --git a/handlers/restart_services.yml b/handlers/restart_services.yml index cfdb02735f..131edb1e54 100644 --- a/handlers/restart_services.yml +++ b/handlers/restart_services.yml @@ -135,9 +135,6 @@ - name: Reload NetworkManager-connections ansible.builtin.command: nmcli c reload -- name: Restart basset-worker - service: name=basset-worker state=restarted - - name: Apply interface-changes ansible.builtin.command: nmcli con up {{ item.split()[1] }} async: 1 diff --git a/roles/nagios_client/tasks/main.yml b/roles/nagios_client/tasks/main.yml index efe5b9fbc2..4abb993a82 100644 --- a/roles/nagios_client/tasks/main.yml +++ b/roles/nagios_client/tasks/main.yml @@ -150,7 +150,6 @@ - check_datanommer_history.cfg - check_memcache.cfg - check_lock_file_age.cfg - - check_basset.cfg - check_fmn.cfg - check_testcloud.cfg - check_mirrorlist_docker_proxy.cfg diff --git a/roles/nagios_client/templates/check_basset.cfg.j2 b/roles/nagios_client/templates/check_basset.cfg.j2 deleted file mode 100644 index 22ebe043f4..0000000000 --- a/roles/nagios_client/templates/check_basset.cfg.j2 +++ /dev/null @@ -1,2 +0,0 @@ -command[check_mongo_proc]={{ libdir }}/nagios/plugins/check_procs -s RSD -u mongodb -C mongod -c 1:1 -command[check_rabbitmq_proc]={{ libdir }}/nagios/plugins/check_procs -s RSD -u rabbitmq -C beam.smp -c 1:1 diff --git a/roles/nagios_server/files/nagios/services/rdu3_internal/basset.cfg b/roles/nagios_server/files/nagios/services/rdu3_internal/basset.cfg deleted file mode 100644 index ba0bc9ff28..0000000000 --- a/roles/nagios_server/files/nagios/services/rdu3_internal/basset.cfg +++ /dev/null @@ -1,27 +0,0 @@ -define service { - hostgroup_name basset - service_description mongo process - check_command check_by_nrpe!check_mongo_proc - use defaulttemplate -} - -define service { - hostgroup_name basset - service_description rabbitmq process - check_command check_by_nrpe!check_rabbitmq_proc - use defaulttemplate -} - -define service { - hostgroup_name basset - service_description basset worker processes - check_command check_by_nrpe!check_worker_proc - use defaulttemplate -} - -define service { - hostgroup_name basset - service_description basset processing queue - check_command check_by_nrpe!check_basset_queue - use defaulttemplate -} diff --git a/roles/nagios_server/tasks/main.yml b/roles/nagios_server/tasks/main.yml index 9028c0632e..7a5f0c9d93 100644 --- a/roles/nagios_server/tasks/main.yml +++ b/roles/nagios_server/tasks/main.yml @@ -183,7 +183,6 @@ - name: Copy /etc/nagios/services (RDU3 specific files) ansible.builtin.copy: src=nagios/services/rdu3_internal/{{ item }} dest=/etc/nagios/services/{{ item }} with_items: - - basset.cfg - certgetter.cfg - db_backups.cfg - disk.cfg @@ -204,7 +203,6 @@ - name: Copy /etc/nagios/services (RDU3 specific files) ansible.builtin.copy: src=nagios/services/rdu3_internal/{{ item }} dest=/etc/nagios/services/{{ item }} with_items: - - basset.cfg - certgetter.cfg - db_backups.cfg - disk.cfg diff --git a/roles/openshift-apps/firmitas/templates/certlist.yml.j2 b/roles/openshift-apps/firmitas/templates/certlist.yml.j2 index b9db56c769..88cf8c7e40 100644 --- a/roles/openshift-apps/firmitas/templates/certlist.yml.j2 +++ b/roles/openshift-apps/firmitas/templates/certlist.yml.j2 @@ -31,22 +31,6 @@ anitya.stg: time: null path: anitya.stg.crt user: firmitas-automata -basset.stg: - certstat: - cstarted: true - cstopped: false - daystobt: -2055 - daystodd: 1595 - issuauth: RabbitMQ STAGING CA - serialno: 302976342416367222605158326276362966017 - stopdate: 2029-02-18 18:33:36 - strtdate: 2019-02-21 18:33:36 - notistat: - done: false - link: null - time: null - path: basset.stg.crt - user: firmitas-automata batcave.stg: certstat: cstarted: true