fix v2.Config -> v3.Config convert

Author: fstab

config/config.go

@@ -74,7 +74,7 @@ func unmarshal(content []byte, version int) (*v3.Config, error) {
 		if err != nil {
 			return nil, err
 		}
-		return v3.Convert(v2cfg), nil
+		return v3.Convert(v2cfg)
 	case 3:
 		return v3.Unmarshal(content)
 	default:

config/v3/configV3.go

@@ -16,6 +16,7 @@ package v3
 
 import (
 	"fmt"
+	v2 "github.com/fstab/grok_exporter/config/v2"
 	"github.com/fstab/grok_exporter/tailer/glob"
 	"github.com/fstab/grok_exporter/template"
 	"gopkg.in/yaml.v2"
@@ -57,6 +58,18 @@ func Unmarshal(config []byte) (*Config, error) {
 	return cfg, nil
 }
 
+func Convert(v2cfg *v2.Config) (*Config, error) {
+	v3cfg := convert(v2cfg)
+	for _, metric := range v3cfg.OrigMetrics {
+		v3cfg.AllMetrics = append(v3cfg.AllMetrics, metric)
+	}
+	err := AddDefaultsAndValidate(v3cfg)
+	if err != nil {
+		return nil, err
+	}
+	return v3cfg, nil
+}
+
 type Config struct {
 	Global       GlobalConfig       `yaml:",omitempty"`
 	Input        InputConfig        `yaml:",omitempty"`

config/v3/converter.go

@@ -22,7 +22,7 @@ import (
 	"time"
 )
 
-func Convert(v2cfg *v2.Config) *Config {
+func convert(v2cfg *v2.Config) *Config {
 	return &Config{
 		Global:       convertGlobal(v2cfg),
 		Input:        convertInput(v2cfg),

config/v3/converter_test.go

@@ -156,7 +156,7 @@ func TestConvert(t *testing.T) {
 			if err != nil {
 				t.Fatalf("error unmarshalling input: %v", err)
 			}
-			v3cfg := Convert(v2cfg)
+			v3cfg := convert(v2cfg)
 			err = equalsIgnoreIndentation(v3cfg.String(), test.expected)
 			if err != nil {
 				t.Fatalf("Expected:\n%v\nActual:\n%v\n%v", test.expected, v3cfg, err)