Modify prometheus push gateway to match scrape model (hyperledger-cal…

…iper#966)

Signed-off-by: [email protected] <[email protected]>

packages/caliper-core/lib/common/config/Config.js

@@ -21,6 +21,12 @@ const nconf = require('nconf');
 nconf.formats.yaml = require('nconf-yaml');
 
 const keys = {
+    Auth: {
+        PrometheusPush: {
+            UserName: 'caliper-auth-prometheuspush-username',
+            Password: 'caliper-auth-prometheuspush-password'
+        }
+    },
     Bind: {
         Sut: 'caliper-bind-sut',
         Args: 'caliper-bind-args',

packages/caliper-core/lib/common/config/default.yaml

@@ -13,6 +13,14 @@
 #
 
 caliper:
+    # Settings related to the authorization
+    auth:
+        # Prometheus Push Gateway
+        prometheuspush:
+            # username
+            username:
+            # password
+            password:
     # Settings related to the binding command
     bind:
         # The binding specification of the SUT in the <SUT type>:<SDK version> format
@@ -61,7 +69,7 @@ caliper:
     # Configurations related to caliper test monitors
     monitor:
         # Default update interval
-        defaultinterval: 5000
+        defaultinterval: 10000
         # Default scrape port for prometheus tx observer
         prometheusscrapeport: 3000
     # Configurations related to the logging mechanism

packages/caliper-core/lib/common/utils/caliper-utils.js

@@ -14,13 +14,15 @@
 
 'use strict';
 
+const loggingUtil = require('./logging-util.js');
+const Config = require('../config/config-util');
+
 const {exec, spawn} = require('child_process');
-const path = require('path');
-require('winston-daily-rotate-file');
 const fs = require('fs');
+const path = require('path');
 const yaml = require('js-yaml');
-const loggingUtil = require('./logging-util.js');
-const Config = require('../config/config-util');
+const url = require('url');
+require('winston-daily-rotate-file');
 
 const BuiltinConnectors = new Map([
     ['burrow', '@hyperledger/caliper-burrow'],
@@ -588,6 +590,25 @@ class CaliperUtils {
         return value / 1000;
     }
 
+    /**
+     * Augment the passed URL with basic auth if the settings are present
+     * @param {string} urlPath the URL to augment
+     * @param {string} component the component being augmented
+     * @returns {string} the URL to be used, which may have been augmented with basic auth
+     */
+    static augmentUrlWithBasicAuth(urlPath, component) {
+        const username = Config.get(Config.keys.Auth[component].UserName, undefined);
+        const password = Config.get(Config.keys.Auth[component].Password, undefined);
+        if (username && password) {
+            const myURL = new url.URL(urlPath);
+            myURL.username = username;
+            myURL.password = password;
+            return url.format(myURL);
+        } else {
+            return urlPath;
+        }
+    }
+
 }
 
 module.exports = CaliperUtils;

packages/caliper-core/lib/common/utils/constants.js

@@ -46,5 +46,8 @@ module.exports = {
             TxsSubmitted: 'txsSubmitted',
             TxsFinished: 'txsFinished'
         }
+    },
+    AuthComponents: {
+        PushGateway: 'PrometheusPush'
     }
 };