Merge branch 'master' into development

go.mod

@@ -113,4 +113,4 @@ replace labix.org/v2/mgo => github.com/go-mgo/mgo v0.0.0-20180705113738-7446a034
 
 replace launchpad.net/gocheck => github.com/go-check/check v0.0.0-20180628173108-788fd78401277ebd861206a03c884797c6ec5541
 
-replace github.com/v3io/frames => github.com/v3io/frames v0.0.0-20190328123118-1dad1ff610509e7b087d9cd390ed1b452caecf15
+replace github.com/v3io/frames => github.com/v3io/frames v0.0.0-20190328123118-1dad1ff610509e7b087d9cd390ed1b452caecf15

storage/tsdb/v3io.go

@@ -18,8 +18,6 @@ package tsdb
 
 import (
 	"context"
-	"encoding/json"
-
 	"os"
 	"reflect"
 	"sync"
@@ -229,9 +227,7 @@ func (s *ReadyStorage) createV3ioPromAdapater(configPath string) (*V3ioPromAdapt
 		return nil, nil, nil
 	}
 
-	if jsonLoadedConfig, err := json.Marshal(&loadedConfig); err == nil {
-		s.logger.Log("msg", "Creating v3io adapter", "config", string(jsonLoadedConfig))
-	}
+	s.logger.Log("msg", "Creating v3io adapter", "config", loadedConfig.String())
 
 	adapter, err := NewV3ioProm(loadedConfig, nil)
 	adapter.SetUseV3ioAggregations(s.useV3ioAggregations)

web/web.go

@@ -376,7 +376,7 @@ func New(logger log.Logger, o *Options) *Handler {
 			return
 		}
 		w.WriteHeader(http.StatusOK)
-		level.Info(h.logger).Log("msg", "Prometheus is Healthy.")
+		level.Debug(h.logger).Log("msg", "Prometheus is Healthy.")
 		fmt.Fprintf(w, "Prometheus is Healthy.\n")
 	})
 	router.Get("/-/ready", readyf(func(w http.ResponseWriter, r *http.Request) {
@@ -387,7 +387,7 @@ func New(logger log.Logger, o *Options) *Handler {
 			return
 		}
 		w.WriteHeader(http.StatusOK)
-		level.Info(h.logger).Log("msg", "Prometheus is Ready.")
+		level.Debug(h.logger).Log("msg", "Prometheus is Ready.")
 		fmt.Fprintf(w, "Prometheus is Ready.\n")
 	}))