diff --git a/Dockerfile b/Dockerfile index 28b365b..d6124c4 100644 --- a/Dockerfile +++ b/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} diff --git a/pkg/pip_requirements.txt b/pkg/pip_requirements.txt index dfdccef..3da95af 100644 --- a/pkg/pip_requirements.txt +++ b/pkg/pip_requirements.txt @@ -1,2 +1,4 @@ google-api-python-client -schematics \ No newline at end of file +schematics +spaceone-api>=1.0.0,<2.0.0 +spaceone-core>=1.0.0,<2.0.0 \ No newline at end of file diff --git a/src/cloudforet/monitoring/conf/global_conf.py b/src/cloudforet/monitoring/conf/global_conf.py index d310142..e2c6653 100644 --- a/src/cloudforet/monitoring/conf/global_conf.py +++ b/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' ] } } diff --git a/src/cloudforet/monitoring/connector/cloud_logging_connector.py b/src/cloudforet/monitoring/connector/cloud_logging_connector.py index ec3d7df..ac9ee2d 100644 --- a/src/cloudforet/monitoring/connector/cloud_logging_connector.py +++ b/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) diff --git a/src/cloudforet/monitoring/manager/monitoring_manager.py b/src/cloudforet/monitoring/manager/monitoring_manager.py index e295623..f993fc8 100644 --- a/src/cloudforet/monitoring/manager/monitoring_manager.py +++ b/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}) diff --git a/src/cloudforet/monitoring/service/monitoring_service.py b/src/cloudforet/monitoring/service/monitoring_service.py index a6088e2..96ae19e 100644 --- a/src/cloudforet/monitoring/service/monitoring_service.py +++ b/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)