diff --git a/config.go b/config.go
index ea65cb1..589aa9b 100644
--- a/config.go
+++ b/config.go
@@ -177,7 +177,7 @@ func configProbes(probesConfig YamlProbeConfig, fileName string) {
log.Fatalf("Config failure probe with name '%s' already exists (%s)", probe.Name, fileName)
}
- var argumentOrder []string = make([]string, len(probe.Arguments))
+ var argumentOrder = make([]string, len(probe.Arguments))
var labelNames []string
var labelValues []string
@@ -201,7 +201,7 @@ func configProbes(probesConfig YamlProbeConfig, fileName string) {
i := 0
for key, argument := range probe.Arguments {
- var argName string = fmt.Sprint(key)
+ var argName = fmt.Sprint(key)
if argument.Param != nil {
if _, exists := config.probes[probe.Name].arguments[*argument.Param]; exists {
diff --git a/go.mod b/go.mod
index 50c6979..f2fae90 100644
--- a/go.mod
+++ b/go.mod
@@ -1,10 +1,10 @@
module mostwanted.io/prometheus/script_exporter
-go 1.22
+go 1.24
require (
github.com/gorilla/handlers v1.5.2
- github.com/prometheus/client_golang v1.20.5
+ github.com/prometheus/client_golang v1.22.0
github.com/sirupsen/logrus v1.9.3
github.com/stretchr/testify v1.10.0
gopkg.in/yaml.v3 v3.0.1
@@ -15,13 +15,12 @@ require (
github.com/cespare/xxhash/v2 v2.3.0 // indirect
github.com/davecgh/go-spew v1.1.1 // indirect
github.com/felixge/httpsnoop v1.0.4 // indirect
- github.com/klauspost/compress v1.17.11 // indirect
github.com/kr/text v0.2.0 // indirect
github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 // indirect
github.com/pmezard/go-difflib v1.0.0 // indirect
github.com/prometheus/client_model v0.6.1 // indirect
- github.com/prometheus/common v0.62.0 // indirect
- github.com/prometheus/procfs v0.15.1 // indirect
- golang.org/x/sys v0.29.0 // indirect
- google.golang.org/protobuf v1.36.4 // indirect
+ github.com/prometheus/common v0.63.0 // indirect
+ github.com/prometheus/procfs v0.16.0 // indirect
+ golang.org/x/sys v0.32.0 // indirect
+ google.golang.org/protobuf v1.36.6 // indirect
)
diff --git a/go.sum b/go.sum
index f2d8788..9f54b35 100644
--- a/go.sum
+++ b/go.sum
@@ -8,12 +8,12 @@ github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c
github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
github.com/felixge/httpsnoop v1.0.4 h1:NFTV2Zj1bL4mc9sqWACXbQFVBBg2W3GPvqp8/ESS2Wg=
github.com/felixge/httpsnoop v1.0.4/go.mod h1:m8KPJKqk1gH5J9DgRY2ASl2lWCfGKXixSwevea8zH2U=
-github.com/google/go-cmp v0.6.0 h1:ofyhxvXcZhMsU5ulbFiLKl/XBFqE1GSq7atu8tAmTRI=
-github.com/google/go-cmp v0.6.0/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY=
+github.com/google/go-cmp v0.7.0 h1:wk8382ETsv4JYUZwIsn6YpYiWiBsYLSJiTsyBybVuN8=
+github.com/google/go-cmp v0.7.0/go.mod h1:pXiqmnSA92OHEEa9HXL2W4E7lf9JzCmGVUdgjX3N/iU=
github.com/gorilla/handlers v1.5.2 h1:cLTUSsNkgcwhgRqvCNmdbRWG0A3N4F+M2nWKdScwyEE=
github.com/gorilla/handlers v1.5.2/go.mod h1:dX+xVpaxdSw+q0Qek8SSsl3dfMk3jNddUkMzo0GtH0w=
-github.com/klauspost/compress v1.17.11 h1:In6xLpyWOi1+C7tXUUWv2ot1QvBjxevKAaI6IXrJmUc=
-github.com/klauspost/compress v1.17.11/go.mod h1:pMDklpSncoRMuLFrf1W9Ss9KT+0rH90U12bZKk7uwG0=
+github.com/klauspost/compress v1.18.0 h1:c/Cqfb0r+Yi+JtIEq73FWXVkRonBlf0CRNYc8Zttxdo=
+github.com/klauspost/compress v1.18.0/go.mod h1:2Pp+KzxcywXVXMr50+X0Q/Lsb43OQHYWRCY2AiWywWQ=
github.com/kr/pretty v0.3.1 h1:flRD4NNwYAUpkphVc1HcthR4KEIFJ65n8Mw5qdRn3LE=
github.com/kr/pretty v0.3.1/go.mod h1:hoEshYVHaxMs3cyo3Yncou5ZscifuDolrwPKZanG3xk=
github.com/kr/text v0.2.0 h1:5Nx0Ya0ZqY2ygV366QzturHI13Jq95ApcVaJBhpS+AY=
@@ -24,14 +24,14 @@ github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 h1:C3w9PqII01/Oq
github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822/go.mod h1:+n7T8mK8HuQTcFwEeznm/DIxMOiR9yIdICNftLE1DvQ=
github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM=
github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
-github.com/prometheus/client_golang v1.20.5 h1:cxppBPuYhUnsO6yo/aoRol4L7q7UFfdm+bR9r+8l63Y=
-github.com/prometheus/client_golang v1.20.5/go.mod h1:PIEt8X02hGcP8JWbeHyeZ53Y/jReSnHgO035n//V5WE=
+github.com/prometheus/client_golang v1.22.0 h1:rb93p9lokFEsctTys46VnV1kLCDpVZ0a/Y92Vm0Zc6Q=
+github.com/prometheus/client_golang v1.22.0/go.mod h1:R7ljNsLXhuQXYZYtw6GAE9AZg8Y7vEW5scdCXrWRXC0=
github.com/prometheus/client_model v0.6.1 h1:ZKSh/rekM+n3CeS952MLRAdFwIKqeY8b62p8ais2e9E=
github.com/prometheus/client_model v0.6.1/go.mod h1:OrxVMOVHjw3lKMa8+x6HeMGkHMQyHDk9E3jmP2AmGiY=
-github.com/prometheus/common v0.62.0 h1:xasJaQlnWAeyHdUBeGjXmutelfJHWMRr+Fg4QszZ2Io=
-github.com/prometheus/common v0.62.0/go.mod h1:vyBcEuLSvWos9B1+CyL7JZ2up+uFzXhkqml0W5zIY1I=
-github.com/prometheus/procfs v0.15.1 h1:YagwOFzUgYfKKHX6Dr+sHT7km/hxC76UB0learggepc=
-github.com/prometheus/procfs v0.15.1/go.mod h1:fB45yRUv8NstnjriLhBQLuOUt+WW4BsoGhij/e3PBqk=
+github.com/prometheus/common v0.63.0 h1:YR/EIY1o3mEFP/kZCD7iDMnLPlGyuU2Gb3HIcXnA98k=
+github.com/prometheus/common v0.63.0/go.mod h1:VVFF/fBIoToEnWRVkYoXEkq3R3paCoxG9PXP74SnV18=
+github.com/prometheus/procfs v0.16.0 h1:xh6oHhKwnOJKMYiYBDWmkHqQPyiY40sny36Cmx2bbsM=
+github.com/prometheus/procfs v0.16.0/go.mod h1:8veyXUu3nGP7oaCxhX6yeaM5u4stL2FeMXnCqhDthZg=
github.com/rogpeppe/go-internal v1.10.0 h1:TMyTOH3F/DB16zRVcYyreMH6GnZZrwQVAoYjRBZyWFQ=
github.com/rogpeppe/go-internal v1.10.0/go.mod h1:UQnix2H7Ngw/k4C5ijL5+65zddjncjaFoBhdsK/akog=
github.com/sirupsen/logrus v1.9.3 h1:dueUQJ1C2q9oE3F7wvmSGAaVtTmUizReu6fjN8uqzbQ=
@@ -41,10 +41,10 @@ github.com/stretchr/testify v1.7.0/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/
github.com/stretchr/testify v1.10.0 h1:Xv5erBjTwe/5IxqUQTdXv5kgmIvbHo3QQyRwhJsOfJA=
github.com/stretchr/testify v1.10.0/go.mod h1:r2ic/lqez/lEtzL7wO/rwa5dbSLXVDPFyf8C91i36aY=
golang.org/x/sys v0.0.0-20220715151400-c0bba94af5f8/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
-golang.org/x/sys v0.29.0 h1:TPYlXGxvx1MGTn2GiZDhnjPA9wZzZeGKHHmKhHYvgaU=
-golang.org/x/sys v0.29.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
-google.golang.org/protobuf v1.36.4 h1:6A3ZDJHn/eNqc1i+IdefRzy/9PokBTPvcqMySR7NNIM=
-google.golang.org/protobuf v1.36.4/go.mod h1:9fA7Ob0pmnwhb644+1+CVWFRbNajQ6iRojtC/QF5bRE=
+golang.org/x/sys v0.32.0 h1:s77OFDvIQeibCmezSnk/q6iAfkdiQaJi4VzroCFrN20=
+golang.org/x/sys v0.32.0/go.mod h1:BJP2sWEmIv4KK5OTEluFJCKSidICx8ciO85XgH3Ak8k=
+google.golang.org/protobuf v1.36.6 h1:z1NpPI8ku2WgiWnf+t9wTPsn6eP1L7ksHUlkfLvd9xY=
+google.golang.org/protobuf v1.36.6/go.mod h1:jduwjTPXsFjZGTmRluh+L6NjiWu7pchiJ2/5YcXBHnY=
gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c h1:Hei/4ADfdWqJk1ZMxUNpqntNwaWcugrBjAiHlqqRiVk=
gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c/go.mod h1:JHkPIbrfpd72SG/EVd6muEfDQjcINNoR0C8j2r3qZ4Q=
diff --git a/main.go b/main.go
index f63d0d1..8c52977 100644
--- a/main.go
+++ b/main.go
@@ -30,7 +30,7 @@ func main() {
r := http.NewServeMux()
- r.HandleFunc("/", landingpage)
+ r.HandleFunc("/", landingPage)
r.Handle("/metrics", promhttp.Handler())
r.HandleFunc("/probe", probe)
diff --git a/pages.go b/pages.go
index 73caa71..c75849a 100644
--- a/pages.go
+++ b/pages.go
@@ -5,7 +5,7 @@ import (
"net/http"
)
-func landingpage(w http.ResponseWriter, r *http.Request) {
+func landingPage(w http.ResponseWriter, r *http.Request) {
if r.URL.Path != "/" {
http.NotFound(w, r)
return
@@ -24,7 +24,7 @@ func landingpage(w http.ResponseWriter, r *http.Request) {
)
}
- fmt.Fprintf(
+ _, err := fmt.Fprintf(
w,
`
%s
@@ -38,12 +38,15 @@ func landingpage(w http.ResponseWriter, r *http.Request) {
title,
probesString,
)
+ if err != nil {
+ return
+ }
}
func debugProbe(w http.ResponseWriter, probeName string, result runResult) {
title := "Debug Probe " + probeName
- fmt.Fprintf(
+ _, err := fmt.Fprintf(
w,
`
%s
@@ -81,4 +84,7 @@ func debugProbe(w http.ResponseWriter, probeName string, result runResult) {
result.stdout,
result.stderr,
)
+ if err != nil {
+ return
+ }
}
diff --git a/probe.go b/probe.go
index 4f34749..3c21b98 100644
--- a/probe.go
+++ b/probe.go
@@ -50,9 +50,9 @@ func probe(w http.ResponseWriter, r *http.Request) {
func run(cmd *exec.Cmd) runResult {
var result runResult
- var outbuf, errbuf bytes.Buffer
- cmd.Stdout = &outbuf
- cmd.Stderr = &errbuf
+ var outBuf, errBuf bytes.Buffer
+ cmd.Stdout = &outBuf
+ cmd.Stderr = &errBuf
log.Debug("[Run] Start cmd", cmd)
start := time.Now()
@@ -62,8 +62,8 @@ func run(cmd *exec.Cmd) runResult {
result.duration = time.Since(start)
log.Debug("[Run] End cmd duration: ", result.duration)
- result.stdout = outbuf.String()
- result.stderr = errbuf.String()
+ result.stdout = outBuf.String()
+ result.stderr = errBuf.String()
result.exitCode = 0
if err != nil {
diff --git a/probe_test.go b/probe_test.go
index d1b3fdd..81f76b8 100644
--- a/probe_test.go
+++ b/probe_test.go
@@ -23,24 +23,24 @@ var commandTests = []struct {
func TestRun(t *testing.T) {
for _, tt := range commandTests {
- assert := assert.New(t)
+ newAssert := assert.New(t)
result := run(tt.program)
- assert.Equalf(tt.expectedExitCode, result.exitCode, "Exit code incorrect for `%s`", tt.program)
- assert.Equalf(tt.expectedStdOut, result.stdout, "StdOut has content check failed for `%s`", tt.program)
- assert.Equalf(tt.expectedStdErr, result.stderr, "StdErr has content check failed for `%s`", tt.program)
+ newAssert.Equalf(tt.expectedExitCode, result.exitCode, "Exit code incorrect for `%s`", tt.program)
+ newAssert.Equalf(tt.expectedStdOut, result.stdout, "StdOut has content check failed for `%s`", tt.program)
+ newAssert.Equalf(tt.expectedStdErr, result.stderr, "StdErr has content check failed for `%s`", tt.program)
}
}
func TestRunDuration(t *testing.T) {
- assert := assert.New(t)
+ newAssert := assert.New(t)
duration := 2.0
program := exec.Command("test/resources/sleeping.py", fmt.Sprintf("%f", duration))
result := run(program)
- assert.Equal(0, result.exitCode, "Exit code incorrect for `%s`", program)
- assert.GreaterOrEqual(result.duration.Seconds(), duration, "Duration incorrect `%s`", program)
- assert.LessOrEqual(result.duration.Seconds(), duration+1, "Duration incorrect `%s`", program)
+ newAssert.Equal(0, result.exitCode, "Exit code incorrect for `%s`", program)
+ newAssert.GreaterOrEqual(result.duration.Seconds(), duration, "Duration incorrect `%s`", program)
+ newAssert.LessOrEqual(result.duration.Seconds(), duration+1, "Duration incorrect `%s`", program)
}