From ba7a86657ecffbabde7bbb7a5ccd479e0975491c Mon Sep 17 00:00:00 2001
From: gifrerenom <lluis.gifre@cttc.es>
Date: Sat, 17 Dec 2022 23:25:31 +0000
Subject: [PATCH] Manifests:
- added missing metrics ports in core services
- updated scalping time to 5 seconds
---
manifests/contextservice.yaml | 30 +++++++++++++++---------------
manifests/dltservice.yaml | 7 +++++++
manifests/interdomainservice.yaml | 7 +++++++
manifests/monitoringservice.yaml | 9 +++++++++
manifests/pathcompservice.yaml | 7 +++++++
manifests/servicemonitors.yaml | 16 ++++++++--------
6 files changed, 53 insertions(+), 23 deletions(-)
diff --git a/manifests/contextservice.yaml b/manifests/contextservice.yaml
index 299864032..80d6c94f9 100644
--- a/manifests/contextservice.yaml
+++ b/manifests/contextservice.yaml
@@ -28,17 +28,17 @@ spec:
spec:
terminationGracePeriodSeconds: 5
containers:
- - name: redis
- image: redis:6.2
- ports:
- - containerPort: 6379
- resources:
- requests:
- cpu: 100m
- memory: 128Mi
- limits:
- cpu: 500m
- memory: 1024Mi
+ #- name: redis
+ # image: redis:6.2
+ # ports:
+ # - containerPort: 6379
+ # resources:
+ # requests:
+ # cpu: 100m
+ # memory: 128Mi
+ # limits:
+ # cpu: 500m
+ # memory: 1024Mi
- name: server
image: registry.gitlab.com/teraflow-h2020/controller/context:latest
imagePullPolicy: Always
@@ -48,11 +48,11 @@ spec:
- containerPort: 9192
env:
- name: DB_BACKEND
- value: "redis"
+ value: "inmemory"
- name: MB_BACKEND
- value: "redis"
- - name: REDIS_DATABASE_ID
- value: "0"
+ value: "inmemory"
+ #- name: REDIS_DATABASE_ID
+ # value: "0"
- name: LOG_LEVEL
value: "INFO"
- name: POPULATE_FAKE_DATA
diff --git a/manifests/dltservice.yaml b/manifests/dltservice.yaml
index d2ad4f404..0f6b5bb9d 100644
--- a/manifests/dltservice.yaml
+++ b/manifests/dltservice.yaml
@@ -32,6 +32,7 @@ spec:
imagePullPolicy: Always
ports:
- containerPort: 8080
+ - containerPort: 9192
env:
- name: LOG_LEVEL
value: "INFO"
@@ -82,6 +83,8 @@ apiVersion: v1
kind: Service
metadata:
name: dltservice
+ labels:
+ app: dltservice
spec:
type: ClusterIP
selector:
@@ -91,3 +94,7 @@ spec:
protocol: TCP
port: 8080
targetPort: 8080
+ - name: metrics
+ protocol: TCP
+ port: 9192
+ targetPort: 9192
diff --git a/manifests/interdomainservice.yaml b/manifests/interdomainservice.yaml
index 3ef3ffba3..b275035f6 100644
--- a/manifests/interdomainservice.yaml
+++ b/manifests/interdomainservice.yaml
@@ -32,6 +32,7 @@ spec:
imagePullPolicy: Always
ports:
- containerPort: 10010
+ - containerPort: 9192
env:
- name: LOG_LEVEL
value: "INFO"
@@ -53,6 +54,8 @@ apiVersion: v1
kind: Service
metadata:
name: interdomainservice
+ labels:
+ app: interdomainservice
spec:
type: ClusterIP
selector:
@@ -62,3 +65,7 @@ spec:
protocol: TCP
port: 10010
targetPort: 10010
+ - name: metrics
+ protocol: TCP
+ port: 9192
+ targetPort: 9192
diff --git a/manifests/monitoringservice.yaml b/manifests/monitoringservice.yaml
index 39acfd523..aed8d1c51 100644
--- a/manifests/monitoringservice.yaml
+++ b/manifests/monitoringservice.yaml
@@ -72,6 +72,9 @@ spec:
- name: grpc
containerPort: 7070
protocol: TCP
+ - name: metrics
+ containerPort: 9192
+ protocol: TCP
env:
- name: LOG_LEVEL
value: "INFO"
@@ -101,6 +104,8 @@ apiVersion: v1
kind: Service
metadata:
name: monitoringservice
+ labels:
+ app: monitoringservice
spec:
type: ClusterIP
selector:
@@ -122,6 +127,10 @@ spec:
protocol: TCP
port: 8812
targetPort: 8812
+ - name: metrics
+ protocol: TCP
+ port: 9192
+ targetPort: 9192
---
apiVersion: networking.k8s.io/v1
diff --git a/manifests/pathcompservice.yaml b/manifests/pathcompservice.yaml
index 51c83a0f3..71c927b56 100644
--- a/manifests/pathcompservice.yaml
+++ b/manifests/pathcompservice.yaml
@@ -33,6 +33,7 @@ spec:
imagePullPolicy: Always
ports:
- containerPort: 10020
+ - containerPort: 9192
env:
- name: LOG_LEVEL
value: "INFO"
@@ -76,6 +77,8 @@ apiVersion: v1
kind: Service
metadata:
name: pathcompservice
+ labels:
+ app: pathcompservice
spec:
type: ClusterIP
selector:
@@ -89,3 +92,7 @@ spec:
protocol: TCP
port: 8081
targetPort: 8081
+ - name: metrics
+ protocol: TCP
+ port: 9192
+ targetPort: 9192
diff --git a/manifests/servicemonitors.yaml b/manifests/servicemonitors.yaml
index 492e1ac60..ad5f042ba 100644
--- a/manifests/servicemonitors.yaml
+++ b/manifests/servicemonitors.yaml
@@ -21,7 +21,7 @@ spec:
- port: metrics # named port in target app
scheme: http
path: /metrics # path to scrape
- interval: 1s # scrape interval
+ interval: 5s # scrape interval
namespaceSelector:
any: false
matchNames:
@@ -50,7 +50,7 @@ spec:
- port: metrics # named port in target app
scheme: http
path: /metrics # path to scrape
- interval: 1s # scrape interval
+ interval: 5s # scrape interval
namespaceSelector:
any: false
matchNames:
@@ -79,7 +79,7 @@ spec:
- port: metrics # named port in target app
scheme: http
path: /metrics # path to scrape
- interval: 1s # scrape interval
+ interval: 5s # scrape interval
namespaceSelector:
any: false
matchNames:
@@ -108,7 +108,7 @@ spec:
- port: metrics # named port in target app
scheme: http
path: /metrics # path to scrape
- interval: 1s # scrape interval
+ interval: 5s # scrape interval
namespaceSelector:
any: false
matchNames:
@@ -137,7 +137,7 @@ spec:
- port: metrics # named port in target app
scheme: http
path: /metrics # path to scrape
- interval: 1s # scrape interval
+ interval: 5s # scrape interval
namespaceSelector:
any: false
matchNames:
@@ -166,7 +166,7 @@ spec:
- port: metrics # named port in target app
scheme: http
path: /metrics # path to scrape
- interval: 1s # scrape interval
+ interval: 5s # scrape interval
namespaceSelector:
any: false
matchNames:
@@ -195,7 +195,7 @@ spec:
- port: metrics # named port in target app
scheme: http
path: /metrics # path to scrape
- interval: 1s # scrape interval
+ interval: 5s # scrape interval
namespaceSelector:
any: false
matchNames:
@@ -224,7 +224,7 @@ spec:
- port: metrics # named port in target app
scheme: http
path: /metrics # path to scrape
- interval: 1s # scrape interval
+ interval: 5s # scrape interval
namespaceSelector:
any: false
matchNames:
--
GitLab