소스 검색

change(grafana-cli): changed upgrade to update in command line, upgrade and upgrade-all will still work as aliases

Torkel Ödegaard 9 년 전
부모
커밋
f93b039e42
3개의 변경된 파일15개의 추가작업 그리고 12개의 파일을 삭제
  1. 4 4
      docs/sources/plugins/installation.md
  2. 10 7
      pkg/cmd/grafana-cli/commands/commands.go
  3. 1 1
      pkg/cmd/grafana-cli/commands/upgrade_all_command.go

+ 4 - 4
docs/sources/plugins/installation.md

@@ -28,14 +28,14 @@ List installed plugins
 grafana-cli plugins ls
 grafana-cli plugins ls
 ```
 ```
 
 
-Upgrade all installed plugins
+Update all installed plugins
 ```
 ```
-grafana-cli plugins upgrade-all
+grafana-cli plugins update-all
 ```
 ```
 
 
-Upgrade one plugin
+Update one plugin
 ```
 ```
-grafana-cli plugins upgrade <plugin-id>
+grafana-cli plugins update <plugin-id>
 ```
 ```
 
 
 Remove one plugin
 Remove one plugin

+ 10 - 7
pkg/cmd/grafana-cli/commands/commands.go

@@ -1,9 +1,10 @@
 package commands
 package commands
 
 
 import (
 import (
+	"os"
+
 	"github.com/codegangsta/cli"
 	"github.com/codegangsta/cli"
 	"github.com/grafana/grafana/pkg/cmd/grafana-cli/log"
 	"github.com/grafana/grafana/pkg/cmd/grafana-cli/log"
-	"os"
 )
 )
 
 
 func runCommand(command func(commandLine CommandLine) error) func(context *cli.Context) {
 func runCommand(command func(commandLine CommandLine) error) func(context *cli.Context) {
@@ -32,13 +33,15 @@ var pluginCommands = []cli.Command{
 		Usage:  "list remote available plugins",
 		Usage:  "list remote available plugins",
 		Action: runCommand(listremoteCommand),
 		Action: runCommand(listremoteCommand),
 	}, {
 	}, {
-		Name:   "upgrade",
-		Usage:  "upgrade <plugin id>",
-		Action: runCommand(upgradeCommand),
+		Name:    "update",
+		Usage:   "update <plugin id>",
+		Aliases: []string{"upgrade"},
+		Action:  runCommand(upgradeCommand),
 	}, {
 	}, {
-		Name:   "upgrade-all",
-		Usage:  "upgrades all your installed plugins",
-		Action: runCommand(upgradeAllCommand),
+		Name:    "update-all",
+		Aliases: []string{"upgrade-all"},
+		Usage:   "update all your installed plugins",
+		Action:  runCommand(upgradeAllCommand),
 	}, {
 	}, {
 		Name:   "ls",
 		Name:   "ls",
 		Usage:  "list all installed plugins",
 		Usage:  "list all installed plugins",

+ 1 - 1
pkg/cmd/grafana-cli/commands/upgrade_all_command.go

@@ -51,7 +51,7 @@ func upgradeAllCommand(c CommandLine) error {
 	}
 	}
 
 
 	for _, p := range pluginsToUpgrade {
 	for _, p := range pluginsToUpgrade {
-		log.Infof("Upgrading %v \n", p.Id)
+		log.Infof("Updating %v \n", p.Id)
 
 
 		s.RemoveInstalledPlugin(pluginsDir, p.Id)
 		s.RemoveInstalledPlugin(pluginsDir, p.Id)
 		InstallPlugin(p.Id, "", c)
 		InstallPlugin(p.Id, "", c)