diff --git a/src/test/clmctest/workshopdemo/dashboards/minio_dash.json b/src/test/clmctest/workshopdemo/dashboards/minio_dash.json
index 9b9a161aa9304ef384e332ad60f46ceef1fcf7b6..906365095d80ef5a7f9c85d21053a9e95ba4aafb 100644
--- a/src/test/clmctest/workshopdemo/dashboards/minio_dash.json
+++ b/src/test/clmctest/workshopdemo/dashboards/minio_dash.json
@@ -1,16 +1,16 @@
 {
-  "id": 1,
+  "id": 3,
   "cells": [
     {
-      "i": "7b828ffc-c979-4302-bc77-9e527d018593",
+      "i": "e62df88a-1e9c-4055-a157-2e01f9f340f2",
       "x": 6,
       "y": 12,
       "w": 6,
       "h": 4,
-      "name": "minio_1_ep2: Network RX",
+      "name": "minio2: Network RX",
       "queries": [
         {
-          "query": "SELECT derivative(max(\"bytes_recv\")) / 62914560 AS \"RX_Mb_per_second\" FROM \"MSDemo\".\"autogen\".\"net\" WHERE time > :dashboardTime: AND \"ipendpoint\"='minio_1_ep2' GROUP BY time(1m)",
+          "query": "SELECT derivative(max(\"bytes_recv\")) / 62914560 AS \"RX_Mb_per_second\" FROM \"MSDemo\".\"autogen\".\"net\" WHERE time > :dashboardTime: AND \"ipendpoint\"=:minio2: GROUP BY time(1m)",
           "queryConfig": {
             "database": "",
             "measurement": "",
@@ -22,11 +22,11 @@
               "tags": []
             },
             "areTagsAccepted": false,
-            "rawText": "SELECT derivative(max(\"bytes_recv\")) / 62914560 AS \"RX_Mb_per_second\" FROM \"MSDemo\".\"autogen\".\"net\" WHERE time > :dashboardTime: AND \"ipendpoint\"='minio_1_ep2' GROUP BY time(1m)",
+            "rawText": "SELECT derivative(max(\"bytes_recv\")) / 62914560 AS \"RX_Mb_per_second\" FROM \"MSDemo\".\"autogen\".\"net\" WHERE time > :dashboardTime: AND \"ipendpoint\"=:minio2: GROUP BY time(1m)",
             "range": null,
             "shifts": null
           },
-          "source": "/chronograf/v1/sources/1"
+          "source": "/chronograf/v1/sources/2"
         }
       ],
       "axes": {
@@ -108,19 +108,19 @@
         "fixFirstColumn": true
       },
       "links": {
-        "self": "/chronograf/v1/dashboards/1/cells/7b828ffc-c979-4302-bc77-9e527d018593"
+        "self": "/chronograf/v1/dashboards/3/cells/e62df88a-1e9c-4055-a157-2e01f9f340f2"
       }
     },
     {
-      "i": "eb815937-1abb-48b5-9bc1-535fe9dee707",
+      "i": "0e1b3956-71c4-4130-80f3-b69fcc9831d8",
       "x": 0,
       "y": 12,
       "w": 6,
       "h": 4,
-      "name": "minio_1_ep1: Network RX",
+      "name": "minio1: Network RX",
       "queries": [
         {
-          "query": "SELECT derivative(max(\"bytes_recv\")) / 62914560 AS \"RX_Mb_per_second\" FROM \"MSDemo\".\"autogen\".\"net\" WHERE time > :dashboardTime: AND \"ipendpoint\"='minio_1_ep1' GROUP BY time(1m)",
+          "query": "SELECT derivative(max(\"bytes_recv\")) / 62914560 AS \"RX_Mb_per_second\" FROM \"MSDemo\".\"autogen\".\"net\" WHERE time > :dashboardTime: AND \"ipendpoint\"=:minio1: GROUP BY time(1m)",
           "queryConfig": {
             "database": "",
             "measurement": "",
@@ -132,11 +132,11 @@
               "tags": []
             },
             "areTagsAccepted": false,
-            "rawText": "SELECT derivative(max(\"bytes_recv\")) / 62914560 AS \"RX_Mb_per_second\" FROM \"MSDemo\".\"autogen\".\"net\" WHERE time > :dashboardTime: AND \"ipendpoint\"='minio_1_ep1' GROUP BY time(1m)",
+            "rawText": "SELECT derivative(max(\"bytes_recv\")) / 62914560 AS \"RX_Mb_per_second\" FROM \"MSDemo\".\"autogen\".\"net\" WHERE time > :dashboardTime: AND \"ipendpoint\"=:minio1: GROUP BY time(1m)",
             "range": null,
             "shifts": null
           },
-          "source": "/chronograf/v1/sources/1"
+          "source": "/chronograf/v1/sources/2"
         }
       ],
       "axes": {
@@ -218,19 +218,19 @@
         "fixFirstColumn": true
       },
       "links": {
-        "self": "/chronograf/v1/dashboards/1/cells/eb815937-1abb-48b5-9bc1-535fe9dee707"
+        "self": "/chronograf/v1/dashboards/3/cells/0e1b3956-71c4-4130-80f3-b69fcc9831d8"
       }
     },
     {
-      "i": "0ddcfff5-b0d7-4cd8-88b7-14e60ee960dd",
+      "i": "ab98bded-9b3d-43f1-bf4e-ba21f692cae9",
       "x": 6,
       "y": 8,
       "w": 6,
       "h": 4,
-      "name": "minio_1_ep2: Network TX",
+      "name": "minio2: Network TX",
       "queries": [
         {
-          "query": "SELECT derivative(max(\"bytes_sent\")) / 62914560 AS \"TX_Mb_per_second\" FROM \"MSDemo\".\"autogen\".\"net\" WHERE time > :dashboardTime: AND \"ipendpoint\"='minio_1_ep2' GROUP BY time(1m)",
+          "query": "SELECT derivative(max(\"bytes_sent\")) / 62914560 AS \"TX_Mb_per_second\" FROM \"MSDemo\".\"autogen\".\"net\" WHERE time > :dashboardTime: AND \"ipendpoint\"=:minio2: GROUP BY time(1m)",
           "queryConfig": {
             "database": "",
             "measurement": "",
@@ -242,11 +242,11 @@
               "tags": []
             },
             "areTagsAccepted": false,
-            "rawText": "SELECT derivative(max(\"bytes_sent\")) / 62914560 AS \"TX_Mb_per_second\" FROM \"MSDemo\".\"autogen\".\"net\" WHERE time > :dashboardTime: AND \"ipendpoint\"='minio_1_ep2' GROUP BY time(1m)",
+            "rawText": "SELECT derivative(max(\"bytes_sent\")) / 62914560 AS \"TX_Mb_per_second\" FROM \"MSDemo\".\"autogen\".\"net\" WHERE time > :dashboardTime: AND \"ipendpoint\"=:minio2: GROUP BY time(1m)",
             "range": null,
             "shifts": null
           },
-          "source": "/chronograf/v1/sources/1"
+          "source": "/chronograf/v1/sources/2"
         }
       ],
       "axes": {
@@ -328,19 +328,19 @@
         "fixFirstColumn": true
       },
       "links": {
-        "self": "/chronograf/v1/dashboards/1/cells/0ddcfff5-b0d7-4cd8-88b7-14e60ee960dd"
+        "self": "/chronograf/v1/dashboards/3/cells/ab98bded-9b3d-43f1-bf4e-ba21f692cae9"
       }
     },
     {
-      "i": "75a6b5e7-0f8e-4916-9463-c5dbdc8a858e",
+      "i": "f36a8d10-2750-46a7-810f-34399c4e9639",
       "x": 0,
       "y": 8,
       "w": 6,
       "h": 4,
-      "name": "minio_1_ep1: Network TX",
+      "name": "minio1: Network TX",
       "queries": [
         {
-          "query": "SELECT derivative(max(\"bytes_sent\")) / 62914560 AS \"TX_Mb_per_second\" FROM \"MSDemo\".\"autogen\".\"net\" WHERE time > :dashboardTime: AND \"ipendpoint\"='minio_1_ep1' GROUP BY time(1m)",
+          "query": "SELECT derivative(max(\"bytes_sent\")) / 62914560 AS \"TX_Mb_per_second\" FROM \"MSDemo\".\"autogen\".\"net\" WHERE time > :dashboardTime: AND \"ipendpoint\"=:minio1: GROUP BY time(1m)",
           "queryConfig": {
             "database": "",
             "measurement": "",
@@ -352,11 +352,11 @@
               "tags": []
             },
             "areTagsAccepted": false,
-            "rawText": "SELECT derivative(max(\"bytes_sent\")) / 62914560 AS \"TX_Mb_per_second\" FROM \"MSDemo\".\"autogen\".\"net\" WHERE time > :dashboardTime: AND \"ipendpoint\"='minio_1_ep1' GROUP BY time(1m)",
+            "rawText": "SELECT derivative(max(\"bytes_sent\")) / 62914560 AS \"TX_Mb_per_second\" FROM \"MSDemo\".\"autogen\".\"net\" WHERE time > :dashboardTime: AND \"ipendpoint\"=:minio1: GROUP BY time(1m)",
             "range": null,
             "shifts": null
           },
-          "source": "/chronograf/v1/sources/1"
+          "source": "/chronograf/v1/sources/2"
         }
       ],
       "axes": {
@@ -438,19 +438,19 @@
         "fixFirstColumn": true
       },
       "links": {
-        "self": "/chronograf/v1/dashboards/1/cells/75a6b5e7-0f8e-4916-9463-c5dbdc8a858e"
+        "self": "/chronograf/v1/dashboards/3/cells/f36a8d10-2750-46a7-810f-34399c4e9639"
       }
     },
     {
-      "i": "100d427d-9579-4f66-8cb0-29ccd2182003",
+      "i": "bb5e93f2-113c-46a1-ad10-da7fefe67c77",
       "x": 6,
       "y": 0,
       "w": 6,
       "h": 8,
-      "name": "minio_1_ep2: Response time",
+      "name": "minio2: Response time",
       "queries": [
         {
-          "query": "SELECT 100*last(\"0.001\") / last(\"count\") AS \"0.001\", 100*last(\"0.003\") / last(\"count\") AS \"0.003\", 100*last(\"0.005\") / last(\"count\") AS \"0.005\", 100*last(\"0.1\") / last(\"count\") AS \"0.1\", 100*last(\"0.5\") / last(\"count\") AS \"0.5\", 100*last(\"1\") / last(\"count\") AS \"1\" FROM \"MSDemo\".\"autogen\".\"minio_http_requests_duration_seconds\" WHERE time > :dashboardTime: and \"ipendpoint\"='minio_1_ep2' GROUP BY time(:interval:) FILL(null)",
+          "query": "SELECT 100*last(\"0.001\") / last(\"count\") AS \"0.001\", 100*last(\"0.003\") / last(\"count\") AS \"0.003\", 100*last(\"0.005\") / last(\"count\") AS \"0.005\", 100*last(\"0.1\") / last(\"count\") AS \"0.1\", 100*last(\"0.5\") / last(\"count\") AS \"0.5\", 100*last(\"1\") / last(\"count\") AS \"1\" FROM \"MSDemo\".\"autogen\".\"minio_http_requests_duration_seconds\" WHERE time > :dashboardTime: and \"ipendpoint\"=:minio2: GROUP BY time(:interval:) FILL(null)",
           "queryConfig": {
             "database": "",
             "measurement": "",
@@ -462,11 +462,11 @@
               "tags": []
             },
             "areTagsAccepted": false,
-            "rawText": "SELECT 100*last(\"0.001\") / last(\"count\") AS \"0.001\", 100*last(\"0.003\") / last(\"count\") AS \"0.003\", 100*last(\"0.005\") / last(\"count\") AS \"0.005\", 100*last(\"0.1\") / last(\"count\") AS \"0.1\", 100*last(\"0.5\") / last(\"count\") AS \"0.5\", 100*last(\"1\") / last(\"count\") AS \"1\" FROM \"MSDemo\".\"autogen\".\"minio_http_requests_duration_seconds\" WHERE time > :dashboardTime: and \"ipendpoint\"='minio_1_ep2' GROUP BY time(:interval:) FILL(null)",
+            "rawText": "SELECT 100*last(\"0.001\") / last(\"count\") AS \"0.001\", 100*last(\"0.003\") / last(\"count\") AS \"0.003\", 100*last(\"0.005\") / last(\"count\") AS \"0.005\", 100*last(\"0.1\") / last(\"count\") AS \"0.1\", 100*last(\"0.5\") / last(\"count\") AS \"0.5\", 100*last(\"1\") / last(\"count\") AS \"1\" FROM \"MSDemo\".\"autogen\".\"minio_http_requests_duration_seconds\" WHERE time > :dashboardTime: and \"ipendpoint\"=:minio2: GROUP BY time(:interval:) FILL(null)",
             "range": null,
             "shifts": null
           },
-          "source": "/chronograf/v1/sources/1"
+          "source": "/chronograf/v1/sources/2"
         }
       ],
       "axes": {
@@ -548,19 +548,19 @@
         "fixFirstColumn": true
       },
       "links": {
-        "self": "/chronograf/v1/dashboards/1/cells/100d427d-9579-4f66-8cb0-29ccd2182003"
+        "self": "/chronograf/v1/dashboards/3/cells/bb5e93f2-113c-46a1-ad10-da7fefe67c77"
       }
     },
     {
-      "i": "14543789-897c-4ada-b702-6d0908c49ee0",
+      "i": "fef268eb-b3d5-4415-94bc-bc23d2795d05",
       "x": 0,
       "y": 0,
       "w": 6,
       "h": 8,
-      "name": "minio_1_ep1: Response time",
+      "name": "minio1: Response time",
       "queries": [
         {
-          "query": "SELECT 100*last(\"0.001\") / last(\"count\") AS \"0.001\", 100*last(\"0.003\") / last(\"count\") AS \"0.003\", 100*last(\"0.005\") / last(\"count\") AS \"0.005\", 100*last(\"0.1\") / last(\"count\") AS \"0.1\", 100*last(\"0.5\") / last(\"count\") AS \"0.5\", 100*last(\"1\") / last(\"count\") AS \"1\" FROM \"MSDemo\".\"autogen\".\"minio_http_requests_duration_seconds\" WHERE time > :dashboardTime: and \"ipendpoint\"='minio_1_ep1' GROUP BY time(:interval:) FILL(null)",
+          "query": "SELECT 100*last(\"0.001\") / last(\"count\") AS \"0.001\", 100*last(\"0.003\") / last(\"count\") AS \"0.003\", 100*last(\"0.005\") / last(\"count\") AS \"0.005\", 100*last(\"0.1\") / last(\"count\") AS \"0.1\", 100*last(\"0.5\") / last(\"count\") AS \"0.5\", 100*last(\"1\") / last(\"count\") AS \"1\" FROM \"MSDemo\".\"autogen\".\"minio_http_requests_duration_seconds\" WHERE time > :dashboardTime: and \"ipendpoint\"=:minio1: GROUP BY time(:interval:) FILL(null)",
           "queryConfig": {
             "database": "",
             "measurement": "",
@@ -572,11 +572,11 @@
               "tags": []
             },
             "areTagsAccepted": false,
-            "rawText": "SELECT 100*last(\"0.001\") / last(\"count\") AS \"0.001\", 100*last(\"0.003\") / last(\"count\") AS \"0.003\", 100*last(\"0.005\") / last(\"count\") AS \"0.005\", 100*last(\"0.1\") / last(\"count\") AS \"0.1\", 100*last(\"0.5\") / last(\"count\") AS \"0.5\", 100*last(\"1\") / last(\"count\") AS \"1\" FROM \"MSDemo\".\"autogen\".\"minio_http_requests_duration_seconds\" WHERE time > :dashboardTime: and \"ipendpoint\"='minio_1_ep1' GROUP BY time(:interval:) FILL(null)",
+            "rawText": "SELECT 100*last(\"0.001\") / last(\"count\") AS \"0.001\", 100*last(\"0.003\") / last(\"count\") AS \"0.003\", 100*last(\"0.005\") / last(\"count\") AS \"0.005\", 100*last(\"0.1\") / last(\"count\") AS \"0.1\", 100*last(\"0.5\") / last(\"count\") AS \"0.5\", 100*last(\"1\") / last(\"count\") AS \"1\" FROM \"MSDemo\".\"autogen\".\"minio_http_requests_duration_seconds\" WHERE time > :dashboardTime: and \"ipendpoint\"=:minio1: GROUP BY time(:interval:) FILL(null)",
             "range": null,
             "shifts": null
           },
-          "source": "/chronograf/v1/sources/1"
+          "source": "/chronograf/v1/sources/2"
         }
       ],
       "axes": {
@@ -658,16 +658,63 @@
         "fixFirstColumn": true
       },
       "links": {
-        "self": "/chronograf/v1/dashboards/1/cells/14543789-897c-4ada-b702-6d0908c49ee0"
+        "self": "/chronograf/v1/dashboards/3/cells/fef268eb-b3d5-4415-94bc-bc23d2795d05"
+      }
+    }
+  ],
+  "templates": [
+    {
+      "tempVar": ":minio1:",
+      "values": [
+        {
+          "value": "minio_1_ep1",
+          "type": "tagValue",
+          "selected": true
+        }
+      ],
+      "id": "ad1cd560-3ae5-4cac-8c67-46970649b641",
+      "type": "tagValues",
+      "label": "",
+      "query": {
+        "influxql": "SHOW TAG VALUES ON :database: FROM :measurement: WITH KEY=:tagKey:",
+        "db": "MSDemo",
+        "measurement": "cpu",
+        "tagKey": "ipendpoint",
+        "fieldKey": ""
+      },
+      "links": {
+        "self": "/chronograf/v1/dashboards/3/templates/ad1cd560-3ae5-4cac-8c67-46970649b641"
+      }
+    },
+    {
+      "tempVar": ":minio2:",
+      "values": [
+        {
+          "value": "minio_1_ep2",
+          "type": "tagValue",
+          "selected": true
+        }
+      ],
+      "id": "11f88a29-0534-42af-bee7-a1f8ae653ba9",
+      "type": "tagValues",
+      "label": "",
+      "query": {
+        "influxql": "SHOW TAG VALUES ON :database: FROM :measurement: WITH KEY=:tagKey:",
+        "db": "MSDemo",
+        "measurement": "cpu",
+        "tagKey": "ipendpoint",
+        "fieldKey": ""
+      },
+      "links": {
+        "self": "/chronograf/v1/dashboards/3/templates/11f88a29-0534-42af-bee7-a1f8ae653ba9"
       }
     }
   ],
-  "templates": [],
   "name": "Minio endpoints",
   "organization": "default",
   "links": {
-    "self": "/chronograf/v1/dashboards/1",
-    "cells": "/chronograf/v1/dashboards/1/cells",
-    "templates": "/chronograf/v1/dashboards/1/templates"
+    "self": "/chronograf/v1/dashboards/3",
+    "cells": "/chronograf/v1/dashboards/3/cells",
+    "templates": "/chronograf/v1/dashboards/3/templates"
   }
 }