-
Notifications
You must be signed in to change notification settings - Fork 124
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge branch 'main' into PMM-12290-remote-pg-comments
- Loading branch information
Showing
6 changed files
with
197 additions
and
32 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -231,6 +231,161 @@ func TestMongodbExporterConfig226(t *testing.T) { | |
| }) | ||
| } | ||
|
|
||
| func TestMongodbExporterConfig2411(t *testing.T) { | ||
| pmmAgentVersion := version.MustParse("2.41.1") | ||
| node := &models.Node{ | ||
| Address: "1.2.3.4", | ||
| } | ||
| mongodb := &models.Service{ | ||
| Address: pointer.ToString("1.2.3.4"), | ||
| Port: pointer.ToUint16(27017), | ||
| } | ||
| exporter := &models.Agent{ | ||
| AgentID: "agent-id", | ||
| AgentType: models.MongoDBExporterType, | ||
| Username: pointer.ToString("username"), | ||
| Password: pointer.ToString("s3cur3 p@$$w0r4."), | ||
| AgentPassword: pointer.ToString("agent-password"), | ||
| } | ||
| actual, err := mongodbExporterConfig(node, mongodb, exporter, redactSecrets, pmmAgentVersion) | ||
| expected := &agentpb.SetStateRequest_AgentProcess{ | ||
| Type: inventorypb.AgentType_MONGODB_EXPORTER, | ||
| TemplateLeftDelim: "{{", | ||
| TemplateRightDelim: "}}", | ||
| Args: []string{ | ||
| "--collector.diagnosticdata", | ||
| "--collector.replicasetstatus", | ||
| "--compatible-mode", | ||
| "--discovering-mode", | ||
| "--mongodb.global-conn-pool", | ||
| "--web.listen-address=0.0.0.0:{{ .listen_port }}", | ||
| "--web.config={{ .TextFiles.webConfigPlaceholder }}", | ||
| }, | ||
| Env: []string{ | ||
| "MONGODB_URI=mongodb://username:s3cur3%20p%[email protected]:27017/?connectTimeoutMS=1000&directConnection=true&serverSelectionTimeoutMS=1000", | ||
| }, | ||
| RedactWords: []string{"s3cur3 p@$$w0r4.", "agent-password"}, | ||
| TextFiles: map[string]string{ | ||
| "webConfigPlaceholder": "basic_auth_users:\n pmm: agent-password\n", | ||
| }, | ||
| } | ||
| require.NoError(t, err) | ||
| requireNoDuplicateFlags(t, actual.Args) | ||
| require.Equal(t, expected.Args, actual.Args) | ||
| require.Equal(t, expected.Env, actual.Env) | ||
| require.Equal(t, expected, actual) | ||
|
|
||
| t.Run("Having collstats limit", func(t *testing.T) { | ||
| exporter.MongoDBOptions = &models.MongoDBOptions{ | ||
| StatsCollections: []string{"col1", "col2", "col3"}, | ||
| CollectionsLimit: 79014, | ||
| } | ||
| expected.Args = []string{ | ||
| "--collector.collstats-limit=79014", | ||
| "--collector.diagnosticdata", | ||
| "--collector.replicasetstatus", | ||
| "--compatible-mode", | ||
| "--discovering-mode", | ||
| "--mongodb.collstats-colls=col1,col2,col3", | ||
| "--mongodb.global-conn-pool", | ||
| "--mongodb.indexstats-colls=col1,col2,col3", | ||
| "--web.listen-address=0.0.0.0:{{ .listen_port }}", | ||
| "--web.config={{ .TextFiles.webConfigPlaceholder }}", | ||
| } | ||
| actual, err := mongodbExporterConfig(node, mongodb, exporter, exposeSecrets, pmmAgentVersion) | ||
| require.NoError(t, err) | ||
| require.Equal(t, expected.Args, actual.Args) | ||
| }) | ||
|
|
||
| t.Run("Enabling all collectors with non zero limit", func(t *testing.T) { | ||
| exporter.MongoDBOptions = &models.MongoDBOptions{ | ||
| StatsCollections: []string{"col1", "col2", "col3"}, | ||
| CollectionsLimit: 79014, | ||
| EnableAllCollectors: true, | ||
| } | ||
|
|
||
| expected.Args = []string{ | ||
| "--collector.collstats", | ||
| "--collector.collstats-limit=79014", | ||
| "--collector.dbstats", | ||
| "--collector.diagnosticdata", | ||
| "--collector.indexstats", | ||
| "--collector.replicasetstatus", | ||
| "--collector.shards", | ||
| "--collector.topmetrics", | ||
| "--compatible-mode", | ||
| "--discovering-mode", | ||
| "--mongodb.collstats-colls=col1,col2,col3", | ||
| "--mongodb.global-conn-pool", | ||
| "--mongodb.indexstats-colls=col1,col2,col3", | ||
| "--web.listen-address=0.0.0.0:{{ .listen_port }}", | ||
| "--web.config={{ .TextFiles.webConfigPlaceholder }}", | ||
| } | ||
| actual, err := mongodbExporterConfig(node, mongodb, exporter, exposeSecrets, pmmAgentVersion) | ||
| require.NoError(t, err) | ||
| require.Equal(t, expected.Args, actual.Args) | ||
| }) | ||
|
|
||
| t.Run("Enabling all collectors", func(t *testing.T) { | ||
| exporter.MongoDBOptions = &models.MongoDBOptions{ | ||
| EnableAllCollectors: true, | ||
| StatsCollections: []string{"db1.col1.one", "db2.col2", "db3"}, | ||
| } | ||
|
|
||
| expected.Args = []string{ | ||
| "--collector.collstats", | ||
| "--collector.collstats-limit=0", | ||
| "--collector.dbstats", | ||
| "--collector.diagnosticdata", | ||
| "--collector.indexstats", | ||
| "--collector.replicasetstatus", | ||
| "--collector.shards", | ||
| "--collector.topmetrics", | ||
| "--compatible-mode", | ||
| "--discovering-mode", | ||
| // this should be here even if limit=0 because it could be used to filter dbstats | ||
| // since dbstats is not depending the number of collections present in the db. | ||
| "--mongodb.collstats-colls=db1.col1.one,db2.col2,db3", | ||
| "--mongodb.global-conn-pool", | ||
| "--mongodb.indexstats-colls=db1.col1.one,db2.col2,db3", | ||
| "--web.listen-address=0.0.0.0:{{ .listen_port }}", | ||
| "--web.config={{ .TextFiles.webConfigPlaceholder }}", | ||
| } | ||
| actual, err := mongodbExporterConfig(node, mongodb, exporter, exposeSecrets, pmmAgentVersion) | ||
| require.NoError(t, err) | ||
| require.Equal(t, expected.Args, actual.Args) | ||
| }) | ||
|
|
||
| t.Run("collstats-limit=-1 -> automatically set the limit", func(t *testing.T) { | ||
| exporter.MongoDBOptions = &models.MongoDBOptions{ | ||
| EnableAllCollectors: true, | ||
| StatsCollections: []string{"db1.col1.one", "db2.col2", "db3"}, | ||
| CollectionsLimit: -1, | ||
| } | ||
|
|
||
| expected.Args = []string{ | ||
| "--collector.collstats", | ||
| "--collector.collstats-limit=200", // 200 is the default for auto-set | ||
| "--collector.dbstats", | ||
| "--collector.diagnosticdata", | ||
| "--collector.indexstats", | ||
| "--collector.replicasetstatus", | ||
| "--collector.shards", | ||
| "--collector.topmetrics", | ||
| "--compatible-mode", | ||
| "--discovering-mode", | ||
| "--mongodb.collstats-colls=db1.col1.one,db2.col2,db3", | ||
| "--mongodb.global-conn-pool", | ||
| "--mongodb.indexstats-colls=db1.col1.one,db2.col2,db3", | ||
| "--web.listen-address=0.0.0.0:{{ .listen_port }}", | ||
| "--web.config={{ .TextFiles.webConfigPlaceholder }}", | ||
| } | ||
| actual, err := mongodbExporterConfig(node, mongodb, exporter, exposeSecrets, pmmAgentVersion) | ||
| require.NoError(t, err) | ||
| require.Equal(t, expected.Args, actual.Args) | ||
| }) | ||
| } | ||
|
|
||
| func TestMongodbExporterConfig(t *testing.T) { | ||
| pmmAgentVersion := version.MustParse("2.0.0") | ||
| node := &models.Node{ | ||
|
|
||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters