Skip to content

Fix issue in influxdb driver #314

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Nov 18, 2014
+11 −11
Merged

Fix issue in influxdb driver #314

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
22 changes: 11 additions & 11 deletions storage/influxdb/influxdb.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,22 +62,22 @@ const (
func (self *influxdbStorage) getSeriesDefaultValues(
Copy link
Contributor

@vmarmol vmarmol Nov 18, 2014

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Looks okay for now. It may make sense for these to be returned rather than passed as pointers though.

Copy link
Contributor Author

@vishh vishh Nov 18, 2014

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Ack.

ref info.ContainerReference,
stats *info.ContainerStats,
columns []string,
values []interface{}) {
columns *[]string,
values *[]interface{}) {
// Timestamp
columns = append(columns, colTimestamp)
values = append(values, stats.Timestamp.UnixNano()/1E3)
*columns = append(*columns, colTimestamp)
*values = append(*values, stats.Timestamp.UnixNano()/1E3)

// Machine name
columns = append(columns, colMachineName)
values = append(values, self.machineName)
*columns = append(*columns, colMachineName)
*values = append(*values, self.machineName)

// Container name
columns = append(columns, colContainerName)
*columns = append(*columns, colContainerName)
if len(ref.Aliases) > 0 {
values = append(values, ref.Aliases[0])
*values = append(*values, ref.Aliases[0])
} else {
values = append(values, ref.Name)
*values = append(*values, ref.Name)
}
}

Expand All @@ -91,7 +91,7 @@ func (self *influxdbStorage) containerFilesystemStatsToSeries(
for _, fsStat := range stats.Filesystem {
columns := make([]string, 0)
values := make([]interface{}, 0)
self.getSeriesDefaultValues(ref, stats, columns, values)
self.getSeriesDefaultValues(ref, stats, &columns, &values)

columns = append(columns, colFsDevice)
values = append(values, fsStat.Device)
Expand All @@ -110,7 +110,7 @@ func (self *influxdbStorage) containerStatsToValues(
ref info.ContainerReference,
stats *info.ContainerStats,
) (columns []string, values []interface{}) {
self.getSeriesDefaultValues(ref, stats, columns, values)
self.getSeriesDefaultValues(ref, stats, &columns, &values)
// Cumulative Cpu Usage
columns = append(columns, colCpuCumulativeUsage)
values = append(values, stats.Cpu.Usage.Total)
Expand Down