Merge pull request #11 from stat-kwon/master

Modify cloud logging connector

Author: stat-kwon

src/cloudforet/monitoring/connector/cloud_logging_connector.py

@@ -19,17 +19,22 @@ def list_log_entries(self, params):
         body = {
             'resource_names': f'projects/{self.project_id}',
             'filter': self._generate_logging_filter(query, start, end),
-            'orderBy': 'timestamp desc'
+            'orderBy': 'timestamp desc',
+            'pageSize': 10000
         }
 
         _LOGGER.debug(f'Cloud Logging Filter: {body["filter"]}')
 
         request = self.client.entries().list(body=body)
 
+        count = 0
         while request is not None:
+            if count == 5:
+                break
             response = request.execute()
             logs = [log for log in response.get('entries', [])]
             yield logs
+            count += 1
             request = self.client.entries().list_next(previous_request=request, previous_response=response)
 
     @staticmethod

src/cloudforet/monitoring/manager/monitoring_manager.py

@@ -22,10 +22,12 @@ def list_logs(self, params):
 
             event_vos = []
             for log in logs:
-                if log.get('protoPayload'):
-                    try:
-                        event_vos.append(Event(log))
-                    except Exception as e:
-                        raise ERROR_CONVERT_EVENT(event=log, error=e)
+                if proto_payload := log.get('protoPayload'):
+                    principal_email = proto_payload.get('authenticationInfo', {}).get('principalEmail')
+                    if not principal_email.startswith('system'):
+                        try:
+                            event_vos.append(Event(log))
+                        except Exception as e:
+                            raise ERROR_CONVERT_EVENT(event=log, error=e)
 
             yield Log({'results': event_vos})