openstack/vitrage
Code Issues Proposed changes

mock changes

Browse Source 
Change-Id: Ic3993531a22cc13a7a4803c9634e1a023912d713
This commit is contained in:
Alexey Weyl 2016-03-07 18:46:07 +02:00
parent f2fe822baf
commit 37d4594cad
4 changed files with 67 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
etc/vitrage/alarms.sample.json
View File

@ -13,33 +13,36 @@
"resource_name": "host-0",
"resource_id": "host-0",
"id": 0,
"vitrage_id": "ALARM:nagios:host0:CPU load"
"vitrage_id": "ALARM:nagios:host0:CPU load",
"normalized_severity": "WARNING"
},
{
"category": "ALARM",
"type": "vitrage",
"name": "Machine Suboptimal",
"state": "Active",
"severity": "WARNING",
"severity": "CRITICAL",
"update_timestamp": "2015-12-01T12:46:41Z",
"resource_type": "nova.instance",
"resource_name": "vm0",
"resource_id": "20d12a8a-ea9a-89c6-5947-83bea959362e",
"id": 1,
"vitrage_id": "ALARM:vitrage:vm0:Machine Suboptimal"
"vitrage_id": "ALARM:vitrage:vm0:Machine Suboptimal",
"normalized_severity": "CRITICAL"
},
{
"category": "ALARM",
"type": "vitrage",
"name": "Machine Suboptimal",
"state": "Active",
"severity": "WARNING",
"severity": "CRITICAL",
"update_timestamp": "2015-12-01T12:46:41Z",
"resource_type": "nova.instance",
"resource_name": "vm1",
"resource_id": "275097cf-954e-8e24-b185-9514e24b8591",
"id": 2,
"vitrage_id": "ALARM:vitrage:vm1:Machine Suboptimal"
"vitrage_id": "ALARM:vitrage:vm1:Machine Suboptimal",
"normalized_severity": "CRITICAL"
},
{
"category": "ALARM",
@ -53,7 +56,8 @@
"resource_name": "host-0",
"resource_id": "host-0",
"id": 3,
"vitrage_id": "ALARM:aodh:host0:Memory overload"
"vitrage_id": "ALARM:aodh:host0:Memory overload",
"normalized_severity": "WARNING"
}
]
}

73
etc/vitrage/graph.sample.json
View File

