JMeter 5.0, Pepper-Box for Kafka testing, misc fixes

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

Author: double16

Diff for: .gitignore

@@ -1 +1 @@
-.tenant_export
+tenant_export

Diff for: Docker files

@@ -32,7 +32,7 @@ First of all the jmeter base image needs to be created from the opend-jdk image,
 
 ============Build, tag and push the base image============
 
-		docker build --tag="kubernautslabs/jmeter-base:latest"
+		docker build --tag="kubernautslabs/jmeter-base:latest" -f Dockerfile-base .
 		docker push kubernautslabs/jmeter-base:latest
 
 
@@ -45,7 +45,7 @@ First of all the jmeter base image needs to be created from the opend-jdk image,
 
 ============Build, tag and push the master image============
 
-		docker build --tag="kubernautslabs/jmeter-master:latest" 
+		docker build --tag="kubernautslabs/jmeter-master:latest" -f Dockerfile-master .
 		docker push kubernautslabs/jmeter-master:latest
 
 ================JMETER-SLAVES DOCKER FILE=====================
@@ -60,7 +60,12 @@ First of all the jmeter base image needs to be created from the opend-jdk image,
 		-Dserver_port=1099
 
 
-============Build, tag and push the salve image:================
+============Build, tag and push the slave image:================
 
-		docker build --tag="kubernautslabs/jmeter-slave:latest" 
+		docker build --tag="kubernautslabs/jmeter-slave:latest" -f Dockerfile-slave .
 		docker push kubernautslabs/jmeter-slave:latest
+
+================JMETER-REPORTER DOCKER FILE=====================
+
+		docker build --tag="kubernautslabs/jmeter-reporter" -f Dockerfile-reporter .
+		docker push kubernautslabs/jmeter-reporter

Diff for: Dockerfile-base

@@ -1,7 +1,7 @@
-FROM openjdk:8-jre-slim
+FROM openjdk:8-jdk-slim
 MAINTAINER Kubernauts-lab
 
-ARG JMETER_VERSION=3.3
+ARG JMETER_VERSION=5.0
 
 RUN apt-get clean && \
 apt-get update && \
@@ -15,10 +15,14 @@ RUN   mkdir /jmeter \
 && wget https://archive.apache.org/dist/jmeter/binaries/apache-jmeter-$JMETER_VERSION.tgz \
 && tar -xzf apache-jmeter-$JMETER_VERSION.tgz \
 && rm apache-jmeter-$JMETER_VERSION.tgz
-		
-		
-ADD jmeter-plugins/lib /jmeter/apache-jmeter-$JMETER_VERSION/lib
-		
+
+ADD https://github.com/raladev/load/blob/master/JARs/pepper-box-1.0.jar?raw=true /jmeter/apache-jmeter-$JMETER_VERSION/lib/ext/pepper-box-1.0.jar
+
+RUN cd /jmeter/apache-jmeter-$JMETER_VERSION/ && wget -q -O /tmp/bzm-parallel-0.7.zip https://jmeter-plugins.org/files/packages/bzm-parallel-0.7.zip && unzip -n /tmp/bzm-parallel-0.7.zip && rm /tmp/bzm-parallel-0.7.zip
+
+COPY plugins/JMeterPlugins-Standard-1.4.0.zip /tmp/
+RUN cd /jmeter/apache-jmeter-$JMETER_VERSION/ && unzip -n /tmp/JMeterPlugins-Standard-1.4.0.zip && rm /tmp/JMeterPlugins-Standard-1.4.0.zip
+
 ENV JMETER_HOME /jmeter/apache-jmeter-$JMETER_VERSION/
 
 ENV PATH $JMETER_HOME/bin:$PATH

Diff for: Dockerfile-reporter

@@ -1,23 +1,22 @@
 # build
 FROM golang:1.8-stretch AS build
 WORKDIR /go/src/${owner:-github.com/IzakMarais}/reporter
-RUN apt-get update && apt-get install make git
-ADD . .
+RUN apt-get update && apt-get install -y make git
+RUN git clone https://${owner:-github.com/IzakMarais}/reporter .
 RUN make build
 
 # create image
 FROM debian:stretch
-COPY util/texlive.profile /
 RUN PACKAGES="wget libswitch-perl" \
     && apt-get update \
-    && apt-get install -qq $PACKAGES --no-install-recommends \
+    && apt-get install -y -qq $PACKAGES --no-install-recommends \
     && wget -qO- http://mirror.ctan.org/systems/texlive/tlnet/install-tl-unx.tar.gz |tar xz \
     && cd install-tl-* \
     && ./install-tl -profile /texlive.profile \
     # Cleanup
     && rm -rf install-tl-* \
