diff --git a/deploy/asapo_services/scripts/asapo.auto.tfvars.in b/deploy/asapo_services/scripts/asapo.auto.tfvars.in index 334e7119a5480d0f1e9c439cf530b21aae90d2b3..bab62e112a89da8230300229889db64406e9cb03 100644 --- a/deploy/asapo_services/scripts/asapo.auto.tfvars.in +++ b/deploy/asapo_services/scripts/asapo.auto.tfvars.in @@ -10,7 +10,7 @@ mongo_version = "4.0.0" grafana_version="7.5.0" influxdb_version = "1.8.4" elk_logs = false -perf_monitor = false +perf_monitor = true nomad_logs = false force_pull_images = false diff --git a/deploy/asapo_services/scripts/resources_services.tf b/deploy/asapo_services/scripts/resources_services.tf index d4e31b92ad37b49550c4d6e19c76da4af6b12f66..2b7ee1b0a2403ce9316d5048fc7421f1a86afe6e 100644 --- a/deploy/asapo_services/scripts/resources_services.tf +++ b/deploy/asapo_services/scripts/resources_services.tf @@ -69,21 +69,21 @@ resource "null_resource" "asapo-broker" { resource "null_resource" "asapo-monitoring-server" { provisioner "local-exec" { - command = "asapo-wait-service asapo-monitoring" + command = "asapo-wait-service asapo-monitoring ${var.perf_monitor}" } depends_on = [nomad_job.asapo-perfmetrics] } resource "null_resource" "asapo-monitoring-proxy" { provisioner "local-exec" { - command = "asapo-wait-service asapo-monitoring-proxy" + command = "asapo-wait-service asapo-monitoring-proxy ${var.perf_monitor}" } depends_on = [nomad_job.asapo-perfmetrics] } resource "null_resource" "asapo-monitoring-ui" { provisioner "local-exec" { - command = "asapo-wait-service asapo-monitoring-ui" + command = "asapo-wait-service asapo-monitoring-ui ${var.perf_monitor}" } depends_on = [nomad_job.asapo-perfmetrics] } diff --git a/docs/site/examples/start_asapo_tcp.sh b/docs/site/examples/start_asapo_tcp.sh index be538e088a9ce51cc5e5749a8ee37c61f42621ca..84687fd1bcc543c2f48acf04e097ee8b84db6834 100644 --- a/docs/site/examples/start_asapo_tcp.sh +++ b/docs/site/examples/start_asapo_tcp.sh @@ -21,7 +21,7 @@ ASAPO_USER=`id -u`:`id -g` mkdir -p $NOMAD_ALLOC_HOST_SHARED $SERVICE_DATA_CLUSTER_SHARED $DATA_GLOBAL_SHARED $DATA_GLOBAL_SHARED_ONLINE chmod 777 $NOMAD_ALLOC_HOST_SHARED $SERVICE_DATA_CLUSTER_SHARED $DATA_GLOBAL_SHARED $DATA_GLOBAL_SHARED_ONLINE -cd $SERVICE_DATA_CLUSTER_SHAREDdetector +cd $SERVICE_DATA_CLUSTER_SHARED mkdir -p fluentd grafana influxdb influxdb2 mongodb prometheus alertmanager chmod 777 * diff --git a/docs/site/versioned_examples/version-22.03.0/start_asapo_socket.sh b/docs/site/versioned_examples/version-22.03.0/start_asapo_socket.sh index eed71b89a9cbc796c6ee90fb49529429d1b4dff0..ca157032d30fe4ab38bb7a035504e2e480b44769 100644 --- a/docs/site/versioned_examples/version-22.03.0/start_asapo_socket.sh +++ b/docs/site/versioned_examples/version-22.03.0/start_asapo_socket.sh @@ -35,4 +35,4 @@ docker run --privileged --rm -v /var/run/docker.sock:/var/run/docker.sock \ --name asapo --net=host -d yakser/asapo-cluster:22.03.0 sleep 15 -docker exec asapo jobs-start +docker exec asapo jobs-start -var perf_monitor=true diff --git a/docs/site/versioned_examples/version-22.03.0/start_asapo_tcp.sh b/docs/site/versioned_examples/version-22.03.0/start_asapo_tcp.sh index 293f7f21580446e2e71069758515392723dfd60e..f32576fb36c99c0227f7644db371b7d9a4196270 100644 --- a/docs/site/versioned_examples/version-22.03.0/start_asapo_tcp.sh +++ b/docs/site/versioned_examples/version-22.03.0/start_asapo_tcp.sh @@ -21,7 +21,7 @@ ASAPO_USER=`id -u`:`id -g` mkdir -p $NOMAD_ALLOC_HOST_SHARED $SERVICE_DATA_CLUSTER_SHARED $DATA_GLOBAL_SHARED $DATA_GLOBAL_SHARED_ONLINE chmod 777 $NOMAD_ALLOC_HOST_SHARED $SERVICE_DATA_CLUSTER_SHARED $DATA_GLOBAL_SHARED $DATA_GLOBAL_SHARED_ONLINE -cd $SERVICE_DATA_CLUSTER_SHAREDdetector +cd $SERVICE_DATA_CLUSTER_SHARED mkdir -p fluentd grafana influxdb influxdb2 mongodb prometheus alertmanager chmod 777 * @@ -44,4 +44,4 @@ docker run --privileged --userns=host --security-opt no-new-privileges --rm \ --name asapo --net=host -d yakser/asapo-cluster:22.03.0 sleep 15 -docker exec asapo jobs-start +docker exec asapo jobs-start -var perf_monitor=true