Adding upstream version 1.46.3.

Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>

7 files changed, 258 insertions, 0 deletions

diff --git a/src/go/collectors/go.d.plugin/modules/phpfpm/testdata/config.json b/src/go/collectors/go.d.plugin/modules/phpfpm/testdata/config.json
new file mode 100644
index 000000000..458343f74
--- /dev/null
+++ b/src/go/collectors/go.d.plugin/modules/phpfpm/testdata/config.json
@@ -0,0 +1,23 @@
+{
+  "update_every": 123,
+  "url": "ok",
+  "body": "ok",
+  "method": "ok",
+  "headers": {
+    "ok": "ok"
+  },
+  "username": "ok",
+  "password": "ok",
+  "proxy_url": "ok",
+  "proxy_username": "ok",
+  "proxy_password": "ok",
+  "timeout": 123.123,
+  "not_follow_redirects": true,
+  "tls_ca": "ok",
+  "tls_cert": "ok",
+  "tls_key": "ok",
+  "tls_skip_verify": true,
+  "socket": "ok",
+  "address": "ok",
+  "fcgi_path": "ok"
+}
diff --git a/src/go/collectors/go.d.plugin/modules/phpfpm/testdata/config.yaml b/src/go/collectors/go.d.plugin/modules/phpfpm/testdata/config.yaml
new file mode 100644
index 000000000..6c7bea094
--- /dev/null
+++ b/src/go/collectors/go.d.plugin/modules/phpfpm/testdata/config.yaml
@@ -0,0 +1,20 @@
+update_every: 123
+url: "ok"
+body: "ok"
+method: "ok"
+headers:
+  ok: "ok"
+username: "ok"
+password: "ok"
+proxy_url: "ok"
+proxy_username: "ok"
+proxy_password: "ok"
+timeout: 123.123
+not_follow_redirects: yes
+tls_ca: "ok"
+tls_cert: "ok"
+tls_key: "ok"
+tls_skip_verify: yes
+socket: "ok"
+address: "ok"
+fcgi_path: "ok"
diff --git a/src/go/collectors/go.d.plugin/modules/phpfpm/testdata/status-full-no-idle.json b/src/go/collectors/go.d.plugin/modules/phpfpm/testdata/status-full-no-idle.json
new file mode 100644
index 000000000..e5b63accd
--- /dev/null
+++ b/src/go/collectors/go.d.plugin/modules/phpfpm/testdata/status-full-no-idle.json
@@ -0,0 +1,63 @@
+{
+  "pool": "www",
+  "process manager": "dynamic",
+  "start time": 1566371090,
+  "start since": 1119,
+  "accepted conn": 22,
+  "listen queue": 0,
+  "max listen queue": 0,
+  "listen queue len": 0,
+  "idle processes": 1,
+  "active processes": 1,
+  "total processes": 2,
+  "max active processes": 1,
+  "max children reached": 0,
+  "slow requests": 0,
+  "processes": [
+    {
+      "pid": 67858,
+      "state": "Running",
+      "start time": 1566371090,
+      "start since": 1119,
+      "requests": 11,
+      "request duration": 834,
+      "request method": "GET",
+      "request uri": "/status?json&full",
+      "content length": 0,
+      "user": "-",
+      "script": "-",
+      "last request cpu": 0,
+      "last request memory": 0
+    },
+    {
+      "pid": 67859,
+      "state": "Running",
+      "start time": 1566371090,
+      "start since": 1119,
+      "requests": 11,
+      "request duration": 919,
+      "request method": "GET",
+      "request uri": "/status?json",
+      "content length": 0,
+      "user": "-",
+      "script": "-",
+      "last request cpu": 0,
+      "last request memory": 2097152
+    },
+    {
+      "pid": 67860,
+      "state": "Running",
+      "start time": 1566371090,
+      "start since": 1119,
+      "requests": 11,
+      "request duration": 18446744073709551227,
+      "request method": "GET",
+      "request uri": "/status?json&full",
+      "content length": 0,
+      "user": "-",
+      "script": "-",
+      "last request cpu": 10.0,
+      "last request memory": 2093045
+    }
+  ]
+}
\ No newline at end of file
diff --git a/src/go/collectors/go.d.plugin/modules/phpfpm/testdata/status-full.json b/src/go/collectors/go.d.plugin/modules/phpfpm/testdata/status-full.json
new file mode 100644
index 000000000..456f6253e
--- /dev/null
+++ b/src/go/collectors/go.d.plugin/modules/phpfpm/testdata/status-full.json
@@ -0,0 +1,63 @@
+{
+  "pool": "www",
+  "process manager": "dynamic",
+  "start time": 1566371090,
+  "start since": 1119,
+  "accepted conn": 22,
+  "listen queue": 0,
+  "max listen queue": 0,
+  "listen queue len": 0,
+  "idle processes": 1,
+  "active processes": 1,
+  "total processes": 2,
+  "max active processes": 1,
+  "max children reached": 0,
+  "slow requests": 0,
+  "processes": [
+    {
+      "pid": 67858,
+      "state": "Running",
+      "start time": 1566371090,
+      "start since": 1119,
+      "requests": 11,
+      "request duration": 834,
+      "request method": "GET",
+      "request uri": "/status?json&full",
+      "content length": 0,
+      "user": "-",
+      "script": "-",
+      "last request cpu": 0,
+      "last request memory": 0
+    },
+    {
+      "pid": 67859,
+      "state": "Idle",
+      "start time": 1566371090,
+      "start since": 1119,
+      "requests": 11,
+      "request duration": 919,
+      "request method": "GET",
+      "request uri": "/status?json",
+      "content length": 0,
+      "user": "-",
+      "script": "-",
+      "last request cpu": 0,
+      "last request memory": 2097152
+    },
+    {
+      "pid": 67860,
+      "state": "Idle",
+      "start time": 1566371090,
+      "start since": 1119,
+      "requests": 11,
+      "request duration": 18446744073709551227,
+      "request method": "GET",
+      "request uri": "/status?json&full",
+      "content length": 0,
+      "user": "-",
+      "script": "-",
+      "last request cpu": 10.0,
+      "last request memory": 2093045
+    }
+  ]
+}
\ No newline at end of file
diff --git a/src/go/collectors/go.d.plugin/modules/phpfpm/testdata/status-full.txt b/src/go/collectors/go.d.plugin/modules/phpfpm/testdata/status-full.txt
new file mode 100644
index 000000000..a5e90987c
--- /dev/null
+++ b/src/go/collectors/go.d.plugin/modules/phpfpm/testdata/status-full.txt
@@ -0,0 +1,59 @@
+pool:                 www
+process manager:      dynamic
+start time:           21/Aug/2019:09:04:50 +0200
+start since:          1079
+accepted conn:        20
+listen queue:         0
+max listen queue:     0
+listen queue len:     0
+idle processes:       1
+active processes:     1
+total processes:      2
+max active processes: 1
+max children reached: 0
+slow requests:        0
+
+************************
+pid:                  67858
+state:                Running
+start time:           21/Aug/2019:09:04:50 +0200
+start since:          1079
+requests:             10
+request duration:     697
+request method:       GET
+request URI:          /status?full
+content length:       0
+user:                 -
+script:               -
+last request cpu:     0.00
+last request memory:  0
+
+************************
+pid:                  67859
+state:                Idle
+start time:           21/Aug/2019:09:04:50 +0200
+start since:          1079
+requests:             10
+request duration:     536
+request method:       GET
+request URI:          /status
+content length:       0
+user:                 -
+script:               -
+last request cpu:     0.00
+last request memory:  2097152
+
+************************
+pid:                  67860
+state:                Idle
+start time:           21/Aug/2019:09:04:50 +0200
+start since:          1079
+requests:             10
+request duration:     18446744073709551227
+request method:       GET
+request URI:          /status?full
+content length:       0
+user:                 -
+script:               -
+last request cpu:     10.00
+last request memory:  2093045
\ No newline at end of file
diff --git a/src/go/collectors/go.d.plugin/modules/phpfpm/testdata/status.json b/src/go/collectors/go.d.plugin/modules/phpfpm/testdata/status.json
new file mode 100644
index 000000000..80af3e0bc
--- /dev/null
+++ b/src/go/collectors/go.d.plugin/modules/phpfpm/testdata/status.json
@@ -0,0 +1,16 @@
+{
+  "pool": "www",
+  "process manager": "dynamic",
+  "start time": 1566371090,
+  "start since": 1088,
+  "accepted conn": 21,
+  "listen queue": 0,
+  "max listen queue": 0,
+  "listen queue len": 0,
+  "idle processes": 1,
+  "active processes": 1,
+  "total processes": 2,
+  "max active processes": 1,
+  "max children reached": 0,
+  "slow requests": 0
+}
\ No newline at end of file
diff --git a/src/go/collectors/go.d.plugin/modules/phpfpm/testdata/status.txt b/src/go/collectors/go.d.plugin/modules/phpfpm/testdata/status.txt
new file mode 100644
index 000000000..08dc158fb
--- /dev/null
+++ b/src/go/collectors/go.d.plugin/modules/phpfpm/testdata/status.txt
@@ -0,0 +1,14 @@
+pool:                 www
+process manager:      dynamic
+start time:           21/Aug/2019:09:04:50 +0200
+start since:          1066
+accepted conn:        19
+listen queue:         0
+max listen queue:     0
+listen queue len:     0
+idle processes:       1
+active processes:     1
+total processes:      2
+max active processes: 1
+max children reached: 0
+slow requests:        0
\ No newline at end of file