Merge pull request grafana#1106 from cortexproject/yaml-schema-dates

Yaml schema config dates in human-readable form

composite_store.go

@@ -53,7 +53,7 @@ func (c *CompositeStore) AddPeriod(storeCfg StoreConfig, cfg PeriodConfig, stora
 	if err != nil {
 		return err
 	}
-	c.stores = append(c.stores, compositeStoreEntry{start: cfg.From, Store: store})
+	c.stores = append(c.stores, compositeStoreEntry{start: model.TimeFromUnixNano(cfg.From.UnixNano()), Store: store})
 	return nil
 }
 

schema_config.go

@@ -23,7 +23,8 @@ const (
 
 // PeriodConfig defines the schema and tables to use for a period of time
 type PeriodConfig struct {
-	From        model.Time          `yaml:"from"`
+	From        model.Time          `yaml:"-"`              // used when working with config
+	FromStr     string              `yaml:"from,omitempty"` // used when loading from yaml
 	Store       string              `yaml:"store"`
 	Schema      string              `yaml:"schema"`
 	IndexTables PeriodicTableConfig `yaml:"index"`
@@ -93,9 +94,10 @@ func (cfg *SchemaConfig) translate() error {
 
 	add := func(t string, f model.Time) {
 		cfg.Configs = append(cfg.Configs, PeriodConfig{
-			From:   f,
-			Schema: t,
-			Store:  cfg.legacy.StorageClient,
+			From:    f,
+			FromStr: f.Time().Format("2006-01-02"),
+			Schema:  t,
+			Store:   cfg.legacy.StorageClient,
 			IndexTables: PeriodicTableConfig{
 				Prefix: cfg.legacy.OriginalTableName,
 				Tags:   cfg.legacy.IndexTables.Tags,
@@ -222,12 +224,22 @@ func (cfg *SchemaConfig) Load() error {
 	if err := decoder.Decode(&cfg); err != nil {
 		return err
 	}
+	for i := range cfg.Configs {
+		t, err := time.Parse("2006-01-02", cfg.Configs[i].FromStr)
+		if err != nil {
+			return err
+		}
+		cfg.Configs[i].From = model.TimeFromUnix(t.Unix())
+	}
 
 	return nil
 }
 
 // PrintYaml dumps the yaml to stdout, to aid in migration
 func (cfg SchemaConfig) PrintYaml() {
+	for i := range cfg.Configs {
+		cfg.Configs[i].FromStr = cfg.Configs[i].From.Time().Format("2006-01-02")
+	}
 	encoder := yaml.NewEncoder(os.Stdout)
 	encoder.Encode(cfg)
 }