Add starttime to php-fpm metrics (influxdata#5997)

bearstech · Apr 17, 2020 · 94ed88a · 94ed88a
1 parent 05a9633
commit 94ed88a
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 1 deletion.
diff --git a/plugins/inputs/phpfpm/phpfpm.go b/plugins/inputs/phpfpm/phpfpm.go
@@ -21,6 +21,7 @@ import (
 const (
 	PF_POOL                 = "pool"
 	PF_PROCESS_MANAGER      = "process manager"
+	PF_START_SINCE          = "start since"
 	PF_ACCEPTED_CONN        = "accepted conn"
 	PF_LISTEN_QUEUE         = "listen queue"
 	PF_MAX_LISTEN_QUEUE     = "max listen queue"
@@ -242,7 +243,8 @@ func importMetric(r io.Reader, acc telegraf.Accumulator, addr string) (poolStat,
 
 		// Start to parse metric for current pool
 		switch fieldName {
-		case PF_ACCEPTED_CONN,
+		case PF_START_SINCE,
+			PF_ACCEPTED_CONN,
 			PF_LISTEN_QUEUE,
 			PF_MAX_LISTEN_QUEUE,
 			PF_LISTEN_QUEUE_LEN,

diff --git a/plugins/inputs/phpfpm/phpfpm_test.go b/plugins/inputs/phpfpm/phpfpm_test.go
@@ -44,6 +44,7 @@ func TestPhpFpmGeneratesMetrics_From_Http(t *testing.T) {
 	}
 
 	fields := map[string]interface{}{
+		"start_since":          int64(1991),
 		"accepted_conn":        int64(3),
 		"listen_queue":         int64(1),
 		"max_listen_queue":     int64(0),
@@ -85,6 +86,7 @@ func TestPhpFpmGeneratesMetrics_From_Fcgi(t *testing.T) {
 	}
 
 	fields := map[string]interface{}{
+		"start_since":          int64(1991),
 		"accepted_conn":        int64(3),
 		"listen_queue":         int64(1),
 		"max_listen_queue":     int64(0),
@@ -130,6 +132,7 @@ func TestPhpFpmGeneratesMetrics_From_Socket(t *testing.T) {
 	}
 
 	fields := map[string]interface{}{
+		"start_since":          int64(1991),
 		"accepted_conn":        int64(3),
 		"listen_queue":         int64(1),
 		"max_listen_queue":     int64(0),
@@ -175,6 +178,7 @@ func TestPhpFpmGeneratesMetrics_From_Socket_Custom_Status_Path(t *testing.T) {
 	}
 
 	fields := map[string]interface{}{
+		"start_since":          int64(1991),
 		"accepted_conn":        int64(3),
 		"listen_queue":         int64(1),
 		"max_listen_queue":     int64(0),