Merge pull request #152 from PureStorage-OpenConnect/better-errors

Upgrade Error Handling

Author: sdodsley

cmd/fa-om-exporter/main.go

@@ -111,6 +111,9 @@ func main() {
 }
 
 func metricsHandler(w http.ResponseWriter, r *http.Request) {
+	if debug {
+		log.Printf("%s %s %s %s\n", r.RemoteAddr, r.Method, r.URL, r.Header.Get("User-Agent"))
+	}
 	params := r.URL.Query()
 	path := strings.Split(r.URL.Path, "/")
 	metrics := ""
@@ -130,6 +133,7 @@ func metricsHandler(w http.ResponseWriter, r *http.Request) {
 	}
 	endpoint := params.Get("endpoint")
 	if endpoint == "" {
+		log.Printf("[ERROR] %s %s %s HTTP REQUEST ERROR: Endpoint parameter is missing\n", r.RemoteAddr, r.Method, r.URL)
 		http.Error(w, "Endpoint parameter is missing", http.StatusBadRequest)
 		return
 	}
@@ -146,6 +150,7 @@ func metricsHandler(w http.ResponseWriter, r *http.Request) {
 		address = endpoint
 	}
 	if apitoken == "" {
+		log.Printf("[ERROR] %s %s %s HTTP REQUEST ERROR: Target authorization token is missing\n", r.RemoteAddr, r.Method, r.URL)
 		http.Error(w, "Target authorization token is missing", http.StatusBadRequest)
 		return
 	}
@@ -156,7 +161,8 @@ func metricsHandler(w http.ResponseWriter, r *http.Request) {
 	registry := prometheus.NewRegistry()
 	faclient := client.NewRestClient(address, apitoken, apiver, uagent, rid, debug)
 	if faclient.Error != nil {
-		http.Error(w, "Error connecting to FlashArray. Check your management endpoint and/or api token are correct.", http.StatusBadRequest)
+		log.Printf("[ERROR] %s %s %s %s FACLIENT ERROR: %s\n", r.RemoteAddr, r.Method, r.URL, r.Header.Get("User-Agent"), faclient.Error.Error())
+		http.Error(w, faclient.Error.Error(), http.StatusBadRequest)
 		return
 	}
 	collectors.Collector(context.TODO(), metrics, registry, faclient)