From 09b804607384f28418c7a948e135abf6694c50a6 Mon Sep 17 00:00:00 2001 From: mr Date: Fri, 21 Feb 2025 11:24:56 +0100 Subject: [PATCH] loki traefik + neo oclib --- docker-compose.tools.yml | 16 ++++++++++++++++ go.mod | 2 +- go.sum | 2 ++ 3 files changed, 19 insertions(+), 1 deletion(-) diff --git a/docker-compose.tools.yml b/docker-compose.tools.yml index 489ba84..0e6b9dd 100644 --- a/docker-compose.tools.yml +++ b/docker-compose.tools.yml @@ -13,6 +13,14 @@ services: loki: image: 'grafana/loki' container_name: loki + labels: + - "traefik.enable=true" + - "traefik.http.routers.loki.entrypoints=web" + - "traefik.http.routers.loki.rule=PathPrefix(`/tools/loki`)" + - "traefik.http.services.loki.loadbalancer.server.port=3100" + - "traefik.http.middlewares.loki-stripprefix.stripprefix.prefixes=/tools/loki" + - "traefik.http.routers.loki.middlewares=loki-stripprefix" + - "traefik.http.middlewares.loki.forwardauth.address=http://oc-auth:8080/oc/forward" ports : - "3100:3100" networks: @@ -22,6 +30,14 @@ services: container_name: grafana ports: - '3000:3000' + labels: + - "traefik.enable=true" + - "traefik.http.routers.grafana.entrypoints=web" + - "traefik.http.routers.grafana.rule=PathPrefix(`/tools/grafana`)" + - "traefik.http.services.grafana.loadbalancer.server.port=3000" + - "traefik.http.middlewares.grafana-stripprefix.stripprefix.prefixes=/tools/grafana" + - "traefik.http.routers.grafana.middlewares=grafana-stripprefix" + - "traefik.http.middlewares.grafana.forwardauth.address=http://oc-auth:8080/oc/forward" networks: - catalog volumes: diff --git a/go.mod b/go.mod index 6a6f555..4edb6be 100644 --- a/go.mod +++ b/go.mod @@ -5,7 +5,7 @@ go 1.22.0 toolchain go1.22.5 require ( - cloud.o-forge.io/core/oc-lib v0.0.0-20250219104152-3ecb0e9d960b + cloud.o-forge.io/core/oc-lib v0.0.0-20250219142942-5111c9c8bec7 github.com/beego/beego v1.12.12 github.com/goraz/onion v0.1.3 github.com/nats-io/nats.go v1.37.0 diff --git a/go.sum b/go.sum index d99b392..3901f23 100644 --- a/go.sum +++ b/go.sum @@ -24,6 +24,8 @@ cloud.o-forge.io/core/oc-lib v0.0.0-20250219100312-b4a176667754 h1:7J5EUe/iNS6cT cloud.o-forge.io/core/oc-lib v0.0.0-20250219100312-b4a176667754/go.mod h1:2roQbUpv3a6mTIr5oU1ux31WbN8YucyyQvCQ0FqwbcE= cloud.o-forge.io/core/oc-lib v0.0.0-20250219104152-3ecb0e9d960b h1:DhRqJdw2VePaYVlsh8OUA3zl+76Q0FWwGu+a+3aOf6s= cloud.o-forge.io/core/oc-lib v0.0.0-20250219104152-3ecb0e9d960b/go.mod h1:2roQbUpv3a6mTIr5oU1ux31WbN8YucyyQvCQ0FqwbcE= +cloud.o-forge.io/core/oc-lib v0.0.0-20250219142942-5111c9c8bec7 h1:fh6SzBPenzIxufIIzExtx4jEE4OhFposqn3EbHFr92Q= +cloud.o-forge.io/core/oc-lib v0.0.0-20250219142942-5111c9c8bec7/go.mod h1:2roQbUpv3a6mTIr5oU1ux31WbN8YucyyQvCQ0FqwbcE= github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU= github.com/Knetic/govaluate v3.0.0+incompatible/go.mod h1:r7JcOSlj0wfOMncg0iLm8Leh48TZaKVeNIfJntJ2wa0= github.com/alecthomas/template v0.0.0-20160405071501-a0175ee3bccc/go.mod h1:LOuyumcjzFXgccqObfd/Ljyb9UuFJ6TxHnclSeseNhc=