prometheus/cadvisor
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge pull request #581 from juliusv/fix-metrics

Browse Source 
Fix Prometheus metrics and typo in container info stats
This commit is contained in:
Victor Marmol 2015-03-12 14:16:27 -07:00
commit cf9c76c06c
2 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
info/v1/container.go
View File

@ -228,7 +228,7 @@ type LoadStats struct {
NrStopped uint64 `json:"nr_stopped"` NrStopped uint64 `json:"nr_stopped"`
// Number of tasks in uninterruptible state // Number of tasks in uninterruptible state
NrUinterruptible uint64 `json:"nr_uninterruptible"` NrUninterruptible uint64 `json:"nr_uninterruptible"`
// Number of tasks waiting on IO // Number of tasks waiting on IO
NrIoWait uint64 `json:"nr_io_wait"` NrIoWait uint64 `json:"nr_io_wait"`

12
metrics/prometheus.go
View File

@ -183,7 +183,7 @@ func NewPrometheusCollector(manager manager.Manager) *PrometheusCollector {
nil), nil),
fsWeightedIoTime: prometheus.NewDesc( fsWeightedIoTime: prometheus.NewDesc(
"container_fs_io_time_weighted_seconds_total", "container_fs_io_time_weighted_seconds_total",
"Cumulative count of seconds spent doing I/Os", "Cumulative weighted I/O time in seconds",
[]string{"name", "id", "device"}, []string{"name", "id", "device"},
nil), nil),
networkRxBytes: prometheus.NewDesc( networkRxBytes: prometheus.NewDesc(
@ -198,7 +198,7 @@ func NewPrometheusCollector(manager manager.Manager) *PrometheusCollector {
nil), nil),
networkRxDropped: prometheus.NewDesc( networkRxDropped: prometheus.NewDesc(
"container_network_receive_packets_dropped_total", "container_network_receive_packets_dropped_total",
"Cumulative count of bytes received", "Cumulative count of packets dropped while receiving",
[]string{"name", "id"}, []string{"name", "id"},
nil), nil),
networkRxErrors: prometheus.NewDesc( networkRxErrors: prometheus.NewDesc(
@ -218,7 +218,7 @@ func NewPrometheusCollector(manager manager.Manager) *PrometheusCollector {
nil), nil),
networkTxDropped: prometheus.NewDesc( networkTxDropped: prometheus.NewDesc(
"container_network_transmit_packets_dropped_total", "container_network_transmit_packets_dropped_total",
"Cumulative count of bytes dropped", "Cumulative count of packets dropped while transmitting",
[]string{"name", "id"}, []string{"name", "id"},
nil), nil),
networkTxErrors: prometheus.NewDesc( networkTxErrors: prometheus.NewDesc(
@ -311,7 +311,7 @@ func (c *PrometheusCollector) Collect(ch chan<- prometheus.Metric) {
{valueType: prometheus.GaugeValue, labels: []string{"sleeping"}, value: float64(stats.TaskStats.NrSleeping)}, {valueType: prometheus.GaugeValue, labels: []string{"sleeping"}, value: float64(stats.TaskStats.NrSleeping)},
{valueType: prometheus.GaugeValue, labels: []string{"running"}, value: float64(stats.TaskStats.NrRunning)}, {valueType: prometheus.GaugeValue, labels: []string{"running"}, value: float64(stats.TaskStats.NrRunning)},
{valueType: prometheus.GaugeValue, labels: []string{"stopped"}, value: float64(stats.TaskStats.NrStopped)}, {valueType: prometheus.GaugeValue, labels: []string{"stopped"}, value: float64(stats.TaskStats.NrStopped)},
{valueType: prometheus.GaugeValue, labels: []string{"uninterruptible"}, value: float64(stats.TaskStats.NrUinterruptible)}, {valueType: prometheus.GaugeValue, labels: []string{"uninterruptible"}, value: float64(stats.TaskStats.NrUninterruptible)},
{valueType: prometheus.GaugeValue, labels: []string{"iowaiting"}, value: float64(stats.TaskStats.NrIoWait)}, {valueType: prometheus.GaugeValue, labels: []string{"iowaiting"}, value: float64(stats.TaskStats.NrIoWait)},
}, },
@ -351,8 +351,8 @@ func (c *PrometheusCollector) Collect(ch chan<- prometheus.Metric) {
c.fsWritesMerged: {valueType: prometheus.CounterValue, value: float64(stat.WritesMerged)}, c.fsWritesMerged: {valueType: prometheus.CounterValue, value: float64(stat.WritesMerged)},
c.fsWriteTime: {valueType: prometheus.CounterValue, value: float64(stat.WriteTime) / float64(time.Second)}, c.fsWriteTime: {valueType: prometheus.CounterValue, value: float64(stat.WriteTime) / float64(time.Second)},
c.fsIoTime: {valueType: prometheus.CounterValue, value: float64(stat.IoInProgress) / float64(time.Second)}, c.fsIoTime: {valueType: prometheus.CounterValue, value: float64(stat.IoTime) / float64(time.Second)},
c.fsWeightedIoTime: {valueType: prometheus.CounterValue, value: float64(stat.IoTime) / float64(time.Second)}, c.fsWeightedIoTime: {valueType: prometheus.CounterValue, value: float64(stat.WeightedIoTime) / float64(time.Second)},
c.fsIoInProgress: {valueType: prometheus.GaugeValue, value: float64(stat.IoInProgress)}, c.fsIoInProgress: {valueType: prometheus.GaugeValue, value: float64(stat.IoInProgress)},
c.fsLimit: {valueType: prometheus.GaugeValue, value: float64(stat.Limit)}, c.fsLimit: {valueType: prometheus.GaugeValue, value: float64(stat.Limit)},