diff --git a/docker-compose.yml b/docker-compose.yml index 1bd3b2b..fc9cbdb 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -12,7 +12,7 @@ services: build: context: shutter args: - UPSTREAM_VERSION: v1.4.2 + UPSTREAM_VERSION: v1.4.4 KEYPER_CONFIG_DIR: /keyper/config SHUTTER_CHAIN_DIR: /chain STAKER_SCRIPTS_VERSION: v0.1.2 diff --git a/package_variants/gnosis/docker-compose.yml b/package_variants/gnosis/docker-compose.yml index db914ee..a58829b 100644 --- a/package_variants/gnosis/docker-compose.yml +++ b/package_variants/gnosis/docker-compose.yml @@ -6,7 +6,7 @@ services: CHAIN_PORT: 27656 KEYPER_PORT: 24003 KEYPER_METRICS_PORT: 9100 - ASSETS_VERSION: shutter-api-gnosis-1002-set1.1.1 + ASSETS_VERSION: shutter-api-gnosis-1002-set1.1.2 ports: - "24003:24003" - "27656:27656" @@ -18,4 +18,4 @@ services: build: args: NETWORK: gnosis - ASSETS_VERSION: shutter-api-gnosis-1002-set1.1.1 + ASSETS_VERSION: shutter-api-gnosis-1002-set1.1.2 \ No newline at end of file diff --git a/shutter/go-shutter-settings/settings/keyper.go b/shutter/go-shutter-settings/settings/keyper.go index 4140938..5d34ce6 100644 --- a/shutter/go-shutter-settings/settings/keyper.go +++ b/shutter/go-shutter-settings/settings/keyper.go @@ -25,10 +25,9 @@ type KeyperConfig struct { EthereumURL string `env:"SHUTTER_NETWORK_NODE_ETHEREUMURL"` } Contracts struct { - KeyperSetManager string `env:"_ASSETS_KEYPER_SET_MANAGER"` - KeyBroadcastContract string `env:"_ASSETS_KEY_BROADCAST_CONTRACT"` - ShutterRegistry string `env:"_ASSETS_SHUTTERREGISTRY"` - ShutterEventTriggerRegistry string `env:"_ASSETS_SHUTTER_EVENT_TRIGGER_REGISTRY"` + KeyperSetManager string `env:"_ASSETS_KEYPER_SET_MANAGER"` + KeyBroadcastContract string `env:"_ASSETS_KEY_BROADCAST_CONTRACT"` + ShutterRegistry string `env:"_ASSETS_SHUTTERREGISTRY"` } } P2P struct { diff --git a/shutter/promtail_config.yaml b/shutter/promtail_config.yaml index 54e83ae..531ef8b 100644 --- a/shutter/promtail_config.yaml +++ b/shutter/promtail_config.yaml @@ -18,7 +18,8 @@ scrape_configs: - localhost labels: job: configure - host: ${KEYPER_NAME} + keyper_name: kpr-${KEYPER_NAME} + compose_project: shutter-api-gnosis.dnp.dappnode.eth __path__: /tmp/configure.log - job_name: keyper pipeline_stages: @@ -29,7 +30,8 @@ scrape_configs: - localhost labels: job: keyper - host: ${KEYPER_NAME} + keyper_name: kpr-${KEYPER_NAME} + compose_project: shutter-api-gnosis.dnp.dappnode.eth __path__: /tmp/keyper.log - job_name: chain pipeline_stages: @@ -40,5 +42,6 @@ scrape_configs: - localhost labels: job: chain - host: ${KEYPER_NAME} - __path__: /tmp/chain.log + keyper_name: kpr-${KEYPER_NAME} + compose_project: shutter-api-gnosis.dnp.dappnode.eth + __path__: /tmp/chain.log \ No newline at end of file