openstatus.dev
Openstatus
www.openstatus.dev
🐛 only active monitor for private regions (#1454)
authored by
Thibault Le Ouay
and committed by
GitHub
03c629e2
090ab123
+1
-32
-31
apps/checker/private-location-image/Dockerfile
-31
apps/checker/private-location-image/Dockerfile
···
1
-
FROM golang:1.25-alpine as builder
2
-
3
-
WORKDIR /go/src/app
4
-
5
-
RUN apk add --no-cache tzdata
6
-
ENV TZ=UTC
7
-
8
-
ENV CGO_ENABLED=0
9
-
ENV GOOS=linux
10
-
ENV GOARCH=amd64
11
-
12
-
COPY go.* .
13
-
RUN go mod download
14
-
15
-
COPY . .
16
-
RUN go build -trimpath -ldflags "-s -w" -o private ./cmd/private/main.go
17
-
18
-
FROM scratch
19
-
20
-
WORKDIR /opt/bin
21
-
22
-
COPY --from=builder /etc/ssl/certs/ca-certificates.crt /etc/ssl/certs/
23
-
COPY --from=builder /usr/share/zoneinfo /usr/share/zoneinfo
24
-
25
-
COPY --from=builder /go/src/app/private /opt/bin/private
26
-
27
-
ENV TZ=UTC
28
-
ENV USER=1000
29
-
ENV GIN_MODE=release
30
-
31
-
CMD [ "/opt/bin/private" ]
+1
-1
apps/private-location/internal/server/monitors.go
+1
-1
apps/private-location/internal/server/monitors.go
···
118
118
}
119
119
120
120
var monitors []database.Monitor
121
-
err := h.db.Select(&monitors, "SELECT monitor.* FROM monitor JOIN private_location_to_monitor a ON monitor.id = a.monitor_id JOIN private_location b ON a.private_location_id = b.id WHERE b.token = ? AND monitor.deleted_at IS NULL", token)
121
+
err := h.db.Select(&monitors, "SELECT monitor.* FROM monitor JOIN private_location_to_monitor a ON monitor.id = a.monitor_id JOIN private_location b ON a.private_location_id = b.id WHERE b.token = ? AND monitor.deleted_at IS NULL and monitor.active = 1", token)
122
122
if err != nil {
123
123
return nil, connect.NewError(connect.CodeInternal, err)
124
124
}