Error on non-flag commandline arguments

- Added minor cmdline parsing logic change to bail on
  unconsumed arguments. Fixes #1821

cmd/prometheus/config.go

@@ -245,10 +245,13 @@ func init() {
 
 func parse(args []string) error {
 	err := cfg.fs.Parse(args)
-	if err != nil {
+	if err != nil || len(cfg.fs.Args()) != 0 {
 		if err != flag.ErrHelp {
 			log.Errorf("Invalid command line arguments. Help: %s -h", os.Args[0])
 		}
+		if err == nil {
+			err = fmt.Errorf("Non-flag argument on command line: %q", cfg.fs.Args()[0])
+		}
 		return err
 	}