Skip to content
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.

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

PMM-12712 Shards collector. #2701

Merged
merged 35 commits into from
Jan 15, 2024
Merged
Show file tree
Hide file tree
Changes from 16 commits
Commits
Show all changes
35 commits
Select commit Hold shift + click to select a range
8a5b5a5
PMM-12712 Add sharded collection into HR resolution.
JiriCtvrtka Dec 15, 2023
0979dfe
PMM-12712 Sharded collector.
JiriCtvrtka Dec 18, 2023
746b96b
Merge branch 'main' into PMM-12712-shards-info
JiriCtvrtka Dec 18, 2023
575646a
Merge branch 'main' into PMM-12712-shards-info
JiriCtvrtka Dec 18, 2023
35ec24d
PMM-12712 Fix tests.
JiriCtvrtka Dec 18, 2023
b8e4a40
Merge remote-tracking branch 'origin/PMM-12712-shards-info' into PMM-…
JiriCtvrtka Dec 18, 2023
6c15ddd
PMM-12712 Fix VM test.
JiriCtvrtka Dec 18, 2023
29d859b
Merge branch 'main' into PMM-12712-shards-info
JiriCtvrtka Dec 19, 2023
c7fa173
Merge branch 'main' into PMM-12712-shards-info
JiriCtvrtka Dec 21, 2023
8eae688
Merge branch 'main' into PMM-12712-shards-info
JiriCtvrtka Dec 22, 2023
56c55ef
Merge branch 'main' into PMM-12712-shards-info
JiriCtvrtka Jan 2, 2024
3905c4f
Merge branch 'main' into PMM-12712-shards-info
JiriCtvrtka Jan 8, 2024
0a70d19
Merge branch 'main' into PMM-12712-shards-info
JiriCtvrtka Jan 8, 2024
45d6ceb
Merge branch 'main' into PMM-12712-shards-info
JiriCtvrtka Jan 8, 2024
84b92c4
Merge branch 'main' into PMM-12712-shards-info
JiriCtvrtka Jan 8, 2024
67f8380
Merge branch 'main' into PMM-12712-shards-info
JiriCtvrtka Jan 8, 2024
16c1f11
PMM-12712 Renaming.
JiriCtvrtka Jan 8, 2024
7383ea4
Merge branch 'main' into PMM-12712-shards-info
JiriCtvrtka Jan 9, 2024
513da6b
PMM-12712 Remove unclear comments.
JiriCtvrtka Jan 9, 2024
d3d6c57
Merge branch 'main' into PMM-12712-shards-info
JiriCtvrtka Jan 9, 2024
fe1f0cb
Merge branch 'main' into PMM-12712-shards-info
JiriCtvrtka Jan 9, 2024
7dbdb0d
Merge branch 'main' into PMM-12712-shards-info
JiriCtvrtka Jan 10, 2024
28bb907
PMM-12712 Check for 2.41.1 version.
JiriCtvrtka Jan 10, 2024
a09134a
PMM-12712 Small change.
JiriCtvrtka Jan 10, 2024
9769e95
PMM-12712 Version check for scrape config for VM.
JiriCtvrtka Jan 10, 2024
a28a6cb
PMM-12712 VM test.
JiriCtvrtka Jan 10, 2024
3b2a67a
Merge branch 'main' into PMM-12712-shards-info
JiriCtvrtka Jan 10, 2024
cb9eb30
Merge branch 'main' into PMM-12712-shards-info
JiriCtvrtka Jan 10, 2024
4d52e5c
Merge branch 'main' into PMM-12712-shards-info
JiriCtvrtka Jan 10, 2024
5885134
PMM-12712 Fix version check for QA versions.
JiriCtvrtka Jan 10, 2024
8e05324
PMM-12712 Small renaming.
JiriCtvrtka Jan 10, 2024
19ea041
PMM-12712 Few more versions in test.
JiriCtvrtka Jan 10, 2024
3b64632
PMM-12712 Lint.
JiriCtvrtka Jan 10, 2024
6121ff2
PMM-12712 Simplify check.
JiriCtvrtka Jan 10, 2024
cde1aa1
Merge branch 'main' into PMM-12712-shards-info
JiriCtvrtka Jan 15, 2024
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
10 changes: 10 additions & 0 deletions managed/services/agents/mongodb.go
Original file line number Diff line number Diff line change
Expand Up @@ -187,6 +187,11 @@ func v225Args(exporter *models.Agent, tdp *models.DelimiterPair, listenAddress s
enabled: false,
enableParam: "--collector.topmetrics",
},
// disabled until we have better information on the resources usage impact
"sharded": {
enabled: false,
enableParam: "--collector.sharded",
},
}

for _, collector := range exporter.DisabledCollectors {
Expand Down Expand Up @@ -252,6 +257,11 @@ func defaultCollectors(collectAll bool) map[string]collectorArgs {
enabled: collectAll,
enableParam: "--collector.topmetrics",
},
// disabled until we have better information on the resources usage impact
artemgavrilov marked this conversation as resolved.
Show resolved Hide resolved
"sharded": {
enabled: collectAll,
enableParam: "--collector.sharded",
},
}
}

Expand Down
3 changes: 3 additions & 0 deletions managed/services/agents/mongodb_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -162,6 +162,7 @@ func TestMongodbExporterConfig226(t *testing.T) {
"--collector.diagnosticdata",
"--collector.indexstats",
"--collector.replicasetstatus",
"--collector.sharded",
"--collector.topmetrics",
"--compatible-mode",
"--discovering-mode",
Expand All @@ -188,6 +189,7 @@ func TestMongodbExporterConfig226(t *testing.T) {
"--collector.diagnosticdata",
"--collector.indexstats",
"--collector.replicasetstatus",
"--collector.sharded",
"--collector.topmetrics",
"--compatible-mode",
"--discovering-mode",
Expand Down Expand Up @@ -217,6 +219,7 @@ func TestMongodbExporterConfig226(t *testing.T) {
"--collector.diagnosticdata",
"--collector.indexstats",
"--collector.replicasetstatus",
"--collector.sharded",
"--collector.topmetrics",
"--compatible-mode",
"--discovering-mode",
Expand Down
1 change: 1 addition & 0 deletions managed/services/victoriametrics/scrape_configs.go
Original file line number Diff line number Diff line change
Expand Up @@ -402,6 +402,7 @@ func scrapeConfigsForMongoDBExporter(s *models.MetricsResolutions, params *scrap
"dbstats",
"indexstats",
"collstats",
"sharded",
})
if err != nil {
return nil, err
Expand Down
2 changes: 1 addition & 1 deletion managed/services/victoriametrics/scrape_configs_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -752,7 +752,7 @@ func TestScrapeConfig(t *testing.T) {
ScrapeTimeout: scrapeTimeout(s.LR),
MetricsPath: "/metrics",
Params: map[string][]string{
"collect[]": {"collstats", "dbstats", "indexstats"},
"collect[]": {"collstats", "dbstats", "indexstats", "sharded"},
},
HTTPClientConfig: config.HTTPClientConfig{
BasicAuth: &config.BasicAuth{
Expand Down
1 change: 1 addition & 0 deletions managed/services/victoriametrics/victoriametrics_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -385,6 +385,7 @@ scrape_configs:
- collstats
- dbstats
- indexstats
- sharded
scrape_interval: 1m
scrape_timeout: 54s
metrics_path: /metrics
Expand Down
Loading