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

Merge pull request #818 from anushree-n/changeCollect

Browse Source 
Modification in Collect() method of GenericCollector
This commit is contained in:
Rohit Jnagal 2015-07-20 07:29:55 -07:00
commit f6933972a5
1 changed files with 9 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
collector/generic_collector.go
View File

@ -66,10 +66,16 @@ func NewCollector(collectorName string, configfile string) (*GenericCollector, e
} }
minPollFrequency := configInJSON.MetricsConfig[0].PollingFrequency minPollFrequency := configInJSON.MetricsConfig[0].PollingFrequency
//set minPollFrequency to housekeepingInterval if config returns minpollFrequency=0
if minPollFrequency == 0 {
minPollFrequency = 1 * time.Second
}
regexprs := make([]*regexp.Regexp, len(configInJSON.MetricsConfig)) regexprs := make([]*regexp.Regexp, len(configInJSON.MetricsConfig))
for ind, metricConfig := range configInJSON.MetricsConfig { for ind, metricConfig := range configInJSON.MetricsConfig {
if metricConfig.PollingFrequency < minPollFrequency { if metricConfig.PollingFrequency < minPollFrequency && metricConfig.PollingFrequency != 0 {
minPollFrequency = metricConfig.PollingFrequency minPollFrequency = metricConfig.PollingFrequency
} }
@ -95,14 +101,8 @@ 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) {
minNextColTime := collector.configFile.MetricsConfig[0].PollingFrequency
for _, metricConfig := range collector.configFile.MetricsConfig {
if metricConfig.PollingFrequency < minNextColTime {
minNextColTime = metricConfig.PollingFrequency
}
}
currentTime := time.Now() currentTime := time.Now()
nextCollectionTime := currentTime.Add(time.Duration(minNextColTime * time.Second)) nextCollectionTime := currentTime.Add(time.Duration(collector.info.minPollingFrequency * time.Second))
uri := collector.configFile.Endpoint uri := collector.configFile.Endpoint
response, err := http.Get(uri) response, err := http.Get(uri)
@ -121,12 +121,7 @@ func (collector *GenericCollector) Collect() (time.Time, []v1.Metric, error) {
var errorSlice []error var errorSlice []error
for ind, metricConfig := range collector.configFile.MetricsConfig { for ind, metricConfig := range collector.configFile.MetricsConfig {
regex, err := regexp.Compile(metricConfig.Regex) matchString := collector.info.regexps[ind].FindStringSubmatch(string(pageContent))
if err != nil {
return nextCollectionTime, nil, err
}
matchString := regex.FindStringSubmatch(string(pageContent))
if matchString != nil { if matchString != nil {
if metricConfig.Units == "float" { if metricConfig.Units == "float" {
regVal, err := strconv.ParseFloat(strings.TrimSpace(matchString[1]), 64) regVal, err := strconv.ParseFloat(strings.TrimSpace(matchString[1]), 64)