Small changes to CLI commands PR

pkg/cmd/accounts.go

@@ -2,31 +2,33 @@ package cmd
 
 import (
 	"fmt"
+	"os"
+	"text/tabwriter"
+
 	"github.com/codegangsta/cli"
+
 	"github.com/grafana/grafana/pkg/bus"
 	"github.com/grafana/grafana/pkg/log"
 	m "github.com/grafana/grafana/pkg/models"
 	"github.com/grafana/grafana/pkg/setting"
-	"os"
-	"text/tabwriter"
 )
 
 var ListAccounts = cli.Command{
-	Name:        "account",
+	Name:        "accounts",
 	Usage:       "list accounts",
 	Description: "Lists the accounts in the system",
 	Action:      listAccounts,
 }
 
 var CreateAccount = cli.Command{
-	Name:        "account:create",
+	Name:        "accounts:create",
 	Usage:       "create a new account",
 	Description: "Creates a new account",
 	Action:      createAccount,
 }
 
 var DeleteAccount = cli.Command{
-	Name:        "account:delete",
+	Name:        "accounts:delete",
 	Usage:       "delete an existing account",
 	Description: "Deletes an existing account",
 	Action:      deleteAccount,

pkg/cmd/dashboard.go

@@ -13,7 +13,7 @@ import (
 )
 
 var ImportDashboard = cli.Command{
-	Name:        "dashboard:import",
+	Name:        "dashboards:import",
 	Usage:       "imports dashboards in JSON from a directory",
 	Description: "Starts Grafana import process",
 	Action:      runImport,

pkg/cmd/datasource.go

@@ -2,23 +2,24 @@ package cmd
 
 import (
 	"fmt"
+	"os"
+	"text/tabwriter"
+
 	"github.com/codegangsta/cli"
 	"github.com/grafana/grafana/pkg/bus"
 	"github.com/grafana/grafana/pkg/log"
 	m "github.com/grafana/grafana/pkg/models"
-	"os"
-	"text/tabwriter"
 )
 
 var (
 	ListDataSources = cli.Command{
-		Name:        "datasource",
+		Name:        "datasources",
 		Usage:       "list datasources",
 		Description: "Lists the datasources in the system",
 		Action:      listDatasources,
 	}
 	CreateDataSource = cli.Command{
-		Name:        "datasource:create",
+		Name:        "datasources:create",
 		Usage:       "creates a new datasource",
 		Description: "Creates a new datasource",
 		Action:      createDataSource,