re-add kingpin parsing and version output

Komodoro · Feb 27, 2019 · e4f6e4b · e4f6e4b
1 parent 9efb119
commit e4f6e4b
Showing 1 changed file with 9 additions and 8 deletions.
diff --git a/main.go b/main.go
@@ -1,8 +1,6 @@
 package main
 
 import (
-	"flag"
-	"fmt"
 	"net/http"
 	"net/url"
 	"os"
@@ -81,10 +79,9 @@ func main() {
 			Default("stdout").Envar("LOG_OUTPUT").String()
 	)
 
-	if *showVersion {
-		fmt.Print(version.Print(Name))
-		os.Exit(0)
-	}
+	kingpin.Version(version.Print(Name))
+	kingpin.CommandLine.HelpFlag.Short('h')
+	kingpin.Parse()
 
 	logger := getLogger(*logLevel, *logOutput, *logFormat)
 
@@ -127,12 +124,16 @@ func main() {
 		}
 	}
 
+	if *esExportSnapshots {
+		prometheus.MustRegister(collector.NewSnapshots(logger, httpClient, esURL))
+	}
+
 	if *esExportClusterSettings {
 		prometheus.MustRegister(collector.NewClusterSettings(logger, httpClient, esURL))
 	}
 
-	if *esExportSnapshots {
-		prometheus.MustRegister(collector.NewSnapshots(logger, httpClient, esURL))
+	if *esExportIndicesSettings {
+		prometheus.MustRegister(collector.NewIndicesSettings(logger, httpClient, esURL))
 	}
 
 	// create a http server