fix: update Dockerfile and requirements, enhance logging, and improve monitoring service

Signed-off-by: kang2453 <kang2453@gmail.com>

Author: kang2453

Dockerfile

@@ -10,8 +10,7 @@ RUN apt update && apt upgrade -y
 
 COPY pkg/*.txt ${PKG_DIR}/
 RUN pip install --upgrade pip && \
-    pip install --upgrade --use-deprecated=legacy-resolver -r ${PKG_DIR}/pip_requirements.txt && \
-    pip install --upgrade spaceone-api
+    pip install --upgrade --use-deprecated=legacy-resolver -r ${PKG_DIR}/pip_requirements.txt 
 
 COPY src ${SRC_DIR}
 

pkg/pip_requirements.txt

@@ -1,2 +1,4 @@
 google-api-python-client
-schematics
+schematics
+spaceone-api>=1.0.0,<2.0.0
+spaceone-core>=1.0.0,<2.0.0

src/cloudforet/monitoring/conf/global_conf.py

@@ -5,8 +5,14 @@
     'filters': {
         'masking': {
             'rules': {
+                'DataSource.verify': [
+                    'secret_data'
+                ],
                 'Log.list': [
                     'secret_data'
+                ],
+                'Log.list_logs':[
+                    'secret_data'
                 ]
             }
         }

src/cloudforet/monitoring/connector/cloud_logging_connector.py

@@ -23,7 +23,7 @@ def list_log_entries(self, params):
             'pageSize': 10000
         }
 
-        _LOGGER.debug(f'Cloud Logging Filter: {body["filter"]}')
+        _LOGGER.info(f'Cloud Logging Filter: {body["filter"]}')
 
         request = self.client.entries().list(body=body)
 

src/cloudforet/monitoring/manager/monitoring_manager.py

@@ -30,4 +30,6 @@ def list_logs(self, params):
                         except Exception as e:
                             raise ERROR_CONVERT_EVENT(event=log, error=e)
 
+            if not event_vos:
+                continue
             yield Log({'results': event_vos})

src/cloudforet/monitoring/service/monitoring_service.py

@@ -6,6 +6,8 @@
 
 
 @authentication_handler
+@authorization_handler
+@event_handler
 class MonitoringService(BaseService):
     def __init__(self, metadata):
         super().__init__(metadata)