From 965f218b98fd43a8d21399c05ab721f666427430 Mon Sep 17 00:00:00 2001 From: Dominic Robinson Date: Mon, 25 Nov 2024 16:12:59 +0000 Subject: [PATCH 1/6] use 30min period for cert expiry --- .../templates/collectd_endpoint_monitoring.sh.j2 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ansible/roles/collectd-endpoint-monitoring/templates/collectd_endpoint_monitoring.sh.j2 b/ansible/roles/collectd-endpoint-monitoring/templates/collectd_endpoint_monitoring.sh.j2 index 3ef87ca79..556579dcf 100644 --- a/ansible/roles/collectd-endpoint-monitoring/templates/collectd_endpoint_monitoring.sh.j2 +++ b/ansible/roles/collectd-endpoint-monitoring/templates/collectd_endpoint_monitoring.sh.j2 @@ -6,7 +6,7 @@ # To debug, run INTERVAL=5 LOGGER_INTERVAL_FOR_ERRORS=0 {{ collectd_script_path }}/{{ collectd_script_name }}.sh ENDPOINTS=() -CERT_EXPIRY_METRIC_INTERVAL=3600 +CERT_EXPIRY_METRIC_INTERVAL=1800 LOGGER_INTERVAL_FOR_ERRORS="${LOGGER_INTERVAL_FOR_ERRORS:-3600}" # set to 0 to display to stdout DEFAULT_INTERVAL="{{ collectd_script_interval }}" HOSTNAME="${HOSTNAME:-localhost}" From c8e32c9da6307f61623d5597ab5b0ab28c567771 Mon Sep 17 00:00:00 2001 From: Dominic Robinson Date: Mon, 25 Nov 2024 16:13:59 +0000 Subject: [PATCH 2/6] use new urls where possible --- ...vironment_name_hmpps_oem_preproduction.yml | 61 +++++++----- .../environment_name_hmpps_oem_production.yml | 93 ++++++++++--------- .../environment_name_hmpps_oem_test.yml | 20 ++-- 3 files changed, 102 insertions(+), 72 deletions(-) diff --git a/ansible/group_vars/environment_name_hmpps_oem_preproduction.yml b/ansible/group_vars/environment_name_hmpps_oem_preproduction.yml index 2b4614aa9..eacc75753 100644 --- a/ansible/group_vars/environment_name_hmpps_oem_preproduction.yml +++ b/ansible/group_vars/environment_name_hmpps_oem_preproduction.yml @@ -74,21 +74,7 @@ emctl_oem: /u01/app/oracle/product/mw135/bin/emctl emctl_agent: /u01/app/oracle/product/oem-agent/agent_inst/bin/emctl collectd_endpoint_monitoring: - - metric_dimension: c.pp-nomis.az.justice.gov.uk - url: https://c.pp-nomis.az.justice.gov.uk/forms/frmservlet?config=tag - time_ranges: "1.0700-1.1800,2.0700-2.1800,3.0700-3.1800,4.0700-4.1800,5.0700-5.1800" - - metric_dimension: reporting.pp-nomis.az.justice.gov.uk - url: https://reporting.pp-nomis.az.justice.gov.uk/keepalive.htm - time_ranges: "1.0700-1.1800,2.0700-2.1800,3.0700-3.1800,4.0700-4.1800,5.0700-5.1800" - - metric_dimension: c.lsast-nomis.az.justice.gov.uk - url: https://c.lsast-nomis.az.justice.gov.uk/forms/frmservlet?config=tag - time_ranges: "1.0700-1.1800,2.0700-2.1800,3.0700-3.1800,4.0700-4.1800,5.0700-5.1800" - - metric_dimension: pp-oasys.az.justice.gov.uk - url: https://pp-oasys.az.justice.gov.uk/eor/f?p=100 - time_ranges: "1.0700-1.1800,2.0700-2.1800,3.0700-3.1800,4.0700-4.1800,5.0700-5.1800" - - metric_dimension: onr.pp-oasys.az.justice.gov.uk - url: https://onr.pp-oasys.az.justice.gov.uk/InfoViewApp - time_ranges: "1.0700-1.1800,2.0700-2.1800,3.0700-3.1800,4.0700-4.1800,5.0700-5.1800" + # corporate-staff-rostering - metric_dimension: r1.pp.csr.service.justice.gov.uk url: http://r1.pp.csr.service.justice.gov.uk:7770/isps/index.html?2057 time_ranges: "1.0700-1.1800,2.0700-2.1800,3.0700-3.1800,4.0700-4.1800,5.0700-5.1800" @@ -110,6 +96,45 @@ collectd_endpoint_monitoring: - metric_dimension: traina.csr.service.justice.gov.uk url: http://traina.csr.service.justice.gov.uk/isps/index.html?2057 time_ranges: "1.0700-1.1800,2.0700-2.1800,3.0700-3.1800,4.0700-4.1800,5.0700-5.1800" + # hmpps-domain-services + - metric_dimension: rdgateway1.preproduction.hmpps-domain.service.justice.gov.uk + url: https://rdgateway1.preproduction.hmpps-domain.service.justice.gov.uk/ + time_ranges: "1.0700-1.1800,2.0700-2.1800,3.0700-3.1800,4.0700-4.1800,5.0700-5.1800" + # nomis + - metric_dimension: c.pp-nomis.az.justice.gov.uk # TODO: delete + url: https://c.pp-nomis.az.justice.gov.uk/forms/frmservlet?config=tag + time_ranges: "1.0700-1.1800,2.0700-2.1800,3.0700-3.1800,4.0700-4.1800,5.0700-5.1800" + - metric_dimension: c.preproduction.nomis.service.justice.gov.uk + url: https://c.preproduction.nomis.service.justice.gov.uk/forms/frmservlet?config=tag + time_ranges: "1.0700-1.1800,2.0700-2.1800,3.0700-3.1800,4.0700-4.1800,5.0700-5.1800" + - metric_dimension: c.lsast-nomis.az.justice.gov.uk # TODO: delete + url: https://c.lsast-nomis.az.justice.gov.uk/forms/frmservlet?config=tag + time_ranges: "1.0700-1.1800,2.0700-2.1800,3.0700-3.1800,4.0700-4.1800,5.0700-5.1800" + - metric_dimension: c-lsast.preproduction.nomis.service.justice.gov.uk + url: https://c-lsast.preproduction.nomis.service.justice.gov.uk/forms/frmservlet?config=tag + time_ranges: "1.0700-1.1800,2.0700-2.1800,3.0700-3.1800,4.0700-4.1800,5.0700-5.1800" + # nomis-combined-reporting + - metric_dimension: reporting.pp-nomis.az.justice.gov.uk # AZURE + url: https://reporting.pp-nomis.az.justice.gov.uk/keepalive.htm + time_ranges: "1.0700-1.1800,2.0700-2.1800,3.0700-3.1800,4.0700-4.1800,5.0700-5.1800" + - metric_dimension: preproduction.reporting.nomis.service.justice.gov.uk + url: https://preproduction.reporting.nomis.service.justice.gov.uk/keepalive.htm + time_ranges: "1.0700-1.1800,2.0700-2.1800,3.0700-3.1800,4.0700-4.1800,5.0700-5.1800" + # oasys + - metric_dimension: pp-oasys.az.justice.gov.uk # TODO: delete + url: https://pp-oasys.az.justice.gov.uk/eor/f?p=100 + time_ranges: "1.0700-1.1800,2.0700-2.1800,3.0700-3.1800,4.0700-4.1800,5.0700-5.1800" + - metric_dimension: pp.oasys.service.justice.gov.uk + url: https://pp.oasys.service.justice.gov.uk/eor/f?p=100 + time_ranges: "1.0700-1.1800,2.0700-2.1800,3.0700-3.1800,4.0700-4.1800,5.0700-5.1800" + - metric_dimension: pp-int.oasys.service.justice.gov.uk + url: https://pp-int.oasys.service.justice.gov.uk/eor/f?p=100 + time_ranges: "1.0700-1.1800,2.0700-2.1800,3.0700-3.1800,4.0700-4.1800,5.0700-5.1800" + # oasys-national-reporting + - metric_dimension: onr.pp-oasys.az.justice.gov.uk # AZURE + url: https://onr.pp-oasys.az.justice.gov.uk/InfoViewApp + time_ranges: "1.0700-1.1800,2.0700-2.1800,3.0700-3.1800,4.0700-4.1800,5.0700-5.1800" + # planetfm - metric_dimension: cafmtx.pp.planetfm.service.justice.gov.uk url: https://cafmtx.pp.planetfm.service.justice.gov.uk/RDWeb time_ranges: "1.0700-1.1800,2.0700-2.1800,3.0700-3.1800,4.0700-4.1800,5.0700-5.1800" @@ -117,9 +142,3 @@ collectd_endpoint_monitoring: url: https://cafmwebx.pp.planetfm.service.justice.gov.uk/PlanetPortal follow_redirect: 0 time_ranges: "1.0700-1.1800,2.0700-2.1800,3.0700-3.1800,4.0700-4.1800,5.0700-5.1800" - - metric_dimension: hpa-preprod.service.hmpps.dsd.io - url: https://hpa-preprod.service.hmpps.dsd.io/ - time_ranges: "1.0700-1.1800,2.0700-2.1800,3.0700-3.1800,4.0700-4.1800,5.0700-5.1800" - - metric_dimension: rdgateway1.preproduction.hmpps-domain.service.justice.gov.uk - url: https://rdgateway1.preproduction.hmpps-domain.service.justice.gov.uk/ - time_ranges: "1.0700-1.1800,2.0700-2.1800,3.0700-3.1800,4.0700-4.1800,5.0700-5.1800" diff --git a/ansible/group_vars/environment_name_hmpps_oem_production.yml b/ansible/group_vars/environment_name_hmpps_oem_production.yml index 35e27c44a..a6014a586 100644 --- a/ansible/group_vars/environment_name_hmpps_oem_production.yml +++ b/ansible/group_vars/environment_name_hmpps_oem_production.yml @@ -69,44 +69,19 @@ housekeeping_cron: hour: "08" # job: command generated in -# Replaces Grafana/Prometheus black-box exporter monitoring -endpoint_monitoring_targets: - # - target: https://google.com # Example target - # expected_response_code: 301 - # check_domain_ssl_expiry: true - - target: https://oasys.az.justice.gov.uk - expected_response_code: 302 - check_domain_ssl_expiry: "true" - - target: https://oasys.az.justice.gov.uk/eor/f?p=100 - expected_response_code: 302 - check_domain_ssl_expiry: "false" # don't re-check this as it's just a duplicate of above - - target: https://bridge-oasys.az.justice.gov.uk - expected_response_code: 200 - check_domain_ssl_expiry: "true" - - target: https://bridge-oasys.az.justice.gov.uk/eor/f?p=100, - expected_response_code: 200 - check_domain_ssl_expiry: "false" - emcli: /u01/app/oracle/product/mw135/bin/emcli emctl_oem: /u01/app/oracle/product/mw135/bin/emctl emctl_agent: /u01/app/oracle/product/oem-agent/agent_inst/bin/emctl collectd_endpoint_monitoring: - - metric_dimension: c.nomis.az.justice.gov.uk - url: https://c.nomis.az.justice.gov.uk/forms/frmservlet?config=tag - - metric_dimension: reporting.nomis.az.justice.gov.uk - url: https://reporting.nomis.az.justice.gov.uk/keepalive.htm - time_ranges: "0.0000-1.0200,1.0210-3.0200,3.0210-5.0200,5.0210-7.0000" # web servers refreshed Mon/Wed/Fri at 2am - - metric_dimension: oasys.az.justice.gov.uk - url: https://oasys.az.justice.gov.uk/eor/f?p=100 - - metric_dimension: training.oasys.az.justice.gov.uk - url: https://training.oasys.az.justice.gov.uk/eor/f?p=100 - - metric_dimension: practice.oasys.az.justice.gov.uk - url: https://practice.oasys.az.justice.gov.uk/eor/f?p=100 - - metric_dimension: bridge-oasys.az.justice.gov.uk - url: https://bridge-oasys.az.justice.gov.uk/ - - metric_dimension: onr.oasys.az.justice.gov.uk - url: https://onr.oasys.az.justice.gov.uk/InfoViewApp + # az-noms-production-1 + - metric_dimension: www.offloc.service.justice.gov.uk + url: https://www.offloc.service.justice.gov.uk/health + - metric_dimension: hpa.service.hmpps.dsd.io + url: https://hpa.service.hmpps.dsd.io/health + - metric_dimension: hmpps-az-gw1.justice.gov.uk + url: https://hmpps-az-gw1.justice.gov.uk/RDWeb + # corporate-staff-rostering - metric_dimension: r1.csr.service.justice.gov.uk url: http://r1.csr.service.justice.gov.uk:7770/isps/index.html?2057 - metric_dimension: r2.csr.service.justice.gov.uk @@ -119,20 +94,52 @@ collectd_endpoint_monitoring: url: http://r5.csr.service.justice.gov.uk:7770/isps/index.html?2057 - metric_dimension: r6.csr.service.justice.gov.uk url: http://r6.csr.service.justice.gov.uk:7771/isps/index.html?2057 + # hmpps-domain-services + - metric_dimension: rdgateway1.hmpps-domain.service.justice.gov.uk + url: https://rdgateway1.hmpps-domain.service.justice.gov.uk/ + # nomis + - metric_dimension: c.nomis.az.justice.gov.uk # TODO: delete + url: https://c.nomis.az.justice.gov.uk/forms/frmservlet?config=tag + - metric_dimension: c.nomis.service.justice.gov.uk + url: https://c.nomis.service.justice.gov.uk/forms/frmservlet?config=tag + # nomis-combined-reporting + - metric_dimension: reporting.nomis.az.justice.gov.uk # AZURE + url: https://reporting.nomis.az.justice.gov.uk/keepalive.htm + time_ranges: "0.0000-1.0200,1.0210-3.0200,3.0210-5.0200,5.0210-7.0000" # web servers refreshed Mon/Wed/Fri at 2am + # oasys + - metric_dimension: oasys.az.justice.gov.uk # TODO: delete + url: https://oasys.az.justice.gov.uk/eor/f?p=100 + - metric_dimension: training.oasys.az.justice.gov.uk # TODO: delete + url: https://training.oasys.az.justice.gov.uk/eor/f?p=100 + - metric_dimension: practice.oasys.az.justice.gov.uk # TODO: delete + url: https://practice.oasys.az.justice.gov.uk/eor/f?p=100 + - metric_dimension: bridge-oasys.az.justice.gov.uk # TODO: delete + url: https://bridge-oasys.az.justice.gov.uk + - metric_dimension: int.oasys.service.justice.gov.uk + url: https://int.oasys.service.justice.gov.uk/eor/f?p=100 + - metric_dimension: training.int.oasys.service.justice.gov.uk + url: https://training.int.oasys.service.justice.gov.uk/eor/f?p=100 + - metric_dimension: practice.int.oasys.service.justice.gov.uk + url: https://practice.int.oasys.service.justice.gov.uk/eor/f?p=100 + - metric_dimension: oasys.servive.justice.gov.uk + url: https://oasys.service.justice.gov.uk/ + # oasys-national-reporting + - metric_dimension: onr.oasys.az.justice.gov.uk # Azure + url: https://onr.oasys.az.justice.gov.uk/InfoViewApp + # planetfm - metric_dimension: cafmtx.planetfm.service.justice.gov.uk url: https://cafmtx.planetfm.service.justice.gov.uk/RDWeb - - metric_dimension: cafmwebx2.az.justice.gov.uk + - metric_dimension: cafmwebx2.az.justice.gov.uk # TODO: delete url: https://cafmwebx2.az.justice.gov.uk/PlanetPortal follow_redirect: 0 - - metric_dimension: cafmtrainweb.az.justice.gov.uk + - metric_dimension: cafmtrainweb.az.justice.gov.uk # TODO: delete url: https://cafmtrainweb.az.justice.gov.uk/PlanetPortal follow_redirect: 0 time_ranges: "1.0700-1.1800,2.0700-2.1800,3.0700-3.1800,4.0700-4.1800,5.0700-5.1800" - - metric_dimension: www.offloc.service.justice.gov.uk - url: https://www.offloc.service.justice.gov.uk/health - - metric_dimension: hpa.service.hmpps.dsd.io - url: https://hpa.service.hmpps.dsd.io/ - - metric_dimension: hmpps-az-gw1.justice.gov.uk - url: https://hmpps-az-gw1.justice.gov.uk/RDWeb - - metric_dimension: rdgateway1.hmpps-domain.service.justice.gov.uk - url: https://rdgateway1.hmpps-domain.service.justice.gov.uk/ + - metric_dimension: cafmwebx2.planetfm.service.justice.gov.uk + url: https://cafmwebx2.planetfm.service.justice.gov.uk/PlanetPortal + follow_redirect: 0 + - metric_dimension: cafmtrainweb.planetfm.service.justice.gov.uk + url: https://cafmtrainweb.planetfm.service.justice.gov.uk/PlanetPortal + follow_redirect: 0 + time_ranges: "1.0700-1.1800,2.0700-2.1800,3.0700-3.1800,4.0700-4.1800,5.0700-5.1800" diff --git a/ansible/group_vars/environment_name_hmpps_oem_test.yml b/ansible/group_vars/environment_name_hmpps_oem_test.yml index eeb208dec..239b7ebc3 100644 --- a/ansible/group_vars/environment_name_hmpps_oem_test.yml +++ b/ansible/group_vars/environment_name_hmpps_oem_test.yml @@ -73,23 +73,27 @@ emctl_oem: /u01/app/oracle/product/mw135/bin/emctl emctl_agent: /u01/app/oracle/product/oem-agent/agent_inst/bin/emctl collectd_endpoint_monitoring: + # az-noms-dev-test-environments + - metric_dimension: stage.offloc.service.justice.gov.uk + url: https://stage.offloc.service.justice.gov.uk/health + time_ranges: "1.0700-1.1800,2.0700-2.1800,3.0700-3.1800,4.0700-4.1800,5.0700-5.1800" + - metric_dimension: hmppgw1.justice.gov.uk + url: https://hmppgw1.justice.gov.uk/RDWeb + # hmpps-domain-services + - metric_dimension: rdgateway1.test.hmpps-domain.service.justice.gov.uk + url: https://rdgateway1.test.hmpps-domain.service.justice.gov.uk/ + time_ranges: "1.0700-1.1800,2.0700-2.1800,3.0700-3.1800,4.0700-4.1800,5.0700-5.1800" + # nomis - metric_dimension: c-t1.test.nomis.service.justice.gov.uk url: https://c-t1.test.nomis.service.justice.gov.uk/forms/frmservlet?config=tag - metric_dimension: c-t2.test.nomis.service.justice.gov.uk url: https://c-t1.test.nomis.service.justice.gov.uk/forms/frmservlet?config=tag - metric_dimension: c-t3.test.nomis.service.justice.gov.uk url: https://c-t3.test.nomis.service.justice.gov.uk/forms/frmservlet?config=tag + # oasys - metric_dimension: t1-int.oasys.service.justice.gov.uk url: https://t1-int.oasys.service.justice.gov.uk/ time_ranges: "1.0700-1.1800,2.0700-2.1800,3.0700-3.1800,4.0700-4.1800,5.0700-5.1800" - metric_dimension: t2-int.oasys.service.justice.gov.uk url: https://t2-int.oasys.service.justice.gov.uk/ time_ranges: "1.0700-1.1800,2.0700-2.1800,3.0700-3.1800,4.0700-4.1800,5.0700-5.1800" - - metric_dimension: stage.offloc.service.justice.gov.uk - url: https://stage.offloc.service.justice.gov.uk/health - time_ranges: "1.0700-1.1800,2.0700-2.1800,3.0700-3.1800,4.0700-4.1800,5.0700-5.1800" - - metric_dimension: hmppgw1.justice.gov.uk - url: https://hmppgw1.justice.gov.uk/RDWeb - - metric_dimension: rdgateway1.test.hmpps-domain.service.justice.gov.uk - url: https://rdgateway1.test.hmpps-domain.service.justice.gov.uk/ - time_ranges: "1.0700-1.1800,2.0700-2.1800,3.0700-3.1800,4.0700-4.1800,5.0700-5.1800" From 06291684a8c00fd63b096aadb4294128853cb854 Mon Sep 17 00:00:00 2001 From: Dominic Robinson Date: Mon, 25 Nov 2024 16:14:31 +0000 Subject: [PATCH 3/6] restart on the hour so can be excluded from monitoring --- ansible/roles/ncr-bip/tasks/setup_tomcat_restart.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/ansible/roles/ncr-bip/tasks/setup_tomcat_restart.yml b/ansible/roles/ncr-bip/tasks/setup_tomcat_restart.yml index b2be6c671..49882df5d 100644 --- a/ansible/roles/ncr-bip/tasks/setup_tomcat_restart.yml +++ b/ansible/roles/ncr-bip/tasks/setup_tomcat_restart.yml @@ -22,7 +22,7 @@ - name: Setup tomcat restart cron ansible.builtin.cron: name: "tomcat_restart" - minute: "{{ 60 | random(seed=inventory_hostname) }}" + minute: "0" hour: "2" weekday: "MON,WED,FRI" job: "/home/bobj/tomcat_restart.sh" @@ -31,7 +31,7 @@ - name: Setup log cleanup cron ansible.builtin.cron: name: "log_cleanup" - minute: "{{ 60 | random(seed=inventory_hostname) }}" + minute: "0" hour: "3" weekday: "MON,WED,FRI" job: "find {{ sap_bip_archived_logs_directory }} -mtime +365 -prune -exec rm -rf {} \\;" From 995e16cd4a77ba88646af0c8bc1da75d5e5f2b5a Mon Sep 17 00:00:00 2001 From: Dominic Robinson Date: Mon, 25 Nov 2024 16:49:45 +0000 Subject: [PATCH 4/6] formatting --- ...vironment_name_hmpps_oem_preproduction.yml | 18 ++++++++----- .../environment_name_hmpps_oem_production.yml | 27 ++++++++++++------- .../environment_name_hmpps_oem_test.yml | 3 +++ 3 files changed, 33 insertions(+), 15 deletions(-) diff --git a/ansible/group_vars/environment_name_hmpps_oem_preproduction.yml b/ansible/group_vars/environment_name_hmpps_oem_preproduction.yml index eacc75753..ace6084e1 100644 --- a/ansible/group_vars/environment_name_hmpps_oem_preproduction.yml +++ b/ansible/group_vars/environment_name_hmpps_oem_preproduction.yml @@ -96,23 +96,26 @@ collectd_endpoint_monitoring: - metric_dimension: traina.csr.service.justice.gov.uk url: http://traina.csr.service.justice.gov.uk/isps/index.html?2057 time_ranges: "1.0700-1.1800,2.0700-2.1800,3.0700-3.1800,4.0700-4.1800,5.0700-5.1800" + # hmpps-domain-services - metric_dimension: rdgateway1.preproduction.hmpps-domain.service.justice.gov.uk url: https://rdgateway1.preproduction.hmpps-domain.service.justice.gov.uk/ time_ranges: "1.0700-1.1800,2.0700-2.1800,3.0700-3.1800,4.0700-4.1800,5.0700-5.1800" + # nomis - - metric_dimension: c.pp-nomis.az.justice.gov.uk # TODO: delete - url: https://c.pp-nomis.az.justice.gov.uk/forms/frmservlet?config=tag - time_ranges: "1.0700-1.1800,2.0700-2.1800,3.0700-3.1800,4.0700-4.1800,5.0700-5.1800" - - metric_dimension: c.preproduction.nomis.service.justice.gov.uk - url: https://c.preproduction.nomis.service.justice.gov.uk/forms/frmservlet?config=tag - time_ranges: "1.0700-1.1800,2.0700-2.1800,3.0700-3.1800,4.0700-4.1800,5.0700-5.1800" - metric_dimension: c.lsast-nomis.az.justice.gov.uk # TODO: delete url: https://c.lsast-nomis.az.justice.gov.uk/forms/frmservlet?config=tag time_ranges: "1.0700-1.1800,2.0700-2.1800,3.0700-3.1800,4.0700-4.1800,5.0700-5.1800" - metric_dimension: c-lsast.preproduction.nomis.service.justice.gov.uk url: https://c-lsast.preproduction.nomis.service.justice.gov.uk/forms/frmservlet?config=tag time_ranges: "1.0700-1.1800,2.0700-2.1800,3.0700-3.1800,4.0700-4.1800,5.0700-5.1800" + - metric_dimension: c.pp-nomis.az.justice.gov.uk # TODO: delete + url: https://c.pp-nomis.az.justice.gov.uk/forms/frmservlet?config=tag + time_ranges: "1.0700-1.1800,2.0700-2.1800,3.0700-3.1800,4.0700-4.1800,5.0700-5.1800" + - metric_dimension: c.preproduction.nomis.service.justice.gov.uk + url: https://c.preproduction.nomis.service.justice.gov.uk/forms/frmservlet?config=tag + time_ranges: "1.0700-1.1800,2.0700-2.1800,3.0700-3.1800,4.0700-4.1800,5.0700-5.1800" + # nomis-combined-reporting - metric_dimension: reporting.pp-nomis.az.justice.gov.uk # AZURE url: https://reporting.pp-nomis.az.justice.gov.uk/keepalive.htm @@ -120,6 +123,7 @@ collectd_endpoint_monitoring: - metric_dimension: preproduction.reporting.nomis.service.justice.gov.uk url: https://preproduction.reporting.nomis.service.justice.gov.uk/keepalive.htm time_ranges: "1.0700-1.1800,2.0700-2.1800,3.0700-3.1800,4.0700-4.1800,5.0700-5.1800" + # oasys - metric_dimension: pp-oasys.az.justice.gov.uk # TODO: delete url: https://pp-oasys.az.justice.gov.uk/eor/f?p=100 @@ -130,10 +134,12 @@ collectd_endpoint_monitoring: - metric_dimension: pp-int.oasys.service.justice.gov.uk url: https://pp-int.oasys.service.justice.gov.uk/eor/f?p=100 time_ranges: "1.0700-1.1800,2.0700-2.1800,3.0700-3.1800,4.0700-4.1800,5.0700-5.1800" + # oasys-national-reporting - metric_dimension: onr.pp-oasys.az.justice.gov.uk # AZURE url: https://onr.pp-oasys.az.justice.gov.uk/InfoViewApp time_ranges: "1.0700-1.1800,2.0700-2.1800,3.0700-3.1800,4.0700-4.1800,5.0700-5.1800" + # planetfm - metric_dimension: cafmtx.pp.planetfm.service.justice.gov.uk url: https://cafmtx.pp.planetfm.service.justice.gov.uk/RDWeb diff --git a/ansible/group_vars/environment_name_hmpps_oem_production.yml b/ansible/group_vars/environment_name_hmpps_oem_production.yml index a6014a586..1d391b3f6 100644 --- a/ansible/group_vars/environment_name_hmpps_oem_production.yml +++ b/ansible/group_vars/environment_name_hmpps_oem_production.yml @@ -75,12 +75,13 @@ emctl_agent: /u01/app/oracle/product/oem-agent/agent_inst/bin/emctl collectd_endpoint_monitoring: # az-noms-production-1 - - metric_dimension: www.offloc.service.justice.gov.uk - url: https://www.offloc.service.justice.gov.uk/health - - metric_dimension: hpa.service.hmpps.dsd.io - url: https://hpa.service.hmpps.dsd.io/health - metric_dimension: hmpps-az-gw1.justice.gov.uk url: https://hmpps-az-gw1.justice.gov.uk/RDWeb + - metric_dimension: hpa.service.hmpps.dsd.io + url: https://hpa.service.hmpps.dsd.io/health + - metric_dimension: www.offloc.service.justice.gov.uk + url: https://www.offloc.service.justice.gov.uk/health + # corporate-staff-rostering - metric_dimension: r1.csr.service.justice.gov.uk url: http://r1.csr.service.justice.gov.uk:7770/isps/index.html?2057 @@ -94,18 +95,22 @@ collectd_endpoint_monitoring: url: http://r5.csr.service.justice.gov.uk:7770/isps/index.html?2057 - metric_dimension: r6.csr.service.justice.gov.uk url: http://r6.csr.service.justice.gov.uk:7771/isps/index.html?2057 + # hmpps-domain-services - metric_dimension: rdgateway1.hmpps-domain.service.justice.gov.uk url: https://rdgateway1.hmpps-domain.service.justice.gov.uk/ + # nomis - - metric_dimension: c.nomis.az.justice.gov.uk # TODO: delete + - metric_dimension: c.nomis.az.justice.gov.uk url: https://c.nomis.az.justice.gov.uk/forms/frmservlet?config=tag - metric_dimension: c.nomis.service.justice.gov.uk url: https://c.nomis.service.justice.gov.uk/forms/frmservlet?config=tag + # nomis-combined-reporting - metric_dimension: reporting.nomis.az.justice.gov.uk # AZURE url: https://reporting.nomis.az.justice.gov.uk/keepalive.htm time_ranges: "0.0000-1.0200,1.0210-3.0200,3.0210-5.0200,5.0210-7.0000" # web servers refreshed Mon/Wed/Fri at 2am + # oasys - metric_dimension: oasys.az.justice.gov.uk # TODO: delete url: https://oasys.az.justice.gov.uk/eor/f?p=100 @@ -115,17 +120,21 @@ collectd_endpoint_monitoring: url: https://practice.oasys.az.justice.gov.uk/eor/f?p=100 - metric_dimension: bridge-oasys.az.justice.gov.uk # TODO: delete url: https://bridge-oasys.az.justice.gov.uk + - metric_dimension: oasys.servive.justice.gov.uk # TODO: delete + url: https://oasys.service.justice.gov.uk/ + - metric_dimension: oasys.service.justice.gov.uk + url: https://oasys.service.justice.gov.uk/ - metric_dimension: int.oasys.service.justice.gov.uk url: https://int.oasys.service.justice.gov.uk/eor/f?p=100 - - metric_dimension: training.int.oasys.service.justice.gov.uk - url: https://training.int.oasys.service.justice.gov.uk/eor/f?p=100 - metric_dimension: practice.int.oasys.service.justice.gov.uk url: https://practice.int.oasys.service.justice.gov.uk/eor/f?p=100 - - metric_dimension: oasys.servive.justice.gov.uk - url: https://oasys.service.justice.gov.uk/ + - metric_dimension: training.int.oasys.service.justice.gov.uk + url: https://training.int.oasys.service.justice.gov.uk/eor/f?p=100 + # oasys-national-reporting - metric_dimension: onr.oasys.az.justice.gov.uk # Azure url: https://onr.oasys.az.justice.gov.uk/InfoViewApp + # planetfm - metric_dimension: cafmtx.planetfm.service.justice.gov.uk url: https://cafmtx.planetfm.service.justice.gov.uk/RDWeb diff --git a/ansible/group_vars/environment_name_hmpps_oem_test.yml b/ansible/group_vars/environment_name_hmpps_oem_test.yml index 239b7ebc3..ecc52197f 100644 --- a/ansible/group_vars/environment_name_hmpps_oem_test.yml +++ b/ansible/group_vars/environment_name_hmpps_oem_test.yml @@ -79,10 +79,12 @@ collectd_endpoint_monitoring: time_ranges: "1.0700-1.1800,2.0700-2.1800,3.0700-3.1800,4.0700-4.1800,5.0700-5.1800" - metric_dimension: hmppgw1.justice.gov.uk url: https://hmppgw1.justice.gov.uk/RDWeb + # hmpps-domain-services - metric_dimension: rdgateway1.test.hmpps-domain.service.justice.gov.uk url: https://rdgateway1.test.hmpps-domain.service.justice.gov.uk/ time_ranges: "1.0700-1.1800,2.0700-2.1800,3.0700-3.1800,4.0700-4.1800,5.0700-5.1800" + # nomis - metric_dimension: c-t1.test.nomis.service.justice.gov.uk url: https://c-t1.test.nomis.service.justice.gov.uk/forms/frmservlet?config=tag @@ -90,6 +92,7 @@ collectd_endpoint_monitoring: url: https://c-t1.test.nomis.service.justice.gov.uk/forms/frmservlet?config=tag - metric_dimension: c-t3.test.nomis.service.justice.gov.uk url: https://c-t3.test.nomis.service.justice.gov.uk/forms/frmservlet?config=tag + # oasys - metric_dimension: t1-int.oasys.service.justice.gov.uk url: https://t1-int.oasys.service.justice.gov.uk/ From 7d9ffbe49be2ae92072d41000647d65d4f7dfe68 Mon Sep 17 00:00:00 2001 From: Dominic Robinson Date: Mon, 25 Nov 2024 17:13:36 +0000 Subject: [PATCH 5/6] remove unused urls --- ...environment_name_hmpps_oem_preproduction.yml | 9 --------- .../environment_name_hmpps_oem_production.yml | 17 ----------------- 2 files changed, 26 deletions(-) diff --git a/ansible/group_vars/environment_name_hmpps_oem_preproduction.yml b/ansible/group_vars/environment_name_hmpps_oem_preproduction.yml index ace6084e1..636e23c84 100644 --- a/ansible/group_vars/environment_name_hmpps_oem_preproduction.yml +++ b/ansible/group_vars/environment_name_hmpps_oem_preproduction.yml @@ -103,15 +103,9 @@ collectd_endpoint_monitoring: time_ranges: "1.0700-1.1800,2.0700-2.1800,3.0700-3.1800,4.0700-4.1800,5.0700-5.1800" # nomis - - metric_dimension: c.lsast-nomis.az.justice.gov.uk # TODO: delete - url: https://c.lsast-nomis.az.justice.gov.uk/forms/frmservlet?config=tag - time_ranges: "1.0700-1.1800,2.0700-2.1800,3.0700-3.1800,4.0700-4.1800,5.0700-5.1800" - metric_dimension: c-lsast.preproduction.nomis.service.justice.gov.uk url: https://c-lsast.preproduction.nomis.service.justice.gov.uk/forms/frmservlet?config=tag time_ranges: "1.0700-1.1800,2.0700-2.1800,3.0700-3.1800,4.0700-4.1800,5.0700-5.1800" - - metric_dimension: c.pp-nomis.az.justice.gov.uk # TODO: delete - url: https://c.pp-nomis.az.justice.gov.uk/forms/frmservlet?config=tag - time_ranges: "1.0700-1.1800,2.0700-2.1800,3.0700-3.1800,4.0700-4.1800,5.0700-5.1800" - metric_dimension: c.preproduction.nomis.service.justice.gov.uk url: https://c.preproduction.nomis.service.justice.gov.uk/forms/frmservlet?config=tag time_ranges: "1.0700-1.1800,2.0700-2.1800,3.0700-3.1800,4.0700-4.1800,5.0700-5.1800" @@ -125,9 +119,6 @@ collectd_endpoint_monitoring: time_ranges: "1.0700-1.1800,2.0700-2.1800,3.0700-3.1800,4.0700-4.1800,5.0700-5.1800" # oasys - - metric_dimension: pp-oasys.az.justice.gov.uk # TODO: delete - url: https://pp-oasys.az.justice.gov.uk/eor/f?p=100 - time_ranges: "1.0700-1.1800,2.0700-2.1800,3.0700-3.1800,4.0700-4.1800,5.0700-5.1800" - metric_dimension: pp.oasys.service.justice.gov.uk url: https://pp.oasys.service.justice.gov.uk/eor/f?p=100 time_ranges: "1.0700-1.1800,2.0700-2.1800,3.0700-3.1800,4.0700-4.1800,5.0700-5.1800" diff --git a/ansible/group_vars/environment_name_hmpps_oem_production.yml b/ansible/group_vars/environment_name_hmpps_oem_production.yml index 1d391b3f6..0b1639375 100644 --- a/ansible/group_vars/environment_name_hmpps_oem_production.yml +++ b/ansible/group_vars/environment_name_hmpps_oem_production.yml @@ -112,16 +112,6 @@ collectd_endpoint_monitoring: time_ranges: "0.0000-1.0200,1.0210-3.0200,3.0210-5.0200,5.0210-7.0000" # web servers refreshed Mon/Wed/Fri at 2am # oasys - - metric_dimension: oasys.az.justice.gov.uk # TODO: delete - url: https://oasys.az.justice.gov.uk/eor/f?p=100 - - metric_dimension: training.oasys.az.justice.gov.uk # TODO: delete - url: https://training.oasys.az.justice.gov.uk/eor/f?p=100 - - metric_dimension: practice.oasys.az.justice.gov.uk # TODO: delete - url: https://practice.oasys.az.justice.gov.uk/eor/f?p=100 - - metric_dimension: bridge-oasys.az.justice.gov.uk # TODO: delete - url: https://bridge-oasys.az.justice.gov.uk - - metric_dimension: oasys.servive.justice.gov.uk # TODO: delete - url: https://oasys.service.justice.gov.uk/ - metric_dimension: oasys.service.justice.gov.uk url: https://oasys.service.justice.gov.uk/ - metric_dimension: int.oasys.service.justice.gov.uk @@ -138,13 +128,6 @@ collectd_endpoint_monitoring: # planetfm - metric_dimension: cafmtx.planetfm.service.justice.gov.uk url: https://cafmtx.planetfm.service.justice.gov.uk/RDWeb - - metric_dimension: cafmwebx2.az.justice.gov.uk # TODO: delete - url: https://cafmwebx2.az.justice.gov.uk/PlanetPortal - follow_redirect: 0 - - metric_dimension: cafmtrainweb.az.justice.gov.uk # TODO: delete - url: https://cafmtrainweb.az.justice.gov.uk/PlanetPortal - follow_redirect: 0 - time_ranges: "1.0700-1.1800,2.0700-2.1800,3.0700-3.1800,4.0700-4.1800,5.0700-5.1800" - metric_dimension: cafmwebx2.planetfm.service.justice.gov.uk url: https://cafmwebx2.planetfm.service.justice.gov.uk/PlanetPortal follow_redirect: 0 From e9a8c3d448407e9d4dc7a597917ffe55997b761a Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Mon, 25 Nov 2024 17:16:39 +0000 Subject: [PATCH 6/6] Commit changes made by code formatters --- .../group_vars/environment_name_hmpps_oem_preproduction.yml | 4 ++-- .../group_vars/environment_name_hmpps_oem_production.yml | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/ansible/group_vars/environment_name_hmpps_oem_preproduction.yml b/ansible/group_vars/environment_name_hmpps_oem_preproduction.yml index 636e23c84..febad2780 100644 --- a/ansible/group_vars/environment_name_hmpps_oem_preproduction.yml +++ b/ansible/group_vars/environment_name_hmpps_oem_preproduction.yml @@ -111,7 +111,7 @@ collectd_endpoint_monitoring: time_ranges: "1.0700-1.1800,2.0700-2.1800,3.0700-3.1800,4.0700-4.1800,5.0700-5.1800" # nomis-combined-reporting - - metric_dimension: reporting.pp-nomis.az.justice.gov.uk # AZURE + - metric_dimension: reporting.pp-nomis.az.justice.gov.uk # AZURE url: https://reporting.pp-nomis.az.justice.gov.uk/keepalive.htm time_ranges: "1.0700-1.1800,2.0700-2.1800,3.0700-3.1800,4.0700-4.1800,5.0700-5.1800" - metric_dimension: preproduction.reporting.nomis.service.justice.gov.uk @@ -127,7 +127,7 @@ collectd_endpoint_monitoring: time_ranges: "1.0700-1.1800,2.0700-2.1800,3.0700-3.1800,4.0700-4.1800,5.0700-5.1800" # oasys-national-reporting - - metric_dimension: onr.pp-oasys.az.justice.gov.uk # AZURE + - metric_dimension: onr.pp-oasys.az.justice.gov.uk # AZURE url: https://onr.pp-oasys.az.justice.gov.uk/InfoViewApp time_ranges: "1.0700-1.1800,2.0700-2.1800,3.0700-3.1800,4.0700-4.1800,5.0700-5.1800" diff --git a/ansible/group_vars/environment_name_hmpps_oem_production.yml b/ansible/group_vars/environment_name_hmpps_oem_production.yml index 0b1639375..820197093 100644 --- a/ansible/group_vars/environment_name_hmpps_oem_production.yml +++ b/ansible/group_vars/environment_name_hmpps_oem_production.yml @@ -107,9 +107,9 @@ collectd_endpoint_monitoring: url: https://c.nomis.service.justice.gov.uk/forms/frmservlet?config=tag # nomis-combined-reporting - - metric_dimension: reporting.nomis.az.justice.gov.uk # AZURE + - metric_dimension: reporting.nomis.az.justice.gov.uk # AZURE url: https://reporting.nomis.az.justice.gov.uk/keepalive.htm - time_ranges: "0.0000-1.0200,1.0210-3.0200,3.0210-5.0200,5.0210-7.0000" # web servers refreshed Mon/Wed/Fri at 2am + time_ranges: "0.0000-1.0200,1.0210-3.0200,3.0210-5.0200,5.0210-7.0000" # web servers refreshed Mon/Wed/Fri at 2am # oasys - metric_dimension: oasys.service.justice.gov.uk @@ -122,7 +122,7 @@ collectd_endpoint_monitoring: url: https://training.int.oasys.service.justice.gov.uk/eor/f?p=100 # oasys-national-reporting - - metric_dimension: onr.oasys.az.justice.gov.uk # Azure + - metric_dimension: onr.oasys.az.justice.gov.uk # Azure url: https://onr.oasys.az.justice.gov.uk/InfoViewApp # planetfm