From 42c7b0d51ecec54ed3b49f3296fb344a0f88c2bb Mon Sep 17 00:00:00 2001
From: Sergey Yakubov <sergey.yakubov@desy.de>
Date: Fri, 4 Feb 2022 13:32:13 +0100
Subject: [PATCH] fix cmake
---
deploy/asapo_services/scripts/asapo-perfmetrics.nmd.tpl | 8 +-------
monitoring/monitoring_server/CMakeLists.txt | 2 +-
monitoring/rpc_proxy/Dockerfile | 1 -
3 files changed, 2 insertions(+), 9 deletions(-)
diff --git a/deploy/asapo_services/scripts/asapo-perfmetrics.nmd.tpl b/deploy/asapo_services/scripts/asapo-perfmetrics.nmd.tpl
index cd717baff..22b832bd7 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 4c671d027..4763bb434 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 869dde560..2625f3f79 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
--
GitLab