Skip to content

Commit 4c7b20c

Browse files
fix: fix bugs & add color
1 parent ed0fe23 commit 4c7b20c

File tree

4 files changed

+10
-6
lines changed

4 files changed

+10
-6
lines changed

src/spaceone/inventory/connector/aws_cloud_watch_connector/connector.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -148,8 +148,8 @@ def _set_alarm_history(self, raw_alarm):
148148
history.append(
149149
{
150150
"date": alarm_history["Timestamp"],
151-
"type": alarm_histories["HistoryItemType"],
152-
"description": alarm_histories["HistorySummary"]
151+
"type": alarm_history["HistoryItemType"],
152+
"description": alarm_history["HistorySummary"]
153153
}
154154
)
155155

src/spaceone/inventory/connector/aws_cloud_watch_connector/schema/data.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,14 +12,14 @@
1212
"""
1313

1414
class Action(Model):
15-
type = StringType(deserialize_from="type")
15+
type = StringType( deserialize_from="type")
1616
description = StringType(deserialize_from="description")
1717
config = StringType(deserialize_from="config")
1818

1919

2020
class History(Model):
2121
date = DateType(deserialize_from="date")
22-
type = StringType(deserialize_from="type")
22+
type = StringType(choices=("ConfigurationUpdate","StateUpdate","Action"), deserialize_from="type")
2323
description = StringType(deserialize_from="description")
2424

2525

src/spaceone/inventory/connector/aws_cloud_watch_connector/schema/resource.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121
DateTimeDyField.data_source("Date", "data.history.date"),
2222
TextDyField.data_source("Type", "data.history.type"),
2323
TextDyField.data_source("Description", "data.history.description"),
24-
]
24+
],
2525
)
2626

2727
cloud_watch_metadata = CloudServiceMeta.set_layouts(layouts=[cw_actions,cw_history])

src/spaceone/inventory/connector/aws_cloud_watch_connector/schema/service_type.py

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
from spaceone.inventory.conf.cloud_service_conf import ASSET_URL
2-
from spaceone.inventory.libs.schema.dynamic_field import TextDyField, ListDyField, SearchField, DateTimeDyField
2+
from spaceone.inventory.libs.schema.dynamic_field import TextDyField, ListDyField, SearchField, DateTimeDyField, \
3+
EnumDyField
34
from spaceone.inventory.libs.schema.resource import CloudServiceTypeResponse, CloudServiceTypeResource, \
45
CloudServiceTypeMeta
56

@@ -20,6 +21,9 @@
2021

2122
cst_alarms._metadata = CloudServiceTypeMeta.set_meta(
2223
fields=[
24+
EnumDyField.data_source("State", "data.state_value", default_badge={
25+
'gray.500': ['INSUFFICIENT_DATA'], 'green.500': ['OK'], 'red.500': ['ALARM']
26+
}),
2327
TextDyField.data_source("State", "data.state_value"),
2428
DateTimeDyField.data_source("Last State Update", "data.state_updated_timestamp"),
2529
TextDyField.data_source("Conditions", "data.conditions"),

0 commit comments

Comments
 (0)