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

Merge pull request #314 from vishh/fix_influx

Browse Source 
Fix issue in influxdb driver
This commit is contained in:
Vish Kannan 2014-11-18 11:24:27 -08:00
commit ec5a39d30d
1 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
storage/influxdb/influxdb.go
View File

@ -62,22 +62,22 @@ const (
func (self *influxdbStorage) getSeriesDefaultValues( func (self *influxdbStorage) getSeriesDefaultValues(
ref info.ContainerReference, ref info.ContainerReference,
stats *info.ContainerStats, stats *info.ContainerStats,
columns []string, columns *[]string,
values []interface{}) { values *[]interface{}) {
// Timestamp // Timestamp
columns = append(columns, colTimestamp) *columns = append(*columns, colTimestamp)
values = append(values, stats.Timestamp.UnixNano()/1E3) *values = append(*values, stats.Timestamp.UnixNano()/1E3)
// Machine name // Machine name
columns = append(columns, colMachineName) *columns = append(*columns, colMachineName)
values = append(values, self.machineName) *values = append(*values, self.machineName)
// Container name // Container name
columns = append(columns, colContainerName) *columns = append(*columns, colContainerName)
if len(ref.Aliases) > 0 { if len(ref.Aliases) > 0 {
values = append(values, ref.Aliases[0]) *values = append(*values, ref.Aliases[0])
} else { } else {
values = append(values, ref.Name) *values = append(*values, ref.Name)
} }
} }
@ -91,7 +91,7 @@ func (self *influxdbStorage) containerFilesystemStatsToSeries(
for _, fsStat := range stats.Filesystem { for _, fsStat := range stats.Filesystem {
columns := make([]string, 0) columns := make([]string, 0)
values := make([]interface{}, 0) values := make([]interface{}, 0)
self.getSeriesDefaultValues(ref, stats, columns, values) self.getSeriesDefaultValues(ref, stats, &columns, &values)
columns = append(columns, colFsDevice) columns = append(columns, colFsDevice)
values = append(values, fsStat.Device) values = append(values, fsStat.Device)
@ -110,7 +110,7 @@ func (self *influxdbStorage) containerStatsToValues(
ref info.ContainerReference, ref info.ContainerReference,
stats *info.ContainerStats, stats *info.ContainerStats,
) (columns []string, values []interface{}) { ) (columns []string, values []interface{}) {
self.getSeriesDefaultValues(ref, stats, columns, values) self.getSeriesDefaultValues(ref, stats, &columns, &values)
// Cumulative Cpu Usage // Cumulative Cpu Usage
columns = append(columns, colCpuCumulativeUsage) columns = append(columns, colCpuCumulativeUsage)
values = append(values, stats.Cpu.Usage.Total) values = append(values, stats.Cpu.Usage.Total)