fix merge conflict

.docksal/docksal.env

@@ -1,5 +1,5 @@
 DOCKSAL_STACK=default
 DOCROOT=html
 DB_IMAGE="docksal/db:1.1-mysql-5.7"
-CLI_IMAGE='docksal/cli:php8.1-build'
+CLI_IMAGE='docksal/cli:php8.2-build'
 XDEBUG_ENABLED=1

.github/workflows/composer-update.yml

@@ -14,7 +14,7 @@ jobs:
       uses: UN-OCHA/actions/composer-update@main
       with:
         github_access_token: ${{ secrets.PAT }}
-        patch_branch: 'develop'
+        patch_branch: ${{ github.head_ref || github.ref_name }}
         patch_maintainers: ${{ secrets.DRUPAL_MAINTAINERS }}
         slack_bot_token: ${{ secrets.SLACK_BOT_TOKEN }}
         slack_channel_name: ${{ secrets.SLACK_CHANNEL }}

composer.json

@@ -57,7 +57,8 @@
         "drush/drush": "^12",
         "oomphinc/composer-installers-extender": "^2.0",
         "orakili/composer-drupal-info-file-patch-helper": "^1",
-        "unocha/common_design": "^9"
+        "unocha/common_design": "^9",
+        "unocha/ocha_monitoring": "^1.0"
     },
     "require-dev": {
         "drupal/coder": "^8.3",

config/core.extension.yml

@@ -48,8 +48,10 @@ module:
   metatag: 0
   metatag_open_graph: 0
   metatag_twitter_cards: 0
+  monitoring: 0
   mysql: 0
   node: 0
+  ocha_monitoring: 0
   options: 0
   page_cache: 0
   path: 0

config/monitoring.sensor_config.core_cron_last_run_age.yml

@@ -0,0 +1,20 @@
+uuid: a8e1ca2c-e991-4555-941d-407d49ff32c4
+langcode: en
+status: true
+dependencies: {  }
+_core:
+  default_config_hash: 9xaHOMw0Ra9sOuNKGoBqCLFoX2pj_66FbTQPK1CFK1U
+id: core_cron_last_run_age
+label: 'Last cron run age'
+description: 'Time since last cron run'
+category: Cron
+plugin_id: cron_last_run_time
+result_class: null
+value_label: null
+value_type: time_interval
+caching_time: null
+settings: {  }
+thresholds:
+  type: exceeds
+  warning: 86400
+  critical: 259200

config/monitoring.sensor_config.core_maintenance_mode.yml

@@ -0,0 +1,20 @@
+uuid: 7c464634-717d-4ac7-8b3a-e4da601a0211
+langcode: en
+status: true
+dependencies: {  }
+_core:
+  default_config_hash: zogxfdFrxiieH69X2iP7PB00dkW62vHwpukdsyMCP5k
+id: core_maintenance_mode
+label: 'Maintenance mode'
+description: 'Site maintenance mode'
+category: Other
+plugin_id: state_value
+result_class: null
+value_label: null
+value_type: bool
+caching_time: null
+settings:
+  key: system.maintenance_mode
+  value: false
+thresholds:
+  type: none

config/monitoring.sensor_config.core_requirements_csp.yml

@@ -0,0 +1,20 @@
+uuid: 5bd39507-36c8-4215-ae08-1e5e225ca116
+langcode: en
+status: false
+dependencies:
+  module:
+    - csp
+id: core_requirements_csp
+label: 'Module csp'
+description: 'Requirements of the csp module'
+category: Requirements
+plugin_id: core_requirements
+result_class: null
+value_label: null
+value_type: no_value
+caching_time: 3600
+settings:
+  module: csp
+  exclude_keys: {  }
+thresholds:
+  type: none

config/monitoring.sensor_config.core_requirements_file.yml

@@ -0,0 +1,20 @@
+uuid: f063634f-3335-4709-88bd-f1d1d3ab7b30
+langcode: en
+status: false
+dependencies:
+  module:
+    - file
+id: core_requirements_file
+label: 'Module file'
+description: 'Requirements of the file module'
+category: Requirements
+plugin_id: core_requirements
+result_class: null
+value_label: null
+value_type: no_value
+caching_time: 3600
+settings:
+  module: file
+  exclude_keys: {  }
+thresholds:
+  type: none

config/monitoring.sensor_config.core_requirements_google_tag.yml

@@ -0,0 +1,20 @@
+uuid: eaf3d2d7-43d8-431b-b09c-19d1f611b2d5
+langcode: en
+status: false
+dependencies:
+  module:
+    - google_tag
+id: core_requirements_google_tag
+label: 'Module google_tag'
+description: 'Requirements of the google_tag module'
+category: Requirements
+plugin_id: core_requirements
+result_class: null
+value_label: null
+value_type: no_value
+caching_time: 3600
+settings:
+  module: google_tag
+  exclude_keys: {  }
+thresholds:
+  type: none

config/monitoring.sensor_config.core_requirements_image.yml

@@ -0,0 +1,20 @@
+uuid: 3bacc0e0-cc2d-483c-a6db-627efa997994
+langcode: en
+status: false
+dependencies:
+  module:
+    - image
+id: core_requirements_image
+label: 'Module image'
+description: 'Requirements of the image module'
+category: Requirements
+plugin_id: core_requirements
+result_class: null
+value_label: null
+value_type: no_value
+caching_time: 3600
+settings:
+  module: image
+  exclude_keys: {  }
+thresholds:
+  type: none

config/monitoring.sensor_config.core_requirements_imagemagick.yml

@@ -0,0 +1,20 @@
+uuid: 1039f8a3-2395-478b-9b54-78c66c63ee25
+langcode: en
+status: false
+dependencies:
+  module:
+    - imagemagick
+id: core_requirements_imagemagick
+label: 'Module imagemagick'
+description: 'Requirements of the imagemagick module'
+category: Requirements
+plugin_id: core_requirements
+result_class: null
+value_label: null
+value_type: no_value
+caching_time: 3600
+settings:
+  module: imagemagick
+  exclude_keys: {  }
+thresholds:
+  type: none

config/monitoring.sensor_config.core_requirements_layout_discovery.yml

@@ -0,0 +1,20 @@
+uuid: 9dfa8475-2191-4fa5-bd4e-deb43da021f0
+langcode: en
+status: false
+dependencies:
+  module:
+    - layout_discovery
+id: core_requirements_layout_discovery
+label: 'Module layout_discovery'
+description: 'Requirements of the layout_discovery module'
+category: Requirements
+plugin_id: core_requirements
+result_class: null
+value_label: null
+value_type: no_value
+caching_time: 3600
+settings:
+  module: layout_discovery
+  exclude_keys: {  }
+thresholds:
+  type: none

config/monitoring.sensor_config.core_requirements_locale.yml

@@ -0,0 +1,20 @@
+uuid: eb73c283-0283-485e-9ae7-96806a9ae463
+langcode: en
+status: false
+dependencies:
+  module:
+    - locale
+id: core_requirements_locale
+label: 'Module locale'
+description: 'Requirements of the locale module'
+category: Requirements
+plugin_id: core_requirements
+result_class: null
+value_label: null
+value_type: no_value
+caching_time: 3600
+settings:
+  module: locale
+  exclude_keys: {  }
+thresholds:
+  type: none

config/monitoring.sensor_config.core_requirements_media.yml

@@ -0,0 +1,20 @@
+uuid: 3a839c11-cb1f-4056-a395-d969fdbf98f6
+langcode: en
+status: false
+dependencies:
+  module:
+    - media
+id: core_requirements_media
+label: 'Module media'
+description: 'Requirements of the media module'
+category: Requirements
+plugin_id: core_requirements
+result_class: null
+value_label: null
+value_type: no_value
+caching_time: 3600
+settings:
+  module: media
+  exclude_keys: {  }
+thresholds:
+  type: none