Added option for configuration file

README.md

@@ -15,25 +15,36 @@ Binaries can be downloaded from [Github releases](https://github.com/mjavier2k/s
 
 ### Usage
 
-```
-./solidfire_exporter -u $SOLIDFIRE_USER -p $SOLIDFIRE_PASSWORD -e $SOLIDFIRE_ENDPOINT
+Create *config.yaml* on the same directory as the solidfire_exporter binary
+
+```yml
+endpoint: https://192.168.1.2/json-rpc/11.3
+listenPort: 9987
+insecure: true
+timeout: 30
+username: solidfire-username 
+password: solidfire-password 
 ```
 
-```
-Usage of solidfire-exporter:
+Start Netapp Solidfire exporter
+
+```bash
+./solidfire_exporter
+
+
   -l, --listenPort int    Port for the exporter to listen on. May also be set by environment variable SOLIDFIRE_PORT. (default 9987)
-  -u, --username string   User with which to authenticate to the Solidfire API. May also be set by environment variable SOLIDFIRE_USER. (default "my_solidfire_user")
-  -p, --password string   Password with which to authenticate to the Solidfire API. May also be set by environment variable SOLIDFIRE_PASS. (default "my_solidfire_password")
   -e, --endpoint string   Endpoint for the Solidfire API. May also be set by environment variable SOLIDFIRE_RPC_ENDPOINT. (default "https://192.168.1.2/json-rpc/11.3")
   -i, --insecure          Whether to disable TLS validation when calling the Solidfire API. May also be set by environment variable INSECURE_SKIP_VERIFY.
   -t, --timeout int       HTTP Client timeout (in seconds) per call to Solidfire API. (default 30)
+  -c, --config string     Specify default configuration file. (default: config.yaml)
 ```
 
+
 __NOTE__: The account for __SOLIDFIRE_USER__ must have administrator access to the solidfire cluster so that QOS data will show up.
 
 ### Prometheus Configuration
 
-```
+```yml
 - job_name: solidfire_exporter
   honor_timestamps: true
   scrape_interval: 30s
@@ -53,7 +64,7 @@ __NOTE__: The account for __SOLIDFIRE_USER__ must have administrator access to t
 
 Create an file with the environment variables set and pass it to docker run. 
 
-```
+```bash
 docker run --env-file=.env_file  --rm -p 8080:8080 mjavier/solidfire-exporter:latest
 ```
 
@@ -67,7 +78,9 @@ TO DO
 
 
 ### Contributing
+
 We welcome any contributions. Please fork the project on GitHub and open Pull Requests for any proposed changes.
 
 ### License
+
 Code is licensed under the Apache License 2.0.

cmd/solidfire-exporter/main.go

@@ -21,12 +21,12 @@ var (
 
 func init() {
 	flag.CommandLine.SortFlags = false
+
 	flag.IntP(solidfire.ListenPortFlag, "l", 9987, fmt.Sprintf("Port for the exporter to listen on. May also be set by environment variable %v.", solidfire.ListenPortFlagEnv))
-	flag.StringP(solidfire.UsernameFlag, "u", "my_solidfire_user", fmt.Sprintf("User with which to authenticate to the Solidfire API. May also be set by environment variable %v.", solidfire.UsernameFlagEnv))
-	flag.StringP(solidfire.PasswordFlag, "p", "my_solidfire_password", fmt.Sprintf("Password with which to authenticate to the Solidfire API. May also be set by environment variable %v.", solidfire.PasswordFlagEnv))
 	flag.StringP(solidfire.EndpointFlag, "e", "https://192.168.1.2/json-rpc/11.3", fmt.Sprintf("Endpoint for the Solidfire API. May also be set by environment variable %v.", solidfire.EndpointFlagEnv))
 	flag.BoolP(solidfire.InsecureSSLFlag, "i", false, fmt.Sprintf("Whether to disable TLS validation when calling the Solidfire API. May also be set by environment variable %v.", solidfire.InsecureSSLFlagEnv))
 	flag.Int64P(solidfire.HTTPClientTimeoutFlag, "t", 30, fmt.Sprintf("HTTP Client timeout (in seconds) per call to Solidfire API."))
+	flag.StringP(solidfire.ConfigFileFlag, "c", "config", fmt.Sprintf("Specify configuration file."))
 	flag.Parse()
 
 	// PORT environment variable takes precedence in order to be backwards-compatible
@@ -36,12 +36,26 @@ func init() {
 	} else {
 		viper.BindEnv(solidfire.ListenPortFlag, solidfire.ListenPortFlagEnv)
 	}
-
-	viper.BindEnv(solidfire.UsernameFlag, solidfire.UsernameFlagEnv)
-	viper.BindEnv(solidfire.PasswordFlag, solidfire.PasswordFlagEnv)
-	viper.BindEnv(solidfire.EndpointFlag, solidfire.EndpointFlagEnv)
 	viper.BindEnv(solidfire.InsecureSSLFlag, solidfire.InsecureSSLFlagEnv)
 	viper.BindPFlags(flag.CommandLine)
+
+	// load default values if config file is present
+	// Environment variables and parameter flags takes precedence to config file
+	viper.SetConfigName(viper.GetString(solidfire.ConfigFileFlag))
+	viper.SetConfigType("yaml")
+	viper.AddConfigPath(".")
+
+	if err := viper.ReadInConfig(); err != nil {
+		if _, ok := err.(viper.ConfigFileNotFoundError); ok == false {
+			panic(err)
+		}
+		log.Infof("No config file found.")
+	} else {
+		// Parameter takes precedence to ENV
+		// ENV takes precedence to config file
+		log.Infof("Found configuration file on %v ", viper.GetViper().ConfigFileUsed())
+		log.Warningf("Values on this configuration file can be overriden by ENV or Parameter flags.")
+	}
 }
 func main() {
 	log.Infof("Version: %v", sha1ver)

config.yaml

@@ -0,0 +1,6 @@
+endpoint: https://192.168.1.2/json-rpc/11.3
+listenPort: 9987
+insecure: true
+http_client_timeout: 30
+username: solidfire-username-config
+password: solidfire-password-config

pkg/solidfire/types.go

@@ -12,9 +12,8 @@ var (
 	EndpointFlag          = "endpoint"
 	InsecureSSLFlag       = "insecure"
 	HTTPClientTimeoutFlag = "timeout"
+	ConfigFileFlag        = "config.yaml"
 	ListenPortFlagEnv     = "SOLIDFIRE_PORT"
-	UsernameFlagEnv       = "SOLIDFIRE_USER"
-	PasswordFlagEnv       = "SOLIDFIRE_PASS"
 	EndpointFlagEnv       = "SOLIDFIRE_RPC_ENDPOINT"
 	InsecureSSLFlagEnv    = "INSECURE_SKIP_VERIFY"
 )