CLOUDP-68337: internal/cli/atlas/metrics and internal/cli/opsmanager/metrics to use the simplified output (#314)

Author: andreaangiolillo

internal/cli/opsmanager/metrics/databases_list.go

@@ -38,6 +38,10 @@ func (opts *DatabasesListsOpts) initStore() error {
 	return err
 }
 
+var databasesListTemplate = `{{range .Results}}
+{{.DatabaseName}}{{end}}
+`
+
 func (opts *DatabasesListsOpts) Run() error {
 	listOpts := opts.NewListOptions()
 	r, err := opts.store.HostDatabases(opts.ConfigProjectID(), opts.hostID, listOpts)
@@ -46,10 +50,10 @@ func (opts *DatabasesListsOpts) Run() error {
 		return err
 	}
 
-	return output.Print(config.Default(), "", r)
+	return output.Print(config.Default(), databasesListTemplate, r)
 }
 
-// mongocli om metric(s) process(es) disks lists <ID>
+// mongocli om metric(s) process(es) disks lists <HOST_ID>
 func DatabasesListBuilder() *cobra.Command {
 	opts := &DatabasesListsOpts{}
 	cmd := &cobra.Command{

internal/cli/opsmanager/metrics/disks_describe.go

@@ -39,14 +39,19 @@ func (opts *DisksDescribeOpts) initStore() error {
 	return err
 }
 
+var diskMetricTemplate = `NAME	UNITS	TIMESTAMP		VALUE{{range .ProcessMeasurements.Measurements}}  {{if .DataPoints}}
+{{- $name := .Name }}{{- $unit := .Units }}{{- range .DataPoints}}	
+{{ $name }}	{{ $unit }}	{{.Timestamp}}	{{if .Value }}	{{ .Value }}{{else}}	N/A {{end}}{{end}}{{end}}{{end}}
+`
+
 func (opts *DisksDescribeOpts) Run() error {
 	listOpts := opts.NewProcessMetricsListOptions()
 	r, err := opts.store.HostDiskMeasurements(opts.ConfigProjectID(), opts.hostID, opts.name, listOpts)
 	if err != nil {
 		return err
 	}
 
-	return output.Print(config.Default(), "", r)
+	return output.Print(config.Default(), diskMetricTemplate, r)
 }
 
 // mcli om metric(s) disk(s) describe <hostId:port> <name> --granularity g --period p --start start --end end [--type type] [--projectId projectId]

internal/cli/opsmanager/metrics/disks_describe_test.go

@@ -29,7 +29,11 @@ func TestDisksDescribeOpts_Run(t *testing.T) {
 	mockStore := mocks.NewMockHostDiskMeasurementsLister(ctrl)
 	defer ctrl.Finish()
 
-	expected := &mongodbatlas.ProcessDiskMeasurements{}
+	expected := &mongodbatlas.ProcessDiskMeasurements{
+		ProcessMeasurements: &mongodbatlas.ProcessMeasurements{
+			Measurements: []*mongodbatlas.Measurements{},
+		},
+	}
 
 	listOpts := &DisksDescribeOpts{
 		hostID: "1",

internal/cli/opsmanager/metrics/disks_list.go

@@ -38,14 +38,18 @@ func (opts *DisksListsOpts) initStore() error {
 	return err
 }
 
+var listTemplate = `{{range .Results}}
+{{.PartitionName}}{{end}}
+`
+
 func (opts *DisksListsOpts) Run() error {
 	listOpts := opts.NewListOptions()
 	r, err := opts.store.HostDisks(opts.ConfigProjectID(), opts.hostID, listOpts)
 	if err != nil {
 		return err
 	}
 
-	return output.Print(config.Default(), "", r)
+	return output.Print(config.Default(), listTemplate, r)
 }
 
 // mongocli om metric(s) process(es) disks lists <ID>

internal/cli/opsmanager/metrics/process.go

@@ -38,14 +38,19 @@ func (opts *ProcessOpts) initStore() error {
 	return err
 }
 
+var metricTemplate = `NAME	UNITS	TIMESTAMP		VALUE{{range .Measurements}} {{if .DataPoints}}
+{{- $name := .Name }}{{- $unit := .Units }}{{- range .DataPoints}}	
+{{ $name }}	{{ $unit }}	{{.Timestamp}}	{{if .Value }}	{{ .Value }}{{else}}	N/A {{end}}{{end}}{{end}}{{end}}
+`
+
 func (opts *ProcessOpts) Run() error {
 	listOpts := opts.NewProcessMetricsListOptions()
 	r, err := opts.store.HostMeasurements(opts.ConfigProjectID(), opts.hostID, listOpts)
 	if err != nil {
 		return err
 	}
 
-	return output.Print(config.Default(), "", r)
+	return output.Print(config.Default(), metricTemplate, r)
 }
 
 // mongocli om|cm metric(s) process(es) <ID> [--granularity granularity] [--period period] [--start start] [--end end] [--type type][--projectId projectId]