Modifications in the monitoring information model (c0ac4a77) · Commits · TFS / controller

.gitlab-ci.yml

+1 −1

Original line number	Diff line number	Diff line
		@@ -34,7 +34,7 @@ include:
		- local: '/src/opticalattackmitigator/.gitlab-ci.yml'
		- local: '/src/opticalcentralizedattackdetector/.gitlab-ci.yml'
		- local: '/src/automation/.gitlab-ci.yml'
		- local: '/src/webui/.gitlab-ci.yml'
		#- local: '/src/webui/.gitlab-ci.yml'
		#- local: '/src/l3_distributedattackdetector/.gitlab-ci.yml'
		#- local: '/src/l3_centralizedattackdetector/.gitlab-ci.yml'
		#- local: '/src/l3_attackmitigator/.gitlab-ci.yml'

proto/monitoring.proto

+52 −7

Original line number	Diff line number	Diff line
		@@ -25,6 +25,13 @@ service MonitoringService {
		rpc MonitorKpi (MonitorKpiRequest ) returns (context.Empty ) {}
		rpc GetStreamKpi (KpiId ) returns (stream Kpi ) {}
		rpc GetInstantKpi (KpiId ) returns (Kpi ) {}
		rpc CreateMetrics (MetricsDescriptor ) returns (MetricsId ) {}
		rpc GetMetricsDescriptor (MetricsId ) returns (MetricsDescriptor) {}
		rpc IncludeMetrics (Metrics ) returns (context.Empty ) {}
		rpc MonitorMetrics (MonitorMetricsRequest) returns (context.Empty ) {}
		rpc GetStreamMetrics (MetricsId ) returns (stream Metrics ) {}
		rpc GetInstantMetrics (MetricsId ) returns (Metrics ) {}

		}

		message KpiDescriptor {
		@@ -36,22 +43,47 @@ message KpiDescriptor {
		// context.SliceId slice_id = 6;
		}

		message MetricsDescriptor {
		string metrics_description = 1;
		kpi_sample_types.KpiSampleType kpi_sample_type = 2;
		context.DeviceId device_id = 3;
		context.EndPointId endpoint_id = 4;
		context.ServiceId service_id = 5;
		// context.SliceId slice_id = 6;
		}

		message MonitorKpiRequest{
		KpiId kpi_id = 1;
		float sampling_duration_s = 2;
		float sampling_interval_s = 3;
		}

		message MonitorMetricsRequest{
		MetricsId metrics_id = 1;
		float sampling_duration_s = 2;
		float sampling_interval_s = 3;
		}

		message KpiId {
		context.Uuid kpi_id = 1;
		}

		message MetricsId {
		context.Uuid kpi_id = 1;
		}

		message Kpi {
		KpiId kpi_id = 1;
		string timestamp = 2;
		KpiValue kpi_value = 4;
		}

		message Metrics {
		MetricsId metrics_id = 1;
		string timestamp = 2;
		MetricsValue metrics_value = 4;
		}

		message KpiValue {
		oneof value {
		uint32 intVal = 1;
		@@ -61,6 +93,19 @@ message KpiValue {
		}
		}

		message MetricsValue {
		oneof value {
		uint32 intVal = 1;
		float floatVal = 2;
		string stringVal = 3;
		bool boolVal = 4;
		}
		}

		message KpiList {
		repeated Kpi kpi_list = 1;
		}

		message MetricsList {
		repeated Metrics metrics_list = 1;
		}
		No newline at end of file

src/automation/.gitlab-ci.yml

+0 −1

Original line number	Diff line number	Diff line
		@@ -69,7 +69,6 @@ unit_test automation:
		coverage: '/JaCoCo Coverage Total: ([0-9]{1,3})%/'
		artifacts:
		reports:
		cobertura: ${REPORTS_PATH}/cobertura.xml
		junit:
		- ${REPORTS_PATH}/surefire-reports/TEST-*.xml
		rules:

src/compute/.gitlab-ci.yml

+1 −3

Original line number	Diff line number	Diff line
		@@ -56,7 +56,6 @@ unit test compute:
		- docker ps -a
		- docker logs $IMAGE_NAME
		- docker exec -i $IMAGE_NAME bash -c "coverage run -m pytest --log-level=INFO --verbose $IMAGE_NAME/tests/test_unitary.py --junitxml=/opt/results/${IMAGE_NAME}_report.xml"
		- docker exec -i $IMAGE_NAME bash -c "coverage xml -o /opt/results/${IMAGE_NAME}_coverage.xml"
		- docker exec -i $IMAGE_NAME bash -c "coverage report --include='${IMAGE_NAME}/*' --show-missing"
		coverage: '/TOTAL\s+\d+\s+\d+\s+(\d+%)/'
		after_script:
		@@ -76,7 +75,6 @@ unit test compute:
		when: always
		reports:
		junit: src/$IMAGE_NAME/tests/${IMAGE_NAME}_report.xml
		cobertura: src/$IMAGE_NAME/tests/${IMAGE_NAME}_coverage.xml

		# Deployment of the service in Kubernetes Cluster
		deploy compute:

src/context/.gitlab-ci.yml

+0 −2

Original line number	Diff line number	Diff line
		@@ -58,7 +58,6 @@ unit test context:
		- docker ps -a
		- docker logs $IMAGE_NAME
		- docker exec -i $IMAGE_NAME bash -c "coverage run -m pytest --log-level=INFO --verbose $IMAGE_NAME/tests/test_unitary.py --junitxml=/opt/results/${IMAGE_NAME}_report.xml"
		- docker exec -i $IMAGE_NAME bash -c "coverage xml -o /opt/results/${IMAGE_NAME}_coverage.xml"
		- docker exec -i $IMAGE_NAME bash -c "coverage report --include='${IMAGE_NAME}/*' --show-missing"
		coverage: '/TOTAL\s+\d+\s+\d+\s+(\d+%)/'
		after_script:
		@@ -79,7 +78,6 @@ unit test context:
		when: always
		reports:
		junit: src/$IMAGE_NAME/tests/${IMAGE_NAME}_report.xml
		cobertura: src/$IMAGE_NAME/tests/${IMAGE_NAME}_coverage.xml

		# Deployment of the service in Kubernetes Cluster
		deploy context: