grafana running behind caddy

Author: m3dwards

resources/charts/caddy/values.yaml

@@ -99,7 +99,7 @@ caddyConfig: |
     }
 
     handle_path /grafana/* {
-      reverse_proxy grafana:3000
+      reverse_proxy loki-grafana:80
     }
 
   }

resources/manifests/grafana_values.yaml

@@ -16,6 +16,9 @@ grafana.ini:
   auth:
     disable_login_form: true
     disable_signout_menu: true
+  server:
+    # this is required to use Grafana behind a reverse proxy (caddy)
+    root_url: "%(protocol)s://%(domain)s:%(http_port)s/grafana/"
   auth.anonymous:
     enabled: true
     org_name: Main Org.

src/warnet/graph.py

@@ -184,7 +184,7 @@ def inquirer_create_network(project_path: Path):
         custom_network_path,
         fork_observer,
         fork_observer_query_interval,
-        fork_observer, # This enables caddy whenever fork-observer is enabled
+        fork_observer,  # This enables caddy whenever fork-observer is enabled
     )
     return custom_network_path
 

test/data/logging/network.yaml

@@ -10,4 +10,6 @@ nodes:
     metrics: txrate=getchaintxstats(10)["txrate"]
   - name: tank-0002
     connect:
-      - tank-0000
+      - tank-0000
+caddy:
+  enabled: true

test/logging_test.py

@@ -10,6 +10,8 @@
 import requests
 from test_base import TestBase
 
+GRAFANA_URL = "http://localhost:2019/grafana/"
+
 
 class LoggingTest(TestBase):
     def __init__(self):
@@ -60,7 +62,7 @@ def wait_for_endpoint_ready(self):
 
         def check_endpoint():
             try:
-                response = requests.get("http://localhost:3000/login")
+                response = requests.get(f"{GRAFANA_URL}login")
                 return response.status_code == 200
             except requests.RequestException:
                 return False
@@ -75,7 +77,7 @@ def make_grafana_api_request(self, ds_uid, start, metric):
             "from": f"{start}",
             "to": "now",
         }
-        reply = requests.post("http://localhost:3000/api/ds/query", json=data)
+        reply = requests.post(f"{GRAFANA_URL}api/ds/query", json=data)
         if reply.status_code != 200:
             self.log.error(f"Grafana API request failed with status code {reply.status_code}")
             self.log.error(f"Response content: {reply.text}")
@@ -92,7 +94,7 @@ def test_prometheus_and_grafana(self):
         self.warnet(f"run {miner_file} --allnodes --interval=5 --mature")
         self.warnet(f"run {tx_flood_file} --interval=1")
 
-        prometheus_ds = requests.get("http://localhost:3000/api/datasources/name/Prometheus")
+        prometheus_ds = requests.get(f"{GRAFANA_URL}api/datasources/name/Prometheus")
         assert prometheus_ds.status_code == 200
         prometheus_uid = prometheus_ds.json()["uid"]
         self.log.info(f"Got Prometheus data source uid from Grafana: {prometheus_uid}")