wippp

utils/S3UtilsMongoClient.js

@@ -5,6 +5,7 @@ const { errors, constants } = require('arsenal');
 const async = require('async');
 const { validStorageMetricLevels } = require('../CountItems/utils/constants');
 const getLocationConfig = require('./locationConfig');
+const monitoring = require('../utils/monitoring');
 
 const METASTORE = '__metastore';
 const INFOSTORE = '__infostore';
@@ -150,6 +151,7 @@ class S3UtilsMongoClient extends MongoClientInterface {
                             entry: res,
                             error,
                         });
+                        monitoring.objectsCount.inc({ state: 'error' });
                         return;
                     }
 
@@ -159,6 +161,7 @@ class S3UtilsMongoClient extends MongoClientInterface {
                             method: 'getObjectMDStats',
                             entry: res,
                         });
+                        monitoring.objectsCount.inc({ state: 'skipped' });
                         return;
                     }
 
@@ -231,6 +234,7 @@ class S3UtilsMongoClient extends MongoClientInterface {
                             collRes.account[account].locations[location].deleteMarkerCount += res.value.isDeleteMarker ? 1 : 0;
                         });
                     });
+                    monitoring.objectsCount.inc({ state: 'success' });
                     processed++;
                 },
                 err => {

utils/monitoring.js

@@ -12,14 +12,16 @@ const bucketCount = new promClient.Gauge({
 
 // Histogram of the bucket processing duration, by the utilization service.
 
-const bucketProcessingDuration = new promClient.Histogram({
+const bucketProcessingDuration = (promClient.register.getSingleMetric('count_items_workersCountErrors')) 
+    || new promClient.Histogram({
     name: 'count_items_bucketProcessingDuration',
     help: 'Duration of processing a bucket',
     labelNames: ['service'],
     buckets: [1, 10, 60, 600, 3600, 18000, 36000],
 });
 
-const consolidationDuration = new promClient.Histogram({
+const consolidationDuration = (promClient.register.getSingleMetric('count_items_workersCountErrors')) 
+    || new promClient.Histogram({
     name: 'count_items_consolidationDuration',
     help: 'Duration of metrics consolidation in seconds',
     labelNames: ['service'],
@@ -33,6 +35,12 @@ const workersCount = (promClient.register.getSingleMetric('count_items_workersCo
         labelNames: ['state'],
     });
 
+const objectsCount = (promClient.register.getSingleMetric('count_items_objectsCount')) 
+    || new promClient.Counter({
+        name: 'count_items_objectsCount',
+        help: 'Number of objects',
+        labelNames: ['state'],
+    });
 /**
  * @param {http.ServerResponse} res - http response object
  * @param {errors.ArsenalError} error - Error code
@@ -81,4 +89,5 @@ module.exports = {
     bucketProcessingDuration,
     consolidationDuration,
     workersCount,
+    objectsCount,
 };