Remove read_failed state from TCP prober

Fix typo in README Remove deprecated comments Tweak Missed a few deprecated warnings
influxdata · Jul 13, 2017 · 925eeef · 925eeef
1 parent f495f08
commit 925eeef
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 6 deletions.
diff --git a/plugins/inputs/net_response/README.md b/plugins/inputs/net_response/README.md
@@ -60,7 +60,7 @@ It can also check response text.
 - net_response
     - response_time (float, seconds)
     - result_type (string) # success, timeout, connection_failed, read_failed, string_mismatch
-    - [**DEPRECATED**] string_mismatch (boolean)
+    - [**DEPRECATED**] string_found (boolean)
 
 ### Tags:
 

diff --git a/plugins/inputs/net_response/net_response.go b/plugins/inputs/net_response/net_response.go
@@ -92,17 +92,17 @@ func (n *NetResponse) TcpGather() (map[string]interface{}, error) {
 		responseTime = time.Since(start).Seconds()
 		// Handle error
 		if err != nil {
-			fields["result_type"] = "read_failed"
+			fields["result_type"] = "string_mismatch"
 		} else {
 			// Looking for string in answer
 			RegEx := regexp.MustCompile(`.*` + n.Expect + `.*`)
 			find := RegEx.FindString(string(data))
 			if find != "" {
 				fields["result_type"] = "success"
-				fields["string_found"] = true // WARNING: This field will be deprecated in a future release.
+				fields["string_found"] = true
 			} else {
 				fields["result_type"] = "string_mismatch"
-				fields["string_found"] = false // WARNING: This field will be deprecated in a future release.
+				fields["string_found"] = false
 			}
 		}
 	} else {
@@ -153,10 +153,10 @@ func (n *NetResponse) UdpGather() (map[string]interface{}, error) {
 		find := RegEx.FindString(string(buf))
 		if find != "" {
 			fields["result_type"] = "success"
-			fields["string_found"] = true // WARNING: This field will be deprecated in a future release.
+			fields["string_found"] = true
 		} else {
 			fields["result_type"] = "string_mismatch"
-			fields["string_found"] = false // WARNING: This field will be deprecated in a future release.
+			fields["string_found"] = false
 		}
 	}
 	fields["response_time"] = responseTime