From 771d72e12d225eca135387fe50386a67f070878a Mon Sep 17 00:00:00 2001 From: Kevin Fenzi Date: Mon, 27 Jun 2022 15:14:12 -0700 Subject: [PATCH] resultsdb01: clean up last entries Signed-off-by: Kevin Fenzi --- playbooks/include/proxies-reverseproxy.yml | 40 ------------------- .../templates/nagios/services/websites.cfg.j2 | 7 ---- 2 files changed, 47 deletions(-) diff --git a/playbooks/include/proxies-reverseproxy.yml b/playbooks/include/proxies-reverseproxy.yml index f2659ae127..2e8502e2b1 100644 --- a/playbooks/include/proxies-reverseproxy.yml +++ b/playbooks/include/proxies-reverseproxy.yml @@ -598,46 +598,6 @@ proxyurl: http://log01 tags: data-analysis - ## entries for resultsdb and resultsdb_frontend - - role: httpd/reverseproxy - website: taskotron.fedoraproject.org - destname: taskotron-resultsdb - localpath: /resultsdb - remotepath: /resultsdb - balancer_name: resultsdb - balancer_members: ['resultsdb01.vpn.fedoraproject.org:80'] - http_not_https_yes_this_is_insecure_and_i_feel_bad: true - - - role: httpd/reverseproxy - website: taskotron.fedoraproject.org - destname: taskotron-resultsdbapi - localpath: /resultsdb_api - remotepath: /resultsdb_api - balancer_name: resultsdb - balancer_members: ['resultsdb01.vpn.fedoraproject.org:80'] - http_not_https_yes_this_is_insecure_and_i_feel_bad: true - - ### staging entries for resultsdb and resultsdb_frontend - # - role: httpd/reverseproxy - # website: taskotron.stg.fedoraproject.org - # destname: taskotron-resultsdb - # localpath: /resultsdb - # remotepath: /resultsdb - # balancer_name: resultsdb-stg - # balancer_members: ['resultsdb01.stg.iad2.fedoraproject.org:80'] - # http_not_https_yes_this_is_insecure_and_i_feel_bad: true - # when: env == "staging" - # - #- role: httpd/reverseproxy - # website: taskotron.stg.fedoraproject.org - # destname: taskotron-resultsdbapi - # localpath: /resultsdb_api - # remotepath: /resultsdb_api - # balancer_name: resultsdb-stg - # balancer_members: ['resultsdb01.stg.iad2.fedoraproject.org:80'] - # http_not_https_yes_this_is_insecure_and_i_feel_bad: true - # when: env == "staging" - ### staging entries for resultsdb and resultsdb_frontend - role: httpd/reverseproxy website: resultsdb.stg.fedoraproject.org diff --git a/roles/nagios_server/templates/nagios/services/websites.cfg.j2 b/roles/nagios_server/templates/nagios/services/websites.cfg.j2 index 0c62c423a1..dc32e5a020 100644 --- a/roles/nagios_server/templates/nagios/services/websites.cfg.j2 +++ b/roles/nagios_server/templates/nagios/services/websites.cfg.j2 @@ -327,13 +327,6 @@ define service { use websitetemplate } -define service { - host_name resultsdb01.iad2.fedoraproject.org - service_description http-resultsdb-internal - check_command check_website!resultsdb01.iad2.fedoraproject.org!/resultsdb/results!resultsdb_frontend - use websitetemplate -} - {% endif %} define service {