From d83615a818f9105d3fa03bc4ea178ec4902bdecf Mon Sep 17 00:00:00 2001 From: Steve Zook Date: Fri, 3 Aug 2018 09:48:32 -0400 Subject: [PATCH] reorder functions so that the two functions that list available child collectors are next to each other - should make less likely to not miss editing one of those when adding additional wmi classes also removed the 'filter' from the `mssqlFilterAvailableClassCollectors` function as it's not filtering anyting. --- collector/mssql.go | 32 ++++++++++++++++---------------- 1 file changed, 16 insertions(+), 16 deletions(-) diff --git a/collector/mssql.go b/collector/mssql.go index dcb759c7..b1761cf9 100644 --- a/collector/mssql.go +++ b/collector/mssql.go @@ -37,7 +37,7 @@ var ( mssqlEnabledCollectors = kingpin.Flag( "collectors.mssql.classes-enabled", "Comma-separated list of mssql WMI classes to use."). - Default(mssqlFilterAvailableClassCollectors()).String() + Default(mssqlAvailableClassCollectors()).String() mssqlPrintCollectors = kingpin.Flag( "collectors.mssql.class-print", @@ -80,10 +80,24 @@ func getMSSQLInstances() mssqlInstancesType { type mssqlCollectorsMap map[string]mssqlCollectorFunc -func mssqlFilterAvailableClassCollectors() string { +func mssqlAvailableClassCollectors() string { return "availreplica,bufman,databases,dbreplica,genstats,locks,memmgr,sqlstats" } +func (c *MSSQLCollector) getMSSQLCollectors() mssqlCollectorsMap { + mssqlCollectors := make(mssqlCollectorsMap) + mssqlCollectors["availreplica"] = c.collectAvailabilityReplica + mssqlCollectors["bufman"] = c.collectBufferManager + mssqlCollectors["databases"] = c.collectDatabases + mssqlCollectors["dbreplica"] = c.collectDatabaseReplica + mssqlCollectors["genstats"] = c.collectGeneralStatistics + mssqlCollectors["locks"] = c.collectLocks + mssqlCollectors["memmgr"] = c.collectMemoryManager + mssqlCollectors["sqlstats"] = c.collectSQLStats + + return mssqlCollectors +} + func mssqlExpandEnabledCollectors(enabled string) []string { separated := strings.Split(enabled, ",") unique := map[string]bool{} @@ -99,20 +113,6 @@ func mssqlExpandEnabledCollectors(enabled string) []string { return result } -func (c *MSSQLCollector) getMSSQLCollectors() mssqlCollectorsMap { - mssqlCollectors := make(mssqlCollectorsMap) - mssqlCollectors["availreplica"] = c.collectAvailabilityReplica - mssqlCollectors["bufman"] = c.collectBufferManager - mssqlCollectors["databases"] = c.collectDatabases - mssqlCollectors["dbreplica"] = c.collectDatabaseReplica - mssqlCollectors["genstats"] = c.collectGeneralStatistics - mssqlCollectors["locks"] = c.collectLocks - mssqlCollectors["memmgr"] = c.collectMemoryManager - mssqlCollectors["sqlstats"] = c.collectSQLStats - - return mssqlCollectors -} - func init() { Factories["mssql"] = NewMSSQLCollector }