Commit 334ee6d0 authored by Carlos Natalino's avatar Carlos Natalino
Browse files

Finalizing device detail page.

parent 3d5a54c8

src/webui/Config.py

+2 −2
Original line number Diff line number Diff line
@@ -15,6 +15,6 @@ HOST = '0.0.0.0' # accepts connections coming from any ADDRESS 


DEBUG=False



CONTEXT_SERVICE_ADDRESS = '10.109.119.161'

# CONTEXT_SERVICE_ADDRESS = 'context'  # TODO: use the correct context ADDRESS

# CONTEXT_SERVICE_ADDRESS = '10.107.242.226'

CONTEXT_SERVICE_ADDRESS = 'context'  # TODO: use the correct context ADDRESS

CONTEXT_SERVICE_PORT = 1010

src/webui/proto/monitoring_pb2.py

+84 −123
Original line number Diff line number Diff line
@@ -21,7 +21,7 @@ DESCRIPTOR = _descriptor.FileDescriptor( 
  syntax='proto3',

  serialized_options=None,

  create_key=_descriptor._internal_create_key,

  serialized_pb=b'\n\x10monitoring.proto\x12\nmonitoring\x1a\rcontext.proto\"\x84\x01\n\x10\x43reateKpiRequest\x12\x16\n\x0ekpiDescription\x18\x01 \x01(\t\x12$\n\tdevice_id\x18\x02 \x01(\x0b\x32\x11.context.DeviceId\x12\x32\n\x0fkpi_sample_type\x18\x03 \x01(\x0e\x32\x19.monitoring.KpiSampleType\"h\n\x11MonitorKpiRequest\x12!\n\x06kpi_id\x18\x01 \x01(\x0b\x32\x11.monitoring.KpiId\x12\x18\n\x10\x63onnexion_time_s\x18\x02 \x01(\r\x12\x16\n\x0esample_rate_ms\x18\x03 \x01(\r\"i\n\x17MonitorDeviceKpiRequest\x12\x1c\n\x03kpi\x18\x01 \x01(\x0b\x32\x0f.monitoring.Kpi\x12\x18\n\x10\x63onnexion_time_s\x18\x02 \x01(\r\x12\x16\n\x0esample_rate_ms\x18\x03 \x01(\r\"s\n\x11IncludeKpiRequest\x12!\n\x06kpi_id\x18\x01 \x01(\x0b\x32\x11.monitoring.KpiId\x12\x12\n\ntime_stamp\x18\x02 \x01(\t\x12\'\n\tkpi_value\x18\x03 \x01(\x0b\x32\x14.monitoring.KpiValue\"\xd6\x01\n\x03Kpi\x12!\n\x06kpi_id\x18\x01 \x01(\x0b\x32\x11.monitoring.KpiId\x12\x11\n\ttimestamp\x18\x02 \x01(\t\x12\x16\n\x0ekpiDescription\x18\x03 \x01(\t\x12\'\n\tkpi_value\x18\x04 \x01(\x0b\x32\x14.monitoring.KpiValue\x12\x32\n\x0fkpi_sample_type\x18\x05 \x01(\x0e\x32\x19.monitoring.KpiSampleType\x12$\n\tdevice_id\x18\x06 \x01(\x0b\x32\x11.context.DeviceId\"&\n\x05KpiId\x12\x1d\n\x06kpi_id\x18\x01 \x01(\x0b\x32\r.context.Uuid\"T\n\tKpiDevice\x12!\n\x06kpi_id\x18\x01 \x01(\x0b\x32\x11.monitoring.KpiId\x12$\n\tdevice_id\x18\x02 \x01(\x0b\x32\x11.context.DeviceId\"+\n\x07KpiList\x12 \n\x07kpiList\x18\x01 \x03(\x0b\x32\x0f.monitoring.Kpi\"M\n\x08KpiValue\x12\x10\n\x06intVal\x18\x01 \x01(\rH\x00\x12\x13\n\tstringVal\x18\x02 \x01(\tH\x00\x12\x11\n\x07\x62oolVal\x18\x03 \x01(\x08H\x00\x42\x07\n\x05value*x\n\rKpiSampleType\x12\x0b\n\x07UNKNOWN\x10\x00\x12\x17\n\x13PACKETS_TRANSMITTED\x10\x65\x12\x14\n\x10PACKETS_RECEIVED\x10\x66\x12\x16\n\x11\x42YTES_TRANSMITTED\x10\xc9\x01\x12\x13\n\x0e\x42YTES_RECEIVED\x10\xca\x01\x32\x8b\x03\n\x11MonitoringService\x12>\n\tCreateKpi\x12\x1c.monitoring.CreateKpiRequest\x1a\x11.monitoring.KpiId\"\x00\x12=\n\nIncludeKpi\x12\x1d.monitoring.IncludeKpiRequest\x1a\x0e.context.Empty\"\x00\x12=\n\nMonitorKpi\x12\x1d.monitoring.MonitorKpiRequest\x1a\x0e.context.Empty\"\x00\x12I\n\x10MonitorDeviceKpi\x12#.monitoring.MonitorDeviceKpiRequest\x1a\x0e.context.Empty\"\x00\x12\x36\n\x0cGetStreamKpi\x12\x11.monitoring.KpiId\x1a\x0f.monitoring.Kpi\"\x00\x30\x01\x12\x35\n\rGetInstantKpi\x12\x11.monitoring.KpiId\x1a\x0f.monitoring.Kpi\"\x00\x62\x06proto3'

  serialized_pb=b'\n\x10monitoring.proto\x12\nmonitoring\x1a\rcontext.proto\"\x84\x01\n\x10\x43reateKpiRequest\x12\x16\n\x0ekpiDescription\x18\x01 \x01(\t\x12$\n\tdevice_id\x18\x02 \x01(\x0b\x32\x11.context.DeviceId\x12\x32\n\x0fkpi_sample_type\x18\x03 \x01(\x0e\x32\x19.monitoring.KpiSampleType\"h\n\x11MonitorKpiRequest\x12!\n\x06kpi_id\x18\x01 \x01(\x0b\x32\x11.monitoring.KpiId\x12\x18\n\x10\x63onnexion_time_s\x18\x02 \x01(\r\x12\x16\n\x0esample_rate_ms\x18\x03 \x01(\r\"i\n\x17MonitorDeviceKpiRequest\x12\x1c\n\x03kpi\x18\x01 \x01(\x0b\x32\x0f.monitoring.Kpi\x12\x18\n\x10\x63onnexion_time_s\x18\x02 \x01(\r\x12\x16\n\x0esample_rate_ms\x18\x03 \x01(\r\"s\n\x11IncludeKpiRequest\x12!\n\x06kpi_id\x18\x01 \x01(\x0b\x32\x11.monitoring.KpiId\x12\x12\n\ntime_stamp\x18\x02 \x01(\t\x12\'\n\tkpi_value\x18\x03 \x01(\x0b\x32\x14.monitoring.KpiValue\"&\n\x05KpiId\x12\x1d\n\x06kpi_id\x18\x01 \x01(\x0b\x32\r.context.Uuid\"\xd6\x01\n\x03Kpi\x12!\n\x06kpi_id\x18\x01 \x01(\x0b\x32\x11.monitoring.KpiId\x12\x11\n\ttimestamp\x18\x02 \x01(\t\x12\x16\n\x0ekpiDescription\x18\x03 \x01(\t\x12\'\n\tkpi_value\x18\x04 \x01(\x0b\x32\x14.monitoring.KpiValue\x12\x32\n\x0fkpi_sample_type\x18\x05 \x01(\x0e\x32\x19.monitoring.KpiSampleType\x12$\n\tdevice_id\x18\x06 \x01(\x0b\x32\x11.context.DeviceId\"a\n\x08KpiValue\x12\x10\n\x06intVal\x18\x01 \x01(\rH\x00\x12\x12\n\x08\x66loatVal\x18\x02 \x01(\x02H\x00\x12\x13\n\tstringVal\x18\x03 \x01(\tH\x00\x12\x11\n\x07\x62oolVal\x18\x04 \x01(\x08H\x00\x42\x07\n\x05value\"+\n\x07KpiList\x12 \n\x07kpiList\x18\x01 \x03(\x0b\x32\x0f.monitoring.Kpi*x\n\rKpiSampleType\x12\x0b\n\x07UNKNOWN\x10\x00\x12\x17\n\x13PACKETS_TRANSMITTED\x10\x65\x12\x14\n\x10PACKETS_RECEIVED\x10\x66\x12\x16\n\x11\x42YTES_TRANSMITTED\x10\xc9\x01\x12\x13\n\x0e\x42YTES_RECEIVED\x10\xca\x01\x32\x8b\x03\n\x11MonitoringService\x12>\n\tCreateKpi\x12\x1c.monitoring.CreateKpiRequest\x1a\x11.monitoring.KpiId\"\x00\x12=\n\nIncludeKpi\x12\x1d.monitoring.IncludeKpiRequest\x1a\x0e.context.Empty\"\x00\x12=\n\nMonitorKpi\x12\x1d.monitoring.MonitorKpiRequest\x1a\x0e.context.Empty\"\x00\x12I\n\x10MonitorDeviceKpi\x12#.monitoring.MonitorDeviceKpiRequest\x1a\x0e.context.Empty\"\x00\x12\x36\n\x0cGetStreamKpi\x12\x11.monitoring.KpiId\x1a\x0f.monitoring.Kpi\"\x00\x30\x01\x12\x35\n\rGetInstantKpi\x12\x11.monitoring.KpiId\x1a\x0f.monitoring.Kpi\"\x00\x62\x06proto3'

  ,

  dependencies=[context__pb2.DESCRIPTOR,])
