Merge branch 'master' into m.fix_missing_netstat

Dockerfile

@@ -35,7 +35,10 @@ RUN $APT_UPDATE && $APT_INSTALL \
 RUN locale-gen "en_US.UTF-8" && update-locale LANG=en_US.UTF-8 LC_ALL=en_US.UTF-8
 
 # Force cgi version to fix CVE-2021-41816
-RUN gem install rspec rake selenium-webdriver cgi:0.1.1 && gem update bundler date && gem cleanup
+RUN gem install rspec rake selenium-webdriver cgi:0.1.1 && gem update bundler date && gem cleanup \
+    && rm /usr/lib/ruby/gems/2.7.0/specifications/default/cgi-0.1.0.gemspec \
+    && rm /usr/lib/ruby/gems/2.7.0/specifications/default/bundler-2.1.4.gemspec \
+    && rm /usr/lib/ruby/gems/2.7.0/specifications/default/date-3.0.0.gemspec
 
 # Get Google Chrome
 RUN $APT_INSTALL ./google-chrome-stable_current_amd64.deb \
@@ -53,12 +56,6 @@ RUN apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys C5AD17C747
    && $APT_UPDATE \
    && $APT_INSTALL k6
 
-# Install Vegeta
-ENV VEGETA_VERSION 12.8.4
-RUN wget -q "https://github.com/tsenart/vegeta/releases/download/v${VEGETA_VERSION}/vegeta_${VEGETA_VERSION}_linux_amd64.tar.gz" -O /tmp/vegeta.tar.gz \
- && tar xzf /tmp/vegeta.tar.gz -C /bin \
- && rm /tmp/vegeta.tar.gz
-
 # auto installable tools
 RUN mkdir -p /etc/bzt.d \
   && echo '{"install-id": "Docker"}' > /etc/bzt.d/99-zinstallID.json \

bzt/modules/external.py

@@ -9,7 +9,6 @@
 from bzt.modules.aggregator import AggregatorListener, ConsolidatingAggregator, DataPoint
 from bzt.modules.gatling import DataLogReader as GatlingLogReader
 from bzt.modules.jmeter import JTLReader, XMLJTLReader
-from bzt.modules.vegeta import VegetaLogReader
 from bzt.utils import dehumanize_time
 
 
@@ -109,9 +108,6 @@ def _get_reader(self):
             return GatlingLogReader(self.data_file, self.log, None)
         elif "timestamp" in header.lower() and "elapsed" in header.lower():
             return JTLReader(self.data_file, self.log, self.errors_file)
-        elif re.match("^[0-9]{19},", header):
-            # Vegeta CSV does not have a header, every line starts with a timestamp in nanoseconds
-            return VegetaLogReader(self.data_file, self.log)
         else:
             self.log.info("Header line was: %s", header)
             raise TaurusInternalException("Unable to detect results format for: %s" % self.data_file)

bzt/modules/jmeter.py

@@ -1582,18 +1582,19 @@ def _get_jar_fixes(self, lib_dir):
         affected_components = {
             # Needs to be <1.4.18 for old Jmeters https://stackoverflow.com/questions/30812293/com-thoughtworks-xstream-security-forbiddenclassexception
             "xstream": "com/thoughtworks/xstream/xstream/1.4.19/xstream-1.4.19.jar",
-            "jackson-annotations": "com/fasterxml/jackson/core/jackson-annotations/2.13.3/jackson-annotations-2.13.3.jar",
-            "jackson-core": "com/fasterxml/jackson/core/jackson-core/2.13.3/jackson-core-2.13.3.jar",
-            "jackson-databind": "com/fasterxml/jackson/core/jackson-databind/2.13.3/jackson-databind-2.13.3.jar",
+            "jackson-annotations": "com/fasterxml/jackson/core/jackson-annotations/2.13.4/jackson-annotations-2.13.4.jar",
+            "jackson-core": "com/fasterxml/jackson/core/jackson-core/2.13.4/jackson-core-2.13.4.jar",
+            "jackson-databind": "com/fasterxml/jackson/core/jackson-databind/2.13.4.2/jackson-databind-2.13.4.2.jar",
             "json-smart": "net/minidev/json-smart/2.4.8/json-smart-2.4.8.jar",
             "jsoup": "org/jsoup/jsoup/1.15.3/jsoup-1.15.3.jar",
-            "snakeyaml": "org/yaml/snakeyaml/1.31/snakeyaml-1.31.jar",
-            "okhttp" : "com/squareup/okhttp3/okhttp/4.10.0/okhttp-4.10.0.jar",
+            "snakeyaml": "org/yaml/snakeyaml/1.33/snakeyaml-1.33.jar",
+            "okhttp": "com/squareup/okhttp3/okhttp/4.10.0/okhttp-4.10.0.jar",
+            "commons-text": "org/apache/commons/commons-text/1.10.0/commons-text-1.10.0.jar",
             "xmlgraphics-commons": "org/apache/xmlgraphics/xmlgraphics-commons/2.7/xmlgraphics-commons-2.7.jar"}
 
         if LooseVersion(self.version) <= LooseVersion('5.4.2'):  # log4j must be fixed till jmeter 5.4.2
             affected_names = ["log4j-core", "log4j-api", "log4j-slf4j-impl", "log4j-1.2-api"]
