🔪 superflous metrics

these are handled by the histogram

Co-Authored-By: sindrerh2 <[email protected]>
Co-Authored-By: Youssef Bel Mekki <[email protected]>

Author: 3 people

cmd/aivencmd/createcmd.go

@@ -80,7 +80,6 @@ func createCommand() *cli.Command {
 			},
 		},
 		Before: func(context *cli.Context) error {
-			metrics.AddOne("aiven_create_total")
 			if context.Args().Len() < 3 {
 				metrics.AddOne("aiven_create_required_args_error_total")
 				return fmt.Errorf("missing required arguments: service, username, namespace")

cmd/aivencmd/getcmd.go

@@ -16,7 +16,6 @@ func getCommand() *cli.Command {
 		Usage:     "Generate preferred config format to '/tmp' folder",
 		ArgsUsage: "service username namespace",
 		Before: func(context *cli.Context) error {
-			metrics.AddOne("aiven_get_total")
 			if context.Args().Len() < 3 {
 				metrics.AddOne("aiven_get_arguments_error_total")
 

cmd/aivencmd/tidycmd.go

@@ -13,7 +13,6 @@ func tidyCommand() *cli.Command {
 		Description: `Remove '/tmp' folder '$TMPDIR' and files created by the aiven command
 Caution - This will delete all files in '/tmp' folder starting with 'aiven-secret-'`,
 		Action: func(context *cli.Context) error {
-			metrics.AddOne("aiven_tidy_total")
 			return aiven.TidyLocalSecrets()
 		},
 	}

cmd/devicecmd/configcmd.go

@@ -29,7 +29,6 @@ func getConfigCommand() *cli.Command {
 		Name:  "get",
 		Usage: "Gets the current configuration",
 		Action: func(context *cli.Context) error {
-			metrics.AddOne("device_config_get_total")
 			config, err := naisdevice.GetConfiguration(context.Context)
 			if err != nil {
 				return err
@@ -48,7 +47,6 @@ func setConfigCommand() *cli.Command {
 		Usage:     "Sets a configuration value",
 		ArgsUsage: "setting value",
 		Before: func(context *cli.Context) error {
-			metrics.AddOne("device_config_set_total")
 			if context.Args().Len() < 2 {
 				metrics.AddOne("device_settings_error_total")
 				return fmt.Errorf("missing required arguments: setting, value")

cmd/devicecmd/connectioncmd.go

@@ -11,7 +11,6 @@ func connectCommand() *cli.Command {
 		Name:  "connect",
 		Usage: "Creates a naisdevice connection, will lock until connection",
 		Action: func(context *cli.Context) error {
-			metrics.AddOne("device_connect_total")
 			return naisdevice.Connect(context.Context)
 		},
 	}
@@ -22,7 +21,6 @@ func disconnectCommand() *cli.Command {
 		Name:  "disconnect",
 		Usage: "Disconnects your naisdevice",
 		Action: func(context *cli.Context) error {
-			metrics.AddOne("device_disconnect_total")
 			return naisdevice.Disconnect(context.Context)
 		},
 	}

cmd/devicecmd/doctor.go

@@ -15,7 +15,6 @@ func doctorCommand() *cli.Command {
 		Name:  "doctor",
 		Usage: "Examine the health of your naisdevice",
 		Action: func(context *cli.Context) error {
-			metrics.AddOne("device_doctor_total")
 			results := examination().Run()
 			for key, value := range results {
 				fmt.Printf("%s ", key)

cmd/devicecmd/jitacmd.go

@@ -18,7 +18,6 @@ func jitaCommand() *cli.Command {
 		Usage:     "Connects to a JITA gateway",
 		ArgsUsage: "gateway",
 		Before: func(context *cli.Context) error {
-			metrics.AddOne("jita_connect_total")
 			if context.Args().Len() < 1 {
 				metrics.AddOne("jita_arguments_error_total")
 				return fmt.Errorf("missing required arguments: gateway")

cmd/devicecmd/statuscmd.go

@@ -36,7 +36,6 @@ func statusCommand() *cli.Command {
 			},
 		},
 		Action: func(context *cli.Context) error {
-			metrics.AddOne("device_status_total")
 			outputFormat := context.String("output")
 			quiet := context.Bool("quiet")
 			verbose := context.Bool("verbose")

cmd/kubeconfigcmd/kubeconfig.go

@@ -42,7 +42,6 @@ gcloud auth login --update-adc`,
 			},
 		},
 		Before: func(context *cli.Context) error {
-			metrics.AddOne("kube_kubeconfig_total")
 
 			err := gcp.ValidateUserLogin(context.Context, false)
 			if err != nil {

cmd/postgrescmd/grantcmd.go

@@ -25,7 +25,6 @@ func grantCommand() *cli.Command {
 			},
 		},
 		Before: func(context *cli.Context) error {
-			metrics.AddOne("postgres_grant_total")
 			if context.Args().Len() < 1 {
 				metrics.AddOne("postgres_missing_app_name_error_total")
 				return fmt.Errorf("missing name of app")

cmd/postgrescmd/passwordrotatecmd.go

@@ -25,7 +25,6 @@ func passwordRotateCommand() *cli.Command {
 			},
 		},
 		Before: func(context *cli.Context) error {
-			metrics.AddOne("postgres_rotate_password_total")
 			if context.Args().Len() < 1 {
 				metrics.AddOne("postgres_missing_app_name_error_total")
 				return fmt.Errorf("missing name of app")

cmd/postgrescmd/postgres.go

@@ -23,7 +23,6 @@ func Command() *cli.Command {
 		Name:  "postgres",
 		Usage: "Command used for connecting to Postgres",
 		Before: func(context *cli.Context) error {
-			metrics.AddOne("postgres_connect_total")
 			return gcp.ValidateUserLogin(context.Context, false)
 		},
 		Subcommands: commands,

cmd/postgrescmd/preparecmd.go

@@ -38,7 +38,6 @@ This operation is only required to run once for each postgresql instance.`,
 			},
 		},
 		Before: func(context *cli.Context) error {
-			metrics.AddOne("postgres_prepare_total")
 			if context.Args().Len() < 1 {
 				metrics.AddOne("postgres_prepare_missing_app_name_error_total")
 				return fmt.Errorf("missing name of app")

cmd/postgrescmd/proxycmd.go

@@ -39,7 +39,6 @@ func proxyCommand() *cli.Command {
 			},
 		},
 		Before: func(context *cli.Context) error {
-			metrics.AddOne("postgres_proxy_total")
 			if context.Args().Len() < 1 {
 				metrics.AddOne("postgres_missing_app_name_error_total")
 				return fmt.Errorf("missing name of app")

cmd/postgrescmd/psqlcmd.go

@@ -29,7 +29,6 @@ func psqlCommand() *cli.Command {
 			},
 		},
 		Before: func(context *cli.Context) error {
-			metrics.AddOne("postgres_psql_total")
 			if context.Args().Len() < 1 {
 				metrics.AddOne("postgres_missing_app_name_error_total")
 				return fmt.Errorf("missing name of app")

cmd/postgrescmd/revokecmd.go

@@ -34,7 +34,6 @@ This operation is only required to run once for each postgresql instance.`,
 			},
 		},
 		Before: func(context *cli.Context) error {
-			metrics.AddOne("postgres_revoke_total")
 			if context.Args().Len() < 1 {
 				metrics.AddOne("postgres_missing_app_name_error_total")
 				return fmt.Errorf("missing name of app")

cmd/postgrescmd/usersaddcmd.go

@@ -30,7 +30,6 @@ func usersAddCommand() *cli.Command {
 			},
 		},
 		Before: func(context *cli.Context) error {
-			metrics.AddOne("postgres_users_add_total")
 			if context.Args().Len() < 3 {
 				metrics.AddOne("postgres_missing_args_error_total")
 				return fmt.Errorf("missing required arguments: appname, username, password")

cmd/postgrescmd/userslistcmd.go

@@ -24,7 +24,6 @@ func usersListCommand() *cli.Command {
 			},
 		},
 		Before: func(context *cli.Context) error {
-			metrics.AddOne("postgres_users_list_total")
 			if context.Args().Len() < 1 {
 				metrics.AddOne("postgres_missing_app_name_error_total")
 				return fmt.Errorf("missing name of app")

cmd/rootcmd/login.go

@@ -12,7 +12,6 @@ func loginCommand() *cli.Command {
 		Usage:       "Login using Google Auth.",
 		Description: "This is a wrapper around gcloud auth login --update-adc.",
 		Action: func(context *cli.Context) error {
-			metrics.AddOne("login_total")
 			return gcp.Login(context.Context)
 		},
 	}

cmd/validatecmd/validate.go

@@ -31,7 +31,6 @@ func Command() *cli.Command {
 			},
 		},
 		Before: func(context *cli.Context) error {
-			metrics.AddOne("validate_nais_yaml_total")
 			if context.Args().Len() == 0 {
 				metrics.AddOne("validate_enonent_error_total")
 				return fmt.Errorf("no config files provided")