sendnrw/windows_exporter
2
0
Fork 0
mirror of https://github.com/prometheus-community/windows_exporter.git synced 2026-03-03 00:56:35 +00:00
Code Issues Packages Projects Releases Wiki Activity

process,iis: fix log call

Browse Source
This commit is contained in:
Martin Lindhe
2017-08-10 03:50:21 +02:00
parent 3cfc11c6d2
commit 96faedf481
2 changed files with 9 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
collector/iis.go
View File

@@ -9,13 +9,13 @@ package collector
import ( import (
"flag" "flag"
"fmt" "fmt"
"log"
"regexp" "regexp"
"golang.org/x/sys/windows/registry" "golang.org/x/sys/windows/registry"
"github.com/StackExchange/wmi" "github.com/StackExchange/wmi"
"github.com/prometheus/client_golang/prometheus" "github.com/prometheus/client_golang/prometheus"
"github.com/prometheus/common/log"
) )
func init() { func init() {
@@ -31,23 +31,23 @@ type simple_version struct {
func getIISVersion() simple_version { func getIISVersion() simple_version {
k, err := registry.OpenKey(registry.LOCAL_MACHINE, `SOFTWARE\Microsoft\InetStp\`, registry.QUERY_VALUE) k, err := registry.OpenKey(registry.LOCAL_MACHINE, `SOFTWARE\Microsoft\InetStp\`, registry.QUERY_VALUE)
if err != nil { if err != nil {
log.Warnf("Couldn't open registry to determine IIS version: %v\n", err) log.Println("warning: Couldn't open registry to determine IIS version:", err)
return simple_version{} return simple_version{}
} }
defer k.Close() defer k.Close()
major, _, err := k.GetIntegerValue("MajorVersion") major, _, err := k.GetIntegerValue("MajorVersion")
if err != nil { if err != nil {
log.Warnf("Couldn't open registry to determine IIS version: %v\n", err) log.Println("warning: Couldn't open registry to determine IIS version:", err)
return simple_version{} return simple_version{}
} }
minor, _, err := k.GetIntegerValue("MinorVersion") minor, _, err := k.GetIntegerValue("MinorVersion")
if err != nil { if err != nil {
log.Warnf("Couldn't open registry to determine IIS version: %v\n", err) log.Println("warning: Couldn't open registry to determine IIS version:", err)
return simple_version{} return simple_version{}
} }
log.Debugf("Detected IIS %d.%d\n", major, minor) log.Printf("Detected IIS %d.%d\n", major, minor)
return simple_version{ return simple_version{
major: major, major: major,
@@ -815,7 +815,7 @@ func NewIISCollector() (Collector, error) {
// to the provided prometheus Metric channel. // to the provided prometheus Metric channel.
func (c *IISCollector) Collect(ch chan<- prometheus.Metric) error { func (c *IISCollector) Collect(ch chan<- prometheus.Metric) error {
if desc, err := c.collect(ch); err != nil { if desc, err := c.collect(ch); err != nil {
log.Errorf("[ERROR] failed collecting iis metrics:", desc, err) log.Println("[ERROR] failed collecting iis metrics:", desc, err)
return err return err
} }
return nil return nil

6
collector/process.go
View File

@@ -5,12 +5,12 @@ package collector
import ( import (
"bytes" "bytes"
"flag" "flag"
"log"
"strconv" "strconv"
"strings" "strings"
"github.com/StackExchange/wmi" "github.com/StackExchange/wmi"
"github.com/prometheus/client_golang/prometheus" "github.com/prometheus/client_golang/prometheus"
"github.com/prometheus/common/log"
) )
func init() { func init() {
@@ -49,7 +49,7 @@ func NewProcessCollector() (Collector, error) {
wc.WriteString("WHERE ") wc.WriteString("WHERE ")
wc.WriteString(*processWhereClause) wc.WriteString(*processWhereClause)
} else { } else {
log.Warn("No where-clause specified for process collector. This will generate a very large number of metrics!") log.Println("warning: No where-clause specified for process collector. This will generate a very large number of metrics!")
} }
return &ProcessCollector{ return &ProcessCollector{
@@ -139,7 +139,7 @@ func NewProcessCollector() (Collector, error) {
// to the provided prometheus Metric channel. // to the provided prometheus Metric channel.
func (c *ProcessCollector) Collect(ch chan<- prometheus.Metric) error { func (c *ProcessCollector) Collect(ch chan<- prometheus.Metric) error {
if desc, err := c.collect(ch); err != nil { if desc, err := c.collect(ch); err != nil {
log.Errorln("[ERROR] failed collecting process metrics:", desc, err) log.Println("[ERROR] failed collecting process metrics:", desc, err)
return err return err
} }
return nil return nil