Add filtering for available collectors
parent
399ce78c36
commit
d9683215e7
|
@ -53,10 +53,23 @@ var (
|
||||||
factories = make(map[string]func(config *NodeCollectorConfig, logger log.Logger) (Collector, error))
|
factories = make(map[string]func(config *NodeCollectorConfig, logger log.Logger) (Collector, error))
|
||||||
initiatedCollectorsMtx = sync.Mutex{}
|
initiatedCollectorsMtx = sync.Mutex{}
|
||||||
initiatedCollectors = make(map[string]Collector)
|
initiatedCollectors = make(map[string]Collector)
|
||||||
collectorState = make(map[string]*bool)
|
collectorStateGlobal = make(map[string]*bool)
|
||||||
|
availableCollectors = make([]string, 0)
|
||||||
forcedCollectors = map[string]bool{} // collectors which have been explicitly enabled or disabled
|
forcedCollectors = map[string]bool{} // collectors which have been explicitly enabled or disabled
|
||||||
)
|
)
|
||||||
|
|
||||||
|
func getDefaults() map[string]bool {
|
||||||
|
defaults := make(map[string]bool)
|
||||||
|
for k, v := range collectorStateGlobal {
|
||||||
|
defaults[k] = *v
|
||||||
|
}
|
||||||
|
return defaults
|
||||||
|
}
|
||||||
|
|
||||||
|
func GetAvailableCollectors() []string {
|
||||||
|
return availableCollectors
|
||||||
|
}
|
||||||
|
|
||||||
func registerCollector(collector string, isDefaultEnabled bool, factory func(config *NodeCollectorConfig, logger log.Logger) (Collector, error)) {
|
func registerCollector(collector string, isDefaultEnabled bool, factory func(config *NodeCollectorConfig, logger log.Logger) (Collector, error)) {
|
||||||
var helpDefaultState string
|
var helpDefaultState string
|
||||||
if isDefaultEnabled {
|
if isDefaultEnabled {
|
||||||
|
@ -64,13 +77,14 @@ func registerCollector(collector string, isDefaultEnabled bool, factory func(con
|
||||||
} else {
|
} else {
|
||||||
helpDefaultState = "disabled"
|
helpDefaultState = "disabled"
|
||||||
}
|
}
|
||||||
|
availableCollectors = append(availableCollectors, collector)
|
||||||
|
|
||||||
flagName := fmt.Sprintf("collector.%s", collector)
|
flagName := fmt.Sprintf("collector.%s", collector)
|
||||||
flagHelp := fmt.Sprintf("Enable the %s collector (default: %s).", collector, helpDefaultState)
|
flagHelp := fmt.Sprintf("Enable the %s collector (default: %s).", collector, helpDefaultState)
|
||||||
defaultValue := fmt.Sprintf("%v", isDefaultEnabled)
|
defaultValue := fmt.Sprintf("%v", isDefaultEnabled)
|
||||||
|
|
||||||
flag := kingpin.Flag(flagName, flagHelp).Default(defaultValue).Action(collectorFlagAction(collector)).Bool()
|
flag := kingpin.Flag(flagName, flagHelp).Default(defaultValue).Action(collectorFlagAction(collector)).Bool()
|
||||||
collectorState[collector] = flag
|
collectorStateGlobal[collector] = flag
|
||||||
|
|
||||||
factories[collector] = factory
|
factories[collector] = factory
|
||||||
}
|
}
|
||||||
|
@ -84,9 +98,9 @@ type NodeCollector struct {
|
||||||
// DisableDefaultCollectors sets the collector state to false for all collectors which
|
// DisableDefaultCollectors sets the collector state to false for all collectors which
|
||||||
// have not been explicitly enabled on the command line.
|
// have not been explicitly enabled on the command line.
|
||||||
func DisableDefaultCollectors() {
|
func DisableDefaultCollectors() {
|
||||||
for c := range collectorState {
|
for c := range collectorStateGlobal {
|
||||||
if _, ok := forcedCollectors[c]; !ok {
|
if _, ok := forcedCollectors[c]; !ok {
|
||||||
*collectorState[c] = false
|
*collectorStateGlobal[c] = false
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -106,12 +120,13 @@ func collectorFlagAction(collector string) func(ctx *kingpin.ParseContext) error
|
||||||
// NewNodeCollector creates a new NodeCollector.
|
// NewNodeCollector creates a new NodeCollector.
|
||||||
func NewNodeCollector(config *NodeCollectorConfig, logger log.Logger, filters ...string) (*NodeCollector, error) {
|
func NewNodeCollector(config *NodeCollectorConfig, logger log.Logger, filters ...string) (*NodeCollector, error) {
|
||||||
f := make(map[string]bool)
|
f := make(map[string]bool)
|
||||||
|
defaults := getDefaults()
|
||||||
for _, filter := range filters {
|
for _, filter := range filters {
|
||||||
enabled, exist := collectorState[filter]
|
enabled, exist := defaults[filter]
|
||||||
if !exist {
|
if !exist {
|
||||||
return nil, fmt.Errorf("missing collector: %s", filter)
|
return nil, fmt.Errorf("missing collector: %s", filter)
|
||||||
}
|
}
|
||||||
if !*enabled {
|
if !enabled {
|
||||||
return nil, fmt.Errorf("disabled collector: %s", filter)
|
return nil, fmt.Errorf("disabled collector: %s", filter)
|
||||||
}
|
}
|
||||||
f[filter] = true
|
f[filter] = true
|
||||||
|
@ -119,8 +134,8 @@ func NewNodeCollector(config *NodeCollectorConfig, logger log.Logger, filters ..
|
||||||
collectors := make(map[string]Collector)
|
collectors := make(map[string]Collector)
|
||||||
initiatedCollectorsMtx.Lock()
|
initiatedCollectorsMtx.Lock()
|
||||||
defer initiatedCollectorsMtx.Unlock()
|
defer initiatedCollectorsMtx.Unlock()
|
||||||
for key, enabled := range collectorState {
|
for key, enabled := range defaults {
|
||||||
if !*enabled || (len(f) > 0 && !f[key]) {
|
if !enabled || (len(f) > 0 && !f[key]) {
|
||||||
continue
|
continue
|
||||||
}
|
}
|
||||||
if collector, ok := initiatedCollectors[key]; ok {
|
if collector, ok := initiatedCollectors[key]; ok {
|
||||||
|
|
Loading…
Reference in New Issue