@adalo/metrics 0.1.110 → 0.1.111

package/lib/metricsRedisClient.js

@@ -9,8 +9,8 @@ const {
   IOREDIS,
   REDIS_V3
 } = require('./redisUtils');
-const redisConnectionStableFields = ['name', 'flags'];
-const redisConnectionFields = ['name', 'flags', 'tot-mem'];
+const redisConnectionStableFields = ['name', 'flags', 'cmd'];
+const redisConnectionFields = ['name', 'flags', 'tot-mem', 'cmd'];
 
 /**
  * RedisMetricsClient extends MetricsClient to collect

package/lib/metricsRedisClient.js.map

@@ -1 +1 @@
-{"version":3,"file":"metricsRedisClient.js","names":["MetricsClient","require","getRedisClientType","REDIS_V4","IOREDIS","REDIS_V3","redisConnectionStableFields","redisConnectionFields","RedisMetricsClient","constructor","redisClient","metricsConfig","intervalSec","parseInt","process","env","METRICS_QUEUE_INTERVAL_SEC","scripDefaultMetrics","processType","redisClientType","redisConnectionsGauge","createGauge","name","help","labelNames","withDefaultLabels","redisConnectionsMemoryGauge","redisMemoryGauge","redisStatsGauge","_setCleanupHandlers","getRedisConnections","Error","Promise","resolve","reject","send_command","err","result","message","sendCommand","client","getRedisInfo","section","info","parseRedisConnections","clientsStr","split","filter","line","trim","map","parts","forEach","p","k","v","includes","collectRedisMetrics","memoryInfoStr","statsInfoStr","connectionsInfoStr","all","labels","getDefaultLabels","connections","logValues","console","log","length","grouped","conn","flags","totMem","key","JSON","stringify","count","memory","Object","values","valueLabels","set","parseRedisInfo","infoStr","fromEntries","startsWith","stats","used_memory","memory_type","maxmemory","instantaneous_ops_per_sec","operation","error","warn","pushRedisMetrics","gatewayPush","clearAllCounters","metricsLogValues","metricObjects","registry","getMetricsAsJSON","startPush","_startPush","catch","cleanup","quit","disconnect","exit","on","module","exports"],"sources":["../src/metricsRedisClient.js"],"sourcesContent":["const { MetricsClient } = require('.')\nconst {\n  getRedisClientType,\n  REDIS_V4,\n  IOREDIS,\n  REDIS_V3,\n} = require('./redisUtils')\n\nconst redisConnectionStableFields = ['name', 'flags']\nconst redisConnectionFields = ['name', 'flags', 'tot-mem']\n\n/**\n * RedisMetricsClient extends MetricsClient to collect\n * Redis metrics periodically and push them to Prometheus Pushgateway.\n *\n * @extends MetricsClient\n */\nclass RedisMetricsClient extends MetricsClient {\n  /**\n   * @param {Object} options\n   * @param {any} options.redisClient - Redis client instance (required)\n   * @param {string} [options.appName] - Application name (from MetricsClient)\n   * @param {string} [options.dynoId] - Dyno/instance ID (from MetricsClient)\n   * @param {string} [options.processType] - Process type (from MetricsClient)\n   * @param {boolean} [options.enabled] - Enable metrics collection (from MetricsClient)\n   * @param {boolean} [options.logValues] - Log metrics values (from MetricsClient)\n   * @param {string} [options.pushgatewayUrl] - PushGateway URL (from MetricsClient)\n   * @param {string} [options.pushgatewaySecret] - PushGateway secret token (from MetricsClient)\n   * @param {number} [options.intervalSec] - Interval in seconds for pushing metrics (from MetricsClient)\n   * @param {boolean} [options.removeOldMetrics] - Remove old metrics by service (from MetricsClient)\n   * @param {boolean} [options.scripDefaultMetrics] - Skip default metrics creation (from MetricsClient)\n   * @param {function} [options.startupValidation] - Function to validate startup (from MetricsClient)\n   */\n  constructor({ redisClient, ...metricsConfig } = {}) {\n    const intervalSec =\n      metricsConfig.intervalSec ||\n      parseInt(process.env.METRICS_QUEUE_INTERVAL_SEC || '', 10) ||\n      5\n\n    super({\n      ...metricsConfig,\n      scripDefaultMetrics: true,\n      processType: metricsConfig.processType || 'queue-metrics',\n      intervalSec,\n    })\n\n    /** Redis client used for metrics */\n    this.redisClient = redisClient\n    this.redisClientType = getRedisClientType(redisClient)\n\n    /** Counter for Redis client connections */\n    this.redisConnectionsGauge = this.createGauge({\n      name: 'app_redis_connections_count',\n      help: 'Redis client connections',\n      labelNames: this.withDefaultLabels(redisConnectionStableFields),\n    })\n\n    this.redisConnectionsMemoryGauge = this.createGauge({\n      name: 'app_redis_connections_memory_usage_count',\n      help: 'Redis client connections',\n      labelNames: this.withDefaultLabels(redisConnectionStableFields),\n    })\n\n    /** Gauge for Redis memory usage */\n    this.redisMemoryGauge = this.createGauge({\n      name: 'app_redis_memory_bytes',\n      help: 'Redis memory usage in bytes',\n      labelNames: this.withDefaultLabels(['memory_type']),\n    })\n\n    /** Gauge for Redis operation stats */\n    this.redisStatsGauge = this.createGauge({\n      name: 'app_redis_stats_total',\n      help: 'Redis operation statistics',\n      labelNames: this.withDefaultLabels(['operation']),\n    })\n\n    this._setCleanupHandlers()\n  }\n\n  getRedisConnections = async () => {\n    if (!this.redisClient) throw new Error('Redis client not provided')\n\n    // node-redis v3 (uses callback)\n    if (this.redisClientType === REDIS_V3) {\n      return new Promise((resolve, reject) => {\n        this.redisClient.send_command('CLIENT', ['LIST'], (err, result) => {\n          if (err) {\n            reject(new Error(`Failed to get CLIENT LIST: ${err.message}`))\n          } else resolve(result)\n        })\n      })\n    }\n\n    // node-redis v4\n    if (this.redisClientType === REDIS_V4) {\n      try {\n        return this.redisClient.sendCommand(['CLIENT', 'LIST'])\n      } catch (err) {\n        throw new Error(`Failed to get CLIENT LIST: ${err.message}`)\n      }\n    }\n\n    if (this.redisClientType === IOREDIS) {\n      try {\n        return this.redisClient.client('LIST')\n      } catch (err) {\n        throw new Error(`Failed to get CLIENT LIST: ${err.message}`)\n      }\n    }\n\n    throw new Error('Unsupported Redis client type')\n  }\n\n  getRedisInfo = async section => {\n    if (!this.redisClient) throw new Error('Redis client not provided')\n\n    // node-redis v3 (uses callback)\n    if (this.redisClientType === REDIS_V3) {\n      return new Promise((resolve, reject) => {\n        this.redisClient.info(section, (err, result) => {\n          if (err) reject(err)\n          else resolve(result)\n        })\n      })\n    }\n\n    // node-redis v4 or ioredis (info returns Promise)\n    if (this.redisClientType === REDIS_V4 || this.redisClientType === IOREDIS) {\n      try {\n        return this.redisClient.info(section)\n      } catch (err) {\n        throw new Error(`Failed to get Redis INFO: ${err.message}`)\n      }\n    }\n\n    throw new Error('Unsupported Redis client type')\n  }\n\n  parseRedisConnections = clientsStr => {\n    return clientsStr\n      .split('\\n')\n      .filter(line => line.trim() !== '')\n      .map(line => {\n        const parts = line.split(' ')\n        const client = {}\n        parts.forEach(p => {\n          const [k, v] = p.split('=')\n          if (redisConnectionFields.includes(k)) {\n            client[k] = v\n          }\n        })\n        return client\n      })\n  }\n\n  /**\n   * Collect basic Redis INFO metrics: clients, memory, stats\n   * @returns {Promise<void>}\n   */\n  collectRedisMetrics = async () => {\n    try {\n      const [memoryInfoStr, statsInfoStr, connectionsInfoStr] =\n        await Promise.all([\n          this.getRedisInfo('memory'),\n          this.getRedisInfo('stats'),\n          this.getRedisConnections(),\n        ])\n\n      const labels = this.getDefaultLabels()\n\n      const connections = this.parseRedisConnections(connectionsInfoStr)\n\n      if (this.logValues) {\n        console.log('Redis connections: ', connectionsInfoStr)\n        console.log('Redis connections count: ', connections.length)\n      }\n\n      const grouped = {}\n      connections.forEach(conn => {\n        const { name, flags, 'tot-mem': totMem } = conn\n\n        // build grouping key (includes default gauge labels later)\n        const key = JSON.stringify({ name, flags })\n\n        if (!grouped[key]) {\n          grouped[key] = {\n            labels: { name, flags },\n            count: 0,\n            memory: 0,\n          }\n        }\n\n        grouped[key].count += 1\n        grouped[key].memory += parseInt(totMem, 10)\n      })\n\n      Object.values(grouped).forEach(\n        ({ labels: valueLabels, count, memory }) => {\n          this.redisConnectionsGauge.set({ ...labels, ...valueLabels }, count)\n          this.redisConnectionsMemoryGauge.set(\n            { ...labels, ...valueLabels },\n            memory\n          )\n        }\n      )\n\n      const parseRedisInfo = infoStr =>\n        Object.fromEntries(\n          infoStr\n            .split('\\r\\n')\n            .filter(line => line && !line.startsWith('#'))\n            .map(line => line.split(':', 2))\n            .filter(parts => parts.length === 2 && parts[0] && parts[1])\n        )\n\n      const memory = parseRedisInfo(memoryInfoStr)\n      const stats = parseRedisInfo(statsInfoStr)\n\n      if (memory.used_memory) {\n        this.redisMemoryGauge.set(\n          { ...labels, memory_type: 'used' },\n          parseInt(memory.used_memory, 10) || 0\n        )\n      }\n      if (memory.maxmemory) {\n        this.redisMemoryGauge.set(\n          { ...labels, memory_type: 'max' },\n          parseInt(memory.maxmemory, 10) || 0\n        )\n      }\n\n      if (stats.instantaneous_ops_per_sec) {\n        this.redisStatsGauge.set(\n          { ...labels, operation: 'ops_per_sec' },\n          parseInt(stats.instantaneous_ops_per_sec, 10) || 0\n        )\n      }\n    } catch (error) {\n      console.warn(\n        `[queue-metrics] Failed to collect Redis metrics:`,\n        error.message\n      )\n    }\n  }\n\n  /**\n   * Collect metrics for all Redis and push to Prometheus Pushgateway\n   * @returns {Promise<void>}\n   */\n  pushRedisMetrics = async () => {\n    try {\n      await this.collectRedisMetrics()\n      await this.gatewayPush()\n      this.clearAllCounters()\n\n      if (this.metricsLogValues) {\n        const metricObjects = await this.registry.getMetricsAsJSON()\n        console.info(\n          `[queue-metrics] Collected metrics for Redis`,\n          JSON.stringify(metricObjects, null, 2)\n        )\n      }\n    } catch (error) {\n      console.error(\n        `[queue-metrics] Failed to collect Redis metrics: ${error.message}`\n      )\n      throw error\n    }\n  }\n\n  /**\n   * Start periodic collection.\n   * @param {number} [intervalSec=this.intervalSec] - Interval in seconds\n   */\n  startPush = (intervalSec = this.intervalSec) => {\n    this._startPush(intervalSec, () => {\n      this.pushRedisMetrics().catch(err => {\n        console.error(`[queue-metrics] Failed to push Redis metrics:`, err)\n      })\n    })\n  }\n\n  /**\n   * Cleanup Redis client and exit process.\n   * @returns {Promise<void>}\n   */\n  cleanup = async () => {\n    try {\n      if (!this.redisClient) return\n\n      if (\n        this.redisClientType === REDIS_V3 ||\n        this.redisClientType === REDIS_V4\n      ) {\n        await this.redisClient.quit()\n      } else if (this.redisClientType === IOREDIS) {\n        await this.redisClient.disconnect()\n      }\n    } catch (err) {\n      console.error('[queue-metrics] Error closing Redis client:', err)\n    }\n    process.exit(0)\n  }\n\n  _setCleanupHandlers = () => {\n    process.on('SIGINT', this.cleanup)\n    process.on('SIGTERM', this.cleanup)\n  }\n}\n\nmodule.exports = { RedisMetricsClient }\n"],"mappings":"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","ignoreList":[]}
+{"version":3,"file":"metricsRedisClient.js","names":["MetricsClient","require","getRedisClientType","REDIS_V4","IOREDIS","REDIS_V3","redisConnectionStableFields","redisConnectionFields","RedisMetricsClient","constructor","redisClient","metricsConfig","intervalSec","parseInt","process","env","METRICS_QUEUE_INTERVAL_SEC","scripDefaultMetrics","processType","redisClientType","redisConnectionsGauge","createGauge","name","help","labelNames","withDefaultLabels","redisConnectionsMemoryGauge","redisMemoryGauge","redisStatsGauge","_setCleanupHandlers","getRedisConnections","Error","Promise","resolve","reject","send_command","err","result","message","sendCommand","client","getRedisInfo","section","info","parseRedisConnections","clientsStr","split","filter","line","trim","map","parts","forEach","p","k","v","includes","collectRedisMetrics","memoryInfoStr","statsInfoStr","connectionsInfoStr","all","labels","getDefaultLabels","connections","logValues","console","log","length","grouped","conn","flags","totMem","key","JSON","stringify","count","memory","Object","values","valueLabels","set","parseRedisInfo","infoStr","fromEntries","startsWith","stats","used_memory","memory_type","maxmemory","instantaneous_ops_per_sec","operation","error","warn","pushRedisMetrics","gatewayPush","clearAllCounters","metricsLogValues","metricObjects","registry","getMetricsAsJSON","startPush","_startPush","catch","cleanup","quit","disconnect","exit","on","module","exports"],"sources":["../src/metricsRedisClient.js"],"sourcesContent":["const { MetricsClient } = require('.')\nconst {\n  getRedisClientType,\n  REDIS_V4,\n  IOREDIS,\n  REDIS_V3,\n} = require('./redisUtils')\n\nconst redisConnectionStableFields = ['name', 'flags', 'cmd']\nconst redisConnectionFields = ['name', 'flags', 'tot-mem', 'cmd']\n\n/**\n * RedisMetricsClient extends MetricsClient to collect\n * Redis metrics periodically and push them to Prometheus Pushgateway.\n *\n * @extends MetricsClient\n */\nclass RedisMetricsClient extends MetricsClient {\n  /**\n   * @param {Object} options\n   * @param {any} options.redisClient - Redis client instance (required)\n   * @param {string} [options.appName] - Application name (from MetricsClient)\n   * @param {string} [options.dynoId] - Dyno/instance ID (from MetricsClient)\n   * @param {string} [options.processType] - Process type (from MetricsClient)\n   * @param {boolean} [options.enabled] - Enable metrics collection (from MetricsClient)\n   * @param {boolean} [options.logValues] - Log metrics values (from MetricsClient)\n   * @param {string} [options.pushgatewayUrl] - PushGateway URL (from MetricsClient)\n   * @param {string} [options.pushgatewaySecret] - PushGateway secret token (from MetricsClient)\n   * @param {number} [options.intervalSec] - Interval in seconds for pushing metrics (from MetricsClient)\n   * @param {boolean} [options.removeOldMetrics] - Remove old metrics by service (from MetricsClient)\n   * @param {boolean} [options.scripDefaultMetrics] - Skip default metrics creation (from MetricsClient)\n   * @param {function} [options.startupValidation] - Function to validate startup (from MetricsClient)\n   */\n  constructor({ redisClient, ...metricsConfig } = {}) {\n    const intervalSec =\n      metricsConfig.intervalSec ||\n      parseInt(process.env.METRICS_QUEUE_INTERVAL_SEC || '', 10) ||\n      5\n\n    super({\n      ...metricsConfig,\n      scripDefaultMetrics: true,\n      processType: metricsConfig.processType || 'queue-metrics',\n      intervalSec,\n    })\n\n    /** Redis client used for metrics */\n    this.redisClient = redisClient\n    this.redisClientType = getRedisClientType(redisClient)\n\n    /** Counter for Redis client connections */\n    this.redisConnectionsGauge = this.createGauge({\n      name: 'app_redis_connections_count',\n      help: 'Redis client connections',\n      labelNames: this.withDefaultLabels(redisConnectionStableFields),\n    })\n\n    this.redisConnectionsMemoryGauge = this.createGauge({\n      name: 'app_redis_connections_memory_usage_count',\n      help: 'Redis client connections',\n      labelNames: this.withDefaultLabels(redisConnectionStableFields),\n    })\n\n    /** Gauge for Redis memory usage */\n    this.redisMemoryGauge = this.createGauge({\n      name: 'app_redis_memory_bytes',\n      help: 'Redis memory usage in bytes',\n      labelNames: this.withDefaultLabels(['memory_type']),\n    })\n\n    /** Gauge for Redis operation stats */\n    this.redisStatsGauge = this.createGauge({\n      name: 'app_redis_stats_total',\n      help: 'Redis operation statistics',\n      labelNames: this.withDefaultLabels(['operation']),\n    })\n\n    this._setCleanupHandlers()\n  }\n\n  getRedisConnections = async () => {\n    if (!this.redisClient) throw new Error('Redis client not provided')\n\n    // node-redis v3 (uses callback)\n    if (this.redisClientType === REDIS_V3) {\n      return new Promise((resolve, reject) => {\n        this.redisClient.send_command('CLIENT', ['LIST'], (err, result) => {\n          if (err) {\n            reject(new Error(`Failed to get CLIENT LIST: ${err.message}`))\n          } else resolve(result)\n        })\n      })\n    }\n\n    // node-redis v4\n    if (this.redisClientType === REDIS_V4) {\n      try {\n        return this.redisClient.sendCommand(['CLIENT', 'LIST'])\n      } catch (err) {\n        throw new Error(`Failed to get CLIENT LIST: ${err.message}`)\n      }\n    }\n\n    if (this.redisClientType === IOREDIS) {\n      try {\n        return this.redisClient.client('LIST')\n      } catch (err) {\n        throw new Error(`Failed to get CLIENT LIST: ${err.message}`)\n      }\n    }\n\n    throw new Error('Unsupported Redis client type')\n  }\n\n  getRedisInfo = async section => {\n    if (!this.redisClient) throw new Error('Redis client not provided')\n\n    // node-redis v3 (uses callback)\n    if (this.redisClientType === REDIS_V3) {\n      return new Promise((resolve, reject) => {\n        this.redisClient.info(section, (err, result) => {\n          if (err) reject(err)\n          else resolve(result)\n        })\n      })\n    }\n\n    // node-redis v4 or ioredis (info returns Promise)\n    if (this.redisClientType === REDIS_V4 || this.redisClientType === IOREDIS) {\n      try {\n        return this.redisClient.info(section)\n      } catch (err) {\n        throw new Error(`Failed to get Redis INFO: ${err.message}`)\n      }\n    }\n\n    throw new Error('Unsupported Redis client type')\n  }\n\n  parseRedisConnections = clientsStr => {\n    return clientsStr\n      .split('\\n')\n      .filter(line => line.trim() !== '')\n      .map(line => {\n        const parts = line.split(' ')\n        const client = {}\n        parts.forEach(p => {\n          const [k, v] = p.split('=')\n          if (redisConnectionFields.includes(k)) {\n            client[k] = v\n          }\n        })\n        return client\n      })\n  }\n\n  /**\n   * Collect basic Redis INFO metrics: clients, memory, stats\n   * @returns {Promise<void>}\n   */\n  collectRedisMetrics = async () => {\n    try {\n      const [memoryInfoStr, statsInfoStr, connectionsInfoStr] =\n        await Promise.all([\n          this.getRedisInfo('memory'),\n          this.getRedisInfo('stats'),\n          this.getRedisConnections(),\n        ])\n\n      const labels = this.getDefaultLabels()\n\n      const connections = this.parseRedisConnections(connectionsInfoStr)\n\n      if (this.logValues) {\n        console.log('Redis connections: ', connectionsInfoStr)\n        console.log('Redis connections count: ', connections.length)\n      }\n\n      const grouped = {}\n      connections.forEach(conn => {\n        const { name, flags, 'tot-mem': totMem } = conn\n\n        // build grouping key (includes default gauge labels later)\n        const key = JSON.stringify({ name, flags })\n\n        if (!grouped[key]) {\n          grouped[key] = {\n            labels: { name, flags },\n            count: 0,\n            memory: 0,\n          }\n        }\n\n        grouped[key].count += 1\n        grouped[key].memory += parseInt(totMem, 10)\n      })\n\n      Object.values(grouped).forEach(\n        ({ labels: valueLabels, count, memory }) => {\n          this.redisConnectionsGauge.set({ ...labels, ...valueLabels }, count)\n          this.redisConnectionsMemoryGauge.set(\n            { ...labels, ...valueLabels },\n            memory\n          )\n        }\n      )\n\n      const parseRedisInfo = infoStr =>\n        Object.fromEntries(\n          infoStr\n            .split('\\r\\n')\n            .filter(line => line && !line.startsWith('#'))\n            .map(line => line.split(':', 2))\n            .filter(parts => parts.length === 2 && parts[0] && parts[1])\n        )\n\n      const memory = parseRedisInfo(memoryInfoStr)\n      const stats = parseRedisInfo(statsInfoStr)\n\n      if (memory.used_memory) {\n        this.redisMemoryGauge.set(\n          { ...labels, memory_type: 'used' },\n          parseInt(memory.used_memory, 10) || 0\n        )\n      }\n      if (memory.maxmemory) {\n        this.redisMemoryGauge.set(\n          { ...labels, memory_type: 'max' },\n          parseInt(memory.maxmemory, 10) || 0\n        )\n      }\n\n      if (stats.instantaneous_ops_per_sec) {\n        this.redisStatsGauge.set(\n          { ...labels, operation: 'ops_per_sec' },\n          parseInt(stats.instantaneous_ops_per_sec, 10) || 0\n        )\n      }\n    } catch (error) {\n      console.warn(\n        `[queue-metrics] Failed to collect Redis metrics:`,\n        error.message\n      )\n    }\n  }\n\n  /**\n   * Collect metrics for all Redis and push to Prometheus Pushgateway\n   * @returns {Promise<void>}\n   */\n  pushRedisMetrics = async () => {\n    try {\n      await this.collectRedisMetrics()\n      await this.gatewayPush()\n      this.clearAllCounters()\n\n      if (this.metricsLogValues) {\n        const metricObjects = await this.registry.getMetricsAsJSON()\n        console.info(\n          `[queue-metrics] Collected metrics for Redis`,\n          JSON.stringify(metricObjects, null, 2)\n        )\n      }\n    } catch (error) {\n      console.error(\n        `[queue-metrics] Failed to collect Redis metrics: ${error.message}`\n      )\n      throw error\n    }\n  }\n\n  /**\n   * Start periodic collection.\n   * @param {number} [intervalSec=this.intervalSec] - Interval in seconds\n   */\n  startPush = (intervalSec = this.intervalSec) => {\n    this._startPush(intervalSec, () => {\n      this.pushRedisMetrics().catch(err => {\n        console.error(`[queue-metrics] Failed to push Redis metrics:`, err)\n      })\n    })\n  }\n\n  /**\n   * Cleanup Redis client and exit process.\n   * @returns {Promise<void>}\n   */\n  cleanup = async () => {\n    try {\n      if (!this.redisClient) return\n\n      if (\n        this.redisClientType === REDIS_V3 ||\n        this.redisClientType === REDIS_V4\n      ) {\n        await this.redisClient.quit()\n      } else if (this.redisClientType === IOREDIS) {\n        await this.redisClient.disconnect()\n      }\n    } catch (err) {\n      console.error('[queue-metrics] Error closing Redis client:', err)\n    }\n    process.exit(0)\n  }\n\n  _setCleanupHandlers = () => {\n    process.on('SIGINT', this.cleanup)\n    process.on('SIGTERM', this.cleanup)\n  }\n}\n\nmodule.exports = { RedisMetricsClient }\n"],"mappings":"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","ignoreList":[]}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@adalo/metrics",
-  "version": "0.1.110",
+  "version": "0.1.111",
   "description": "Reusable metrics utilities for Node.js and Laravel apps",
   "main": "lib/index.js",
   "types": "lib/index.d.ts",

package/src/metricsRedisClient.js

@@ -6,8 +6,8 @@ const {
   REDIS_V3,
 } = require('./redisUtils')
 
-const redisConnectionStableFields = ['name', 'flags']
-const redisConnectionFields = ['name', 'flags', 'tot-mem']
+const redisConnectionStableFields = ['name', 'flags', 'cmd']
+const redisConnectionFields = ['name', 'flags', 'tot-mem', 'cmd']
 
 /**
  * RedisMetricsClient extends MetricsClient to collect