From da99385c418e2b95c54681ccfee84e0a3cc2d778 Mon Sep 17 00:00:00 2001 From: Dave Kelsey <25582377+davidkel@users.noreply.github.com> Date: Wed, 27 Apr 2022 12:33:21 +0100 Subject: [PATCH] correct interval usage in fabric-tests (#1323) Signed-off-by: D --- .../fabric_tests/phase2/benchconfig.yaml | 2 +- .../fabric_tests/phase3/benchconfig.yaml | 4 ++-- .../fabric_tests/phase4/benchconfig.yaml | 1 - .../fabric_tests/phase5/benchconfig.yaml | 5 ++--- .../fabric_tests/phase6/benchconfig.yaml | 1 - .../fabric_tests/phase7/benchconfig.yaml | 5 ++--- 6 files changed, 7 insertions(+), 11 deletions(-) diff --git a/packages/caliper-tests-integration/fabric_tests/phase2/benchconfig.yaml b/packages/caliper-tests-integration/fabric_tests/phase2/benchconfig.yaml index 56536aabe..997a6926d 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: 3000 + interval: 3 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 037b6fe71..5fbaab022 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: 3000 + interval: 3 processes: [{ command: 'node', arguments: 'caliper.js', multiOutput: 'avg' }] - module: docker options: - interval: 4000 + interval: 4 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 7be8d7ef4..0828985b4 100644 --- a/packages/caliper-tests-integration/fabric_tests/phase4/benchconfig.yaml +++ b/packages/caliper-tests-integration/fabric_tests/phase4/benchconfig.yaml @@ -56,7 +56,6 @@ monitors: resource: - module: prometheus options: - 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 fffd15676..f93c65dc2 100644 --- a/packages/caliper-tests-integration/fabric_tests/phase5/benchconfig.yaml +++ b/packages/caliper-tests-integration/fabric_tests/phase5/benchconfig.yaml @@ -48,7 +48,6 @@ monitors: resource: - module: prometheus options: - interval: 5000 url: "http://localhost:9090" metrics: include: [peer*, dev*] @@ -71,9 +70,9 @@ monitors: metrics: [all] - module: process options: - interval: 3000 + interval: 3 processes: [{ command: 'node', arguments: 'caliper.js', multiOutput: 'avg' }] - module: docker options: - interval: 4000 + interval: 4 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 bd98e3f07..1babb8776 100644 --- a/packages/caliper-tests-integration/fabric_tests/phase6/benchconfig.yaml +++ b/packages/caliper-tests-integration/fabric_tests/phase6/benchconfig.yaml @@ -51,7 +51,6 @@ monitors: resource: - module: prometheus options: - 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 ff98bedd3..cc1875a05 100644 --- a/packages/caliper-tests-integration/fabric_tests/phase7/benchconfig.yaml +++ b/packages/caliper-tests-integration/fabric_tests/phase7/benchconfig.yaml @@ -51,7 +51,6 @@ monitors: resource: - module: prometheus options: - interval: 5000 url: "http://localhost:9090" metrics: include: [peer*, dev*] @@ -74,10 +73,10 @@ monitors: metrics: [all] - module: process options: - interval: 3000 + interval: 3 processes: [{ command: 'node', arguments: 'caliper.js', multiOutput: 'avg' }] - module: docker options: - interval: 4000 + interval: 4 containers: ['peer0.org1.example.com', 'peer0.org2.example.com', 'orderer0.example.com', 'orderer1.example.com']