Skip to content
This repository was archived by the owner on Jun 21, 2022. It is now read-only.
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
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-managed
# for local test
Expand Down
2 changes: 1 addition & 1 deletion go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions go.sum
Original file line number Diff line number Diff line change
Expand Up @@ -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=
Expand Down
14 changes: 9 additions & 5 deletions services/victoriametrics/prometheus.go
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
}
cfg.ScrapeConfigs = append(cfg.ScrapeConfigs, scfgs...)
}

Expand Down
2 changes: 0 additions & 2 deletions services/victoriametrics/scrape_configs.go
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