2fb45eeec8
* Feature: Introduce a grafana-cli wrapper When our users install the *nix packed version of grafana, tendency is to use the services and scripts installed as part of the package for grafana-server. These leverage the default configuration options by specifying the several default paths. This introduces a similar approach for the grafana-cli binary. We exposed it through a wrapper to ensure a proper configuration is in place. To enable that, we add the .real suffix to the original binary (grafana-cli.real) and then use a bash script named grafana-cli as the wrapper. * Make the config and homepath flags global * Introduce `configOverrides` as a global flag This flag allows us to pass configuration overrides as a string. The string follows the convention of configuration arguments separated by a space e.g. "cfg:default.paths.data=/dev/nullX cfg:default.paths.logs=/dev/nullX" Also, it is backwards compatible with similar the previous configuration method through tailing arguments. Tailing arguments take presedence over the configuration options string. * Only log configuration information in debug mode * Move the grafana-cli binary to $GRAFANA_HOME/bin As part of the package install process, we copy all the release files and directories into the grafana home directory. This includes the /bin folder from where we copied the binaries into their respective destinations. After that, the /bin folder gets deleted as we don't want to keep duplicates of the binaries around. As part of this commit, we moved the re-creation of /bin within grafana-home and the copy of the original binary (again) after the folder gets deleted.
60 lines
1.2 KiB
Go
60 lines
1.2 KiB
Go
package utils
|
|
|
|
import (
|
|
"github.com/codegangsta/cli"
|
|
)
|
|
|
|
type CommandLine interface {
|
|
ShowHelp()
|
|
ShowVersion()
|
|
Application() *cli.App
|
|
Args() cli.Args
|
|
Bool(name string) bool
|
|
Int(name string) int
|
|
String(name string) string
|
|
StringSlice(name string) []string
|
|
GlobalString(name string) string
|
|
FlagNames() (names []string)
|
|
Generic(name string) interface{}
|
|
|
|
PluginDirectory() string
|
|
RepoDirectory() string
|
|
PluginURL() string
|
|
}
|
|
|
|
type ContextCommandLine struct {
|
|
*cli.Context
|
|
}
|
|
|
|
func (c *ContextCommandLine) ShowHelp() {
|
|
cli.ShowCommandHelp(c.Context, c.Command.Name)
|
|
}
|
|
|
|
func (c *ContextCommandLine) ShowVersion() {
|
|
cli.ShowVersion(c.Context)
|
|
}
|
|
|
|
func (c *ContextCommandLine) Application() *cli.App {
|
|
return c.App
|
|
}
|
|
|
|
func (c *ContextCommandLine) HomePath() string { return c.GlobalString("homepath") }
|
|
|
|
func (c *ContextCommandLine) ConfigFile() string { return c.GlobalString("config") }
|
|
|
|
func (c *ContextCommandLine) PluginDirectory() string {
|
|
return c.GlobalString("pluginsDir")
|
|
}
|
|
|
|
func (c *ContextCommandLine) RepoDirectory() string {
|
|
return c.GlobalString("repo")
|
|
}
|
|
|
|
func (c *ContextCommandLine) PluginURL() string {
|
|
return c.GlobalString("pluginUrl")
|
|
}
|
|
|
|
func (c *ContextCommandLine) OptionsString() string {
|
|
return c.GlobalString("configOverrides")
|
|
}
|