Changes for next Shutter Network release

README.md

@@ -24,7 +24,7 @@ This package includes the following services:
 
   - Uses VictoriaMetrics to send performance metrics to a remote Pushgateway.
 
-  - Configuration is handled through templates in `/config/gnosis/`, and the main config file (`vmagent.yml`) is dynamically generated based on environment variables.
+  - Configuration is handled via the config file `/config/gnosis/vmagent.yml`, placehoders in that file are automatically picked up from the environment by vmagent.
 
 ### Configuration
 

docker-compose.yml

@@ -13,8 +13,8 @@ services:
     build:
       context: shutter
       args:
-        ASSETS_VERSION: shutter-gnosis-1000-set-1v2 # $NETWORK-10*$CHAIN_ID-set-$VERSION
-        UPSTREAM_VERSION: gnosis-v1.2.4b1
+        ASSETS_VERSION: shutter-gnosis-1000-set1.3 # $NETWORK-10*$CHAIN_ID-set-$VERSION
+        UPSTREAM_VERSION: v1.2.5
         KEYPER_CONFIG_DIR: /keyper/config
         SHUTTER_CHAIN_DIR: /chain
         STAKER_SCRIPTS_VERSION: v0.1.0
@@ -31,7 +31,7 @@ services:
     build:
       context: metrics
       args:
-        ASSETS_VERSION: shutter-gnosis-1000-set-1v2 # $NETWORK-10*$CHAIN_ID-set-$VERSION
+        ASSETS_VERSION: shutter-gnosis-1000-set1.3 # $NETWORK-10*$CHAIN_ID-set-$VERSION
     restart: on-failure
     environment:
       SHUTTER_PUSH_METRICS_ENABLED: false

metrics/Dockerfile

@@ -9,7 +9,6 @@ FROM victoriametrics/vmagent:v1.101.0
 ARG NETWORK
 
 ENV ASSETS_DIR=/assets \
-    TEMPLATE_CONFIG_FILE=/config/${NETWORK}/vmagent_template.yml \
     CONFIG_FILE=/config/${NETWORK}/vmagent.yml \
     USER_SETTINGS_FILE=/config/user/settings.env
 

metrics/config/gnosis/vmagent_template.yml → metrics/config/gnosis/vmagent.yml

@@ -6,18 +6,24 @@ scrape_configs:
     static_configs:
       - targets: ["shutter.shutter-gnosis.dappnode:9100"]
         labels:
-          instance: "%{KEYPER_NAME}"
+          instance: "kpr-%{KEYPER_NAME}"
           deployment: "%{_ASSETS_VERSION}"
+          deployment_type: "dappnode"
+          network: "%{_ASSETS_NETWORK}"
   - job_name: 'shuttermint'
     metrics_path: /
     static_configs:
       - targets: ["shutter.shutter-gnosis.dappnode:26660"]
         labels:
-          instance: "%{KEYPER_NAME}"
+          instance: "kpr-%{KEYPER_NAME}"
           deployment: "%{_ASSETS_VERSION}"
+          deployment_type: "dappnode"
+          network: "%{_ASSETS_NETWORK}"
   - job_name: 'vmagent'
     static_configs:
       - targets: ["localhost:8429"]
         labels:
-          instance: "%{KEYPER_NAME}"
-          deployment: "%{_ASSETS_VERSION}"
+          instance: "kpr-%{KEYPER_NAME}"
+          deployment: "%{_ASSETS_VERSION}"
+          deployment_type: "dappnode"
+          network: "%{_ASSETS_NETWORK}"

metrics/entrypoint.sh

@@ -62,11 +62,6 @@ source_user_settings() {
     fi
 }
 
-replace_envs_in_yaml() {
-    echo "[INFO | metrics] Replacing environment variables in the configuration file"
-    sed "s|%{KEYPER_NAME}|$KEYPER_NAME|g; s|%{_ASSETS_VERSION}|$_ASSETS_VERSION|g" "$TEMPLATE_CONFIG_FILE" >"$CONFIG_FILE"
-}
-
 update_user_settings
 
 if [ "${SHUTTER_PUSH_METRICS_ENABLED}" = "false" ]; then
@@ -78,8 +73,6 @@ source_assets_envs
 
 source_user_settings
 
-replace_envs_in_yaml
-
 exec /vmagent-prod \
     -promscrape.config="${CONFIG_FILE}" \
     -remoteWrite.url="${PUSHGATEWAY_URL}" \

shutter/Dockerfile

@@ -6,7 +6,7 @@ FROM ghcr.io/shutter-network/assets:${ASSETS_VERSION} as assets
 RUN rsync -aq --delete /assets-source/ /assets/
 
 ARG UPSTREAM_VERSION
-FROM ghcr.io/shutter-network/rolling-shutter:${UPSTREAM_VERSION}
+FROM ghcr.io/shutter-network/keyper:${UPSTREAM_VERSION}
 
 ARG NETWORK
 ARG KEYPER_CONFIG_DIR