@ -12,7 +12,8 @@
"project_id": "0683517e1e354d2ba25cba6937f44e79",
"type": "nova.instance",
"id": "20d12a8a-ea9a-89c6-5947-83bea959362e",
"vitrage_id": "RESOURCE:nova.instance:20d12a8a-ea9a-89c6-5947-83bea959362e"
"vitrage_id": "RESOURCE:nova.instance:20d12a8a-ea9a-89c6-5947-83bea959362e",
"aggregated_state": "RUNNING"
},
{
"category": "RESOURCE",
@ -24,7 +25,8 @@
"project_id": "0683517e1e354d2ba25cba6937f44e79",
"type": "nova.instance",
"id": "dc35fa2f-4515-1653-ef6b-03b471bb395b",
"vitrage_id": "RESOURCE:nova.instance:dc35fa2f-4515-1653-ef6b-03b471bb395b"
"vitrage_id": "RESOURCE:nova.instance:dc35fa2f-4515-1653-ef6b-03b471bb395b",
"aggregated_state": "RUNNING"
},
{
"category": "RESOURCE",
@ -36,7 +38,8 @@
"project_id": "0683517e1e354d2ba25cba6937f44e79",
"type": "nova.instance",
"id": "9879cf5a-bdcf-3651-3017-961ed887ec86",
"vitrage_id": "RESOURCE:nova.instance:9879cf5a-bdcf-3651-3017-961ed887ec86"
"vitrage_id": "RESOURCE:nova.instance:9879cf5a-bdcf-3651-3017-961ed887ec86",
"aggregated_state": "RUNNING"
},
{
"category": "RESOURCE",
@ -48,7 +51,8 @@
"project_id": "0683517e1e354d2ba25cba6937f44e79",
"type": "nova.instance",
"id": "fe124f4b-9ed7-4591-fcd1-803cf5c33cb1",
"vitrage_id": "RESOURCE:nova.instance:fe124f4b-9ed7-4591-fcd1-803cf5c33cb1"
"vitrage_id": "RESOURCE:nova.instance:fe124f4b-9ed7-4591-fcd1-803cf5c33cb1",
"aggregated_state": "RUNNING"
},
{
"category": "RESOURCE",
@ -60,7 +64,8 @@
"project_id": "0683517e1e354d2ba25cba6937f44e79",
"type": "nova.instance",
"id": "f2e48a97-7350-061e-12d3-84c6dc3e67c0",
"vitrage_id": "RESOURCE:nova.instance:f2e48a97-7350-061e-12d3-84c6dc3e67c0"
"vitrage_id": "RESOURCE:nova.instance:f2e48a97-7350-061e-12d3-84c6dc3e67c0",
"aggregated_state": "RUNNING"
},
{
"category": "RESOURCE",
@ -71,7 +76,8 @@
"state": "available",
"type": "nova.host",
"id": "host-2",
"vitrage_id": "RESOURCE:nova.host:host-2"
"vitrage_id": "RESOURCE:nova.host:host-2",
"aggregated_state": "RUNNING"
},
{
"category": "RESOURCE",
@ -82,7 +88,8 @@
"state": "available",
"type": "nova.host",
"id": "host-3",
"vitrage_id": "RESOURCE:nova.host:host-3"
"vitrage_id": "RESOURCE:nova.host:host-3",
"aggregated_state": "RUNNING"
},
{
"category": "RESOURCE",
@ -93,7 +100,8 @@
"state": "available",
"type": "nova.host",
"id": "host-0",
"vitrage_id": "RESOURCE:nova.host:host-0"
"vitrage_id": "RESOURCE:nova.host:host-0",
"aggregated_state": "RUNNING"
},
{
"category": "RESOURCE",
@ -104,7 +112,8 @@
"state": "available",
"type": "nova.host",
"id": "host-1",
"vitrage_id": "RESOURCE:nova.host:host-1"
"vitrage_id": "RESOURCE:nova.host:host-1",
"aggregated_state": "RUNNING"
},
{
"category": "RESOURCE",
@ -116,7 +125,8 @@
"project_id": "0683517e1e354d2ba25cba6937f44e79",
"type": "nova.instance",
"id": "275097cf-954e-8e24-b185-9514e24b8591",
"vitrage_id": "RESOURCE:nova.instance:275097cf-954e-8e24-b185-9514e24b8591"
"vitrage_id": "RESOURCE:nova.instance:275097cf-954e-8e24-b185-9514e24b8591",
"aggregated_state": "RUNNING"
},
{
"category": "RESOURCE",
@ -128,7 +138,8 @@
"project_id": "0683517e1e354d2ba25cba6937f44e79",
"type": "nova.instance",
"id": "a0f0805f-c804-cffe-c25a-1b38f555ed68",
"vitrage_id": "RESOURCE:nova.instance:a0f0805f-c804-cffe-c25a-1b38f555ed68"
"vitrage_id": "RESOURCE:nova.instance:a0f0805f-c804-cffe-c25a-1b38f555ed68",
"aggregated_state": "RUNNING"
},
{
"category": "RESOURCE",
@ -140,7 +151,8 @@
"project_id": "0683517e1e354d2ba25cba6937f44e79",
"type": "nova.instance",
"id": "56af57d2-34a4-19b1-5106-b613637a11a7",
"vitrage_id": "RESOURCE:nova.instance:56af57d2-34a4-19b1-5106-b613637a11a7"
"vitrage_id": "RESOURCE:nova.instance:56af57d2-34a4-19b1-5106-b613637a11a7",
"aggregated_state": "RUNNING"
},
{
"category": "RESOURCE",
@ -151,7 +163,8 @@
"state": "available",
"type": "nova.zone",
"id": "zone-1",
"vitrage_id": "RESOURCE:nova.zone:zone-1"
"vitrage_id": "RESOURCE:nova.zone:zone-1",
"aggregated_state": "RUNNING"
},
{
"category": "RESOURCE",
@ -163,7 +176,8 @@
"project_id": "0683517e1e354d2ba25cba6937f44e79",
"type": "nova.instance",
"id": "16e14c58-d254-2bec-53e4-c766e48810aa",
"vitrage_id": "RESOURCE:nova.instance:16e14c58-d254-2bec-53e4-c766e48810aa"
"vitrage_id": "RESOURCE:nova.instance:16e14c58-d254-2bec-53e4-c766e48810aa",
"aggregated_state": "RUNNING"
},
{
"category": "RESOURCE",
@ -171,11 +185,12 @@
"is_deleted": false,
"name": "vm-7",
"update_timestamp": "2015-12-01T12:46:41Z",
"state": "ACTIVE",
"state": "SUSPENDED",
"project_id": "0683517e1e354d2ba25cba6937f44e79",
"type": "nova.instance",
"id": "f35a1e10-74ff-7332-8edf-83cd6ffcb2de",
"vitrage_id": "RESOURCE:nova.instance:f35a1e10-74ff-7332-8edf-83cd6ffcb2de"
"vitrage_id": "RESOURCE:nova.instance:f35a1e10-74ff-7332-8edf-83cd6ffcb2de",
"aggregated_state": "SUSPENDED"
},
{
"category": "RESOURCE",
@ -187,7 +202,8 @@
"project_id": "0683517e1e354d2ba25cba6937f44e79",
"type": "nova.instance",
"id": "ea8a450e-cab1-2272-f431-494b40c5c378",
"vitrage_id": "RESOURCE:nova.instance:ea8a450e-cab1-2272-f431-494b40c5c378"
"vitrage_id": "RESOURCE:nova.instance:ea8a450e-cab1-2272-f431-494b40c5c378",
"aggregated_state": "RUNNING"
},
{
"category": "RESOURCE",
@ -199,7 +215,8 @@
"project_id": "0683517e1e354d2ba25cba6937f44e79",
"type": "nova.instance",
"id": "6e42bdc3-b776-1b2c-2c7d-b7a8bb98f721",
"vitrage_id": "RESOURCE:nova.instance:6e42bdc3-b776-1b2c-2c7d-b7a8bb98f721"
"vitrage_id": "RESOURCE:nova.instance:6e42bdc3-b776-1b2c-2c7d-b7a8bb98f721",
"aggregated_state": "RUNNING"
},
{
"category": "RESOURCE",
@ -211,7 +228,8 @@
"project_id": "0683517e1e354d2ba25cba6937f44e79",
"type": "nova.instance",
"id": "8c951613-c660-87c0-c18b-0fa3293ce8d8",
"vitrage_id": "RESOURCE:nova.instance:8c951613-c660-87c0-c18b-0fa3293ce8d8"
"vitrage_id": "RESOURCE:nova.instance:8c951613-c660-87c0-c18b-0fa3293ce8d8",
"aggregated_state": "RUNNING"
},
{
"category": "RESOURCE",
@ -222,7 +240,8 @@
"state": "available",
"type": "nova.zone",
"id": "zone-0",
"vitrage_id": "RESOURCE:nova.zone:zone-0"
"vitrage_id": "RESOURCE:nova.zone:zone-0",
"aggregated_state": "RUNNING"
},
{
"category": "RESOURCE",
@ -230,11 +249,12 @@
"is_deleted": false,
"name": "vm-0",
"update_timestamp": "2015-12-01T12:46:41Z",
"state": "ACTIVE",
"state": "ERROR",
"project_id": "0683517e1e354d2ba25cba6937f44e79",
"type": "nova.instance",
"id": "78353ce4-2710-49b5-1341-b8cbb6000ebc",
"vitrage_id": "RESOURCE:nova.instance:78353ce4-2710-49b5-1341-b8cbb6000ebc"
"vitrage_id": "RESOURCE:nova.instance:78353ce4-2710-49b5-1341-b8cbb6000ebc",
"aggregated_state": "ERROR"
},
{
"category": "RESOURCE",
@ -242,11 +262,12 @@
"is_deleted": false,
"name": "vm-12",
"update_timestamp": "2015-12-01T12:46:41Z",
"state": "ACTIVE",
"state": "PAUSED",
"project_id": "0683517e1e354d2ba25cba6937f44e79",
"type": "nova.instance",
"id": "35bf479a-75d9-80a9-874e-d3b50fb2dd2e",
"vitrage_id": "RESOURCE:nova.instance:35bf479a-75d9-80a9-874e-d3b50fb2dd2e"
"vitrage_id": "RESOURCE:nova.instance:35bf479a-75d9-80a9-874e-d3b50fb2dd2e",
"aggregated_state": "SUSPENDED"
},
{
"category": "RESOURCE",
@ -255,7 +276,9 @@
"name": "openstack.node",
"type": "openstack.node",
"id": "openstack.node",
"vitrage_id": "RESOURCE:openstack.node"
"vitrage_id": "RESOURCE:openstack.node",
"state": "available",
"aggregated_state": "RUNNING"
}
],
"links": [

13
etc/vitrage/rca.sample.json
View File

@ -16,33 +16,36 @@
"resource_name": "host-0",
"resource_id": "host-0",
"id": 0,
"vitrage_id": "ALARM:nagios:host0:CPU load"
"vitrage_id": "ALARM:nagios:host0:CPU load",
"normalized_severity": "WARNING"
},
{
"category": "ALARM",
"type": "vitrage",
"name": "Machine Suboptimal",
"state": "Active",
"severity": "WARNING",
"severity": "CRITICAL",
"update_timestamp": "2015-12-01T12:46:41Z",
"resource_type": "nova.instance",
"resource_name": "vm0",
"resource_id": "20d12a8a-ea9a-89c6-5947-83bea959362e",
"id": 1,
"vitrage_id": "ALARM:vitrage:vm0:Machine Suboptimal"
"vitrage_id": "ALARM:vitrage:vm0:Machine Suboptimal",
"normalized_severity": "CRITICAL"
},
{
"category": "ALARM",
"type": "vitrage",
"name": "Machine Suboptimal",
"state": "Active",
"severity": "WARNING",
"severity": "CRITICAL",
"update_timestamp": "2015-12-01T12:46:41Z",
"resource_type": "nova.instance",
"resource_name": "vm1",
"resource_id": "275097cf-954e-8e24-b185-9514e24b8591",
"id": 2,
"vitrage_id": "ALARM:vitrage:vm1:Machine Suboptimal"
"vitrage_id": "ALARM:vitrage:vm1:Machine Suboptimal",
"normalized_severity": "CRITICAL"
}
],
"links": [

1
vitrage/synchronizer/plugins/transformer_base.py
View File

@ -66,6 +66,7 @@ def create_node_placeholder_vertex():
return graph_utils.create_vertex(
key,
entity_id=EntityType.OPENSTACK_NODE,
entity_category=cons.EntityCategory.RESOURCE,
entity_type=EntityType.OPENSTACK_NODE,
entity_state=AVAILABLE,