@@ -60,8 +60,8 @@ _KPISAMPLETYPE = _descriptor.EnumDescriptor( 
  ],

  containing_type=None,

  serialized_options=None,

  serialized_start=979,

  serialized_end=1099,

  serialized_start=913,

  serialized_end=1033,

)

_sym_db.RegisterEnumDescriptor(_KPISAMPLETYPE)
@@ -258,6 +258,38 @@ _INCLUDEKPIREQUEST = _descriptor.Descriptor( 
)





_KPIID = _descriptor.Descriptor(

  name='KpiId',

  full_name='monitoring.KpiId',

  filename=None,

  file=DESCRIPTOR,

  containing_type=None,

  create_key=_descriptor._internal_create_key,

  fields=[

    _descriptor.FieldDescriptor(

      name='kpi_id', full_name='monitoring.KpiId.kpi_id', index=0,

      number=1, type=11, cpp_type=10, label=1,

      has_default_value=False, default_value=None,

      message_type=None, enum_type=None, containing_type=None,

      is_extension=False, extension_scope=None,

      serialized_options=None, file=DESCRIPTOR,  create_key=_descriptor._internal_create_key),

  ],

  extensions=[

  ],

  nested_types=[],

  enum_types=[

  ],

  serialized_options=None,

  is_extendable=False,

  syntax='proto3',

  extension_ranges=[],

  oneofs=[

  ],

  serialized_start=512,

  serialized_end=550,

)





