Skip to content

Commit db44af4

Browse files
committed
Modify pika exporter
1 parent 5c44d38 commit db44af4

2 files changed

Lines changed: 10 additions & 5 deletions

File tree

tools/pika_exporter/exporter/client.go

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -120,13 +120,17 @@ func (c *client) InfoCommand(command string) (string, error) {
120120
return redis.String(c.conn.Do("INFO", command))
121121
}
122122

123+
func (c *client) InfoBigKeys() (string, error) {
124+
return redis.String(c.conn.Do("INFO", "BIGKEYS"))
125+
}
123126
func (c *client) InfoNoneCommandList() (string, error) {
124127
var rst []string
125128

126129
sectionsMap := map[string]bool{
127130
"COMMAND_EXEC_COUNT": InfoConf.Execcount,
128131
"COMMANDSTATS": InfoConf.Commandstats,
129132
"ROCKSDB": InfoConf.Rocksdb,
133+
"BIGKEYS": InfoConf.BigKeys,
130134
}
131135
for section, flag := range sectionsMap {
132136
if flag {
@@ -155,6 +159,7 @@ func (c *client) InfoAllCommandList() (string, error) {
155159
"COMMAND_EXEC_COUNT": InfoConf.Execcount,
156160
"COMMANDSTATS": InfoConf.Commandstats,
157161
"ROCKSDB": InfoConf.Rocksdb,
162+
"BIGKEYS": InfoConf.BigKeys,
158163
}
159164
for section, flag := range sectionsMap {
160165
if flag {

tools/pika_exporter/exporter/metrics/bigkeys.go

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ var collectBigKeysMetrics = map[string]MetricConfig{
1313
Parser: &regexParser{
1414
name: "bigkeys_string",
1515
reg: regexp.MustCompile(
16-
`Type: string, key: (?P<key>[^,]+), key_length: (?P<key_length>\d+), value_length: (?P<value_length>\d+)`,
16+
`Type:\s*string,\s*key:\s*(?P<key>[^,]+),\s*key_length:\s*(?P<key_length>\d+),\s*value_length:\s*(?P<value_length>\d+)`,
1717
),
1818
},
1919
MetricMeta: MetaDatas{
@@ -37,7 +37,7 @@ var collectBigKeysMetrics = map[string]MetricConfig{
3737
Parser: &regexParser{
3838
name: "bigkeys_complex",
3939
reg: regexp.MustCompile(
40-
`Type: (?P<type>\w+), key: (?P<key>[^,]+), value_length: (?P<value_length>\d+), member_size: (?P<member_size>\d+)`,
40+
`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+)`,
4141
),
4242
},
4343
MetricMeta: MetaDatas{
@@ -49,11 +49,11 @@ var collectBigKeysMetrics = map[string]MetricConfig{
4949
ValueName: "member_size",
5050
},
5151
{
52-
Name: "bigkeys_value_length",
53-
Help: "Big key value length",
52+
Name: "bigkeys_key_length",
53+
Help: "Big key length for complex type",
5454
Type: metricTypeGauge,
5555
Labels: []string{LabelNameAddr, LabelNameAlias, "type", "key"},
56-
ValueName: "value_length",
56+
ValueName: "key_length",
5757
},
5858
},
5959
},

0 commit comments

Comments
 (0)