Merge pull request #47 from prometheus/flag-cleanup
Make collector-specific flags consistent with others.
This commit is contained in:
commit
0c8bfba04d
11
README.md
11
README.md
|
@ -17,7 +17,7 @@ collectors.
|
||||||
By default the build will include the native collectors that expose information
|
By default the build will include the native collectors that expose information
|
||||||
from /proc.
|
from /proc.
|
||||||
|
|
||||||
Which collectors are used is controlled by the `--enabledCollectors` flag.
|
Which collectors are used is controlled by the `--collectors.enabled` flag.
|
||||||
|
|
||||||
### Enabled by default
|
### Enabled by default
|
||||||
|
|
||||||
|
@ -31,7 +31,7 @@ meminfo | Exposes memory statistics from /proc/meminfo.
|
||||||
netdev | Exposes network interface statistics from /proc/netstat, such as bytes transferred.
|
netdev | Exposes network interface statistics from /proc/netstat, such as bytes transferred.
|
||||||
netstat | Exposes network statistics from /proc/net/netstat. This is the same information as `netstat -s`.
|
netstat | Exposes network statistics from /proc/net/netstat. This is the same information as `netstat -s`.
|
||||||
stat | Exposes various statistics from /proc/stat. This includes CPU usage, boot time, forks and interrupts.
|
stat | Exposes various statistics from /proc/stat. This includes CPU usage, boot time, forks and interrupts.
|
||||||
textfile | Exposes statistics read from local disk. The `--textfile.directory` flag must be set.
|
textfile | Exposes statistics read from local disk. The `--collector.textfile.directory` flag must be set.
|
||||||
time | Exposes the current system time.
|
time | Exposes the current system time.
|
||||||
|
|
||||||
|
|
||||||
|
@ -55,9 +55,10 @@ to export static metrics, such as what role a machine has. The Pushgateway
|
||||||
should be used for service-level metrics. The textfile module is for metrics
|
should be used for service-level metrics. The textfile module is for metrics
|
||||||
that are tied to a machine.
|
that are tied to a machine.
|
||||||
|
|
||||||
To use set the `--textfile.directory` flag on the Node exporter. The collector
|
To use set the `--collector.textfile.directory` flag on the Node exporter. The
|
||||||
will parse all files in that directory matching the glob `*.prom` using the
|
collector will parse all files in that directory matching the glob `*.prom`
|
||||||
[text format](http://prometheus.io/docs/instrumenting/exposition_formats/).
|
using the [text
|
||||||
|
format](http://prometheus.io/docs/instrumenting/exposition_formats/).
|
||||||
|
|
||||||
To atomically push completion time for a cron job:
|
To atomically push completion time for a cron job:
|
||||||
```
|
```
|
||||||
|
|
|
@ -22,7 +22,7 @@ const (
|
||||||
)
|
)
|
||||||
|
|
||||||
var (
|
var (
|
||||||
ignoredDevices = flag.String("diskstatsIgnoredDevices", "^(ram|loop|fd|(h|s|v|xv)d[a-z])\\d+$", "Regexp of devices to ignore for diskstats.")
|
ignoredDevices = flag.String("collector.diskstats.ignored-devices", "^(ram|loop|fd|(h|s|v|xv)d[a-z])\\d+$", "Regexp of devices to ignore for diskstats.")
|
||||||
)
|
)
|
||||||
|
|
||||||
type diskstatsCollector struct {
|
type diskstatsCollector struct {
|
||||||
|
|
|
@ -21,7 +21,7 @@ const (
|
||||||
)
|
)
|
||||||
|
|
||||||
var (
|
var (
|
||||||
ignoredMountPoints = flag.String("filesystemIgnoredMountPoints", "^/(sys|proc|dev)($|/)", "Regexp of mount points to ignore for filesystem collector.")
|
ignoredMountPoints = flag.String("collector.filesystem.ignored-mount-points", "^/(sys|proc|dev)($|/)", "Regexp of mount points to ignore for filesystem collector.")
|
||||||
)
|
)
|
||||||
|
|
||||||
type filesystemCollector struct {
|
type filesystemCollector struct {
|
||||||
|
|
|
@ -13,7 +13,7 @@ import (
|
||||||
)
|
)
|
||||||
|
|
||||||
var (
|
var (
|
||||||
ntpServer = flag.String("ntpServer", "", "NTP server to use for ntp collector.")
|
ntpServer = flag.String("collector.ntp.server", "", "NTP server to use for ntp collector.")
|
||||||
)
|
)
|
||||||
|
|
||||||
type ntpCollector struct {
|
type ntpCollector struct {
|
||||||
|
|
|
@ -20,7 +20,7 @@ import (
|
||||||
)
|
)
|
||||||
|
|
||||||
var (
|
var (
|
||||||
textFileDirectory = flag.String("textfile.directory", "", "Directory to read text files with metrics from.")
|
textFileDirectory = flag.String("collector.textfile.directory", "", "Directory to read text files with metrics from.")
|
||||||
)
|
)
|
||||||
|
|
||||||
type textFileCollector struct {
|
type textFileCollector struct {
|
||||||
|
|
Loading…
Reference in New Issue