Skip to content

Commit d6473fe

Browse files
committed
remove connect_logging and update monitoring docs
1 parent a34db27 commit d6473fe

File tree

3 files changed

+5
-48
lines changed

3 files changed

+5
-48
lines changed

docs/logging_monitoring.md

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -62,10 +62,11 @@ aggregate logs and data from Bitcoin RPC queries into a web-based dashboard.
6262
## Connect to logging dashboard
6363

6464
The logging stack including the user interface web server runs inside the kubernetes cluster.
65-
To access that from a local web browser, you must use kubernetes port-forwarding.
65+
Warnet will forward port `2019` locally from the cluster, and the landing page for all
66+
web based interfaces will be available at `localhost:2019`.
67+
68+
This page can also be opened quickly with the command [`warnet dashboard`](/docs/warnet.md#warnet-dashboard)
6669

67-
Run the script `./resources/scripts/connect_logging.sh` to forward port 3000.
68-
The Grafana dashboard will then be available locally at `localhost:3000`.
6970

7071
### Prometheus
7172

resources/scripts/connect_logging.sh

Lines changed: 0 additions & 17 deletions
This file was deleted.

test/logging_test.py

Lines changed: 1 addition & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,8 @@
11
#!/usr/bin/env python3
22

3-
import logging
43
import os
5-
import threading
64
from datetime import datetime
75
from pathlib import Path
8-
from subprocess import PIPE, Popen
96

107
import requests
118
from test_base import TestBase
@@ -18,39 +15,15 @@ def __init__(self):
1815
super().__init__()
1916
self.network_dir = Path(os.path.dirname(__file__)) / "data" / "logging"
2017
self.scripts_dir = Path(os.path.dirname(__file__)) / ".." / "resources" / "scripts"
21-
self.connect_logging_process = None
22-
self.connect_logging_thread = None
23-
self.connect_logging_logger = logging.getLogger("cnct_log")
2418

2519
def run_test(self):
2620
try:
2721
self.setup_network()
28-
self.start_logging()
22+
self.wait_for_endpoint_ready()
2923
self.test_prometheus_and_grafana()
3024
finally:
31-
if self.connect_logging_process is not None:
32-
self.log.info("Terminating background connect_logging.sh process...")
33-
self.connect_logging_process.terminate()
3425
self.cleanup()
3526

36-
def start_logging(self):
37-
# Stays alive in background
38-
self.connect_logging_process = Popen(
39-
[f"{self.scripts_dir / 'connect_logging.sh'}"],
40-
stdout=PIPE,
41-
stderr=PIPE,
42-
bufsize=1,
43-
universal_newlines=True,
44-
)
45-
self.log.info("connect_logging.sh started...")
46-
self.connect_logging_thread = threading.Thread(
47-
target=self.output_reader,
48-
args=(self.connect_logging_process.stdout, self.connect_logging_logger.info),
49-
)
50-
self.connect_logging_thread.daemon = True
51-
self.connect_logging_thread.start()
52-
self.wait_for_endpoint_ready()
53-
5427
def setup_network(self):
5528
self.log.info("Setting up network")
5629
self.log.info(self.warnet(f"deploy {self.network_dir}"))

0 commit comments

Comments
 (0)