Conditional query for wmi fields added in IIS 8

This commit is contained in:
Calle Pettersson
2017-07-15 13:56:09 +01:00
parent e8cfeef26c
commit f4195aa435
2 changed files with 180 additions and 90 deletions

View File

@@ -9,15 +9,50 @@ package collector
import ( import (
"flag" "flag"
"fmt" "fmt"
"log"
"regexp" "regexp"
"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() {
Factories["iis"] = NewIISCollector Factories["iis"] = NewIISCollector
iis_version = getIISVersion()
}
type simple_version struct {
major uint64
minor uint64
}
func getIISVersion() simple_version {
k, err := registry.OpenKey(registry.LOCAL_MACHINE, `SOFTWARE\Microsoft\InetStp\`, registry.QUERY_VALUE)
if err != nil {
log.Warnf("Couldn't open registry to determine IIS version: %v\n", err)
return simple_version{}
}
defer k.Close()
major, _, err := k.GetIntegerValue("MajorVersion")
if err != nil {
log.Warnf("Couldn't open registry to determine IIS version: %v\n", err)
return simple_version{}
}
minor, _, err := k.GetIntegerValue("MinorVersion")
if err != nil {
log.Warnf("Couldn't open registry to determine IIS version: %v\n", err)
return simple_version{}
}
log.Debugf("Detected IIS %d.%d\n", major, minor)
return simple_version{
major: major,
minor: minor,
}
} }
var ( var (
@@ -25,6 +60,8 @@ var (
siteBlacklist = flag.String("collector.iis.site-blacklist", "", "Regexp of sites to blacklist. Site name must both match whitelist and not match blacklist to be included.") siteBlacklist = flag.String("collector.iis.site-blacklist", "", "Regexp of sites to blacklist. Site name must both match whitelist and not match blacklist to be included.")
appWhitelist = flag.String("collector.iis.app-whitelist", ".+", "Regexp of apps to whitelist. App name must both match whitelist and not match blacklist to be included.") appWhitelist = flag.String("collector.iis.app-whitelist", ".+", "Regexp of apps to whitelist. App name must both match whitelist and not match blacklist to be included.")
appBlacklist = flag.String("collector.iis.app-blacklist", "", "Regexp of apps to blacklist. App name must both match whitelist and not match blacklist to be included.") appBlacklist = flag.String("collector.iis.app-blacklist", "", "Regexp of apps to blacklist. App name must both match whitelist and not match blacklist to be included.")
iis_version = simple_version{}
) )
type IISCollector struct { type IISCollector struct {
@@ -778,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.Println("[ERROR] failed collecting iis metrics:", desc, err) log.Errorf("[ERROR] failed collecting iis metrics:", desc, err)
return err return err
} }
return nil return nil
@@ -886,6 +923,10 @@ type Win32_PerfRawData_W3SVCW3WPCounterProvider_W3SVCW3WP struct {
MaximumThreadsCount uint64 MaximumThreadsCount uint64
TotalHTTPRequestsServed uint64 TotalHTTPRequestsServed uint64
ActiveRequests uint64 ActiveRequests uint64
}
type Win32_PerfRawData_W3SVCW3WPCounterProvider_W3SVCW3WP_IIS8 struct {
Name string
Percent401HTTPResponseSent uint64 Percent401HTTPResponseSent uint64
Percent403HTTPResponseSent uint64 Percent403HTTPResponseSent uint64
Percent404HTTPResponseSent uint64 Percent404HTTPResponseSent uint64
@@ -1567,6 +1608,22 @@ func (c *IISCollector) collect(ch chan<- prometheus.Metric) (*prometheus.Desc, e
float64(app.ActiveRequests), float64(app.ActiveRequests),
name, name,
) )
}
if iis_version.major >= 8 {
var dst_worker_iis8 []Win32_PerfRawData_W3SVCW3WPCounterProvider_W3SVCW3WP_IIS8
q = createQuery(&dst_worker_iis8, "Win32_PerfRawData_W3SVCW3WPCounterProvider_W3SVCW3WP", "")
if err := wmi.Query(q, &dst_worker_iis8); err != nil {
return nil, err
}
for _, app := range dst_worker_iis8 {
// Extract the apppool name from the format <PID>_<NAME>
name := workerProcessNameExtractor.ReplaceAllString(app.Name, "$1")
if name == "_Total" ||
c.appBlacklistPattern.MatchString(name) ||
!c.appWhitelistPattern.MatchString(name) {
continue
}
ch <- prometheus.MustNewConstMetric( ch <- prometheus.MustNewConstMetric(
c.RequestErrorsTotal, c.RequestErrorsTotal,
@@ -1624,7 +1681,7 @@ func (c *IISCollector) collect(ch chan<- prometheus.Metric) (*prometheus.Desc, e
float64(app.WebSocketConnectionsRejectedPerSec), float64(app.WebSocketConnectionsRejectedPerSec),
name, name,
) )
}
} }
var dst_cache []Win32_PerfRawData_W3SVC_WebServiceCache var dst_cache []Win32_PerfRawData_W3SVC_WebServiceCache

View File

@@ -1,6 +1,12 @@
package collector package collector
import "github.com/prometheus/client_golang/prometheus" import (
"bytes"
"reflect"
"strings"
"github.com/prometheus/client_golang/prometheus"
)
// ... // ...
const ( const (
@@ -18,3 +24,30 @@ type Collector interface {
// Get new metrics and expose them via prometheus registry. // Get new metrics and expose them via prometheus registry.
Collect(ch chan<- prometheus.Metric) (err error) Collect(ch chan<- prometheus.Metric) (err error)
} }
// This is adapted from StackExchange/wmi/wmi.go, and lets us change the class
// name being queried for:
// CreateQuery returns a WQL query string that queries all columns of src. where
// is an optional string that is appended to the query, to be used with WHERE
// clauses. In such a case, the "WHERE" string should appear at the beginning.
func createQuery(src interface{}, class, where string) string {
var b bytes.Buffer
b.WriteString("SELECT ")
s := reflect.Indirect(reflect.ValueOf(src))
t := s.Type()
if s.Kind() == reflect.Slice {
t = t.Elem()
}
if t.Kind() != reflect.Struct {
return ""
}
var fields []string
for i := 0; i < t.NumField(); i++ {
fields = append(fields, t.Field(i).Name)
}
b.WriteString(strings.Join(fields, ", "))
b.WriteString(" FROM ")
b.WriteString(class)
b.WriteString(" " + where)
return b.String()
}