Merge "Add to osdpl introspective instance timeout options"

Mirantis · Jan 8, 2025 · c7eaaa2 · c7eaaa2
2 parents 53dad88 + bb923a3
commit c7eaaa2
Show file tree

Hide file tree

Showing 6 changed files with 42 additions and 2 deletions.
diff --git a/rockoon/admission/validators/schemas/osdpl.yaml b/rockoon/admission/validators/schemas/osdpl.yaml
@@ -1821,6 +1821,21 @@ properties:
                     description: |
                       Enable instance introspection monitor
                       default: false
+                  guest_monitoring_interval:
+                    type: integer
+                    description: |
+                      Guest monitoring interval of VM status (in seconds)
+                      default: 10
+                  guest_monitoring_timeout:
+                    type: integer
+                    description: |
+                      Guest monitoring timeout (in seconds)
+                      default: 2
+                  guest_monitoring_failure_threshold:
+                    type: integer
+                    description: |
+                      Failure threshold before sending notification
+                      default: 3
       logging:
         type: object
         additionalProperties: false

diff --git a/rockoon/templates/services/instance-ha.yaml b/rockoon/templates/services/instance-ha.yaml
@@ -15,7 +15,7 @@
 {%- endif  %}
 {%- set masakari_db_cleanup = spec.get('features', {}).get('database', {}).get('cleanup', {}).get('masakari', {'enabled': true}) %}
 {%- set libvirt_server_tls_enabled = spec.get('features', {}).get('nova', {}).get('libvirt', {}).get('tls', {}).get('enabled', false) %}
-{%- set introspective_monitors_enabled = spec.get('features', {}).get('masakari', {}).get('monitors', {}).get('introspective', {}).get('enabled', false) %}
+{%- set introspective_monitors = spec.get('features', {}).get('masakari', {}).get('monitors', {}).get('introspective', {}) %}
 {%- from 'macros/etcd3.j2' import get_etcd3_endpoint %}
 
 spec:
@@ -69,9 +69,14 @@ spec:
             evacuate_all_instances: false
             ignore_instances_in_error_state: true
 {% include 'base/_oslo_policy_enforce_defaults.yaml' %}
+        masakarimonitors:
+          introspectiveinstancemonitor:
+            guest_monitoring_interval: {{ introspective_monitors.get("guest_monitoring_interval", 10) }}
+            guest_monitoring_timeout: {{ introspective_monitors.get("guest_monitoring_timeout", 2) }}
+            guest_monitoring_failure_threshold: {{ introspective_monitors.get("guest_monitoring_failure_threshold", 3) }}
         monitors:
           introspective:
-            enabled: {{ introspective_monitors_enabled }}
+            enabled: {{ introspective_monitors.get("enabled", false) }}
         logging:
           logger_masakari:
             level: {{ spec.get('features', {}).get('logging', {}).get('masakari', {}).get('level', 'INFO') }}

diff --git a/tests/fixtures/render_service_template/output/instance-ha/ussuri_ceph_local_non_dvr.yaml b/tests/fixtures/render_service_template/output/instance-ha/ussuri_ceph_local_non_dvr.yaml
@@ -27,6 +27,11 @@ spec:
           host_failure:
             evacuate_all_instances: false
             ignore_instances_in_error_state: true
+        masakarimonitors:
+          introspectiveinstancemonitor:
+            guest_monitoring_interval: 10
+            guest_monitoring_timeout: 2
+            guest_monitoring_failure_threshold: 3
         monitors:
           introspective:
             enabled: false

diff --git a/...ures/render_service_template/output/instance-ha/ussuri_ceph_local_non_dvr_db_cleanup.yaml b/...ures/render_service_template/output/instance-ha/ussuri_ceph_local_non_dvr_db_cleanup.yaml
@@ -27,6 +27,11 @@ spec:
           host_failure:
             evacuate_all_instances: false
             ignore_instances_in_error_state: true
+        masakarimonitors:
+          introspectiveinstancemonitor:
+            guest_monitoring_interval: 10
+            guest_monitoring_timeout: 2
+            guest_monitoring_failure_threshold: 3
         monitors:
           introspective:
             enabled: false

diff --git a/...xtures/render_service_template/output/instance-ha/ussuri_ceph_local_non_dvr_policies.yaml b/...xtures/render_service_template/output/instance-ha/ussuri_ceph_local_non_dvr_policies.yaml
@@ -28,6 +28,11 @@ spec:
           host_failure:
             evacuate_all_instances: false
             ignore_instances_in_error_state: true
+        masakarimonitors:
+          introspectiveinstancemonitor:
+            guest_monitoring_interval: 10
+            guest_monitoring_timeout: 2
+            guest_monitoring_failure_threshold: 3
         monitors:
           introspective:
             enabled: false

diff --git a/...tures/render_service_template/output/instance-ha/ussuri_ceph_local_non_dvr_telemetry.yaml b/...tures/render_service_template/output/instance-ha/ussuri_ceph_local_non_dvr_telemetry.yaml
@@ -27,6 +27,11 @@ spec:
           host_failure:
             evacuate_all_instances: false
             ignore_instances_in_error_state: true
+        masakarimonitors:
+          introspectiveinstancemonitor:
+            guest_monitoring_interval: 10
+            guest_monitoring_timeout: 2
+            guest_monitoring_failure_threshold: 3
         monitors:
           introspective:
             enabled: false