Commit 22fa4800 authored by Javi Moreno's avatar Javi Moreno
Browse files

More changes on adapting the monitoring service

parent 6418d522

src/monitoring/client/__init__.py

0 → 100644
+0 −0

Empty file added.

src/monitoring/client/monitoring_client.py

+8 −10
Original line number Diff line number Diff line 
import sys

import grpc



from . import monitoring_pb2

from . import monitoring_pb2_grpc

from . import context_pb2

from src.monitoring.proto import monitoring_pb2

from src.monitoring.proto import monitoring_pb2_grpc

from src.monitoring.proto import context_pb2



#import json



from .logger import getJSONLogger

from src.monitoring.logger import getJSONLogger

LOGGER = getJSONLogger('monitoring-client')

LOGGER.setLevel('DEBUG')
@@ -31,10 +29,10 @@ class MonitoringClient: 
        LOGGER.info('MonitorKpi result: {}'.format(response))

        return context_pb2.Empty()



    def GetStream_kpi(self, request):

        LOGGER.info('GetStream_kpi: {}'.format(request))

        response = self.server.GetStream_kpi(request)

        LOGGER.info('GetStream_kpi result: {}'.format(response))

    def GetStreamKpi(self, request):

        LOGGER.info('GetStreamKpi: {}'.format(request))

        response = self.server.GetStreamKpi(request)

        LOGGER.info('GetStreamKpi result: {}'.format(response))

        yield response



    def GetInstantKpi(self, request):

src/monitoring/genproto.sh

+12 −7
Original line number Diff line number Diff line
@@ -14,12 +14,17 @@ 
# See the License for the specific language governing permissions and

# limitations under the License.



#!/bin/bash -e

# Make folder containing the script the root folder for its execution

cd $(dirname $0)



python -m grpc_tools.protoc -I../../proto --python_out=. --grpc_python_out=. ../../proto/monitoring.proto

python -m grpc_tools.protoc -I../../proto --python_out=. --grpc_python_out=. ../../proto/context.proto

rm -rf proto/*.py

rm -rf proto/__pycache__

touch proto/__init__.py



sed -i -E 's/(import\ .*)_pb2/from . \1_pb2/g' monitoring_pb2.py

sed -i -E 's/(import\ .*)_pb2/from . \1_pb2/g' monitoring_pb2_grpc.py

sed -i -E 's/(import\ .*)_pb2/from . \1_pb2/g' context_pb2.py

sed -i -E 's/(import\ .*)_pb2/from . \1_pb2/g' context_pb2_grpc.py
 
python -m grpc_tools.protoc -I../../proto --python_out=proto --grpc_python_out=proto monitoring.proto

python -m grpc_tools.protoc -I../../proto --python_out=proto --grpc_python_out=proto context.proto



sed -i -E 's/(import\ .*)_pb2/from . \1_pb2/g' proto/monitoring_pb2.py

sed -i -E 's/(import\ .*)_pb2/from . \1_pb2/g' proto/monitoring_pb2_grpc.py

sed -i -E 's/(import\ .*)_pb2/from . \1_pb2/g' proto/context_pb2.py

sed -i -E 's/(import\ .*)_pb2/from . \1_pb2/g' proto/context_pb2_grpc.py

src/monitoring/proto/__init__.py

0 → 100644
+0 −0

Empty file added.

src/monitoring/proto/context_pb2.py

0 → 100644
+856 −0

File added.

Preview size limit exceeded, changes collapsed.