- Add grafana metric validation test to logging_test

- Reduced complexity of ln network.yaml config to align with ln_basic_test

Author: macgyver13

docs/logging_monitoring.md

@@ -120,12 +120,11 @@ mempool_size 0.0
 
 Lightning nodes can also be configured to export metrics to prometheus using `lnd-exporter`.
 Example configuration is provided in `test/data/ln/`. Review `node-defauts.yaml` for a typical logging configuration. All default metrics reported to prometheus are prefixed with `lnd_`
-lnd-exporter
 
 [lnd-exporter configuration reference](https://github.com/macgyver13/lnd-exporter/tree/main?tab=readme-ov-file#configuration)
-lnd-exporter assumes same macarroon referenced in ln_framework (can be overridden by env variable)
+lnd-exporter assumes same macaroon referenced in ln_framework (can be overridden by env variable)
 
-**Note: `test/data/ln` takes advantage of **extraContainers** configuration option to add containers to default `lnd/templates/pod`*
+**Note: `test/data/ln` and `test/data/logging` take advantage of **extraContainers** configuration option to add containers to default `lnd/templates/pod`*
 
 ### Grafana
 

test/data/ln/network.yaml

@@ -2,46 +2,15 @@ nodes:
   - name: tank-0000
     addnode:
       - tank-0001
-      - tank-0002
-    lnd:
-      channels:
-        - id:
-            block: 300
-            index: 6
-          target: tank-0001-ln
-          capacity: 100000
-          push_amt: 50000
   - name: tank-0001
     addnode:
-      - tank-0000
-    lnd:
-      channels:
-        - id:
-            block: 300
-            index: 5
-          target: tank-0000-ln
-          capacity: 50000
-          push_amt: 25000
-        - id:
-            block: 300
-            index: 4
-          target: tank-0002-ln
-          capacity: 100000
-          push_amt: 50000
+      - tank-0002
   - name: tank-0002
     addnode:
-      - tank-0001
-    lnd:
-      channels:
-        - id:
-            block: 300
-            index: 2
-          target: tank-0001-ln
-          capacity: 50000
-          push_amt: 25000
+      - tank-0000
   - name: tank-0003
     addnode:
-      - tank-0002
+      - tank-0000
     lnd:
       config: |
         bitcoin.timelockdelta=33
@@ -59,10 +28,10 @@ nodes:
       channels:
         - id:
             block: 300
-            index: 3
+            index: 2
           target: tank-0005-ln
           capacity: 50000
           push_amt: 25000
   - name: tank-0005
     addnode:
-      - tank-0004
+      - tank-0000

test/data/ln/node-defaults.yaml

@@ -1,11 +1,12 @@
+# Enable caddy, collectLogs and metricsExport to activate publish lnd-exporter metrics
 caddy:
-  enabled: true
+  enabled: false
 
 #Core configs
 image:
   repository: bitcoindevproject/bitcoin
   pullPolicy: IfNotPresent
-  tag: '27.0'
+  tag: "27.0"
 collectLogs: false
 metricsExport: false
 

test/data/logging/network.yaml

@@ -11,5 +11,25 @@ nodes:
   - name: tank-0002
     addnode:
       - tank-0000
+    ln:
+      lnd: true
+    lnd:
+      metricsExport: true
+      prometheusMetricsPort: 9332
+      extraContainers:
+        - name: lnd-exporter
+          image: bitdonkey/lnd-exporter:0.1.1
+          imagePullPolicy: IfNotPresent
+          env:
+            - name: ADMIN_MACAROON_HEX
+              value: 0201036c6e6402f801030a1062beabbf2a614b112128afa0c0b4fdd61201301a160a0761646472657373120472656164120577726974651a130a04696e666f120472656164120577726974651a170a08696e766f69636573120472656164120577726974651a210a086d616361726f6f6e120867656e6572617465120472656164120577726974651a160a076d657373616765120472656164120577726974651a170a086f6666636861696e120472656164120577726974651a160a076f6e636861696e120472656164120577726974651a140a057065657273120472656164120577726974651a180a067369676e6572120867656e657261746512047265616400000620b17be53e367290871681055d0de15587f6d1cd47d1248fe2662ae27f62cfbdc6
+            - name: METRICS
+              value: >
+                lnd_block_height=parse("/v1/getinfo","block_height") 
+                lnd_peers=parse("/v1/getinfo","num_peers")
+          ports:
+            - name: prom-metrics
+              containerPort: 9332
+              protocol: TCP
 caddy:
   enabled: true

test/logging_test.py

@@ -94,6 +94,7 @@ def get_five_values_for_metric(metric):
 
         self.wait_for_predicate(lambda: get_five_values_for_metric("blocks"))
         self.wait_for_predicate(lambda: get_five_values_for_metric("txrate"))
+        self.wait_for_predicate(lambda: get_five_values_for_metric("lnd_block_height"))
 
         # Verify default dashboard exists
         dbs = requests.get(f"{self.grafana_url}/api/search").json()