@@ -12,13 +12,15 @@ var collectBigKeysMetrics = map[string]MetricConfig{
1212 "bigkeys_string" : {
1313 Parser : & regexParser {
1414 name : "bigkeys_string" ,
15+ source : "bigkeys_output" ,
1516 reg : regexp .MustCompile (
16- `Type: string, key: (?P<key>[^,]+), key_length: (?P<key_length>\d+), value_length: (?P<value_length>\d+)` ,
17+ `(?s).*?#\s*String.*?Big\s+Keys\s+number:\s*\d+.*? Type:\s* string,\s* key:\s* (?P<key>[^,]+),\s* key_length:\s* (?P<key_length>\d+),\s* value_length:\s* (?P<value_length>\d+)` ,
1718 ),
19+ Parser : & normalParser {},
1820 },
1921 MetricMeta : MetaDatas {
2022 {
21- Name : "bigkeys_key_length " ,
23+ Name : "bigkeys_string_key_length " ,
2224 Help : "Big key length for string type" ,
2325 Type : metricTypeGauge ,
2426 Labels : []string {LabelNameAddr , LabelNameAlias , "type" , "key" },
@@ -36,9 +38,11 @@ var collectBigKeysMetrics = map[string]MetricConfig{
3638 "bigkeys_complex" : {
3739 Parser : & regexParser {
3840 name : "bigkeys_complex" ,
41+ source : "bigkeys_output" ,
3942 reg : regexp .MustCompile (
40- `Type: (?P<type>\w+), key: (?P<key>[^,]+), value_length: (?P<value_length >\d+), member_size: (?P<member_size>\d+)` ,
43+ `(?s).*?#\s*(Hash|List|Set|ZSet).*?Big\s+Keys\s+number:\s*\d+.*? Type:\s* (?P<type>hash|list|set|zset),\s* key:\s* (?P<key>[^,]+),\s*key_length:\s* (?P<key_length >\d+),\s* member_size:\s* (?P<member_size>\d+)` ,
4144 ),
45+ Parser : & normalParser {},
4246 },
4347 MetricMeta : MetaDatas {
4448 {
@@ -49,11 +53,11 @@ var collectBigKeysMetrics = map[string]MetricConfig{
4953 ValueName : "member_size" ,
5054 },
5155 {
52- Name : "bigkeys_value_length " ,
53- Help : "Big key value length" ,
56+ Name : "bigkeys_complex_key_length " ,
57+ Help : "Big key length for complex type " ,
5458 Type : metricTypeGauge ,
5559 Labels : []string {LabelNameAddr , LabelNameAlias , "type" , "key" },
56- ValueName : "value_length " ,
60+ ValueName : "key_length " ,
5761 },
5862 },
5963 },
0 commit comments