Commit 3ce21e4c authored by Lluis Gifre Renom's avatar Lluis Gifre Renom
Browse files

Merge branch 'metrics_collection_automation_policy' into 'develop' 

feat(automation/policy): Enabling metrics collection

See merge request !84
parents 45620b61 30db9870

manifests/automationservice.yaml

deleted120000 → 0
+125 −1
Original line number Diff line number Diff line 
../src/automation/target/kubernetes/kubernetes.yml
 
 No newline at end of file

manifests/automationservice.yaml

0 → 100644
+125 −1
Original line number Diff line number Diff line 
# Copyright 2022-2023 ETSI TeraFlowSDN - TFS OSG (https://tfs.etsi.org/)

#

# Licensed under the Apache License, Version 2.0 (the "License");

# you may not use this file except in compliance with the License.

# You may obtain a copy of the License at

#

#     http://www.apache.org/licenses/LICENSE-2.0

#

# Unless required by applicable law or agreed to in writing, software

# distributed under the License is distributed on an "AS IS" BASIS,

# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

# See the License for the specific language governing permissions and

# limitations under the License.



---

apiVersion: v1

kind: Service

metadata:

  annotations:

    app.quarkus.io/build-timestamp: 2022-09-19 - 10:48:18 +0000

  labels:

    app.kubernetes.io/name: automationservice

    app: automationservice

  name: automationservice

spec:

  ports:

    - name: grpc

      port: 5050

      targetPort: 5050

    - name: metrics

      protocol: TCP

      port: 9192

      targetPort: 8080

  selector:

    app.kubernetes.io/name: automationservice

  type: ClusterIP

---

apiVersion: apps/v1

kind: Deployment

metadata:

  annotations:

    app.quarkus.io/build-timestamp: 2022-09-19 - 10:48:18 +0000

  labels:

    app: automationservice

    app.kubernetes.io/name: automationservice

  name: automationservice

spec:

  replicas: 1

  selector:

    matchLabels:

      app.kubernetes.io/name: automationservice

  template:

    metadata:

      annotations:

        app.quarkus.io/build-timestamp: 2022-09-19 - 10:48:18 +0000

      labels:

        app: automationservice

        app.kubernetes.io/name: automationservice

    spec:

      containers:

        - env:

            - name: KUBERNETES_NAMESPACE

              valueFrom:

                fieldRef:

                  fieldPath: metadata.namespace

            - name: CONTEXT_SERVICE_HOST

              value: contextservice

            - name: DEVICE_SERVICE_HOST

              value: deviceservice

          image: labs.etsi.org:5050/tfs/controller/automation:0.2.0

          imagePullPolicy: Always

          livenessProbe:

            failureThreshold: 3

            httpGet:

              path: /q/health/live

              port: 8080

              scheme: HTTP

            initialDelaySeconds: 2

            periodSeconds: 10

            successThreshold: 1

            timeoutSeconds: 10

          name: automationservice

          ports:

            - containerPort: 5050

              name: grpc

              protocol: TCP

            - containerPort: 8080

              name: metrics

              protocol: TCP

          readinessProbe:

            failureThreshold: 3

            httpGet:

              path: /q/health/ready

              port: 8080

              scheme: HTTP

            initialDelaySeconds: 2

            periodSeconds: 10

            successThreshold: 1

            timeoutSeconds: 10

          resources:

            requests:

              cpu: 50m

              memory: 512Mi

            limits:

              cpu: 500m

              memory: 2048Mi

---

apiVersion: autoscaling/v2

kind: HorizontalPodAutoscaler

metadata:

  name: automationservice-hpa

spec:

  scaleTargetRef:

    apiVersion: apps/v1

    kind: Deployment

    name: automationservice

  minReplicas: 1

  maxReplicas: 10

  metrics:

  - type: Resource

    resource:

      name: cpu

      target:

        type: Utilization

        averageUtilization: 80

manifests/policyservice.yaml

deleted120000 → 0
+129 −1
Original line number Diff line number Diff line 
../src/policy/target/kubernetes/kubernetes.yml
 
 No newline at end of file

manifests/policyservice.yaml

0 → 100644
+129 −1
Original line number Diff line number Diff line 
# Copyright 2022-2023 ETSI TeraFlowSDN - TFS OSG (https://tfs.etsi.org/)

#

# Licensed under the Apache License, Version 2.0 (the "License");

# you may not use this file except in compliance with the License.

# You may obtain a copy of the License at

#

#     http://www.apache.org/licenses/LICENSE-2.0

#

# Unless required by applicable law or agreed to in writing, software

# distributed under the License is distributed on an "AS IS" BASIS,

# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

# See the License for the specific language governing permissions and

# limitations under the License.



---

apiVersion: v1

kind: Service

metadata:

  annotations:

    app.quarkus.io/commit-id: 8065cee75be759e14af792737179537096de5e11

    app.quarkus.io/build-timestamp: 2023-03-30 - 13:49:59 +0000

  labels:

    app.kubernetes.io/name: policyservice

    app: policyservice

  name: policyservice

