Skip to content

Commit 50d2689

Browse files
committed
fix: update console login event
1 parent 500e14f commit 50d2689

1 file changed

Lines changed: 10 additions & 2 deletions

File tree

src/spaceone/monitoring/manager/monitoring_manager.py

Lines changed: 10 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
import copy
12
import logging
23
from spaceone.core.manager import BaseManager
34
from spaceone.monitoring.conf.monitoring_conf import *
@@ -49,7 +50,7 @@ def lookup_events(self, params):
4950
for event in events:
5051
event_chunk.append(event)
5152

52-
if len(event_chunk) == MAX_EVENT_CHUNK_NUM:
53+
if len(event_chunk) == PAGINATOR_PAGE_SIZE:
5354
yield event_chunk
5455
event_chunk = []
5556

@@ -75,10 +76,17 @@ def get_events_iam_user(self, params):
7576
region_names = self.list_regions(params)
7677

7778
console_login_target_user_name = ''
79+
_lookup_attr = params['query'].get('LookupAttributes')
80+
if _lookup_attr:
81+
console_login_target_user_name = _lookup_attr[0].get('AttributeValue')
82+
83+
console_login_params = copy.deepcopy(params)
84+
console_login_params['query'] = {
85+
'LookupAttributes': [{'AttributeKey': 'EventName', 'AttributeValue': 'ConsoleLogin'}]}
7886

7987
for region_name in region_names:
8088
cloudtrail_connector.set_client(region_name)
81-
for iam_user_events in cloudtrail_connector.lookup_events(params):
89+
for iam_user_events in cloudtrail_connector.lookup_events(console_login_params):
8290
for _user_event in iam_user_events:
8391
if _user_event.get('Username') == console_login_target_user_name:
8492
events.append(_user_event)

0 commit comments

Comments
 (0)