Merge branch 'tronprotocol:develop' into develop

Author: FriendlyCM

conf/main_net_config.conf

@@ -180,7 +180,7 @@ node {
   inactiveThreshold = 600 //seconds
 
   p2p {
-    version = 11111 # 11111: mainnet; 20180622: testnet
+    version = 11111 # mainnet:11111; nile testnet:201910292
   }
 
   active = [

conf/private_net_config_others.conf

@@ -51,7 +51,7 @@ storage {
 
 # this part of config is used to node discovery.
 node.discovery = {
-  enable = true  # you should set this entry value with true if you want your node can be discovered by other node.
+  enable = true  # you should set this entry value with true if you want to discover other nodes or be discovered by other nodes.
   persist = true  # this entry is used to determined to whether storing the peers in the database or not.
 }
 
@@ -96,7 +96,7 @@ node {
   isOpenFullTcpDisconnect = true
 
   p2p {
-    version = 1 # 11111: Mainnet; 20180622: Nile testnet; you can set other number when you deploy one private net, but the node must have the same number in some private net.
+    version = 1 # mainnet:11111; nile testnet:201910292; other net: customized, should not be equal to 11111 or 201910292.
   }
 
   active = [

conf/private_net_config_witness1.conf

@@ -51,7 +51,7 @@ storage {
 
 # this part of config is used to node discovery.
 node.discovery = {
-  enable = true  # you should set this entry value with true if you want your node can be discovered by other node.
+  enable = true  # you should set this entry value with true if you want to discover other nodes or be discovered by other nodes.
   persist = true  # this entry is used to determined to whether storing the peers in the database or not.
 }
 
@@ -96,7 +96,7 @@ node {
   isOpenFullTcpDisconnect = true
 
   p2p {
-    version = 1 # 11111: Mainnet; 20180622: Nile testnet; you can set other number when you deploy one private net, but the node must have the same number in some private net.
+    version = 1 # mainnet:11111; nile testnet:201910292; other net: customized, should not be equal to 11111 or 201910292.
   }
 
   active = [

conf/private_net_config_witness2.conf

@@ -51,7 +51,7 @@ storage {
 
 # this part of config is used to node discovery.
 node.discovery = {
-  enable = true  # you should set this entry value with true if you want your node can be discovered by other node.
+  enable = true  # you should set this entry value with true if you want to discover other nodes or be discovered by other nodes.
   persist = true  # this entry is used to determined to whether storing the peers in the database or not.
 }
 
@@ -96,7 +96,7 @@ node {
   isOpenFullTcpDisconnect = true
 
   p2p {
-    version = 1 # 11111: Mainnet; 20180622: Nile testnet; you can set other number when you deploy one private net, but the node must have the same number in some private net.
+    version = 1 # mainnet:11111; nile testnet:201910292; other net: customized, should not be equal to 11111 or 201910292.
   }
 
   active = [

metric_monitor/README.md

@@ -18,7 +18,7 @@ docker-compose -f ./docker-compose/docker-compose-quick-start.yml up -d
 ```
 It will start a TRON FullNode that connects to the Mainnet, along with Prometheus and Grafana services. Note that in [main_net_config.conf](../conf/main_net_config.conf), it contains the configuration below to enable metrics.
 ```
-metrics{
+node.metrics{
   prometheus{
     enable=true
     port="9527"

metric_monitor/docker-compose/node-exporter.yml

@@ -6,7 +6,13 @@ services:
     ports:
       - "9100:9100"  # For metric collection
     volumes:
-      - "./:/host:ro,rslave"
+      - "/proc:/host/proc:ro"
+      - "/sys:/host/sys:ro"
+      - "/:/rootfs:ro"
     command:
-      - "--path.rootfs=/host"
+    - "--path.procfs=/host/proc"
+    - "--path.sysfs=/host/sys"
+    - "--path.rootfs=/rootfs"
+    - "--collector.filesystem.ignored-mount-points=^$"
+    - "--collector.filesystem.ignored-fs-types=^$"
     restart: unless-stopped