From 4e460bc24c3668fbef641a187162073cd5da2ecb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jan-Otto=20Kr=C3=B6pke?= Date: Sat, 17 Aug 2024 21:00:05 +0200 Subject: [PATCH] exchange: enable all collectors as default (#1572) --- config.yaml | 7 +++++ pkg/collector/exchange/exchange.go | 47 +++++++++++++----------------- 2 files changed, 27 insertions(+), 27 deletions(-) create mode 100644 config.yaml diff --git a/config.yaml b/config.yaml new file mode 100644 index 00000000..bbb26da7 --- /dev/null +++ b/config.yaml @@ -0,0 +1,7 @@ +collectors: + enabled: cpu,cpu_info,cs,exchange,iis,logical_disk,logon,memory,net,os,process,remote_fx,service,system,tcp,time,terminal_services,textfile +collector: + service: + services-where: "Name='windows_exporter'" +log: + level: warn \ No newline at end of file diff --git a/pkg/collector/exchange/exchange.go b/pkg/collector/exchange/exchange.go index de246298..fd6b3a56 100644 --- a/pkg/collector/exchange/exchange.go +++ b/pkg/collector/exchange/exchange.go @@ -23,7 +23,18 @@ type Config struct { } var ConfigDefaults = Config{ - CollectorsEnabled: []string{}, + CollectorsEnabled: []string{ + "ADAccessProcesses", + "TransportQueues", + "HttpProxy", + "ActiveSync", + "AvailabilityService", + "OutlookWebAccess", + "Autodiscover", + "WorkloadManagement", + "RpcClientAccess", + "MapiHttpEmsmdb", + }, } type Collector struct { @@ -72,20 +83,6 @@ type Collector struct { enabledCollectors []string } -// All available Collector functions. -var exchangeAllCollectorNames = []string{ - "ADAccessProcesses", - "TransportQueues", - "HttpProxy", - "ActiveSync", - "AvailabilityService", - "OutlookWebAccess", - "Autodiscover", - "WorkloadManagement", - "RpcClientAccess", - "MapiHttpEmsmdb", -} - func New(logger log.Logger, config *Config) *Collector { if config == nil { config = &ConfigDefaults @@ -141,7 +138,7 @@ func NewWithFlags(app *kingpin.Application) *Collector { sb := strings.Builder{} sb.WriteString(fmt.Sprintf("%-32s %-32s\n", "Collector Name", "[PerfID] Perflib Object")) - for _, cname := range exchangeAllCollectorNames { + for _, cname := range ConfigDefaults.CollectorsEnabled { sb.WriteString(fmt.Sprintf("%-32s %-32s\n", cname, collectorDesc[cname])) } @@ -239,22 +236,18 @@ func (c *Collector) Build() error { c.syncCommandsPerSec = desc("activesync_sync_cmds_total", "Number of sync commands processed per second. Clients use this command to synchronize items within a folder") c.activeUserCountMapiHttpEmsMDB = desc("mapihttp_emsmdb_active_user_count", "Number of unique outlook users that have shown some kind of activity in the last 2 minutes") - if len(c.config.CollectorsEnabled) == 0 { - c.enabledCollectors = exchangeAllCollectorNames - } else { - c.enabledCollectors = make([]string, 0, len(exchangeAllCollectorNames)) + c.enabledCollectors = make([]string, 0, len(ConfigDefaults.CollectorsEnabled)) - for _, collectorName := range c.config.CollectorsEnabled { - if !slices.Contains(exchangeAllCollectorNames, collectorName) { - return fmt.Errorf("unknown exchange collector: %s", collectorName) - } - - c.enabledCollectors = append(c.enabledCollectors, collectorName) + for _, collectorName := range c.config.CollectorsEnabled { + if !slices.Contains(ConfigDefaults.CollectorsEnabled, collectorName) { + return fmt.Errorf("unknown exchange collector: %s", collectorName) } - c.enabledCollectors = slices.Clip(c.enabledCollectors) + c.enabledCollectors = append(c.enabledCollectors, collectorName) } + c.enabledCollectors = slices.Clip(c.enabledCollectors) + return nil }