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

feat: Update NPS collector for go-kit logging

Browse Source 
Signed-off-by: Ben Reedy <breed808@breed808.com>
This commit is contained in:
Ben Reedy
2023-07-11 06:17:46 +10:00
parent 7115c9dc22
commit 95f250ed39
2 changed files with 16 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
collector/init.go
View File

@@ -276,9 +276,9 @@ var collectors = []collectorInit{
perfCounterFunc: nil, perfCounterFunc: nil,
}, },
{ {
name: "nps", name: "nps",
builder: newNPSCollector, builder: newNPSCollector,
perfCounterNames: nil, perfCounterFunc: nil,
}, },
{ {
name: "os", name: "os",

19
collector/nps.go
View File

@@ -1,7 +1,10 @@
package collector package collector
import ( import (
"github.com/prometheus-community/windows_exporter/log" "fmt"
"github.com/go-kit/log"
"github.com/go-kit/log/level"
"github.com/prometheus/client_golang/prometheus" "github.com/prometheus/client_golang/prometheus"
"github.com/yusufpapurcu/wmi" "github.com/yusufpapurcu/wmi"
) )
@@ -9,6 +12,8 @@ import (
// A npsCollector is a Prometheus collector for WMI Win32_PerfRawData_IAS_NPSAuthenticationServer and Win32_PerfRawData_IAS_NPSAccountingServer metrics // A npsCollector is a Prometheus collector for WMI Win32_PerfRawData_IAS_NPSAuthenticationServer and Win32_PerfRawData_IAS_NPSAccountingServer metrics
type npsCollector struct { type npsCollector struct {
logger log.Logger
AccessAccepts *prometheus.Desc AccessAccepts *prometheus.Desc
AccessChallenges *prometheus.Desc AccessChallenges *prometheus.Desc
AccessRejects *prometheus.Desc AccessRejects *prometheus.Desc
@@ -37,9 +42,11 @@ type npsCollector struct {
AccountingUnknownType *prometheus.Desc AccountingUnknownType *prometheus.Desc
} }
func newNPSCollector() (Collector, error) { func newNPSCollector(logger log.Logger) (Collector, error) {
const subsystem = "nps" const subsystem = "nps"
logger = log.With(logger, "collector", subsystem)
return &npsCollector{ return &npsCollector{
logger: logger,
AccessAccepts: prometheus.NewDesc( AccessAccepts: prometheus.NewDesc(
prometheus.BuildFQName(Namespace, subsystem, "access_accepts"), prometheus.BuildFQName(Namespace, subsystem, "access_accepts"),
"(AccessAccepts)", "(AccessAccepts)",
@@ -198,11 +205,11 @@ func newNPSCollector() (Collector, error) {
// to the provided prometheus Metric channel. // to the provided prometheus Metric channel.
func (c *npsCollector) Collect(ctx *ScrapeContext, ch chan<- prometheus.Metric) error { func (c *npsCollector) Collect(ctx *ScrapeContext, ch chan<- prometheus.Metric) error {
if desc, err := c.CollectAccept(ch); err != nil { if desc, err := c.CollectAccept(ch); err != nil {
log.Error("failed collecting NPS accept data:", desc, err) _ = level.Error(c.logger).Log("msg", fmt.Sprintf("failed collecting NPS accept data: %s %v", desc, err))
return err return err
} }
if desc, err := c.CollectAccounting(ch); err != nil { if desc, err := c.CollectAccounting(ch); err != nil {
log.Error("failed collecting NPS accounting data:", desc, err) _ = level.Error(c.logger).Log("msg", fmt.Sprintf("failed collecting NPS accounting data: %s %v", desc, err))
return err return err
} }
return nil return nil
@@ -249,7 +256,7 @@ type Win32_PerfRawData_IAS_NPSAccountingServer struct {
// to the provided prometheus Metric channel. // to the provided prometheus Metric channel.
func (c *npsCollector) CollectAccept(ch chan<- prometheus.Metric) (*prometheus.Desc, error) { func (c *npsCollector) CollectAccept(ch chan<- prometheus.Metric) (*prometheus.Desc, error) {
var dst []Win32_PerfRawData_IAS_NPSAuthenticationServer var dst []Win32_PerfRawData_IAS_NPSAuthenticationServer
q := queryAll(&dst) q := queryAll(&dst, c.logger)
if err := wmi.Query(q, &dst); err != nil { if err := wmi.Query(q, &dst); err != nil {
return nil, err return nil, err
} }
@@ -337,7 +344,7 @@ func (c *npsCollector) CollectAccept(ch chan<- prometheus.Metric) (*prometheus.D
func (c *npsCollector) CollectAccounting(ch chan<- prometheus.Metric) (*prometheus.Desc, error) { func (c *npsCollector) CollectAccounting(ch chan<- prometheus.Metric) (*prometheus.Desc, error) {
var dst []Win32_PerfRawData_IAS_NPSAccountingServer var dst []Win32_PerfRawData_IAS_NPSAccountingServer
q := queryAll(&dst) q := queryAll(&dst, c.logger)
if err := wmi.Query(q, &dst); err != nil { if err := wmi.Query(q, &dst); err != nil {
return nil, err return nil, err
} }