Merge branch 'feature_ASAPO-150-asapo-status-monitoring' into doc_update

3d_party/mongoose/install.sh

+wget https://raw.githubusercontent.com/cesanta/mongoose/7.4/mongoose.c
+wget https://raw.githubusercontent.com/cesanta/mongoose/7.4/mongoose.h
\ No newline at end of file

broker/src/asapo_broker/go.mod

@@ -9,6 +9,7 @@ require (
 	github.com/blastrain/vitess-sqlparser v0.0.0-20201030050434-a139afbb1aba
 	github.com/gorilla/mux v1.8.0
 	github.com/influxdata/influxdb1-client v0.0.0-20200827194710-b269163b24ab
+	github.com/prometheus/client_golang v1.11.0
 	github.com/rs/xid v1.2.1
 	github.com/stretchr/testify v1.7.0
 	go.mongodb.org/mongo-driver v1.5.3

broker/src/asapo_broker/server/server_nottested.go

@@ -6,6 +6,7 @@ import (
 	log "asapo_common/logger"
 	"asapo_common/utils"
 	"errors"
+	"github.com/prometheus/client_golang/prometheus/promhttp"
 	"net/http"
 	_ "net/http/pprof"
 	"strconv"
@@ -24,6 +25,8 @@ func Start() {
 	}
 	mux := utils.NewRouter(listRoutes)
 	mux.PathPrefix("/debug/pprof/").Handler(http.DefaultServeMux)
+	mux.PathPrefix("/metrics").Handler(promhttp.Handler())
+
 	log.Info("Listening on port: " + strconv.Itoa(settings.Port))
 	log.Fatal(http.ListenAndServe(":"+strconv.Itoa(settings.Port), http.HandlerFunc(mux.ServeHTTP)))
 }

config/nomad/authorizer.nmd.in

@@ -10,7 +10,7 @@ job "authorizer" {
       driver = "raw_exec"
 
       config {
-        command = "@AUTHORIZER_FULLPATH@",
+        command = "@AUTHORIZER_FULLPATH@"
         args =  ["-config","${NOMAD_TASK_DIR}/authorizer.json"]
       }
 

config/nomad/broker.nmd.in

@@ -10,7 +10,7 @@ job "broker" {
       driver = "raw_exec"
 
       config {
-        command = "@BROKER_FULLPATH@",
+        command = "@BROKER_FULLPATH@"
         args =  ["-config","${NOMAD_TASK_DIR}/broker.json"]
       }
 

config/nomad/discovery.nmd.in

@@ -6,22 +6,23 @@ job "discovery" {
   group "group" {
     count = 1
 
+    network {
+      port "discovery" {
+        static = "5006"
+      }
+    }
+
     task "discovery" {
       driver = "raw_exec"
 
       config {
-        command = "@DISCOVERY_FULLPATH@",
+        command = "@DISCOVERY_FULLPATH@"
         args =  ["-config","${NOMAD_TASK_DIR}/discovery.json"]
       }
 
       resources {
         cpu    = 500 # 500 MHz
         memory = 256 # 256MB
-        network {
-          port "discovery" {
-            static = "5006"
-          }
-        }
       }
 
       service {

config/nomad/file_transfer.nmd.in

@@ -10,7 +10,7 @@ job "file_transfer" {
       driver = "raw_exec"
 
       config {
-        command = "@FILE_TRANSFER_FULLPATH@",
+        command = "@FILE_TRANSFER_FULLPATH@"
         args =  ["-config","${NOMAD_TASK_DIR}/file_transfer.json"]
       }
 

config/nomad/nginx.nmd.in

@@ -20,23 +20,24 @@ job "nginx" {
       mode = "fail"
     }
 
+    network {
+      port "nginx" {
+        static = 8400
+      }
+    }
+
+
     task "nginx" {
       driver = "raw_exec"
 
       config {
-        command = "nginx",
+        command = "nginx"
         args =  ["-c","${NOMAD_TASK_DIR}/nginx.conf"]
       }
 
       resources {
         cpu    = 500 # 500 MHz
         memory = 256 # 256MB
-        network {
-          mbits = 10
-          port "nginx" {
-          static = 8400
-          }
-        }
       }
 
       service {
@@ -45,9 +46,9 @@ job "nginx" {
         check {
           name     = "alive"
           type     = "http"
-	  path     = "/nginx-health"
+	      path     = "/nginx-health"
           timeout  = "2s"
-	  interval = "10s"
+	      interval = "10s"
         }
       }
 

config/nomad/nginx_kill_lin.nmd

@@ -9,7 +9,7 @@ job "nginx_kill" {
     task "nginx_kill" {
       driver = "raw_exec"
       config {
-        command = "killall",
+        command = "killall"
         args =  ["nginx"]
       }
    }

config/nomad/nginx_kill_win.nmd

@@ -10,7 +10,7 @@ job "nginx_kill" {
     task "nginx_kill" {
       driver = "raw_exec"
       config {
-        command = "taskkill",
+        command = "taskkill"
         args =  ["/f","/im","nginx.exe"]
       }
    }

config/nomad/receiver_fabric.nmd.in

@@ -10,7 +10,7 @@ job "receiver" {
       driver = "raw_exec"
 
       config {
-        command = "@RECEIVER_DIR@/@RECEIVER_NAME@",
+        command = "@RECEIVER_DIR@/@RECEIVER_NAME@"
         args =  ["${NOMAD_TASK_DIR}/receiver.json"]
       }
 
@@ -20,6 +20,7 @@ job "receiver" {
         network {
           port "recv" {}
           port "recv_ds" {}
+          port "recv_metrics" {}
         }
       }
 

config/nomad/receiver_tcp.nmd.in

@@ -10,7 +10,7 @@ job "receiver" {
       driver = "raw_exec"
 
       config {
-        command = "@RECEIVER_DIR@/@RECEIVER_NAME@",
+        command = "@RECEIVER_DIR@/@RECEIVER_NAME@"
         args =  ["${NOMAD_TASK_DIR}/receiver.json"]
       }
 
@@ -20,6 +20,7 @@ job "receiver" {
         network {
           port "recv" {}
           port "recv_ds" {}
+          port "recv_metrics" {}
         }
       }
 
@@ -29,10 +30,23 @@ job "receiver" {
         check {
           name     = "alive"
           type     = "tcp"
+          port = "recv"
           interval = "10s"
           timeout  = "2s"
           initial_status =   "passing"
         }
+        check {
+          name     = "metrics"
+          type     = "http"
+          port = "recv_metrics"
+          path     = "/metrics"
+          interval = "10s"
+          timeout  = "2s"
+          initial_status =   "passing"
+        }
+        meta {
+          metrics-port = "${NOMAD_PORT_recv_metrics}"
+        }
       }
 
       template {

deploy/asapo_helm_chart/asapo/configs/asapo-receiver.json

@@ -13,6 +13,10 @@
     "ListenPort": {{ .Values.ownServices.receiver.dataServer.port }},
     "NetworkMode": ["tcp"]
   },
+  "Metrics": {
+  "Expose": {{ .Values.ownServices.receiver.metrics.expose },
+  "ListenPort": {{ .Values.ownServices.receiver.metrics.port }}
+  },
   "DataCache": {
     "Use": {{ .Values.ownServices.receiver.dataCache.enable }},
     "SizeGB": {{ .Values.ownServices.receiver.dataCache.sizeGb }},