From 5b1c6b0dd201ebf0328e20fb2bfd7f2c90122fc2 Mon Sep 17 00:00:00 2001
From: gifrerenom <lluis.gifre@cttc.es>
Date: Fri, 28 Jul 2023 14:48:38 +0000
Subject: [PATCH] Fixes in Grafana deployment and configuration
---
deploy/tfs.sh | 2 +-
manifests/deviceservice.yaml | 2 +-
manifests/webuiservice.yaml | 17 +++++++++--------
3 files changed, 11 insertions(+), 10 deletions(-)
diff --git a/deploy/tfs.sh b/deploy/tfs.sh
index 261996acb..95d882c8b 100755
--- a/deploy/tfs.sh
+++ b/deploy/tfs.sh
@@ -348,7 +348,7 @@ for COMPONENT in $TFS_COMPONENTS; do
printf "\n"
done
-if [[ "$TFS_COMPONENTS" == *"webui"* ]]; then
+if [[ "$TFS_COMPONENTS" == *"monitoring"* ]] && [[ "$TFS_COMPONENTS" == *"webui"* ]]; then
echo "Configuring WebUI DataStores and Dashboards..."
sleep 5
diff --git a/manifests/deviceservice.yaml b/manifests/deviceservice.yaml
index a99e3e588..77e421f29 100644
--- a/manifests/deviceservice.yaml
+++ b/manifests/deviceservice.yaml
@@ -44,7 +44,7 @@ spec:
exec:
command: ["/bin/grpc_health_probe", "-addr=:2020"]
failureThreshold: 30
- periodSeconds: 10
+ periodSeconds: 1
readinessProbe:
exec:
command: ["/bin/grpc_health_probe", "-addr=:2020"]
diff --git a/manifests/webuiservice.yaml b/manifests/webuiservice.yaml
index ba408bb40..43caa9f04 100644
--- a/manifests/webuiservice.yaml
+++ b/manifests/webuiservice.yaml
@@ -74,26 +74,27 @@ spec:
- name: GF_SERVER_SERVE_FROM_SUB_PATH
value: "true"
readinessProbe:
- failureThreshold: 3
+ failureThreshold: 60
httpGet:
- path: /robots.txt
+ #path: /robots.txt
+ path: /login
port: 3000
scheme: HTTP
- initialDelaySeconds: 10
- periodSeconds: 30
+ initialDelaySeconds: 1
+ periodSeconds: 1
successThreshold: 1
timeoutSeconds: 2
livenessProbe:
- failureThreshold: 3
- initialDelaySeconds: 30
- periodSeconds: 10
+ failureThreshold: 60
+ initialDelaySeconds: 1
+ periodSeconds: 1
successThreshold: 1
tcpSocket:
port: 3000
timeoutSeconds: 1
resources:
requests:
- cpu: 150m
+ cpu: 250m
memory: 512Mi
limits:
cpu: 500m
--
GitLab