-    && apt-get remove --purge -qq $PACKAGES \
-    && apt-get autoremove --purge -qq \
+    && apt-get remove --purge -y -qq $PACKAGES \
+    && apt-get autoremove --purge -y -qq \
     && rm -rf /var/lib/apt/lists/* \
     && mkdir /var/tex
 

Diff for: Dockerfile-slave

@@ -1,8 +1,9 @@
-FROM kubernautslabs/jmeter-base
+FROM kubernautslabs/jmeter-base:latest
 MAINTAINER Kubernauts-lab
 
 EXPOSE 1099 50000
 
 ENTRYPOINT $JMETER_HOME/bin/jmeter-server \
 -Dserver.rmi.localport=50000 \
--Dserver_port=1099
+-Dserver_port=1099 \
+-Jserver.rmi.ssl.disable=true

Diff for: README.md

@@ -11,6 +11,7 @@ N.B.: this implementation was tested on Kubernetes 1.9, 1.10, and 1.11 and OpenS
 ## TL;DR
 
 ```bash
+./dockerimages.sh
 ./jmeter_cluster_create.sh
 ./dashboard.sh
 ./start_test.sh

Diff for: dockerimages.sh

@@ -0,0 +1,6 @@
+#!/bin/bash -e
+
+docker build --tag="kubernautslabs/jmeter-base:latest" -f Dockerfile-base .
+docker build --tag="kubernautslabs/jmeter-master:latest" -f Dockerfile-master .
+docker build --tag="kubernautslabs/jmeter-slave:latest" -f Dockerfile-slave .
+docker build --tag="kubernautslabs/jmeter-reporter" -f Dockerfile-reporter .

Diff for: jmeter_grafana_deploy.yaml

@@ -17,6 +17,7 @@ spec:
       containers:
       - name: grafana
         image: grafana/grafana:5.2.0
+        imagePullPolicy: IfNotPresent
         ports:
         - containerPort: 3000
           protocol: TCP

Diff for: jmeter_grafana_reporter.yaml

@@ -16,7 +16,8 @@ spec:
     spec:
       containers:
       - name: jmreporter
-        image: kubernautslabs/jmeter-reporter
+        image: kubernautslabs/jmeter-reporter:latest
+        imagePullPolicy: IfNotPresent
         ports:
         - containerPort: 8686
 

Diff for: jmeter_influxdb_deploy.yaml

@@ -16,6 +16,7 @@ spec:
     spec:
       containers:
         - image: influxdb
+          imagePullPolicy: IfNotPresent
           name: influxdb
           volumeMounts:
           - name: config-volume

Diff for: jmeter_master_configmap.yaml

@@ -9,4 +9,4 @@ data:
     #!/bin/bash
     #Script created to invoke jmeter test script with the slave POD IP addresses
     #Script should be run like: ./load_test "path to the test script in jmx format"
-    /jmeter/apache-jmeter-4.0/bin/jmeter -n -t $1 -Dserver.rmi.ssl.disable=true -R `getent ahostsv4 jmeter-slaves-svc | cut -d' ' -f1 | sort -u | awk -v ORS=, '{print $1}' | sed 's/,$//'`
+    /jmeter/apache-jmeter-*/bin/jmeter -n -t $1 -Dserver.rmi.ssl.disable=true -R `getent ahostsv4 jmeter-slaves-svc | cut -d' ' -f1 | sort -u | awk -v ORS=, '{print $1}' | sed 's/,$//'`

Diff for: jmeter_master_deploy.yaml

@@ -16,7 +16,8 @@ spec:
     spec:
       containers:
       - name: jmmaster
-        image: kubernautslabs/jmeter_master
+        image: kubernautslabs/jmeter-master:latest
+        imagePullPolicy: IfNotPresent
         command: [ "/bin/bash", "-c", "--" ]
         args: [ "while true; do sleep 30; done;" ]
         volumeMounts:

Diff for: jmeter_slaves_deploy.yaml

@@ -16,7 +16,8 @@ spec:
     spec:
       containers:
       - name: jmslave
-        image: kubernautslabs/jmeter_slave
+        image: kubernautslabs/jmeter-slave:latest
+        imagePullPolicy: IfNotPresent
         ports:
         - containerPort: 1099
         - containerPort: 50000

Diff for: plugins/bzm-parallel-0.4.zip

@@ -3,12 +3,13 @@
 #It requires that you supply the path to the jmx file
 #After execution, test script jmx file may be deleted from the pod itself but not locally.
 
-working_dir=`pwd`
+working_dir="`pwd`"
 
 #Get namesapce variable
-tenant=`awk '{print $NF}' $working_dir/tenant_export`
+tenant=`awk '{print $NF}' "$working_dir/tenant_export"`
 
-read -p 'Enter path to the jmx file ' jmx
+jmx="$1"
+[ -n "$jmx" ] || read -p 'Enter path to the jmx file ' jmx
 
 if [ ! -f "$jmx" ];
 then
@@ -17,12 +18,14 @@ then
     exit
 fi
 
+test_name="$(basename "$jmx")"
+
 #Get Master pod details
 
 master_pod=`kubectl get po -n $tenant | grep jmeter-master | awk '{print $1}'`
 
-kubectl cp $jmx -n $tenant $master_pod:/$jmx
+kubectl cp "$jmx" -n $tenant "$master_pod:/$test_name"
 
 ## Echo Starting Jmeter load test
 
-kubectl exec -ti -n $tenant $master_pod -- /jmeter/load_test $jmx
+kubectl exec -ti -n $tenant $master_pod -- /bin/bash /load_test "$test_name"