Skip to content

Commit 65ca89b

Browse files
committed
fix: add limit params
1 parent 50d2689 commit 65ca89b

3 files changed

Lines changed: 6 additions & 9 deletions

File tree

src/spaceone/monitoring/conf/monitoring_conf.py

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,8 @@
11
DEFAULT_REGION = 'us-east-1'
22
DEFAULT_SCHEMA = 'aws_access_key'
33
NUM_OF_LIMIT = 100
4-
MAX_EVENT_CHUNK_NUM = 20
4+
PAGINATOR_MAX_ITEMS = 10000
5+
PAGINATOR_PAGE_SIZE = 50
56

67
EXCLUDE_EVENT_NAME = [
78
'AddTags',

src/spaceone/monitoring/connector/cloudtrail_connector.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ def lookup_events(self, params):
1515
query = params['query']
1616
start = params['start']
1717
end = params['end']
18-
limit = params.get('limit') # TODO
18+
limit = params.get('limit', 1000) # Force throttling because too many events cause performance issues
1919

2020
lookup_attributes = query.get('LookupAttributes', [])
2121

@@ -27,7 +27,7 @@ def lookup_events(self, params):
2727
'EndTime': end
2828
}
2929

30-
query = self.generate_query(is_paginate=True, **_query)
30+
query = self.generate_query(is_paginate=True, limit=limit, **_query)
3131
response_iterator = paginator.paginate(**query)
3232

3333
for response in response_iterator:

src/spaceone/monitoring/libs/connector.py

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -3,10 +3,6 @@
33
from spaceone.core.connector import BaseConnector
44
from spaceone.monitoring.conf.monitoring_conf import *
55

6-
PAGINATOR_MAX_ITEMS = 10000
7-
PAGINATOR_PAGE_SIZE = 50
8-
DEFAULT_REGION = 'us-east-1'
9-
106

117
class AWSConnector(BaseConnector):
128
service = 'cloudtrail'
@@ -61,11 +57,11 @@ def set_client(self, region_name=DEFAULT_REGION):
6157
self.client = self.session.client(self.service)
6258

6359
@staticmethod
64-
def generate_query(is_paginate=False, **query):
60+
def generate_query(is_paginate=False, limit=PAGINATOR_MAX_ITEMS, **query):
6561
if is_paginate:
6662
query.update({
6763
'PaginationConfig': {
68-
'MaxItems': PAGINATOR_MAX_ITEMS,
64+
'MaxItems': limit,
6965
'PageSize': PAGINATOR_PAGE_SIZE,
7066
}
7167
})

0 commit comments

Comments
 (0)