Merge pull request #816 from ministryofjustice/oasys-adjust-maintenan…

…ce-message-checks oasys adjust maintenance message checks
ministryofjustice · May 30, 2024 · 0be34b6 · 0be34b6
2 parents 322a05f + 2e38352
commit 0be34b6
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 2 deletions.
diff --git a/ansible/group_vars/server_type_oasys_web.yml b/ansible/group_vars/server_type_oasys_web.yml
@@ -55,3 +55,8 @@ collectd_monitored_services_servertype:
   - metric_name: service_status_app
     metric_dimension: tomcat-healthcheck
     shell_cmd: "service tomcat status"
+  - metric_name: service_status_app
+    metric_dimension: maintenance-msg
+    shell_cmd: "[ $( date -r /u01/app/apache/tomcat/latest/webapps/ROOT/maintenance_message.html '+%Y%m%d%H%M' ) -gt $(date -d '1 hour ago' +'%Y%m%d%H%M') ]"
+
+collectd_script_user: oracle
diff --git a/ansible/roles/oasys-ords/defaults/main.yml b/ansible/roles/oasys-ords/defaults/main.yml
@@ -11,7 +11,6 @@ oasys_ords_extra_files:
   - "index_message.html"
   - "index_no_message.html"
 oasys_ords_s3_bucket: "hmpps/oasys-ords"
-oasys_maintenance_msg: ""
 ords_db_port: 1521
 ords_db_sid: "{{ ec2.tags['oracle-db-sid'] }}"
 oasys_ords_dir: "/u02/stage/ORDS/ords_stage"

diff --git a/ansible/roles/oasys-ords/tasks/files.yml b/ansible/roles/oasys-ords/tasks/files.yml
@@ -76,6 +76,6 @@
 - name: update maintenance message
   ansible.builtin.cron:
     name: "maintenance_message"
-    minute: "*/2" # every 10 mins
+    minute: "*/10" # every 10 mins
     user: root
     job: "su oracle -c '{{ oasys_ords_get_maintenance_msg_command }} > {{ oasys_ords_maintenance_message_file }}'"