From 55c8b1ebbc711971f598b26912145049481821b7 Mon Sep 17 00:00:00 2001
From: Sergey Yakubov <sergey.yakubov@desy.de>
Date: Tue, 15 Mar 2022 10:07:09 +0100
Subject: [PATCH] fix docs, perf_monitor true by default
---
deploy/asapo_services/scripts/asapo.auto.tfvars.in | 2 +-
deploy/asapo_services/scripts/resources_services.tf | 6 +++---
docs/site/examples/start_asapo_tcp.sh | 2 +-
.../version-22.03.0/start_asapo_socket.sh | 2 +-
.../versioned_examples/version-22.03.0/start_asapo_tcp.sh | 4 ++--
5 files changed, 8 insertions(+), 8 deletions(-)
diff --git a/deploy/asapo_services/scripts/asapo.auto.tfvars.in b/deploy/asapo_services/scripts/asapo.auto.tfvars.in
index 334e7119a..bab62e112 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 d4e31b92a..2b7ee1b0a 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 be538e088..84687fd1b 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 eed71b89a..ca157032d 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 293f7f215..f32576fb3 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
--
GitLab