disable http compression by default

percona · Jun 20, 2022 · 9511588 · 9511588
1 parent 2050762
commit 9511588
Show file tree

Hide file tree

Showing 4 changed files with 14 additions and 8 deletions.
diff --git 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
@@ -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
@@ -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
@@ -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),