Merge pull request #671 from cndolo/fix/logging-docs

pinheadmz · web-flow · commit 0287fdfda44e · 2024-12-06T10:39:53.000-05:00
log correct number of outbound connections
diff --git a/docs/logging_monitoring.md b/docs/logging_monitoring.md
@@ -96,7 +96,7 @@ For example, the default metrics listed above would be explicitly configured as
 nodes:
   - name: tank-0000
     metricsExport: true
-    metrics: blocks=getblockcount() inbounds=getnetworkinfo()["connections_in"] outbounds=getnetworkinfo()["connections_in"] mempool_size=getmempoolinfo()["size"]
+    metrics: blocks=getblockcount() inbounds=getnetworkinfo()["connections_in"] outbounds=getnetworkinfo()["connections_out"] mempool_size=getmempoolinfo()["size"]
 ```
 
 The data can be retrieved directly from the Prometheus exporter container in the tank pod via port `9332`, example:
@@ -108,7 +108,7 @@ blocks 704.0
 # HELP inbounds getnetworkinfo()["connections_in"]
 # TYPE inbounds gauge
 inbounds 0.0
-# HELP outbounds getnetworkinfo()["connections_in"]
+# HELP outbounds getnetworkinfo()["connections_out"]
 # TYPE outbounds gauge
 outbounds 0.0
 # HELP mempool_size getmempoolinfo()["size"]
diff --git a/resources/images/exporter/bitcoin-exporter.py b/resources/images/exporter/bitcoin-exporter.py
@@ -28,7 +28,7 @@ def auth_proxy_request(self, method, path, postdata):
 # label=method(params)[return object key][...]
 METRICS = os.environ.get(
     "METRICS",
-    'blocks=getblockcount() inbounds=getnetworkinfo()["connections_in"] outbounds=getnetworkinfo()["connections_in"] mempool_size=getmempoolinfo()["size"]',
+    'blocks=getblockcount() inbounds=getnetworkinfo()["connections_in"] outbounds=getnetworkinfo()["connections_out"] mempool_size=getmempoolinfo()["size"]',
 )
 
 # Set up bitcoind RPC client

Original file line number	Diff line number	Diff line change
`@@ -28,7 +28,7 @@ def auth_proxy_request(self, method, path, postdata):`
`28`	`28`	`# label=method(params)[return object key][...]`
`29`	`29`	`METRICS = os.environ.get(`
`30`	`30`	`"METRICS",`
`31`		`- 'blocks=getblockcount() inbounds=getnetworkinfo()["connections_in"] outbounds=getnetworkinfo()["connections_in"] mempool_size=getmempoolinfo()["size"]',`
	`31`	`+ 'blocks=getblockcount() inbounds=getnetworkinfo()["connections_in"] outbounds=getnetworkinfo()["connections_out"] mempool_size=getmempoolinfo()["size"]',`
`32`	`32`	`)`
`33`	`33`
`34`	`34`	`# Set up bitcoind RPC client`