Skip to content

put Promtail on default CTF network #1993

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
skudasov merged 3 commits into from
Jul 24, 2025
Merged

put Promtail on default CTF network #1993

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
44507ad
put promtail on default CTF network to be able to run seamlessly in CI
skudasov Jul 24, 2025
6e2ad46
Merge branch 'main' into test-promtail-obs-ci
skudasov Jul 24, 2025
d1f6392
fix network alias
skudasov Jul 24, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions framework/.changeset/v0.10.7.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
- Test observability stack in CI, move promtail to ctf default network
2 changes: 1 addition & 1 deletion framework/observability.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
6 changes: 5 additions & 1 deletion framework/promtail.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down Expand Up @@ -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,
Expand Down
Loading