diff --git a/public/language/en-GB/admin/advanced/database.json b/public/language/en-GB/admin/advanced/database.json index f0892fd0f5..9fccd39b48 100644 --- a/public/language/en-GB/admin/advanced/database.json +++ b/public/language/en-GB/admin/advanced/database.json @@ -25,6 +25,9 @@ "redis": "Redis", "redis.version": "Redis Version", + "redis.keys": "Keys", + "redis.expires": "Expires", + "redis.avg-ttl": "Average TTL", "redis.connected-clients": "Connected Clients", "redis.connected-slaves": "Connected Slaves", "redis.blocked-clients": "Blocked Clients", diff --git a/src/database/redis.js b/src/database/redis.js index 95a78b6310..4cbca8104b 100644 --- a/src/database/redis.js +++ b/src/database/redis.js @@ -180,7 +180,10 @@ redisModule.info = function (cxn, callback) { } }); - redisData.keys = redisData['db' + nconf.get('redis:database')]; + const keyInfo = redisData['db' + nconf.get('redis:database')]; + redisData.keys = keyInfo.split(',')[0].replace('keys=', ''); + redisData.expires = keyInfo.split(',')[1].replace('expires=', ''); + redisData.avg_ttl = keyInfo.split(',')[2].replace('avg_ttl=', ''); redisData.instantaneous_input = (redisData.instantaneous_input_kbps / 1024).toFixed(3); redisData.instantaneous_output = (redisData.instantaneous_output_kbps / 1024).toFixed(3); diff --git a/src/views/admin/advanced/database.tpl b/src/views/admin/advanced/database.tpl index 10d3989e97..086b24e179 100644 --- a/src/views/admin/advanced/database.tpl +++ b/src/views/admin/advanced/database.tpl @@ -43,6 +43,8 @@ [[admin/advanced/database:uptime-days]] {redis.uptime_in_days}

[[admin/advanced/database:redis.keys]] {redis.keys}
+ [[admin/advanced/database:redis.expires]] {redis.expires}
+ [[admin/advanced/database:redis.avg-ttl]] {redis.avg_ttl}
[[admin/advanced/database:redis.connected-clients]] {redis.connected_clients}
[[admin/advanced/database:redis.connected-slaves]] {redis.connected_slaves}
[[admin/advanced/database:redis.blocked-clients]] {redis.blocked_clients}