From 951158867d7f908a564ca4addeefef0a88714386 Mon Sep 17 00:00:00 2001 From: Alexey Mukas Date: Tue, 14 Jun 2022 22:27:44 +0200 Subject: [PATCH 1/2] disable http compression by default --- docker-compose.yml | 4 ++++ go.mod | 2 +- services/victoriametrics/prometheus.go | 14 +++++++++----- services/victoriametrics/scrape_configs.go | 2 -- 4 files changed, 14 insertions(+), 8 deletions(-) diff --git a/docker-compose.yml b/docker-compose.yml index e40590037b..60c2028782 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-managed # for local test diff --git a/go.mod b/go.mod index e6371c035a..bcc6b2fb5c 100644 --- a/go.mod +++ b/go.mod @@ -38,7 +38,7 @@ require ( github.com/percona-platform/dbaas-api v0.0.0-20220110092915-5aacd784d472 github.com/percona-platform/saas v0.0.0-20220427162947-f9d246ad0f16 github.com/percona/pmm v0.0.0-20220613185940-593b9a167d9f - github.com/percona/promconfig v0.2.4-0.20211110115058-98687f586f54 + github.com/percona/promconfig v0.2.5-0.20220614151255-5619997cf14d github.com/pkg/errors v0.9.1 github.com/pmezard/go-difflib v1.0.0 github.com/prometheus/alertmanager v0.24.0 diff --git a/services/victoriametrics/prometheus.go b/services/victoriametrics/prometheus.go index ed3dd8473a..b075cfd6df 100644 --- a/services/victoriametrics/prometheus.go +++ b/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/services/victoriametrics/scrape_configs.go b/services/victoriametrics/scrape_configs.go index d132173c20..83cf209914 100644 --- a/services/victoriametrics/scrape_configs.go +++ b/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), From 4580b957c57b6343b8abab1ba327ffe8392362ae Mon Sep 17 00:00:00 2001 From: Alexey Mukas Date: Mon, 20 Jun 2022 14:09:35 +0200 Subject: [PATCH 2/2] go mod tidy --- go.sum | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/go.sum b/go.sum index c9421beb07..ee0db81344 100644 --- a/go.sum +++ b/go.sum @@ -468,8 +468,8 @@ github.com/percona-platform/saas v0.0.0-20220427162947-f9d246ad0f16 h1:0fx16uGtl github.com/percona-platform/saas v0.0.0-20220427162947-f9d246ad0f16/go.mod h1:gFUwaFp6Ugu5qsBwiOVJYbDlzgZ77tmXdXGO7tG5xVI= github.com/percona/pmm v0.0.0-20220613185940-593b9a167d9f h1:zoseK4ixNYbRYKObv6/u8m3gp5C0Ti6qg9eL2CuQTug= github.com/percona/pmm v0.0.0-20220613185940-593b9a167d9f/go.mod h1:c22C8QvyFlcxr61TbqPlLGVC2u4xDptqYuYAoV0Umbs= -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.14 h1:+fL8AQEZtz/ijeNnpduH0bROTu0O3NZAlPjQxGn8LwE= github.com/pierrec/lz4/v4 v4.1.14/go.mod h1:gZWDp/Ze/IJXGXf23ltt2EXimqmTUXEy0GFuRQyBid4=