Skip to content

PMM-10180: disable http compression by default #954

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
ritbl wants to merge 1 commit into from
Closed

PMM-10180: disable http compression by default #954

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions docker-compose.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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

@artemgavrilov artemgavrilov Jun 22, 2022

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Damn! @BupycHuk It seem that we were targeting this percona/promconfig#12 😖

We forgot to merge promconfig or we added this dependency here accidentally?

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
Expand Down
4 changes: 2 additions & 2 deletions go.sum
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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=
Expand Down
14 changes: 9 additions & 5 deletions managed/services/victoriametrics/prometheus.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down Expand Up @@ -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
}
Comment on lines +199 to +201

@artemgavrilov artemgavrilov Jun 22, 2022

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

But how can I enable it then?

cfg.ScrapeConfigs = append(cfg.ScrapeConfigs, scfgs...)
}

Expand Down
2 changes: 0 additions & 2 deletions managed/services/victoriametrics/scrape_configs.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand All @@ -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),
Expand Down