diff --git a/docker-compose.yml b/docker-compose.yml index 5937ed06ef5..866a79afe7e 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -48,6 +48,10 @@ services: # CH - ${PMM_PORT_CH_TCP:-11000}:9000 - ${PMM_PORT_CH_HTTP:-11123}:8123 + # Exporters + - ${PMM_PORT_EXP_0:-52000}:42000 + - ${PMM_PORT_EXP_1:-52001}:42001 + - ${PMM_PORT_EXP_2:-52002}:42002 volumes: - ./:/root/go/src/github.com/percona/pmm - ./Makefile.devcontainer:/root/go/src/github.com/percona/pmm/Makefile:ro diff --git a/go.mod b/go.mod index 37023ed795e..94d725638dc 100644 --- a/go.mod +++ b/go.mod @@ -43,7 +43,7 @@ require ( github.com/percona/exporter_shared v0.7.3 github.com/percona/go-mysql v0.0.0-20210427141028-73d29c6da78c github.com/percona/percona-toolkit v3.2.1+incompatible - github.com/percona/promconfig v0.2.4-0.20211110115058-98687f586f54 + github.com/percona/promconfig v0.2.5-0.20220614151255-5619997cf14d github.com/pganalyze/pg_query_go v1.0.3 github.com/pkg/errors v0.9.1 github.com/pmezard/go-difflib v1.0.0 diff --git a/go.sum b/go.sum index fca8fd42bfe..ed290ed3793 100644 --- a/go.sum +++ b/go.sum @@ -486,8 +486,8 @@ github.com/percona/go-mysql v0.0.0-20210427141028-73d29c6da78c h1:1SZ7nS+kSaO63I github.com/percona/go-mysql v0.0.0-20210427141028-73d29c6da78c/go.mod h1:/SGLf9OMxlnK6jq4mkFiImBcJXXk5jwD+lDrwDaGXcw= github.com/percona/percona-toolkit v3.2.1+incompatible h1:5jLvtZKcu9fDmaLRB8qA4bLR727t5iYyguHJJQTk9w0= github.com/percona/percona-toolkit v3.2.1+incompatible/go.mod h1:netQWdWMaF1cnmwiIS+i5uyaqNXz46yNeM6HKkR6yeI= -github.com/percona/promconfig v0.2.4-0.20211110115058-98687f586f54 h1:aI1emmycDTGWKsBdxFPKZqohfBbK4y2ta9G4+RX7gVg= -github.com/percona/promconfig v0.2.4-0.20211110115058-98687f586f54/go.mod h1:Y2uXi5QNk71+ceJHuI9poank+0S1kjxd3K105fXKVkg= +github.com/percona/promconfig v0.2.5-0.20220614151255-5619997cf14d h1:HtKzmhjAjvkLZAIQaPJX//UP7qNm/sm3fcFArLa5hBw= +github.com/percona/promconfig v0.2.5-0.20220614151255-5619997cf14d/go.mod h1:Y2uXi5QNk71+ceJHuI9poank+0S1kjxd3K105fXKVkg= github.com/pierrec/lz4 v2.0.5+incompatible/go.mod h1:pdkljMzZIN41W+lC3N2tnIh5sFi+IEE17M5jbnwPHcY= github.com/pierrec/lz4/v4 v4.1.15 h1:MO0/ucJhngq7299dKLwIMtgTfbkoSPF6AoMYDd8Q4q0= github.com/pierrec/lz4/v4 v4.1.15/go.mod h1:gZWDp/Ze/IJXGXf23ltt2EXimqmTUXEy0GFuRQyBid4= diff --git a/managed/services/victoriametrics/prometheus.go b/managed/services/victoriametrics/prometheus.go index 2354a872d30..1c44899b2cc 100644 --- a/managed/services/victoriametrics/prometheus.go +++ b/managed/services/victoriametrics/prometheus.go @@ -132,11 +132,10 @@ func AddScrapeConfigs(l *logrus.Entry, cfg *config.Config, q *reform.Querier, s case models.PostgresExporterType: scfgs, err = scrapeConfigsForPostgresExporter(s, &scrapeConfigParams{ - host: paramsHost, - node: paramsNode, - service: paramsService, - agent: agent, - streamParse: true, + host: paramsHost, + node: paramsNode, + service: paramsService, + agent: agent, }) case models.ProxySQLExporterType: @@ -195,6 +194,11 @@ func AddScrapeConfigs(l *logrus.Entry, cfg *config.Config, q *reform.Querier, s if err != nil { l.Warnf("Failed to add %s %q, skipping: %s.", agent.AgentType, agent.AgentID, err) } + + // PMM-10180: disable compression by default + for _, scfg := range scfgs { + scfg.DisableCompression = true + } cfg.ScrapeConfigs = append(cfg.ScrapeConfigs, scfgs...) } diff --git a/managed/services/victoriametrics/scrape_configs.go b/managed/services/victoriametrics/scrape_configs.go index 5c3ab6fbe68..c95735655ab 100644 --- a/managed/services/victoriametrics/scrape_configs.go +++ b/managed/services/victoriametrics/scrape_configs.go @@ -163,7 +163,6 @@ type scrapeConfigParams struct { service *models.Service agent *models.Agent pmmAgentVersion *version.Parsed - streamParse bool } // scrapeConfigForStandardExporter returns scrape config for endpoint with given parameters. @@ -174,7 +173,6 @@ func scrapeConfigForStandardExporter(intervalName string, interval time.Duration } cfg := &config.ScrapeConfig{ - StreamParse: params.streamParse, JobName: jobName(params.agent, intervalName, interval), ScrapeInterval: config.Duration(interval), ScrapeTimeout: scrapeTimeout(interval),