Merge pull request #3963 from nhsuk/next

Version 2.9.0

Author: thomasleese

.prettierignore

@@ -39,4 +39,5 @@ terraform/.terraform
 *.tfstate
 *.tfstate.backup
 scratchpad
-spec/fixtures/fhir/immunisation.json
+spec/fixtures/fhir/immunisation-create.json
+spec/fixtures/fhir/immunisation-update.json

Gemfile.lock

@@ -101,7 +101,7 @@ GEM
       public_suffix (>= 2.0.2, < 7.0)
     aes_key_wrap (1.1.0)
     amazing_print (1.8.1)
-    annotaterb (4.16.0)
+    annotaterb (4.17.0)
       activerecord (>= 6.0.0)
       activesupport (>= 6.0.0)
     array_enum (1.6.0)
@@ -182,7 +182,7 @@ GEM
     climate_control (1.2.0)
     coderay (1.1.3)
     concurrent-ruby (1.3.5)
-    config (5.5.2)
+    config (5.6.1)
       deep_merge (~> 1.2, >= 1.2.1)
       ostruct
     connection_pool (2.5.3)
@@ -552,7 +552,7 @@ GEM
       rspec-mocks (~> 3.13)
       rspec-support (~> 3.13)
     rspec-support (3.13.4)
-    rubocop (1.77.0)
+    rubocop (1.78.0)
       json (~> 2.3)
       language_server-protocol (~> 3.17.0.2)
       lint_roller (~> 1.1.0)
@@ -569,8 +569,8 @@ GEM
     rubocop-capybara (2.22.1)
       lint_roller (~> 1.1)
       rubocop (~> 1.72, >= 1.72.1)
-    rubocop-govuk (5.1.16)
-      rubocop (= 1.77.0)
+    rubocop-govuk (5.1.17)
+      rubocop (= 1.78.0)
       rubocop-ast (= 1.45.1)
       rubocop-capybara (= 2.22.1)
       rubocop-rails (= 2.32.0)

adr/00013-grafana-for-monitoring-and-alerting.md

@@ -0,0 +1,99 @@
+# 13. Amazon Managed Grafana for Monitoring and Alerting
+
+Date: 2025-07-01
+
+## Status
+
+Accepted
+
+## Context
+
+Currently, monitoring is done via CloudWatch and alerts are based on Sentry. We want to improve the monitoring and
+alerting capabilities of the Mavis application by integrating a more robust and unified solution.
+
+### Acceptance Criteria
+
+1. Fully cloud native solution that integrates with AWS services.
+2. Monitoring does not require access to the AWS console.
+3. Can be fully managed and automated using terraform.
+4. Aligns with TechRadar's accepted technologies.
+5. Authentication aligns with existing Identity and Access Management (IAM) setup.
+6. Allows Alerts to be configured and managed within the same platform.
+
+## Considered Options
+
+### Option 1 : AWS CloudWatch Dashboards and Alarms
+
+This option involves expanding our use of the native AWS CloudWatch service for all monitoring and alerting, creating
+more sophisticated dashboards and migrating all alerts to CloudWatch Alarms.
+
+- **Pros**:
+  - Deeply integrated with all AWS services.
+  - Fully manageable via Terraform.
+  - Provides both dashboarding and alerting in a single service.
+- **Cons**:
+  - Less flexible and powerful dashboarding capabilities.
+  - User experience requires returning to the AWS console.
+
+### Option 2 : Splunk
+
+This option would involve leveraging our existing Splunk integration to handle not just log aggregation but also
+metric-based monitoring and alerting.
+
+- **Pros**:
+  - Powerful alerting features based on complex log queries.
+  - Can view dashboards without accessing the AWS console.
+- **Cons**:
+  - Primarily a log analysis tool, not ideal for metric-based monitoring.
+  - Integrating it AWS is more difficult as it is an external service.
+  - Restricting NHS-wide access to dashboards and alerts would require additional configuration.
+
+### Option 3 : Amazon OpenSearch Service
+
+This involves using the managed OpenSearch service, which includes OpenSearch Dashboards and an integrated alerting
+plugin.
+
+- **Pros**:
+  - Fully managed AWS service.
+  - Provides powerful log analytics, visualization, and alerting.
+  - Can view dashboards without accessing the AWS console.
+- **Cons**:
+  - Core strength is in log data, not metrics.
+  - Metric-based alerting setup is more complex than specialized tools.
+  - Potentially overkill for our primary requirements.
+
+### Option 4 : Amazon Managed Grafana
+
+A fully managed service for the open-source Grafana platform, which is a popular tool for analytics, interactive
+visualization, and alerting.
+
+- **Pros**:
+  - Purpose-built for unified dashboards and alerting.
+  - Best-in-class visualization capabilities.
+  - Integrates seamlessly with CloudWatch and AWS IAM Identity Center.
+  - Fully manageable via Terraform.
+  - Can view dashboards without accessing the AWS console.
+- **Cons**:
+  - Introduces a new service to the architecture.
+
+## Decision
+
+We will adopt **Amazon Managed Grafana** as our primary monitoring and alerting solution.
+
+It is the only option that excels at meeting all our acceptance criteria, especially the need for a unified platform for
+both visualization and alerting. It provides best-in-class dashboard features while also integrating an alerting system.
+The service also integrates well with multiple types of data (logs, streams, metrics, etc.)
+This allows us to consolidate our tooling and deprecate the use of Sentry for alerts, creating a more streamlined
+operational workflow. Its native integration with AWS for data sources (CloudWatch) and authentication (IAM Identity
+Center) makes it a natural fit, and as an AWS Service it is tech radar accepted.
+
+## Consequences
+
+- We will provision a new Amazon Managed Grafana workspace using Terraform.
+- User access will be managed via AWS IAM Identity Center, granting authorized personnel access to dashboards and alert
+  configurations without needing to log into the AWS console.
+- CloudWatch will be configured as the primary data source within Grafana.
+- An initial set of dashboards for key application and infrastructure metrics (e.g., CPU/Memory utilization, database
+  connections, latency) will be created.
+- All future alerting will be configured and managed within Grafana, deprecating our reliance on Sentry for this
+  purpose.

