Merge pull request #4 from stat-kwon/master

Change name filter to filters in cloud logging connector

Author: stat-kwon

src/cloudforet/monitoring/connector/cloud_logging_connector.py

@@ -22,6 +22,8 @@ def list_log_entries(self, params):
             'orderBy': 'timestamp desc'
         }
 
+        _LOGGER.debug(f'Cloud Logging Filter: {body["filter"]}')
+
         request = self.client.entries().list(body=body)
 
         while request is not None:
@@ -33,7 +35,7 @@ def list_log_entries(self, params):
     @staticmethod
     def _generate_logging_filter(query, start, end):
         logging_filter = ''
-        log_filters = query.get('filter', [])
+        log_filters = query.get('filters', [])
         for log_filter in log_filters:
 
             _filter = []

src/cloudforet/monitoring/manager/metadata_manager.py

@@ -32,7 +32,8 @@ def get_data_source_metadata():
                     'red.500': ['ALERT', 'EMERGENCY'],
                     'coral.500': ['ERROR', 'CRITICAL'],
                     'yellow.300': ['NOTICE', 'WARNING'],
-                    'gray.500': ['DEBUG', 'INFO', 'NOTICE'],
+                    'green.500': ['NOTICE'],
+                    'gray.500': ['DEBUG', 'INFO'],
                     'black': ['DEFAULT']
                 }),
                 TextDyField.data_source('Method name', 'proto_payload.methodName'),

src/cloudforet/monitoring/manager/monitoring_manager.py

@@ -12,6 +12,10 @@ def __init__(self, transaction):
         super().__init__(transaction)
 
     def list_logs(self, params):
+        query = params.get('query', {})
+        if not query:
+            return Log({'results': []})
+
         cloud_logging_conn: CloudLoggingConnector = self.locator.get_connector('CloudLoggingConnector', **params)
 
         for logs in cloud_logging_conn.list_log_entries(params):

test/api/test_log.py

@@ -49,15 +49,15 @@ def test_log_list(self):
             'options': {},
             'secret_data': secret_data,
             'query': {
-                'resource_id': '969092xxxxx',
+                'resource_id': '',
                 'name': 'projects/bluese-cloudone-20200113',
-                'filter': [
+                'filters': [
                     {
                         'resource_type': 'gce_instance',
                         'labels': [
                             {
                                 'key': 'resource.labels.instance_id',
-                                'value': '969092xxxxx'
+                                'value': ''
                             }
                         ]
                     }
@@ -67,6 +67,14 @@ def test_log_list(self):
             'end': '2023-03-21T23:00:00Z'
         }
 
+        # empty_params = {
+        #     'options': {},
+        #     'secret_data': secret_data,
+        #     'query': {},
+        #     'start': '2023-03-21T00:00:00Z',
+        #     'end': '2023-03-21T23:00:00Z'
+        # }
+
         resource_stream = self.monitoring.Log.list(params)
 
         for res in resource_stream: