Merge branch 'develop' into release-versions/v3.4.15

composer.json

@@ -100,6 +100,7 @@
         "symfony/flex": "^1.12",
         "symfony/uid": "^5.3",
         "unocha/common_design": "^8.0.1",
+        "unocha/ocha_monitoring": "^1.0",
         "webflo/drupal-finder": "^1.2.2"
     },
     "require-dev": {

composer.patches.json

@@ -11,8 +11,7 @@
             "Simplify log format": "./patches/csp-log-format.patch"
         },
         "drupal/diff": {
-            "Issue #3183380: Add 'compare revisions' button on top for long form.": "https://www.drupal.org/files/issues/2023-05-10/3183380-add-compare-revisions-9.patch",
-            "Issue #3058111: Allow user to choose 'Visual inline' display view mode": "https://www.drupal.org/files/issues/2019-08-29/3058111-add-default-view-mode-setting-3.patch"
+            "Issue #3183380: Add 'compare revisions' button on top for long form.": "https://www.drupal.org/files/issues/2024-04-25/3183380-add-compare-revisions-8.x-1.3.patch"
         },
         "drupal/entity_browser": {
             "Issue #3056057: Position the main form actions to the bottom of IFrame": "https://www.drupal.org/files/issues/2019-05-23/position-main-form-actins-on-bottom-3056057-10.patch"

config/core.extension.yml

@@ -68,11 +68,13 @@ module:
   metatag: 0
   metatag_open_graph: 0
   metatag_twitter_cards: 0
+  monitoring: 0
   mysql: 0
   ncms_graphql: 0
   ncms_publisher: 0
   ncms_ui: 0
   node: 0
+  ocha_monitoring: 0
   options: 0
   override_node_options: 0
   page_cache: 0

config/language/ar/monitoring.sensor_config.core_maintenance_mode.yml

@@ -0,0 +1 @@
+label: 'وضع الصيانة'

config/language/ar/monitoring.sensor_config.core_theme_default.yml

@@ -0,0 +1 @@
+label: 'الحلة الافتراضية'

config/language/ar/monitoring.sensor_config.update_core.yml

@@ -0,0 +1 @@
+label: النواة

config/language/ar/monitoring.sensor_config.user_active.yml

@@ -0,0 +1 @@
+label: 'مستخدمون نشطون'

config/language/ar/views.view.monitoring_sensor_results.yml

@@ -0,0 +1,47 @@
+display:
+  default:
+    display_title: الرئيسي
+    display_options:
+      exposed_form:
+        options:
+          submit_button: Apply
+          reset_button_label: Reset
+          exposed_sorts_label: 'Sort by'
+          sort_asc_label: Asc
+          sort_desc_label: Desc
+      pager:
+        options:
+          expose:
+            items_per_page_options_all_label: '- All -'
+            offset_label: Offset
+          tags:
+            previous: '‹ previous'
+            next: 'next ›'
+            first: '« الأولى'
+            last: 'last »'
+      fields:
+        sensor_status:
+          label: Status
+        sensor_message:
+          label: 'رسالة الحالة'
+        timestamp:
+          label: 'التوقيت الزمني'
+      title: السجل
+      arguments:
+        sensor_name:
+          exception:
+            title: All
+  detail_page_log:
+    display_options:
+      fields:
+        timestamp:
+          label: 'التوقيت الزمني'
+        sensor_status:
+          label: Status
+        sensor_message:
+          label: 'رسالة الحالة'
+  page_1:
+    display_title: Page
+    display_options:
+      menu:
+        title: السجل

config/language/es/monitoring.sensor_config.core_maintenance_mode.yml

@@ -0,0 +1 @@
+label: 'Modo de mantenimiento'

config/language/es/monitoring.sensor_config.core_theme_default.yml

@@ -0,0 +1 @@
+label: 'Tema predeterminado'

config/language/es/monitoring.sensor_config.system_memory.yml

@@ -0,0 +1 @@
+label: Memoria

config/language/es/monitoring.sensor_config.twig_debug_mode.yml

@@ -0,0 +1 @@
+label: 'Modo de depuración de Twig'

config/language/es/monitoring.sensor_config.update_core.yml

@@ -0,0 +1 @@
+label: Núcleo

config/language/es/monitoring.sensor_config.user_active.yml

@@ -0,0 +1 @@
+label: 'Usuarios activos'

config/language/es/monitoring.sensor_config.user_new.yml

@@ -0,0 +1 @@
+label: 'Usuarios nuevos'

config/language/es/views.view.files.yml

@@ -26,6 +26,7 @@ display:
           label: 'Changed date'
         count:
           label: 'Used in'
+          format_plural_string: !!binary MSBsdWdhcgNAY291bnQgbHVnYXJlcw==
       pager:
         options:
           tags:

config/language/es/views.view.monitoring_sensor_results.yml

@@ -0,0 +1,52 @@
+display:
+  default:
+    display_title: Máster
+    display_options:
+      exposed_form:
+        options:
+          submit_button: Apply
+          reset_button_label: Reset
+          exposed_sorts_label: 'Sort by'
+          sort_asc_label: Asc
+          sort_desc_label: Desc
+      pager:
+        options:
+          expose:
+            items_per_page_label: 'Items per page'
+            items_per_page_options_all_label: '- All -'
+            offset_label: Offset
+          tags:
+            previous: '‹ previous'
+            next: 'next ›'
+            first: '« first'
+            last: 'last »'
+      fields:
+        sensor_status:
+          label: Status
+        sensor_message:
+          label: 'Mensaje de estado'
+        execution_time:
+          label: 'Tiempo de ejecución'
+        timestamp:
+          label: 'Sello temporal'
+      title: Registro
+      arguments:
+        sensor_name:
+          exception:
+            title: All
+  detail_page_log:
+    display_options:
+      fields:
+        timestamp:
+          label: 'Sello temporal'
+        sensor_status:
+          label: Status
+        sensor_message:
+          label: 'Mensaje de estado'
+        execution_time:
+          label: 'Tiempo de ejecución'
+  page_1:
+    display_title: Page
+    display_options:
+      menu:
+        title: Registro

config/language/fr/monitoring.sensor_config.core_maintenance_mode.yml

@@ -0,0 +1 @@
+label: 'Mode maintenance'

config/language/fr/monitoring.sensor_config.core_theme_default.yml

@@ -0,0 +1 @@
+label: 'Thème par défaut'

config/language/fr/monitoring.sensor_config.system_memory.yml

@@ -0,0 +1 @@
+label: Mémoire

config/language/fr/monitoring.sensor_config.twig_debug_mode.yml

@@ -0,0 +1 @@
+label: 'Mode de débogage de Twig'

config/language/fr/monitoring.sensor_config.update_core.yml

@@ -0,0 +1 @@
+label: Cœur

config/language/fr/monitoring.sensor_config.user_active.yml

@@ -0,0 +1 @@
+label: 'Utilisateurs actifs'

config/language/fr/monitoring.sensor_config.user_new.yml

@@ -0,0 +1 @@
+label: 'Nouveaux utilisateurs'

config/language/fr/views.view.files.yml

@@ -26,6 +26,7 @@ display:
           label: 'Changed date'
         count:
           label: 'Used in'
+          format_plural_string: !!binary QGNvdW50IGVtcGxhY2VtZW50A0Bjb3VudCBlbXBsYWNlbWVudHM=
       pager:
         options:
           tags:

config/language/fr/views.view.monitoring_sensor_results.yml

@@ -0,0 +1,48 @@
+display:
+  default:
+    display_title: Maître
+    display_options:
+      exposed_form:
+        options:
+          submit_button: Apply
+          reset_button_label: Reset
+          exposed_sorts_label: 'Sort by'
+          sort_asc_label: Asc
+          sort_desc_label: Desc
+      pager:
+        options:
+          expose:
+            items_per_page_label: 'Items per page'
+            items_per_page_options_all_label: '- All -'
+            offset_label: Offset
+          tags:
+            previous: '‹ previous'
+            next: 'next ›'
+            first: '« first'
+            last: 'last »'
+      fields:
+        sensor_status:
+          label: Status
+        sensor_message:
+          label: "Message d'état"
+        timestamp:
+          label: Horodatage
+      title: Journal
+      arguments:
+        sensor_name:
+          exception:
+            title: All
+  detail_page_log:
+    display_options:
+      fields:
+        timestamp:
+          label: Horodatage
+        sensor_status:
+          label: Status
+        sensor_message:
+          label: "Message d'état"
+  page_1:
+    display_title: Page
+    display_options:
+      menu:
+        title: Journal

config/monitoring.sensor_config.core_cron_last_run_age.yml

@@ -0,0 +1,20 @@
+uuid: d31c0b60-53da-4b84-934d-5c2e40bbb9b0
+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: 90553c17-2fec-4df7-ab84-84b5f8e14d64
+langcode: en
+status: false
+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_config_filter.yml

@@ -0,0 +1,20 @@
+uuid: e3767c0c-b6e3-4792-8b94-97d90995b728
+langcode: en
+status: false
+dependencies:
+  module:
+    - config_filter
+id: core_requirements_config_filter
+label: 'Module config_filter'
+description: 'Requirements of the config_filter module'
+category: Requirements
+plugin_id: core_requirements
+result_class: null
+value_label: null
+value_type: no_value
+caching_time: 3600
+settings:
+  module: config_filter
+  exclude_keys: {  }
+thresholds:
+  type: none

config/monitoring.sensor_config.core_requirements_csp.yml

@@ -0,0 +1,20 @@
+uuid: 80fc7f31-83d7-4240-bafa-85dfe546c3d5
+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_diff.yml

@@ -0,0 +1,20 @@
+uuid: f5bce8df-d1d5-4c3e-8fb1-1d55b1fe92b7
+langcode: en
+status: false
+dependencies:
+  module:
+    - diff
+id: core_requirements_diff
+label: 'Module diff'
+description: 'Requirements of the diff module'
+category: Requirements
+plugin_id: core_requirements
+result_class: null
+value_label: null
+value_type: no_value
+caching_time: 3600
+settings:
+  module: diff
+  exclude_keys: {  }
+thresholds:
+  type: none

config/monitoring.sensor_config.core_requirements_field_group.yml

@@ -0,0 +1,20 @@
+uuid: 4a4a642a-35e2-4337-8b27-208cc9d20522
+langcode: en
+status: false
+dependencies:
+  module:
+    - field_group
+id: core_requirements_field_group
+label: 'Module field_group'
+description: 'Requirements of the field_group module'
+category: Requirements
+plugin_id: core_requirements
+result_class: null
+value_label: null
+value_type: no_value
+caching_time: 3600
+settings:
+  module: field_group
+  exclude_keys: {  }
+thresholds:
+  type: none

config/monitoring.sensor_config.core_requirements_file.yml

@@ -0,0 +1,20 @@
+uuid: 8c1e378f-cde6-46bf-8c6a-f6bb05bcd311
+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