diff --git a/cmd/tools/grafana/grafana.go b/cmd/tools/grafana/grafana.go index ace448103..86d2cf59c 100644 --- a/cmd/tools/grafana/grafana.go +++ b/cmd/tools/grafana/grafana.go @@ -423,7 +423,7 @@ func initImportVars() { switch { case opts.dir == "grafana/dashboards" && opts.serverfolder.name == "": m[filepath.Join(opts.dir, "cmode")] = &Folder{name: "Harvest-" + harvestRelease + "-cDOT"} - m[filepath.Join(opts.dir, "cmode", "details")] = &Folder{name: "Harvest-" + harvestRelease + "-cDOT Details"} + m[filepath.Join(opts.dir, "cmode-details")] = &Folder{name: "Harvest-" + harvestRelease + "-cDOT Details"} m[filepath.Join(opts.dir, "7mode")] = &Folder{name: "Harvest-" + harvestRelease + "-7mode"} m[filepath.Join(opts.dir, "storagegrid")] = &Folder{name: "Harvest-" + harvestRelease + "-StorageGrid"} case opts.dir != "" && opts.serverfolder.name != "": diff --git a/integration/test/grafana/grafana_mgr.go b/integration/test/grafana/grafana_mgr.go index 2ce0dfaff..de379f780 100644 --- a/integration/test/grafana/grafana_mgr.go +++ b/integration/test/grafana/grafana_mgr.go @@ -12,7 +12,7 @@ import ( type Mgr struct { } -func (g *Mgr) Import(jsonDir string) (bool, string) { +func (g *Mgr) Import() (bool, string) { var ( importOutput string status bool @@ -31,15 +31,11 @@ func (g *Mgr) Import(jsonDir string) (bool, string) { if err != nil { panic(err) } - directoryOption := "" - if jsonDir != "" { - directoryOption = "--directory" - } grafanaURL := utils.GetGrafanaURL() if docker.IsDockerBasedPoller() { grafanaURL = "grafana:3000" } - importCmds := []string{"grafana", "import", "--overwrite", "--addr", grafanaURL, directoryOption, jsonDir} + importCmds := []string{"grafana", "import", "--overwrite", "--addr", grafanaURL} if docker.IsDockerBasedPoller() { params := []string{"exec", containerIDs[0].ID, "bin/harvest"} params = append(params, importCmds...)