PMM-13399 add nomad data dir to tests and flags.

percona · Oct 21, 2024 · 4545436 · 4545436
1 parent a51df49
commit 4545436
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 0 deletions.
diff --git a/agent/config/config.go b/agent/config/config.go
@@ -406,6 +406,8 @@ func Application(cfg *Config) (*kingpin.Application, *string) {
 		Envar("PMM_AGENT_PATHS_PT_MYSQL_SUMMARY").StringVar(&cfg.Paths.PTMySQLSummary)
 	app.Flag("paths-nomad", "Path to nomad to use [PMM_AGENT_PATHS_NOMAD]").
 		Envar("PMM_AGENT_PATHS_NOMAD").StringVar(&cfg.Paths.Nomad)
+	app.Flag("paths-nomad-data-dir", "Nomad data directory [PMM_AGENT_PATHS_NOMAD_DATA_DIR]").
+		Envar("PMM_AGENT_PATHS_NOMAD_DATA_DIR").StringVar(&cfg.Paths.NomadDataDir)
 	app.Flag("paths-tempdir", "Temporary directory for exporters [PMM_AGENT_PATHS_TEMPDIR]").
 		Envar("PMM_AGENT_PATHS_TEMPDIR").StringVar(&cfg.Paths.TempDir)
 	// no flag for SlowLogFilePrefix - it is only for development and testing

diff --git a/agent/config/config_test.go b/agent/config/config_test.go
@@ -116,6 +116,7 @@ func TestGet(t *testing.T) {
 				AzureExporter:    "/usr/local/percona/pmm/exporters/azure_exporter",
 				VMAgent:          "/usr/local/percona/pmm/exporters/vmagent",
 				TempDir:          "/usr/local/percona/pmm/tmp",
+				NomadDataDir:     "/usr/local/percona/pmm/data/nomad",
 				PTSummary:        "/usr/local/percona/pmm/tools/pt-summary",
 				PTPGSummary:      "/usr/local/percona/pmm/tools/pt-pg-summary",
 				PTMySQLSummary:   "/usr/local/percona/pmm/tools/pt-mysql-summary",
@@ -177,6 +178,7 @@ func TestGet(t *testing.T) {
 				AzureExporter:    "/usr/local/percona/pmm/exporters/azure_exporter",
 				VMAgent:          "/usr/local/percona/pmm/exporters/vmagent",
 				TempDir:          "/usr/local/percona/pmm/tmp",
+				NomadDataDir:     "/usr/local/percona/pmm/data/nomad",
 				PTSummary:        "/usr/local/percona/pmm/tools/pt-summary",
 				PTPGSummary:      "/usr/local/percona/pmm/tools/pt-pg-summary",
 				PTMongoDBSummary: "/usr/local/percona/pmm/tools/pt-mongodb-summary",
@@ -237,6 +239,7 @@ func TestGet(t *testing.T) {
 				AzureExporter:    "/usr/local/percona/pmm/exporters/azure_exporter",
 				VMAgent:          "/usr/local/percona/pmm/exporters/vmagent",
 				TempDir:          "/foo/bar/tmp",
+				NomadDataDir:     "/usr/local/percona/pmm/data/nomad",
 				PTSummary:        "/usr/local/percona/pmm/tools/pt-summary",
 				PTPGSummary:      "/usr/local/percona/pmm/tools/pt-pg-summary",
 				PTMySQLSummary:   "/usr/local/percona/pmm/tools/pt-mysql-summary",
@@ -305,6 +308,7 @@ func TestGet(t *testing.T) {
 				AzureExporter:    "/base/azure_exporter",   // default value
 				VMAgent:          "/base/vmagent",          // default value
 				TempDir:          "/usr/local/percona/pmm/tmp",
+				NomadDataDir:     "/usr/local/percona/pmm/data/nomad",
 				PTSummary:        "/usr/local/percona/pmm/tools/pt-summary",
 				PTPGSummary:      "/usr/local/percona/pmm/tools/pt-pg-summary",
 				PTMongoDBSummary: "/usr/local/percona/pmm/tools/pt-mongodb-summary",
@@ -371,6 +375,7 @@ func TestGet(t *testing.T) {
 				AzureExporter:    "/base/exporters/azure_exporter",     // default value
 				VMAgent:          "/base/exporters/vmagent",            // default value
 				TempDir:          "/base/tmp",
+				NomadDataDir:     "/base/data/nomad",
 				PTSummary:        "/base/tools/pt-summary",
 				PTPGSummary:      "/base/tools/pt-pg-summary",
 				PTMongoDBSummary: "/base/tools/pt-mongodb-summary",
@@ -435,6 +440,7 @@ func TestGet(t *testing.T) {
 				AzureExporter:    "/foo/exporters/azure_exporter",    // default value
 				VMAgent:          "/foo/exporters/vmagent",           // default value
 				TempDir:          "/foo/tmp",
+				NomadDataDir:     "/base/data/nomad",
 				PTSummary:        "/base/tools/pt-summary",
 				PTPGSummary:      "/base/tools/pt-pg-summary",
 				PTMongoDBSummary: "/base/tools/pt-mongodb-summary",
@@ -484,6 +490,7 @@ func TestGet(t *testing.T) {
 				AzureExporter:    "/usr/local/percona/pmm/exporters/azure_exporter",
 				VMAgent:          "/usr/local/percona/pmm/exporters/vmagent",
 				TempDir:          "/usr/local/percona/pmm/tmp",
+				NomadDataDir:     "/usr/local/percona/pmm/data/nomad",
 				PTSummary:        "/usr/local/percona/pmm/tools/pt-summary",
 				PTPGSummary:      "/usr/local/percona/pmm/tools/pt-pg-summary",
 				PTMongoDBSummary: "/usr/local/percona/pmm/tools/pt-mongodb-summary",