Skip to content
This repository has been archived by the owner on May 24, 2023. It is now read-only.

Commit

Permalink
fix
Browse files Browse the repository at this point in the history
  • Loading branch information
ccjenniferhsu committed Jun 24, 2021
1 parent d522e1c commit 9713dcc
Show file tree
Hide file tree
Showing 2 changed files with 15 additions and 16 deletions.
9 changes: 4 additions & 5 deletions collector/api_base.go
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,7 @@ package collector
import (
"encoding/json"
"net/http"

"github.com/prometheus/common/log"
"log"
)

// HTTPHandler type
Expand All @@ -30,19 +29,19 @@ type HTTPHandlerInterface interface {
func getMetrics(h HTTPHandlerInterface, target interface{}) error {
response, err := h.Get()
if err != nil {
log.Errorf("Cannot retrieve metrics: %v", err)
log.Printf("[ERROR] Cannot retrieve metrics: %v\n", err)
return err
}

defer func() {
if err := response.Body.Close(); err != nil {
log.Errorf("Cannot close response body: %v", err)
log.Printf("[ERROR] Cannot close response body: %v\n", err)
}
}()

err = json.NewDecoder(response.Body).Decode(target)
if err != nil {
log.Errorf("Cannot parse Logstash response json: %v", err)
log.Printf("[ERROR] Cannot parse Logstash response json: %v\n", err)
}

return err
Expand Down
22 changes: 11 additions & 11 deletions logstash_exporter.go
Original file line number Diff line number Diff line change
Expand Up @@ -2,13 +2,13 @@ package main

import (
"net/http"
"log"
_ "net/http/pprof"
"sync"
"time"

"github.com/prometheus/client_golang/prometheus"
"github.com/prometheus/client_golang/prometheus/promhttp"
"github.com/prometheus/common/log"
"github.com/prometheus/common/version"
"github.com/sequra/logstash_exporter/collector"
"gopkg.in/alecthomas/kingpin.v2"
Expand All @@ -35,12 +35,12 @@ type LogstashCollector struct {
func NewLogstashCollector(logstashEndpoint string) (*LogstashCollector, error) {
nodeStatsCollector, err := collector.NewNodeStatsCollector(logstashEndpoint)
if err != nil {
log.Fatalf("Cannot register a new collector: %v", err)
log.Fatalf("Cannot register a new collector: %v\n", err)
}

nodeInfoCollector, err := collector.NewNodeInfoCollector(logstashEndpoint)
if err != nil {
log.Fatalf("Cannot register a new collector: %v", err)
log.Fatalf("Cannot register a new collector: %v\n", err)
}

return &LogstashCollector{
Expand All @@ -57,9 +57,9 @@ func listen(exporterBindAddress string) {
http.Redirect(w, r, "/metrics", http.StatusMovedPermanently)
})

log.Infoln("Starting server on", exporterBindAddress)
log.Println("Starting server on\n", exporterBindAddress)
if err := http.ListenAndServe(exporterBindAddress, nil); err != nil {
log.Fatalf("Cannot start Logstash exporter: %s", err)
log.Fatalf("Cannot start Logstash exporter: %s\n", err)
}
}

Expand Down Expand Up @@ -89,10 +89,10 @@ func execute(name string, c collector.Collector, ch chan<- prometheus.Metric) {
var result string

if err != nil {
log.Debugf("ERROR: %s collector failed after %fs: %s", name, duration.Seconds(), err)
log.Println("ERROR: %s collector failed after %fs: %s\n", name, duration.Seconds(), err)
result = "error"
} else {
log.Debugf("OK: %s collector succeeded after %fs.", name, duration.Seconds())
log.Println("OK: %s collector succeeded after %fs.\n", name, duration.Seconds())
result = "success"
}
scrapeDurations.WithLabelValues(name, result).Observe(duration.Seconds())
Expand All @@ -108,7 +108,7 @@ func main() {
exporterBindAddress = kingpin.Flag("web.listen-address", "Address on which to expose metrics and web interface.").Default(":9198").String()
)

log.AddFlags(kingpin.CommandLine)
//log.AddFlags(kingpin.CommandLine)
kingpin.Version(version.Print("logstash_exporter"))
kingpin.HelpFlag.Short('h')
kingpin.Parse()
Expand All @@ -120,7 +120,7 @@ func main() {

prometheus.MustRegister(logstashCollector)

log.Infoln("Starting Logstash exporter", version.Info())
log.Infoln("Build context", version.BuildContext())
log.Println("Starting Logstash exporter", version.Info())
log.Println("Build context", version.BuildContext())
listen(*exporterBindAddress)
}

0 comments on commit 9713dcc

Please sign in to comment.