From 57d8d46108869d12871440c734fdfdfe7074c546 Mon Sep 17 00:00:00 2001
From: Dave Kelsey <25582377+davidkel@users.noreply.github.com>
Date: Fri, 15 Apr 2022 14:18:18 +0100
Subject: [PATCH] Change monitor intervals from milliseconds to seconds (#1314)

For the fabric tests the monitor intervals were set to single
millisecond values such as 3, 4, 5. This adds a massive overhead to the
running of the integration tests and isn't needed, so changing them to
be seconds instead.

Signed-off-by: D <d_kelsey@uk.ibm.com>

Co-authored-by: D <d_kelsey@uk.ibm.com>
---
 .../fabric_tests/phase2/benchconfig.yaml                  | 2 +-
 .../fabric_tests/phase3/benchconfig.yaml                  | 4 ++--
 .../fabric_tests/phase4/benchconfig.yaml                  | 4 ++--
 .../fabric_tests/phase5/benchconfig.yaml                  | 8 ++++----
 .../fabric_tests/phase6/benchconfig.yaml                  | 4 ++--
 .../fabric_tests/phase7/benchconfig.yaml                  | 8 ++++----
 6 files changed, 15 insertions(+), 15 deletions(-)

diff --git a/packages/caliper-tests-integration/fabric_tests/phase2/benchconfig.yaml b/packages/caliper-tests-integration/fabric_tests/phase2/benchconfig.yaml
index 997a6926d..56536aabe 100644
--- a/packages/caliper-tests-integration/fabric_tests/phase2/benchconfig.yaml
+++ b/packages/caliper-tests-integration/fabric_tests/phase2/benchconfig.yaml
@@ -37,5 +37,5 @@ monitors:
     resource:
     - module: process
       options:
-        interval: 3
+        interval: 3000
         processes: [{ command: 'node', arguments: 'caliper.js', multiOutput: 'avg' }]
diff --git a/packages/caliper-tests-integration/fabric_tests/phase3/benchconfig.yaml b/packages/caliper-tests-integration/fabric_tests/phase3/benchconfig.yaml
index 5fbaab022..037b6fe71 100644
--- a/packages/caliper-tests-integration/fabric_tests/phase3/benchconfig.yaml
+++ b/packages/caliper-tests-integration/fabric_tests/phase3/benchconfig.yaml
@@ -37,9 +37,9 @@ monitors:
     resource:
     - module: process
       options:
-        interval: 3
+        interval: 3000
         processes: [{ command: 'node', arguments: 'caliper.js', multiOutput: 'avg' }]
     - module: docker
       options:
-        interval: 4
+        interval: 4000
         containers: ['peer0.org1.example.com', 'peer0.org2.example.com', 'orderer0.example.com', 'orderer1.example.com']
diff --git a/packages/caliper-tests-integration/fabric_tests/phase4/benchconfig.yaml b/packages/caliper-tests-integration/fabric_tests/phase4/benchconfig.yaml
index 406d14589..7be8d7ef4 100644
--- a/packages/caliper-tests-integration/fabric_tests/phase4/benchconfig.yaml
+++ b/packages/caliper-tests-integration/fabric_tests/phase4/benchconfig.yaml
@@ -51,12 +51,12 @@ monitors:
         messageLevel: info
     - module: prometheus-push
       options:
-        pushInterval: 5
+        pushInterval: 5000
         pushUrl: "http://localhost:9091"
     resource:
     - module: prometheus
       options:
-        interval: 5
+        interval: 5000
         url: "http://localhost:9090"
         metrics:
             include: [peer*, dev*]
diff --git a/packages/caliper-tests-integration/fabric_tests/phase5/benchconfig.yaml b/packages/caliper-tests-integration/fabric_tests/phase5/benchconfig.yaml
index 676ae26a0..fffd15676 100644
--- a/packages/caliper-tests-integration/fabric_tests/phase5/benchconfig.yaml
+++ b/packages/caliper-tests-integration/fabric_tests/phase5/benchconfig.yaml
@@ -43,12 +43,12 @@ monitors:
     transaction:
     - module: prometheus-push
       options:
-        pushInterval: 5
+        pushInterval: 5000
         pushUrl: "http://localhost:9091"
     resource:
     - module: prometheus
       options:
-        interval: 5
+        interval: 5000
         url: "http://localhost:9090"
         metrics:
             include: [peer*, dev*]
@@ -71,9 +71,9 @@ monitors:
                 metrics: [all]
     - module: process
       options:
-        interval: 3
+        interval: 3000
         processes: [{ command: 'node', arguments: 'caliper.js', multiOutput: 'avg' }]
     - module: docker
       options:
-        interval: 4
+        interval: 4000
         containers: ['peer0.org1.example.com', 'peer0.org2.example.com', 'orderer0.example.com', 'orderer1.example.com']
diff --git a/packages/caliper-tests-integration/fabric_tests/phase6/benchconfig.yaml b/packages/caliper-tests-integration/fabric_tests/phase6/benchconfig.yaml
index a284bdf56..bd98e3f07 100644
--- a/packages/caliper-tests-integration/fabric_tests/phase6/benchconfig.yaml
+++ b/packages/caliper-tests-integration/fabric_tests/phase6/benchconfig.yaml
@@ -46,12 +46,12 @@ monitors:
     transaction:
     - module: prometheus-push
       options:
-        pushInterval: 5
+        pushInterval: 5000
         pushUrl: "http://localhost:9091"
     resource:
     - module: prometheus
       options:
-        interval: 5
+        interval: 5000
         url: "http://localhost:9090"
         metrics:
             include: [peer*, dev*]
diff --git a/packages/caliper-tests-integration/fabric_tests/phase7/benchconfig.yaml b/packages/caliper-tests-integration/fabric_tests/phase7/benchconfig.yaml
index 9f40d3b92..ff98bedd3 100644
--- a/packages/caliper-tests-integration/fabric_tests/phase7/benchconfig.yaml
+++ b/packages/caliper-tests-integration/fabric_tests/phase7/benchconfig.yaml
@@ -46,12 +46,12 @@ monitors:
     transaction:
     - module: prometheus-push
       options:
-        pushInterval: 5
+        pushInterval: 5000
         pushUrl: "http://localhost:9091"
     resource:
     - module: prometheus
       options:
-        interval: 5
+        interval: 5000
         url: "http://localhost:9090"
         metrics:
             include: [peer*, dev*]
@@ -74,10 +74,10 @@ monitors:
                 metrics: [all]
     - module: process
       options:
-        interval: 3
+        interval: 3000
         processes: [{ command: 'node', arguments: 'caliper.js', multiOutput: 'avg' }]
     - module: docker
       options:
-        interval: 4
+        interval: 4000
         containers: ['peer0.org1.example.com', 'peer0.org2.example.com', 'orderer0.example.com', 'orderer1.example.com']