Skip to content

Commit

Permalink
update deps
Browse files Browse the repository at this point in the history
  • Loading branch information
ncabatoff committed Apr 16, 2024
1 parent 935906b commit 5d0621f
Show file tree
Hide file tree
Showing 4 changed files with 1,288 additions and 39 deletions.
4 changes: 2 additions & 2 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -64,10 +64,10 @@ docker:
docker run --rm --volumes-from configs "$(DOCKER_IMAGE_NAME):$(TAG_VERSION)" $(SMOKE_TEST)

dockertest:
docker run --rm -it -v `pwd`:/go/src/github.com/ncabatoff/process-exporter golang:1.15 make -C /go/src/github.com/ncabatoff/process-exporter test
docker run --rm -it -v `pwd`:/go/src/github.com/ncabatoff/process-exporter golang:1.22 make -C /go/src/github.com/ncabatoff/process-exporter test

dockerinteg:
docker run --rm -it -v `pwd`:/go/src/github.com/ncabatoff/process-exporter golang:1.15 make -C /go/src/github.com/ncabatoff/process-exporter build integ
docker run --rm -it -v `pwd`:/go/src/github.com/ncabatoff/process-exporter golang:1.22 make -C /go/src/github.com/ncabatoff/process-exporter build integ

.PHONY: update-go-deps
update-go-deps:
Expand Down
7 changes: 5 additions & 2 deletions cmd/process-exporter/main.go
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@ import (
"github.com/ncabatoff/process-exporter/collector"
"github.com/ncabatoff/process-exporter/config"
"github.com/prometheus/client_golang/prometheus"
verCollector "github.com/prometheus/client_golang/prometheus/collectors/version"
"github.com/prometheus/client_golang/prometheus/promhttp"
"github.com/prometheus/common/promlog"
promVersion "github.com/prometheus/common/version"
Expand Down Expand Up @@ -141,7 +142,7 @@ func (nmr *nameMapperRegex) MatchAndName(nacl common.ProcAttributes) (bool, stri

func init() {
promVersion.Version = version
prometheus.MustRegister(promVersion.NewCollector("process_exporter"))
prometheus.MustRegister(verCollector.NewCollector("process_exporter"))
}

func main() {
Expand Down Expand Up @@ -271,7 +272,9 @@ func main() {
</html>`))
})
server := &http.Server{Addr: *listenAddress}
if err := web.ListenAndServe(server, *tlsConfigFile, logger); err != nil {
if err := web.ListenAndServe(server, &web.FlagConfig{
WebConfigFile: tlsConfigFile,
}, logger); err != nil {
log.Fatalf("Failed to start the server: %v", err)
os.Exit(1)
}
Expand Down
12 changes: 5 additions & 7 deletions go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -3,15 +3,13 @@ module github.com/ncabatoff/process-exporter
go 1.13

require (
github.com/google/go-cmp v0.5.6
github.com/kr/pretty v0.3.0 // indirect
github.com/google/go-cmp v0.6.0
github.com/ncabatoff/fakescraper v0.0.0-20201102132415-4b37ba603d65
github.com/ncabatoff/go-seq v0.0.0-20180805175032-b08ef85ed833
github.com/prometheus/client_golang v1.11.0
github.com/prometheus/common v0.29.0
github.com/prometheus/exporter-toolkit v0.7.0
github.com/prometheus/procfs v0.7.3
github.com/rogpeppe/go-internal v1.8.0 // indirect
github.com/prometheus/client_golang v1.19.0
github.com/prometheus/common v0.52.3
github.com/prometheus/exporter-toolkit v0.11.0
github.com/prometheus/procfs v0.13.0
gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c
gopkg.in/yaml.v2 v2.4.0
)
Loading

0 comments on commit 5d0621f

Please sign in to comment.