-            fixed_version = '2.17.2'
+            fixed_version = '2.19.0'
             maven_link = "org/apache/logging/log4j/{name}/{ver}/{name}-{ver}.jar"
 
             for name in affected_names:

bzt/resources/10-base-config.yml

@@ -21,8 +21,6 @@ modules:
     class: bzt.modules.tsung.TsungExecutor
   k6:
     class: bzt.modules.k6.K6Executor
-  vegeta:
-    class: bzt.modules.vegeta.VegetaExecutor
 
   # selenium & functional executors
   selenium:

examples/all-executors.yml

@@ -154,12 +154,6 @@ execution:
   iterations: 10
   scenario:
     script: k6/k6_example.js
-
-- executor: vegeta  # https://blazedemo.com/?tool=Vegeta
-  throughput: 1
-  hold-for: 10s
-  scenario:
-    script: vegeta/vegeta.in
 ---
 # all of load-style executors
 execution:

site/dat/docs/Changelog.md

@@ -1,8 +1,15 @@
 # Changelog
 
-## 1.16.15<sup> ?? September 2022</sup>
+## 1.16.18<sup> 7 November 2022</sup>
+- Removing Vegeta test executor as it's not maintained for 2+ years
 - Added net-tools to Dockerfile to fix startup loop finding `netstat` command
 
+## 1.16.17<sup> 1 November 2022</sup>
+- Vulnerability fixes
+
+## 1.16.15<sup> 19 October 2022</sup>
+- Fixes for pass-fail validation
+
 ## 1.16.14<sup> 13 September 2022</sup>
 - Fixes for VU calculation
 
@@ -43,4 +50,4 @@
 - update remote browser logic and capabilities
 - migrate to apiritif 1.1.1
 
-[Changelog for Year 2021](Changelog2021.md)
+[Changelog for Year 2021](Changelog2021.md)

site/dat/docs/ExecutionSettings.md

@@ -47,7 +47,6 @@ Taurus tool may use different underlying tools as executors for scenarios. Curre
   - [Robot](Robot.md), executor type `robot`
   - [Postman/Newman](Postman.md), executor type `newman`
   - [K6](K6.md), executor type `k6`
-  - [Vegeta](Vegeta.md), executor type `Vegeta`
 
 Default executor is `jmeter` and can be changed under [general settings](ConfigSyntax.md#Top-Level-Settings) section.
 ```yaml

site/dat/docs/Index.md

@@ -27,7 +27,6 @@
     1. [Siege Executor](Siege.md)
     1. [TestNG Executor](TestNG.md)
     1. [Tsung Executor](Tsung.md)
-    1. [Vegeta Executor](Vegeta.md)
     1. [WebdriverIO Executor](WebdriverIO.md)
     1. [xUnit Executor](XUnit.md)
  1. [Cloud Provisioned Test Execution](Cloud.md)

site/dat/docs/ResultsLoader.md

@@ -23,7 +23,6 @@ List of supported file formats:
 - `kpi.jtl`/`error.jtl` (JMeter CSV & XML files)
 - `simulation.log` (Gatling)
 - TSV files (Apache Benchmark)
-- Headerless CSV files (Vegeta)
 
 You can put `data-file`, and `errors-file` under scenario definition also, and point execution item onto corresponding scenario. If file is defined in both scenario and execution blocks, execution will have higher priority.