CLOUDP-62056: Change measurements to metrics (#156)

mongodb · May 5, 2020 · 75f1add · 75f1add
1 parent 56b24ee
commit 75f1add
Show file tree

Hide file tree

Showing 26 changed files with 104 additions and 102 deletions.
diff --git a/internal/cli/atlas.go b/internal/cli/atlas.go
@@ -34,7 +34,7 @@ func AtlasBuilder() *cobra.Command {
 	cmd.AddCommand(AtlasAlertsBuilder())
 	cmd.AddCommand(AtlasBackupsBuilder())
 	cmd.AddCommand(AtlasEventsBuilder())
-	cmd.AddCommand(AtlasMeasurementsBuilder())
+	cmd.AddCommand(AtlasMetricsBuilder())
 	cmd.AddCommand(AtlasLogsBuilder())
 	cmd.AddCommand(AtlasProcessesBuilder())
 

diff --git a/internal/cli/atlas_measurements.go → internal/cli/atlas_metrics.go b/internal/cli/atlas_measurements.go → internal/cli/atlas_metrics.go
@@ -20,7 +20,7 @@ import (
 	"github.com/spf13/cobra"
 )
 
-type measurementsOpts struct {
+type metricsOpts struct {
 	listOpts
 	granularity     string
 	period          string
@@ -29,7 +29,7 @@ type measurementsOpts struct {
 	measurementType []string
 }
 
-func (opts *measurementsOpts) newProcessMeasurementListOptions() *atlas.ProcessMeasurementListOptions {
+func (opts *metricsOpts) newProcessMetricsListOptions() *atlas.ProcessMeasurementListOptions {
 	o := &atlas.ProcessMeasurementListOptions{
 		ListOptions: opts.newListOptions(),
 	}
@@ -42,14 +42,15 @@ func (opts *measurementsOpts) newProcessMeasurementListOptions() *atlas.ProcessM
 	return o
 }
 
-func AtlasMeasurementsBuilder() *cobra.Command {
+func AtlasMetricsBuilder() *cobra.Command {
 	cmd := &cobra.Command{
-		Use:   "measurements",
-		Short: description.Measurements,
+		Use:     "metrics",
+		Aliases: []string{"metric", "measurements", "measurement"},
+		Short:   description.Metrics,
 	}
-	cmd.AddCommand(AtlasMeasurementsProcessBuilder())
-	cmd.AddCommand(AtlasMeasurementsDisksBuilder())
-	cmd.AddCommand(AtlasMeasurementsDatabasesBuilder())
+	cmd.AddCommand(AtlasMetricsProcessBuilder())
+	cmd.AddCommand(AtlasMetricsDisksBuilder())
+	cmd.AddCommand(AtlasMetricsDatabasesBuilder())
 
 	return cmd
 }
diff --git a/internal/cli/atlas_measurements_databases.go → internal/cli/atlas_metrics_databases.go b/internal/cli/atlas_measurements_databases.go → internal/cli/atlas_metrics_databases.go
@@ -19,14 +19,14 @@ import (
 	"github.com/spf13/cobra"
 )
 
-func AtlasMeasurementsDatabasesBuilder() *cobra.Command {
+func AtlasMetricsDatabasesBuilder() *cobra.Command {
 	cmd := &cobra.Command{
 		Use:     "databases",
 		Aliases: []string{"database"},
 		Short:   description.Databases,
 	}
 
-	cmd.AddCommand(AtlasMeasurementsDatabasesListBuilder())
+	cmd.AddCommand(AtlasMetricsDatabasesListBuilder())
 
 	return cmd
 }
diff --git a/.../cli/atlas_measurements_databases_list.go → internal/cli/atlas_metrics_databases_list.go b/.../cli/atlas_measurements_databases_list.go → internal/cli/atlas_metrics_databases_list.go
@@ -23,21 +23,21 @@ import (
 	"github.com/spf13/cobra"
 )
 
-type atlasMeasurementsDatabasesListsOpts struct {
+type atlasMetricsDatabasesListsOpts struct {
 	globalOpts
 	listOpts
 	host  string
 	port  int
 	store store.ProcessDatabaseLister
 }
 
-func (opts *atlasMeasurementsDatabasesListsOpts) initStore() error {
+func (opts *atlasMetricsDatabasesListsOpts) initStore() error {
 	var err error
 	opts.store, err = store.New()
 	return err
 }
 
-func (opts *atlasMeasurementsDatabasesListsOpts) Run() error {
+func (opts *atlasMetricsDatabasesListsOpts) Run() error {
 	listOpts := opts.newListOptions()
 	result, err := opts.store.ProcessDatabases(opts.ProjectID(), opts.host, opts.port, listOpts)
 
@@ -48,9 +48,9 @@ func (opts *atlasMeasurementsDatabasesListsOpts) Run() error {
 	return json.PrettyPrint(result)
 }
 
-// mongocli atlas measurements process(es) disks lists [host:port]
-func AtlasMeasurementsDatabasesListBuilder() *cobra.Command {
-	opts := &atlasMeasurementsDatabasesListsOpts{}
+// mongocli atlas metric(s) process(es) disks lists [host:port]
+func AtlasMetricsDatabasesListBuilder() *cobra.Command {
+	opts := &atlasMetricsDatabasesListsOpts{}
 	cmd := &cobra.Command{
 		Use:     "list [host:port]",
 		Short:   description.ListDatabases,

diff --git a/...atlas_measurements_databases_list_test.go → .../cli/atlas_metrics_databases_list_test.go b/...atlas_measurements_databases_list_test.go → .../cli/atlas_metrics_databases_list_test.go
@@ -21,15 +21,15 @@ import (
 	"github.com/mongodb/mongocli/internal/mocks"
 )
 
-func TestAtlasMeasurementsDatabasesListsOpts_Run(t *testing.T) {
+func TestAtlasMetricsDatabasesListsOpts_Run(t *testing.T) {
 	ctrl := gomock.NewController(t)
 	mockStore := mocks.NewMockProcessDatabaseLister(ctrl)
 
 	defer ctrl.Finish()
 
 	expected := &mongodbatlas.ProcessDatabasesResponse{}
 
-	listOpts := &atlasMeasurementsDatabasesListsOpts{
+	listOpts := &atlasMetricsDatabasesListsOpts{
 		host:  "hard-00-00.mongodb.net",
 		port:  27017,
 		store: mockStore,

diff --git a/internal/cli/atlas_measurements_disks.go → internal/cli/atlas_metrics_disks.go b/internal/cli/atlas_measurements_disks.go → internal/cli/atlas_metrics_disks.go
@@ -19,15 +19,15 @@ import (
 	"github.com/spf13/cobra"
 )
 
-func AtlasMeasurementsDisksBuilder() *cobra.Command {
+func AtlasMetricsDisksBuilder() *cobra.Command {
 	cmd := &cobra.Command{
 		Use:     "disks",
 		Aliases: []string{"disk"},
 		Short:   description.Disks,
 	}
 
-	cmd.AddCommand(AtlasMeasurementsDisksListBuilder())
-	cmd.AddCommand(AtlasMeasurementsDisksDescribeBuilder())
+	cmd.AddCommand(AtlasMetricsDisksListBuilder())
+	cmd.AddCommand(AtlasMetricsDisksDescribeBuilder())
 
 	return cmd
 }
diff --git a/.../cli/atlas_measurements_disks_describe.go → internal/cli/atlas_metrics_disks_describe.go b/.../cli/atlas_measurements_disks_describe.go → internal/cli/atlas_metrics_disks_describe.go
@@ -23,23 +23,23 @@ import (
 	"github.com/spf13/cobra"
 )
 
-type atlasMeasurementsDisksDescribeOpts struct {
+type atlasMetricsDisksDescribeOpts struct {
 	globalOpts
-	measurementsOpts
+	metricsOpts
 	host  string
 	port  int
 	name  string
 	store store.ProcessDiskMeasurementsLister
 }
 
-func (opts *atlasMeasurementsDisksDescribeOpts) initStore() error {
+func (opts *atlasMetricsDisksDescribeOpts) initStore() error {
 	var err error
 	opts.store, err = store.New()
 	return err
 }
 
-func (opts *atlasMeasurementsDisksDescribeOpts) Run() error {
-	listOpts := opts.newProcessMeasurementListOptions()
+func (opts *atlasMetricsDisksDescribeOpts) Run() error {
+	listOpts := opts.newProcessMetricsListOptions()
 	result, err := opts.store.ProcessDiskMeasurements(opts.ProjectID(), opts.host, opts.port, opts.name, listOpts)
 
 	if err != nil {
@@ -49,9 +49,9 @@ func (opts *atlasMeasurementsDisksDescribeOpts) Run() error {
 	return json.PrettyPrint(result)
 }
 
-// mcli atlas measurements disk(s) describe [host:port] [name] --granularity g --period p --start start --end end [--type type] [--projectId projectId]
-func AtlasMeasurementsDisksDescribeBuilder() *cobra.Command {
-	opts := &atlasMeasurementsDisksDescribeOpts{}
+// mcli atlas metric(s) disk(s) describe [host:port] [name] --granularity g --period p --start start --end end [--type type] [--projectId projectId]
+func AtlasMetricsDisksDescribeBuilder() *cobra.Command {
+	opts := &atlasMetricsDisksDescribeOpts{}
 	cmd := &cobra.Command{
 		Use:   "describe [host:port] [name]",
 		Short: description.DescribeDisks,

diff --git a/...atlas_measurements_disks_describe_test.go → .../cli/atlas_metrics_disks_describe_test.go b/...atlas_measurements_disks_describe_test.go → .../cli/atlas_metrics_disks_describe_test.go
@@ -21,22 +21,22 @@ import (
 	"github.com/mongodb/mongocli/internal/mocks"
 )
 
-func TestAtlasMeasurementsDisksDescribeOpts_Run(t *testing.T) {
+func TestAtlasMetricsDisksDescribeOpts_Run(t *testing.T) {
 	ctrl := gomock.NewController(t)
 	mockStore := mocks.NewMockProcessDiskMeasurementsLister(ctrl)
 
 	defer ctrl.Finish()
 
 	expected := &mongodbatlas.ProcessDiskMeasurements{}
 
-	listOpts := &atlasMeasurementsDisksDescribeOpts{
+	listOpts := &atlasMetricsDisksDescribeOpts{
 		host:  "hard-00-00.mongodb.net",
 		port:  27017,
 		name:  "test",
 		store: mockStore,
 	}
 
-	opts := listOpts.newProcessMeasurementListOptions()
+	opts := listOpts.newProcessMetricsListOptions()
 	mockStore.
 		EXPECT().ProcessDiskMeasurements(listOpts.projectID, listOpts.host, listOpts.port, listOpts.name, opts).
 		Return(expected, nil).

diff --git a/...rnal/cli/atlas_measurements_disks_list.go → internal/cli/atlas_metrics_disks_list.go b/...rnal/cli/atlas_measurements_disks_list.go → internal/cli/atlas_metrics_disks_list.go
@@ -23,21 +23,21 @@ import (
 	"github.com/spf13/cobra"
 )
 
-type atlasMeasurementsDisksListsOpts struct {
+type atlasMetricsDisksListsOpts struct {
 	globalOpts
 	listOpts
 	host  string
 	port  int
 	store store.ProcessDisksLister
 }
 
-func (opts *atlasMeasurementsDisksListsOpts) initStore() error {
+func (opts *atlasMetricsDisksListsOpts) initStore() error {
 	var err error
 	opts.store, err = store.New()
 	return err
 }
 
-func (opts *atlasMeasurementsDisksListsOpts) Run() error {
+func (opts *atlasMetricsDisksListsOpts) Run() error {
 	listOpts := opts.newListOptions()
 	result, err := opts.store.ProcessDisks(opts.ProjectID(), opts.host, opts.port, listOpts)
 
@@ -48,9 +48,9 @@ func (opts *atlasMeasurementsDisksListsOpts) Run() error {
 	return json.PrettyPrint(result)
 }
 
-// mongocli atlas measurements process(es) disks lists [host:port]
-func AtlasMeasurementsDisksListBuilder() *cobra.Command {
-	opts := &atlasMeasurementsDisksListsOpts{}
+// mongocli atlas metric(s) process(es) disks lists [host:port]
+func AtlasMetricsDisksListBuilder() *cobra.Command {
+	opts := &atlasMetricsDisksListsOpts{}
 	cmd := &cobra.Command{
 		Use:     "list [host:port]",
 		Short:   description.ListDisks,

diff --git a/...cli/atlas_measurements_disks_list_test.go → ...rnal/cli/atlas_metrics_disks_list_test.go b/...cli/atlas_measurements_disks_list_test.go → ...rnal/cli/atlas_metrics_disks_list_test.go
@@ -21,15 +21,15 @@ import (
 	"github.com/mongodb/mongocli/internal/mocks"
 )
 
-func TestAtlasMeasurementsDisksListsOpts_Run(t *testing.T) {
+func TestAtlasMetricsDisksListsOpts_Run(t *testing.T) {
 	ctrl := gomock.NewController(t)
 	mockStore := mocks.NewMockProcessDisksLister(ctrl)
 
 	defer ctrl.Finish()
 
 	expected := &mongodbatlas.ProcessDisksResponse{}
 
-	listOpts := &atlasMeasurementsDisksListsOpts{
+	listOpts := &atlasMetricsDisksListsOpts{
 		host:  "hard-00-00.mongodb.net",
 		port:  27017,
 		store: mockStore,

diff --git a/internal/cli/atlas_measurements_processes.go → internal/cli/atlas_metrics_processes.go b/internal/cli/atlas_measurements_processes.go → internal/cli/atlas_metrics_processes.go
@@ -23,22 +23,22 @@ import (
 	"github.com/spf13/cobra"
 )
 
-type atlasMeasurementsProcessOpts struct {
+type atlasMetricsProcessOpts struct {
 	globalOpts
-	measurementsOpts
+	metricsOpts
 	host  string
 	port  int
 	store store.ProcessMeasurementLister
 }
 
-func (opts *atlasMeasurementsProcessOpts) initStore() error {
+func (opts *atlasMetricsProcessOpts) initStore() error {
 	var err error
 	opts.store, err = store.New()
 	return err
 }
 
-func (opts *atlasMeasurementsProcessOpts) Run() error {
-	listOpts := opts.newProcessMeasurementListOptions()
+func (opts *atlasMetricsProcessOpts) Run() error {
+	listOpts := opts.newProcessMetricsListOptions()
 	result, err := opts.store.ProcessMeasurements(opts.ProjectID(), opts.host, opts.port, listOpts)
 
 	if err != nil {
@@ -48,9 +48,9 @@ func (opts *atlasMeasurementsProcessOpts) Run() error {
 	return json.PrettyPrint(result)
 }
 
-// mongocli atlas measurements process(es) host:port [--granularity granularity] [--period period] [--start start] [--end end] [--type type][--projectId projectId]
-func AtlasMeasurementsProcessBuilder() *cobra.Command {
-	opts := &atlasMeasurementsProcessOpts{}
+// mongocli atlas metric(s) process(es) host:port [--granularity granularity] [--period period] [--start start] [--end end] [--type type][--projectId projectId]
+func AtlasMetricsProcessBuilder() *cobra.Command {
+	opts := &atlasMetricsProcessOpts{}
 	cmd := &cobra.Command{
 		Use:     "processes [host:port]",
 		Short:   description.ProcessMeasurements,

diff --git a/.../cli/atlas_measurements_processes_test.go → internal/cli/atlas_metrics_processes_test.go b/.../cli/atlas_measurements_processes_test.go → internal/cli/atlas_metrics_processes_test.go
@@ -21,23 +21,23 @@ import (
 	"github.com/mongodb/mongocli/internal/mocks"
 )
 
-func TestAtlasMeasurementsProcess_Run(t *testing.T) {
+func TestAtlasMetricsProcess_Run(t *testing.T) {
 	ctrl := gomock.NewController(t)
 	mockStore := mocks.NewMockProcessMeasurementLister(ctrl)
 
 	defer ctrl.Finish()
 
 	expected := &mongodbatlas.ProcessMeasurements{}
 
-	listOpts := &atlasMeasurementsProcessOpts{
+	listOpts := &atlasMetricsProcessOpts{
 		host:  "hard-00-00.mongodb.net",
 		port:  27017,
 		store: mockStore,
 	}
 	listOpts.granularity = "PT1M"
 	listOpts.period = "PT1M"
 
-	opts := listOpts.newProcessMeasurementListOptions()
+	opts := listOpts.newProcessMetricsListOptions()
 	mockStore.
 		EXPECT().ProcessMeasurements(listOpts.projectID, listOpts.host, listOpts.port, opts).
 		Return(expected, nil).

diff --git a/internal/cli/cloud_manager.go b/internal/cli/cloud_manager.go
@@ -39,7 +39,7 @@ func CloudManagerBuilder() *cobra.Command {
 	cmd.AddCommand(OpsManagerDBUsersBuilder())
 	cmd.AddCommand(AtlasEventsBuilder())
 	cmd.AddCommand(OpsManagerProcessesBuilder())
-	cmd.AddCommand(OpsManagerMeasurementsBuilder())
+	cmd.AddCommand(OpsManagerMetricsBuilder())
 	cmd.AddCommand(OpsManagerLogsBuilder())
 
 	return cmd

diff --git a/internal/cli/ops_manager.go b/internal/cli/ops_manager.go
@@ -40,7 +40,7 @@ func OpsManagerBuilder() *cobra.Command {
 	cmd.AddCommand(OpsManagerOwnerBuilder())
 	cmd.AddCommand(AtlasEventsBuilder())
 	cmd.AddCommand(OpsManagerProcessesBuilder())
-	cmd.AddCommand(OpsManagerMeasurementsBuilder())
+	cmd.AddCommand(OpsManagerMetricsBuilder())
 	cmd.AddCommand(OpsManagerLogsBuilder())
 	cmd.AddCommand(OpsManagerAgentsBuilder())
 	cmd.AddCommand(OpsManagerDiagnoseArchive())

diff --git a/internal/cli/ops_manager_measurements.go → internal/cli/ops_manager_metrics.go b/internal/cli/ops_manager_measurements.go → internal/cli/ops_manager_metrics.go
@@ -19,15 +19,16 @@ import (
 	"github.com/spf13/cobra"
 )
 
-func OpsManagerMeasurementsBuilder() *cobra.Command {
+func OpsManagerMetricsBuilder() *cobra.Command {
 	cmd := &cobra.Command{
-		Use:   "measurements",
-		Short: description.Measurements,
+		Use:     "metrics",
+		Aliases: []string{"metric", "measurements", "measurement"},
+		Short:   description.Metrics,
 	}
 
-	cmd.AddCommand(OpsManagerMeasurementsProcessBuilder())
-	cmd.AddCommand(OpsManagerMeasurementsDisksBuilder())
-	cmd.AddCommand(OpsManagerMeasurementsDatabasesBuilder())
+	cmd.AddCommand(OpsManagerMetricsProcessBuilder())
+	cmd.AddCommand(OpsManagerMetricsDisksBuilder())
+	cmd.AddCommand(OpsManagerMetricsDatabasesBuilder())
 
 	return cmd
 }
diff --git a/...cli/ops_manager_measurements_databases.go → ...rnal/cli/ops_manager_metrics_databases.go b/...cli/ops_manager_measurements_databases.go → ...rnal/cli/ops_manager_metrics_databases.go
@@ -19,7 +19,7 @@ import (
 	"github.com/spf13/cobra"
 )
 
-func OpsManagerMeasurementsDatabasesBuilder() *cobra.Command {
+func OpsManagerMetricsDatabasesBuilder() *cobra.Command {
 	cmd := &cobra.Command{
 		Use:     "databases",
 		Aliases: []string{"database"},