diff --git a/src/test/clmctest/workshopdemo/README.md b/docs/tutorial/README.md
similarity index 100%
rename from src/test/clmctest/workshopdemo/README.md
rename to docs/tutorial/README.md
diff --git a/src/test/clmctest/workshopdemo/initDemo.sh b/docs/tutorial/initDemo.sh
similarity index 100%
rename from src/test/clmctest/workshopdemo/initDemo.sh
rename to docs/tutorial/initDemo.sh
diff --git a/src/test/clmctest/workshopdemo/nginx1.conf b/docs/tutorial/nginx1.conf
similarity index 100%
rename from src/test/clmctest/workshopdemo/nginx1.conf
rename to docs/tutorial/nginx1.conf
diff --git a/src/test/clmctest/workshopdemo/nginx2.conf b/docs/tutorial/nginx2.conf
similarity index 100%
rename from src/test/clmctest/workshopdemo/nginx2.conf
rename to docs/tutorial/nginx2.conf
diff --git a/src/test/clmctest/workshopdemo/nginxMiniDemo/initDemo.sh b/docs/tutorial/nginxMiniDemo/initDemo.sh
similarity index 100%
rename from src/test/clmctest/workshopdemo/nginxMiniDemo/initDemo.sh
rename to docs/tutorial/nginxMiniDemo/initDemo.sh
diff --git a/src/test/clmctest/workshopdemo/nginxMiniDemo/resources/installTelegraf.sh b/docs/tutorial/nginxMiniDemo/resources/installTelegraf.sh
similarity index 100%
rename from src/test/clmctest/workshopdemo/nginxMiniDemo/resources/installTelegraf.sh
rename to docs/tutorial/nginxMiniDemo/resources/installTelegraf.sh
diff --git a/src/test/clmctest/workshopdemo/nginxMiniDemo/telegrafConfigs/telegraf.conf b/docs/tutorial/nginxMiniDemo/telegrafConfigs/telegraf.conf
similarity index 100%
rename from src/test/clmctest/workshopdemo/nginxMiniDemo/telegrafConfigs/telegraf.conf
rename to docs/tutorial/nginxMiniDemo/telegrafConfigs/telegraf.conf
diff --git a/src/test/clmctest/workshopdemo/nginxMiniDemo/telegrafConfigs/telegraf.d/telegraf_host.conf b/docs/tutorial/nginxMiniDemo/telegrafConfigs/telegraf.d/telegraf_host.conf
similarity index 100%
rename from src/test/clmctest/workshopdemo/nginxMiniDemo/telegrafConfigs/telegraf.d/telegraf_host.conf
rename to docs/tutorial/nginxMiniDemo/telegrafConfigs/telegraf.d/telegraf_host.conf
diff --git a/src/test/clmctest/workshopdemo/nginxMiniDemo/telegrafConfigs/telegraf.d/telegraf_nginx.conf b/docs/tutorial/nginxMiniDemo/telegrafConfigs/telegraf.d/telegraf_nginx.conf
similarity index 100%
rename from src/test/clmctest/workshopdemo/nginxMiniDemo/telegrafConfigs/telegraf.d/telegraf_nginx.conf
rename to docs/tutorial/nginxMiniDemo/telegrafConfigs/telegraf.d/telegraf_nginx.conf
diff --git a/src/test/clmctest/workshopdemo/nginxMiniDemo/telegrafConfigs/telegraf.d/telegraf_output.conf b/docs/tutorial/nginxMiniDemo/telegrafConfigs/telegraf.d/telegraf_output.conf
similarity index 100%
rename from src/test/clmctest/workshopdemo/nginxMiniDemo/telegrafConfigs/telegraf.d/telegraf_output.conf
rename to docs/tutorial/nginxMiniDemo/telegrafConfigs/telegraf.d/telegraf_output.conf
diff --git a/src/test/clmctest/workshopdemo/rules/minioKPI.json b/docs/tutorial/rules/minioKPI.json
similarity index 100%
rename from src/test/clmctest/workshopdemo/rules/minioKPI.json
rename to docs/tutorial/rules/minioKPI.json
diff --git a/src/test/clmctest/workshopdemo/rules/minio_bytes_sent.json b/docs/tutorial/rules/minio_bytes_sent.json
similarity index 100%
rename from src/test/clmctest/workshopdemo/rules/minio_bytes_sent.json
rename to docs/tutorial/rules/minio_bytes_sent.json
diff --git a/src/test/clmctest/workshopdemo/dashboards/MINIO_ep1_dash.json b/src/test/clmctest/workshopdemo/dashboards/MINIO_ep1_dash.json
deleted file mode 100644
index 928afae6da219e6224a798f8c7f622239343504b..0000000000000000000000000000000000000000
--- a/src/test/clmctest/workshopdemo/dashboards/MINIO_ep1_dash.json
+++ /dev/null
@@ -1,855 +0,0 @@
-{
-  "id": 2,
-  "cells": [
-    {
-      "i": "b8c92047-9a14-4a1e-bc28-d29482a62cfb",
-      "x": 9,
-      "y": 0,
-      "w": 3,
-      "h": 3,
-      "name": "MINIO network TX (Clone)",
-      "queries": [
-        {
-          "query": "SELECT derivative(max(\"bytes_sent\"),10s) AS \"bytesTX\" FROM \"MSDemo\".\"autogen\".\"net\" WHERE time > :dashboardTime: AND \"ipendpoint\"='minio_1_ep1' GROUP BY time(:interval:) FILL(null)",
-          "queryConfig": {
-            "database": "",
-            "measurement": "",
-            "retentionPolicy": "",
-            "fields": [],
-            "tags": {},
-            "groupBy": {
-              "time": "",
-              "tags": []
-            },
-            "areTagsAccepted": false,
-            "rawText": "SELECT derivative(max(\"bytes_sent\"),10s) AS \"bytesTX\" FROM \"MSDemo\".\"autogen\".\"net\" WHERE time > :dashboardTime: AND \"ipendpoint\"='minio_1_ep1' GROUP BY time(:interval:) FILL(null)",
-            "range": null,
-            "shifts": null
-          },
-          "source": "/chronograf/v1/sources/1"
-        }
-      ],
-      "axes": {
-        "x": {
-          "bounds": [
-            "",
-            ""
-          ],
-          "label": "",
-          "prefix": "",
-          "suffix": "",
-          "base": "10",
-          "scale": "linear"
-        },
-        "y": {
-          "bounds": [
-            "",
-            ""
-          ],
-          "label": "Bytes sent",
-          "prefix": "",
-          "suffix": "",
-          "base": "10",
-          "scale": "linear"
-        },
-        "y2": {
-          "bounds": [
-            "",
-            ""
-          ],
-          "label": "",
-          "prefix": "",
-          "suffix": "",
-          "base": "10",
-          "scale": "linear"
-        }
-      },
-      "type": "line",
-      "colors": [
-        {
-          "id": "3e61eee6-fd07-4076-9c65-4ccc03565f52",
-          "type": "scale",
-          "hex": "#31C0F6",
-          "name": "Nineteen Eighty Four",
-          "value": "0"
-        },
-        {
-          "id": "3e698c4b-7ef0-4121-889c-220e79081737",
-          "type": "scale",
-          "hex": "#A500A5",
-          "name": "Nineteen Eighty Four",
-          "value": "0"
-        },
-        {
-          "id": "4fafd9be-a56c-4acb-b2e6-ff2a82c41911",
-          "type": "scale",
-          "hex": "#FF7E27",
-          "name": "Nineteen Eighty Four",
-          "value": "0"
-        }
-      ],
-      "legend": {},
-      "tableOptions": {
-        "timeFormat": "MM/DD/YYYY HH:mm:ss",
-        "verticalTimeAxis": true,
-        "sortBy": {
-          "internalName": "time",
-          "displayName": "",
-          "visible": true
-        },
-        "wrapping": "truncate",
-        "fieldNames": [
-          {
-            "internalName": "time",
-            "displayName": "",
-            "visible": true
-          }
-        ],
-        "fixFirstColumn": true
-      },
-      "links": {
-        "self": "/chronograf/v1/dashboards/2/cells/b8c92047-9a14-4a1e-bc28-d29482a62cfb"
-      }
-    },
-    {
-      "i": "c56eb40b-08d1-40b3-9800-93f929491138",
-      "x": 6,
-      "y": 0,
-      "w": 3,
-      "h": 3,
-      "name": "MINIO network RX",
-      "queries": [
-        {
-          "query": "SELECT derivative(max(\"bytes_recv\"),10s) AS \"bytesRX\" FROM \"MSDemo\".\"autogen\".\"net\" WHERE time > :dashboardTime: AND \"ipendpoint\"='minio_1_ep1' GROUP BY time(:interval:) FILL(null)",
-          "queryConfig": {
-            "database": "",
-            "measurement": "",
-            "retentionPolicy": "",
-            "fields": [],
-            "tags": {},
-            "groupBy": {
-              "time": "",
-              "tags": []
-            },
-            "areTagsAccepted": false,
-            "rawText": "SELECT derivative(max(\"bytes_recv\"),10s) AS \"bytesRX\" FROM \"MSDemo\".\"autogen\".\"net\" WHERE time > :dashboardTime: AND \"ipendpoint\"='minio_1_ep1' GROUP BY time(:interval:) FILL(null)",
-            "range": null,
-            "shifts": null
-          },
-          "source": "/chronograf/v1/sources/1"
-        }
-      ],
-      "axes": {
-        "x": {
-          "bounds": [
-            "",
-            ""
-          ],
-          "label": "",
-          "prefix": "",
-          "suffix": "",
-          "base": "10",
-          "scale": "linear"
-        },
-        "y": {
-          "bounds": [
-            "",
-            ""
-          ],
-          "label": "Bytes received",
-          "prefix": "",
-          "suffix": "",
-          "base": "10",
-          "scale": "linear"
-        },
-        "y2": {
-          "bounds": [
-            "",
-            ""
-          ],
-          "label": "",
-          "prefix": "",
-          "suffix": "",
-          "base": "10",
-          "scale": "linear"
-        }
-      },
-      "type": "line",
-      "colors": [
-        {
-          "id": "3e61eee6-fd07-4076-9c65-4ccc03565f52",
-          "type": "scale",
-          "hex": "#31C0F6",
-          "name": "Nineteen Eighty Four",
-          "value": "0"
-        },
-        {
-          "id": "3e698c4b-7ef0-4121-889c-220e79081737",
-          "type": "scale",
-          "hex": "#A500A5",
-          "name": "Nineteen Eighty Four",
-          "value": "0"
-        },
-        {
-          "id": "4fafd9be-a56c-4acb-b2e6-ff2a82c41911",
-          "type": "scale",
-          "hex": "#FF7E27",
-          "name": "Nineteen Eighty Four",
-          "value": "0"
-        }
-      ],
-      "legend": {},
-      "tableOptions": {
-        "timeFormat": "MM/DD/YYYY HH:mm:ss",
-        "verticalTimeAxis": true,
-        "sortBy": {
-          "internalName": "time",
-          "displayName": "",
-          "visible": true
-        },
-        "wrapping": "truncate",
-        "fieldNames": [
-          {
-            "internalName": "time",
-            "displayName": "",
-            "visible": true
-          }
-        ],
-        "fixFirstColumn": true
-      },
-      "links": {
-        "self": "/chronograf/v1/dashboards/2/cells/c56eb40b-08d1-40b3-9800-93f929491138"
-      }
-    },
-    {
-      "i": "b0f6dfaa-8dcc-425e-be40-87efcdaeb5cf",
-      "x": 0,
-      "y": 6,
-      "w": 12,
-      "h": 3,
-      "name": "MINIO configuration",
-      "queries": [
-        {
-          "query": "SELECT max(\"uptime\") AS \"maxUpTime\" FROM \"MSDemo\".\"autogen\".\"system\" WHERE time > :dashboardTime: AND \"ipendpoint\"='minio_1_ep1' GROUP BY time(:interval:) FILL(null)",
-          "queryConfig": {
-            "database": "MSDemo",
-            "measurement": "system",
-            "retentionPolicy": "autogen",
-            "fields": [
-              {
-                "value": "max",
-                "type": "func",
-                "alias": "maxUpTime",
-                "args": [
-                  {
-                    "value": "uptime",
-                    "type": "field",
-                    "alias": ""
-                  }
-                ]
-              }
-            ],
-            "tags": {
-              "ipendpoint": [
-                "minio_1_ep1"
-              ]
-            },
-            "groupBy": {
-              "time": "auto",
-              "tags": []
-            },
-            "areTagsAccepted": true,
-            "fill": "null",
-            "rawText": null,
-            "range": null,
-            "shifts": null
-          },
-          "source": "/chronograf/v1/sources/1"
-        }
-      ],
-      "axes": {
-        "x": {
-          "bounds": [
-            "",
-            ""
-          ],
-          "label": "",
-          "prefix": "",
-          "suffix": "",
-          "base": "10",
-          "scale": "linear"
-        },
-        "y": {
-          "bounds": [
-            "",
-            ""
-          ],
-          "label": "Service UP time (s)",
-          "prefix": "",
-          "suffix": "",
-          "base": "10",
-          "scale": "linear"
-        },
-        "y2": {
-          "bounds": [
-            "",
-            ""
-          ],
-          "label": "",
-          "prefix": "",
-          "suffix": "",
-          "base": "10",
-          "scale": "linear"
-        }
-      },
-      "type": "line",
-      "colors": [
-        {
-          "id": "e9486252-8022-4347-b1ee-afb9ebe6a6c6",
-          "type": "scale",
-          "hex": "#31C0F6",
-          "name": "Nineteen Eighty Four",
-          "value": "0"
-        },
-        {
-          "id": "f7c72a19-58bb-486e-bf42-82a542a60e33",
-          "type": "scale",
-          "hex": "#A500A5",
-          "name": "Nineteen Eighty Four",
-          "value": "0"
-        },
-        {
-          "id": "90cc1fd5-69a8-407b-8b90-1a8d06c8cd20",
-          "type": "scale",
-          "hex": "#FF7E27",
-          "name": "Nineteen Eighty Four",
-          "value": "0"
-        }
-      ],
-      "legend": {},
-      "tableOptions": {
-        "timeFormat": "MM/DD/YYYY HH:mm:ss",
-        "verticalTimeAxis": true,
-        "sortBy": {
-          "internalName": "time",
-          "displayName": "",
-          "visible": true
-        },
-        "wrapping": "truncate",
-        "fieldNames": [
-          {
-            "internalName": "time",
-            "displayName": "",
-            "visible": true
-          }
-        ],
-        "fixFirstColumn": true
-      },
-      "links": {
-        "self": "/chronograf/v1/dashboards/2/cells/b0f6dfaa-8dcc-425e-be40-87efcdaeb5cf"
-      }
-    },
-    {
-      "i": "77e58fb4-6b5c-48aa-938e-9ce619af5877",
-      "x": 6,
-      "y": 3,
-      "w": 6,
-      "h": 3,
-      "name": "MINIO total bytes sent",
-      "queries": [
-        {
-          "query": "SELECT max(\"counter\") AS \"contentBytesSent\" FROM \"MSDemo\".\"autogen\".\"minio_network_sent_bytes_total\" WHERE time > :dashboardTime: AND \"ipendpoint\"='minio_1_ep1' GROUP BY time(:interval:) FILL(null)",
-          "queryConfig": {
-            "database": "MSDemo",
-            "measurement": "minio_network_sent_bytes_total",
-            "retentionPolicy": "autogen",
-            "fields": [
-              {
-                "value": "max",
-                "type": "func",
-                "alias": "contentBytesSent",
-                "args": [
-                  {
-                    "value": "counter",
-                    "type": "field",
-                    "alias": ""
-                  }
-                ]
-              }
-            ],
-            "tags": {
-              "ipendpoint": [
-                "minio_1_ep1"
-              ]
-            },
-            "groupBy": {
-              "time": "auto",
-              "tags": []
-            },
-            "areTagsAccepted": true,
-            "fill": "null",
-            "rawText": null,
-            "range": null,
-            "shifts": null
-          },
-          "source": "/chronograf/v1/sources/1"
-        }
-      ],
-      "axes": {
-        "x": {
-          "bounds": [
-            "",
-            ""
-          ],
-          "label": "",
-          "prefix": "",
-          "suffix": "",
-          "base": "10",
-          "scale": "linear"
-        },
-        "y": {
-          "bounds": [
-            "",
-            ""
-          ],
-          "label": "Bytes (Mbytes)",
-          "prefix": "",
-          "suffix": "",
-          "base": "10",
-          "scale": "linear"
-        },
-        "y2": {
-          "bounds": [
-            "",
-            ""
-          ],
-          "label": "",
-          "prefix": "",
-          "suffix": "",
-          "base": "10",
-          "scale": "linear"
-        }
-      },
-      "type": "line",
-      "colors": [
-        {
-          "id": "3e61eee6-fd07-4076-9c65-4ccc03565f52",
-          "type": "scale",
-          "hex": "#31C0F6",
-          "name": "Nineteen Eighty Four",
-          "value": "0"
-        },
-        {
-          "id": "3e698c4b-7ef0-4121-889c-220e79081737",
-          "type": "scale",
-          "hex": "#A500A5",
-          "name": "Nineteen Eighty Four",
-          "value": "0"
-        },
-        {
-          "id": "4fafd9be-a56c-4acb-b2e6-ff2a82c41911",
-          "type": "scale",
-          "hex": "#FF7E27",
-          "name": "Nineteen Eighty Four",
-          "value": "0"
-        }
-      ],
-      "legend": {},
-      "tableOptions": {
-        "timeFormat": "MM/DD/YYYY HH:mm:ss",
-        "verticalTimeAxis": true,
-        "sortBy": {
-          "internalName": "time",
-          "displayName": "",
-          "visible": true
-        },
-        "wrapping": "truncate",
-        "fieldNames": [
-          {
-            "internalName": "time",
-            "displayName": "",
-            "visible": true
-          }
-        ],
-        "fixFirstColumn": true
-      },
-      "links": {
-        "self": "/chronograf/v1/dashboards/2/cells/77e58fb4-6b5c-48aa-938e-9ce619af5877"
-      }
-    },
-    {
-      "i": "ec5ffe3d-d1c1-4766-8ad6-22c48e534e41",
-      "x": 0,
-      "y": 3,
-      "w": 6,
-      "h": 3,
-      "name": "Average response time (seconds)",
-      "queries": [
-        {
-          "query": "SELECT derivative(max(\"sum\"),10s)/derivative(max(\"count\"),10s) AS \"req/sec\" FROM \"MSDemo\".\"autogen\".\"minio_http_requests_duration_seconds\" WHERE time > :dashboardTime: AND \"ipendpoint\"='minio_1_ep1' GROUP BY time(:interval:) FILL(null)",
-          "queryConfig": {
-            "database": "",
-            "measurement": "",
-            "retentionPolicy": "",
-            "fields": [],
-            "tags": {},
-            "groupBy": {
-              "time": "",
-              "tags": []
-            },
-            "areTagsAccepted": false,
-            "rawText": "SELECT derivative(max(\"sum\"),10s)/derivative(max(\"count\"),10s) AS \"req/sec\" FROM \"MSDemo\".\"autogen\".\"minio_http_requests_duration_seconds\" WHERE time > :dashboardTime: AND \"ipendpoint\"='minio_1_ep1' GROUP BY time(:interval:) FILL(null)",
-            "range": null,
-            "shifts": null
-          },
-          "source": "/chronograf/v1/sources/1"
-        }
-      ],
-      "axes": {
-        "x": {
-          "bounds": [
-            "",
-            ""
-          ],
-          "label": "",
-          "prefix": "",
-          "suffix": "",
-          "base": "10",
-          "scale": "linear"
-        },
-        "y": {
-          "bounds": [
-            "",
-            ""
-          ],
-          "label": "",
-          "prefix": "",
-          "suffix": "",
-          "base": "10",
-          "scale": "linear"
-        },
-        "y2": {
-          "bounds": [
-            "",
-            ""
-          ],
-          "label": "",
-          "prefix": "",
-          "suffix": "",
-          "base": "10",
-          "scale": "linear"
-        }
-      },
-      "type": "line",
-      "colors": [
-        {
-          "id": "3e61eee6-fd07-4076-9c65-4ccc03565f52",
-          "type": "scale",
-          "hex": "#31C0F6",
-          "name": "Nineteen Eighty Four",
-          "value": "0"
-        },
-        {
-          "id": "3e698c4b-7ef0-4121-889c-220e79081737",
-          "type": "scale",
-          "hex": "#A500A5",
-          "name": "Nineteen Eighty Four",
-          "value": "0"
-        },
-        {
-          "id": "4fafd9be-a56c-4acb-b2e6-ff2a82c41911",
-          "type": "scale",
-          "hex": "#FF7E27",
-          "name": "Nineteen Eighty Four",
-          "value": "0"
-        }
-      ],
-      "legend": {},
-      "tableOptions": {
-        "timeFormat": "MM/DD/YYYY HH:mm:ss",
-        "verticalTimeAxis": true,
-        "sortBy": {
-          "internalName": "time",
-          "displayName": "",
-          "visible": true
-        },
-        "wrapping": "truncate",
-        "fieldNames": [
-          {
-            "internalName": "time",
-            "displayName": "",
-            "visible": true
-          }
-        ],
-        "fixFirstColumn": true
-      },
-      "links": {
-        "self": "/chronograf/v1/dashboards/2/cells/ec5ffe3d-d1c1-4766-8ad6-22c48e534e41"
-      }
-    },
-    {
-      "i": "22c84b31-df6c-4582-a40e-e2bbc4c3145b",
-      "x": 3,
-      "y": 0,
-      "w": 3,
-      "h": 3,
-      "name": "MINIO Memory usage",
-      "queries": [
-        {
-          "query": "SELECT mean(\"used\") AS \"Avg bytes used\" FROM \"MSDemo\".\"autogen\".\"mem\" WHERE time > :dashboardTime: AND \"ipendpoint\"='minio_1_ep1' GROUP BY time(:interval:) FILL(null)",
-          "queryConfig": {
-            "database": "MSDemo",
-            "measurement": "mem",
-            "retentionPolicy": "autogen",
-            "fields": [
-              {
-                "value": "mean",
-                "type": "func",
-                "alias": "Avg bytes used",
-                "args": [
-                  {
-                    "value": "used",
-                    "type": "field",
-                    "alias": ""
-                  }
-                ]
-              }
-            ],
-            "tags": {
-              "ipendpoint": [
-                "minio_1_ep1"
-              ]
-            },
-            "groupBy": {
-              "time": "auto",
-              "tags": []
-            },
-            "areTagsAccepted": true,
-            "fill": "null",
-            "rawText": null,
-            "range": null,
-            "shifts": null
-          },
-          "source": "/chronograf/v1/sources/1"
-        }
-      ],
-      "axes": {
-        "x": {
-          "bounds": [
-            "",
-            ""
-          ],
-          "label": "",
-          "prefix": "",
-          "suffix": "",
-          "base": "10",
-          "scale": "linear"
-        },
-        "y": {
-          "bounds": [
-            "",
-            ""
-          ],
-          "label": "Bytes used (bytes)",
-          "prefix": "",
-          "suffix": "",
-          "base": "10",
-          "scale": "linear"
-        },
-        "y2": {
-          "bounds": [
-            "",
-            ""
-          ],
-          "label": "",
-          "prefix": "",
-          "suffix": "",
-          "base": "10",
-          "scale": "linear"
-        }
-      },
-      "type": "line",
-      "colors": [
-        {
-          "id": "3e61eee6-fd07-4076-9c65-4ccc03565f52",
-          "type": "scale",
-          "hex": "#31C0F6",
-          "name": "Nineteen Eighty Four",
-          "value": "0"
-        },
-        {
-          "id": "3e698c4b-7ef0-4121-889c-220e79081737",
-          "type": "scale",
-          "hex": "#A500A5",
-          "name": "Nineteen Eighty Four",
-          "value": "0"
-        },
-        {
-          "id": "4fafd9be-a56c-4acb-b2e6-ff2a82c41911",
-          "type": "scale",
-          "hex": "#FF7E27",
-          "name": "Nineteen Eighty Four",
-          "value": "0"
-        }
-      ],
-      "legend": {},
-      "tableOptions": {
-        "timeFormat": "MM/DD/YYYY HH:mm:ss",
-        "verticalTimeAxis": true,
-        "sortBy": {
-          "internalName": "time",
-          "displayName": "",
-          "visible": true
-        },
-        "wrapping": "truncate",
-        "fieldNames": [
-          {
-            "internalName": "time",
-            "displayName": "",
-            "visible": true
-          }
-        ],
-        "fixFirstColumn": true
-      },
-      "links": {
-        "self": "/chronograf/v1/dashboards/2/cells/22c84b31-df6c-4582-a40e-e2bbc4c3145b"
-      }
-    },
-    {
-      "i": "11f77b6f-e5dc-4732-b9d2-7730e27f0bca",
-      "x": 0,
-      "y": 0,
-      "w": 3,
-      "h": 3,
-      "name": "MINIO CPU Usage",
-      "queries": [
-        {
-          "query": "SELECT mean(\"load1\") AS \"mean_load1\" FROM \"MSDemo\".\"autogen\".\"system\" WHERE time > :dashboardTime: AND \"ipendpoint\"='minio_1_ep1' GROUP BY time(:interval:) FILL(null)",
-          "queryConfig": {
-            "database": "MSDemo",
-            "measurement": "system",
-            "retentionPolicy": "autogen",
-            "fields": [
-              {
-                "value": "mean",
-                "type": "func",
-                "alias": "mean_load1",
-                "args": [
-                  {
-                    "value": "load1",
-                    "type": "field",
-                    "alias": ""
-                  }
-                ]
-              }
-            ],
-            "tags": {
-              "ipendpoint": [
-                "minio_1_ep1"
-              ]
-            },
-            "groupBy": {
-              "time": "auto",
-              "tags": []
-            },
-            "areTagsAccepted": true,
-            "fill": "null",
-            "rawText": null,
-            "range": null,
-            "shifts": null
-          },
-          "source": ""
-        }
-      ],
-      "axes": {
-        "x": {
-          "bounds": [
-            "",
-            ""
-          ],
-          "label": "",
-          "prefix": "",
-          "suffix": "",
-          "base": "10",
-          "scale": "linear"
-        },
-        "y": {
-          "bounds": [
-            "",
-            ""
-          ],
-          "label": "CPU usage (Load1)",
-          "prefix": "",
-          "suffix": "",
-          "base": "10",
-          "scale": "linear"
-        },
-        "y2": {
-          "bounds": [
-            "",
-            ""
-          ],
-          "label": "",
-          "prefix": "",
-          "suffix": "",
-          "base": "10",
-          "scale": "linear"
-        }
-      },
-      "type": "line",
-      "colors": [
-        {
-          "id": "3e61eee6-fd07-4076-9c65-4ccc03565f52",
-          "type": "scale",
-          "hex": "#31C0F6",
-          "name": "Nineteen Eighty Four",
-          "value": "0"
-        },
-        {
-          "id": "3e698c4b-7ef0-4121-889c-220e79081737",
-          "type": "scale",
-          "hex": "#A500A5",
-          "name": "Nineteen Eighty Four",
-          "value": "0"
-        },
-        {
-          "id": "4fafd9be-a56c-4acb-b2e6-ff2a82c41911",
-          "type": "scale",
-          "hex": "#FF7E27",
-          "name": "Nineteen Eighty Four",
-          "value": "0"
-        }
-      ],
-      "legend": {},
-      "tableOptions": {
-        "timeFormat": "MM/DD/YYYY HH:mm:ss",
-        "verticalTimeAxis": true,
-        "sortBy": {
-          "internalName": "time",
-          "displayName": "",
-          "visible": true
-        },
-        "wrapping": "truncate",
-        "fieldNames": [
-          {
-            "internalName": "time",
-            "displayName": "",
-            "visible": true
-          }
-        ],
-        "fixFirstColumn": true
-      },
-      "links": {
-        "self": "/chronograf/v1/dashboards/2/cells/11f77b6f-e5dc-4732-b9d2-7730e27f0bca"
-      }
-    }
-  ],
-  "templates": [],
-  "name": "Minio 1 metrics",
-  "organization": "default",
-  "links": {
-    "self": "/chronograf/v1/dashboards/2",
-    "cells": "/chronograf/v1/dashboards/2/cells",
-    "templates": "/chronograf/v1/dashboards/2/templates"
-  }
-}
diff --git a/src/test/clmctest/workshopdemo/dashboards/NGINX_ep1_dash.json b/src/test/clmctest/workshopdemo/dashboards/NGINX_ep1_dash.json
deleted file mode 100644
index 6a74d499deb55288e8624530fef0e049c35e3f6b..0000000000000000000000000000000000000000
--- a/src/test/clmctest/workshopdemo/dashboards/NGINX_ep1_dash.json
+++ /dev/null
@@ -1,715 +0,0 @@
-{
-  "id": 1,
-  "cells": [
-    {
-      "i": "f1a47a99-0608-4a03-b9a0-475d8c37e4fd",
-      "x": 9,
-      "y": 0,
-      "w": 3,
-      "h": 3,
-      "name": "Network TX",
-      "queries": [
-        {
-          "query": "SELECT derivative(max(\"bytes_sent\")) / 62914560 AS \"TX_Mb_per_second\" FROM \"MSDemo\".\"autogen\".\"net\" WHERE time > :dashboardTime: AND \"ipendpoint\"='nginx_1_ep1' GROUP BY time(1m)",
-          "queryConfig": {
-            "database": "",
-            "measurement": "",
-            "retentionPolicy": "",
-            "fields": [],
-            "tags": {},
-            "groupBy": {
-              "time": "",
-              "tags": []
-            },
-            "areTagsAccepted": false,
-            "rawText": "SELECT derivative(max(\"bytes_sent\")) / 62914560 AS \"TX_Mb_per_second\" FROM \"MSDemo\".\"autogen\".\"net\" WHERE time > :dashboardTime: AND \"ipendpoint\"='nginx_1_ep1' GROUP BY time(1m)",
-            "range": null,
-            "shifts": null
-          },
-          "source": "/chronograf/v1/sources/1"
-        }
-      ],
-      "axes": {
-        "x": {
-          "bounds": [
-            "",
-            ""
-          ],
-          "label": "",
-          "prefix": "",
-          "suffix": "",
-          "base": "10",
-          "scale": "linear"
-        },
-        "y": {
-          "bounds": [
-            "",
-            ""
-          ],
-          "label": "Bytes sent / Mb per second",
-          "prefix": "",
-          "suffix": "",
-          "base": "10",
-          "scale": "linear"
-        },
-        "y2": {
-          "bounds": [
-            "",
-            ""
-          ],
-          "label": "",
-          "prefix": "",
-          "suffix": "",
-          "base": "10",
-          "scale": "linear"
-        }
-      },
-      "type": "line-stepplot",
-      "colors": [
-        {
-          "id": "810ac4ac-1b30-4aab-be2c-d422aa070149",
-          "type": "scale",
-          "hex": "#31C0F6",
-          "name": "Nineteen Eighty Four",
-          "value": "0"
-        },
-        {
-          "id": "c9abe6da-7d4a-49fb-bd1c-8d02fa61f36a",
-          "type": "scale",
-          "hex": "#A500A5",
-          "name": "Nineteen Eighty Four",
-          "value": "0"
-        },
-        {
-          "id": "48e5bb0a-72e5-41d1-8f98-36737ca74808",
-          "type": "scale",
-          "hex": "#FF7E27",
-          "name": "Nineteen Eighty Four",
-          "value": "0"
-        }
-      ],
-      "legend": {},
-      "tableOptions": {
-        "timeFormat": "MM/DD/YYYY HH:mm:ss",
-        "verticalTimeAxis": true,
-        "sortBy": {
-          "internalName": "time",
-          "displayName": "",
-          "visible": true
-        },
-        "wrapping": "truncate",
-        "fieldNames": [
-          {
-            "internalName": "time",
-            "displayName": "",
-            "visible": true
-          }
-        ],
-        "fixFirstColumn": true
-      },
-      "links": {
-        "self": "/chronograf/v1/dashboards/1/cells/f1a47a99-0608-4a03-b9a0-475d8c37e4fd"
-      }
-    },
-    {
-      "i": "45d67caa-3cfb-4b86-8819-c64d13d4df15",
-      "x": 6,
-      "y": 0,
-      "w": 3,
-      "h": 3,
-      "name": "Network RX",
-      "queries": [
-        {
-          "query": "SELECT derivative(max(\"bytes_recv\")) / 62914560 AS \"RX_Mb_per_second\" FROM \"MSDemo\".\"autogen\".\"net\" WHERE time > :dashboardTime: AND \"ipendpoint\"='nginx_1_ep1' GROUP By time(1m) fill(previous)",
-          "queryConfig": {
-            "database": "",
-            "measurement": "",
-            "retentionPolicy": "",
-            "fields": [],
-            "tags": {},
-            "groupBy": {
-              "time": "",
-              "tags": []
-            },
-            "areTagsAccepted": false,
-            "rawText": "SELECT derivative(max(\"bytes_recv\")) / 62914560 AS \"RX_Mb_per_second\" FROM \"MSDemo\".\"autogen\".\"net\" WHERE time > :dashboardTime: AND \"ipendpoint\"='nginx_1_ep1' GROUP By time(1m) fill(previous)",
-            "range": null,
-            "shifts": null
-          },
-          "source": "/chronograf/v1/sources/1"
-        }
-      ],
-      "axes": {
-        "x": {
-          "bounds": [
-            "",
-            ""
-          ],
-          "label": "",
-          "prefix": "",
-          "suffix": "",
-          "base": "10",
-          "scale": "linear"
-        },
-        "y": {
-          "bounds": [
-            "",
-            ""
-          ],
-          "label": "Bytes received / Mb per second",
-          "prefix": "",
-          "suffix": "",
-          "base": "10",
-          "scale": "linear"
-        },
-        "y2": {
-          "bounds": [
-            "",
-            ""
-          ],
-          "label": "",
-          "prefix": "",
-          "suffix": "",
-          "base": "10",
-          "scale": "linear"
-        }
-      },
-      "type": "line-stepplot",
-      "colors": [
-        {
-          "id": "810ac4ac-1b30-4aab-be2c-d422aa070149",
-          "type": "scale",
-          "hex": "#31C0F6",
-          "name": "Nineteen Eighty Four",
-          "value": "0"
-        },
-        {
-          "id": "c9abe6da-7d4a-49fb-bd1c-8d02fa61f36a",
-          "type": "scale",
-          "hex": "#A500A5",
-          "name": "Nineteen Eighty Four",
-          "value": "0"
-        },
-        {
-          "id": "48e5bb0a-72e5-41d1-8f98-36737ca74808",
-          "type": "scale",
-          "hex": "#FF7E27",
-          "name": "Nineteen Eighty Four",
-          "value": "0"
-        }
-      ],
-      "legend": {},
-      "tableOptions": {
-        "timeFormat": "MM/DD/YYYY HH:mm:ss",
-        "verticalTimeAxis": true,
-        "sortBy": {
-          "internalName": "time",
-          "displayName": "",
-          "visible": true
-        },
-        "wrapping": "truncate",
-        "fieldNames": [
-          {
-            "internalName": "time",
-            "displayName": "",
-            "visible": true
-          }
-        ],
-        "fixFirstColumn": true
-      },
-      "links": {
-        "self": "/chronograf/v1/dashboards/1/cells/45d67caa-3cfb-4b86-8819-c64d13d4df15"
-      }
-    },
-    {
-      "i": "b65ef3f9-aa81-430c-9cdd-08edb062e50a",
-      "x": 0,
-      "y": 0,
-      "w": 3,
-      "h": 3,
-      "name": "CPU usage",
-      "queries": [
-        {
-          "query": "SELECT mean(\"cpu_usage\") AS \"mean_cpu_usage\" FROM \"MSDemo\".\"autogen\".\"procstat\" WHERE time > :dashboardTime: AND \"exe\"='nginx' AND \"ipendpoint\"='nginx_1_ep1' GROUP BY time(:interval:) FILL(null)",
-          "queryConfig": {
-            "database": "MSDemo",
-            "measurement": "procstat",
-            "retentionPolicy": "autogen",
-            "fields": [
-              {
-                "value": "mean",
-                "type": "func",
-                "alias": "mean_cpu_usage",
-                "args": [
-                  {
-                    "value": "cpu_usage",
-                    "type": "field",
-                    "alias": ""
-                  }
-                ]
-              }
-            ],
-            "tags": {
-              "exe": [
-                "nginx"
-              ],
-              "ipendpoint": [
-                "nginx_1_ep1"
-              ]
-            },
-            "groupBy": {
-              "time": "auto",
-              "tags": []
-            },
-            "areTagsAccepted": true,
-            "fill": "null",
-            "rawText": null,
-            "range": null,
-            "shifts": null
-          },
-          "source": "/chronograf/v1/sources/1"
-        }
-      ],
-      "axes": {
-        "x": {
-          "bounds": [
-            "",
-            ""
-          ],
-          "label": "",
-          "prefix": "",
-          "suffix": "",
-          "base": "10",
-          "scale": "linear"
-        },
-        "y": {
-          "bounds": [
-            "",
-            ""
-          ],
-          "label": "CPU use (load1)",
-          "prefix": "",
-          "suffix": "",
-          "base": "10",
-          "scale": "linear"
-        },
-        "y2": {
-          "bounds": [
-            "",
-            ""
-          ],
-          "label": "",
-          "prefix": "",
-          "suffix": "",
-          "base": "10",
-          "scale": "linear"
-        }
-      },
-      "type": "line",
-      "colors": [
-        {
-          "id": "3e61eee6-fd07-4076-9c65-4ccc03565f52",
-          "type": "scale",
-          "hex": "#31C0F6",
-          "name": "Nineteen Eighty Four",
-          "value": "0"
-        },
-        {
-          "id": "3e698c4b-7ef0-4121-889c-220e79081737",
-          "type": "scale",
-          "hex": "#A500A5",
-          "name": "Nineteen Eighty Four",
-          "value": "0"
-        },
-        {
-          "id": "4fafd9be-a56c-4acb-b2e6-ff2a82c41911",
-          "type": "scale",
-          "hex": "#FF7E27",
-          "name": "Nineteen Eighty Four",
-          "value": "0"
-        }
-      ],
-      "legend": {},
-      "tableOptions": {
-        "timeFormat": "MM/DD/YYYY HH:mm:ss",
-        "verticalTimeAxis": true,
-        "sortBy": {
-          "internalName": "time",
-          "displayName": "",
-          "visible": true
-        },
-        "wrapping": "truncate",
-        "fieldNames": [
-          {
-            "internalName": "time",
-            "displayName": "",
-            "visible": true
-          }
-        ],
-        "fixFirstColumn": true
-      },
-      "links": {
-        "self": "/chronograf/v1/dashboards/1/cells/b65ef3f9-aa81-430c-9cdd-08edb062e50a"
-      }
-    },
-    {
-      "i": "48904941-3337-4ba8-b828-44d875d720f9",
-      "x": 0,
-      "y": 3,
-      "w": 6,
-      "h": 3,
-      "name": "requests/second",
-      "queries": [
-        {
-          "query": "SELECT non_negative_derivative(\"requests\") AS \"requests/sec\" FROM \"MSDemo\".\"autogen\".\"nginx\" WHERE time > :dashboardTime: AND \"ipendpoint\"='nginx_1_ep1'",
-          "queryConfig": {
-            "database": "",
-            "measurement": "",
-            "retentionPolicy": "",
-            "fields": [],
-            "tags": {},
-            "groupBy": {
-              "time": "",
-              "tags": []
-            },
-            "areTagsAccepted": false,
-            "rawText": "SELECT non_negative_derivative(\"requests\") AS \"requests/sec\" FROM \"MSDemo\".\"autogen\".\"nginx\" WHERE time > :dashboardTime: AND \"ipendpoint\"='nginx_1_ep1'",
-            "range": null,
-            "shifts": null
-          },
-          "source": "/chronograf/v1/sources/1"
-        }
-      ],
-      "axes": {
-        "x": {
-          "bounds": [
-            "",
-            ""
-          ],
-          "label": "",
-          "prefix": "",
-          "suffix": "",
-          "base": "10",
-          "scale": "linear"
-        },
-        "y": {
-          "bounds": [
-            "",
-            ""
-          ],
-          "label": "",
-          "prefix": "",
-          "suffix": "",
-          "base": "10",
-          "scale": "linear"
-        },
-        "y2": {
-          "bounds": [
-            "",
-            ""
-          ],
-          "label": "",
-          "prefix": "",
-          "suffix": "",
-          "base": "10",
-          "scale": "linear"
-        }
-      },
-      "type": "line",
-      "colors": [
-        {
-          "id": "810ac4ac-1b30-4aab-be2c-d422aa070149",
-          "type": "scale",
-          "hex": "#31C0F6",
-          "name": "Nineteen Eighty Four",
-          "value": "0"
-        },
-        {
-          "id": "c9abe6da-7d4a-49fb-bd1c-8d02fa61f36a",
-          "type": "scale",
-          "hex": "#A500A5",
-          "name": "Nineteen Eighty Four",
-          "value": "0"
-        },
-        {
-          "id": "48e5bb0a-72e5-41d1-8f98-36737ca74808",
-          "type": "scale",
-          "hex": "#FF7E27",
-          "name": "Nineteen Eighty Four",
-          "value": "0"
-        }
-      ],
-      "legend": {},
-      "tableOptions": {
-        "timeFormat": "MM/DD/YYYY HH:mm:ss",
-        "verticalTimeAxis": true,
-        "sortBy": {
-          "internalName": "time",
-          "displayName": "",
-          "visible": true
-        },
-        "wrapping": "truncate",
-        "fieldNames": [
-          {
-            "internalName": "time",
-            "displayName": "",
-            "visible": true
-          }
-        ],
-        "fixFirstColumn": true
-      },
-      "links": {
-        "self": "/chronograf/v1/dashboards/1/cells/48904941-3337-4ba8-b828-44d875d720f9"
-      }
-    },
-    {
-      "i": "2fa94807-bbee-49d3-b332-f14928b61c99",
-      "x": 6,
-      "y": 3,
-      "w": 6,
-      "h": 3,
-      "name": "responses/second",
-      "queries": [
-        {
-          "query": "SELECT non_negative_derivative(\"handled\") AS \"responses/sec\" FROM \"MSDemo\".\"autogen\".\"nginx\" WHERE time > :dashboardTime: AND \"ipendpoint\"='nginx_1_ep1' ",
-          "queryConfig": {
-            "database": "",
-            "measurement": "",
-            "retentionPolicy": "",
-            "fields": [],
-            "tags": {},
-            "groupBy": {
-              "time": "",
-              "tags": []
-            },
-            "areTagsAccepted": false,
-            "rawText": "SELECT non_negative_derivative(\"handled\") AS \"responses/sec\" FROM \"MSDemo\".\"autogen\".\"nginx\" WHERE time > :dashboardTime: AND \"ipendpoint\"='nginx_1_ep1' ",
-            "range": null,
-            "shifts": null
-          },
-          "source": "/chronograf/v1/sources/1"
-        }
-      ],
-      "axes": {
-        "x": {
-          "bounds": [
-            "",
-            ""
-          ],
-          "label": "",
-          "prefix": "",
-          "suffix": "",
-          "base": "10",
-          "scale": "linear"
-        },
-        "y": {
-          "bounds": [
-            "",
-            ""
-          ],
-          "label": "",
-          "prefix": "",
-          "suffix": "",
-          "base": "10",
-          "scale": "linear"
-        },
-        "y2": {
-          "bounds": [
-            "",
-            ""
-          ],
-          "label": "",
-          "prefix": "",
-          "suffix": "",
-          "base": "10",
-          "scale": "linear"
-        }
-      },
-      "type": "line",
-      "colors": [
-        {
-          "id": "810ac4ac-1b30-4aab-be2c-d422aa070149",
-          "type": "scale",
-          "hex": "#31C0F6",
-          "name": "Nineteen Eighty Four",
-          "value": "0"
-        },
-        {
-          "id": "c9abe6da-7d4a-49fb-bd1c-8d02fa61f36a",
-          "type": "scale",
-          "hex": "#A500A5",
-          "name": "Nineteen Eighty Four",
-          "value": "0"
-        },
-        {
-          "id": "48e5bb0a-72e5-41d1-8f98-36737ca74808",
-          "type": "scale",
-          "hex": "#FF7E27",
-          "name": "Nineteen Eighty Four",
-          "value": "0"
-        }
-      ],
-      "legend": {},
-      "tableOptions": {
-        "timeFormat": "MM/DD/YYYY HH:mm:ss",
-        "verticalTimeAxis": true,
-        "sortBy": {
-          "internalName": "time",
-          "displayName": "",
-          "visible": true
-        },
-        "wrapping": "truncate",
-        "fieldNames": [
-          {
-            "internalName": "time",
-            "displayName": "",
-            "visible": true
-          }
-        ],
-        "fixFirstColumn": true
-      },
-      "links": {
-        "self": "/chronograf/v1/dashboards/1/cells/2fa94807-bbee-49d3-b332-f14928b61c99"
-      }
-    },
-    {
-      "i": "d72f8453-5375-4559-9791-f507ce9e0785",
-      "x": 3,
-      "y": 0,
-      "w": 3,
-      "h": 3,
-      "name": "Memory usage",
-      "queries": [
-        {
-          "query": "SELECT mean(\"memory_rss\") AS \"mean_memory_rss\" FROM \"MSDemo\".\"autogen\".\"procstat\" WHERE time > :dashboardTime: AND \"exe\"='nginx' AND \"ipendpoint\"='nginx_1_ep1' GROUP BY time(:interval:) FILL(null)",
-          "queryConfig": {
-            "database": "MSDemo",
-            "measurement": "procstat",
-            "retentionPolicy": "autogen",
-            "fields": [
-              {
-                "value": "mean",
-                "type": "func",
-                "alias": "mean_memory_rss",
-                "args": [
-                  {
-                    "value": "memory_rss",
-                    "type": "field",
-                    "alias": ""
-                  }
-                ]
-              }
-            ],
-            "tags": {
-              "exe": [
-                "nginx"
-              ],
-              "ipendpoint": [
-                "nginx_1_ep1"
-              ]
-            },
-            "groupBy": {
-              "time": "auto",
-              "tags": []
-            },
-            "areTagsAccepted": true,
-            "fill": "null",
-            "rawText": null,
-            "range": null,
-            "shifts": null
-          },
-          "source": "/chronograf/v1/sources/1"
-        }
-      ],
-      "axes": {
-        "x": {
-          "bounds": [
-            "",
-            ""
-          ],
-          "label": "",
-          "prefix": "",
-          "suffix": "",
-          "base": "10",
-          "scale": "linear"
-        },
-        "y": {
-          "bounds": [
-            "",
-            ""
-          ],
-          "label": "Bytes used (MBytes)",
-          "prefix": "",
-          "suffix": "",
-          "base": "10",
-          "scale": "linear"
-        },
-        "y2": {
-          "bounds": [
-            "",
-            ""
-          ],
-          "label": "",
-          "prefix": "",
-          "suffix": "",
-          "base": "10",
-          "scale": "linear"
-        }
-      },
-      "type": "line",
-      "colors": [
-        {
-          "id": "810ac4ac-1b30-4aab-be2c-d422aa070149",
-          "type": "scale",
-          "hex": "#31C0F6",
-          "name": "Nineteen Eighty Four",
-          "value": "0"
-        },
-        {
-          "id": "c9abe6da-7d4a-49fb-bd1c-8d02fa61f36a",
-          "type": "scale",
-          "hex": "#A500A5",
-          "name": "Nineteen Eighty Four",
-          "value": "0"
-        },
-        {
-          "id": "48e5bb0a-72e5-41d1-8f98-36737ca74808",
-          "type": "scale",
-          "hex": "#FF7E27",
-          "name": "Nineteen Eighty Four",
-          "value": "0"
-        }
-      ],
-      "legend": {},
-      "tableOptions": {
-        "timeFormat": "MM/DD/YYYY HH:mm:ss",
-        "verticalTimeAxis": true,
-        "sortBy": {
-          "internalName": "time",
-          "displayName": "",
-          "visible": true
-        },
-        "wrapping": "truncate",
-        "fieldNames": [
-          {
-            "internalName": "time",
-            "displayName": "",
-            "visible": true
-          }
-        ],
-        "fixFirstColumn": true
-      },
-      "links": {
-        "self": "/chronograf/v1/dashboards/1/cells/d72f8453-5375-4559-9791-f507ce9e0785"
-      }
-    }
-  ],
-  "templates": [],
-  "name": "nginx_1_ep1 metrics",
-  "organization": "default",
-  "links": {
-    "self": "/chronograf/v1/dashboards/1",
-    "cells": "/chronograf/v1/dashboards/1/cells",
-    "templates": "/chronograf/v1/dashboards/1/templates"
-  }
-}
diff --git a/src/test/clmctest/workshopdemo/dashboards/dc_dash.json b/src/test/clmctest/workshopdemo/dashboards/dc_dash.json
deleted file mode 100644
index 7d98cf5c9422218b10513de1e66564c78450a639..0000000000000000000000000000000000000000
--- a/src/test/clmctest/workshopdemo/dashboards/dc_dash.json
+++ /dev/null
@@ -1,147 +0,0 @@
-{
-  "id": 4,
-  "cells": [
-    {
-      "i": "5df7003f-6367-40e1-9eb4-c3ac9d92b05c",
-      "x": 0,
-      "y": 0,
-      "w": 6,
-      "h": 4,
-      "name": "Mean %CPU",
-      "queries": [
-        {
-          "query": "SELECT mean(\"cpu_usage\") AS \"mean_cpu_usage\" FROM \"MSDemo\".\"autogen\".\"procstat\" WHERE time > :dashboardTime: AND \"location\"= :location: GROUP BY time(:interval:) FILL(null)",
-          "queryConfig": {
-            "database": "",
-            "measurement": "",
-            "retentionPolicy": "",
-            "fields": [],
-            "tags": {},
-            "groupBy": {
-              "time": "",
-              "tags": []
-            },
-            "areTagsAccepted": false,
-            "rawText": "SELECT mean(\"cpu_usage\") AS \"mean_cpu_usage\" FROM \"MSDemo\".\"autogen\".\"procstat\" WHERE time > :dashboardTime: AND \"location\"= :location: GROUP BY time(:interval:) FILL(null)",
-            "range": null,
-            "shifts": null
-          },
-          "source": "/chronograf/v1/sources/1"
-        }
-      ],
-      "axes": {
-        "x": {
-          "bounds": [
-            "",
-            ""
-          ],
-          "label": "",
-          "prefix": "",
-          "suffix": "",
-          "base": "10",
-          "scale": "linear"
-        },
-        "y": {
-          "bounds": [
-            "",
-            ""
-          ],
-          "label": "Mean %CPU",
-          "prefix": "",
-          "suffix": "",
-          "base": "10",
-          "scale": "linear"
-        },
-        "y2": {
-          "bounds": [
-            "",
-            ""
-          ],
-          "label": "",
-          "prefix": "",
-          "suffix": "",
-          "base": "10",
-          "scale": "linear"
-        }
-      },
-      "type": "line",
-      "colors": [
-        {
-          "id": "2f5981b6-6f85-4efc-989c-9da90fe54189",
-          "type": "scale",
-          "hex": "#31C0F6",
-          "name": "Nineteen Eighty Four",
-          "value": "0"
-        },
-        {
-          "id": "696e12a0-4b7d-4a8f-9d95-a5be5ef3e8b8",
-          "type": "scale",
-          "hex": "#A500A5",
-          "name": "Nineteen Eighty Four",
-          "value": "0"
-        },
-        {
-          "id": "f3788c7b-bdbe-4d14-8439-c6f3b4db75e9",
-          "type": "scale",
-          "hex": "#FF7E27",
-          "name": "Nineteen Eighty Four",
-          "value": "0"
-        }
-      ],
-      "legend": {},
-      "tableOptions": {
-        "timeFormat": "MM/DD/YYYY HH:mm:ss",
-        "verticalTimeAxis": true,
-        "sortBy": {
-          "internalName": "time",
-          "displayName": "",
-          "visible": true
-        },
-        "wrapping": "truncate",
-        "fieldNames": [
-          {
-            "internalName": "time",
-            "displayName": "",
-            "visible": true
-          }
-        ],
-        "fixFirstColumn": true
-      },
-      "links": {
-        "self": "/chronograf/v1/dashboards/4/cells/5df7003f-6367-40e1-9eb4-c3ac9d92b05c"
-      }
-    }
-  ],
-  "templates": [
-    {
-      "tempVar": ":location:",
-      "values": [
-        {
-          "value": "DC3",
-          "type": "tagValue",
-          "selected": true
-        }
-      ],
-      "id": "51e972f9-c4c3-4bcf-a264-9f95ffa86017",
-      "type": "tagValues",
-      "label": "",
-      "query": {
-        "influxql": "SHOW TAG VALUES ON :database: FROM :measurement: WITH KEY=:tagKey:",
-        "db": "MSDemo",
-        "measurement": "cpu",
-        "tagKey": "location",
-        "fieldKey": ""
-      },
-      "links": {
-        "self": "/chronograf/v1/dashboards/4/templates/51e972f9-c4c3-4bcf-a264-9f95ffa86017"
-      }
-    }
-  ],
-  "name": "Data Centre",
-  "organization": "default",
-  "links": {
-    "self": "/chronograf/v1/dashboards/4",
-    "cells": "/chronograf/v1/dashboards/4/cells",
-    "templates": "/chronograf/v1/dashboards/4/templates"
-  }
-}
diff --git a/src/test/clmctest/workshopdemo/dashboards/minioKPIDashboard.json b/src/test/clmctest/workshopdemo/dashboards/minioKPIDashboard.json
deleted file mode 100644
index 84d9b222415905eaa6c8e9784e9143ecd5cefd0a..0000000000000000000000000000000000000000
--- a/src/test/clmctest/workshopdemo/dashboards/minioKPIDashboard.json
+++ /dev/null
@@ -1,250 +0,0 @@
-{
-    "id": 1,
-    "cells": [
-        {
-            "i": "274ae38a-c72a-4d39-8a93-1d9855e06076",
-            "x": 2,
-            "y": 0,
-            "w": 4,
-            "h": 3,
-            "name": "MINIO response % within 0.003 seconds",
-            "queries": [
-                {
-                    "query": "SELECT mean(\"RT at 0.003s\") AS \"mean_RT at 0.003s\" FROM \"MSDemo\".\"autogen\".\"minio_sf_RT_KPI\" WHERE time > now() - 15m GROUP BY time(:interval:) FILL(null)",
-                    "queryConfig": {
-                        "database": "MSDemo",
-                        "measurement": "minio_sf_RT_KPI",
-                        "retentionPolicy": "autogen",
-                        "fields": [
-                            {
-                                "value": "mean",
-                                "type": "func",
-                                "alias": "mean_RT at 0.003s",
-                                "args": [
-                                    {
-                                        "value": "RT at 0.003s",
-                                        "type": "field",
-                                        "alias": ""
-                                    }
-                                ]
-                            }
-                        ],
-                        "tags": {},
-                        "groupBy": {
-                            "time": "auto",
-                            "tags": []
-                        },
-                        "areTagsAccepted": false,
-                        "fill": "null",
-                        "rawText": null,
-                        "range": {
-                            "upper": "",
-                            "lower": "now() - 15m"
-                        },
-                        "shifts": null
-                    },
-                    "source": "/chronograf/v1/sources/1"
-                }
-            ],
-            "axes": {
-                "x": {
-                    "bounds": [
-                        "",
-                        ""
-                    ],
-                    "label": "",
-                    "prefix": "",
-                    "suffix": "",
-                    "base": "10",
-                    "scale": "linear"
-                },
-                "y": {
-                    "bounds": [
-                        "",
-                        ""
-                    ],
-                    "label": "",
-                    "prefix": "",
-                    "suffix": "",
-                    "base": "10",
-                    "scale": "linear"
-                },
-                "y2": {
-                    "bounds": [
-                        "",
-                        ""
-                    ],
-                    "label": "",
-                    "prefix": "",
-                    "suffix": "",
-                    "base": "10",
-                    "scale": "linear"
-                }
-            },
-            "type": "line",
-            "colors": [
-                {
-                    "id": "e4b985dc-2486-47bd-a67e-3384a7920ecd",
-                    "type": "scale",
-                    "hex": "#31C0F6",
-                    "name": "Nineteen Eighty Four",
-                    "value": "0"
-                },
-                {
-                    "id": "697dcc7f-e9ff-4096-824c-2c474726865e",
-                    "type": "scale",
-                    "hex": "#A500A5",
-                    "name": "Nineteen Eighty Four",
-                    "value": "0"
-                },
-                {
-                    "id": "f8c97f56-d58a-4573-8334-472fef7c3132",
-                    "type": "scale",
-                    "hex": "#FF7E27",
-                    "name": "Nineteen Eighty Four",
-                    "value": "0"
-                }
-            ],
-            "legend": {},
-            "tableOptions": {
-                "timeFormat": "MM/DD/YYYY HH:mm:ss",
-                "verticalTimeAxis": true,
-                "sortBy": {
-                    "internalName": "time",
-                    "displayName": "",
-                    "visible": true
-                },
-                "wrapping": "truncate",
-                "fieldNames": [
-                    {
-                        "internalName": "time",
-                        "displayName": "",
-                        "visible": true
-                    }
-                ],
-                "fixFirstColumn": true
-            },
-            "links": {
-                "self": "/chronograf/v1/dashboards/1/cells/274ae38a-c72a-4d39-8a93-1d9855e06076"
-            }
-        },
-        {
-            "i": "dd3e3609-79d5-46bc-8e49-79b737b0f5e2",
-            "x": 0,
-            "y": 0,
-            "w": 2,
-            "h": 3,
-            "name": "MINIO response time continuous query",
-            "queries": [
-                {
-                    "query": "SELECT (mean(\"0.005\")/mean(\"count\")) as \"RT at 0.003s\" INTO \"MSDemo\".\"autogen\".\"minio_sf_RT_KPI\" FROM \"MSDemo\".\"autogen\".\"minio_http_requests_duration_seconds\" WHERE time > now() - 5s GROUP BY time(:interval:) FILL(null)",
-                    "queryConfig": {
-                        "database": "",
-                        "measurement": "",
-                        "retentionPolicy": "",
-                        "fields": [],
-                        "tags": {},
-                        "groupBy": {
-                            "time": "",
-                            "tags": []
-                        },
-                        "areTagsAccepted": false,
-                        "rawText": "SELECT (mean(\"0.005\")/mean(\"count\")) as \"RT at 0.003s\" INTO \"MSDemo\".\"autogen\".\"minio_sf_RT_KPI\" FROM \"MSDemo\".\"autogen\".\"minio_http_requests_duration_seconds\" WHERE time > now() - 5s GROUP BY time(:interval:) FILL(null)",
-                        "range": null,
-                        "shifts": null
-                    },
-                    "source": "/chronograf/v1/sources/1"
-                }
-            ],
-            "axes": {
-                "x": {
-                    "bounds": [
-                        "",
-                        ""
-                    ],
-                    "label": "",
-                    "prefix": "",
-                    "suffix": "",
-                    "base": "10",
-                    "scale": "linear"
-                },
-                "y": {
-                    "bounds": [
-                        "",
-                        ""
-                    ],
-                    "label": "",
-                    "prefix": "",
-                    "suffix": "",
-                    "base": "10",
-                    "scale": "linear"
-                },
-                "y2": {
-                    "bounds": [
-                        "",
-                        ""
-                    ],
-                    "label": "",
-                    "prefix": "",
-                    "suffix": "",
-                    "base": "10",
-                    "scale": "linear"
-                }
-            },
-            "type": "line",
-            "colors": [
-                {
-                    "id": "e4b985dc-2486-47bd-a67e-3384a7920ecd",
-                    "type": "scale",
-                    "hex": "#31C0F6",
-                    "name": "Nineteen Eighty Four",
-                    "value": "0"
-                },
-                {
-                    "id": "697dcc7f-e9ff-4096-824c-2c474726865e",
-                    "type": "scale",
-                    "hex": "#A500A5",
-                    "name": "Nineteen Eighty Four",
-                    "value": "0"
-                },
-                {
-                    "id": "f8c97f56-d58a-4573-8334-472fef7c3132",
-                    "type": "scale",
-                    "hex": "#FF7E27",
-                    "name": "Nineteen Eighty Four",
-                    "value": "0"
-                }
-            ],
-            "legend": {},
-            "tableOptions": {
-                "timeFormat": "MM/DD/YYYY HH:mm:ss",
-                "verticalTimeAxis": true,
-                "sortBy": {
-                    "internalName": "time",
-                    "displayName": "",
-                    "visible": true
-                },
-                "wrapping": "truncate",
-                "fieldNames": [
-                    {
-                        "internalName": "time",
-                        "displayName": "",
-                        "visible": true
-                    }
-                ],
-                "fixFirstColumn": true
-            },
-            "links": {
-                "self": "/chronograf/v1/dashboards/1/cells/dd3e3609-79d5-46bc-8e49-79b737b0f5e2"
-            }
-        }
-    ],
-    "templates": [],
-    "name": "MINIO KPI dashboard",
-    "organization": "default",
-    "links": {
-        "self": "/chronograf/v1/dashboards/1",
-        "cells": "/chronograf/v1/dashboards/1/cells",
-        "templates": "/chronograf/v1/dashboards/1/templates"
-    }
-}
\ No newline at end of file
diff --git a/src/test/clmctest/workshopdemo/dashboards/minio_dash.json b/src/test/clmctest/workshopdemo/dashboards/minio_dash.json
deleted file mode 100644
index 906365095d80ef5a7f9c85d21053a9e95ba4aafb..0000000000000000000000000000000000000000
--- a/src/test/clmctest/workshopdemo/dashboards/minio_dash.json
+++ /dev/null
@@ -1,720 +0,0 @@
-{
-  "id": 3,
-  "cells": [
-    {
-      "i": "e62df88a-1e9c-4055-a157-2e01f9f340f2",
-      "x": 6,
-      "y": 12,
-      "w": 6,
-      "h": 4,
-      "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\"=:minio2: GROUP BY time(1m)",
-          "queryConfig": {
-            "database": "",
-            "measurement": "",
-            "retentionPolicy": "",
-            "fields": [],
-            "tags": {},
-            "groupBy": {
-              "time": "",
-              "tags": []
-            },
-            "areTagsAccepted": false,
-            "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/2"
-        }
-      ],
-      "axes": {
-        "x": {
-          "bounds": [
-            "",
-            ""
-          ],
-          "label": "",
-          "prefix": "",
-          "suffix": "",
-          "base": "10",
-          "scale": "linear"
-        },
-        "y": {
-          "bounds": [
-            "",
-            ""
-          ],
-          "label": "MB / s",
-          "prefix": "",
-          "suffix": "",
-          "base": "10",
-          "scale": "linear"
-        },
-        "y2": {
-          "bounds": [
-            "",
-            ""
-          ],
-          "label": "",
-          "prefix": "",
-          "suffix": "",
-          "base": "10",
-          "scale": "linear"
-        }
-      },
-      "type": "line-stepplot",
-      "colors": [
-        {
-          "id": "19960cdc-ba07-4374-815e-83ac91d2d09c",
-          "type": "scale",
-          "hex": "#31C0F6",
-          "name": "Nineteen Eighty Four",
-          "value": "0"
-        },
-        {
-          "id": "0dba565e-1e38-4632-817c-30bc795ae63b",
-          "type": "scale",
-          "hex": "#A500A5",
-          "name": "Nineteen Eighty Four",
-          "value": "0"
-        },
-        {
-          "id": "cc618b53-490d-43f5-aac5-103672a87c2f",
-          "type": "scale",
-          "hex": "#FF7E27",
-          "name": "Nineteen Eighty Four",
-          "value": "0"
-        }
-      ],
-      "legend": {},
-      "tableOptions": {
-        "timeFormat": "MM/DD/YYYY HH:mm:ss",
-        "verticalTimeAxis": true,
-        "sortBy": {
-          "internalName": "time",
-          "displayName": "",
-          "visible": true
-        },
-        "wrapping": "truncate",
-        "fieldNames": [
-          {
-            "internalName": "time",
-            "displayName": "",
-            "visible": true
-          }
-        ],
-        "fixFirstColumn": true
-      },
-      "links": {
-        "self": "/chronograf/v1/dashboards/3/cells/e62df88a-1e9c-4055-a157-2e01f9f340f2"
-      }
-    },
-    {
-      "i": "0e1b3956-71c4-4130-80f3-b69fcc9831d8",
-      "x": 0,
-      "y": 12,
-      "w": 6,
-      "h": 4,
-      "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\"=:minio1: GROUP BY time(1m)",
-          "queryConfig": {
-            "database": "",
-            "measurement": "",
-            "retentionPolicy": "",
-            "fields": [],
-            "tags": {},
-            "groupBy": {
-              "time": "",
-              "tags": []
-            },
-            "areTagsAccepted": false,
-            "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/2"
-        }
-      ],
-      "axes": {
-        "x": {
-          "bounds": [
-            "",
-            ""
-          ],
-          "label": "",
-          "prefix": "",
-          "suffix": "",
-          "base": "10",
-          "scale": "linear"
-        },
-        "y": {
-          "bounds": [
-            "",
-            ""
-          ],
-          "label": "MB / s",
-          "prefix": "",
-          "suffix": "",
-          "base": "10",
-          "scale": "linear"
-        },
-        "y2": {
-          "bounds": [
-            "",
-            ""
-          ],
-          "label": "",
-          "prefix": "",
-          "suffix": "",
-          "base": "10",
-          "scale": "linear"
-        }
-      },
-      "type": "line-stepplot",
-      "colors": [
-        {
-          "id": "19960cdc-ba07-4374-815e-83ac91d2d09c",
-          "type": "scale",
-          "hex": "#31C0F6",
-          "name": "Nineteen Eighty Four",
-          "value": "0"
-        },
-        {
-          "id": "0dba565e-1e38-4632-817c-30bc795ae63b",
-          "type": "scale",
-          "hex": "#A500A5",
-          "name": "Nineteen Eighty Four",
-          "value": "0"
-        },
-        {
-          "id": "cc618b53-490d-43f5-aac5-103672a87c2f",
-          "type": "scale",
-          "hex": "#FF7E27",
-          "name": "Nineteen Eighty Four",
-          "value": "0"
-        }
-      ],
-      "legend": {},
-      "tableOptions": {
-        "timeFormat": "MM/DD/YYYY HH:mm:ss",
-        "verticalTimeAxis": true,
-        "sortBy": {
-          "internalName": "time",
-          "displayName": "",
-          "visible": true
-        },
-        "wrapping": "truncate",
-        "fieldNames": [
-          {
-            "internalName": "time",
-            "displayName": "",
-            "visible": true
-          }
-        ],
-        "fixFirstColumn": true
-      },
-      "links": {
-        "self": "/chronograf/v1/dashboards/3/cells/0e1b3956-71c4-4130-80f3-b69fcc9831d8"
-      }
-    },
-    {
-      "i": "ab98bded-9b3d-43f1-bf4e-ba21f692cae9",
-      "x": 6,
-      "y": 8,
-      "w": 6,
-      "h": 4,
-      "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\"=:minio2: GROUP BY time(1m)",
-          "queryConfig": {
-            "database": "",
-            "measurement": "",
-            "retentionPolicy": "",
-            "fields": [],
-            "tags": {},
-            "groupBy": {
-              "time": "",
-              "tags": []
-            },
-            "areTagsAccepted": false,
-            "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/2"
-        }
-      ],
-      "axes": {
-        "x": {
-          "bounds": [
-            "",
-            ""
-          ],
-          "label": "",
-          "prefix": "",
-          "suffix": "",
-          "base": "10",
-          "scale": "linear"
-        },
-        "y": {
-          "bounds": [
-            "",
-            ""
-          ],
-          "label": "MB / s",
-          "prefix": "",
-          "suffix": "",
-          "base": "10",
-          "scale": "linear"
-        },
-        "y2": {
-          "bounds": [
-            "",
-            ""
-          ],
-          "label": "",
-          "prefix": "",
-          "suffix": "",
-          "base": "10",
-          "scale": "linear"
-        }
-      },
-      "type": "line-stepplot",
-      "colors": [
-        {
-          "id": "19960cdc-ba07-4374-815e-83ac91d2d09c",
-          "type": "scale",
-          "hex": "#31C0F6",
-          "name": "Nineteen Eighty Four",
-          "value": "0"
-        },
-        {
-          "id": "0dba565e-1e38-4632-817c-30bc795ae63b",
-          "type": "scale",
-          "hex": "#A500A5",
-          "name": "Nineteen Eighty Four",
-          "value": "0"
-        },
-        {
-          "id": "cc618b53-490d-43f5-aac5-103672a87c2f",
-          "type": "scale",
-          "hex": "#FF7E27",
-          "name": "Nineteen Eighty Four",
-          "value": "0"
-        }
-      ],
-      "legend": {},
-      "tableOptions": {
-        "timeFormat": "MM/DD/YYYY HH:mm:ss",
-        "verticalTimeAxis": true,
-        "sortBy": {
-          "internalName": "time",
-          "displayName": "",
-          "visible": true
-        },
-        "wrapping": "truncate",
-        "fieldNames": [
-          {
-            "internalName": "time",
-            "displayName": "",
-            "visible": true
-          }
-        ],
-        "fixFirstColumn": true
-      },
-      "links": {
-        "self": "/chronograf/v1/dashboards/3/cells/ab98bded-9b3d-43f1-bf4e-ba21f692cae9"
-      }
-    },
-    {
-      "i": "f36a8d10-2750-46a7-810f-34399c4e9639",
-      "x": 0,
-      "y": 8,
-      "w": 6,
-      "h": 4,
-      "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\"=:minio1: GROUP BY time(1m)",
-          "queryConfig": {
-            "database": "",
-            "measurement": "",
-            "retentionPolicy": "",
-            "fields": [],
-            "tags": {},
-            "groupBy": {
-              "time": "",
-              "tags": []
-            },
-            "areTagsAccepted": false,
-            "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/2"
-        }
-      ],
-      "axes": {
-        "x": {
-          "bounds": [
-            "",
-            ""
-          ],
-          "label": "",
-          "prefix": "",
-          "suffix": "",
-          "base": "10",
-          "scale": "linear"
-        },
-        "y": {
-          "bounds": [
-            "",
-            ""
-          ],
-          "label": "MB / s",
-          "prefix": "",
-          "suffix": "",
-          "base": "10",
-          "scale": "linear"
-        },
-        "y2": {
-          "bounds": [
-            "",
-            ""
-          ],
-          "label": "",
-          "prefix": "",
-          "suffix": "",
-          "base": "10",
-          "scale": "linear"
-        }
-      },
-      "type": "line-stepplot",
-      "colors": [
-        {
-          "id": "19960cdc-ba07-4374-815e-83ac91d2d09c",
-          "type": "scale",
-          "hex": "#31C0F6",
-          "name": "Nineteen Eighty Four",
-          "value": "0"
-        },
-        {
-          "id": "0dba565e-1e38-4632-817c-30bc795ae63b",
-          "type": "scale",
-          "hex": "#A500A5",
-          "name": "Nineteen Eighty Four",
-          "value": "0"
-        },
-        {
-          "id": "cc618b53-490d-43f5-aac5-103672a87c2f",
-          "type": "scale",
-          "hex": "#FF7E27",
-          "name": "Nineteen Eighty Four",
-          "value": "0"
-        }
-      ],
-      "legend": {},
-      "tableOptions": {
-        "timeFormat": "MM/DD/YYYY HH:mm:ss",
-        "verticalTimeAxis": true,
-        "sortBy": {
-          "internalName": "time",
-          "displayName": "",
-          "visible": true
-        },
-        "wrapping": "truncate",
-        "fieldNames": [
-          {
-            "internalName": "time",
-            "displayName": "",
-            "visible": true
-          }
-        ],
-        "fixFirstColumn": true
-      },
-      "links": {
-        "self": "/chronograf/v1/dashboards/3/cells/f36a8d10-2750-46a7-810f-34399c4e9639"
-      }
-    },
-    {
-      "i": "bb5e93f2-113c-46a1-ad10-da7fefe67c77",
-      "x": 6,
-      "y": 0,
-      "w": 6,
-      "h": 8,
-      "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\"=:minio2: GROUP BY time(:interval:) FILL(null)",
-          "queryConfig": {
-            "database": "",
-            "measurement": "",
-            "retentionPolicy": "",
-            "fields": [],
-            "tags": {},
-            "groupBy": {
-              "time": "",
-              "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\"=:minio2: GROUP BY time(:interval:) FILL(null)",
-            "range": null,
-            "shifts": null
-          },
-          "source": "/chronograf/v1/sources/2"
-        }
-      ],
-      "axes": {
-        "x": {
-          "bounds": [
-            "",
-            ""
-          ],
-          "label": "",
-          "prefix": "",
-          "suffix": "",
-          "base": "10",
-          "scale": "linear"
-        },
-        "y": {
-          "bounds": [
-            "",
-            ""
-          ],
-          "label": "% response",
-          "prefix": "",
-          "suffix": "",
-          "base": "10",
-          "scale": "linear"
-        },
-        "y2": {
-          "bounds": [
-            "",
-            ""
-          ],
-          "label": "",
-          "prefix": "",
-          "suffix": "",
-          "base": "10",
-          "scale": "linear"
-        }
-      },
-      "type": "line",
-      "colors": [
-        {
-          "id": "3d1219b0-2bae-4784-a7e1-9fab2e72ed55",
-          "type": "scale",
-          "hex": "#31C0F6",
-          "name": "Nineteen Eighty Four",
-          "value": "0"
-        },
-        {
-          "id": "63c18823-a5e6-4aca-9a1e-29f820096c00",
-          "type": "scale",
-          "hex": "#A500A5",
-          "name": "Nineteen Eighty Four",
-          "value": "0"
-        },
-        {
-          "id": "b567535f-1289-48df-b96f-5e46d8d61fb1",
-          "type": "scale",
-          "hex": "#FF7E27",
-          "name": "Nineteen Eighty Four",
-          "value": "0"
-        }
-      ],
-      "legend": {},
-      "tableOptions": {
-        "timeFormat": "MM/DD/YYYY HH:mm:ss",
-        "verticalTimeAxis": true,
-        "sortBy": {
-          "internalName": "time",
-          "displayName": "",
-          "visible": true
-        },
-        "wrapping": "truncate",
-        "fieldNames": [
-          {
-            "internalName": "time",
-            "displayName": "",
-            "visible": true
-          }
-        ],
-        "fixFirstColumn": true
-      },
-      "links": {
-        "self": "/chronograf/v1/dashboards/3/cells/bb5e93f2-113c-46a1-ad10-da7fefe67c77"
-      }
-    },
-    {
-      "i": "fef268eb-b3d5-4415-94bc-bc23d2795d05",
-      "x": 0,
-      "y": 0,
-      "w": 6,
-      "h": 8,
-      "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\"=:minio1: GROUP BY time(:interval:) FILL(null)",
-          "queryConfig": {
-            "database": "",
-            "measurement": "",
-            "retentionPolicy": "",
-            "fields": [],
-            "tags": {},
-            "groupBy": {
-              "time": "",
-              "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\"=:minio1: GROUP BY time(:interval:) FILL(null)",
-            "range": null,
-            "shifts": null
-          },
-          "source": "/chronograf/v1/sources/2"
-        }
-      ],
-      "axes": {
-        "x": {
-          "bounds": [
-            "",
-            ""
-          ],
-          "label": "",
-          "prefix": "",
-          "suffix": "",
-          "base": "10",
-          "scale": "linear"
-        },
-        "y": {
-          "bounds": [
-            "",
-            ""
-          ],
-          "label": "% response",
-          "prefix": "",
-          "suffix": "",
-          "base": "10",
-          "scale": "linear"
-        },
-        "y2": {
-          "bounds": [
-            "",
-            ""
-          ],
-          "label": "",
-          "prefix": "",
-          "suffix": "",
-          "base": "10",
-          "scale": "linear"
-        }
-      },
-      "type": "line",
-      "colors": [
-        {
-          "id": "3d1219b0-2bae-4784-a7e1-9fab2e72ed55",
-          "type": "scale",
-          "hex": "#31C0F6",
-          "name": "Nineteen Eighty Four",
-          "value": "0"
-        },
-        {
-          "id": "63c18823-a5e6-4aca-9a1e-29f820096c00",
-          "type": "scale",
-          "hex": "#A500A5",
-          "name": "Nineteen Eighty Four",
-          "value": "0"
-        },
-        {
-          "id": "b567535f-1289-48df-b96f-5e46d8d61fb1",
-          "type": "scale",
-          "hex": "#FF7E27",
-          "name": "Nineteen Eighty Four",
-          "value": "0"
-        }
-      ],
-      "legend": {},
-      "tableOptions": {
-        "timeFormat": "MM/DD/YYYY HH:mm:ss",
-        "verticalTimeAxis": true,
-        "sortBy": {
-          "internalName": "time",
-          "displayName": "",
-          "visible": true
-        },
-        "wrapping": "truncate",
-        "fieldNames": [
-          {
-            "internalName": "time",
-            "displayName": "",
-            "visible": true
-          }
-        ],
-        "fixFirstColumn": true
-      },
-      "links": {
-        "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"
-      }
-    }
-  ],
-  "name": "Minio endpoints",
-  "organization": "default",
-  "links": {
-    "self": "/chronograf/v1/dashboards/3",
-    "cells": "/chronograf/v1/dashboards/3/cells",
-    "templates": "/chronograf/v1/dashboards/3/templates"
-  }
-}
diff --git a/src/test/clmctest/workshopdemo/dashboards/nginx_dash.json b/src/test/clmctest/workshopdemo/dashboards/nginx_dash.json
deleted file mode 100644
index d60572664056e825819ae31a9cdbcface374a481..0000000000000000000000000000000000000000
--- a/src/test/clmctest/workshopdemo/dashboards/nginx_dash.json
+++ /dev/null
@@ -1,935 +0,0 @@
-{
-  "id": 3,
-  "cells": [
-    {
-      "i": "1ba178dd-a091-47f4-9c46-31dff88403b1",
-      "x": 5,
-      "y": 6,
-      "w": 5,
-      "h": 2,
-      "name": "nginx_ep_2: Requests / s",
-      "queries": [
-        {
-          "query": "SELECT non_negative_derivative(\"requests\") AS \"requests/sec\" FROM \"MSDemo\".\"autogen\".\"nginx\" WHERE time > :dashboardTime: AND \"ipendpoint\"='nginx_1_ep2'",
-          "queryConfig": {
-            "database": "",
-            "measurement": "",
-            "retentionPolicy": "",
-            "fields": [],
-            "tags": {},
-            "groupBy": {
-              "time": "",
-              "tags": []
-            },
-            "areTagsAccepted": false,
-            "rawText": "SELECT non_negative_derivative(\"requests\") AS \"requests/sec\" FROM \"MSDemo\".\"autogen\".\"nginx\" WHERE time > :dashboardTime: AND \"ipendpoint\"='nginx_1_ep2'",
-            "range": null,
-            "shifts": null
-          },
-          "source": "/chronograf/v1/sources/1"
-        }
-      ],
-      "axes": {
-        "x": {
-          "bounds": [
-            "",
-            ""
-          ],
-          "label": "",
-          "prefix": "",
-          "suffix": "",
-          "base": "10",
-          "scale": "linear"
-        },
-        "y": {
-          "bounds": [
-            "",
-            ""
-          ],
-          "label": "requests / s",
-          "prefix": "",
-          "suffix": "",
-          "base": "10",
-          "scale": "linear"
-        },
-        "y2": {
-          "bounds": [
-            "",
-            ""
-          ],
-          "label": "",
-          "prefix": "",
-          "suffix": "",
-          "base": "10",
-          "scale": "linear"
-        }
-      },
-      "type": "line",
-      "colors": [
-        {
-          "id": "2f5981b6-6f85-4efc-989c-9da90fe54189",
-          "type": "scale",
-          "hex": "#31C0F6",
-          "name": "Nineteen Eighty Four",
-          "value": "0"
-        },
-        {
-          "id": "696e12a0-4b7d-4a8f-9d95-a5be5ef3e8b8",
-          "type": "scale",
-          "hex": "#A500A5",
-          "name": "Nineteen Eighty Four",
-          "value": "0"
-        },
-        {
-          "id": "f3788c7b-bdbe-4d14-8439-c6f3b4db75e9",
-          "type": "scale",
-          "hex": "#FF7E27",
-          "name": "Nineteen Eighty Four",
-          "value": "0"
-        }
-      ],
-      "legend": {},
-      "tableOptions": {
-        "timeFormat": "MM/DD/YYYY HH:mm:ss",
-        "verticalTimeAxis": true,
-        "sortBy": {
-          "internalName": "time",
-          "displayName": "",
-          "visible": true
-        },
-        "wrapping": "truncate",
-        "fieldNames": [
-          {
-            "internalName": "time",
-            "displayName": "",
-            "visible": true
-          }
-        ],
-        "fixFirstColumn": true
-      },
-      "links": {
-        "self": "/chronograf/v1/dashboards/3/cells/1ba178dd-a091-47f4-9c46-31dff88403b1"
-      }
-    },
-    {
-      "i": "6cac8c3f-ad9d-4394-b043-637d44d39a90",
-      "x": 5,
-      "y": 4,
-      "w": 5,
-      "h": 2,
-      "name": "nginx_ep_2: Network TX",
-      "queries": [
-        {
-          "query": "SELECT derivative(max(\"bytes_sent\")) / 62914560 AS \"TX_Mb_per_second\" FROM \"MSDemo\".\"autogen\".\"net\" WHERE time > :dashboardTime: AND \"ipendpoint\"='nginx_1_ep2' GROUP BY time(1m)",
-          "queryConfig": {
-            "database": "",
-            "measurement": "",
-            "retentionPolicy": "",
-            "fields": [],
-            "tags": {},
-            "groupBy": {
-              "time": "",
-              "tags": []
-            },
-            "areTagsAccepted": false,
-            "rawText": "SELECT derivative(max(\"bytes_sent\")) / 62914560 AS \"TX_Mb_per_second\" FROM \"MSDemo\".\"autogen\".\"net\" WHERE time > :dashboardTime: AND \"ipendpoint\"='nginx_1_ep2' GROUP BY time(1m)",
-            "range": null,
-            "shifts": null
-          },
-          "source": "/chronograf/v1/sources/1"
-        }
-      ],
-      "axes": {
-        "x": {
-          "bounds": [
-            "",
-            ""
-          ],
-          "label": "",
-          "prefix": "",
-          "suffix": "",
-          "base": "10",
-          "scale": "linear"
-        },
-        "y": {
-          "bounds": [
-            "",
-            ""
-          ],
-          "label": "Mb / s",
-          "prefix": "",
-          "suffix": "",
-          "base": "10",
-          "scale": "linear"
-        },
-        "y2": {
-          "bounds": [
-            "",
-            ""
-          ],
-          "label": "",
-          "prefix": "",
-          "suffix": "",
-          "base": "10",
-          "scale": "linear"
-        }
-      },
-      "type": "line-stepplot",
-      "colors": [
-        {
-          "id": "2f5981b6-6f85-4efc-989c-9da90fe54189",
-          "type": "scale",
-          "hex": "#31C0F6",
-          "name": "Nineteen Eighty Four",
-          "value": "0"
-        },
-        {
-          "id": "696e12a0-4b7d-4a8f-9d95-a5be5ef3e8b8",
-          "type": "scale",
-          "hex": "#A500A5",
-          "name": "Nineteen Eighty Four",
-          "value": "0"
-        },
-        {
-          "id": "f3788c7b-bdbe-4d14-8439-c6f3b4db75e9",
-          "type": "scale",
-          "hex": "#FF7E27",
-          "name": "Nineteen Eighty Four",
-          "value": "0"
-        }
-      ],
-      "legend": {},
-      "tableOptions": {
-        "timeFormat": "MM/DD/YYYY HH:mm:ss",
-        "verticalTimeAxis": true,
-        "sortBy": {
-          "internalName": "time",
-          "displayName": "",
-          "visible": true
-        },
-        "wrapping": "truncate",
-        "fieldNames": [
-          {
-            "internalName": "time",
-            "displayName": "",
-            "visible": true
-          }
-        ],
-        "fixFirstColumn": true
-      },
-      "links": {
-        "self": "/chronograf/v1/dashboards/3/cells/6cac8c3f-ad9d-4394-b043-637d44d39a90"
-      }
-    },
-    {
-      "i": "433d8774-f57a-4d80-8008-5b24c62de8f0",
-      "x": 5,
-      "y": 2,
-      "w": 5,
-      "h": 2,
-      "name": "nginx_ep_2: Network RX",
-      "queries": [
-        {
-          "query": "SELECT derivative(max(\"bytes_sent\")) / 62914560 AS \"RX_Mb_per_second\" FROM \"MSDemo\".\"autogen\".\"net\" WHERE time > :dashboardTime: AND \"ipendpoint\"='nginx_1_ep2' GROUP By time(1m) fill(previous)",
-          "queryConfig": {
-            "database": "",
-            "measurement": "",
-            "retentionPolicy": "",
-            "fields": [],
-            "tags": {},
-            "groupBy": {
-              "time": "",
-              "tags": []
-            },
-            "areTagsAccepted": false,
-            "rawText": "SELECT derivative(max(\"bytes_sent\")) / 62914560 AS \"RX_Mb_per_second\" FROM \"MSDemo\".\"autogen\".\"net\" WHERE time > :dashboardTime: AND \"ipendpoint\"='nginx_1_ep2' GROUP By time(1m) fill(previous)",
-            "range": null,
-            "shifts": null
-          },
-          "source": "/chronograf/v1/sources/1"
-        }
-      ],
-      "axes": {
-        "x": {
-          "bounds": [
-            "",
-            ""
-          ],
-          "label": "",
-          "prefix": "",
-          "suffix": "",
-          "base": "10",
-          "scale": "linear"
-        },
-        "y": {
-          "bounds": [
-            "",
-            ""
-          ],
-          "label": "Mb / s",
-          "prefix": "",
-          "suffix": "",
-          "base": "10",
-          "scale": "linear"
-        },
-        "y2": {
-          "bounds": [
-            "",
-            ""
-          ],
-          "label": "",
-          "prefix": "",
-          "suffix": "",
-          "base": "10",
-          "scale": "linear"
-        }
-      },
-      "type": "line-stepplot",
-      "colors": [
-        {
-          "id": "2f5981b6-6f85-4efc-989c-9da90fe54189",
-          "type": "scale",
-          "hex": "#31C0F6",
-          "name": "Nineteen Eighty Four",
-          "value": "0"
-        },
-        {
-          "id": "696e12a0-4b7d-4a8f-9d95-a5be5ef3e8b8",
-          "type": "scale",
-          "hex": "#A500A5",
-          "name": "Nineteen Eighty Four",
-          "value": "0"
-        },
-        {
-          "id": "f3788c7b-bdbe-4d14-8439-c6f3b4db75e9",
-          "type": "scale",
-          "hex": "#FF7E27",
-          "name": "Nineteen Eighty Four",
-          "value": "0"
-        }
-      ],
-      "legend": {},
-      "tableOptions": {
-        "timeFormat": "MM/DD/YYYY HH:mm:ss",
-        "verticalTimeAxis": true,
-        "sortBy": {
-          "internalName": "time",
-          "displayName": "",
-          "visible": true
-        },
-        "wrapping": "truncate",
-        "fieldNames": [
-          {
-            "internalName": "time",
-            "displayName": "",
-            "visible": true
-          }
-        ],
-        "fixFirstColumn": true
-      },
-      "links": {
-        "self": "/chronograf/v1/dashboards/3/cells/433d8774-f57a-4d80-8008-5b24c62de8f0"
-      }
-    },
-    {
-      "i": "e630e38e-2ba1-45e6-b0cd-cc294259d6de",
-      "x": 0,
-      "y": 6,
-      "w": 5,
-      "h": 2,
-      "name": "nginx_ep_1: Requests / s",
-      "queries": [
-        {
-          "query": "SELECT non_negative_derivative(\"requests\") AS \"requests/sec\" FROM \"MSDemo\".\"autogen\".\"nginx\" WHERE time > :dashboardTime: AND \"ipendpoint\"='nginx_1_ep1'",
-          "queryConfig": {
-            "database": "",
-            "measurement": "",
-            "retentionPolicy": "",
-            "fields": [],
-            "tags": {},
-            "groupBy": {
-              "time": "",
-              "tags": []
-            },
-            "areTagsAccepted": false,
-            "rawText": "SELECT non_negative_derivative(\"requests\") AS \"requests/sec\" FROM \"MSDemo\".\"autogen\".\"nginx\" WHERE time > :dashboardTime: AND \"ipendpoint\"='nginx_1_ep1'",
-            "range": null,
-            "shifts": null
-          },
-          "source": "/chronograf/v1/sources/1"
-        }
-      ],
-      "axes": {
-        "x": {
-          "bounds": [
-            "",
-            ""
-          ],
-          "label": "",
-          "prefix": "",
-          "suffix": "",
-          "base": "10",
-          "scale": "linear"
-        },
-        "y": {
-          "bounds": [
-            "",
-            ""
-          ],
-          "label": "requests / s",
-          "prefix": "",
-          "suffix": "",
-          "base": "10",
-          "scale": "linear"
-        },
-        "y2": {
-          "bounds": [
-            "",
-            ""
-          ],
-          "label": "",
-          "prefix": "",
-          "suffix": "",
-          "base": "10",
-          "scale": "linear"
-        }
-      },
-      "type": "line",
-      "colors": [
-        {
-          "id": "2f5981b6-6f85-4efc-989c-9da90fe54189",
-          "type": "scale",
-          "hex": "#31C0F6",
-          "name": "Nineteen Eighty Four",
-          "value": "0"
-        },
-        {
-          "id": "696e12a0-4b7d-4a8f-9d95-a5be5ef3e8b8",
-          "type": "scale",
-          "hex": "#A500A5",
-          "name": "Nineteen Eighty Four",
-          "value": "0"
-        },
-        {
-          "id": "f3788c7b-bdbe-4d14-8439-c6f3b4db75e9",
-          "type": "scale",
-          "hex": "#FF7E27",
-          "name": "Nineteen Eighty Four",
-          "value": "0"
-        }
-      ],
-      "legend": {},
-      "tableOptions": {
-        "timeFormat": "MM/DD/YYYY HH:mm:ss",
-        "verticalTimeAxis": true,
-        "sortBy": {
-          "internalName": "time",
-          "displayName": "",
-          "visible": true
-        },
-        "wrapping": "truncate",
-        "fieldNames": [
-          {
-            "internalName": "time",
-            "displayName": "",
-            "visible": true
-          }
-        ],
-        "fixFirstColumn": true
-      },
-      "links": {
-        "self": "/chronograf/v1/dashboards/3/cells/e630e38e-2ba1-45e6-b0cd-cc294259d6de"
-      }
-    },
-    {
-      "i": "af1fcc24-00a1-459b-b1c8-f41834032891",
-      "x": 0,
-      "y": 4,
-      "w": 5,
-      "h": 2,
-      "name": "nginx_ep_1: Network TX",
-      "queries": [
-        {
-          "query": "SELECT derivative(max(\"bytes_sent\")) / 62914560 AS \"TX_Mb_per_second\" FROM \"MSDemo\".\"autogen\".\"net\" WHERE time > :dashboardTime: AND \"ipendpoint\"='nginx_1_ep1' GROUP BY time(1m)",
-          "queryConfig": {
-            "database": "",
-            "measurement": "",
-            "retentionPolicy": "",
-            "fields": [],
-            "tags": {},
-            "groupBy": {
-              "time": "",
-              "tags": []
-            },
-            "areTagsAccepted": false,
-            "rawText": "SELECT derivative(max(\"bytes_sent\")) / 62914560 AS \"TX_Mb_per_second\" FROM \"MSDemo\".\"autogen\".\"net\" WHERE time > :dashboardTime: AND \"ipendpoint\"='nginx_1_ep1' GROUP BY time(1m)",
-            "range": null,
-            "shifts": null
-          },
-          "source": "/chronograf/v1/sources/1"
-        }
-      ],
-      "axes": {
-        "x": {
-          "bounds": [
-            "",
-            ""
-          ],
-          "label": "",
-          "prefix": "",
-          "suffix": "",
-          "base": "10",
-          "scale": "linear"
-        },
-        "y": {
-          "bounds": [
-            "",
-            ""
-          ],
-          "label": "Mb / s",
-          "prefix": "",
-          "suffix": "",
-          "base": "10",
-          "scale": "linear"
-        },
-        "y2": {
-          "bounds": [
-            "",
-            ""
-          ],
-          "label": "",
-          "prefix": "",
-          "suffix": "",
-          "base": "10",
-          "scale": "linear"
-        }
-      },
-      "type": "line-stepplot",
-      "colors": [
-        {
-          "id": "2f5981b6-6f85-4efc-989c-9da90fe54189",
-          "type": "scale",
-          "hex": "#31C0F6",
-          "name": "Nineteen Eighty Four",
-          "value": "0"
-        },
-        {
-          "id": "696e12a0-4b7d-4a8f-9d95-a5be5ef3e8b8",
-          "type": "scale",
-          "hex": "#A500A5",
-          "name": "Nineteen Eighty Four",
-          "value": "0"
-        },
-        {
-          "id": "f3788c7b-bdbe-4d14-8439-c6f3b4db75e9",
-          "type": "scale",
-          "hex": "#FF7E27",
-          "name": "Nineteen Eighty Four",
-          "value": "0"
-        }
-      ],
-      "legend": {},
-      "tableOptions": {
-        "timeFormat": "MM/DD/YYYY HH:mm:ss",
-        "verticalTimeAxis": true,
-        "sortBy": {
-          "internalName": "time",
-          "displayName": "",
-          "visible": true
-        },
-        "wrapping": "truncate",
-        "fieldNames": [
-          {
-            "internalName": "time",
-            "displayName": "",
-            "visible": true
-          }
-        ],
-        "fixFirstColumn": true
-      },
-      "links": {
-        "self": "/chronograf/v1/dashboards/3/cells/af1fcc24-00a1-459b-b1c8-f41834032891"
-      }
-    },
-    {
-      "i": "23b48164-50d6-4c54-b284-05c8125bfa66",
-      "x": 0,
-      "y": 2,
-      "w": 5,
-      "h": 2,
-      "name": "nginx_ep_1: Network RX",
-      "queries": [
-        {
-          "query": "SELECT derivative(max(\"bytes_sent\")) / 62914560 AS \"RX_Mb_per_second\" FROM \"MSDemo\".\"autogen\".\"net\" WHERE time > :dashboardTime: AND \"ipendpoint\"='nginx_1_ep1' GROUP By time(1m) fill(previous)",
-          "queryConfig": {
-            "database": "",
-            "measurement": "",
-            "retentionPolicy": "",
-            "fields": [],
-            "tags": {},
-            "groupBy": {
-              "time": "",
-              "tags": []
-            },
-            "areTagsAccepted": false,
-            "rawText": "SELECT derivative(max(\"bytes_sent\")) / 62914560 AS \"RX_Mb_per_second\" FROM \"MSDemo\".\"autogen\".\"net\" WHERE time > :dashboardTime: AND \"ipendpoint\"='nginx_1_ep1' GROUP By time(1m) fill(previous)",
-            "range": null,
-            "shifts": null
-          },
-          "source": "/chronograf/v1/sources/1"
-        }
-      ],
-      "axes": {
-        "x": {
-          "bounds": [
-            "",
-            ""
-          ],
-          "label": "",
-          "prefix": "",
-          "suffix": "",
-          "base": "10",
-          "scale": "linear"
-        },
-        "y": {
-          "bounds": [
-            "",
-            ""
-          ],
-          "label": "Mb / s",
-          "prefix": "",
-          "suffix": "",
-          "base": "10",
-          "scale": "linear"
-        },
-        "y2": {
-          "bounds": [
-            "",
-            ""
-          ],
-          "label": "",
-          "prefix": "",
-          "suffix": "",
-          "base": "10",
-          "scale": "linear"
-        }
-      },
-      "type": "line-stepplot",
-      "colors": [
-        {
-          "id": "2f5981b6-6f85-4efc-989c-9da90fe54189",
-          "type": "scale",
-          "hex": "#31C0F6",
-          "name": "Nineteen Eighty Four",
-          "value": "0"
-        },
-        {
-          "id": "696e12a0-4b7d-4a8f-9d95-a5be5ef3e8b8",
-          "type": "scale",
-          "hex": "#A500A5",
-          "name": "Nineteen Eighty Four",
-          "value": "0"
-        },
-        {
-          "id": "f3788c7b-bdbe-4d14-8439-c6f3b4db75e9",
-          "type": "scale",
-          "hex": "#FF7E27",
-          "name": "Nineteen Eighty Four",
-          "value": "0"
-        }
-      ],
-      "legend": {},
-      "tableOptions": {
-        "timeFormat": "MM/DD/YYYY HH:mm:ss",
-        "verticalTimeAxis": true,
-        "sortBy": {
-          "internalName": "time",
-          "displayName": "",
-          "visible": true
-        },
-        "wrapping": "truncate",
-        "fieldNames": [
-          {
-            "internalName": "time",
-            "displayName": "",
-            "visible": true
-          }
-        ],
-        "fixFirstColumn": true
-      },
-      "links": {
-        "self": "/chronograf/v1/dashboards/3/cells/23b48164-50d6-4c54-b284-05c8125bfa66"
-      }
-    },
-    {
-      "i": "9a5fce61-3013-4b17-aece-9b4252c7d4ab",
-      "x": 5,
-      "y": 0,
-      "w": 5,
-      "h": 2,
-      "name": "nginx_ep_2: CPU usage",
-      "queries": [
-        {
-          "query": "SELECT mean(\"cpu_usage\") AS \"mean_cpu_usage\" FROM \"MSDemo\".\"autogen\".\"procstat\" WHERE time > :dashboardTime: AND \"exe\"='nginx' AND \"ipendpoint\"='nginx_1_ep2' GROUP BY time(:interval:) FILL(null)",
-          "queryConfig": {
-            "database": "MSDemo",
-            "measurement": "procstat",
-            "retentionPolicy": "autogen",
-            "fields": [
-              {
-                "value": "mean",
-                "type": "func",
-                "alias": "mean_cpu_usage",
-                "args": [
-                  {
-                    "value": "cpu_usage",
-                    "type": "field",
-                    "alias": ""
-                  }
-                ]
-              }
-            ],
-            "tags": {
-              "exe": [
-                "nginx"
-              ],
-              "ipendpoint": [
-                "nginx_1_ep2"
-              ]
-            },
-            "groupBy": {
-              "time": "auto",
-              "tags": []
-            },
-            "areTagsAccepted": true,
-            "fill": "null",
-            "rawText": null,
-            "range": null,
-            "shifts": null
-          },
-          "source": "/chronograf/v1/sources/1"
-        }
-      ],
-      "axes": {
-        "x": {
-          "bounds": [
-            "",
-            ""
-          ],
-          "label": "",
-          "prefix": "",
-          "suffix": "",
-          "base": "10",
-          "scale": "linear"
-        },
-        "y": {
-          "bounds": [
-            "",
-            ""
-          ],
-          "label": "%CPU",
-          "prefix": "",
-          "suffix": "",
-          "base": "10",
-          "scale": "linear"
-        },
-        "y2": {
-          "bounds": [
-            "",
-            ""
-          ],
-          "label": "",
-          "prefix": "",
-          "suffix": "",
-          "base": "10",
-          "scale": "linear"
-        }
-      },
-      "type": "line",
-      "colors": [
-        {
-          "id": "2f5981b6-6f85-4efc-989c-9da90fe54189",
-          "type": "scale",
-          "hex": "#31C0F6",
-          "name": "Nineteen Eighty Four",
-          "value": "0"
-        },
-        {
-          "id": "696e12a0-4b7d-4a8f-9d95-a5be5ef3e8b8",
-          "type": "scale",
-          "hex": "#A500A5",
-          "name": "Nineteen Eighty Four",
-          "value": "0"
-        },
-        {
-          "id": "f3788c7b-bdbe-4d14-8439-c6f3b4db75e9",
-          "type": "scale",
-          "hex": "#FF7E27",
-          "name": "Nineteen Eighty Four",
-          "value": "0"
-        }
-      ],
-      "legend": {},
-      "tableOptions": {
-        "timeFormat": "MM/DD/YYYY HH:mm:ss",
-        "verticalTimeAxis": true,
-        "sortBy": {
-          "internalName": "time",
-          "displayName": "",
-          "visible": true
-        },
-        "wrapping": "truncate",
-        "fieldNames": [
-          {
-            "internalName": "time",
-            "displayName": "",
-            "visible": true
-          }
-        ],
-        "fixFirstColumn": true
-      },
-      "links": {
-        "self": "/chronograf/v1/dashboards/3/cells/9a5fce61-3013-4b17-aece-9b4252c7d4ab"
-      }
-    },
-    {
-      "i": "2cdaa83a-95d1-4a5f-9611-8bebe8b3035a",
-      "x": 0,
-      "y": 0,
-      "w": 5,
-      "h": 2,
-      "name": "nginx_ep_1: CPU usage",
-      "queries": [
-        {
-          "query": "SELECT mean(\"cpu_usage\") AS \"mean_cpu_usage\" FROM \"MSDemo\".\"autogen\".\"procstat\" WHERE time > :dashboardTime: AND \"exe\"='nginx' AND \"ipendpoint\"='nginx_1_ep1' GROUP BY time(:interval:) FILL(null)",
-          "queryConfig": {
-            "database": "MSDemo",
-            "measurement": "procstat",
-            "retentionPolicy": "autogen",
-            "fields": [
-              {
-                "value": "mean",
-                "type": "func",
-                "alias": "mean_cpu_usage",
-                "args": [
-                  {
-                    "value": "cpu_usage",
-                    "type": "field",
-                    "alias": ""
-                  }
-                ]
-              }
-            ],
-            "tags": {
-              "exe": [
-                "nginx"
-              ],
-              "ipendpoint": [
-                "nginx_1_ep1"
-              ]
-            },
-            "groupBy": {
-              "time": "auto",
-              "tags": []
-            },
-            "areTagsAccepted": true,
-            "fill": "null",
-            "rawText": null,
-            "range": null,
-            "shifts": null
-          },
-          "source": "/chronograf/v1/sources/1"
-        }
-      ],
-      "axes": {
-        "x": {
-          "bounds": [
-            "",
-            ""
-          ],
-          "label": "",
-          "prefix": "",
-          "suffix": "",
-          "base": "10",
-          "scale": "linear"
-        },
-        "y": {
-          "bounds": [
-            "",
-            ""
-          ],
-          "label": "%CPU",
-          "prefix": "",
-          "suffix": "",
-          "base": "10",
-          "scale": "linear"
-        },
-        "y2": {
-          "bounds": [
-            "",
-            ""
-          ],
-          "label": "",
-          "prefix": "",
-          "suffix": "",
-          "base": "10",
-          "scale": "linear"
-        }
-      },
-      "type": "line",
-      "colors": [
-        {
-          "id": "2f5981b6-6f85-4efc-989c-9da90fe54189",
-          "type": "scale",
-          "hex": "#31C0F6",
-          "name": "Nineteen Eighty Four",
-          "value": "0"
-        },
-        {
-          "id": "696e12a0-4b7d-4a8f-9d95-a5be5ef3e8b8",
-          "type": "scale",
-          "hex": "#A500A5",
-          "name": "Nineteen Eighty Four",
-          "value": "0"
-        },
-        {
-          "id": "f3788c7b-bdbe-4d14-8439-c6f3b4db75e9",
-          "type": "scale",
-          "hex": "#FF7E27",
-          "name": "Nineteen Eighty Four",
-          "value": "0"
-        }
-      ],
-      "legend": {},
-      "tableOptions": {
-        "timeFormat": "MM/DD/YYYY HH:mm:ss",
-        "verticalTimeAxis": true,
-        "sortBy": {
-          "internalName": "time",
-          "displayName": "",
-          "visible": true
-        },
-        "wrapping": "truncate",
-        "fieldNames": [
-          {
-            "internalName": "time",
-            "displayName": "",
-            "visible": true
-          }
-        ],
-        "fixFirstColumn": true
-      },
-      "links": {
-        "self": "/chronograf/v1/dashboards/3/cells/2cdaa83a-95d1-4a5f-9611-8bebe8b3035a"
-      }
-    }
-  ],
-  "templates": [],
-  "name": "Nginx endpoints",
-  "organization": "default",
-  "links": {
-    "self": "/chronograf/v1/dashboards/3",
-    "cells": "/chronograf/v1/dashboards/3/cells",
-    "templates": "/chronograf/v1/dashboards/3/templates"
-  }
-}
diff --git a/src/test/clmctest/workshopdemo/dashboards/sf_dash.json b/src/test/clmctest/workshopdemo/dashboards/sf_dash.json
deleted file mode 100644
index 8430953819de013a3f0eca43cab74c30ad6e883e..0000000000000000000000000000000000000000
--- a/src/test/clmctest/workshopdemo/dashboards/sf_dash.json
+++ /dev/null
@@ -1,500 +0,0 @@
-{
-  "id": 2,
-  "cells": [
-    {
-      "i": "d4dad017-395e-4192-9a89-cfde2b5d133a",
-      "x": 5,
-      "y": 4,
-      "w": 5,
-      "h": 4,
-      "name": "Average MB/s sent/recv for service-function 2",
-      "queries": [
-        {
-          "query": "select derivative(total_RX_MB, 1m) / 60 as RX_MB_per_s, derivative(total_TX_MB, 1m) / 60 as TX_MB_per_s from (select sum(RX_MB) as total_RX_MB, sum(TX_MB) as total_TX_MB from (SELECT last(\"bytes_recv\") / 1048576 AS \"RX_MB\", last(\"bytes_sent\") / 1048576 AS \"TX_MB\" FROM \"MSDemo\".\"autogen\".\"net\" WHERE time > :dashboardTime: AND \"sf\"=:sf2: GROUP BY time(1m), ipendpoint FILL(null)) group by time(1m)) ",
-          "queryConfig": {
-            "database": "",
-            "measurement": "",
-            "retentionPolicy": "",
-            "fields": [],
-            "tags": {},
-            "groupBy": {
-              "time": "",
-              "tags": []
-            },
-            "areTagsAccepted": false,
-            "rawText": "select derivative(total_RX_MB, 1m) / 60 as RX_MB_per_s, derivative(total_TX_MB, 1m) / 60 as TX_MB_per_s from (select sum(RX_MB) as total_RX_MB, sum(TX_MB) as total_TX_MB from (SELECT last(\"bytes_recv\") / 1048576 AS \"RX_MB\", last(\"bytes_sent\") / 1048576 AS \"TX_MB\" FROM \"MSDemo\".\"autogen\".\"net\" WHERE time > :dashboardTime: AND \"sf\"=:sf2: GROUP BY time(1m), ipendpoint FILL(null)) group by time(1m)) ",
-            "range": null,
-            "shifts": null
-          },
-          "source": "/chronograf/v1/sources/2"
-        }
-      ],
-      "axes": {
-        "x": {
-          "bounds": [
-            "",
-            ""
-          ],
-          "label": "",
-          "prefix": "",
-          "suffix": "",
-          "base": "10",
-          "scale": "linear"
-        },
-        "y": {
-          "bounds": [
-            "",
-            ""
-          ],
-          "label": "MB / sec",
-          "prefix": "",
-          "suffix": "",
-          "base": "10",
-          "scale": "linear"
-        },
-        "y2": {
-          "bounds": [
-            "",
-            ""
-          ],
-          "label": "",
-          "prefix": "",
-          "suffix": "",
-          "base": "10",
-          "scale": "linear"
-        }
-      },
-      "type": "line-stepplot",
-      "colors": [
-        {
-          "id": "2f5981b6-6f85-4efc-989c-9da90fe54189",
-          "type": "scale",
-          "hex": "#31C0F6",
-          "name": "Nineteen Eighty Four",
-          "value": "0"
-        },
-        {
-          "id": "696e12a0-4b7d-4a8f-9d95-a5be5ef3e8b8",
-          "type": "scale",
-          "hex": "#A500A5",
-          "name": "Nineteen Eighty Four",
-          "value": "0"
-        },
-        {
-          "id": "f3788c7b-bdbe-4d14-8439-c6f3b4db75e9",
-          "type": "scale",
-          "hex": "#FF7E27",
-          "name": "Nineteen Eighty Four",
-          "value": "0"
-        }
-      ],
-      "legend": {},
-      "tableOptions": {
-        "timeFormat": "MM/DD/YYYY HH:mm:ss",
-        "verticalTimeAxis": true,
-        "sortBy": {
-          "internalName": "time",
-          "displayName": "",
-          "visible": true
-        },
-        "wrapping": "truncate",
-        "fieldNames": [
-          {
-            "internalName": "time",
-            "displayName": "",
-            "visible": true
-          }
-        ],
-        "fixFirstColumn": true
-      },
-      "links": {
-        "self": "/chronograf/v1/dashboards/2/cells/d4dad017-395e-4192-9a89-cfde2b5d133a"
-      }
-    },
-    {
-      "i": "8522ec33-51a1-4cd4-a02b-02525800c25e",
-      "x": 5,
-      "y": 0,
-      "w": 5,
-      "h": 4,
-      "name": "Total MB sent/recv for service-function 2",
-      "queries": [
-        {
-          "query": "select sum(RX_MB) as total_RX_MB, sum(TX_MB) as total_TX_MB from (SELECT last(\"bytes_recv\") / 1048576 AS \"RX_MB\", last(\"bytes_sent\") / 1048576 AS \"TX_MB\" FROM \"MSDemo\".\"autogen\".\"net\" WHERE time > :dashboardTime: AND \"sf\"=:sf2: GROUP BY time(1m), ipendpoint FILL(null)) group by time(1m)",
-          "queryConfig": {
-            "database": "",
-            "measurement": "",
-            "retentionPolicy": "",
-            "fields": [],
-            "tags": {},
-            "groupBy": {
-              "time": "",
-              "tags": []
-            },
-            "areTagsAccepted": false,
-            "rawText": "select sum(RX_MB) as total_RX_MB, sum(TX_MB) as total_TX_MB from (SELECT last(\"bytes_recv\") / 1048576 AS \"RX_MB\", last(\"bytes_sent\") / 1048576 AS \"TX_MB\" FROM \"MSDemo\".\"autogen\".\"net\" WHERE time > :dashboardTime: AND \"sf\"=:sf2: GROUP BY time(1m), ipendpoint FILL(null)) group by time(1m)",
-            "range": null,
-            "shifts": null
-          },
-          "source": "/chronograf/v1/sources/2"
-        }
-      ],
-      "axes": {
-        "x": {
-          "bounds": [
-            "",
-            ""
-          ],
-          "label": "",
-          "prefix": "",
-          "suffix": "",
-          "base": "10",
-          "scale": "linear"
-        },
-        "y": {
-          "bounds": [
-            "",
-            ""
-          ],
-          "label": "MB",
-          "prefix": "",
-          "suffix": "",
-          "base": "10",
-          "scale": "linear"
-        },
-        "y2": {
-          "bounds": [
-            "",
-            ""
-          ],
-          "label": "",
-          "prefix": "",
-          "suffix": "",
-          "base": "10",
-          "scale": "linear"
-        }
-      },
-      "type": "line-stepplot",
-      "colors": [
-        {
-          "id": "2f5981b6-6f85-4efc-989c-9da90fe54189",
-          "type": "scale",
-          "hex": "#31C0F6",
-          "name": "Nineteen Eighty Four",
-          "value": "0"
-        },
-        {
-          "id": "696e12a0-4b7d-4a8f-9d95-a5be5ef3e8b8",
-          "type": "scale",
-          "hex": "#A500A5",
-          "name": "Nineteen Eighty Four",
-          "value": "0"
-        },
-        {
-          "id": "f3788c7b-bdbe-4d14-8439-c6f3b4db75e9",
-          "type": "scale",
-          "hex": "#FF7E27",
-          "name": "Nineteen Eighty Four",
-          "value": "0"
-        }
-      ],
-      "legend": {},
-      "tableOptions": {
-        "timeFormat": "MM/DD/YYYY HH:mm:ss",
-        "verticalTimeAxis": true,
-        "sortBy": {
-          "internalName": "time",
-          "displayName": "",
-          "visible": true
-        },
-        "wrapping": "truncate",
-        "fieldNames": [
-          {
-            "internalName": "time",
-            "displayName": "",
-            "visible": true
-          }
-        ],
-        "fixFirstColumn": true
-      },
-      "links": {
-        "self": "/chronograf/v1/dashboards/2/cells/8522ec33-51a1-4cd4-a02b-02525800c25e"
-      }
-    },
-    {
-      "i": "dd7693ca-0622-41f0-9f2c-d9a468434097",
-      "x": 0,
-      "y": 4,
-      "w": 5,
-      "h": 4,
-      "name": "Average MB/s sent/recv for service-function 1",
-      "queries": [
-        {
-          "query": "select derivative(total_RX_MB, 1m) / 60 as RX_MB_per_s, derivative(total_TX_MB, 1m) / 60 as TX_MB_per_s from (select sum(RX_MB) as total_RX_MB, sum(TX_MB) as total_TX_MB from (SELECT last(\"bytes_recv\") / 1048576 AS \"RX_MB\", last(\"bytes_sent\") / 1048576 AS \"TX_MB\" FROM \"MSDemo\".\"autogen\".\"net\" WHERE time > :dashboardTime: AND \"sf\"=:sf1: GROUP BY time(1m), ipendpoint FILL(null)) group by time(1m)) ",
-          "queryConfig": {
-            "database": "",
-            "measurement": "",
-            "retentionPolicy": "",
-            "fields": [],
-            "tags": {},
-            "groupBy": {
-              "time": "",
-              "tags": []
-            },
-            "areTagsAccepted": false,
-            "rawText": "select derivative(total_RX_MB, 1m) / 60 as RX_MB_per_s, derivative(total_TX_MB, 1m) / 60 as TX_MB_per_s from (select sum(RX_MB) as total_RX_MB, sum(TX_MB) as total_TX_MB from (SELECT last(\"bytes_recv\") / 1048576 AS \"RX_MB\", last(\"bytes_sent\") / 1048576 AS \"TX_MB\" FROM \"MSDemo\".\"autogen\".\"net\" WHERE time > :dashboardTime: AND \"sf\"=:sf1: GROUP BY time(1m), ipendpoint FILL(null)) group by time(1m)) ",
-            "range": null,
-            "shifts": null
-          },
-          "source": "/chronograf/v1/sources/2"
-        }
-      ],
-      "axes": {
-        "x": {
-          "bounds": [
-            "",
-            ""
-          ],
-          "label": "",
-          "prefix": "",
-          "suffix": "",
-          "base": "10",
-          "scale": "linear"
-        },
-        "y": {
-          "bounds": [
-            "",
-            ""
-          ],
-          "label": "MB / sec",
-          "prefix": "",
-          "suffix": "",
-          "base": "10",
-          "scale": "linear"
-        },
-        "y2": {
-          "bounds": [
-            "",
-            ""
-          ],
-          "label": "",
-          "prefix": "",
-          "suffix": "",
-          "base": "10",
-          "scale": "linear"
-        }
-      },
-      "type": "line-stepplot",
-      "colors": [
-        {
-          "id": "2f5981b6-6f85-4efc-989c-9da90fe54189",
-          "type": "scale",
-          "hex": "#31C0F6",
-          "name": "Nineteen Eighty Four",
-          "value": "0"
-        },
-        {
-          "id": "696e12a0-4b7d-4a8f-9d95-a5be5ef3e8b8",
-          "type": "scale",
-          "hex": "#A500A5",
-          "name": "Nineteen Eighty Four",
-          "value": "0"
-        },
-        {
-          "id": "f3788c7b-bdbe-4d14-8439-c6f3b4db75e9",
-          "type": "scale",
-          "hex": "#FF7E27",
-          "name": "Nineteen Eighty Four",
-          "value": "0"
-        }
-      ],
-      "legend": {},
-      "tableOptions": {
-        "timeFormat": "MM/DD/YYYY HH:mm:ss",
-        "verticalTimeAxis": true,
-        "sortBy": {
-          "internalName": "time",
-          "displayName": "",
-          "visible": true
-        },
-        "wrapping": "truncate",
-        "fieldNames": [
-          {
-            "internalName": "time",
-            "displayName": "",
-            "visible": true
-          }
-        ],
-        "fixFirstColumn": true
-      },
-      "links": {
-        "self": "/chronograf/v1/dashboards/2/cells/dd7693ca-0622-41f0-9f2c-d9a468434097"
-      }
-    },
-    {
-      "i": "419b4e3c-1ca3-49ac-bc91-410bfbeb879a",
-      "x": 0,
-      "y": 0,
-      "w": 5,
-      "h": 4,
-      "name": "Total MB sent/recv for service-function 1",
-      "queries": [
-        {
-          "query": "select sum(RX_MB) as total_RX_MB, sum(TX_MB) as total_TX_MB from (SELECT last(\"bytes_recv\") / 1048576 AS \"RX_MB\", last(\"bytes_sent\") / 1048576 AS \"TX_MB\" FROM \"MSDemo\".\"autogen\".\"net\" WHERE time > :dashboardTime: AND \"sf\"=:sf1: GROUP BY time(1m), ipendpoint FILL(null)) group by time(1m)",
-          "queryConfig": {
-            "database": "",
-            "measurement": "",
-            "retentionPolicy": "",
-            "fields": [],
-            "tags": {},
-            "groupBy": {
-              "time": "",
-              "tags": []
-            },
-            "areTagsAccepted": false,
-            "rawText": "select sum(RX_MB) as total_RX_MB, sum(TX_MB) as total_TX_MB from (SELECT last(\"bytes_recv\") / 1048576 AS \"RX_MB\", last(\"bytes_sent\") / 1048576 AS \"TX_MB\" FROM \"MSDemo\".\"autogen\".\"net\" WHERE time > :dashboardTime: AND \"sf\"=:sf1: GROUP BY time(1m), ipendpoint FILL(null)) group by time(1m)",
-            "range": null,
-            "shifts": null
-          },
-          "source": "/chronograf/v1/sources/2"
-        }
-      ],
-      "axes": {
-        "x": {
-          "bounds": [
-            "",
-            ""
-          ],
-          "label": "",
-          "prefix": "",
-          "suffix": "",
-          "base": "10",
-          "scale": "linear"
-        },
-        "y": {
-          "bounds": [
-            "",
-            ""
-          ],
-          "label": "MB",
-          "prefix": "",
-          "suffix": "",
-          "base": "10",
-          "scale": "linear"
-        },
-        "y2": {
-          "bounds": [
-            "",
-            ""
-          ],
-          "label": "",
-          "prefix": "",
-          "suffix": "",
-          "base": "10",
-          "scale": "linear"
-        }
-      },
-      "type": "line-stepplot",
-      "colors": [
-        {
-          "id": "2f5981b6-6f85-4efc-989c-9da90fe54189",
-          "type": "scale",
-          "hex": "#31C0F6",
-          "name": "Nineteen Eighty Four",
-          "value": "0"
-        },
-        {
-          "id": "696e12a0-4b7d-4a8f-9d95-a5be5ef3e8b8",
-          "type": "scale",
-          "hex": "#A500A5",
-          "name": "Nineteen Eighty Four",
-          "value": "0"
-        },
-        {
-          "id": "f3788c7b-bdbe-4d14-8439-c6f3b4db75e9",
-          "type": "scale",
-          "hex": "#FF7E27",
-          "name": "Nineteen Eighty Four",
-          "value": "0"
-        }
-      ],
-      "legend": {},
-      "tableOptions": {
-        "timeFormat": "MM/DD/YYYY HH:mm:ss",
-        "verticalTimeAxis": true,
-        "sortBy": {
-          "internalName": "time",
-          "displayName": "",
-          "visible": true
-        },
-        "wrapping": "truncate",
-        "fieldNames": [
-          {
-            "internalName": "time",
-            "displayName": "",
-            "visible": true
-          }
-        ],
-        "fixFirstColumn": true
-      },
-      "links": {
-        "self": "/chronograf/v1/dashboards/2/cells/419b4e3c-1ca3-49ac-bc91-410bfbeb879a"
-      }
-    }
-  ],
-  "templates": [
-    {
-      "tempVar": ":sf1:",
-      "values": [
-        {
-          "value": "nginx",
-          "type": "tagValue",
-          "selected": true
-        }
-      ],
-      "id": "2160b8b2-a885-4518-90dc-f2363eb3fc83",
-      "type": "tagValues",
-      "label": "",
-      "query": {
-        "influxql": "SHOW TAG VALUES ON :database: FROM :measurement: WITH KEY=:tagKey:",
-        "db": "MSDemo",
-        "measurement": "cpu",
-        "tagKey": "sf",
-        "fieldKey": ""
-      },
-      "links": {
-        "self": "/chronograf/v1/dashboards/2/templates/2160b8b2-a885-4518-90dc-f2363eb3fc83"
-      }
-    },
-    {
-      "tempVar": ":sf2:",
-      "values": [
-        {
-          "value": "minio",
-          "type": "tagValue",
-          "selected": true
-        }
-      ],
-      "id": "beb094ee-5bed-4956-a551-83fe8e905c19",
-      "type": "tagValues",
-      "label": "",
-      "query": {
-        "influxql": "SHOW TAG VALUES ON :database: FROM :measurement: WITH KEY=:tagKey:",
-        "db": "MSDemo",
-        "measurement": "cpu",
-        "tagKey": "sf",
-        "fieldKey": ""
-      },
-      "links": {
-        "self": "/chronograf/v1/dashboards/2/templates/beb094ee-5bed-4956-a551-83fe8e905c19"
-      }
-    }
-  ],
-  "name": "Service Functions",
-  "organization": "default",
-  "links": {
-    "self": "/chronograf/v1/dashboards/2",
-    "cells": "/chronograf/v1/dashboards/2/cells",
-    "templates": "/chronograf/v1/dashboards/2/templates"
-  }
-}