From cc372a3cfc0246374d07f953e74c7424f50b175a Mon Sep 17 00:00:00 2001
From: Sergey Yakubov <sergey.yakubov@desy.de>
Date: Tue, 12 Nov 2019 13:45:29 +0100
Subject: [PATCH] update deploy scripts
---
.../asapo_broker/server/process_request.go | 2 -
deploy/CMakeLists.txt | 7 +-
deploy/{docker/cluster => asapo}/Dockerfile | 0
deploy/asapo/asap3.tfvars | 26 +++
deploy/{docker/cluster => asapo}/asapo-start | 0
deploy/{docker/cluster => asapo}/asapo-stop | 0
.../cluster => asapo}/asapo-wait-service | 0
.../asapo_overwrite_vars.tfvars | 0
.../{docker/cluster => asapo}/build_image.sh | 0
.../{docker/cluster => asapo}/consul.hcl.tpl | 0
deploy/asapo/copy_asap3.sh.in | 4 +
deploy/{docker/cluster => asapo}/job.sh | 0
.../{docker/cluster => asapo}/nomad.hcl.tpl | 0
.../cluster => asapo}/orchestr_config.py | 0
deploy/{docker/cluster => asapo}/run.sh | 0
.../{docker/cluster => asapo}/run_maxwell.sh | 0
.../scripts/asapo-brokers.nmd.tpl | 1 -
.../scripts/asapo-logging.nmd.tpl | 3 -
.../scripts/asapo-mongo.nmd.tpl | 1 -
.../scripts/asapo-nginx.nmd.tpl | 2 +-
.../scripts/asapo-perfmetrics.nmd.tpl | 2 -
.../scripts/asapo-receivers.nmd.tpl | 1 -
.../scripts/asapo-services.nmd.tpl | 2 -
.../scripts/asapo.auto.tfvars.in | 2 +-
.../cluster => asapo}/scripts/auth_secret.key | 0
.../scripts/authorizer.json.tpl | 0
.../cluster => asapo}/scripts/broker.json.tpl | 0
.../scripts/discovery.json.tpl | 0
.../scripts/fluentd.conf.tpl | 0
.../cluster => asapo}/scripts/kibana.yml | 0
.../cluster => asapo}/scripts/nginx.conf.tpl | 4 +-
.../cluster => asapo}/scripts/provider.tf | 0
.../scripts/receiver.json.tpl | 0
.../cluster => asapo}/scripts/resources.tf | 0
.../scripts/resources_services.tf | 0
.../cluster => asapo}/scripts/templates.tf | 1 +
.../{docker/cluster => asapo}/scripts/vars.tf | 2 +
.../cluster => asapo}/supervisord.conf | 0
deploy/nomad_jobs/asapo-brokers.nmd.in | 75 --------
deploy/nomad_jobs/asapo-logging.nmd.in | 179 ------------------
deploy/nomad_jobs/asapo-mongo.nmd.in | 59 ------
deploy/nomad_jobs/asapo-nginx.nmd.in | 70 -------
deploy/nomad_jobs/asapo-perfmetrics.nmd.in | 108 -----------
deploy/nomad_jobs/asapo-receivers.nmd.in | 74 --------
deploy/nomad_jobs/asapo-services.nmd.in | 128 -------------
deploy/nomad_jobs/authorizer.json.tpl | 12 --
deploy/nomad_jobs/broker.json.tpl | 9 -
deploy/nomad_jobs/copy.sh.in | 3 -
deploy/nomad_jobs/discovery.json.tpl | 11 --
deploy/nomad_jobs/fluentd.conf | 55 ------
deploy/nomad_jobs/init_influx.sh | 10 -
deploy/nomad_jobs/kibana.yml | 6 -
deploy/nomad_jobs/nginx.conf.tpl | 85 ---------
deploy/nomad_jobs/receiver.json.tpl | 25 ---
deploy/nomad_jobs/start_asapo.sh | 9 -
deploy/nomad_jobs/stop_asapo.sh | 9 -
56 files changed, 39 insertions(+), 948 deletions(-)
rename deploy/{docker/cluster => asapo}/Dockerfile (100%)
create mode 100644 deploy/asapo/asap3.tfvars
rename deploy/{docker/cluster => asapo}/asapo-start (100%)
rename deploy/{docker/cluster => asapo}/asapo-stop (100%)
rename deploy/{docker/cluster => asapo}/asapo-wait-service (100%)
rename deploy/{docker/cluster => asapo}/asapo_overwrite_vars.tfvars (100%)
rename deploy/{docker/cluster => asapo}/build_image.sh (100%)
rename deploy/{docker/cluster => asapo}/consul.hcl.tpl (100%)
create mode 100755 deploy/asapo/copy_asap3.sh.in
rename deploy/{docker/cluster => asapo}/job.sh (100%)
rename deploy/{docker/cluster => asapo}/nomad.hcl.tpl (100%)
rename deploy/{docker/cluster => asapo}/orchestr_config.py (100%)
rename deploy/{docker/cluster => asapo}/run.sh (100%)
rename deploy/{docker/cluster => asapo}/run_maxwell.sh (100%)
rename deploy/{docker/cluster => asapo}/scripts/asapo-brokers.nmd.tpl (98%)
rename deploy/{docker/cluster => asapo}/scripts/asapo-logging.nmd.tpl (98%)
rename deploy/{docker/cluster => asapo}/scripts/asapo-mongo.nmd.tpl (98%)
rename deploy/{docker/cluster => asapo}/scripts/asapo-nginx.nmd.tpl (97%)
rename deploy/{docker/cluster => asapo}/scripts/asapo-perfmetrics.nmd.tpl (98%)
rename deploy/{docker/cluster => asapo}/scripts/asapo-receivers.nmd.tpl (98%)
rename deploy/{docker/cluster => asapo}/scripts/asapo-services.nmd.tpl (98%)
rename deploy/{docker/cluster => asapo}/scripts/asapo.auto.tfvars.in (97%)
rename deploy/{docker/cluster => asapo}/scripts/auth_secret.key (100%)
rename deploy/{docker/cluster => asapo}/scripts/authorizer.json.tpl (100%)
rename deploy/{docker/cluster => asapo}/scripts/broker.json.tpl (100%)
rename deploy/{docker/cluster => asapo}/scripts/discovery.json.tpl (100%)
rename deploy/{docker/cluster => asapo}/scripts/fluentd.conf.tpl (100%)
rename deploy/{docker/cluster => asapo}/scripts/kibana.yml (100%)
rename deploy/{docker/cluster => asapo}/scripts/nginx.conf.tpl (95%)
rename deploy/{docker/cluster => asapo}/scripts/provider.tf (100%)
rename deploy/{docker/cluster => asapo}/scripts/receiver.json.tpl (100%)
rename deploy/{docker/cluster => asapo}/scripts/resources.tf (100%)
rename deploy/{docker/cluster => asapo}/scripts/resources_services.tf (100%)
rename deploy/{docker/cluster => asapo}/scripts/templates.tf (98%)
rename deploy/{docker/cluster => asapo}/scripts/vars.tf (97%)
rename deploy/{docker/cluster => asapo}/supervisord.conf (100%)
delete mode 100644 deploy/nomad_jobs/asapo-brokers.nmd.in
delete mode 100644 deploy/nomad_jobs/asapo-logging.nmd.in
delete mode 100644 deploy/nomad_jobs/asapo-mongo.nmd.in
delete mode 100644 deploy/nomad_jobs/asapo-nginx.nmd.in
delete mode 100644 deploy/nomad_jobs/asapo-perfmetrics.nmd.in
delete mode 100644 deploy/nomad_jobs/asapo-receivers.nmd.in
delete mode 100644 deploy/nomad_jobs/asapo-services.nmd.in
delete mode 100644 deploy/nomad_jobs/authorizer.json.tpl
delete mode 100644 deploy/nomad_jobs/broker.json.tpl
delete mode 100755 deploy/nomad_jobs/copy.sh.in
delete mode 100644 deploy/nomad_jobs/discovery.json.tpl
delete mode 100644 deploy/nomad_jobs/fluentd.conf
delete mode 100644 deploy/nomad_jobs/init_influx.sh
delete mode 100644 deploy/nomad_jobs/kibana.yml
delete mode 100644 deploy/nomad_jobs/nginx.conf.tpl
delete mode 100644 deploy/nomad_jobs/receiver.json.tpl
delete mode 100644 deploy/nomad_jobs/start_asapo.sh
delete mode 100644 deploy/nomad_jobs/stop_asapo.sh
diff --git a/broker/src/asapo_broker/server/process_request.go b/broker/src/asapo_broker/server/process_request.go
index 9697dbd6c..ba380a26c 100644
--- a/broker/src/asapo_broker/server/process_request.go
+++ b/broker/src/asapo_broker/server/process_request.go
@@ -5,7 +5,6 @@ import (
"asapo_common/logger"
log "asapo_common/logger"
"asapo_common/utils"
- "fmt"
"github.com/gorilla/mux"
"github.com/rs/xid"
"net/http"
@@ -33,7 +32,6 @@ func checkGroupID(w http.ResponseWriter, needGroupID bool, group_id string, db_n
err_str := "wrong groupid " + group_id
log_str := "processing get " + op + " request in " + db_name + " at " + settings.GetDatabaseServer() + ": " + err_str
logger.Error(log_str)
- fmt.Println(log_str)
w.WriteHeader(http.StatusBadRequest)
w.Write([]byte(err_str))
return false
diff --git a/deploy/CMakeLists.txt b/deploy/CMakeLists.txt
index 29a093caf..78859d893 100644
--- a/deploy/CMakeLists.txt
+++ b/deploy/CMakeLists.txt
@@ -4,12 +4,9 @@ else()
SET (NOMAD_INSTALL ${CMAKE_INSTALL_PREFIX}/nomad_jobs)
endif()
-configure_files(${CMAKE_CURRENT_SOURCE_DIR}/nomad_jobs ${CMAKE_CURRENT_BINARY_DIR}/nomad_jobs)
+configure_files(${CMAKE_CURRENT_SOURCE_DIR}/asapo ${CMAKE_CURRENT_BINARY_DIR}/asapo)
+configure_files(${CMAKE_CURRENT_SOURCE_DIR}/asapo/scripts ${CMAKE_CURRENT_BINARY_DIR}/asapo/scripts)
-configure_files(${CMAKE_CURRENT_SOURCE_DIR}/docker/cluster ${CMAKE_CURRENT_BINARY_DIR}/docker/cluster)
-configure_files(${CMAKE_CURRENT_SOURCE_DIR}/docker/cluster/scripts ${CMAKE_CURRENT_BINARY_DIR}/docker/cluster/scripts)
-install(DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/nomad_jobs/ DESTINATION ${NOMAD_INSTALL})
-
diff --git a/deploy/docker/cluster/Dockerfile b/deploy/asapo/Dockerfile
similarity index 100%
rename from deploy/docker/cluster/Dockerfile
rename to deploy/asapo/Dockerfile
diff --git a/deploy/asapo/asap3.tfvars b/deploy/asapo/asap3.tfvars
new file mode 100644
index 000000000..42982885b
--- /dev/null
+++ b/deploy/asapo/asap3.tfvars
@@ -0,0 +1,26 @@
+consul_dns_port = 53
+
+elk_logs = true
+
+service_dir="/bldocuments/support/asapo"
+data_dir="/bldocuments/support/asapo/data"
+mongo_dir="/bldocuments/support/asapo/mongodb"
+asapo_user="994:989"
+job_scripts_dir="/bldocuments/support/asapo/config/nomad_jobs/terraform_scripts"
+
+receiver_total_memory_size = 35000
+receiver_dataserver_cache_size = 30 #gb
+receiver_receive_to_disk_threshold = 50 # mb
+receiver_dataserver_nthreads = 8
+
+grafana_total_memory_size = 2000
+influxdb_total_memory_size = 2000
+fluentd_total_memory_size = 1000
+elasticsearch_total_memory_size = 3000
+kibana_total_memory_size = 1000
+mongo_total_memory_size = 20000
+authorizer_total_memory_size = 512
+discovery_total_memory_size = 512
+
+n_receivers = 1
+n_brokers = 1
diff --git a/deploy/docker/cluster/asapo-start b/deploy/asapo/asapo-start
similarity index 100%
rename from deploy/docker/cluster/asapo-start
rename to deploy/asapo/asapo-start
diff --git a/deploy/docker/cluster/asapo-stop b/deploy/asapo/asapo-stop
similarity index 100%
rename from deploy/docker/cluster/asapo-stop
rename to deploy/asapo/asapo-stop
diff --git a/deploy/docker/cluster/asapo-wait-service b/deploy/asapo/asapo-wait-service
similarity index 100%
rename from deploy/docker/cluster/asapo-wait-service
rename to deploy/asapo/asapo-wait-service
diff --git a/deploy/docker/cluster/asapo_overwrite_vars.tfvars b/deploy/asapo/asapo_overwrite_vars.tfvars
similarity index 100%
rename from deploy/docker/cluster/asapo_overwrite_vars.tfvars
rename to deploy/asapo/asapo_overwrite_vars.tfvars
diff --git a/deploy/docker/cluster/build_image.sh b/deploy/asapo/build_image.sh
similarity index 100%
rename from deploy/docker/cluster/build_image.sh
rename to deploy/asapo/build_image.sh
diff --git a/deploy/docker/cluster/consul.hcl.tpl b/deploy/asapo/consul.hcl.tpl
similarity index 100%
rename from deploy/docker/cluster/consul.hcl.tpl
rename to deploy/asapo/consul.hcl.tpl
diff --git a/deploy/asapo/copy_asap3.sh.in b/deploy/asapo/copy_asap3.sh.in
new file mode 100755
index 000000000..5bea7f394
--- /dev/null
+++ b/deploy/asapo/copy_asap3.sh.in
@@ -0,0 +1,4 @@
+#!/usr/bin/env bash
+
+scp scripts/* psana002:@NOMAD_INSTALL@/terraform_scripts/
+scp asap3.tfvars psana002:@NOMAD_INSTALL@/terraform_scripts/
diff --git a/deploy/docker/cluster/job.sh b/deploy/asapo/job.sh
similarity index 100%
rename from deploy/docker/cluster/job.sh
rename to deploy/asapo/job.sh
diff --git a/deploy/docker/cluster/nomad.hcl.tpl b/deploy/asapo/nomad.hcl.tpl
similarity index 100%
rename from deploy/docker/cluster/nomad.hcl.tpl
rename to deploy/asapo/nomad.hcl.tpl
diff --git a/deploy/docker/cluster/orchestr_config.py b/deploy/asapo/orchestr_config.py
similarity index 100%
rename from deploy/docker/cluster/orchestr_config.py
rename to deploy/asapo/orchestr_config.py
diff --git a/deploy/docker/cluster/run.sh b/deploy/asapo/run.sh
similarity index 100%
rename from deploy/docker/cluster/run.sh
rename to deploy/asapo/run.sh
diff --git a/deploy/docker/cluster/run_maxwell.sh b/deploy/asapo/run_maxwell.sh
similarity index 100%
rename from deploy/docker/cluster/run_maxwell.sh
rename to deploy/asapo/run_maxwell.sh
diff --git a/deploy/docker/cluster/scripts/asapo-brokers.nmd.tpl b/deploy/asapo/scripts/asapo-brokers.nmd.tpl
similarity index 98%
rename from deploy/docker/cluster/scripts/asapo-brokers.nmd.tpl
rename to deploy/asapo/scripts/asapo-brokers.nmd.tpl
index 2bca8c175..8074880c0 100644
--- a/deploy/docker/cluster/scripts/asapo-brokers.nmd.tpl
+++ b/deploy/asapo/scripts/asapo-brokers.nmd.tpl
@@ -27,7 +27,6 @@ job "asapo-brokers" {
user = "${asapo_user}"
config {
network_mode = "host"
- privileged = true
security_opt = ["no-new-privileges"]
userns_mode = "host"
image = "yakser/asapo-broker${image_suffix}"
diff --git a/deploy/docker/cluster/scripts/asapo-logging.nmd.tpl b/deploy/asapo/scripts/asapo-logging.nmd.tpl
similarity index 98%
rename from deploy/docker/cluster/scripts/asapo-logging.nmd.tpl
rename to deploy/asapo/scripts/asapo-logging.nmd.tpl
index dc3807894..1f0af9df6 100644
--- a/deploy/docker/cluster/scripts/asapo-logging.nmd.tpl
+++ b/deploy/asapo/scripts/asapo-logging.nmd.tpl
@@ -34,7 +34,6 @@ job "asapo-logging" {
}
config {
network_mode = "host"
- privileged = true
security_opt = ["no-new-privileges"]
userns_mode = "host"
image = "yakser/fluentd_elastic"
@@ -105,7 +104,6 @@ job "asapo-logging" {
nproc = "8192"
}
network_mode = "host"
- privileged = true
security_opt = ["no-new-privileges"]
userns_mode = "host"
image = "yakser/elasticsearch:${elasticsearch_version}"
@@ -144,7 +142,6 @@ job "asapo-logging" {
user = "${asapo_user}"
config {
network_mode = "host"
- privileged = true
security_opt = ["no-new-privileges"]
userns_mode = "host"
image = "yakser/kibana:${kibana_version}"
diff --git a/deploy/docker/cluster/scripts/asapo-mongo.nmd.tpl b/deploy/asapo/scripts/asapo-mongo.nmd.tpl
similarity index 98%
rename from deploy/docker/cluster/scripts/asapo-mongo.nmd.tpl
rename to deploy/asapo/scripts/asapo-mongo.nmd.tpl
index e7de2f1a6..4ed27586b 100644
--- a/deploy/docker/cluster/scripts/asapo-mongo.nmd.tpl
+++ b/deploy/asapo/scripts/asapo-mongo.nmd.tpl
@@ -28,7 +28,6 @@ job "asapo-mongo" {
config {
network_mode = "host"
- privileged = true
security_opt = ["no-new-privileges"]
userns_mode = "host"
image = "mongo:${mongo_version}"
diff --git a/deploy/docker/cluster/scripts/asapo-nginx.nmd.tpl b/deploy/asapo/scripts/asapo-nginx.nmd.tpl
similarity index 97%
rename from deploy/docker/cluster/scripts/asapo-nginx.nmd.tpl
rename to deploy/asapo/scripts/asapo-nginx.nmd.tpl
index c76ec47f7..b9ab767cd 100644
--- a/deploy/docker/cluster/scripts/asapo-nginx.nmd.tpl
+++ b/deploy/asapo/scripts/asapo-nginx.nmd.tpl
@@ -34,11 +34,11 @@ job "asapo-nginx" {
influxdb_port = "${influxdb_port}"
authorizer_port = "${authorizer_port}"
discovery_port = "${discovery_port}"
+ consul_dns_port = "${consul_dns_port}"
}
config {
network_mode = "host"
- privileged = true
security_opt = ["no-new-privileges"]
userns_mode = "host"
image = "nginx:${nginx_version}"
diff --git a/deploy/docker/cluster/scripts/asapo-perfmetrics.nmd.tpl b/deploy/asapo/scripts/asapo-perfmetrics.nmd.tpl
similarity index 98%
rename from deploy/docker/cluster/scripts/asapo-perfmetrics.nmd.tpl
rename to deploy/asapo/scripts/asapo-perfmetrics.nmd.tpl
index d4b69b705..21d815c06 100644
--- a/deploy/docker/cluster/scripts/asapo-perfmetrics.nmd.tpl
+++ b/deploy/asapo/scripts/asapo-perfmetrics.nmd.tpl
@@ -27,7 +27,6 @@ job "asapo-perfmetrics" {
user = "${asapo_user}"
config {
network_mode = "host"
- privileged = true
security_opt = ["no-new-privileges"]
userns_mode = "host"
image = "influxdb:${influxdb_version}"
@@ -77,7 +76,6 @@ job "asapo-perfmetrics" {
config {
network_mode = "host"
- privileged = true
security_opt = ["no-new-privileges"]
userns_mode = "host"
image = "grafana/grafana:${grafana_version}"
diff --git a/deploy/docker/cluster/scripts/asapo-receivers.nmd.tpl b/deploy/asapo/scripts/asapo-receivers.nmd.tpl
similarity index 98%
rename from deploy/docker/cluster/scripts/asapo-receivers.nmd.tpl
rename to deploy/asapo/scripts/asapo-receivers.nmd.tpl
index 1b96b3f3c..2a2035ea5 100644
--- a/deploy/docker/cluster/scripts/asapo-receivers.nmd.tpl
+++ b/deploy/asapo/scripts/asapo-receivers.nmd.tpl
@@ -28,7 +28,6 @@ job "asapo-receivers" {
user = "${asapo_user}"
config {
network_mode = "host"
- privileged = true
security_opt = ["no-new-privileges"]
userns_mode = "host"
image = "yakser/asapo-receiver${image_suffix}"
diff --git a/deploy/docker/cluster/scripts/asapo-services.nmd.tpl b/deploy/asapo/scripts/asapo-services.nmd.tpl
similarity index 98%
rename from deploy/docker/cluster/scripts/asapo-services.nmd.tpl
rename to deploy/asapo/scripts/asapo-services.nmd.tpl
index 040a67464..98b12180b 100644
--- a/deploy/docker/cluster/scripts/asapo-services.nmd.tpl
+++ b/deploy/asapo/scripts/asapo-services.nmd.tpl
@@ -16,7 +16,6 @@ job "asapo-services" {
user = "${asapo_user}"
config {
network_mode = "host"
- privileged = true
security_opt = ["no-new-privileges"]
userns_mode = "host"
image = "yakser/asapo-authorizer${image_suffix}"
@@ -81,7 +80,6 @@ job "asapo-services" {
user = "${asapo_user}"
config {
network_mode = "host"
- privileged = true
security_opt = ["no-new-privileges"]
userns_mode = "host"
image = "yakser/asapo-discovery${image_suffix}"
diff --git a/deploy/docker/cluster/scripts/asapo.auto.tfvars.in b/deploy/asapo/scripts/asapo.auto.tfvars.in
similarity index 97%
rename from deploy/docker/cluster/scripts/asapo.auto.tfvars.in
rename to deploy/asapo/scripts/asapo.auto.tfvars.in
index cfbcb6c97..e25ef9f32 100644
--- a/deploy/docker/cluster/scripts/asapo.auto.tfvars.in
+++ b/deploy/asapo/scripts/asapo.auto.tfvars.in
@@ -40,7 +40,7 @@ elasticsearch_port = 9200
kibana_port = 5601
discovery_port = 5006
authorizer_port = 5007
-
+consul_dns_port = 8600
n_receivers = 1
n_brokers = 1
\ No newline at end of file
diff --git a/deploy/docker/cluster/scripts/auth_secret.key b/deploy/asapo/scripts/auth_secret.key
similarity index 100%
rename from deploy/docker/cluster/scripts/auth_secret.key
rename to deploy/asapo/scripts/auth_secret.key
diff --git a/deploy/docker/cluster/scripts/authorizer.json.tpl b/deploy/asapo/scripts/authorizer.json.tpl
similarity index 100%
rename from deploy/docker/cluster/scripts/authorizer.json.tpl
rename to deploy/asapo/scripts/authorizer.json.tpl
diff --git a/deploy/docker/cluster/scripts/broker.json.tpl b/deploy/asapo/scripts/broker.json.tpl
similarity index 100%
rename from deploy/docker/cluster/scripts/broker.json.tpl
rename to deploy/asapo/scripts/broker.json.tpl
diff --git a/deploy/docker/cluster/scripts/discovery.json.tpl b/deploy/asapo/scripts/discovery.json.tpl
similarity index 100%
rename from deploy/docker/cluster/scripts/discovery.json.tpl
rename to deploy/asapo/scripts/discovery.json.tpl
diff --git a/deploy/docker/cluster/scripts/fluentd.conf.tpl b/deploy/asapo/scripts/fluentd.conf.tpl
similarity index 100%
rename from deploy/docker/cluster/scripts/fluentd.conf.tpl
rename to deploy/asapo/scripts/fluentd.conf.tpl
diff --git a/deploy/docker/cluster/scripts/kibana.yml b/deploy/asapo/scripts/kibana.yml
similarity index 100%
rename from deploy/docker/cluster/scripts/kibana.yml
rename to deploy/asapo/scripts/kibana.yml
diff --git a/deploy/docker/cluster/scripts/nginx.conf.tpl b/deploy/asapo/scripts/nginx.conf.tpl
similarity index 95%
rename from deploy/docker/cluster/scripts/nginx.conf.tpl
rename to deploy/asapo/scripts/nginx.conf.tpl
index deabdfc8f..b101534de 100644
--- a/deploy/docker/cluster/scripts/nginx.conf.tpl
+++ b/deploy/asapo/scripts/nginx.conf.tpl
@@ -25,7 +25,7 @@ http {
uwsgi_temp_path "/tmp/uwsgi" 1 2;
- resolver 127.0.0.1:8600 valid=1s;
+ resolver 127.0.0.1:{{ env "NOMAD_META_consul_dns_port" }} valid=1s;
server {
listen {{ env "NOMAD_PORT_nginx" }};
set $discovery_endpoint asapo-discovery.service.asapo;
@@ -80,7 +80,7 @@ http {
}
stream {
- resolver 127.0.0.1:8600 valid=1s;
+ resolver 127.0.0.1:{{ env "NOMAD_META_consul_dns_port" }} valid=1s;
map $remote_addr $upstream {
default fluentd.service.asapo;
diff --git a/deploy/docker/cluster/scripts/provider.tf b/deploy/asapo/scripts/provider.tf
similarity index 100%
rename from deploy/docker/cluster/scripts/provider.tf
rename to deploy/asapo/scripts/provider.tf
diff --git a/deploy/docker/cluster/scripts/receiver.json.tpl b/deploy/asapo/scripts/receiver.json.tpl
similarity index 100%
rename from deploy/docker/cluster/scripts/receiver.json.tpl
rename to deploy/asapo/scripts/receiver.json.tpl
diff --git a/deploy/docker/cluster/scripts/resources.tf b/deploy/asapo/scripts/resources.tf
similarity index 100%
rename from deploy/docker/cluster/scripts/resources.tf
rename to deploy/asapo/scripts/resources.tf
diff --git a/deploy/docker/cluster/scripts/resources_services.tf b/deploy/asapo/scripts/resources_services.tf
similarity index 100%
rename from deploy/docker/cluster/scripts/resources_services.tf
rename to deploy/asapo/scripts/resources_services.tf
diff --git a/deploy/docker/cluster/scripts/templates.tf b/deploy/asapo/scripts/templates.tf
similarity index 98%
rename from deploy/docker/cluster/scripts/templates.tf
rename to deploy/asapo/scripts/templates.tf
index 9eb5e0972..709e46451 100644
--- a/deploy/docker/cluster/scripts/templates.tf
+++ b/deploy/asapo/scripts/templates.tf
@@ -12,6 +12,7 @@ data "template_file" "nginx" {
authorizer_port = "${var.authorizer_port}"
discovery_port = "${var.discovery_port}"
asapo_user = "${var.asapo_user}"
+ consul_dns_port = "${var.consul_dns_port}"
}
}
diff --git a/deploy/docker/cluster/scripts/vars.tf b/deploy/asapo/scripts/vars.tf
similarity index 97%
rename from deploy/docker/cluster/scripts/vars.tf
rename to deploy/asapo/scripts/vars.tf
index a6c2814ac..0de5e3678 100644
--- a/deploy/docker/cluster/scripts/vars.tf
+++ b/deploy/asapo/scripts/vars.tf
@@ -70,6 +70,8 @@ variable "discovery_port" {}
variable "authorizer_port" {}
+variable "consul_dns_port" {}
+
variable "n_receivers" {}
variable "n_brokers" {}
\ No newline at end of file
diff --git a/deploy/docker/cluster/supervisord.conf b/deploy/asapo/supervisord.conf
similarity index 100%
rename from deploy/docker/cluster/supervisord.conf
rename to deploy/asapo/supervisord.conf
diff --git a/deploy/nomad_jobs/asapo-brokers.nmd.in b/deploy/nomad_jobs/asapo-brokers.nmd.in
deleted file mode 100644
index a4bdb3457..000000000
--- a/deploy/nomad_jobs/asapo-brokers.nmd.in
+++ /dev/null
@@ -1,75 +0,0 @@
-job "asapo-brokers" {
- datacenters = ["dc1"]
-
- update {
- max_parallel = 1
- min_healthy_time = "10s"
- healthy_deadline = "3m"
- auto_revert = false
- }
-
- group "brokers" {
- count = 1
-
- restart {
- attempts = 2
- interval = "3m"
- delay = "15s"
- mode = "fail"
- }
-
- task "brokers" {
- driver = "docker"
- config {
- network_mode = "host"
- dns_servers = ["127.0.0.1"]
- image = "yakser/asapo-broker-dev:@ASAPO_VERSION@"
- force_pull = true
- volumes = ["local/config.json:/var/lib/broker/config.json"]
- logging {
- type = "fluentd"
- config {
- fluentd-address = "localhost:9881"
- fluentd-async-connect = true
- tag = "asapo.docker"
- }
- }
- }
-
- resources {
- network {
- port "broker" {}
- }
- }
-
- service {
- port = "broker"
- name = "asapo-broker"
- check {
- name = "asapo-broker-alive"
- type = "http"
- path = "/health"
- interval = "10s"
- timeout = "2s"
- }
- check_restart {
- limit = 2
- grace = "90s"
- ignore_warnings = false
- }
- }
-
- template {
- source = "@NOMAD_INSTALL@/broker.json.tpl"
- destination = "local/config.json"
- change_mode = "restart"
- }
-
- template {
- source = "@NOMAD_INSTALL@/auth_secret.key"
- destination = "secrets/secret.key"
- change_mode = "restart"
- }
- } #task brokers
- }
-}
diff --git a/deploy/nomad_jobs/asapo-logging.nmd.in b/deploy/nomad_jobs/asapo-logging.nmd.in
deleted file mode 100644
index e7c9cdfc1..000000000
--- a/deploy/nomad_jobs/asapo-logging.nmd.in
+++ /dev/null
@@ -1,179 +0,0 @@
-job "asapo-logging" {
- datacenters = ["dc1"]
-
-# update {
-# max_parallel = 1
-# min_healthy_time = "10s"
-# healthy_deadline = "3m"
-# auto_revert = false
-# }
-
- group "fluentd" {
- count = 1
- restart {
- attempts = 2
- interval = "3m"
- delay = "15s"
- mode = "delay"
- }
-
- task "fluentd" {
- driver = "docker"
-
- meta {
- change_me_to_restart = 1
- }
-
- config {
- dns_servers = ["127.0.0.1"]
- network_mode = "host"
- image = "yakser/fluentd_elastic"
- volumes = ["local/fluentd.conf:/fluentd/etc/fluent.conf",
- "/${meta.shared_storage}/fluentd:/shared"]
- }
-
- resources {
- cpu = 500
- memory = 256
- network {
- mbits = 10
- port "fluentd" {
- static = 9880
- }
- }
- }
-
- service {
- port = "fluentd"
- name = "fluentd"
- check {
- name = "alive"
- type = "script"
- command = "/bin/pidof"
- args = ["ruby2.3"]
- timeout = "2s"
- interval = "10s"
- }
- check_restart {
- limit = 2
- grace = "15s"
- ignore_warnings = false
- }
- }
- template {
- source = "@NOMAD_INSTALL@/fluentd.conf"
- destination = "local/fluentd.conf"
- change_mode = "restart"
- }
- }
- }
-#elasticsearch
- group "elk" {
- count = 1
- restart {
- attempts = 2
- interval = "3m"
- delay = "15s"
- mode = "delay"
- }
-
- task "elasticsearch" {
- driver = "docker"
-
- env {
- bootstrap.memory_lock = "true"
- cluster.name = "asapo-logging"
- ES_JAVA_OPTS = "-Xms512m -Xmx512m"
- }
-
- config {
- ulimit {
- memlock = "-1:-1"
- nofile = "65536:65536"
- nproc = "8192"
- }
- network_mode = "host"
- dns_servers = ["127.0.0.1"]
- image = "docker.elastic.co/elasticsearch/elasticsearch:6.3.0"
- volumes = ["/${meta.shared_storage}/esdatadir:/usr/share/elasticsearch/data"]
- }
-
- resources {
- #MHz
- cpu = 4000
- #MB
- memory = 2048
- network {
- mbits = 10
- port "elasticsearch" {
- static = 9200
- }
- }
- }
-
- service {
- port = "elasticsearch"
- name = "elasticsearch"
- check {
- name = "alive"
- type = "http"
- path = "/_cluster/health"
- interval = "10s"
- timeout = "1s"
- }
- check_restart {
- limit = 2
- grace = "90s"
- ignore_warnings = false
- }
- }
- }
-#kibana
- task "kibana" {
- driver = "docker"
-
- config {
- network_mode = "host"
- dns_servers = ["127.0.0.1"]
- image = "docker.elastic.co/kibana/kibana:6.3.0"
- volumes = ["local/kibana.yml:/usr/share/kibana/config/kibana.yml"]
- }
-
- template {
- source = "@NOMAD_INSTALL@/kibana.yml"
- destination = "local/kibana.yml"
- change_mode = "restart"
- }
-
- resources {
- cpu = 256
- memory = 1024
- network {
- mbits = 10
- port "kibana" {
- static = 5601
- }
- }
- }
-
- service {
- port = "kibana"
- name = "kibana"
- check {
- name = "alive"
- type = "http"
- path = "/logsview"
- interval = "10s"
- timeout = "1s"
- }
- check_restart {
- limit = 2
- grace = "90s"
- ignore_warnings = false
- }
- }
- }
-
- }
-
-}
diff --git a/deploy/nomad_jobs/asapo-mongo.nmd.in b/deploy/nomad_jobs/asapo-mongo.nmd.in
deleted file mode 100644
index be05168e3..000000000
--- a/deploy/nomad_jobs/asapo-mongo.nmd.in
+++ /dev/null
@@ -1,59 +0,0 @@
-job "asapo-mongo" {
- datacenters = ["dc1"]
-
- update {
- max_parallel = 1
- min_healthy_time = "10s"
- healthy_deadline = "3m"
- auto_revert = false
- }
-
- group "mongo" {
- count = 1
-
- restart {
- attempts = 2
- interval = "3m"
- delay = "15s"
- mode = "delay"
- }
-
- task "mongo" {
- driver = "docker"
-
- config {
- network_mode = "host"
- image = "mongo:4.0.0"
- volumes = ["/${meta.shared_storage}/mongodb:/data/db"]
- }
-
- resources {
- cpu = 1500
- memory = 12560
- network {
- port "mongo" {
- static = 27017
- }
- }
- }
-
- service {
- port = "mongo"
- name = "mongo"
- check {
- type = "script"
- name = "alive"
- command = "mongo"
- args = ["--eval","db.version()"]
- interval = "10s"
- timeout = "5s"
- }
- check_restart {
- limit = 2
- grace = "90s"
- ignore_warnings = false
- }
- }
- }
- }
-}
diff --git a/deploy/nomad_jobs/asapo-nginx.nmd.in b/deploy/nomad_jobs/asapo-nginx.nmd.in
deleted file mode 100644
index b9455b414..000000000
--- a/deploy/nomad_jobs/asapo-nginx.nmd.in
+++ /dev/null
@@ -1,70 +0,0 @@
-job "asapo-nginx" {
- datacenters = ["dc1"]
-
- type = "system"
-
-# update {
-# max_parallel = 1
-# min_healthy_time = "10s"
-# healthy_deadline = "3m"
-# auto_revert = false
-# }
-
- group "nginx" {
- count = 1
-
- restart {
- attempts = 2
- interval = "3m"
- delay = "15s"
- mode = "delay"
- }
-
- task "nginx" {
- driver = "docker"
-
- config {
- network_mode = "host"
- image = "nginx:1.14"
- volumes = ["local/nginx.conf:/etc/nginx/nginx.conf"]
- }
-
- resources {
- cpu = 500
- memory = 256
- network {
- mbits = 10
- port "nginx" {
- static = 8400
- }
- }
- }
-
- service {
- port = "nginx"
- name = "nginx"
- check {
- name = "alive"
- type = "http"
- path = "/nginx-health"
- timeout = "2s"
- interval = "10s"
- }
-
- check_restart {
- limit = 2
- grace = "15s"
- ignore_warnings = false
- }
- }
-
- template {
- source = "@NOMAD_INSTALL@/nginx.conf.tpl"
- destination = "local/nginx.conf"
- change_mode = "restart"
- }
-
-
- }
- }
-}
diff --git a/deploy/nomad_jobs/asapo-perfmetrics.nmd.in b/deploy/nomad_jobs/asapo-perfmetrics.nmd.in
deleted file mode 100644
index bb8db1b2b..000000000
--- a/deploy/nomad_jobs/asapo-perfmetrics.nmd.in
+++ /dev/null
@@ -1,108 +0,0 @@
-job "asapo-perfmetrics" {
- datacenters = ["dc1"]
-
-# update {
-# max_parallel = 1
-# min_healthy_time = "10s"
-# healthy_deadline = "3m"
-# auto_revert = false
-# }
-
- group "perfmetrics" {
- count = 1
- restart {
- attempts = 2
- interval = "3m"
- delay = "15s"
- mode = "delay"
- }
-
- task "influxdb" {
- driver = "docker"
-
- config {
- dns_servers = ["127.0.0.1"]
- network_mode = "host"
- image = "influxdb"
- volumes = ["/${meta.shared_storage}/influxdb:/var/lib/influxdb"]
- }
-
- resources {
- cpu = 1500
- memory = 32000
- network {
- mbits = 10
- port "influxdb" {
- static = 8086
- }
- }
- }
-
- service {
- port = "influxdb"
- name = "influxdb"
- check {
- name = "alive"
- type = "http"
- path = "/ping"
- interval = "10s"
- timeout = "1s"
- }
- check_restart {
- limit = 2
- grace = "90s"
- ignore_warnings = false
- }
- }
-
- } #influxdb
-
-
- task "grafana" {
- driver = "docker"
-
- env {
- GF_SERVER_DOMAIN = "${attr.unique.hostname}"
- GF_SERVER_ROOT_URL = "%(protocol)s://%(domain)s/performance/"
- }
-
- config {
- dns_servers = ["127.0.0.1"]
- network_mode = "host"
- image = "grafana/grafana"
- volumes = ["/${meta.shared_storage}/grafana:/var/lib/grafana"]
- }
-
- resources {
- cpu = 1500
- memory = 2560
- network {
- mbits = 10
- port "grafana" {
- static = 3000
- }
- }
- }
-
- service {
- port = "grafana"
- name = "grafana"
- check {
- name = "alive"
- type = "http"
- path = "/api/health"
- interval = "10s"
- timeout = "1s"
- }
- check_restart {
- limit = 2
- grace = "90s"
- ignore_warnings = false
- }
- }
-
- } #grafana
-
-
- }
-}
diff --git a/deploy/nomad_jobs/asapo-receivers.nmd.in b/deploy/nomad_jobs/asapo-receivers.nmd.in
deleted file mode 100644
index 4af7a29e6..000000000
--- a/deploy/nomad_jobs/asapo-receivers.nmd.in
+++ /dev/null
@@ -1,74 +0,0 @@
-job "asapo-receivers" {
- datacenters = ["dc1"]
-
- update {
- max_parallel = 1
- min_healthy_time = "10s"
- healthy_deadline = "3m"
- auto_revert = false
- }
-
- group "receivers" {
- count = 1
-
- restart {
- attempts = 2
- interval = "3m"
- delay = "15s"
- mode = "fail"
- }
-
- task "receivers" {
- driver = "docker"
-
- config {
- network_mode = "host"
- dns_servers = ["127.0.0.1"]
- image = "yakser/asapo-receiver-dev:@ASAPO_VERSION@"
- force_pull = true
- volumes = ["local/config.json:/var/lib/receiver/config.json",
- "/bldocuments/support/asapo/data:/var/lib/receiver/data"]
- logging {
- type = "fluentd"
- config {
- fluentd-address = "localhost:9881"
- tag = "asapo.docker"
- }
- }
- }
-
- resources {
- network {
- port "recv" {}
- port "recv_ds" {}
- }
- memory = 40000
- }
-
- service {
- name = "asapo-receiver"
- port = "recv"
- check {
- name = "asapo-receiver-alive"
- type = "script"
- command = "/bin/ps"
- args = ["-fC","receiver"]
- interval = "10s"
- timeout = "2s"
- }
- check_restart {
- limit = 2
- grace = "15s"
- ignore_warnings = false
- }
- }
-
- template {
- source = "@NOMAD_INSTALL@/receiver.json.tpl"
- destination = "local/config.json"
- change_mode = "restart"
- }
- } #task receivers
- }
-}
-
diff --git a/deploy/nomad_jobs/asapo-services.nmd.in b/deploy/nomad_jobs/asapo-services.nmd.in
deleted file mode 100644
index fb685e3a7..000000000
--- a/deploy/nomad_jobs/asapo-services.nmd.in
+++ /dev/null
@@ -1,128 +0,0 @@
-job "asapo-services" {
- datacenters = ["dc1"]
-
- type = "service"
-
- group "asapo-authorizer" {
- count = 1
-
- task "asapo-authorizer" {
- driver = "docker"
-
- config {
- network_mode = "host"
- dns_servers = ["127.0.0.1"]
- image = "yakser/asapo-authorizer-dev:@ASAPO_VERSION@"
- force_pull = true
- volumes = ["local/config.json:/var/lib/authorizer/config.json",
- "/bldocuments/support/asapo/beamtime_beamline_mapping.txt:/var/lib/authorizer/beamtime_beamline_mapping.txt",
- "/bldocuments/support/asapo/ip_beamtime_mapping:/var/lib/authorizer/ip_beamtime_mapping"]
- logging {
- type = "fluentd"
- config {
- fluentd-address = "localhost:9881"
- fluentd-async-connect = true
- tag = "asapo.docker"
- }
- }
- }
-
- resources {
- cpu = 500 # 500 MHz
- memory = 256 # 256MB
- network {
- port "authorizer" {
- static = "5007"
- }
- }
- }
-
- service {
- name = "asapo-authorizer"
- port = "authorizer"
- check {
- name = "alive"
- type = "http"
- path = "/health-check"
- interval = "10s"
- timeout = "2s"
- initial_status = "passing"
- }
- check_restart {
- limit = 2
- grace = "15s"
- ignore_warnings = false
- }
- }
-
- template {
- source = "@NOMAD_INSTALL@/authorizer.json.tpl"
- destination = "local/config.json"
- change_mode = "restart"
- }
- template {
- source = "@NOMAD_INSTALL@/auth_secret.key"
- destination = "secrets/secret.key"
- change_mode = "restart"
- }
- }
- } #authorizer
- group "asapo-discovery" {
- count = 1
-
- task "asapo-discovery" {
- driver = "docker"
-
- config {
- network_mode = "host"
- dns_servers = ["127.0.0.1"]
- image = "yakser/asapo-discovery-dev:@ASAPO_VERSION@"
- force_pull = true
- volumes = ["local/config.json:/var/lib/discovery/config.json"]
- logging {
- type = "fluentd"
- config {
- fluentd-address = "localhost:9881"
- fluentd-async-connect = true
- tag = "asapo.docker"
- }
- }
- }
-
- resources {
- cpu = 500 # 500 MHz
- memory = 256 # 256MB
- network {
- port "discovery" {
- static = "5006"
- }
- }
- }
-
- service {
- name = "asapo-discovery"
- port = "discovery"
- check {
- name = "alive"
- type = "http"
- path = "/receivers"
- interval = "10s"
- timeout = "2s"
- initial_status = "passing"
- }
- check_restart {
- limit = 2
- grace = "15s"
- ignore_warnings = false
- }
-
- }
-
- template {
- source = "@NOMAD_INSTALL@/discovery.json.tpl"
- destination = "local/config.json"
- change_mode = "restart"
- }
- }
- }
-}
diff --git a/deploy/nomad_jobs/authorizer.json.tpl b/deploy/nomad_jobs/authorizer.json.tpl
deleted file mode 100644
index 838627963..000000000
--- a/deploy/nomad_jobs/authorizer.json.tpl
+++ /dev/null
@@ -1,12 +0,0 @@
-{
- "Port": {{ env "NOMAD_PORT_authorizer" }},
- "LogLevel":"debug",
- "AlwaysAllowedBeamtimes":[{"BeamtimeId":"asapo_test","Beamline":"test"},
- {"BeamtimeId":"asapo_test1","Beamline":"test1"},
- {"BeamtimeId":"asapo_test2","Beamline":"test2"}],
- "BeamtimeBeamlineMappingFile":"//var//lib//authorizer//beamtime_beamline_mapping.txt",
- "IpBeamlineMappingFolder":"//var//lib//authorizer//ip_beamtime_mapping",
- "SecretFile":"/secrets/secret.key"
-}
-
-
diff --git a/deploy/nomad_jobs/broker.json.tpl b/deploy/nomad_jobs/broker.json.tpl
deleted file mode 100644
index 88f2df6be..000000000
--- a/deploy/nomad_jobs/broker.json.tpl
+++ /dev/null
@@ -1,9 +0,0 @@
-{
- "DatabaseServer":"auto",
- "DiscoveryServer": "localhost:8400/discovery",
- "PerformanceDbServer":"localhost:8400/influxdb",
- "PerformanceDbName": "asapo_brokers",
- "port":{{ env "NOMAD_PORT_broker" }},
- "LogLevel":"info",
- "SecretFile":"/secrets/secret.key"
-}
\ No newline at end of file
diff --git a/deploy/nomad_jobs/copy.sh.in b/deploy/nomad_jobs/copy.sh.in
deleted file mode 100755
index d6809604a..000000000
--- a/deploy/nomad_jobs/copy.sh.in
+++ /dev/null
@@ -1,3 +0,0 @@
-#!/usr/bin/env bash
-
-scp * psana002:@NOMAD_INSTALL@/
diff --git a/deploy/nomad_jobs/discovery.json.tpl b/deploy/nomad_jobs/discovery.json.tpl
deleted file mode 100644
index 0dc045609..000000000
--- a/deploy/nomad_jobs/discovery.json.tpl
+++ /dev/null
@@ -1,11 +0,0 @@
-{
- "Mode": "consul",
- "Receiver": {
- "MaxConnections": 32,
- "UseIBAddress": {{ keyOrDefault "use_ib_for_receiver" "false" }}
- },
- "Port": {{ env "NOMAD_PORT_discovery" }},
- "LogLevel": "{{ keyOrDefault "log_level" "info" }}"
-}
-
-
diff --git a/deploy/nomad_jobs/fluentd.conf b/deploy/nomad_jobs/fluentd.conf
deleted file mode 100644
index 948c5109d..000000000
--- a/deploy/nomad_jobs/fluentd.conf
+++ /dev/null
@@ -1,55 +0,0 @@
-<source>
- @type forward
- port 24224
- source_hostname_key source_addr
- bind 0.0.0.0
-</source>
-
-<source>
- @type http
- port 9880
- bind 0.0.0.0
- add_remote_addr true
- format json
- time_format %Y-%m-%d %H:%M:%S.%N
-</source>
-
-<filter asapo.docker>
- @type parser
- key_name log
- format json
- time_format %Y-%m-%d %H:%M:%S.%N
- reserve_data true
-</filter>
-
-<filter asapo.docker>
- @type record_transformer
- enable_ruby
- remove_keys ["log","container_id","container_name"]
- <record>
- source_addr ${record["source_addr"].split('.')[0]}
- </record>
-</filter>
-
-<match asapo.**>
-@type copy
-<store>
- @type elasticsearch
- hosts localhost:8400/elasticsearch
- flush_interval 5s
- logstash_format true
- time_key_format %Y-%m-%dT%H:%M:%S.%N
- time_key time
- time_key_exclude_timestamp true
- buffer_type memory
- flush_interval 1s
- </store>
- <store>
- @type file
- flush_interval 1s
- append true
- buffer_type memory
- path /shared/asapo-logs
- </store>
-</match>
-
diff --git a/deploy/nomad_jobs/init_influx.sh b/deploy/nomad_jobs/init_influx.sh
deleted file mode 100644
index 0319c4c4f..000000000
--- a/deploy/nomad_jobs/init_influx.sh
+++ /dev/null
@@ -1,10 +0,0 @@
-#!/usr/bin/env bash
-
-influx=`dig +short @127.0.0.1 influxdb.service.asapo | head -1`
-
-databases="asapo_receivers asapo_brokers"
-
-for database in $databases
-do
- curl -i -XPOST http://${influx}:8086/query --data-urlencode "q=CREATE DATABASE $database"
-done
\ No newline at end of file
diff --git a/deploy/nomad_jobs/kibana.yml b/deploy/nomad_jobs/kibana.yml
deleted file mode 100644
index 10675706c..000000000
--- a/deploy/nomad_jobs/kibana.yml
+++ /dev/null
@@ -1,6 +0,0 @@
-elasticsearch:
- url: "http://localhost:8400/elasticsearch"
-server:
- basePath: "/logsview"
- rewriteBasePath: true
- host: "0.0.0.0"
diff --git a/deploy/nomad_jobs/nginx.conf.tpl b/deploy/nomad_jobs/nginx.conf.tpl
deleted file mode 100644
index 20dccdcd4..000000000
--- a/deploy/nomad_jobs/nginx.conf.tpl
+++ /dev/null
@@ -1,85 +0,0 @@
-worker_processes 1;
-
-events {
- worker_connections 1024;
-}
-
-http {
-# include mime.types;
-# default_type application/octet-stream;
-
-# sendfile on;
-# tcp_nopush on;
-
-# keepalive_timeout 0;
-# keepalive_timeout 65;
-
- resolver 127.0.0.1:53 valid=1s;
- server {
- listen {{ env "NOMAD_PORT_nginx" }};
- set $discovery_endpoint asapo-discovery.service.asapo;
- set $authorizer_endpoint asapo-authorizer.service.asapo;
- set $fluentd_endpoint fluentd.service.asapo;
- set $kibana_endpoint kibana.service.asapo;
- set $grafana_endpoint grafana.service.asapo;
- set $influxdb_endpoint influxdb.service.asapo;
- set $elasticsearch_endpoint elasticsearch.service.asapo;
-
- location /influxdb/ {
- rewrite ^/influxdb(/.*) $1 break;
- proxy_pass http://$influxdb_endpoint:8086$uri$is_args$args;
- }
-
- location /elasticsearch/ {
- rewrite ^/elasticsearch(/.*) $1 break;
- proxy_pass http://$elasticsearch_endpoint:9200$uri$is_args$args;
- }
-
- location /discovery/ {
- rewrite ^/discovery(/.*) $1 break;
- proxy_pass http://$discovery_endpoint:5006$uri$is_args$args;
- }
-
- location /logs/ {
- rewrite ^/logs(/.*) $1 break;
- proxy_pass http://$fluentd_endpoint:9880$uri$is_args$args;
- }
-
- location /logsview/ {
- proxy_pass http://$kibana_endpoint:5601$uri$is_args$args;
- proxy_set_header X-Real-IP $remote_addr;
- proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
- proxy_set_header Host $http_host;
- }
-
- location /performance/ {
- rewrite ^/performance(/.*) $1 break;
- proxy_pass http://$grafana_endpoint:3000$uri$is_args$args;
- }
-
- location /authorizer/ {
- rewrite ^/authorizer(/.*) $1 break;
- proxy_pass http://$authorizer_endpoint:5007$uri$is_args$args;
- }
-
- location /nginx-health {
- return 200 "healthy\n";
- }
- }
-}
-
-stream {
- resolver 127.0.0.1:53 valid=1s;
-
- map $remote_addr $upstream {
- default fluentd.service.asapo;
- }
-
-
- server {
- listen 9881;
- proxy_pass $upstream:24224;
- }
-}
-
-
diff --git a/deploy/nomad_jobs/receiver.json.tpl b/deploy/nomad_jobs/receiver.json.tpl
deleted file mode 100644
index a8c1938ef..000000000
--- a/deploy/nomad_jobs/receiver.json.tpl
+++ /dev/null
@@ -1,25 +0,0 @@
-{
- "AdvertiseIP": "127.0.0.1",
- "PerformanceDbServer":"localhost:8400/influxdb",
- "PerformanceDbName": "asapo_receivers",
- "DatabaseServer":"auto",
- "DiscoveryServer": "localhost:8400/discovery",
- "AuthorizationServer": "localhost:8400/authorizer",
- "AuthorizationInterval": 10000,
- "ListenPort": {{ env "NOMAD_PORT_recv" }},
- "DataServer": {
- "NThreads": 2,
- "ListenPort": {{ env "NOMAD_PORT_recv_ds" }}
- },
- "DataCache": {
- "Use": true,
- "SizeGB": 30,
- "ReservedShare": 10
- },
- "Tag": "{{ env "NOMAD_ADDR_recv" }}",
- "WriteToDisk":true,
- "ReceiveToDiskThresholdMB":50,
- "WriteToDb":true,
- "LogLevel": "{{ keyOrDefault "receiver_log_level" "info" }}",
- "RootFolder" : "/var/lib/receiver/data"
-}
diff --git a/deploy/nomad_jobs/start_asapo.sh b/deploy/nomad_jobs/start_asapo.sh
deleted file mode 100644
index 59a12f2b1..000000000
--- a/deploy/nomad_jobs/start_asapo.sh
+++ /dev/null
@@ -1,9 +0,0 @@
-#!/usr/bin/env bash
-
-nomad run asapo-nginx.nmd
-nomad run asapo-logging.nmd
-nomad run asapo-mongo.nmd
-nomad run asapo-brokers.nmd
-nomad run asapo-services.nmd
-nomad run asapo-perfmetrics.nmd
-nomad run asapo-receivers.nmd
diff --git a/deploy/nomad_jobs/stop_asapo.sh b/deploy/nomad_jobs/stop_asapo.sh
deleted file mode 100644
index 9ede6dd7d..000000000
--- a/deploy/nomad_jobs/stop_asapo.sh
+++ /dev/null
@@ -1,9 +0,0 @@
-#!/usr/bin/env bash
-
-nomad stop asapo-nginx
-nomad stop asapo-logging
-nomad stop asapo-mongo
-nomad stop asapo-services
-nomad stop asapo-perfmetrics
-nomad stop asapo-receivers
-nomad stop asapo-brokers
--
GitLab