From 2531c72a3f78b957caefa4bbcf69a13ea9f7fe05 Mon Sep 17 00:00:00 2001 From: Anna Reznikov Date: Mon, 13 Aug 2018 09:27:33 +0000 Subject: [PATCH] dont add vitrage_resource_project_id if None Depends-On: Idb2ce0aef7a051ce2d2bd60a6c5ec5628e5a009b Change-Id: Id8f1d77802c0071df778f4a9b7fb0a25c473cf9c --- devstack/gate_hook_mock.sh | 1 + vitrage/entity_graph/processor/processor.py | 4 ++-- vitrage/evaluator/actions/evaluator_event_transformer.py | 2 +- 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/devstack/gate_hook_mock.sh b/devstack/gate_hook_mock.sh index 4831647ee..0f2cd2f5f 100644 --- a/devstack/gate_hook_mock.sh +++ b/devstack/gate_hook_mock.sh @@ -43,6 +43,7 @@ notification_driver = messagingv2 verbose = true debug = false notifiers = nova,webhook +rpc_response_timeout=300 [datasources] types=doctor,mock_graph_datasource diff --git a/vitrage/entity_graph/processor/processor.py b/vitrage/entity_graph/processor/processor.py index bf7476231..3809e18d7 100644 --- a/vitrage/entity_graph/processor/processor.py +++ b/vitrage/entity_graph/processor/processor.py @@ -343,7 +343,6 @@ class Processor(processor.ProcessorBase): for alarm in alarms: if not resource: - self.add_resource_details(alarm, None, None, None) continue project_id = resource.get(VProps.PROJECT_ID) @@ -361,7 +360,8 @@ class Processor(processor.ProcessorBase): def add_resource_details(alarm, r_id, r_type, r_project_id): alarm[VProps.VITRAGE_RESOURCE_ID] = r_id alarm[VProps.VITRAGE_RESOURCE_TYPE] = r_type - alarm[VProps.VITRAGE_RESOURCE_PROJECT_ID] = r_project_id + if r_project_id: + alarm[VProps.VITRAGE_RESOURCE_PROJECT_ID] = r_project_id @staticmethod def _set_datasource_name(entity, event): diff --git a/vitrage/evaluator/actions/evaluator_event_transformer.py b/vitrage/evaluator/actions/evaluator_event_transformer.py index ba962adaf..7ac980a95 100644 --- a/vitrage/evaluator/actions/evaluator_event_transformer.py +++ b/vitrage/evaluator/actions/evaluator_event_transformer.py @@ -137,7 +137,7 @@ class EvaluatorEventTransformer(transformer_base.TransformerBase): VProps.VITRAGE_SAMPLE_TIMESTAMP: event[VProps.VITRAGE_SAMPLE_TIMESTAMP], VProps.IS_REAL_VITRAGE_ID: True, - VProps.VITRAGE_TYPE: event[VProps.VITRAGE_RESOURCE_TYPE], + VProps.VITRAGE_TYPE: event.get(VProps.VITRAGE_RESOURCE_TYPE), VProps.VITRAGE_CATEGORY: EntityCategory.RESOURCE, } neighbor = Vertex(event[TFields.TARGET], neighbor_props)