enabled loki driver(staging)

prometheus https portal

staging FQDN changed, grafana exposed

sourcify-monitoring submodule

staging environment server URL fix

.gitmodules

@@ -1,3 +1,6 @@
 [submodule "h5ai-nginx"]
 	path = h5ai-nginx
 	url = https://github.com/blockchain-it-hr/h5ai-nginx
+[submodule "docker/sourcify-monitoring"]
+	path = docker/sourcify-monitoring
+	url = [email protected]:sourcifyeth/sourcify-monitoring.git

README.md

@@ -54,11 +54,11 @@ watches:
 
 + a website which allows you to submit sources and metadata for a specific contract address manually
   + https://sourcify.dev (Stable)
-  + https://verificationstaging.shardlabs.io (Unstable)
+  + https://sourcify.shardlabs.io (Unstable)
 
 + a public metadata repository that contains uploaded (or discovered) metadata and their sources:
   + https://contractrepo.komputing.org (Stable)
-  + https://contractrepo.verificationstaging.shardlabs.io (Unstable)
+  + https://contractrepo.sourcify.shardlabs.io (Unstable)
 
 ### Getting Metadata
 

environments/.env.latest

@@ -1,5 +1,5 @@
 # Domain and ports config
-FQDN=verificationstaging.shardlabs.io
+FQDN=sourcify.shardlabs.io
 
 # Monitor config
 MONITOR_EXTERNAL_PORT=3000
@@ -12,7 +12,7 @@ UI_PORT=1234
 # Server config
 SERVER_EXTERNAL_PORT=5000
 SERVER_PORT=80
-SERVER_URL=https://server.verificationstaging.shardlabs.io
+SERVER_URL=https://server.sourcify.shardlabs.io
 SOLC_REPO_HOST=/home/sourcify/staging/data/solc-bin/linux-amd64
 SOLC_REPO=/home/data/solc-bin/linux-amd64
 SOLJSON_REPO_HOST=/home/sourcify/staging/data/solc-bin/bin
@@ -26,7 +26,7 @@ LOCALCHAIN_URL=http://localchain:8545
 # Repository config
 REPOSITORY_EXTERNAL_PORT=10000
 REPOSITORY_PORT=80
-REPOSITORY_URL=https://contractrepo.verificationstaging.shardlabs.io
+REPOSITORY_URL=https://contractrepo.sourcify.shardlabs.io
 REPOSITORY_PATH=../../data/repository
 DATABASE_PATH=../../data/database/
 

environments/https-portal.yaml

@@ -12,7 +12,7 @@ services:
       - ui
       - repository
     environment:
-      DOMAINS: 'server.${FQDN} -> http://server-${TAG}:${SERVER_PORT}, ${FQDN} -> http://ui-${TAG}:${UI_PORT}, contractrepo.${FQDN} -> http://repository-${TAG}:${REPOSITORY_PORT}'
+      DOMAINS: 'server.${FQDN} -> http://server-${TAG}:${SERVER_PORT}, ${FQDN} -> http://ui-${TAG}:${UI_PORT}, contractrepo.${FQDN} -> http://repository-${TAG}:${REPOSITORY_PORT}, prometheus.${FQDN} -> http://prometheus:9090, grafana.${FQDN} -> http://grafana:11000, loki.${FQDN} -> http://loki:3100'
       STAGE: 'production'
       FORCE_RENEW: 'false'
     networks:

environments/s3-monitoring.yaml

@@ -1,7 +1,7 @@
-vversion: "3.7"
-  services:
-    s3:
-      logging:
-        driver: loki
-        options:
-          loki-url: ${LOKI_URL}
+version: "3.7"
+services:
+  s3sync:
+    logging:
+      driver: loki
+      options:
+        loki-url: ${LOKI_URL}

scripts/setup.sh

@@ -18,7 +18,7 @@ fi
 if [ "${TAG}" == "stable" ]; then
     export COMPOSE_COMMAND="COMPOSE_PROJECT_NAME=${TAG}_source-verify docker-compose -f ipfs.yaml -f monitor.yaml -f repository.yaml -f s3.yaml -f server.yaml -f ui.yaml "
 elif [ "${TAG}" == "latest" ]; then
-    export COMPOSE_COMMAND="COMPOSE_PROJECT_NAME=${TAG}_source-verify docker-compose -f ipfs.yaml -f monitor.yaml -f repository.yaml -f s3.yaml -f server.yaml -f ui.yaml -f https-portal.yaml"
+    export COMPOSE_COMMAND="COMPOSE_PROJECT_NAME=${TAG}_source-verify docker-compose -f ipfs.yaml -f ipfs-monitoring.yaml -f monitor.yaml -f monitor-monitoring.yaml -f repository.yaml -f repository-monitoring.yaml -f s3.yaml -f s3-monitoring.yaml -f server.yaml -f server-monitoring.yaml -f ui.yaml -f ui-monitoring.yaml -f https-portal.yaml"
 else
     export COMPOSE_COMMAND="COMPOSE_PROJECT_NAME=${TAG}_source-verify docker-compose -f ipfs.yaml -f monitor.yaml -f repository.yaml -f s3.yaml -f server.yaml -f ui.yaml -f localchain.yaml"
 fi
@@ -30,7 +30,7 @@ cd environments
 echo $PWD
 eval ${COMPOSE_COMMAND} pull
 echo $PWD
-eval ${COMPOSE_COMMAND} --compatibility up -d --force-recreate
+eval COMPOSE_HTTP_TIMEOUT=700 ${COMPOSE_COMMAND} --compatibility up -d --force-recreate
 echo $PWD
 cd ..
 ./scripts/clear-repo.sh