Merge pull request #193 from x13n/scrape-metrics

Fix metric whitelist updating in timeSeriesBuilder
GoogleCloudPlatform · Aug 16, 2018 · f46f940 · f46f940
2 parents 27fb44a + 5fd0c53
commit f46f940
Show file tree

Hide file tree

Showing 5 changed files with 19 additions and 14 deletions.
diff --git a/prometheus-to-sd/Dockerfile b/prometheus-to-sd/Dockerfile
@@ -17,7 +17,7 @@ WORKDIR ${GOPATH}/src/github.com/GoogleCloudPlatform/k8s-stackdriver/prometheus-
 COPY . ./
 RUN CGO_ENABLED=0 GOOS=linux go build -o /monitor
 
-FROM gcr.io/google-containers/debian-base-amd64:0.3
+FROM gcr.io/google-containers/debian-base-amd64:0.3.2
 RUN clean-install ca-certificates
 #   nobody:nobody
 USER 65534:65534

diff --git a/prometheus-to-sd/Makefile b/prometheus-to-sd/Makefile
@@ -16,7 +16,7 @@ all: build
 
 ENVVAR = GOOS=linux GOARCH=amd64 CGO_ENABLED=0
 PREFIX = staging-k8s.gcr.io
-TAG = v0.3.0
+TAG = v0.3.1
 
 build:
 	$(ENVVAR) go build -a -o monitor

diff --git a/prometheus-to-sd/main.go b/prometheus-to-sd/main.go
@@ -142,6 +142,7 @@ func getSourceConfigs(gceConfig *config.GceConfig) []config.SourceConfig {
 	return append(staticSourceConfigs, dynamicSourceConfigs...)
 }
 
+// TODO(x13n): factor out all the logic below and add tests, this doesn't really belong in main.
 func scrapeMetrics(commonConfig *config.CommonConfig, sourceConfig *config.SourceConfig, metricDescriptorCache *translator.MetricDescriptorCache) (map[string]*dto.MetricFamily, error) {
 	metrics, err := translator.GetPrometheusMetrics(sourceConfig)
 	if err != nil {
@@ -168,7 +169,7 @@ func readAndPushDataToStackdriver(stackdriverService *v3.Service, gceConf *confi
 	metricDescriptorCache := translator.NewMetricDescriptorCache(stackdriverService, commonConfig, sourceConfig.Component)
 	signal := time.After(0)
 	useWhitelistedMetricsAutodiscovery := *autoWhitelistMetrics && len(sourceConfig.Whitelisted) == 0
-	timeSeriesBuilder := translator.NewTimeSeriesBuilder(commonConfig, sourceConfig.Whitelisted, metricDescriptorCache)
+	timeSeriesBuilder := translator.NewTimeSeriesBuilder(commonConfig, &sourceConfig, metricDescriptorCache)
 	exportTicker := time.Tick(*exportInterval)
 
 	for range time.Tick(*scrapeInterval) {

diff --git a/prometheus-to-sd/translator/translator.go b/prometheus-to-sd/translator/translator.go
@@ -43,8 +43,8 @@ var supportedMetricTypes = map[dto.MetricType]bool{
 const falseValueEpsilon = 0.001
 
 type timeSeriesBuilder struct {
-	config         *config.CommonConfig
-	whitelisted    []string
+	commonConfig   *config.CommonConfig
+	sourceConfig   *config.SourceConfig
 	cache          *MetricDescriptorCache
 	metricFamilies map[string]*metricFamilyWithTimestamp
 }
@@ -55,10 +55,10 @@ type metricFamilyWithTimestamp struct {
 }
 
 // NewTimeSeriesBuilder creates new builder object that keeps intermediate state of metrics.
-func NewTimeSeriesBuilder(config *config.CommonConfig, whitelisted []string, cache *MetricDescriptorCache) *timeSeriesBuilder {
+func NewTimeSeriesBuilder(commonConfig *config.CommonConfig, sourceConfig *config.SourceConfig, cache *MetricDescriptorCache) *timeSeriesBuilder {
 	return &timeSeriesBuilder{
-		config:         config,
-		whitelisted:    whitelisted,
+		commonConfig:   commonConfig,
+		sourceConfig:   sourceConfig,
 		cache:          cache,
 		metricFamilies: make(map[string]*metricFamilyWithTimestamp),
 	}
@@ -75,13 +75,13 @@ func (t *timeSeriesBuilder) Update(metrics map[string]*dto.MetricFamily) {
 func (t *timeSeriesBuilder) Build() []*v3.TimeSeries {
 	var ts []*v3.TimeSeries
 	startTime := getStartTime(t.metricFamilies)
-	t.metricFamilies = filterWhitelisted(t.metricFamilies, t.whitelisted)
+	t.metricFamilies = filterWhitelisted(t.metricFamilies, t.sourceConfig.Whitelisted)
 
 	for name, metric := range t.metricFamilies {
 		if t.cache.IsMetricBroken(name) {
 			continue
 		}
-		f, err := translateFamily(t.config, metric, startTime, t.cache)
+		f, err := translateFamily(t.commonConfig, metric, startTime, t.cache)
 		if err != nil {
 			glog.Warningf("Error while processing metric %s: %v", name, err)
 		} else {

diff --git a/prometheus-to-sd/translator/translator_test.go b/prometheus-to-sd/translator/translator_test.go
@@ -229,9 +229,11 @@ var metricDescriptors = map[string]*v3.MetricDescriptor{
 
 func TestTranslatePrometheusToStackdriver(t *testing.T) {
 	cache := buildCacheForTesting()
-	whitelistedMetrics := []string{testMetricName, testMetricHistogram, booleanMetricName, floatMetricName}
+	sourceConfig := &config.SourceConfig{
+		Whitelisted: []string{testMetricName, testMetricHistogram, booleanMetricName, floatMetricName},
+	}
 
-	tsb := NewTimeSeriesBuilder(commonConfig, whitelistedMetrics, cache)
+	tsb := NewTimeSeriesBuilder(commonConfig, sourceConfig, cache)
 	tsb.Update(metrics)
 	ts := tsb.Build()
 
@@ -318,8 +320,10 @@ func TestTranslatePrometheusToStackdriver(t *testing.T) {
 }
 
 func TestMergeScrapes(t *testing.T) {
-	whitelistedMetrics := []string{testMetricName, floatMetricName}
-	tsb := NewTimeSeriesBuilder(commonConfig, whitelistedMetrics, buildCacheForTesting())
+	sourceConfig := &config.SourceConfig{
+		Whitelisted: []string{testMetricName, floatMetricName},
+	}
+	tsb := NewTimeSeriesBuilder(commonConfig, sourceConfig, buildCacheForTesting())
 	scrape := map[string]*dto.MetricFamily{
 		testMetricName: {
 			Name: &testMetricName,