update deploy scripts

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

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})
-

deploy/asapo/asap3.tfvars

+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

deploy/asapo/copy_asap3.sh.in

+#!/usr/bin/env bash
+
+scp scripts/* psana002:@NOMAD_INSTALL@/terraform_scripts/
+scp asap3.tfvars psana002:@NOMAD_INSTALL@/terraform_scripts/

deploy/docker/cluster/scripts/asapo-brokers.nmd.tpl → 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}"

deploy/docker/cluster/scripts/asapo-logging.nmd.tpl → 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}"

deploy/docker/cluster/scripts/asapo-mongo.nmd.tpl → 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}"

deploy/docker/cluster/scripts/asapo-nginx.nmd.tpl → 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}"