Merging upstream version 1.45.3+dfsg.

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

4 files changed, 245 insertions, 0 deletions

diff --git a/src/go/collectors/go.d.plugin/modules/pika/testdata/config.json b/src/go/collectors/go.d.plugin/modules/pika/testdata/config.json
new file mode 100644
index 000000000..d8ba812ab
--- /dev/null
+++ b/src/go/collectors/go.d.plugin/modules/pika/testdata/config.json
@@ -0,0 +1,9 @@
+{
+  "update_every": 123,
+  "address": "ok",
+  "timeout": 123.123,
+  "tls_ca": "ok",
+  "tls_cert": "ok",
+  "tls_key": "ok",
+  "tls_skip_verify": true
+}
diff --git a/src/go/collectors/go.d.plugin/modules/pika/testdata/config.yaml b/src/go/collectors/go.d.plugin/modules/pika/testdata/config.yaml
new file mode 100644
index 000000000..6a6f6ae69
--- /dev/null
+++ b/src/go/collectors/go.d.plugin/modules/pika/testdata/config.yaml
@@ -0,0 +1,7 @@
+update_every: 123
+address: "ok"
+timeout: 123.123
+tls_ca: "ok"
+tls_cert: "ok"
+tls_key: "ok"
+tls_skip_verify: yes
diff --git a/src/go/collectors/go.d.plugin/modules/pika/testdata/redis/info_all.txt b/src/go/collectors/go.d.plugin/modules/pika/testdata/redis/info_all.txt
new file mode 100644
index 000000000..8ab381620
--- /dev/null
+++ b/src/go/collectors/go.d.plugin/modules/pika/testdata/redis/info_all.txt
@@ -0,0 +1,165 @@
+$4050
+# Server
+redis_version:6.0.9
+redis_git_sha1:00000000
+redis_git_dirty:0
+redis_build_id:12c354e6793cb936
+redis_mode:standalone
+os:Linux 5.4.39-linuxkit x86_64
+arch_bits:64
+multiplexing_api:epoll
+atomicvar_api:atomic-builtin
+gcc_version:8.3.0
+process_id:1
+run_id:5d97fd948bbf6cb68458685fc747f9f9019c3fc4
+tcp_port:6379
+uptime_in_seconds:252812
+uptime_in_days:2
+hz:10
+configured_hz:10
+lru_clock:13181377
+executable:/data/redis-server
+config_file:
+io_threads_active:0
+
+# Clients
+connected_clients:1
+client_recent_max_input_buffer:8
+client_recent_max_output_buffer:0
+blocked_clients:0
+tracking_clients:0
+clients_in_timeout_table:0
+
+# Memory
+used_memory:867160
+used_memory_human:846.84K
+used_memory_rss:3989504
+used_memory_rss_human:3.80M
+used_memory_peak:923360
+used_memory_peak_human:901.72K
+used_memory_peak_perc:93.91%
+used_memory_overhead:803344
+used_memory_startup:803152
+used_memory_dataset:63816
+used_memory_dataset_perc:99.70%
+allocator_allocated:903408
+allocator_active:1208320
+allocator_resident:3723264
+total_system_memory:2084032512
+total_system_memory_human:1.94G
+used_memory_lua:37888
+used_memory_lua_human:37.00K
+used_memory_scripts:0
+used_memory_scripts_human:0B
+number_of_cached_scripts:0
+maxmemory:0
+maxmemory_human:0B
+maxmemory_policy:noeviction
+allocator_frag_ratio:1.34
+allocator_frag_bytes:304912
+allocator_rss_ratio:3.08
+allocator_rss_bytes:2514944
+rss_overhead_ratio:1.07
+rss_overhead_bytes:266240
+mem_fragmentation_ratio:4.96
+mem_fragmentation_bytes:3185848
+mem_not_counted_for_evict:0
+mem_replication_backlog:0
+mem_clients_slaves:0
+mem_clients_normal:0
+mem_aof_buffer:0
+mem_allocator:jemalloc-5.1.0
+active_defrag_running:0
+lazyfree_pending_objects:0
+
+# Persistence
+loading:0
+rdb_changes_since_last_save:0
+rdb_bgsave_in_progress:0
+rdb_last_save_time:1606951667
+rdb_last_bgsave_status:ok
+rdb_last_bgsave_time_sec:0
+rdb_current_bgsave_time_sec:-1
+rdb_last_cow_size:290816
+aof_enabled:0
+aof_rewrite_in_progress:0
+aof_rewrite_scheduled:0
+aof_last_rewrite_time_sec:-1
+aof_current_rewrite_time_sec:-1
+aof_last_bgrewrite_status:ok
+aof_last_write_status:ok
+aof_last_cow_size:0
+module_fork_in_progress:0
+module_fork_last_cow_size:0
+
+# Stats
+total_connections_received:87
+total_commands_processed:161
+instantaneous_ops_per_sec:0
+total_net_input_bytes:2301
+total_net_output_bytes:507187
+instantaneous_input_kbps:0.00
+instantaneous_output_kbps:0.00
+rejected_connections:0
+sync_full:0
+sync_partial_ok:0
+sync_partial_err:0
+expired_keys:0
+expired_stale_perc:0.00
+expired_time_cap_reached_count:0
+expire_cycle_cpu_milliseconds:28362
+evicted_keys:0
+keyspace_hits:2
+keyspace_misses:0
+pubsub_channels:0
+pubsub_patterns:0
+latest_fork_usec:810
+migrate_cached_sockets:0
+slave_expires_tracked_keys:0
+active_defrag_hits:0
+active_defrag_misses:0
+active_defrag_key_hits:0
+active_defrag_key_misses:0
+tracking_total_keys:0
+tracking_total_items:0
+tracking_total_prefixes:0
+unexpected_error_replies:0
+total_reads_processed:250
+total_writes_processed:163
+io_threaded_reads_processed:0
+io_threaded_writes_processed:0
+
+# Replication
+role:master
+connected_slaves:0
+master_replid:3f0ad529c9c59a17834bde8ae85f09f77609ecb1
+master_replid2:0000000000000000000000000000000000000000
+master_repl_offset:0
+second_repl_offset:-1
+repl_backlog_active:0
+repl_backlog_size:1048576
+repl_backlog_first_byte_offset:0
+repl_backlog_histlen:0
+
+# CPU
+used_cpu_sys:630.829091
+used_cpu_user:188.394908
+used_cpu_sys_children:0.020626
+used_cpu_user_children:0.002731
+
+# Modules
+
+# Commandstats
+cmdstat_set:calls=3,usec=140,usec_per_call=46.67
+cmdstat_command:calls=2,usec=2182,usec_per_call=1091.00
+cmdstat_get:calls=2,usec=29,usec_per_call=14.50
+cmdstat_hmset:calls=2,usec=408,usec_per_call=204.00
+cmdstat_hello:calls=1,usec=15,usec_per_call=15.00
+cmdstat_ping:calls=19,usec=286,usec_per_call=15.05
+cmdstat_info:calls=132,usec=37296,usec_per_call=282.55
+
+# Cluster
+cluster_enabled:0
+
+# Keyspace
+db0:keys=4,expires=0,avg_ttl=0
diff --git a/src/go/collectors/go.d.plugin/modules/pika/testdata/v3.4.0/info_all.txt b/src/go/collectors/go.d.plugin/modules/pika/testdata/v3.4.0/info_all.txt
new file mode 100644
index 000000000..ec58524ce
--- /dev/null
+++ b/src/go/collectors/go.d.plugin/modules/pika/testdata/v3.4.0/info_all.txt
@@ -0,0 +1,64 @@
+$1283
+# Server
+pika_version:3.4.0
+pika_git_sha:bd30511bf82038c2c6531b3d84872c9825fe836a
+pika_build_compile_date: Dec  1 2020
+os:Linux 5.4.39-linuxkit x86_64
+arch_bits:64
+process_id:1
+tcp_port:9221
+thread_num:1
+sync_thread_num:6
+uptime_in_seconds:1884
+uptime_in_days:1
+config_file:/pika/conf/pika.conf
+server_id:1
+
+# Data
+db_size:645807
+db_size_human:0M
+log_size:4272814
+log_size_human:4M
+compression:snappy
+used_memory:8198
+used_memory_human:0M
+db_memtable_usage:8072
+db_tablereader_usage:126
+db_fatal:0
+db_fatal_msg:NULL
+
+# Clients
+connected_clients:1
+
+# Stats
+total_connections_received:3
+instantaneous_ops_per_sec:0
+total_commands_processed:3
+is_bgsaving:No
+is_scaning_keyspace:No
+is_compact:No
+compact_cron:
+compact_interval:
+
+# Command_Exec_Count
+INFO:1
+SET:2
+
+# CPU
+used_cpu_sys:158.20
+used_cpu_user:22.05
+used_cpu_sys_children:0.03
+used_cpu_user_children:0.02
+
+# Replication(MASTER)
+role:master
+connected_slaves:0
+db0 binlog_offset=0 589,safety_purge=none
+
+# Keyspace
+# Time:1970-01-01 08:00:00
+db0 Strings_keys=0, expires=0, invalid_keys=0
+db0 Hashes_keys=0, expires=0, invalid_keys=0
+db0 Lists_keys=0, expires=0, invalid_keys=0
+db0 Zsets_keys=0, expires=0, invalid_keys=0
+db0 Sets_keys=0, expires=0, invalid_keys=0