updated jmeter config for kuda test cluster

GrafanaJMeterTemplate.json

@@ -1541,7 +1541,7 @@
         "multi": false,
         "name": "retention",
         "options": [],
-        "query": "SHOW RETENTION POLICIES ON \"jmeterdb\"",
+        "query": "SHOW RETENTION POLICIES ON \"jmeter\"",
         "refresh": 1,
         "regex": "",
         "sort": 0,

dashboard.sh

@@ -3,7 +3,8 @@
 working_dir=`pwd`
 
 #Get namesapce variable
-tenant=`awk '{print $NF}' $working_dir/tenant_export`
+# tenant=`awk '{print $NF}' $working_dir/tenant_export`
+tenant='testing'
 
 ## Create jmeter database automatically in Influxdb
 
@@ -32,4 +33,9 @@ kubectl exec -ti -n $tenant $master_pod -- chmod 755 /jmeter/load_test
 
 ##kubectl cp $working_dir/influxdb-jmeter-datasource.json -n $tenant $grafana_pod:/influxdb-jmeter-datasource.json
 
-kubectl exec -ti -n $tenant $grafana_pod -- curl 'http://admin:admin@127.0.0.1:3000/api/datasources' -X POST -H 'Content-Type: application/json;charset=UTF-8' --data-binary '{"name":"jmeterdb","type":"influxdb","url":"http://jmeter-influxdb:8086","access":"proxy","isDefault":true,"database":"jmeter","user":"admin","password":"admin"}'
+# kubectl exec -ti -n $tenant $grafana_pod -- curl 'http://admin:admin@127.0.0.1:3000/api/datasources' -X POST -H 'Content-Type: application/json;charset=UTF-8' --data-binary '{"name":"jmeterdb","type":"influxdb","url":"http://jmeter-influxdb:8086","access":"proxy","isDefault":true,"database":"jmeter","user":"admin","password":"admin"}'
+
+grafana_dns=`kubectl get svc -n $tenant | grep jmeter-grafana | awk '{print $4}'`
+
+echo "Creating Datasource for jmeter..."
+curl 'http://admin:admin@'${grafana_dns}':3000/api/datasources' -X POST -H 'Content-Type: application/json;charset=UTF-8' --data-binary '{"name":"jmeterdb","type":"influxdb","url":"http://jmeter-influxdb:8086","access":"proxy","isDefault":true,"database":"jmeter","user":"admin","password":"admin"}'

jmeter_grafana_configmap.yaml

@@ -0,0 +1,10 @@
+apiVersion: v1
+kind: ConfigMap
+metadata:
+  name: grafana-config
+  labels:
+    app: jmeter-grafana
+data:
+  custom.ini: |
+    [plugin.grafana-image-renderer]
+      rendering_ignore_https_errors = true

jmeter_grafana_deploy.yaml

@@ -16,8 +16,11 @@ spec:
     spec:
       containers:
       - name: grafana
-        image: grafana/grafana:5.2.0
+        image: grafana/grafana:latest
         imagePullPolicy: IfNotPresent
+        # volumeMounts:
+        # - name: config-volume
+        #   mountPath: /etc/grafana/custom.ini
         ports:
         - containerPort: 3000
           protocol: TCP
@@ -33,4 +36,50 @@ spec:
         - name: GF_SERVER_ROOT_URL
           # If you're only using the API Server proxy, set this value instead:
           # value: /api/v1/namespaces/kube-system/services/monitoring-grafana/proxy
-          value: /
+          value: http://jmeter-grafana:3000/ #/
+        - name: GF_PLUGIN_GRAFANA_IMAGE_RENDERER_RENDERING_IGNORE_HTTPS_ERRORS
+          value: "true"
+        - name: GF_RENDERING_SERVER_URL
+          value: http://image-renderer:8081/render
+        - name: GF_RENDERING_CALLBACK_URL
+          value: http://jmeter-grafana:3000/
+        - name: GF_LOG_FILTERS
+          value: "rendering:debug" 
+      # volumes:
+      # - name: config-volume
+      #   configMap:
+      #    name: grafana-config    
+
+
+---
+
+apiVersion: apps/v1
+kind: Deployment
+metadata:
+  name: image-renderer
+  labels:
+    app: image-renderer
+spec:
+  replicas: 1
+  selector:
+    matchLabels:
+      app: image-renderer
+  template:
+    metadata:
+      labels:
+        app: image-renderer
+    spec:
+      containers:
+      - name: image-renderer
+        image: grafana/grafana-image-renderer:latest
+        imagePullPolicy: IfNotPresent
+        ports:
+        - containerPort: 8081
+          protocol: TCP
+        env:
+        - name: ENABLE_METRICS
+          value: "true"
+        - name: LOG_LEVEL
+          value: debug
+        - name: RENDERING_VERBOSE_LOGGING
+          value: "true"

jmeter_grafana_reporter.yaml

@@ -1,4 +1,4 @@
-apiVersion: apps/v1beta2 # for versions before 1.9.0 use apps/v1beta2
+apiVersion: apps/v1 # for versions before 1.9.0 use apps/v1beta2
 kind: Deployment
 metadata:
   name: jmeter-reporter
@@ -34,4 +34,4 @@ spec:
       targetPort: 8686
   selector:
     jmeter_mode: reporter
-  type: NodePort
+  type: LoadBalancer

jmeter_grafana_svc.yaml

@@ -10,4 +10,20 @@ spec:
       targetPort: 3000
   selector:
     app: jmeter-grafana
-  type: NodePort
+  type: LoadBalancer
+
+---
+
+apiVersion: v1
+kind: Service
+metadata:
+  name: image-renderer
+  labels:
+    app: image-renderer
+spec:
+  ports:
+    - port: 8081
+      targetPort: 8081
+  selector:
+    app: image-renderer
+  type: ClusterIP

jmeter_influxdb_deploy.yaml

@@ -15,7 +15,7 @@ spec:
         app: influxdb-jmeter
     spec:
       containers:
-        - image: influxdb
+        - image: influxdb:1.8.6
           imagePullPolicy: IfNotPresent
           name: influxdb
           volumeMounts:

jmeter_slaves_deploy.yaml

@@ -5,7 +5,7 @@ metadata:
   labels:
     jmeter_mode: slave
 spec:
-  replicas: 2 
+  replicas: 4 
   selector:
     matchLabels:
       jmeter_mode: slave