Replace --collectors.enabled with per-collector flags (#640)
* Move NodeCollector into package collector * Refactor collector enabling * Update README with new collector enabled flags * Fix out-of-date inline flag reference syntax * Use new flags in end-to-end tests * Add flag to disable all default collectors * Track if a flag has been set explicitly * Add --collectors.disable-defaults to README * Revert disable-defaults flag * Shorten flags * Fixup timex collector registration * Fix end-to-end tests * Change procfs and sysfs path flags * Fix review comments
This commit is contained in:
parent
3762191e66
commit
859a825bb8
58 changed files with 410 additions and 406 deletions
|
|
@ -34,7 +34,7 @@ type drbdNumericalMetric struct {
|
|||
func newDRBDNumericalMetric(name string, desc string, valueType prometheus.ValueType, multiplier float64) drbdNumericalMetric {
|
||||
return drbdNumericalMetric{
|
||||
desc: prometheus.NewDesc(
|
||||
prometheus.BuildFQName(Namespace, "drbd", name),
|
||||
prometheus.BuildFQName(namespace, "drbd", name),
|
||||
desc,
|
||||
[]string{"device"}, nil),
|
||||
valueType: valueType,
|
||||
|
|
@ -58,7 +58,7 @@ func (metric *drbdStringPairMetric) isOkay(value string) float64 {
|
|||
func newDRBDStringPairMetric(name string, desc string, valueOkay string) drbdStringPairMetric {
|
||||
return drbdStringPairMetric{
|
||||
desc: prometheus.NewDesc(
|
||||
prometheus.BuildFQName(Namespace, "drbd", name),
|
||||
prometheus.BuildFQName(namespace, "drbd", name),
|
||||
desc,
|
||||
[]string{"device", "node"}, nil),
|
||||
valueOkay: valueOkay,
|
||||
|
|
@ -140,7 +140,7 @@ var (
|
|||
}
|
||||
|
||||
drbdConnected = prometheus.NewDesc(
|
||||
prometheus.BuildFQName(Namespace, "drbd", "connected"),
|
||||
prometheus.BuildFQName(namespace, "drbd", "connected"),
|
||||
"Whether DRBD is connected to the peer.",
|
||||
[]string{"device"}, nil)
|
||||
)
|
||||
|
|
@ -148,7 +148,7 @@ var (
|
|||
type drbdCollector struct{}
|
||||
|
||||
func init() {
|
||||
Factories["drbd"] = newDRBDCollector
|
||||
registerCollector("drbd", defaultDisabled, newDRBDCollector)
|
||||
}
|
||||
|
||||
func newDRBDCollector() (Collector, error) {
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue