1-5-2-1-SpikeScript

.gitignore

@@ -1 +1,2 @@
-*~
+*~
+*.Ds_store

.travis.yml

@@ -6,6 +6,8 @@ services:
 before_install:
   - sudo apt-get update
   - sudo apt-get -y -o Dpkg::Options::="--force-confnew" install docker-ce
+  - sudo useradd -s /bin/bash -p $(echo ssh_pass | openssl passwd -1 -stdin) ssh_user
 
 script:
   - make
+  - make clean

1-5-2-1-SpikeScript/Dockerfile

@@ -0,0 +1,12 @@
+FROM ubuntu:xenial
+
+MAINTAINER [email protected]
+
+RUN apt-get update && apt-get install -y openssh-server
+RUN apt-get install -y curl
+RUN apt-get install -y iproute2
+RUN apt-get install -y sshpass
+COPY SpikeScript.sh /
+COPY SpikeScript.conf /
+COPY start-and-initialize.sh /
+CMD ["/start-and-initialize.sh"]

1-5-2-1-SpikeScript/SpikeScript.conf

@@ -0,0 +1,4 @@
+USERNAME="root"
+PASSWORD="root"
+IPADDRESS="monitor_system"
+HOST="influx_system"

1-5-2-1-SpikeScript/SpikeScript.sh

@@ -0,0 +1,50 @@
+#!/bin/bash
+
+end=$((SECONDS+2400000))
+#
+#need to add check if sysstat is installed.
+#
+
+source SpikeScript.conf
+echo $USERNAME
+echo $PASSWORD
+echo $IPADDRESS
+while [ $SECONDS -lt $end ]; do
+##################
+#get data from external server 
+##################
+
+NOW=$(date +"%s")
+
+MEMORY=$(sshpass -p "$PASSWORD" ssh -tt  -o "StrictHostKeyChecking no" $USERNAME@$IPADDRESS free -m | awk 'NR==2{printf "%.2g", $3*100/$2 }')
+
+CPU=$(sshpass -p "$PASSWORD" ssh -tt $USERNAME@$IPADDRESS top -bn1 | grep load | awk '{printf "%.2g", $(NF-2)}')
+
+#For the following metrics, sysstat needs to be installed
+DISKREADSEC=$(sshpass -p "$PASSWORD" ssh -tt $USERNAME@$IPADDRESS iostat -dx | tail -n 2 | awk '{ print $4; }')
+DISKWRITESEC=$(sshpass -p "$PASSWORD" ssh -tt $USERNAME@$IPADDRESS iostat -dx | tail -n 2 | awk '{ print $5; }')
+
+##################
+#POST to InfluxDB
+##################
+
+#meaningful db name - spikescript
+
+#POST CPU utilization to Influxdb 
+curl -i -XPOST 'http://'$HOST':8086/write?db=snapshot&precision=s' --data-binary 'cpu_load_short,host=server01,region=us-west value='$CPU' '$NOW''
+
+#POST Memory utilization to Influxdb 
+curl -i -XPOST 'http://'$HOST':8086/write?db=snapshot&precision=s' --data-binary 'mem_load_short,host=server01,region=us-west value='$MEMORY' '$NOW''
+
+#POST Disk read to Influxdb
+curl -i -XPOST 'http://'$HOST':8086/write?db=snapshot&precision=s' --data-binary 'disk_read_short,host=server01,region=us-west value='$DISKREADSEC' '$NOW''
+
+#POST Disk write to Influxdb
+curl -i -XPOST 'http://'$HOST':8086/write?db=snapshot&precision=s' --data-binary 'disk_write_short,host=server01,region=us-west value='$DISKWRITESEC' '$NOW''
+
+#printf "Memory\t\tDisk\t\tCPU\n"
+#echo "$CPU $MEMORY $DISKWRITESEC"
+
+sleep 10
+done
+

1-5-2-1-SpikeScript/start-and-initialize.sh

@@ -0,0 +1,4 @@
+#!/bin/bash
+
+#run spikescript
+./SpikeScript.sh

Makefile

