update template vars to use regex for $servername

salt/grafana/templates/containers.json

@@ -7,7 +7,7 @@
       "value": []
     },
     "datasource": "InfluxDB",
-    "definition": "SHOW TAG VALUES ON telegraf WITH KEY = container_name WHERE (_name = 'docker_container_cpu') AND ((host = '$servername') AND (_tagKey = 'container_name'))",
+    "definition": "SHOW TAG VALUES ON telegraf WITH KEY = container_name WHERE (_name = 'docker_container_cpu') AND ((host =~ /^$servername$/) AND (_tagKey = 'container_name'))",
     "description": null,
     "error": null,
     "hide": 0,
@@ -16,7 +16,7 @@
     "multi": true,
     "name": "containers",
     "options": [],
-    "query": "SHOW TAG VALUES ON telegraf WITH KEY = container_name WHERE (_name = 'docker_container_cpu') AND ((host = '$servername') AND (_tagKey = 'container_name'))",
+    "query": "SHOW TAG VALUES ON telegraf WITH KEY = container_name WHERE (_name = 'docker_container_cpu') AND ((host =~ /^$servername$/) AND (_tagKey = 'container_name'))",
     "refresh": 1,
     "regex": "/so-*/",
     "skipUrlSync": false,

salt/grafana/templates/cpucount.json

@@ -2,7 +2,7 @@
     "allValue": null,
     "current": {},
     "datasource": "InfluxDB",
-    "definition": "SELECT \"n_cpus\" FROM \"system\" WHERE \"host\" = '$servername'",
+    "definition": "SELECT \"n_cpus\" FROM \"system\" WHERE \"host\" =~ /^$servername$/",
     "description": null,
     "error": null,
     "hide": 2,
@@ -11,7 +11,7 @@
     "multi": false,
     "name": "cpucount",
     "options": [],
-    "query": "SELECT \"n_cpus\" FROM \"system\" WHERE \"host\" = '$servername'",
+    "query": "SELECT \"n_cpus\" FROM \"system\" WHERE \"host\" =~ /^$servername$/",
     "refresh": 1,
     "regex": "",
     "skipUrlSync": false,

salt/grafana/templates/manint.json

@@ -2,7 +2,7 @@
     "allValue": null,
     "current": {},
     "datasource": "InfluxDB",
-    "definition": "SELECT \"manint\" FROM \"node_config\" WHERE (\"host\" = '$servername')",
+    "definition": "SELECT \"manint\" FROM \"node_config\" WHERE (\"host\" =~ /^$servername$/)",
     "description": null,
     "error": null,
     "hide": 2,
@@ -11,7 +11,7 @@
     "multi": false,
     "name": "manint",
     "options": [],
-    "query": "SELECT \"manint\" FROM \"node_config\" WHERE (\"host\" = '$servername')",
+    "query": "SELECT \"manint\" FROM \"node_config\" WHERE (\"host\" =~ /^$servername$/)",
     "refresh": 1,
     "regex": "",
     "skipUrlSync": false,

salt/grafana/templates/monint.json

@@ -2,7 +2,7 @@
     "allValue": null,
     "current": {},
     "datasource": "InfluxDB",
-    "definition": "SELECT \"monint\" FROM \"node_config\" WHERE (\"host\" = '$servername')",
+    "definition": "SELECT \"monint\" FROM \"node_config\" WHERE (\"host\" =~ /^$servername$/)",
     "description": null,
     "error": null,
     "hide": 2,
@@ -11,7 +11,7 @@
     "multi": false,
     "name": "monint",
     "options": [],
-    "query": "SELECT \"monint\" FROM \"node_config\" WHERE (\"host\" = '$servername')",
+    "query": "SELECT \"monint\" FROM \"node_config\" WHERE (\"host\" =~ /^$servername$/)",
     "refresh": 1,
     "regex": "",
     "skipUrlSync": false,

salt/grafana/templates/servername_all.json

@@ -7,7 +7,7 @@
       "value": []
     },
     "datasource": "InfluxDB",
-    "definition": "show tag values with key=\"host\"",
+    "definition": "show tag values with key=\"host\" WHERE (\"role\" =~ /^$role$/)",
     "description": "",
     "error": null,
     "hide": 0,
@@ -16,7 +16,7 @@
     "multi": true,
     "name": "servername",
     "options": [],
-    "query": "show tag values with key=\"host\"",
+    "query": "show tag values with key=\"host\" WHERE (\"role\" =~ /^$role$/)",
     "refresh": 1,
     "regex": "",
     "skipUrlSync": false,