Commit 6ba95b23 authored by Lluis Gifre Renom's avatar Lluis Gifre Renom
Browse files

Pre-merge code cleanup

parent 46033bc8

deploy/all.sh

+17 −0
Original line number Diff line number Diff line
@@ -213,6 +213,23 @@ export QDB_DROP_TABLES_IF_EXIST=${QDB_DROP_TABLES_IF_EXIST:-""} 
export QDB_REDEPLOY=${QDB_REDEPLOY:-""}





# ----- Time Series Storage - Prometheus / Grafana Mimir -----------------------



# If not already set, set Time Series Storage installation mode. Accepted values are:

# 'single' and 'cluster'.

# - If TSDB_DEPLOY_MODE is "single", Time Series Storage is deployed in single node

#   mode and features a basic Prometheus instance. It is convenient for development and

#   testing purposes and should fit in a VM.

#   IT SHOULD NOT BE USED IN PRODUCTION ENVIRONMENTS.

# - If TSDB_DEPLOY_MODE is "cluster", Time Series Storage is deployed in cluster mode

#   and a Grafana Mimir database in cluster mode will be deployed. It is convenient for

#   production and provides scalability features. If you are deploying for production,

#   also read the following link providing details on deploying Grafana Mimir for

#   production environments:

#   Ref: https://grafana.com/docs/mimir/latest/manage/run-production-environment/

export TSDB_DEPLOY_MODE=${TSDB_DEPLOY_MODE:-"single"}





# ----- K8s Observability ------------------------------------------------------



# If not already set, set the external port Prometheus Mgmt HTTP GUI interface will be exposed to.

deploy/monitoring.sh

+18 −3
Original line number Diff line number Diff line
@@ -15,8 +15,23 @@ 


set -euo pipefail



# Deploy TFS in production environment

export DEPLOY_TSDB_MODE=${DEPLOY_TSDB_MODE:-""}



# ----- Time Series Storage - Prometheus / Grafana Mimir -----------------------



# If not already set, set Time Series Storage installation mode. Accepted values are:

# 'single' and 'cluster'.

# - If TSDB_DEPLOY_MODE is "single", Time Series Storage is deployed in single node

#   mode and features a basic Prometheus instance. It is convenient for development and

#   testing purposes and should fit in a VM.

#   IT SHOULD NOT BE USED IN PRODUCTION ENVIRONMENTS.

# - If TSDB_DEPLOY_MODE is "cluster", Time Series Storage is deployed in cluster mode

#   and a Grafana Mimir database in cluster mode will be deployed. It is convenient for

#   production and provides scalability features. If you are deploying for production,

#   also read the following link providing details on deploying Grafana Mimir for

#   production environments:

#   Ref: https://grafana.com/docs/mimir/latest/manage/run-production-environment/

export TSDB_DEPLOY_MODE=${TSDB_DEPLOY_MODE:-"single"}





# -----------------------------------------------------------

# Global namespace for all deployments
@@ -108,7 +123,7 @@ kubectl rollout status deployment/"$RELEASE_NAME_PROM-server" -n "$NAMESPACE" || 




# 2) Deploy Mimir

if [ "$DEPLOY_TSDB_MODE" == "YES" ]; then

if [ "$TSDB_DEPLOY_MODE" == "cluster" ]; then

    echo "Deploying Mimir in production mode."

    # You can add any production-specific configurations here if needed

    deploy_chart "$RELEASE_NAME_MIMIR" \

my_deploy.sh

+8 −2
Original line number Diff line number Diff line
@@ -120,8 +120,6 @@ export TFS_GRAFANA_PASSWORD="admin123+" 
# Disable skip-build flag to rebuild the Docker images.

export TFS_SKIP_BUILD=""



# Deploy TFS in production environment

export DEPLOY_TSDB_MODE=""



# ----- CockroachDB ------------------------------------------------------------
@@ -219,6 +217,14 @@ export QDB_DROP_TABLES_IF_EXIST="" 
export QDB_REDEPLOY=""





# ----- Time Series Storage - Prometheus / Grafana Mimir -----------------------



# Set Time Series Storage installation mode to 'single' (i.e., Prometheus only).

# This option is convenient for development and testing. See ./deploy/all.sh or

# ./deploy/monitoring.sh for additional details.

export TSDB_DEPLOY_MODE="single"





# ----- K8s Observability ------------------------------------------------------



# Set the external port Prometheus Mgmt HTTP GUI interface will be exposed to.