Feature: add promtail service

config.lua

@@ -21,6 +21,15 @@ stdout_logfile=_SITE_ROOT_/../mkagent/logs/monitor_client.log
     ]]
     },
     supervisor = [[
+[program:gateway_promtail]
+command=/bin/bash _SITE_ROOT_/scripts/run loop _service_promtail _SITE_ROOT_ v1
+autostart=true
+autorestart=true
+redirect_stderr=true
+stopasgroup=true
+killasgroup=true
+stopsignal=INT
+stdout_logfile=_SITE_ROOT_/logs/gateway_promtail.log
 ]],
     supervisor1 = [[
 [program:fisherman]

env/env.sh

@@ -0,0 +1,3 @@
+export TYPE=node
+export DOMAIN=massbitroute.net
+export MONITOR_SCHEME=http

env/env.sh~

@@ -0,0 +1,2 @@
+export DOMAIN=massbitroute.com
+export MONITOR_SCHEME=http

etc/_cache_ttl.conf

@@ -0,0 +1,4 @@
+set $api_method '';
+set $api_method_ttl 0;
+access_by_lua_file /massbit/massbitroute/app/src/sites/services/gateway/src/jsonrpc-access.lua;
+add_header X-Accel-Expires $api_method_ttl;

etc/_node_server.conf

@@ -3,3 +3,4 @@ access_by_lua_file /massbit/massbitroute/app/src/sites/services/gateway/src/filt
 include /massbit/massbitroute/app/src/sites/services/gateway/etc/_proxy_server.conf;
 include /massbit/massbitroute/app/src/sites/services/gateway/etc/_provider_server.conf;
 include /massbit/massbitroute/app/src/sites/services/gateway/etc/_cache_server.conf;
+add_header X-Accel-Expires $upstream_http_x_accel_expires;

promtool/config_tmpl.yaml

@@ -0,0 +1,18 @@
+server:
+  http_listen_port: 9080
+  grpc_listen_port: 0
+
+positions:
+  filename: _SITE_ROOT_/data/promtail/positions.yaml
+
+clients:
+  - url: _LOKI_URL_/loki/api/v1/push
+
+scrape_configs:
+- job_name: system
+  static_configs:
+  - targets:
+      - localhost
+    labels:
+      job: varlogs
+      __path__: _LOKI_LOG_/*log

scripts/run

@@ -1,13 +1,15 @@
 #!/bin/bash
 TYPE="gateway"
 SITE_ROOT=$(realpath $(dirname $(realpath $0))/..)
+SITE_ROOT1=$(echo $SITE_ROOT | sed 's/\//\\\//g')
 MBR=$SITE_ROOT/mbr
 mkdir -p $SITE_ROOT
 export DEBIAN_FRONTEND=noninteractive
 export HOME=$SITE_ROOT
 curl="/usr/bin/curl -skSfL"
 diff="diff -s"
 
+source $SITE_ROOT/env/env.sh
 source $SITE_ROOT/scripts/base.sh >/dev/null
 cd $SITE_ROOT
 
@@ -457,6 +459,10 @@ _update_network() {
 
 	return $_reload
 }
+_repo_update() {
+	git -C $service_dir/mkagent pull
+	git -C $mbr_root/gbc pull
+}
 _load_config() {
 	if [ ! -f "$SITE_ROOT/vars/RAW" ]; then
 		$SITE_ROOT/mbr node nodeinfo
@@ -638,17 +644,57 @@ _update_docker() {
 	fi
 }
 
+_update_ssl() {
+	mkdir -p $SITE_ROOT/ssl
+	cd $SITE_ROOT/ssl
+	PORTAL_URL=$(cat $SITE_ROOT/vars/PORTAL_URL)
+	$curl $PORTAL_URL/deploy/_ssl/gateway_ssl.tar.gz -o gateway_ssl.tar.gz
+	tar xvzf gateway_ssl.tar.gz
+	cd -
+}
+_update_tag() {
+	DOMAIN=$(cat $SITE_ROOT/vars/DOMAIN)
+	PORTAL_DOMAIN=portal.$DOMAIN
+	git="git -C $SITE_ROOT"
+	_v=$($git config --get remote.origin.url | awk -F'/' '{print $NF}')
+	tmp=$(mktemp)
+	curl -sfkL http://$PORTAL_DOMAIN/deploy/info/version/$_v >$tmp
+	if [ $? -ne 0 ]; then
+		rm $tmp
+		return 0
+	fi
+
+	_tag=$(cat $tmp)
+
+	rm $tmp
+
+	_my_tag=$($git describe --tags)
+	echo $_my_tag >$SITE_ROOT/logs/tag_current
+	_tag_update=0
+	if [ "$_tag" != "$_my_tag" ]; then
+		$git fetch --all --tags --prune
+		$git checkout $_tag
+		_tag_update=1
+	fi
+
+	return $_tag_update
+
+}
+
 _update() {
 
 	echo "Update"
 	_save_env
 
 	_prepare
 
+	_repo_update
+
 	if [ "$MBR_MODE" == "docker" ]; then
 		_update_docker 2>&1 >>$log_install
 	fi
 
+	_update_ssl
 	_st_update=0
 
 	_load_config
@@ -659,6 +705,11 @@ _update() {
 		_st_update=$_st
 	fi
 
+	_update_tag
+	if [ $_st_update -eq 0 ]; then
+		_st_update=$?
+	fi
+
 	return $_st_update
 }
 
@@ -674,6 +725,19 @@ _monitor() {
 
 }
 
+_service_promtail() {
+	DOMAIN=$(cat $SITE_ROOT/vars/DOMAIN)
+	type=$(cat $SITE_ROOT/vars/TYPE)
+	blockchain=$(cat $SITE_ROOT/vars/BLOCKCHAIN)
+	network=$(cat $SITE_ROOT/vars/NETWORK)
+
+	mkdir -p $SITE_ROOT/data/promtail
+	sed "s/_SITE_ROOT_/$SITE_ROOT1/g" $SITE_ROOT/promtail/config_tmpl.yaml >$SITE_ROOT/promtail/config.yaml
+	sed "s/_LOKI_URL_/http\:\/\/${type}-${blockchain}-${network}.explorer.mbr.$DOMAIN/g" $SITE_ROOT/promtail/config_tmpl.yaml >$SITE_ROOT/promtail/config.yaml
+	sed "s/_LOKI_LOG_/$SITE_ROOT1\/logs\/access/g" $SITE_ROOT/promtail/config_tmpl.yaml >$SITE_ROOT/promtail/config.yaml
+	$PROMTAIL --config.file=$SITE_ROOT/promtail/config.yaml
+}
+
 _run() {
 	rm -rf $SITE_ROOT/tmp/*
 	_save_env

src/filter-jsonrpc-access.lua

@@ -17,7 +17,7 @@ end
 if session_enable then
     if empty(ngx.var.arg_session) then
         ngx.header.location =
-            scheme .. "://session.mbr." .. domain .. "/api/v1?host=" .. ngx.var.host .. "&token=" .. ngx.var.mbr_token
+            "http" .. "://session.mbr." .. domain .. "/api/v1?host=" .. ngx.var.host .. "&token=" .. ngx.var.mbr_token
 
         return ngx.exit(308)
     else
@@ -30,7 +30,7 @@ if session_enable then
         ngx.log(ngx.ERR, "token arg:" .. ngx.var.mbr_token)
         if not token or token ~= ngx.var.mbr_token then
             ngx.header.location =
-                scheme ..
+                "http" ..
                 "://session.mbr." .. domain .. "/api/v1?host=" .. ngx.var.host .. "&token=" .. ngx.var.mbr_token
             return ngx.exit(308)
         end

src/filter-jsonrpc-access_ws.lua

@@ -19,7 +19,7 @@ end
 if session_enable then
     if empty(ngx.var.arg_session) then
         ngx.header.location =
-            scheme .. "://session.mbr." .. domain .. "/api/v1?host=" .. ngx.var.host .. "&token=" .. ngx.var.mbr_token
+            "http" .. "://session.mbr." .. domain .. "/api/v1?host=" .. ngx.var.host .. "&token=" .. ngx.var.mbr_token
 
         return ngx.exit(308)
     else
@@ -32,7 +32,7 @@ if session_enable then
         ngx.log(ngx.ERR, "token arg:" .. ngx.var.mbr_token)
         if not token or token ~= ngx.var.mbr_token then
             ngx.header.location =
-                scheme ..
+                "http" ..
                 "://session.mbr." .. domain .. "/api/v1?host=" .. ngx.var.host .. "&token=" .. ngx.var.mbr_token
             return ngx.exit(308)
         end

src/jsonrpc-access.lua

@@ -1,5 +1,11 @@
 local cjson = require("cjson")
 
+local method_ttl_default = 2
+local method_ttl = {
+    ["eth_getBlockByNumber"] = 6,
+    ["eth_blockNumber"] = 6
+}
+
 local function empty(s)
     return s == nil or s == ""
 end
@@ -32,3 +38,4 @@ if version ~= "2.0" then
 end
 
 ngx.var["api_method"] = method
+ngx.var["api_method_ttl"] = method_ttl[method] or method_ttl_default