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

Two small fixes to custom metric collection.

Browse Source 
- a typo in minPollingFrequency multiplies it with time.Second twice.
- Updating custom metrics is unnecessarily called for all containers.
This commit is contained in:
Rohit Jnagal 2015-07-23 01:56:07 +00:00
parent a123fd72d8
commit 3f8e065947
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
collector/generic_collector.go
View File

@ -100,7 +100,7 @@ func (collector *GenericCollector) Name() string {
//Returns collected metrics and the next collection time of the collector //Returns collected metrics and the next collection time of the collector
func (collector *GenericCollector) Collect() (time.Time, []v1.Metric, error) { func (collector *GenericCollector) Collect() (time.Time, []v1.Metric, error) {
currentTime := time.Now() currentTime := time.Now()
nextCollectionTime := currentTime.Add(time.Duration(collector.info.minPollingFrequency * time.Second)) nextCollectionTime := currentTime.Add(time.Duration(collector.info.minPollingFrequency))
uri := collector.configFile.Endpoint uri := collector.configFile.Endpoint
response, err := http.Get(uri) response, err := http.Get(uri)

4
manager/container.go
View File

@ -486,8 +486,8 @@ func (c *containerData) updateStats() error {
} }
} }
var customStatsErr error var customStatsErr error
if c.collectorManager != nil { cm := c.collectorManager.(*collector.GenericCollectorManager)
cm := c.collectorManager.(*collector.GenericCollectorManager) if len(cm.Collectors) > 0 {
if cm.NextCollectionTime.Before(time.Now()) { if cm.NextCollectionTime.Before(time.Now()) {
customStats, err := c.updateCustomStats() customStats, err := c.updateCustomStats()
if customStats != nil { if customStats != nil {