Merge pull request #8 from shanjingheng/master

Support pika version 2.2.3.3

.gitignore

@@ -10,3 +10,5 @@
 
 # Output of the go coverage tool, specifically when used with LiteIDE
 *.out
+
+bin/

exporter/metrics/stats.go

@@ -68,7 +68,7 @@ var collectStatsMetrics = map[string]MetricConfig{
 	"compact": {
 		Parser: &regexParser{
 			name:   "compact",
-			reg:    regexp.MustCompile(`is_compact:(?P<is_compact>[^\r\n]*)[\s\S]*compact_cron:(?P<compact_cron>[^\r\n]*)[\s\S]*compact_interval:(?P<compact_interval>[^\r\n]*)`),
+			reg:    regexp.MustCompile(`is_compact:(?P<is_compact>[^\r\n]*)[\s\S]*compact_cron:(?P<compact_cron>[^\r\n]*)([\s\S]*compact_interval:(?P<compact_interval>[^\r\n]*))?`),
 			Parser: &normalParser{},
 		},
 		MetricMeta: &MetaData{

exporter/parser.go

@@ -2,8 +2,9 @@ package exporter
 
 import (
 	"bufio"
-	"strings"
 	"errors"
+	"strings"
+
 	"github.com/Masterminds/semver"
 )
 
@@ -67,5 +68,9 @@ func fetchKV(s string) (k, v string) {
 
 func getVersion(extracted map[string]string) (version string) {
 	version, _ = extracted[pikaVersionKey]
+	vv := strings.Split(version, ".")
+	if len(vv) > 3 {
+		version = strings.Join(vv[:3], ".")
+	}
 	return
 }

exporter/test/test.go

@@ -4,6 +4,9 @@ var InfoCases = []struct {
 	Name string
 	Info string
 }{
+	{"v2.2.3.3_master", V2233MasterInfo},
+	{"v2.2.3.3_slave", V2233SlaveInfo},
+
 	{"v2.2.6_master", V226MasterInfo},
 	{"v2.2.6_slave", V226SlaveInfo},
 

exporter/test/v2.2.3.3_master.go

@@ -0,0 +1,57 @@
+package test
+
+var V2233MasterInfo = `# Server
+pika_version:2.2.3.3
+os:Linux 3.10.0-957.21.3.el7.x86_64 x86_64
+arch_bits:64
+process_id:3652
+tcp_port:8888
+thread_num:6
+sync_thread_num:6
+uptime_in_seconds:4827977
+uptime_in_days:57
+config_file:/data/apps/config/pika/pika.conf
+
+# Data
+db_size:76365887
+db_size_human:72M
+compression:snappy
+used_memory:52563416
+used_memory_human:50M
+db_memtable_usage:51239488
+db_tablereader_usage:1323928
+
+# Log
+log_size:2170115968
+log_size_human:2069M
+safety_purge:write2file1834
+expire_logs_days:7
+expire_logs_nums:20
+binlog_offset:1844 79515877
+
+# Clients
+connected_clients:513
+
+# Stats
+total_connections_received:1802767
+instantaneous_ops_per_sec:216
+total_commands_processed:2100008430
+is_bgsaving:No, , 0
+is_slots_reloading:No, , 0
+is_slots_cleanuping:No, , 0
+is_scaning_keyspace:No
+is_compact:No
+compact_cron:04-05/50
+
+# Replication(MASTER)
+role:master
+connected_slaves:1
+slave0:ip=192.168.1.1,port=8888,state=online
+
+# Keyspace
+# Time:1970-01-01 08:00:00
+kv keys:0
+hash keys:0
+list keys:0
+zset keys:0
+set keys:0`

exporter/test/v2.2.3.3_slave.go

@@ -0,0 +1,60 @@
+package test
+
+var V2233SlaveInfo = `# Server
+pika_version:2.2.3.3
+os:Linux 3.10.0-957.21.3.el7.x86_64 x86_64
+arch_bits:64
+process_id:3320
+tcp_port:8888
+thread_num:6
+sync_thread_num:6
+uptime_in_seconds:4827986
+uptime_in_days:57
+config_file:/data/apps/config/pika/pika.conf
+
+# Data
+db_size:61609726
+db_size_human:58M
+compression:snappy
+used_memory:51530296
+used_memory_human:49M
+db_memtable_usage:51269520
+db_tablereader_usage:260776
+
+# Log
+log_size:1358284883
+log_size_human:1295M
+safety_purge:write2file1834
+expire_logs_days:7
+expire_logs_nums:20
+binlog_offset:1844 79595083
+
+# Clients
+connected_clients:1
+
+# Stats
+total_connections_received:1697368
+instantaneous_ops_per_sec:3
+total_commands_processed:1064238831
+is_bgsaving:No, , 0
+is_slots_reloading:No, , 0
+is_slots_cleanuping:No, , 0
+is_scaning_keyspace:No
+is_compact:No
+compact_cron:04-05/50
+
+# Replication(SLAVE)
+role:slave
+master_host:192.168.1.2
+master_port:8888
+master_link_status:up
+slave_read_only:1
+repl_state: 3
+
+# Keyspace
+# Time:1970-01-01 08:00:00
+kv keys:0
+hash keys:0
+list keys:0
+zset keys:0
+set keys:0`