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

Merge pull request #196 from vishh/influxdb_batch_issue

Browse Source 
Fix bug in influxdb storage driver initialization.
This commit is contained in:
Rohit Jnagal 2014-08-27 15:44:21 -07:00
commit 25778bdbbf
2 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
storage/cache/memcache.go vendored
View File

@ -46,6 +46,7 @@ func (self *cachedStorageDriver) RecentStats(containerName string, numStats int)
return self.backend.RecentStats(containerName, numStats) return self.backend.RecentStats(containerName, numStats)
} }
// TODO(vishh): Calculate percentiles from cached stats instead of reaching the DB. This will make the UI truly independent of the backend storage.
func (self *cachedStorageDriver) Percentiles(containerName string, cpuUsagePercentiles []int, memUsagePercentiles []int) (*info.ContainerStatsPercentiles, error) { func (self *cachedStorageDriver) Percentiles(containerName string, cpuUsagePercentiles []int, memUsagePercentiles []int) (*info.ContainerStatsPercentiles, error) {
return self.backend.Percentiles(containerName, cpuUsagePercentiles, memUsagePercentiles) return self.backend.Percentiles(containerName, cpuUsagePercentiles, memUsagePercentiles)
} }

4
storagedriver.go
View File

@ -35,7 +35,7 @@ var argDbPassword = flag.String("storage_driver_password", "root", "database pas
var argDbHost = flag.String("storage_driver_host", "localhost:8086", "database host:port") var argDbHost = flag.String("storage_driver_host", "localhost:8086", "database host:port")
var argDbName = flag.String("storage_driver_db", "cadvisor", "database name") var argDbName = flag.String("storage_driver_db", "cadvisor", "database name")
var argDbIsSecure = flag.Bool("storage_driver_secure", false, "use secure connection with database") var argDbIsSecure = flag.Bool("storage_driver_secure", false, "use secure connection with database")
var argDbBufferDuration = flag.Duration("storage_driver_buffer_duration", 60*time.Second, "Writes in the storage driver will be bufferd for this duration, and committed to the non memory backends as a single transaction") var argDbBufferDuration = flag.Duration("storage_driver_buffer_duration", 60*time.Second, "Writes in the storage driver will be buffered for this duration, and committed to the non memory backends as a single transaction")
const statsRequestedByUI = 60 const statsRequestedByUI = 60
@ -69,7 +69,7 @@ func NewStorageDriver(driverName string) (storage.StorageDriver, error) {
*argDbPassword, *argDbPassword,
*argDbHost, *argDbHost,
*argDbIsSecure, *argDbIsSecure,
*argDbBufferDuration*time.Second, *argDbBufferDuration,
// TODO(monnand): One hour? Or user-defined? // TODO(monnand): One hour? Or user-defined?
1*time.Hour, 1*time.Hour,
) )