chore(deps): update golangci/golangci-lint-action action to v7 (#1976)

Signed-off-by: Jan-Otto Kröpke <mail@jkroepke.de>
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
Co-authored-by: Jan-Otto Kröpke <mail@jkroepke.de>
This commit is contained in:
renovate[bot]
2025-04-05 11:55:10 +02:00
committed by GitHub
parent ecc805f0fa
commit 6471f3985a
12 changed files with 125 additions and 137 deletions

View File

@@ -40,7 +40,7 @@ const (
subCollectorAutoDiscover = "Autodiscover"
subCollectorWorkloadManagement = "WorkloadManagement"
subCollectorRpcClientAccess = "RpcClientAccess"
subCollectorMapiHttpEmsmdb = "MapiHttpEmsmdb"
subCollectorMapiHTTPEmsmdb = "MapiHttpEmsmdb"
)
type Config struct {
@@ -59,7 +59,7 @@ var ConfigDefaults = Config{
subCollectorAutoDiscover,
subCollectorWorkloadManagement,
subCollectorRpcClientAccess,
subCollectorMapiHttpEmsmdb,
subCollectorMapiHTTPEmsmdb,
},
}
@@ -74,7 +74,7 @@ type Collector struct {
collectorAutoDiscover
collectorAvailabilityService
collectorHTTPProxy
collectorMapiHttpEmsmdb
collectorMapiHTTPEmsMDB
collectorOWA
collectorRpcClientAccess
collectorTransportQueues
@@ -129,7 +129,7 @@ func NewWithFlags(app *kingpin.Application) *Collector {
subCollectorAutoDiscover: "[29240] MSExchange Autodiscover",
subCollectorWorkloadManagement: "[19430] MSExchange WorkloadManagement Workloads",
subCollectorRpcClientAccess: "[29336] MSExchange RpcClientAccess",
subCollectorMapiHttpEmsmdb: "[26463] MSExchange MapiHttp Emsmdb",
subCollectorMapiHTTPEmsmdb: "[26463] MSExchange MapiHttp Emsmdb",
}
sb := strings.Builder{}
@@ -219,10 +219,10 @@ func (c *Collector) Build(_ *slog.Logger, _ *mi.Session) error {
collect: c.collectRpcClientAccess,
close: c.perfDataCollectorRpcClientAccess.Close,
},
subCollectorMapiHttpEmsmdb: {
build: c.buildMapiHttpEmsmdb,
collect: c.collectMapiHttpEmsmdb,
close: c.perfDataCollectorMapiHttpEmsmdb.Close,
subCollectorMapiHTTPEmsmdb: {
build: c.buildMapiHTTPEmsMDB,
collect: c.collectMapiHTTPEmsMDB,
close: c.perfDataCollectorMapiHTTPEmsMDB.Close,
},
}

View File

@@ -23,26 +23,26 @@ import (
"github.com/prometheus/client_golang/prometheus"
)
type collectorMapiHttpEmsmdb struct {
perfDataCollectorMapiHttpEmsmdb *pdh.Collector
perfDataObjectMapiHttpEmsmdb []perfDataCounterValuesMapiHttpEmsmdb
type collectorMapiHTTPEmsMDB struct {
perfDataCollectorMapiHTTPEmsMDB *pdh.Collector
perfDataObjectMapiHTTPEmsMDB []perfDataCounterValuesMapiHTTPEmsMDB
activeUserCountMapiHttpEmsMDB *prometheus.Desc
activeUserCountMapiHTTPEmsMDB *prometheus.Desc
}
type perfDataCounterValuesMapiHttpEmsmdb struct {
type perfDataCounterValuesMapiHTTPEmsMDB struct {
ActiveUserCount float64 `perfdata:"Active User Count"`
}
func (c *Collector) buildMapiHttpEmsmdb() error {
func (c *Collector) buildMapiHTTPEmsMDB() error {
var err error
c.perfDataCollectorMapiHttpEmsmdb, err = pdh.NewCollector[perfDataCounterValuesMapiHttpEmsmdb](pdh.CounterTypeRaw, "MSExchange MapiHttp Emsmdb", pdh.InstancesAll)
c.perfDataCollectorMapiHTTPEmsMDB, err = pdh.NewCollector[perfDataCounterValuesMapiHTTPEmsMDB](pdh.CounterTypeRaw, "MSExchange MapiHttp Emsmdb", pdh.InstancesAll)
if err != nil {
return fmt.Errorf("failed to create MSExchange MapiHttp Emsmdb: %w", err)
}
c.activeUserCountMapiHttpEmsMDB = prometheus.NewDesc(
c.activeUserCountMapiHTTPEmsMDB = prometheus.NewDesc(
prometheus.BuildFQName(types.Namespace, Name, "mapihttp_emsmdb_active_user_count"),
"Number of unique outlook users that have shown some kind of activity in the last 2 minutes",
nil,
@@ -52,15 +52,15 @@ func (c *Collector) buildMapiHttpEmsmdb() error {
return nil
}
func (c *Collector) collectMapiHttpEmsmdb(ch chan<- prometheus.Metric) error {
err := c.perfDataCollectorMapiHttpEmsmdb.Collect(&c.perfDataObjectMapiHttpEmsmdb)
func (c *Collector) collectMapiHTTPEmsMDB(ch chan<- prometheus.Metric) error {
err := c.perfDataCollectorMapiHTTPEmsMDB.Collect(&c.perfDataObjectMapiHTTPEmsMDB)
if err != nil {
return fmt.Errorf("failed to collect MSExchange MapiHttp Emsmdb metrics: %w", err)
}
for _, data := range c.perfDataObjectMapiHttpEmsmdb {
for _, data := range c.perfDataObjectMapiHTTPEmsMDB {
ch <- prometheus.MustNewConstMetric(
c.activeUserCountMapiHttpEmsMDB,
c.activeUserCountMapiHTTPEmsMDB,
prometheus.GaugeValue,
data.ActiveUserCount,
)