spec:

  ports:

    - name: metrics

      port: 9192

      targetPort: 8080

    - name: grpc

      port: 6060

      targetPort: 6060

  selector:

    app.kubernetes.io/name: policyservice

  type: ClusterIP

---

apiVersion: apps/v1

kind: Deployment

metadata:

  annotations:

    app.quarkus.io/commit-id: 8065cee75be759e14af792737179537096de5e11

    app.quarkus.io/build-timestamp: 2023-03-30 - 13:49:59 +0000

  labels:

    app: policyservice

    app.kubernetes.io/name: policyservice

  name: policyservice

spec:

  replicas: 1

  selector:

    matchLabels:

      app.kubernetes.io/name: policyservice

  template:

    metadata:

      annotations:

        app.quarkus.io/commit-id: 8065cee75be759e14af792737179537096de5e11

        app.quarkus.io/build-timestamp: 2023-03-30 - 13:49:59 +0000

      labels:

        app: policyservice

        app.kubernetes.io/name: policyservice

    spec:

      containers:

        - env:

            - name: KUBERNETES_NAMESPACE

              valueFrom:

                fieldRef:

                  fieldPath: metadata.namespace

            - name: SERVICE_SERVICE_HOST

              value: serviceservice

            - name: CONTEXT_SERVICE_HOST

              value: contextservice

            - name: MONITORING_SERVICE_HOST

              value: monitoringservice

          image: labs.etsi.org:5050/tfs/controller/policy:0.1.0

          imagePullPolicy: Always

          livenessProbe:

            failureThreshold: 3

            httpGet:

              path: /q/health/live

              port: 8080

              scheme: HTTP

            initialDelaySeconds: 2

            periodSeconds: 10

            successThreshold: 1

            timeoutSeconds: 10

          name: policyservice

          ports:

            - containerPort: 8080

              name: metrics

              protocol: TCP

            - containerPort: 6060

              name: grpc-server

              protocol: TCP

          readinessProbe:

            failureThreshold: 3

            httpGet:

              path: /q/health/ready

              port: 8080

              scheme: HTTP

            initialDelaySeconds: 2

            periodSeconds: 10

            successThreshold: 1

            timeoutSeconds: 10

          resources:

            requests:

              cpu: 50m

              memory: 512Mi

            limits:

              cpu: 500m

              memory: 2048Mi

---

apiVersion: autoscaling/v2

kind: HorizontalPodAutoscaler

metadata:

  name: policyservice-hpa

spec:

  scaleTargetRef:

    apiVersion: apps/v1

    kind: Deployment

    name: policyservice

  minReplicas: 1

  maxReplicas: 10

  metrics:

  - type: Resource

    resource:

      name: cpu

      target:

        type: Utilization

        averageUtilization: 80
 
 No newline at end of file

manifests/servicemonitors.yaml

+58 −0
Original line number Diff line number Diff line
@@ -243,3 +243,61 @@ spec: 
    any: false

    matchNames:

    - tfs # namespace where the app is running

---

apiVersion: monitoring.coreos.com/v1

kind: ServiceMonitor

metadata:

  namespace: monitoring # namespace where prometheus is running

  name: tfs-policyservice-metric

  labels:

    app: policyservice

    #release: prometheus

    #release: prom  # name of the release 

    # ( VERY IMPORTANT: You need to know the correct release name by viewing 

    #   the servicemonitor of Prometheus itself: Without the correct name, 

    #   Prometheus cannot identify the metrics of the Flask app as the target.)

spec:

  selector:

    matchLabels:

      # Target app service

      #namespace: tfs

      app: policyservice # same as above

      #release: prometheus # same as above

  endpoints:

  - port: metrics # named port in target app

    scheme: http

    path: /q/metrics # path to scrape

    interval: 5s # scrape interval

  namespaceSelector:

    any: false

    matchNames:

    - tfs # namespace where the app is running

---

apiVersion: monitoring.coreos.com/v1

kind: ServiceMonitor

metadata:

  namespace: monitoring # namespace where prometheus is running

  name: tfs-automationservice-metric

  labels:

    app: automationservice

    #release: prometheus

    #release: prom  # name of the release 

    # ( VERY IMPORTANT: You need to know the correct release name by viewing 

    #   the servicemonitor of Prometheus itself: Without the correct name, 

    #   Prometheus cannot identify the metrics of the Flask app as the target.)

spec:

  selector:

    matchLabels:

      # Target app service

      #namespace: tfs

      app: automationservice # same as above

      #release: prometheus # same as above

  endpoints:

  - port: metrics # named port in target app

    scheme: http

    path: /q/metrics # path to scrape

    interval: 5s # scrape interval

  namespaceSelector:

    any: false

    matchNames:

    - tfs # namespace where the app is running