ston1th/node_exporter
0
0
Fork 0
Code Issues Releases Activity

Replace --collectors.enabled with per-collector flags (#640)

Browse source 
* 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:
Calle Pettersson 2017-09-28 15:06:26 +02:00 • committed by Johannes 'fish' Ziemke
commit 859a825bb8
58 changed files with 410 additions and 406 deletions
Download patch file Download diff file Expand all files Collapse all files

18
collector/diskstats_darwin.go
View file

@ -36,7 +36,7 @@ type diskstatsCollector struct {
}
func init() {
Factories["diskstats"] = NewDiskstatsCollector
registerCollector("diskstats", defaultEnabled, NewDiskstatsCollector)
}
// NewDiskstatsCollector returns a new Collector exposing disk device stats.
@ -48,7 +48,7 @@ func NewDiskstatsCollector() (Collector, error) {
{
typedDesc: typedDesc{
desc: prometheus.NewDesc(
prometheus.BuildFQName(Namespace, diskSubsystem, "reads_completed_total"),
prometheus.BuildFQName(namespace, diskSubsystem, "reads_completed_total"),
"The total number of reads completed successfully.",
diskLabelNames,
nil,
@ -62,7 +62,7 @@ func NewDiskstatsCollector() (Collector, error) {
{
typedDesc: typedDesc{
desc: prometheus.NewDesc(
prometheus.BuildFQName(Namespace, diskSubsystem, "read_sectors_total"),
prometheus.BuildFQName(namespace, diskSubsystem, "read_sectors_total"),
"The total number of sectors read successfully.",
diskLabelNames,
nil,
@ -76,7 +76,7 @@ func NewDiskstatsCollector() (Collector, error) {
{
typedDesc: typedDesc{
desc: prometheus.NewDesc(
prometheus.BuildFQName(Namespace, diskSubsystem, "read_seconds_total"),
prometheus.BuildFQName(namespace, diskSubsystem, "read_seconds_total"),
"The total number of seconds spent by all reads.",
diskLabelNames,
nil,
@ -90,7 +90,7 @@ func NewDiskstatsCollector() (Collector, error) {
{
typedDesc: typedDesc{
desc: prometheus.NewDesc(
prometheus.BuildFQName(Namespace, diskSubsystem, "writes_completed_total"),
prometheus.BuildFQName(namespace, diskSubsystem, "writes_completed_total"),
"The total number of writes completed successfully.",
diskLabelNames,
nil,
@ -104,7 +104,7 @@ func NewDiskstatsCollector() (Collector, error) {
{
typedDesc: typedDesc{
desc: prometheus.NewDesc(
prometheus.BuildFQName(Namespace, diskSubsystem, "written_sectors_total"),
prometheus.BuildFQName(namespace, diskSubsystem, "written_sectors_total"),
"The total number of sectors written successfully.",
diskLabelNames,
nil,
@ -118,7 +118,7 @@ func NewDiskstatsCollector() (Collector, error) {
{
typedDesc: typedDesc{
desc: prometheus.NewDesc(
prometheus.BuildFQName(Namespace, diskSubsystem, "write_seconds_total"),
prometheus.BuildFQName(namespace, diskSubsystem, "write_seconds_total"),
"This is the total number of seconds spent by all writes.",
diskLabelNames,
nil,
@ -132,7 +132,7 @@ func NewDiskstatsCollector() (Collector, error) {
{
typedDesc: typedDesc{
desc: prometheus.NewDesc(
prometheus.BuildFQName(Namespace, diskSubsystem, "read_bytes_total"),
prometheus.BuildFQName(namespace, diskSubsystem, "read_bytes_total"),
"The total number of bytes read successfully.",
diskLabelNames,
nil,
@ -146,7 +146,7 @@ func NewDiskstatsCollector() (Collector, error) {
{
typedDesc: typedDesc{
desc: prometheus.NewDesc(
prometheus.BuildFQName(Namespace, diskSubsystem, "written_bytes_total"),
prometheus.BuildFQName(namespace, diskSubsystem, "written_bytes_total"),
"The total number of bytes written successfully.",
diskLabelNames,
nil,