Converter static v2 3rd set of integrations

converter/internal/staticconvert/internal/build/blackbox_exporter.go

@@ -1,26 +1,19 @@
 package build
 
 import (
-	"fmt"
 	"time"
 
 	"github.com/grafana/agent/component/discovery"
 	"github.com/grafana/agent/component/prometheus/exporter/blackbox"
 	"github.com/grafana/agent/converter/internal/common"
 	"github.com/grafana/agent/pkg/integrations/blackbox_exporter"
+	blackbox_exporter_v2 "github.com/grafana/agent/pkg/integrations/v2/blackbox_exporter"
 	"github.com/grafana/river/rivertypes"
 )
 
 func (b *IntegrationsConfigBuilder) appendBlackboxExporter(config *blackbox_exporter.Config) discovery.Exports {
 	args := toBlackboxExporter(config)
-	compLabel := common.LabelForParts(b.globalCtx.LabelPrefix, config.Name())
-	b.f.Body().AppendBlock(common.NewBlockWithOverride(
-		[]string{"prometheus", "exporter", "blackbox"},
-		compLabel,
-		args,
-	))
-
-	return common.NewDiscoveryExports(fmt.Sprintf("prometheus.exporter.blackbox.%s.targets", compLabel))
+	return b.appendExporterBlock(args, config.Name(), nil, "blackbox")
 }
 
 func toBlackboxExporter(config *blackbox_exporter.Config) *blackbox.Arguments {
@@ -35,6 +28,23 @@ func toBlackboxExporter(config *blackbox_exporter.Config) *blackbox.Arguments {
 	}
 }
 