app/components/app_activity_log_component.rb

@@ -205,7 +205,7 @@ def session_events
     patient_sessions.map do |patient_session|
       [
         {
-          title: "Invited to the session at #{patient_session.location.name}",
+          title: "Added to the session at #{patient_session.location.name}",
           at: patient_session.created_at,
           programmes: programmes_for(patient_session)
         }

app/components/app_consent_confirmation_component.rb

@@ -66,16 +66,13 @@ def vaccinations_text(consent_form_programmes)
         .map do |consent_form_programme|
           programme = consent_form_programme.programme
 
-          if programme.flu?
-            if consent_form_programme.vaccine_method_nasal?
-              "nasal flu"
-            elsif consent_form_programme.vaccine_method_injection?
-              "flu injection"
-            else
-              programme.name.downcase
-            end
+          if programme.has_multiple_vaccine_methods?
+            vaccine_method = consent_form_programme.vaccine_methods.first
+            method_prefix =
+              Vaccine.human_enum_name(:method_prefix, vaccine_method)
+            "#{method_prefix} #{programme.name_in_sentence}".lstrip
           else
-            programme.name
+            programme.name_in_sentence
           end
         end
 

app/components/app_patient_session_record_component.rb

@@ -2,7 +2,7 @@
 
 class AppPatientSessionRecordComponent < ViewComponent::Base
   erb_template <<-ERB
-    <h2 class="nhsuk-heading-m">Record vaccination</h2>
+    <h2 class="nhsuk-heading-m"><%= heading %></h2>
     
     <% if helpers.policy(VaccinationRecord).new? %>
       <%= render AppVaccinateFormComponent.new(vaccinate_form) %>
@@ -36,4 +36,18 @@ def default_vaccinate_form
 
     VaccinateForm.new(patient_session:, programme:, pre_screening_confirmed:)
   end
+
+  def heading
+    vaccination =
+      if programme.has_multiple_vaccine_methods?
+        vaccine_method = patient.approved_vaccine_methods(programme:).first
+        method_string =
+          Vaccine.human_enum_name(:method, vaccine_method).downcase
+        "vaccination with #{method_string}"
+      else
+        "vaccination"
+      end
+
+    "Record #{programme.name_in_sentence} #{vaccination}"
+  end
 end

app/components/app_patient_session_search_result_card_component.rb

@@ -96,7 +96,7 @@ def action_required
         status = patient_session.next_activity(programme:)
         next if status.nil?
 
-        "#{I18n.t(status, scope: :activity)} for #{programme.name}"
+        "#{I18n.t(status, scope: :activity)} for #{programme.name_in_sentence}"
       end
 
     return if next_activities.empty?

app/components/app_patient_session_triage_component.html.erb

@@ -11,7 +11,7 @@
     <% end %>
 
     <% if triage_status&.vaccination_history_requires_triage? %>
-      <p>Incomplete vaccination history for <%= programme.name %>. Check if the child needs another dose.</p>
+      <p>Incomplete vaccination history for <%= programme.name_in_sentence %>. Check if the child needs another dose.</p>
     <% end %>
 
     <% if helpers.policy(Triage).new? %>

app/components/app_programme_status_tags_component.rb

@@ -13,7 +13,7 @@ def call
       programme_statuses.map do |programme, hash|
         status = hash[:status]
         vaccine_methods =
-          (hash[:vaccine_methods] if programme.has_multiple_delivery_methods?)
+          (hash[:vaccine_methods] if programme.has_multiple_vaccine_methods?)
         programme_status_tag(programme, status, vaccine_methods)
       end
     )

app/components/app_session_actions_component.rb

@@ -129,7 +129,7 @@ def ready_for_vaccinator_row
 
     texts =
       counts_by_programme.map do |programme, count|
-        "#{I18n.t("children", count:)} for #{programme.name}"
+        "#{I18n.t("children", count:)} for #{programme.name_in_sentence}"
       end
 
     href = session_record_path(session)