Merge branch 'master' of github.com:grafana/grafana

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

latest.json

 {
 {
-	"version": "2.1.1"
+	"stable": "2.6.0",
+	"testing": "3.0.0"
 }
 }

pkg/cmd/grafana-cli/commands/commands.go

 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",

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)

pkg/cmd/grafana-cli/main.go

@@ -8,7 +8,6 @@ import (
 	"github.com/codegangsta/cli"
 	"github.com/codegangsta/cli"
 	"github.com/grafana/grafana/pkg/cmd/grafana-cli/commands"
 	"github.com/grafana/grafana/pkg/cmd/grafana-cli/commands"
 	"github.com/grafana/grafana/pkg/cmd/grafana-cli/log"
 	"github.com/grafana/grafana/pkg/cmd/grafana-cli/log"
-	"strings"
 )
 )
 
 
 var version = "master"
 var version = "master"
@@ -18,7 +17,7 @@ func getGrafanaPluginDir() string {
 	defaultNix := "/var/lib/grafana/plugins"
 	defaultNix := "/var/lib/grafana/plugins"
 
 
 	if currentOS == "windows" {
 	if currentOS == "windows" {
-		return "C:\\opt\\grafana\\plugins"
+		return "..\\data\\plugins"
 	}
 	}
 
 
 	pwd, err := os.Getwd()
 	pwd, err := os.Getwd()
@@ -29,16 +28,16 @@ func getGrafanaPluginDir() string {
 	}
 	}
 
 
 	if isDevenvironment(pwd) {
 	if isDevenvironment(pwd) {
-		return "../../../data/plugins"
+		return "../data/plugins"
 	}
 	}
 
 
 	return defaultNix
 	return defaultNix
 }
 }
 
 
 func isDevenvironment(pwd string) bool {
 func isDevenvironment(pwd string) bool {
-	// if grafana-cli is executed from the cmd folder we can assume
-	// that its in development environment.
-	return strings.HasSuffix(pwd, "/pkg/cmd/grafana-cli")
+	// if ../conf/default.ini exists, grafana is not installed as package
+	_, err := os.Stat("../conf/default.ini")
+	return err != nil
 }
 }
 
 
 func main() {
 func main() {