From 44507adcc77feba85fc818e67006622e22daaf9e Mon Sep 17 00:00:00 2001
From: skudasov <f4hrenh9it@gmail.com>
Date: Thu, 24 Jul 2025 11:58:26 +0200
Subject: [PATCH 1/2] put promtail on default CTF network to be able to run
 seamlessly in CI

---
 framework/.changeset/v0.10.7.md | 1 +
 framework/promtail.go           | 6 +++++-
 2 files changed, 6 insertions(+), 1 deletion(-)
 create mode 100644 framework/.changeset/v0.10.7.md

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/promtail.go b/framework/promtail.go
index 78aa8296a..9c11a3014 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: {"loki"},
+		},
 		Files: []testcontainers.ContainerFile{
 			{
 				HostFilePath:      pcn,

From d1f6392ee3f20481cc3fdd8d44fa47fadcb683ff Mon Sep 17 00:00:00 2001
From: skudasov <f4hrenh9it@gmail.com>
Date: Thu, 24 Jul 2025 15:18:54 +0200
Subject: [PATCH 2/2] fix network alias

---
 framework/observability.go | 2 +-
 framework/promtail.go      | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

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 9c11a3014..a04932df7 100644
--- a/framework/promtail.go
+++ b/framework/promtail.go
@@ -133,7 +133,7 @@ func NewPromtail() error {
 		Cmd:          cmd,
 		Networks:     []string{DefaultNetworkName},
 		NetworkAliases: map[string][]string{
-			DefaultNetworkName: {"loki"},
+			DefaultNetworkName: {"promtail"},
 		},
 		Files: []testcontainers.ContainerFile{
 			{