feat(routing): swap jaeger→tempo subdomain and Traefik route
This commit is contained in:
@@ -268,7 +268,7 @@ SUBDOMAINS = [
|
|||||||
"polaris",
|
"polaris",
|
||||||
"grafana",
|
"grafana",
|
||||||
"prometheus",
|
"prometheus",
|
||||||
"jaeger",
|
"tempo",
|
||||||
"loki",
|
"loki",
|
||||||
"s3",
|
"s3",
|
||||||
"s3console",
|
"s3console",
|
||||||
|
|||||||
@@ -12,7 +12,7 @@
|
|||||||
"polaris" (dict "port" "8181" "theme" false "mw" "git-sso,infra-headers")
|
"polaris" (dict "port" "8181" "theme" false "mw" "git-sso,infra-headers")
|
||||||
"grafana" (dict "port" "3000" "theme" true "mw" "git-sso,secure-headers")
|
"grafana" (dict "port" "3000" "theme" true "mw" "git-sso,secure-headers")
|
||||||
"prometheus" (dict "port" "9090" "theme" true "mw" "git-sso,infra-headers")
|
"prometheus" (dict "port" "9090" "theme" true "mw" "git-sso,infra-headers")
|
||||||
"jaeger" (dict "port" "16686" "theme" true "mw" "git-sso,infra-headers")
|
"tempo" (dict "port" "3200" "theme" true "mw" "git-sso,infra-headers")
|
||||||
"loki" (dict "port" "3100" "theme" false "mw" "git-sso,infra-headers")
|
"loki" (dict "port" "3100" "theme" false "mw" "git-sso,infra-headers")
|
||||||
-}}
|
-}}
|
||||||
{{- $multi := dict
|
{{- $multi := dict
|
||||||
|
|||||||
@@ -23,7 +23,7 @@ host_ip = "192.168.1.192"
|
|||||||
subdomains = [
|
subdomains = [
|
||||||
"dashboard", "docs", "git", "ci", "notebooks", "zotero",
|
"dashboard", "docs", "git", "ci", "notebooks", "zotero",
|
||||||
"webdav", "api", "nessie", "trino", "polaris",
|
"webdav", "api", "nessie", "trino", "polaris",
|
||||||
"grafana", "prometheus", "jaeger", "loki",
|
"grafana", "prometheus", "tempo", "loki",
|
||||||
"s3", "s3console",
|
"s3", "s3console",
|
||||||
]
|
]
|
||||||
|
|
||||||
|
|||||||
@@ -251,3 +251,23 @@ class TestGrafanaOAuth:
|
|||||||
assert "GRAFANA_ENV" in src
|
assert "GRAFANA_ENV" in src
|
||||||
assert 'name="grafana"' in src
|
assert 'name="grafana"' in src
|
||||||
assert "/login/generic_oauth" in src
|
assert "/login/generic_oauth" in src
|
||||||
|
|
||||||
|
|
||||||
|
class TestSubdomainSwap:
|
||||||
|
def test_stack_toml_subdomains(self):
|
||||||
|
import tomllib
|
||||||
|
|
||||||
|
cfg = tomllib.loads((ROOT / "stack.toml").read_text())
|
||||||
|
subs = cfg["platform"]["subdomains"]
|
||||||
|
assert "tempo" in subs
|
||||||
|
assert "jaeger" not in subs
|
||||||
|
|
||||||
|
def test_bootstrap_sso_subdomains(self):
|
||||||
|
src = (ROOT / "dev/scripts/bootstrap_sso.py").read_text()
|
||||||
|
assert '"tempo"' in src
|
||||||
|
assert '"jaeger"' not in src
|
||||||
|
|
||||||
|
def test_traefik_route_swap(self):
|
||||||
|
src = (ROOT / "infra/traefik/dynamic/services.yml").read_text()
|
||||||
|
assert '"tempo"' in src
|
||||||
|
assert '"jaeger"' not in src
|
||||||
|
|||||||
Reference in New Issue
Block a user