+func (b *IntegrationsConfigBuilder) appendBlackboxExporterV2(config *blackbox_exporter_v2.Config) discovery.Exports {
+	args := toBlackboxExporterV2(config)
+	return b.appendExporterBlock(args, config.Name(), config.Common.InstanceKey, "blackbox")
+}
+
+func toBlackboxExporterV2(config *blackbox_exporter_v2.Config) *blackbox.Arguments {
+	return &blackbox.Arguments{
+		ConfigFile: config.BlackboxConfigFile,
+		Config: rivertypes.OptionalSecret{
+			IsSecret: false,
+			Value:    string(config.BlackboxConfig),
+		},
+		Targets:            toBlackboxTargets(config.BlackboxTargets),
+		ProbeTimeoutOffset: time.Duration(config.ProbeTimeoutOffset),
+	}
+}
+
 func toBlackboxTargets(blackboxTargets []blackbox_exporter.BlackboxTarget) blackbox.TargetBlock {
 	var targetBlock blackbox.TargetBlock
 

converter/internal/staticconvert/internal/build/builder.go

@@ -39,8 +39,10 @@ import (
 	"github.com/grafana/agent/pkg/integrations/statsd_exporter"
 	agent_exporter_v2 "github.com/grafana/agent/pkg/integrations/v2/agent"
 	apache_exporter_v2 "github.com/grafana/agent/pkg/integrations/v2/apache_http"
+	blackbox_exporter_v2 "github.com/grafana/agent/pkg/integrations/v2/blackbox_exporter"
 	common_v2 "github.com/grafana/agent/pkg/integrations/v2/common"
 	"github.com/grafana/agent/pkg/integrations/v2/metricsutils"
+	snmp_exporter_v2 "github.com/grafana/agent/pkg/integrations/v2/snmp_exporter"
 	"github.com/grafana/agent/pkg/integrations/windows_exporter"
 	"github.com/grafana/river/scanner"
 	"github.com/grafana/river/token/builder"
@@ -105,53 +107,53 @@ func (b *IntegrationsConfigBuilder) appendV1Integrations() {
 		case *apache_http.Config:
 			exports = b.appendApacheExporter(itg)
 		case *node_exporter.Config:
-			exports = b.appendNodeExporter(itg)
+			exports = b.appendNodeExporter(itg, nil)
 		case *blackbox_exporter.Config:
 			exports = b.appendBlackboxExporter(itg)
 		case *cloudwatch_exporter.Config:
-			exports = b.appendCloudwatchExporter(itg)
+			exports = b.appendCloudwatchExporter(itg, nil)
 		case *consul_exporter.Config:
-			exports = b.appendConsulExporter(itg)
+			exports = b.appendConsulExporter(itg, nil)
 		case *dnsmasq_exporter.Config:
-			exports = b.appendDnsmasqExporter(itg)
+			exports = b.appendDnsmasqExporter(itg, nil)
 		case *elasticsearch_exporter.Config:
-			exports = b.appendElasticsearchExporter(itg)
+			exports = b.appendElasticsearchExporter(itg, nil)
 		case *gcp_exporter.Config:
-			exports = b.appendGcpExporter(itg)
+			exports = b.appendGcpExporter(itg, nil)
 		case *github_exporter.Config:
-			exports = b.appendGithubExporter(itg)
+			exports = b.appendGithubExporter(itg, nil)
 		case *kafka_exporter.Config:
-			exports = b.appendKafkaExporter(itg)
+			exports = b.appendKafkaExporter(itg, nil)
 		case *memcached_exporter.Config:
-			exports = b.appendMemcachedExporter(itg)
+			exports = b.appendMemcachedExporter(itg, nil)
 		case *mongodb_exporter.Config:
-			exports = b.appendMongodbExporter(itg)
+			exports = b.appendMongodbExporter(itg, nil)
 		case *mssql_exporter.Config:
-			exports = b.appendMssqlExporter(itg)
+			exports = b.appendMssqlExporter(itg, nil)
 		case *mysqld_exporter.Config:
-			exports = b.appendMysqldExporter(itg)
+			exports = b.appendMysqldExporter(itg, nil)
 		case *oracledb_exporter.Config:
-			exports = b.appendOracledbExporter(itg)
+			exports = b.appendOracledbExporter(itg, nil)
 		case *postgres_exporter.Config:
-			exports = b.appendPostgresExporter(itg)
+			exports = b.appendPostgresExporter(itg, nil)
 		case *process_exporter.Config:
-			exports = b.appendProcessExporter(itg)
+			exports = b.appendProcessExporter(itg, nil)
 		case *redis_exporter.Config:
-			exports = b.appendRedisExporter(itg)
+			exports = b.appendRedisExporter(itg, nil)
 		case *snmp_exporter.Config:
 			exports = b.appendSnmpExporter(itg)
 		case *snowflake_exporter.Config:
-			exports = b.appendSnowflakeExporter(itg)
+			exports = b.appendSnowflakeExporter(itg, nil)
 		case *squid_exporter.Config:
-			exports = b.appendSquidExporter(itg)
+			exports = b.appendSquidExporter(itg, nil)
 		case *statsd_exporter.Config:
-			exports = b.appendStatsdExporter(itg)
+			exports = b.appendStatsdExporter(itg, nil)
 		case *windows_exporter.Config:
-			exports = b.appendWindowsExporter(itg)
+			exports = b.appendWindowsExporter(itg, nil)
 		case *azure_exporter.Config:
 			exports = b.appendAzureExporter(itg, nil)
 		case *cadvisor.Config:
-			exports = b.appendCadvisorExporter(itg)
+			exports = b.appendCadvisorExporter(itg, nil)
 		}
 
 		if len(exports.Targets) > 0 {
@@ -205,11 +207,59 @@ func (b *IntegrationsConfigBuilder) appendV2Integrations() {
 		case *apache_exporter_v2.Config:
 			exports = b.appendApacheExporterV2(itg)
 			commonConfig = itg.Common
+		case *blackbox_exporter_v2.Config:
+			exports = b.appendBlackboxExporterV2(itg)
+			commonConfig = itg.Common
+		case *snmp_exporter_v2.Config:
+			exports = b.appendSnmpExporterV2(itg)
+			commonConfig = itg.Common
 		case *metricsutils.ConfigShim:
 			commonConfig = itg.Common
 			switch v1_itg := itg.Orig.(type) {
 			case *azure_exporter.Config:
 				exports = b.appendAzureExporter(v1_itg, itg.Common.InstanceKey)
+			case *cadvisor.Config:
+				exports = b.appendCadvisorExporter(v1_itg, itg.Common.InstanceKey)
+			case *cloudwatch_exporter.Config:
+				exports = b.appendCloudwatchExporter(v1_itg, itg.Common.InstanceKey)
+			case *consul_exporter.Config:
+				exports = b.appendConsulExporter(v1_itg, itg.Common.InstanceKey)
+			case *dnsmasq_exporter.Config:
+				exports = b.appendDnsmasqExporter(v1_itg, itg.Common.InstanceKey)
+			case *elasticsearch_exporter.Config:
+				exports = b.appendElasticsearchExporter(v1_itg, itg.Common.InstanceKey)
+			case *gcp_exporter.Config:
+				exports = b.appendGcpExporter(v1_itg, itg.Common.InstanceKey)
+			case *github_exporter.Config:
+				exports = b.appendGithubExporter(v1_itg, itg.Common.InstanceKey)
+			case *kafka_exporter.Config:
+				exports = b.appendKafkaExporter(v1_itg, itg.Common.InstanceKey)
+			case *memcached_exporter.Config:
+				exports = b.appendMemcachedExporter(v1_itg, itg.Common.InstanceKey)
+			case *mongodb_exporter.Config:
+				exports = b.appendMongodbExporter(v1_itg, itg.Common.InstanceKey)
+			case *mssql_exporter.Config:
+				exports = b.appendMssqlExporter(v1_itg, itg.Common.InstanceKey)
+			case *mysqld_exporter.Config:
+				exports = b.appendMysqldExporter(v1_itg, itg.Common.InstanceKey)
+			case *node_exporter.Config:
+				exports = b.appendNodeExporter(v1_itg, itg.Common.InstanceKey)
+			case *oracledb_exporter.Config:
+				exports = b.appendOracledbExporter(v1_itg, itg.Common.InstanceKey)
+			case *postgres_exporter.Config:
+				exports = b.appendPostgresExporter(v1_itg, itg.Common.InstanceKey)
+			case *process_exporter.Config:
+				exports = b.appendProcessExporter(v1_itg, itg.Common.InstanceKey)
+			case *redis_exporter.Config:
+				exports = b.appendRedisExporter(v1_itg, itg.Common.InstanceKey)
+			case *snowflake_exporter.Config:
+				exports = b.appendSnowflakeExporter(v1_itg, itg.Common.InstanceKey)
+			case *squid_exporter.Config:
+				exports = b.appendSquidExporter(v1_itg, itg.Common.InstanceKey)
+			case *statsd_exporter.Config:
+				exports = b.appendStatsdExporter(v1_itg, itg.Common.InstanceKey)
+			case *windows_exporter.Config:
+				exports = b.appendWindowsExporter(v1_itg, itg.Common.InstanceKey)
 			}
 		}
 
@@ -235,11 +285,10 @@ func (b *IntegrationsConfigBuilder) appendExporterV2(commonConfig *common_v2.Met
 	commonConfig.ApplyDefaults(b.cfg.Integrations.ConfigV2.Metrics.Autoscrape)
 	scrapeConfig := prom_config.DefaultScrapeConfig
 	scrapeConfig.JobName = b.formatJobName(name, commonConfig.InstanceKey)
-	scrapeConfig.RelabelConfigs = commonConfig.Autoscrape.RelabelConfigs
+	scrapeConfig.RelabelConfigs = append(commonConfig.Autoscrape.RelabelConfigs, relabelConfigs...)
 	scrapeConfig.MetricRelabelConfigs = commonConfig.Autoscrape.MetricRelabelConfigs
 	scrapeConfig.ScrapeInterval = commonConfig.Autoscrape.ScrapeInterval
 	scrapeConfig.ScrapeTimeout = commonConfig.Autoscrape.ScrapeTimeout
-	scrapeConfig.RelabelConfigs = relabelConfigs
 
 	scrapeConfigs := []*prom_config.ScrapeConfig{&scrapeConfig}
 

converter/internal/staticconvert/internal/build/cadvisor_exporter.go

@@ -1,25 +1,16 @@
 package build
 
 import (
-	"fmt"
 	"time"
 
 	"github.com/grafana/agent/component/discovery"
 	"github.com/grafana/agent/component/prometheus/exporter/cadvisor"
-	"github.com/grafana/agent/converter/internal/common"
 	cadvisor_integration "github.com/grafana/agent/pkg/integrations/cadvisor"
 )
 
-func (b *IntegrationsConfigBuilder) appendCadvisorExporter(config *cadvisor_integration.Config) discovery.Exports {
+func (b *IntegrationsConfigBuilder) appendCadvisorExporter(config *cadvisor_integration.Config, instanceKey *string) discovery.Exports {
 	args := toCadvisorExporter(config)
-	compLabel := common.LabelForParts(b.globalCtx.LabelPrefix, config.Name())
-	b.f.Body().AppendBlock(common.NewBlockWithOverride(
-		[]string{"prometheus", "exporter", "cadvisor"},
-		compLabel,
-		args,
-	))
-
-	return common.NewDiscoveryExports(fmt.Sprintf("prometheus.exporter.cadvisor.%s.targets", compLabel))
+	return b.appendExporterBlock(args, config.Name(), instanceKey, "cadvisor")
 }
 
 func toCadvisorExporter(config *cadvisor_integration.Config) *cadvisor.Arguments {

converter/internal/staticconvert/internal/build/cloudwatch_exporter.go

@@ -1,24 +1,14 @@
 package build
 
 import (
-	"fmt"
-
 	"github.com/grafana/agent/component/discovery"
 	"github.com/grafana/agent/component/prometheus/exporter/cloudwatch"
-	"github.com/grafana/agent/converter/internal/common"
 	"github.com/grafana/agent/pkg/integrations/cloudwatch_exporter"
 )
 
-func (b *IntegrationsConfigBuilder) appendCloudwatchExporter(config *cloudwatch_exporter.Config) discovery.Exports {
+func (b *IntegrationsConfigBuilder) appendCloudwatchExporter(config *cloudwatch_exporter.Config, instanceKey *string) discovery.Exports {
 	args := toCloudwatchExporter(config)
-	compLabel := common.LabelForParts(b.globalCtx.LabelPrefix, config.Name())
-	b.f.Body().AppendBlock(common.NewBlockWithOverride(
-		[]string{"prometheus", "exporter", "cloudwatch"},
-		compLabel,
-		args,
-	))
-
-	return common.NewDiscoveryExports(fmt.Sprintf("prometheus.exporter.cloudwatch.%s.targets", compLabel))
+	return b.appendExporterBlock(args, config.Name(), instanceKey, "cloudwatch")
 }
 
 func toCloudwatchExporter(config *cloudwatch_exporter.Config) *cloudwatch.Arguments {

converter/internal/staticconvert/internal/build/consul_exporter.go

@@ -1,24 +1,14 @@
 package build
 
 import (
-	"fmt"
-
 	"github.com/grafana/agent/component/discovery"
 	"github.com/grafana/agent/component/prometheus/exporter/consul"
-	"github.com/grafana/agent/converter/internal/common"
 	"github.com/grafana/agent/pkg/integrations/consul_exporter"
 )
 
-func (b *IntegrationsConfigBuilder) appendConsulExporter(config *consul_exporter.Config) discovery.Exports {
+func (b *IntegrationsConfigBuilder) appendConsulExporter(config *consul_exporter.Config, instanceKey *string) discovery.Exports {
 	args := toConsulExporter(config)
-	compLabel := common.LabelForParts(b.globalCtx.LabelPrefix, config.Name())
-	b.f.Body().AppendBlock(common.NewBlockWithOverride(
-		[]string{"prometheus", "exporter", "consul"},
-		compLabel,
-		args,
-	))
-
-	return common.NewDiscoveryExports(fmt.Sprintf("prometheus.exporter.consul.%s.targets", compLabel))
+	return b.appendExporterBlock(args, config.Name(), instanceKey, "consul")
 }
 
 func toConsulExporter(config *consul_exporter.Config) *consul.Arguments {

converter/internal/staticconvert/internal/build/dnsmasq_exporter.go

@@ -1,24 +1,14 @@
 package build
 
 import (
-	"fmt"
-
 	"github.com/grafana/agent/component/discovery"
 	"github.com/grafana/agent/component/prometheus/exporter/dnsmasq"
-	"github.com/grafana/agent/converter/internal/common"
 	"github.com/grafana/agent/pkg/integrations/dnsmasq_exporter"
 )
 
-func (b *IntegrationsConfigBuilder) appendDnsmasqExporter(config *dnsmasq_exporter.Config) discovery.Exports {
+func (b *IntegrationsConfigBuilder) appendDnsmasqExporter(config *dnsmasq_exporter.Config, instanceKey *string) discovery.Exports {
 	args := toDnsmasqExporter(config)
-	compLabel := common.LabelForParts(b.globalCtx.LabelPrefix, config.Name())
-	b.f.Body().AppendBlock(common.NewBlockWithOverride(
-		[]string{"prometheus", "exporter", "dnsmasq"},
-		compLabel,
-		args,
-	))
-
-	return common.NewDiscoveryExports(fmt.Sprintf("prometheus.exporter.dnsmasq.%s.targets", compLabel))
+	return b.appendExporterBlock(args, config.Name(), instanceKey, "dnsmasq")
 }
 
 func toDnsmasqExporter(config *dnsmasq_exporter.Config) *dnsmasq.Arguments {

converter/internal/staticconvert/internal/build/elasticsearch_exporter.go

@@ -1,24 +1,14 @@
 package build
 
 import (
-	"fmt"
-
 	"github.com/grafana/agent/component/discovery"
 	"github.com/grafana/agent/component/prometheus/exporter/elasticsearch"
-	"github.com/grafana/agent/converter/internal/common"
 	"github.com/grafana/agent/pkg/integrations/elasticsearch_exporter"
 )
 
-func (b *IntegrationsConfigBuilder) appendElasticsearchExporter(config *elasticsearch_exporter.Config) discovery.Exports {
+func (b *IntegrationsConfigBuilder) appendElasticsearchExporter(config *elasticsearch_exporter.Config, instanceKey *string) discovery.Exports {
 	args := toElasticsearchExporter(config)
-	compLabel := common.LabelForParts(b.globalCtx.LabelPrefix, config.Name())
-	b.f.Body().AppendBlock(common.NewBlockWithOverride(
-		[]string{"prometheus", "exporter", "elasticsearch"},
-		compLabel,
-		args,
-	))
-
-	return common.NewDiscoveryExports(fmt.Sprintf("prometheus.exporter.elasticsearch.%s.targets", compLabel))
+	return b.appendExporterBlock(args, config.Name(), instanceKey, "elasticsearch")
 }
 
 func toElasticsearchExporter(config *elasticsearch_exporter.Config) *elasticsearch.Arguments {

converter/internal/staticconvert/internal/build/gcp_exporter.go

@@ -1,24 +1,14 @@
 package build
 
 import (
-	"fmt"
-
 	"github.com/grafana/agent/component/discovery"
 	"github.com/grafana/agent/component/prometheus/exporter/gcp"
-	"github.com/grafana/agent/converter/internal/common"
 	"github.com/grafana/agent/pkg/integrations/gcp_exporter"
 )
 
-func (b *IntegrationsConfigBuilder) appendGcpExporter(config *gcp_exporter.Config) discovery.Exports {
+func (b *IntegrationsConfigBuilder) appendGcpExporter(config *gcp_exporter.Config, instanceKey *string) discovery.Exports {
 	args := toGcpExporter(config)
-	compLabel := common.LabelForParts(b.globalCtx.LabelPrefix, config.Name())
-	b.f.Body().AppendBlock(common.NewBlockWithOverride(
-		[]string{"prometheus", "exporter", "gcp"},
-		compLabel,
-		args,
-	))
-
-	return common.NewDiscoveryExports(fmt.Sprintf("prometheus.exporter.gcp.%s.targets", compLabel))
+	return b.appendExporterBlock(args, config.Name(), instanceKey, "gcp")
 }
 
 func toGcpExporter(config *gcp_exporter.Config) *gcp.Arguments {