_KPI = _descriptor.Descriptor(

  name='Kpi',

  full_name='monitoring.Kpi',
@@ -320,62 +352,44 @@ _KPI = _descriptor.Descriptor( 
  extension_ranges=[],

  oneofs=[

  ],

  serialized_start=513,

  serialized_end=727,

  serialized_start=553,

  serialized_end=767,

)





_KPIID = _descriptor.Descriptor(

  name='KpiId',

  full_name='monitoring.KpiId',

_KPIVALUE = _descriptor.Descriptor(

  name='KpiValue',

  full_name='monitoring.KpiValue',

  filename=None,

  file=DESCRIPTOR,

  containing_type=None,

  create_key=_descriptor._internal_create_key,

  fields=[

    _descriptor.FieldDescriptor(

      name='kpi_id', full_name='monitoring.KpiId.kpi_id', index=0,

      number=1, type=11, cpp_type=10, label=1,

      has_default_value=False, default_value=None,

      name='intVal', full_name='monitoring.KpiValue.intVal', index=0,

      number=1, type=13, cpp_type=3, label=1,

      has_default_value=False, default_value=0,

      message_type=None, enum_type=None, containing_type=None,

      is_extension=False, extension_scope=None,

      serialized_options=None, file=DESCRIPTOR,  create_key=_descriptor._internal_create_key),

  ],

  extensions=[

  ],

  nested_types=[],

  enum_types=[

  ],

  serialized_options=None,

  is_extendable=False,

  syntax='proto3',

  extension_ranges=[],

  oneofs=[

  ],

  serialized_start=729,

  serialized_end=767,

)





_KPIDEVICE = _descriptor.Descriptor(

  name='KpiDevice',

  full_name='monitoring.KpiDevice',

  filename=None,

  file=DESCRIPTOR,

  containing_type=None,

  create_key=_descriptor._internal_create_key,

  fields=[

    _descriptor.FieldDescriptor(

      name='kpi_id', full_name='monitoring.KpiDevice.kpi_id', index=0,

      number=1, type=11, cpp_type=10, label=1,

      has_default_value=False, default_value=None,

      name='floatVal', full_name='monitoring.KpiValue.floatVal', index=1,

      number=2, type=2, cpp_type=6, label=1,

      has_default_value=False, default_value=float(0),

      message_type=None, enum_type=None, containing_type=None,

      is_extension=False, extension_scope=None,

      serialized_options=None, file=DESCRIPTOR,  create_key=_descriptor._internal_create_key),

    _descriptor.FieldDescriptor(

      name='device_id', full_name='monitoring.KpiDevice.device_id', index=1,

      number=2, type=11, cpp_type=10, label=1,

      has_default_value=False, default_value=None,

      name='stringVal', full_name='monitoring.KpiValue.stringVal', index=2,

      number=3, type=9, cpp_type=9, label=1,

      has_default_value=False, default_value=b"".decode('utf-8'),

      message_type=None, enum_type=None, containing_type=None,

      is_extension=False, extension_scope=None,

      serialized_options=None, file=DESCRIPTOR,  create_key=_descriptor._internal_create_key),

    _descriptor.FieldDescriptor(

      name='boolVal', full_name='monitoring.KpiValue.boolVal', index=3,

      number=4, type=8, cpp_type=7, label=1,

      has_default_value=False, default_value=False,

      message_type=None, enum_type=None, containing_type=None,

      is_extension=False, extension_scope=None,

      serialized_options=None, file=DESCRIPTOR,  create_key=_descriptor._internal_create_key),
@@ -390,9 +404,14 @@ _KPIDEVICE = _descriptor.Descriptor( 
  syntax='proto3',

  extension_ranges=[],

  oneofs=[

    _descriptor.OneofDescriptor(

      name='value', full_name='monitoring.KpiValue.value',

      index=0, containing_type=None,

      create_key=_descriptor._internal_create_key,

    fields=[]),

  ],

  serialized_start=769,

  serialized_end=853,

  serialized_end=866,

)
@@ -423,59 +442,8 @@ _KPILIST = _descriptor.Descriptor( 
  extension_ranges=[],

  oneofs=[

  ],

  serialized_start=855,

  serialized_end=898,

)





_KPIVALUE = _descriptor.Descriptor(

  name='KpiValue',

  full_name='monitoring.KpiValue',

  filename=None,

  file=DESCRIPTOR,

  containing_type=None,

  create_key=_descriptor._internal_create_key,

  fields=[

    _descriptor.FieldDescriptor(

      name='intVal', full_name='monitoring.KpiValue.intVal', index=0,

      number=1, type=13, cpp_type=3, label=1,

      has_default_value=False, default_value=0,

      message_type=None, enum_type=None, containing_type=None,

      is_extension=False, extension_scope=None,

      serialized_options=None, file=DESCRIPTOR,  create_key=_descriptor._internal_create_key),

    _descriptor.FieldDescriptor(

      name='stringVal', full_name='monitoring.KpiValue.stringVal', index=1,

      number=2, type=9, cpp_type=9, label=1,

      has_default_value=False, default_value=b"".decode('utf-8'),

      message_type=None, enum_type=None, containing_type=None,

      is_extension=False, extension_scope=None,

      serialized_options=None, file=DESCRIPTOR,  create_key=_descriptor._internal_create_key),

    _descriptor.FieldDescriptor(

      name='boolVal', full_name='monitoring.KpiValue.boolVal', index=2,

      number=3, type=8, cpp_type=7, label=1,

      has_default_value=False, default_value=False,

      message_type=None, enum_type=None, containing_type=None,

      is_extension=False, extension_scope=None,

      serialized_options=None, file=DESCRIPTOR,  create_key=_descriptor._internal_create_key),

  ],

  extensions=[

  ],

  nested_types=[],

  enum_types=[

  ],

  serialized_options=None,

  is_extendable=False,

  syntax='proto3',

  extension_ranges=[],

  oneofs=[

    _descriptor.OneofDescriptor(

      name='value', full_name='monitoring.KpiValue.value',

      index=0, containing_type=None,

      create_key=_descriptor._internal_create_key,

    fields=[]),

  ],

  serialized_start=900,

  serialized_end=977,

  serialized_start=868,

  serialized_end=911,

)



_CREATEKPIREQUEST.fields_by_name['device_id'].message_type = context__pb2._DEVICEID
@@ -484,32 +452,32 @@ _MONITORKPIREQUEST.fields_by_name['kpi_id'].message_type = _KPIID 
_MONITORDEVICEKPIREQUEST.fields_by_name['kpi'].message_type = _KPI

_INCLUDEKPIREQUEST.fields_by_name['kpi_id'].message_type = _KPIID

_INCLUDEKPIREQUEST.fields_by_name['kpi_value'].message_type = _KPIVALUE

_KPIID.fields_by_name['kpi_id'].message_type = context__pb2._UUID

_KPI.fields_by_name['kpi_id'].message_type = _KPIID

_KPI.fields_by_name['kpi_value'].message_type = _KPIVALUE

_KPI.fields_by_name['kpi_sample_type'].enum_type = _KPISAMPLETYPE

_KPI.fields_by_name['device_id'].message_type = context__pb2._DEVICEID

_KPIID.fields_by_name['kpi_id'].message_type = context__pb2._UUID

_KPIDEVICE.fields_by_name['kpi_id'].message_type = _KPIID

_KPIDEVICE.fields_by_name['device_id'].message_type = context__pb2._DEVICEID

_KPILIST.fields_by_name['kpiList'].message_type = _KPI

_KPIVALUE.oneofs_by_name['value'].fields.append(

  _KPIVALUE.fields_by_name['intVal'])

_KPIVALUE.fields_by_name['intVal'].containing_oneof = _KPIVALUE.oneofs_by_name['value']

_KPIVALUE.oneofs_by_name['value'].fields.append(

  _KPIVALUE.fields_by_name['floatVal'])

_KPIVALUE.fields_by_name['floatVal'].containing_oneof = _KPIVALUE.oneofs_by_name['value']

_KPIVALUE.oneofs_by_name['value'].fields.append(

  _KPIVALUE.fields_by_name['stringVal'])

_KPIVALUE.fields_by_name['stringVal'].containing_oneof = _KPIVALUE.oneofs_by_name['value']

_KPIVALUE.oneofs_by_name['value'].fields.append(

  _KPIVALUE.fields_by_name['boolVal'])

_KPIVALUE.fields_by_name['boolVal'].containing_oneof = _KPIVALUE.oneofs_by_name['value']

_KPILIST.fields_by_name['kpiList'].message_type = _KPI

DESCRIPTOR.message_types_by_name['CreateKpiRequest'] = _CREATEKPIREQUEST

DESCRIPTOR.message_types_by_name['MonitorKpiRequest'] = _MONITORKPIREQUEST

DESCRIPTOR.message_types_by_name['MonitorDeviceKpiRequest'] = _MONITORDEVICEKPIREQUEST

DESCRIPTOR.message_types_by_name['IncludeKpiRequest'] = _INCLUDEKPIREQUEST

DESCRIPTOR.message_types_by_name['Kpi'] = _KPI

DESCRIPTOR.message_types_by_name['KpiId'] = _KPIID

DESCRIPTOR.message_types_by_name['KpiDevice'] = _KPIDEVICE

DESCRIPTOR.message_types_by_name['KpiList'] = _KPILIST

DESCRIPTOR.message_types_by_name['Kpi'] = _KPI

DESCRIPTOR.message_types_by_name['KpiValue'] = _KPIVALUE

DESCRIPTOR.message_types_by_name['KpiList'] = _KPILIST

DESCRIPTOR.enum_types_by_name['KpiSampleType'] = _KPISAMPLETYPE

_sym_db.RegisterFileDescriptor(DESCRIPTOR)
@@ -541,13 +509,6 @@ IncludeKpiRequest = _reflection.GeneratedProtocolMessageType('IncludeKpiRequest' 
  })

_sym_db.RegisterMessage(IncludeKpiRequest)



Kpi = _reflection.GeneratedProtocolMessageType('Kpi', (_message.Message,), {

  'DESCRIPTOR' : _KPI,

  '__module__' : 'monitoring_pb2'

  # @@protoc_insertion_point(class_scope:monitoring.Kpi)

  })

_sym_db.RegisterMessage(Kpi)



KpiId = _reflection.GeneratedProtocolMessageType('KpiId', (_message.Message,), {

  'DESCRIPTOR' : _KPIID,

  '__module__' : 'monitoring_pb2'
@@ -555,19 +516,12 @@ KpiId = _reflection.GeneratedProtocolMessageType('KpiId', (_message.Message,), { 
  })

_sym_db.RegisterMessage(KpiId)



KpiDevice = _reflection.GeneratedProtocolMessageType('KpiDevice', (_message.Message,), {

  'DESCRIPTOR' : _KPIDEVICE,

  '__module__' : 'monitoring_pb2'

  # @@protoc_insertion_point(class_scope:monitoring.KpiDevice)

  })

_sym_db.RegisterMessage(KpiDevice)



KpiList = _reflection.GeneratedProtocolMessageType('KpiList', (_message.Message,), {

  'DESCRIPTOR' : _KPILIST,

Kpi = _reflection.GeneratedProtocolMessageType('Kpi', (_message.Message,), {

  'DESCRIPTOR' : _KPI,

  '__module__' : 'monitoring_pb2'

  # @@protoc_insertion_point(class_scope:monitoring.KpiList)

  # @@protoc_insertion_point(class_scope:monitoring.Kpi)

  })

_sym_db.RegisterMessage(KpiList)

_sym_db.RegisterMessage(Kpi)



KpiValue = _reflection.GeneratedProtocolMessageType('KpiValue', (_message.Message,), {

  'DESCRIPTOR' : _KPIVALUE,
@@ -576,6 +530,13 @@ KpiValue = _reflection.GeneratedProtocolMessageType('KpiValue', (_message.Messag 
  })

_sym_db.RegisterMessage(KpiValue)



KpiList = _reflection.GeneratedProtocolMessageType('KpiList', (_message.Message,), {

  'DESCRIPTOR' : _KPILIST,

  '__module__' : 'monitoring_pb2'

  # @@protoc_insertion_point(class_scope:monitoring.KpiList)

  })

_sym_db.RegisterMessage(KpiList)







_MONITORINGSERVICE = _descriptor.ServiceDescriptor(
@@ -585,8 +546,8 @@ _MONITORINGSERVICE = _descriptor.ServiceDescriptor( 
  index=0,

  serialized_options=None,

  create_key=_descriptor._internal_create_key,

  serialized_start=1102,

  serialized_end=1497,

  serialized_start=1036,

  serialized_end=1431,

  methods=[

  _descriptor.MethodDescriptor(

    name='CreateKpi',