goimports

grafana · Jul 19, 2023 · e5ccbfe · e5ccbfe
1 parent 555512e
commit e5ccbfe
Show file tree

Hide file tree

Showing 9 changed files with 11 additions and 6 deletions.
diff --git a/converter/internal/promtailconvert/internal/build/azure_sd.go b/converter/internal/promtailconvert/internal/build/azure_sd.go
@@ -2,6 +2,7 @@ package build
 
 import (
 	"fmt"
+
 	"github.com/grafana/agent/converter/internal/common"
 	"github.com/grafana/agent/converter/internal/prometheusconvert"
 )

diff --git a/converter/internal/promtailconvert/internal/build/consul_sd.go b/converter/internal/promtailconvert/internal/build/consul_sd.go
@@ -2,6 +2,7 @@ package build
 
 import (
 	"fmt"
+
 	"github.com/grafana/agent/converter/internal/common"
 	"github.com/grafana/agent/converter/internal/prometheusconvert"
 )

diff --git a/converter/internal/promtailconvert/internal/build/digitalocean_sd.go b/converter/internal/promtailconvert/internal/build/digitalocean_sd.go
@@ -2,6 +2,7 @@ package build
 
 import (
 	"fmt"
+
 	"github.com/grafana/agent/converter/internal/common"
 	"github.com/grafana/agent/converter/internal/prometheusconvert"
 )

diff --git a/converter/internal/promtailconvert/internal/build/docker_sd.go b/converter/internal/promtailconvert/internal/build/docker_sd.go
@@ -2,6 +2,7 @@ package build
 
 import (
 	"fmt"
+
 	"github.com/grafana/agent/converter/internal/common"
 	"github.com/grafana/agent/converter/internal/prometheusconvert"
 )

diff --git a/converter/internal/promtailconvert/internal/build/ec2_sd.go b/converter/internal/promtailconvert/internal/build/ec2_sd.go
@@ -2,6 +2,7 @@ package build
 
 import (
 	"fmt"
+
 	"github.com/grafana/agent/converter/internal/common"
 	"github.com/grafana/agent/converter/internal/prometheusconvert"
 )

diff --git a/converter/internal/promtailconvert/internal/build/file_sd.go b/converter/internal/promtailconvert/internal/build/file_sd.go
@@ -2,6 +2,7 @@ package build
 
 import (
 	"fmt"
+
 	"github.com/grafana/agent/converter/internal/common"
 	"github.com/grafana/agent/converter/internal/prometheusconvert"
 )

diff --git a/converter/internal/promtailconvert/internal/build/gce_sd.go b/converter/internal/promtailconvert/internal/build/gce_sd.go
@@ -2,6 +2,7 @@ package build
 
 import (
 	"fmt"
+
 	"github.com/grafana/agent/converter/internal/common"
 	"github.com/grafana/agent/converter/internal/prometheusconvert"
 )

diff --git a/converter/internal/promtailconvert/promtailconvert.go b/converter/internal/promtailconvert/promtailconvert.go
@@ -132,12 +132,10 @@ func appendScrapeConfig(
 	gctx *build.GlobalContext,
 ) {
 	//TODO(thampiotr): need to support/warn about the following fields:
-	//JobName              string                      `mapstructure:"job_name,omitempty" yaml:"job_name,omitempty"`
 	//Encoding               string                 `mapstructure:"encoding,omitempty" yaml:"encoding,omitempty"`
 	//DecompressionCfg       *DecompressionConfig   `yaml:"decompression,omitempty"`
 
 	//TODO(thampiotr): support/warn about the following log producing promtail configs:
-	//PushConfig           *PushTargetConfig           `mapstructure:"loki_push_api,omitempty" yaml:"loki_push_api,omitempty"`
 	//SyslogConfig         *SyslogTargetConfig         `mapstructure:"syslog,omitempty" yaml:"syslog,omitempty"`
 	//GcplogConfig         *GcplogTargetConfig         `mapstructure:"gcplog,omitempty" yaml:"gcplog,omitempty"`
 	//WindowsConfig        *WindowsEventsTargetConfig  `mapstructure:"windows_events,omitempty" yaml:"windows_events,omitempty"`
@@ -170,7 +168,6 @@ func appendScrapeConfig(
 	// Append all the components that produce logs directly.
 	// If any relabelling is required, it will be done via a loki.relabel component.
 	// The logs are sent to loki.process if processing is needed, or directly to loki.write components.
-	//TODO(thampiotr): add support for other integrations
 	b.AppendCloudFlareConfig()
 	b.AppendJournalConfig()
 	b.AppendPushAPI()

diff --git a/converter/internal/test_common/testing.go b/converter/internal/test_common/testing.go
@@ -3,16 +3,17 @@ package test_common
 import (
 	"bytes"
 	"fmt"
-	"github.com/grafana/agent/pkg/cluster"
-	"github.com/grafana/agent/pkg/flow"
-	"github.com/grafana/agent/pkg/flow/logging"
 	"io/fs"
 	"os"
 	"path/filepath"
 	"reflect"
 	"strings"
 	"testing"
 
+	"github.com/grafana/agent/pkg/cluster"
+	"github.com/grafana/agent/pkg/flow"
+	"github.com/grafana/agent/pkg/flow/logging"
+
 	"github.com/grafana/agent/converter/diag"
 	"github.com/stretchr/testify/require"
 )