diff --git a/deploy/asapo_services/scripts/asapo-perfmetrics.nmd.tpl b/deploy/asapo_services/scripts/asapo-perfmetrics.nmd.tpl index cd717baff86ea82bd6bf5b54719d827caa3aacfa..22b832bd714bd3f368358b08f4bf5e41f875341f 100644 --- a/deploy/asapo_services/scripts/asapo-perfmetrics.nmd.tpl +++ b/deploy/asapo_services/scripts/asapo-perfmetrics.nmd.tpl @@ -6,13 +6,6 @@ job "asapo-perfmetrics" { weight = 100 } -# update { -# max_parallel = 1 -# min_healthy_time = "10s" -# healthy_deadline = "3m" -# auto_revert = false -# } - group "perfmetrics" { count = "%{ if perf_monitor }1%{ else }0%{ endif }" restart { @@ -71,6 +64,7 @@ job "asapo-perfmetrics" { } #influxdb + task "grafana" { driver = "docker" user = "${asapo_user}" diff --git a/monitoring/monitoring_server/CMakeLists.txt b/monitoring/monitoring_server/CMakeLists.txt index 4c671d02763d809710a9833a79de72db6ad5ec8c..4763bb434b6d5dde0e264367b21b9d9fcf4d6a5b 100644 --- a/monitoring/monitoring_server/CMakeLists.txt +++ b/monitoring/monitoring_server/CMakeLists.txt @@ -6,7 +6,7 @@ ELSE() set (exe_name "${TARGET_NAME}") ENDIF() -configure_file(docker/Dockerfile . COPYONLY) +configure_file(docker/Dockerfile docker/Dockerfile COPYONLY) add_custom_target(${TARGET_NAME} ALL COMMAND go build ${GO_OPTS} -o ${CMAKE_CURRENT_BINARY_DIR}/${exe_name} main/main.go diff --git a/monitoring/rpc_proxy/Dockerfile b/monitoring/rpc_proxy/Dockerfile index 869dde560549889f8317d68556513b17d949d006..2625f3f794c57830d91f0dcaeb7f75dc81e884a4 100644 --- a/monitoring/rpc_proxy/Dockerfile +++ b/monitoring/rpc_proxy/Dockerfile @@ -1,4 +1,3 @@ - FROM envoyproxy/envoy:v1.17.0 COPY ./envoy.yaml /etc/envoy/envoy.yaml