dolysis
/
cups-exporter
3
0
Fork 0
Code Issues Pull Requests Releases Activity

Update map types

This commit is contained in:
pSox 2022-11-17 13:59:06 +00:00
parent 056190757b
commit 7fda4c0761
3 changed files with 36 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
Dockerfile
View File

@ -1,17 +1,18 @@
FROM golang:1.13 as builder
FROM golang:1.19 as builder
WORKDIR /build
ADD . /build
RUN go build -o cups_exporter main.go
FROM golang:1.13
FROM golang:1.19
LABEL maintainer="lenny.consuegra@camptocamp.com"
ENV CUPS_URI "https://localhost:631"
COPY --from=builder /build/cups_exporter /bin/cups_exporter
COPY --from=builder /build/cups-exporter /bin/cups-exporter
EXPOSE 9329
CMD [ "/bin/sh", "-c", "/bin/cups_exporter -cups.uri ${CUPS_URI}" ]

9
pkg/jobs.go
View File

@ -4,7 +4,9 @@
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
You may obtain a copy of the License at
http://www.apache.org/licenses/LICENSE-2.0
Unless required by applicable law or agreed to in writing, software
distributed under the License is distributed on an "AS IS" BASIS,
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@ -16,9 +18,10 @@
package pkg
import (
"strconv"
ipp "git.st8l.com/dolysis/go-ipp"
"github.com/prometheus/client_golang/prometheus"
"strconv"
)
func (e *Exporter) jobsMetrics(ch chan<- prometheus.Metric) error {
@ -44,13 +47,13 @@ func (e *Exporter) jobsMetrics(ch chan<- prometheus.Metric) error {
ch <- prometheus.MustNewConstMetric(e.jobsTotal, prometheus.CounterValue, float64(len(jobs)), printer)
states := map[ipp.JobState]int{}
states := map[int8]int{}
for _, attr := range jobs {
if len(attr["job-state"]) == 1 {
value := ipp.JobState(attr["job-state"][0].Value.(int))
value := int8(attr["job-state"][0].Value.(int))
if value <= 9 && value >= 3 {
states[value]++

6
pkg/printers.go
View File

@ -4,7 +4,9 @@
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
You may obtain a copy of the License at
http://www.apache.org/licenses/LICENSE-2.0
Unless required by applicable law or agreed to in writing, software
distributed under the License is distributed on an "AS IS" BASIS,
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@ -33,12 +35,12 @@ func (e *Exporter) printerMetrics(ch chan<- prometheus.Metric) error {
printer := attr["printer-name"][0].Value.(string)
states := make(map[ipp.PrinterState]int)
states := make(map[int8]int)
states[ipp.PrinterStateIdle] = 0
states[ipp.PrinterStateProcessing] = 0
states[ipp.PrinterStateStopped] = 0
states[ipp.PrinterState(attr["printer-state"][0].Value.(int))]++
states[int8(attr["printer-state"][0].Value.(int))]++
ch <- prometheus.MustNewConstMetric(e.printerStateTotal, prometheus.GaugeValue, float64(states[ipp.PrinterStateIdle]), printer, "idle")
ch <- prometheus.MustNewConstMetric(e.printerStateTotal, prometheus.GaugeValue, float64(states[ipp.PrinterStateProcessing]), printer, "processing")