Merging upstream version 1.45.3+dfsg.

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

4 files changed, 82 insertions, 0 deletions

diff --git a/src/go/collectors/go.d.plugin/modules/lighttpd/testdata/apache-status.txt b/src/go/collectors/go.d.plugin/modules/lighttpd/testdata/apache-status.txt
new file mode 100644
index 000000000..136b69363
--- /dev/null
+++ b/src/go/collectors/go.d.plugin/modules/lighttpd/testdata/apache-status.txt
@@ -0,0 +1,39 @@
+127.0.0.1
+ServerVersion: Apache/2.4.37 (Unix)
+ServerMPM: event
+Server Built: Oct 23 2018 18:27:46
+CurrentTime: Sunday, 13-Jan-2019 20:39:30 MSK
+RestartTime: Sunday, 13-Jan-2019 20:35:13 MSK
+ParentServerConfigGeneration: 1
+ParentServerMPMGeneration: 0
+ServerUptimeSeconds: 256
+ServerUptime: 4 minutes 16 seconds
+Load1: 1.02
+Load5: 1.30
+Load15: 1.41
+Total Accesses: 9
+Total kBytes: 12
+Total Duration: 1
+CPUUser: 0
+CPUSystem: .01
+CPUChildrenUser: 0
+CPUChildrenSystem: 0
+CPULoad: .00390625
+Uptime: 256
+ReqPerSec: .0351563
+BytesPerSec: 48
+BytesPerReq: 1365.33
+DurationPerReq: .111111
+BusyWorkers: 1
+IdleWorkers: 99
+Processes: 4
+Stopping: 0
+BusyWorkers: 1
+IdleWorkers: 99
+ConnsTotal: 0
+ConnsAsyncWriting: 0
+ConnsAsyncKeepAlive: 0
+ConnsAsyncClosing: 0
+Scoreboard: ____________________________________________________________W_______________________________________............................................................................................................................................................................................................................................................................................................
+Using GnuTLS version: 3.6.5
+Built against GnuTLS version: 3.5.19
\ No newline at end of file
diff --git a/src/go/collectors/go.d.plugin/modules/lighttpd/testdata/config.json b/src/go/collectors/go.d.plugin/modules/lighttpd/testdata/config.json
new file mode 100644
index 000000000..984c3ed6e
--- /dev/null
+++ b/src/go/collectors/go.d.plugin/modules/lighttpd/testdata/config.json
@@ -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": true,
+  "tls_ca": "ok",
+  "tls_cert": "ok",
+  "tls_key": "ok",
+  "tls_skip_verify": true
+}
diff --git a/src/go/collectors/go.d.plugin/modules/lighttpd/testdata/config.yaml b/src/go/collectors/go.d.plugin/modules/lighttpd/testdata/config.yaml
new file mode 100644
index 000000000..8558b61cc
--- /dev/null
+++ b/src/go/collectors/go.d.plugin/modules/lighttpd/testdata/config.yaml
@@ -0,0 +1,17 @@
+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
diff --git a/src/go/collectors/go.d.plugin/modules/lighttpd/testdata/status.txt b/src/go/collectors/go.d.plugin/modules/lighttpd/testdata/status.txt
new file mode 100644
index 000000000..07d8e06e8
--- /dev/null
+++ b/src/go/collectors/go.d.plugin/modules/lighttpd/testdata/status.txt
@@ -0,0 +1,6 @@
+Total Accesses: 12
+Total kBytes: 4
+Uptime: 11
+BusyServers: 3
+IdleServers: 125
+Scoreboard: khr_____________________________________________________________________________________________________________________________
\ No newline at end of file