Commit a03df079 authored by Carlos Natalino's avatar Carlos Natalino
Browse files

Merging and integrating changes from the monitoring service branch.

parents c421fdc7 fc11eda5

.gitlab-ci.yml

+1 −1
Original line number Diff line number Diff line
@@ -10,7 +10,7 @@ stages: 


# include the individual .gitlab-ci.yml of each micro-service

include: 

  - local: '/manifests/.gitlab-ci.yml'

#  - local: '/manifests/.gitlab-ci.yml'

  - local: '/src/monitoring/.gitlab-ci.yml'

  - local: '/src/centralizedattackdetector/.gitlab-ci.yml'

  - local: '/src/context/.gitlab-ci.yml'

src/device/client/DeviceClient.py

+6 −13
Original line number Diff line number Diff line 
import grpc, logging

from common.tools.client.RetryDecorator import retry, delay_exponential

from device.proto.context_pb2 import Device, DeviceConfig, DeviceId, Empty

#from device.proto.device_pb2 import MonitoringSettings

from device.proto.context_pb2 import Device, DeviceId, Empty

from device.proto.device_pb2 import MonitoringSettings

from device.proto.device_pb2_grpc import DeviceServiceStub



LOGGER = logging.getLogger(__name__)
@@ -48,15 +48,8 @@ class DeviceClient: 
        return response



    @retry(exceptions=set(), max_retries=MAX_RETRIES, delay_function=DELAY_FUNCTION, prepare_method_name='connect')

    def GetInitialConfig(self, request : DeviceId) -> DeviceConfig:

        LOGGER.debug('GetInitialConfig request: {:s}'.format(str(request)))

        response = self.stub.GetInitialConfig(request)

        LOGGER.debug('GetInitialConfig result: {:s}'.format(str(response)))

    def MonitorDeviceKpi(self, request: MonitoringSettings) -> Empty:

        LOGGER.debug('MonitorDeviceKpi request: {:s}'.format(str(request)))

        response = self.stub.MonitorDeviceKpi(request)

        LOGGER.debug('MonitorDeviceKpi result: {:s}'.format(str(response)))

        return response
 


    #@retry(exceptions=set(), max_retries=MAX_RETRIES, delay_function=DELAY_FUNCTION, prepare_method_name='connect')

    #def MonitorDeviceKpi(self, request : MonitoringSettings) -> Empty:

    #    LOGGER.debug('MonitorDeviceKpi request: {:s}'.format(str(request)))

    #    response = self.stub.MonitorDeviceKpi(request)

    #    LOGGER.debug('MonitorDeviceKpi result: {:s}'.format(str(response)))

    #    return response

src/device/proto/monitoring_pb2.py

+63 −228

File changed.

Preview size limit exceeded, changes collapsed.

src/device/service/DeviceServiceServicerImpl.py

+168 −253

File changed.

Preview size limit exceeded, changes collapsed.

src/monitoring/.gitlab-ci.yml

+3 −2

File changed.

Preview size limit exceeded, changes collapsed.