@@ -1,11 +1,9 @@
-all: test
+all: test 
 
 test:
 	@for d in ./test/*; do \
-	  echo TEST $$d; \
 	  cd $$d; \
 	  $(MAKE); \
-	  cd -; \
 	done
 
 .PHONY: all test

README.md

@@ -6,11 +6,11 @@ Grafana dashboard for performance test measurements collected by JMeter.
 
 You can start performance-tests-dashboard in regular or detached mode.
 
-1. Regular mode
+##### Regular mode
   1. To start, execute `./start.sh`.
   2. To stop, press Ctrl-C.
   3. To clean stopped containers, execute `./stop.sh`.
-2. Detached mode
+##### Detached mode
   1. To start, execute `./start.sh -d`.
   2. To stop and clean containers, execute `./stop.sh`.
 

docker-compose.yml

@@ -1,14 +1,33 @@
 version: '3'
 
+#do not change container names
+
 services:
   influxdb:
     build: influxdb
+    container_name: influx_system
     ports:
       - 8086:8086
       - 2003:2003
   grafana:
     build: grafana
+    container_name: grafana_system
     ports:
       - 3000:3000
     depends_on:
       - influxdb
+
+  monitor:
+    build: monitor
+    container_name: monitor_system
+
+  spike:
+    build: 1-5-2-1-SpikeScript
+    container_name: spike_system
+    depends_on: 
+      - monitor
+
+  jmeter:
+    build: jmeter
+    container_name: jmeter_system
+

grafana/performance-tests-dashboard.json

@@ -4,7 +4,7 @@
       "type": "grafana",
       "id": "grafana",
       "name": "Grafana",
-      "version": "4.3.1"
+      "version": "4.4.1"
     },
     {
       "type": "panel",
@@ -14,13 +14,7 @@
     },
     {
       "type": "datasource",
-      "id": "influxdb-jmeter",
-      "name": "InfluxDB",
-      "version": "1.0.0"
-    },
-    {
-      "type": "datasource",
-      "id": "influxdb-test",
+      "id": "influxdb",
       "name": "InfluxDB",
       "version": "1.0.0"
     },
@@ -40,7 +34,7 @@
   "hideControls": false,
   "id": null,
   "links": [],
-  "refresh": false,
+  "refresh": "5s",
   "rows": [
     {
       "collapse": false,
@@ -158,7 +152,7 @@
           "thresholds": [],
           "timeFrom": null,
           "timeShift": null,
-          "title": "Average Rate",
+          "title": "Response Time",
           "tooltip": {
             "shared": true,
             "sort": 0,
@@ -529,123 +523,6 @@
       "title": "Dashboard Row",
       "titleSize": "h6"
     },
-    {
-      "collapse": false,
-      "height": 250,
-      "panels": [
-        {
-          "aliasColors": {},
-          "bars": false,
-          "dashLength": 10,
-          "dashes": false,
-          "datasource": "influxdb-jmeter",
-          "fill": 1,
-          "id": 4,
-          "legend": {
-            "avg": false,
-            "current": false,
-            "max": false,
-            "min": false,
-            "show": true,
-            "total": false,
-            "values": false
-          },
-          "lines": true,
-          "linewidth": 1,
-          "links": [],
-          "nullPointMode": "null",
-          "percentage": false,
-          "pointradius": 5,
-          "points": false,
-          "renderer": "flot",
-          "seriesOverrides": [],
-          "spaceLength": 10,
-          "span": 12,
-          "stack": false,
-          "steppedLine": false,
-          "targets": [
-            {
-              "dsType": "influxdb",
-              "groupBy": [
-                {
-                  "params": [
-                    "$__interval"
-                  ],
-                  "type": "time"
-                },
-                {
-                  "params": [
-                    "linear"
-                  ],
-                  "type": "fill"
-                }
-              ],
-              "measurement": "jmeter.test.meanAT",
-              "orderByTime": "ASC",
-              "policy": "default",
-              "refId": "A",
-              "resultFormat": "time_series",
-              "select": [
-                [
-                  {
-                    "params": [
-                      "value"
-                    ],
-                    "type": "field"
-                  },
-                  {
-                    "params": [],
-                    "type": "mean"
-                  }
-                ]
-              ],
-              "tags": []
-            }
-          ],
-          "thresholds": [],
-          "timeFrom": null,
-          "timeShift": null,
-          "title": "Active Users",
-          "tooltip": {
-            "shared": true,
-            "sort": 0,
-            "value_type": "individual"
-          },
-          "type": "graph",
-          "xaxis": {
-            "buckets": null,
-            "mode": "time",
-            "name": null,
-            "show": true,
-            "values": []
-          },
-          "yaxes": [
-            {
-              "format": "short",
-              "label": null,
-              "logBase": 1,
-              "max": null,
-              "min": null,
-              "show": true
-            },
-            {
-              "format": "short",
-              "label": null,
-              "logBase": 1,
-              "max": null,
-              "min": null,
-              "show": true
-            }
-          ]
-        }
-      ],
-      "repeat": null,
-      "repeatIteration": null,
-      "repeatRowId": null,
-      "showTitle": false,
-      "title": "Dashboard Row",
-      "titleSize": "h6"
-    },
     {
       "collapse": false,
       "height": 212,
@@ -881,17 +758,6 @@
       "showTitle": false,
       "title": "Dashboard Row",
       "titleSize": "h6"
-    },
-    {
-      "collapse": false,
-      "height": 250,
-      "panels": [],
-      "repeat": null,
-      "repeatIteration": null,
-      "repeatRowId": null,
-      "showTitle": false,
-      "title": "Dashboard Row",
-      "titleSize": "h6"
     }
   ],
   "schemaVersion": 14,
@@ -931,5 +797,5 @@
   },
   "timezone": "browser",
   "title": "Real Time Results",
-  "version": 15
+  "version": 0
 }

influxdb/Dockerfile

@@ -2,6 +2,12 @@ FROM influxdb:1.2
 
 MAINTAINER [email protected]
 
+
+RUN mkdir -p /workspace
+COPY additional.conf /workspace
+RUN cat /workspace/additional.conf >>/etc/influxdb/influxdb.conf
+
+
 # Create databases
-COPY start-and-initialize.sh /
-CMD ["/start-and-initialize.sh"]
+COPY start-and-initialize.sh /workspace
+CMD ["/workspace/start-and-initialize.sh"]

influxdb/additional.conf

@@ -0,0 +1,12 @@
+[[graphite]]
+   enabled = true
+   bind-address = ":2003"
+   database = "jmeter"
+   retention-policy = ""
+   protocol = "tcp"
+   batch-size = 5000
+   batch-pending = 10
+   batch-timeout = "1s"
+   consistency-level = "one"
+   separator = "."
+   upd-read-buffer = 0

influxdb/start-and-initialize.sh

@@ -2,10 +2,8 @@
 
 influxd &
 
-until influx -execute 'CREATE DATABASE jmeter'; do
+until influx -execute 'CREATE DATABASE jmeter' && influx -execute 'CREATE DATABASE snapshot'; do
   sleep 0.125;
 done
 
-influx -execute 'CREATE DATABASE snapshot'
-
 wait