diff --git a/converter/internal/promtailconvert/internal/build/azure_sd.go b/converter/internal/promtailconvert/internal/build/azure_sd.go index 69d0815f2182..57f154bb18e7 100644 --- 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 index 8341a91a5f77..994590bc8792 100644 --- 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 index 64e368f91fdc..bb26483c3ca2 100644 --- 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 index 73d39f09e5f0..d80b31bba8f4 100644 --- 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 index 22788793f2f8..a78d8dbe82ca 100644 --- 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 index f4f72c826b17..dfce5ea8fd48 100644 --- 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 index be761dc6deab..aa4a7621fb14 100644 --- 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 index 520f03dfc4a2..e8c26149d0f9 100644 --- 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 index 30b603633353..19906cb17c46 100644 --- a/converter/internal/test_common/testing.go +++ b/converter/internal/test_common/testing.go @@ -3,9 +3,6 @@ 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" @@ -13,6 +10,10 @@ import ( "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" )