From 1cedd446bbda7ffc10bfe5028a91024502f7f15c Mon Sep 17 00:00:00 2001 From: Stanislav Bogatyrev Date: Fri, 3 Feb 2023 18:56:08 +0300 Subject: [PATCH] [#1] Fix sample configs - Update sample configs to match unit tests - Remove Docker container for N3 testnet Will return with updates when FrostFS enters N3 Signed-off-by: Stanislav Bogatyrev --- config/mainnet/config.yml | 16 ++++++++-------- config/testnet/config.yml | 16 ++++++++-------- config/testnet/docker-compose.yml | 31 ------------------------------ config/testnet/node_config.env | 32 ------------------------------- config/testnet/prometheus.yml | 13 ------------- 5 files changed, 16 insertions(+), 92 deletions(-) delete mode 100644 config/testnet/docker-compose.yml delete mode 100644 config/testnet/node_config.env delete mode 100644 config/testnet/prometheus.yml diff --git a/config/mainnet/config.yml b/config/mainnet/config.yml index 71b601577..2b240e0b2 100644 --- a/config/mainnet/config.yml +++ b/config/mainnet/config.yml @@ -7,7 +7,7 @@ node: - attribute_0: UN-LOCODE: attribute_1: Price:100000 - attribute_2: User-Agent:NeoFS\/0.27 + attribute_2: User-Agent:FrostFS\/0.9999 grpc: num: 1 @@ -55,13 +55,13 @@ object: morph: rpc_endpoint: - - wss://rpc1.morph.fs.neo.org:40341/ws - - wss://rpc2.morph.fs.neo.org:40341/ws - - wss://rpc3.morph.fs.neo.org:40341/ws - - wss://rpc4.morph.fs.neo.org:40341/ws - - wss://rpc5.morph.fs.neo.org:40341/ws - - wss://rpc6.morph.fs.neo.org:40341/ws - - wss://rpc7.morph.fs.neo.org:40341/ws + - wss://rpc1.morph.frostfs.info:40341/ws + - wss://rpc2.morph.frostfs.info:40341/ws + - wss://rpc3.morph.frostfs.info:40341/ws + - wss://rpc4.morph.frostfs.info:40341/ws + - wss://rpc5.morph.frostfs.info:40341/ws + - wss://rpc6.morph.frostfs.info:40341/ws + - wss://rpc7.morph.frostfs.info:40341/ws dial_timeout: 20s contracts: diff --git a/config/testnet/config.yml b/config/testnet/config.yml index 55e1997bf..416ba35e4 100644 --- a/config/testnet/config.yml +++ b/config/testnet/config.yml @@ -3,13 +3,13 @@ logger: morph: rpc_endpoint: - - wss://rpc01.morph.testnet.fs.neo.org:51331/ws - - wss://rpc02.morph.testnet.fs.neo.org:51331/ws - - wss://rpc03.morph.testnet.fs.neo.org:51331/ws - - wss://rpc04.morph.testnet.fs.neo.org:51331/ws - - wss://rpc05.morph.testnet.fs.neo.org:51331/ws - - wss://rpc06.morph.testnet.fs.neo.org:51331/ws - - wss://rpc07.morph.testnet.fs.neo.org:51331/ws + - wss://rpc01.morph.testnet.frostfs.info:51331/ws + - wss://rpc02.morph.testnet.frostfs.info:51331/ws + - wss://rpc03.morph.testnet.frostfs.info:51331/ws + - wss://rpc04.morph.testnet.frostfs.info:51331/ws + - wss://rpc05.morph.testnet.frostfs.info:51331/ws + - wss://rpc06.morph.testnet.frostfs.info:51331/ws + - wss://rpc07.morph.testnet.frostfs.info:51331/ws dial_timeout: 20s contracts: @@ -21,7 +21,7 @@ contracts: node: key: /node.key attribute_0: Deployed:SelfHosted - attribute_1: User-Agent:NeoFS\/0.27 + attribute_1: User-Agent:FrostFS\/0.9999 prometheus: enabled: true diff --git a/config/testnet/docker-compose.yml b/config/testnet/docker-compose.yml deleted file mode 100644 index 7e0feed47..000000000 --- a/config/testnet/docker-compose.yml +++ /dev/null @@ -1,31 +0,0 @@ ---- - -version: "2.4" -services: - storage01: - image: nspccdev/neofs-storage-testnet:0.27.7 - container_name: frostfs-testnet - env_file: node_config.env - network_mode: host - restart: always - volumes: - - frostfs_storage:/storage - - :/node.key - stop_signal: SIGINT - - vmagent: - image: victoriametrics/vmagent:v1.61.0 - container_name: vmagent - depends_on: - - storage01 - env_file: node_config.env - command: - - '-promscrape.config=/configs/prometheus.yml' - - '-remoteWrite.url=https://collector.fs.neo.org/api/v1/write' - network_mode: host - restart: always - volumes: - - ./prometheus.yml:/configs/prometheus.yml - -volumes: - frostfs_storage: diff --git a/config/testnet/node_config.env b/config/testnet/node_config.env deleted file mode 100644 index 1d274fc6f..000000000 --- a/config/testnet/node_config.env +++ /dev/null @@ -1,32 +0,0 @@ -# - -# Specify your public IP address or domain name with the open port -# in NODE_ADDRESSES and GRPC_0_ENDPOINT -# By default keep these addresses the same. - -# This is used for the public announcement in the network map -# -#NEOFS_NODE_ADDRESSES=1.1.1.1:36512 -NEOFS_NODE_ADDRESSES= - -# This is used to open the connection listening socket(s) on your machine -# -#NEOFS_GRPC_0_ENDPOINT=1.1.1.1:36512 -NEOFS_GRPC_0_ENDPOINT= -NEOFS_GRPC_NUM=1 - -# Specify control service endpoint for node administration. -# It must be different from connection port. -# Keep control service endpoint private with firewall rules or use localhost. -NEOFS_CONTROL_GRPC_ENDPOINT=localhost:30512 - - -#https://unece.org/trade/cefact/unlocode-code-list-country-and-territory -# Find suitable LOCODE (from the link above) for your storage node. -# -#NEOFS_NODE_ATTRIBUTE_2=UN-LOCODE: -#NEOFS_NODE_ATTRIBUTE_2=UN-LOCODE:RU LED -NEOFS_NODE_ATTRIBUTE_2= - - -NEOFS_NODE_ATTRIBUTE_3=Price:100000 diff --git a/config/testnet/prometheus.yml b/config/testnet/prometheus.yml deleted file mode 100644 index ddbc03042..000000000 --- a/config/testnet/prometheus.yml +++ /dev/null @@ -1,13 +0,0 @@ -global: - scrape_interval: 15s - external_labels: - monitor: 'user_metrics' - -scrape_configs: - - job_name: 'frostfs-node-user' - scrape_interval: 5s - static_configs: - - targets: ['localhost:9090'] - relabel_configs: - - target_label: 'instance' - replacement: "%{NEOFS_NODE_ADDRESS}"