Commit 59f08ade authored by Lluis Gifre Renom's avatar Lluis Gifre Renom
Browse files

Merge branch 'develop' of https://gitlab.com/teraflow-h2020/controller into... 

Merge branch 'develop' of https://gitlab.com/teraflow-h2020/controller into feat/device-adapt-to-context-api
parents 3268cb75 632af8e0

.gitignore

+3 −0
Original line number Diff line number Diff line
@@ -148,3 +148,6 @@ cython_debug/ 


# Other

/tmp



# Sqlite

*.db

.gitlab-ci.yml

+2 −1
Original line number Diff line number Diff line
@@ -11,10 +11,11 @@ stages: 
# include the individual .gitlab-ci.yml of each micro-service

include: 

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

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

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

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

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

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

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

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

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

manifests/monitoring.yaml

+36 −10
Original line number Diff line number Diff line
@@ -6,26 +6,49 @@ spec: 
  selector:

    matchLabels:

      app: monitoring

  replicas: 1

  template:

    metadata:

      labels:

        app: monitoring

    spec:

      terminationGracePeriodSeconds: 5

      restartPolicy: Always

      containers:

      - name: influxdb

        image: influxdb:1.8

        ports:

        - containerPort: 8086

        envFrom:

          - secretRef:

              name: influxdb-secrets

        readinessProbe:

          exec:

            command: ["curl", "-XGET", "localhost:8086/health"]

        livenessProbe:

          exec:

            command: ["curl", "-XGET", "localhost:8086/health"]

        resources:

          requests:

            cpu: 250m

            memory: 512Mi

          limits:

            cpu: 700m

            memory: 1024Mi

      - name: server

        image: registry.gitlab.com/teraflow-h2020/controller/monitoring:latest

        imagePullPolicy: Always

        ports:

        - containerPort: 8080

        env:

        - name: PORT

          value: "8080"

        - containerPort: 7070

        envFrom:

          - secretRef:

              name: monitoring-secrets

        readinessProbe:

          exec:

            command: ["/bin/grpc_health_probe", "-addr=:8080"]

            command: ["/bin/grpc_health_probe", "-addr=:7070"]

        livenessProbe:

          exec:

            command: ["/bin/grpc_health_probe", "-addr=:8080"]

            command: ["/bin/grpc_health_probe", "-addr=:7070"]

        resources:

          requests:

            cpu: 250m
@@ -33,8 +56,6 @@ spec: 
          limits:

            cpu: 700m

            memory: 1024Mi

      imagePullSecrets:

      - name: regcred

---

apiVersion: v1

kind: Service
@@ -47,5 +68,10 @@ spec: 
  ports:

  - name: grpc

    protocol: TCP

    port: 8080

    targetPort: 8080
 
    port: 7070

    targetPort: 7070

  - name: influxdb

    protocol: TCP

    port: 8086

    targetPort: 8086

---
 
 No newline at end of file

proto/centralized_attack_detector.proto

+3 −8
Original line number Diff line number Diff line
@@ -3,13 +3,10 @@ syntax = "proto3"; 
package centralized_attack_detector;



import "context.proto";

import "service.proto";

import "monitoring.proto";





service CentralizedAttackDetectorService {



  rpc NotifyServiceUpdate (service.Service) returns (context.Empty) {}

  rpc NotifyServiceUpdate (context.Service   ) returns (context.Empty) {}

  

  // rpc that triggers the attack detection loop

  rpc DetectAttack        (context.Empty     ) returns (context.Empty) {}
@@ -18,6 +15,4 @@ service CentralizedAttackDetectorService { 
  rpc ReportSummarizedKpi (monitoring.KpiList) returns (context.Empty) {}



  rpc ReportKpi           (monitoring.KpiList) returns (context.Empty) {}



}

proto/compute.proto

+7 −8
Original line number Diff line number Diff line
@@ -2,14 +2,13 @@ syntax = "proto3"; 
package compute;



import "context.proto";

import "service.proto";



service ComputeService {

  rpc CheckCredentials                 (context.TeraFlowController) returns (context.AuthenticationResult) {}

  rpc GetConnectivityServiceStatus ( service.ServiceId ) returns (service.ServiceState) {}

  rpc CreateConnectivityService ( service.Service ) returns (service.ServiceId) {}

  rpc EditConnectivityService ( service.Service ) returns (service.ServiceId) {}

  rpc DeleteConnectivityService ( service.Service ) returns ( context.Empty ) {}

  rpc GetAllActiveConnectivityServices ( context.Empty ) returns ( service.ServiceIdList ) {}

  rpc GetConnectivityServiceStatus     (context.ServiceId         ) returns (context.ServiceStatus       ) {}

  rpc CreateConnectivityService        (context.Service           ) returns (context.ServiceId           ) {}

  rpc EditConnectivityService          (context.Service           ) returns (context.ServiceId           ) {}

  rpc DeleteConnectivityService        (context.Service           ) returns (context.Empty               ) {}

  rpc GetAllActiveConnectivityServices (context.Empty             ) returns (context.ServiceIdList       ) {}

  rpc ClearAllConnectivityServices     (context.Empty             ) returns (context.Empty               ) {}

}