adoralaura/ntppool-exporter
1
0
Fork 0
Code Issues 3 Pull requests Projects Releases 3 Packages Wiki Activity

Merge branch '2-nil-reference-pointer-exception-when-getting-queried-by-prometheus' into 'main'

Browse source 
Resolve "Nil reference pointer exception when getting queried by Prometheus"

Closes #2

See merge request adoralaura/ntppool-exporter!1
This commit is contained in:
Adora Laura Kalb 2024-04-17 17:38:21 +00:00
commit 68823aa602
2 changed files with 11 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
Dockerfile
View file

@ -1,8 +1,9 @@
FROM golang:1.22-alpine AS dev FROM golang:1.22-bullseye AS dev
COPY . /var/app COPY . /var/app
WORKDIR /var/app WORKDIR /var/app
ENV GO111MODULE="on" \ ENV GO111MODULE="on" \
CGO_ENABLED=0 \ CGO_ENABLED=0 \
GOOS=linux GOOS=linux
@ -13,14 +14,16 @@ ENTRYPOINT ["sh"]
FROM dev as build FROM dev as build
RUN DEBIAN_FRONTEND=noninteractive apt-get install --no-install-recommends --assume-yes ca-certificates
RUN go mod download && go mod verify RUN go mod download && go mod verify
RUN go build -o ntppool-exporter main.go$ RUN go build -o ntppool-exporter main.go
RUN chmod +x ntppool-exporter RUN chmod +x ntppool-exporter
FROM scratch AS prod FROM debian:12 AS prod
WORKDIR /app WORKDIR /app
COPY --from=build /etc/ssl/certs/ca-certificates.crt /etc/ssl/certs/
COPY --from=build /var/app/ntppool-exporter /bin/ COPY --from=build /var/app/ntppool-exporter /bin/
LABEL maintainer="Adora Laura Kalb <adora@lila.network>" LABEL maintainer="Adora Laura Kalb <adora@lila.network>"

9
collector/collector.go
View file

@ -77,15 +77,16 @@ func (c Collector) collect(ch chan<- prometheus.Metric, logger log.Logger) {
} }
res, err := client.Do(req) res, err := client.Do(req)
if err != nil { if err != nil {
level.Error(logger).Log("msg", "Error in HTTP response", "status", res.Status) level.Error(logger).Log("msg", "Error in HTTP response", "error", err)
httpError = true return
} }
defer res.Body.Close() defer res.Body.Close()
body, err := io.ReadAll(res.Body) body, err := io.ReadAll(res.Body)
if err != nil { if err != nil {
level.Error(logger).Log("msg", "Error reading HTTP response body", "error", err) level.Error(logger).Log("msg", "Error reading HTTP response body", "error", err)
httpError = true return
} }
var response models.ApiResponse var response models.ApiResponse
@ -93,7 +94,7 @@ func (c Collector) collect(ch chan<- prometheus.Metric, logger log.Logger) {
err = json.Unmarshal(body, &response) err = json.Unmarshal(body, &response)
if err != nil { if err != nil {
level.Error(logger).Log("msg", "Error unmarshaling JSON body", "error", err) level.Error(logger).Log("msg", "Error unmarshaling JSON body", "error", err)
httpError = true return
} }
if !httpError { if !httpError {