diff --git a/framework/.changeset/v0.10.7.md b/framework/.changeset/v0.10.7.md new file mode 100644 index 000000000..ee69c0a55 --- /dev/null +++ b/framework/.changeset/v0.10.7.md @@ -0,0 +1 @@ +- Test observability stack in CI, move promtail to ctf default network \ No newline at end of file diff --git a/framework/observability.go b/framework/observability.go index 1d53e281f..311dc4604 100644 --- a/framework/observability.go +++ b/framework/observability.go @@ -117,10 +117,10 @@ func ObservabilityUp() error { if err := extractAllFiles("observability"); err != nil { return err } + _ = DefaultNetwork(nil) if err := NewPromtail(); err != nil { return err } - _ = DefaultNetwork(nil) err := RunCommand("bash", "-c", fmt.Sprintf(` cd %s && \ docker compose up -d diff --git a/framework/promtail.go b/framework/promtail.go index 78aa8296a..a04932df7 100644 --- a/framework/promtail.go +++ b/framework/promtail.go @@ -60,7 +60,7 @@ scrape_configs: lokiTenantID := os.Getenv("LOKI_TENANT_ID") if lokiURL == "" { - lokiURL = "http://host.docker.internal:3030/loki/api/v1/push" + lokiURL = "http://loki:3100/loki/api/v1/push" } if lokiTenantID == "" { lokiTenantID = "promtail" @@ -131,6 +131,10 @@ func NewPromtail() error { ExposedPorts: []string{"9080/tcp"}, Name: "promtail", Cmd: cmd, + Networks: []string{DefaultNetworkName}, + NetworkAliases: map[string][]string{ + DefaultNetworkName: {"promtail"}, + }, Files: []testcontainers.ContainerFile{ { HostFilePath: pcn,