Adding upstream version 1.46.3.

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

10 files changed, 79 insertions, 0 deletions

diff --git a/src/go/collectors/go.d.plugin/modules/openvpn_status_log/testdata/config.json b/src/go/collectors/go.d.plugin/modules/openvpn_status_log/testdata/config.json
new file mode 100644
index 000000000..078a1ae56
--- /dev/null
+++ b/src/go/collectors/go.d.plugin/modules/openvpn_status_log/testdata/config.json
@@ -0,0 +1,12 @@
+{
+  "update_every": 123,
+  "log_path": "ok",
+  "per_user_stats": {
+    "includes": [
+      "ok"
+    ],
+    "excludes": [
+      "ok"
+    ]
+  }
+}
diff --git a/src/go/collectors/go.d.plugin/modules/openvpn_status_log/testdata/config.yaml b/src/go/collectors/go.d.plugin/modules/openvpn_status_log/testdata/config.yaml
new file mode 100644
index 000000000..1a27ab974
--- /dev/null
+++ b/src/go/collectors/go.d.plugin/modules/openvpn_status_log/testdata/config.yaml
@@ -0,0 +1,7 @@
+update_every: 123
+log_path: "ok"
+per_user_stats:
+  includes:
+    - "ok"
+  excludes:
+    - "ok"
diff --git a/fluent-bit/lib/jemalloc-5.3.0/config.stamp.in b/src/go/collectors/go.d.plugin/modules/openvpn_status_log/testdata/empty.txt
index e69de29bb..e69de29bb 100644
--- a/fluent-bit/lib/jemalloc-5.3.0/config.stamp.in
+++ b/src/go/collectors/go.d.plugin/modules/openvpn_status_log/testdata/empty.txt
diff --git a/src/go/collectors/go.d.plugin/modules/openvpn_status_log/testdata/v2.5.1/static-key.txt b/src/go/collectors/go.d.plugin/modules/openvpn_status_log/testdata/v2.5.1/static-key.txt
new file mode 100644
index 000000000..64b691fcd
--- /dev/null
+++ b/src/go/collectors/go.d.plugin/modules/openvpn_status_log/testdata/v2.5.1/static-key.txt
@@ -0,0 +1,8 @@
+OpenVPN STATISTICS
+Updated,2022-05-05 12:35:47
+TUN/TAP read bytes,123
+TUN/TAP write bytes,1155
+TCP/UDP read bytes,19265
+TCP/UDP write bytes,261631
+Auth read bytes,0
+END
diff --git a/src/go/collectors/go.d.plugin/modules/openvpn_status_log/testdata/v2.5.1/version1-no-clients.txt b/src/go/collectors/go.d.plugin/modules/openvpn_status_log/testdata/v2.5.1/version1-no-clients.txt
new file mode 100644
index 000000000..34d7a748f
--- /dev/null
+++ b/src/go/collectors/go.d.plugin/modules/openvpn_status_log/testdata/v2.5.1/version1-no-clients.txt
@@ -0,0 +1,8 @@
+OpenVPN CLIENT LIST
+Updated,2022-07-08 15:05:57
+Common Name,Real Address,Bytes Received,Bytes Sent,Connected Since
+ROUTING TABLE
+Virtual Address,Common Name,Real Address,Last Ref
+GLOBAL STATS
+Max bcast/mcast queue length,0
+END
\ No newline at end of file
diff --git a/src/go/collectors/go.d.plugin/modules/openvpn_status_log/testdata/v2.5.1/version1.txt b/src/go/collectors/go.d.plugin/modules/openvpn_status_log/testdata/v2.5.1/version1.txt
new file mode 100644
index 000000000..0d2f33ba5
--- /dev/null
+++ b/src/go/collectors/go.d.plugin/modules/openvpn_status_log/testdata/v2.5.1/version1.txt
@@ -0,0 +1,12 @@
+OpenVPN CLIENT LIST
+Updated,2022-07-08 15:14:45
+Common Name,Real Address,Bytes Received,Bytes Sent,Connected Since
+vpnclient,10.10.10.107:46195,3084,3185,2022-07-08 15:14:42
+vpnclient2,10.10.10.50:51275,3084,3184,2022-07-08 15:14:41
+ROUTING TABLE
+Virtual Address,Common Name,Real Address,Last Ref
+10.8.0.10,vpnclient,10.10.10.107:46195,2022-07-08 15:14:42
+10.8.0.6,vpnclient2,10.10.10.50:51275,2022-07-08 15:14:41
+GLOBAL STATS
+Max bcast/mcast queue length,0
+END
\ No newline at end of file
diff --git a/src/go/collectors/go.d.plugin/modules/openvpn_status_log/testdata/v2.5.1/version2-no-clients.txt b/src/go/collectors/go.d.plugin/modules/openvpn_status_log/testdata/v2.5.1/version2-no-clients.txt
new file mode 100644
index 000000000..6d1ea1e32
--- /dev/null
+++ b/src/go/collectors/go.d.plugin/modules/openvpn_status_log/testdata/v2.5.1/version2-no-clients.txt
@@ -0,0 +1,6 @@
+TITLE,OpenVPN 2.5.1 x86_64-pc-linux-gnu [SSL (OpenSSL)] [LZO] [LZ4] [EPOLL] [PKCS11] [MH/PKTINFO] [AEAD] built on May 14 2021
+TIME,2022-07-08 15:04:54,1657281894
+HEADER,CLIENT_LIST,Common Name,Real Address,Virtual Address,Virtual IPv6 Address,Bytes Received,Bytes Sent,Connected Since,Connected Since (time_t),Username,Client ID,Peer ID,Data Channel Cipher
+HEADER,ROUTING_TABLE,Virtual Address,Common Name,Real Address,Last Ref,Last Ref (time_t)
+GLOBAL_STATS,Max bcast/mcast queue length,0
+END
\ No newline at end of file
diff --git a/src/go/collectors/go.d.plugin/modules/openvpn_status_log/testdata/v2.5.1/version2.txt b/src/go/collectors/go.d.plugin/modules/openvpn_status_log/testdata/v2.5.1/version2.txt
new file mode 100644
index 000000000..d0f4ac8e3
--- /dev/null
+++ b/src/go/collectors/go.d.plugin/modules/openvpn_status_log/testdata/v2.5.1/version2.txt
@@ -0,0 +1,10 @@
+TITLE,OpenVPN 2.5.1 x86_64-pc-linux-gnu [SSL (OpenSSL)] [LZO] [LZ4] [EPOLL] [PKCS11] [MH/PKTINFO] [AEAD] built on May 14 2021
+TIME,2022-07-08 15:05:14,1657281914
+HEADER,CLIENT_LIST,Common Name,Real Address,Virtual Address,Virtual IPv6 Address,Bytes Received,Bytes Sent,Connected Since,Connected Since (time_t),Username,Client ID,Peer ID,Data Channel Cipher
+CLIENT_LIST,vpnclient2,10.10.10.50:38535,10.8.0.6,,3157,3184,2022-07-08 15:05:09,1657281909,UNDEF,0,0,AES-256-GCM
+CLIENT_LIST,vpnclient,10.10.10.107:50026,10.8.0.10,,3084,3185,2022-07-08 15:05:10,1657281910,UNDEF,1,1,AES-256-GCM
+HEADER,ROUTING_TABLE,Virtual Address,Common Name,Real Address,Last Ref,Last Ref (time_t)
+ROUTING_TABLE,10.8.0.6,vpnclient2,10.10.10.50:38535,2022-07-08 15:05:09,1657281909
+ROUTING_TABLE,10.8.0.10,vpnclient,10.10.10.107:50026,2022-07-08 15:05:10,1657281910
+GLOBAL_STATS,Max bcast/mcast queue length,0
+END
\ No newline at end of file
diff --git a/src/go/collectors/go.d.plugin/modules/openvpn_status_log/testdata/v2.5.1/version3-no-clients.txt b/src/go/collectors/go.d.plugin/modules/openvpn_status_log/testdata/v2.5.1/version3-no-clients.txt
new file mode 100644
index 000000000..6ab671f20
--- /dev/null
+++ b/src/go/collectors/go.d.plugin/modules/openvpn_status_log/testdata/v2.5.1/version3-no-clients.txt
@@ -0,0 +1,6 @@
+TITLE	OpenVPN 2.5.1 x86_64-pc-linux-gnu [SSL (OpenSSL)] [LZO] [LZ4] [EPOLL] [PKCS11] [MH/PKTINFO] [AEAD] built on May 14 2021
+TIME	2022-07-08 15:02:27	1657281747
+HEADER	CLIENT_LIST	Common Name	Real Address	Virtual Address	Virtual IPv6 Address	Bytes Received	Bytes Sent	Connected Since	Connected Since (time_t)	Username	Client ID	Peer ID	Data Channel Cipher
+HEADER	ROUTING_TABLE	Virtual Address	Common Name	Real Address	Last Ref	Last Ref (time_t)
+GLOBAL_STATS	Max bcast/mcast queue length	2
+END
\ No newline at end of file
diff --git a/src/go/collectors/go.d.plugin/modules/openvpn_status_log/testdata/v2.5.1/version3.txt b/src/go/collectors/go.d.plugin/modules/openvpn_status_log/testdata/v2.5.1/version3.txt
new file mode 100644
index 000000000..7d732042e
--- /dev/null
+++ b/src/go/collectors/go.d.plugin/modules/openvpn_status_log/testdata/v2.5.1/version3.txt
@@ -0,0 +1,10 @@
+TITLE	OpenVPN 2.5.1 x86_64-pc-linux-gnu [SSL (OpenSSL)] [LZO] [LZ4] [EPOLL] [PKCS11] [MH/PKTINFO] [AEAD] built on May 14 2021
+TIME	2022-07-08 14:53:40	1657281220
+HEADER	CLIENT_LIST	Common Name	Real Address	Virtual Address	Virtual IPv6 Address	Bytes Received	Bytes Sent	Connected Since	Connected Since (time_t)	Username	Client ID	Peer ID	Data Channel Cipher
+CLIENT_LIST	vpnclient2	10.10.10.50:53856	10.8.0.6		3654	3617	2022-07-08 14:50:56	1657281056	UNDEF	0	0	AES-256-GCM
+CLIENT_LIST	vpnclient	10.10.10.107:42132	10.8.0.10		3654	3618	2022-07-08 14:50:58	1657281058	UNDEF	1	1	AES-256-GCM
+HEADER	ROUTING_TABLE	Virtual Address	Common Name	Real Address	Last Ref	Last Ref (time_t)
+ROUTING_TABLE	10.8.0.6	vpnclient2	10.10.10.50:53856	2022-07-08 14:50:56	1657281056
+ROUTING_TABLE	10.8.0.10	vpnclient	10.10.10.107:42132	2022-07-08 14:50:58	1657281058
+GLOBAL_STATS	Max bcast/mcast queue length	2
+END
\ No newline at end of file