Commit 103822cc authored by Lluis Gifre Renom's avatar Lluis Gifre Renom
Browse files

Merge branch 'fix/48-tune-grafana-deployment-and-configuration' into 'develop' 

Resolve "Tune Grafana deployment and configuration"

See merge request !143
parents 8cd8e0d9 5b1c6b0d

deploy/tfs.sh

+1 −1
Original line number Original line Diff line number Diff line
@@ -348,7 +348,7 @@ for COMPONENT in $TFS_COMPONENTS; do 
    printf "\n"

    printf "\n"

done

done





if [[ "$TFS_COMPONENTS" == *"webui"* ]]; then

if [[ "$TFS_COMPONENTS" == *"monitoring"* ]] && [[ "$TFS_COMPONENTS" == *"webui"* ]]; then

    echo "Configuring WebUI DataStores and Dashboards..."

    echo "Configuring WebUI DataStores and Dashboards..."

    sleep 5

    sleep 5

manifests/deviceservice.yaml

+1 −1
Original line number Original line Diff line number Diff line
@@ -44,7 +44,7 @@ spec: 
          exec:

          exec:

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

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

          failureThreshold: 30

          failureThreshold: 30

          periodSeconds: 10

          periodSeconds: 1

        readinessProbe:

        readinessProbe:

          exec:

          exec:

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

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

manifests/webuiservice.yaml

+9 −8
Original line number Original line Diff line number Diff line
@@ -74,26 +74,27 @@ spec: 
        - name: GF_SERVER_SERVE_FROM_SUB_PATH

        - name: GF_SERVER_SERVE_FROM_SUB_PATH

          value: "true"

          value: "true"

        readinessProbe:

        readinessProbe:

          failureThreshold: 3

          failureThreshold: 60

          httpGet:

          httpGet:

            path: /robots.txt

            #path: /robots.txt

            path: /login

            port: 3000

            port: 3000

            scheme: HTTP

            scheme: HTTP

          initialDelaySeconds: 10

          initialDelaySeconds: 1

          periodSeconds: 30

          periodSeconds: 1

          successThreshold: 1

          successThreshold: 1

          timeoutSeconds: 2

          timeoutSeconds: 2

        livenessProbe:

        livenessProbe:

          failureThreshold: 3

          failureThreshold: 60

          initialDelaySeconds: 30

          initialDelaySeconds: 1

          periodSeconds: 10

          periodSeconds: 1

          successThreshold: 1

          successThreshold: 1

          tcpSocket:

          tcpSocket:

            port: 3000

            port: 3000

          timeoutSeconds: 1

          timeoutSeconds: 1

        resources:

        resources:

          requests:

          requests:

            cpu: 150m

            cpu: 250m

            memory: 512Mi

            memory: 512Mi

          limits:

          limits:

            cpu: 500m

            cpu: 500m