Merge branch 'feature/ZENKO-925-increaseMetricsExpiry' into q/8.0

scality · Aug 9, 2018 · 2417105 · 2417105
2 parents d9694a9 + 7a47236
commit 2417105
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 5 deletions.
diff --git a/lib/utilities/reportHandler.js b/lib/utilities/reportHandler.js
@@ -11,6 +11,7 @@ const metadata = require('../metadata/wrapper');
 const monitoring = require('../utilities/monitoringHandler');
 
 const REPORT_MODEL_VERSION = 1;
+const CRR_METRIC_EXPIRY = 86400;
 
 function hasWSOptionalDependencies() {
     try {
@@ -148,7 +149,7 @@ function getCRRStats(log, cb, _config) {
     const backbeatMetrics = new backbeat.Metrics({
         redisConfig: redis,
         validSites: sites,
-        internalStart: Date.now() - 900000, // 15 minutes ago.
+        internalStart: Date.now() - (CRR_METRIC_EXPIRY * 1000), // 24 hours ago
     }, log);
     const redisKeys = {
         ops: 'bb:crr:ops',

diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -19,7 +19,7 @@
   },
   "homepage": "https://github.com/scality/S3#readme",
   "dependencies": {
-    "arsenal": "github:scality/Arsenal#db743f8",
+    "arsenal": "github:scality/Arsenal#06dfdd9",
     "async": "~2.5.0",
     "aws-sdk": "2.28.0",
     "azure-storage": "^2.1.0",

diff --git a/tests/functional/utilities/reportHandler.js b/tests/functional/utilities/reportHandler.js
@@ -55,6 +55,7 @@ const testCRRKeys = [
 ];
 
 const INTERVAL = 300;
+const CRR_METRIC_EXPIRY = 86400;
 
 function _normalizeTimestamp(d) {
     const m = d.getMinutes();
@@ -114,7 +115,7 @@ describe('reportHandler::_crrRequest', function testSuite() {
             backbeatMetrics = new backbeat.Metrics({
                 redisConfig: config.redis,
                 validSites: sites,
-                internalStart: Date.now() - 900000,
+                internalStart: Date.now() - (CRR_METRIC_EXPIRY * 1000),
             }, logger);
             return done();
         });