Merge pull request #433 from daixiang0/fix-logcli

remove logcli config part
grafana · Apr 8, 2019 · 8b8945d · 8b8945d
2 parents d75212d + f634f53
commit 8b8945d
Show file tree

Hide file tree

Showing 4 changed files with 3 additions and 42 deletions.
diff --git a/cmd/logcli/config.go b/cmd/logcli/config.go
diff --git a/cmd/logcli/logcli-config.yaml b/cmd/logcli/logcli-config.yaml
diff --git a/cmd/logcli/main.go b/cmd/logcli/main.go
@@ -10,9 +10,9 @@ import (
 var (
 	app = kingpin.New("logcli", "A command-line for loki.")
 
-	config = app.Flag("config", "Logcli config.").Default("").String()
-
-	addr, username, password *string
+	addr     = app.Flag("addr", "Server address.").Default("https://logs-us-west1.grafana.net").Envar("GRAFANA_ADDR").String()
+	username = app.Flag("username", "Username for HTTP basic auth.").Default("").Envar("GRAFANA_USERNAME").String()
+	password = app.Flag("password", "Password for HTTP basic auth.").Default("").Envar("GRAFANA_PASSWORD").String()
 
 	queryCmd  = app.Command("query", "Run a LogQL query.")
 	queryStr  = queryCmd.Arg("query", "eg '{foo=\"bar\",baz=\"blip\"}'").Required().String()
@@ -28,17 +28,6 @@ var (
 )
 
 func main() {
-	// get val from config file
-	cfg, err := getConfig(*config)
-	if err != nil {
-		fmt.Println(err)
-		os.Exit(1)
-	}
-
-	addr = app.Flag("addr", "Server address.").Default(cfg.Addr).Envar("GRAFANA_ADDR").String()
-	username = app.Flag("username", "Username for HTTP basic auth.").Default(cfg.Username).Envar("GRAFANA_USERNAME").String()
-	password = app.Flag("password", "Password for HTTP basic auth.").Default(cfg.Password).Envar("GRAFANA_PASSWORD").String()
-
 	switch kingpin.MustParse(app.Parse(os.Args[1:])) {
 	case queryCmd.FullCommand():
 		if *addr == "" {

diff --git a/docs/logcli.md b/docs/logcli.md
@@ -44,10 +44,8 @@ Common labels: {job="cortex-ops/consul", namespace="cortex-ops"}
 
 ### Configuration
 
-You may use `--config=path/to/file` to load configuration options from a file. For an example file see `cmd/logcli/logcli-config.yaml`
 
 Configuration values are considered in the following order (lowest to highest):
-- config file
 - environment value
 - command line
 
@@ -66,7 +64,6 @@ Flags:
   --addr=""      Server address, need to specify.
   --username=""  Username for HTTP basic auth.
   --password=""  Password for HTTP basic auth.
-  --config=""    Configuration file for logcli.
 
 Commands:
   help [<command>...]