diff --git a/sqlserver/assets/dashboards/sqlserver_dashboard.json b/sqlserver/assets/dashboards/sqlserver_dashboard.json
index ecb72f16c10b8..57be08ee6a767 100644
--- a/sqlserver/assets/dashboards/sqlserver_dashboard.json
+++ b/sqlserver/assets/dashboards/sqlserver_dashboard.json
@@ -14,7 +14,19 @@
             "definition": {
                 "requests": [
                     {
-                        "q": "sum:sqlserver.stats.connections{$scope}"
+                        "response_format": "timeseries",
+                        "queries": [
+                            {
+                                "data_source": "metrics",
+                                "name": "query1",
+                                "query": "sum:sqlserver.stats.connections{$scope}"
+                            }
+                        ],
+                        "formulas": [
+                            {
+                                "formula": "query1"
+                            }
+                        ]
                     }
                 ],
                 "type": "timeseries",
@@ -25,7 +37,19 @@
             "definition": {
                 "requests": [
                     {
-                        "q": "avg:sqlserver.buffer.cache_hit_ratio{$scope}"
+                        "response_format": "timeseries",
+                        "queries": [
+                            {
+                                "data_source": "metrics",
+                                "name": "query1",
+                                "query": "avg:sqlserver.buffer.cache_hit_ratio{$scope}"
+                            }
+                        ],
+                        "formulas": [
+                            {
+                                "formula": "query1"
+                            }
+                        ]
                     }
                 ],
                 "type": "timeseries",
@@ -36,7 +60,19 @@
             "definition": {
                 "requests": [
                     {
-                        "q": "sum:sqlserver.stats.procs_blocked{$scope}"
+                        "response_format": "timeseries",
+                        "queries": [
+                            {
+                                "data_source": "metrics",
+                                "name": "query1",
+                                "query": "sum:sqlserver.stats.procs_blocked{$scope}"
+                            }
+                        ],
+                        "formulas": [
+                            {
+                                "formula": "query1"
+                            }
+                        ]
                     }
                 ],
                 "type": "timeseries",
@@ -47,7 +83,19 @@
             "definition": {
                 "requests": [
                     {
-                        "q": "sum:sqlserver.access.page_splits{$scope}"
+                        "response_format": "timeseries",
+                        "queries": [
+                            {
+                                "data_source": "metrics",
+                                "name": "query1",
+                                "query": "sum:sqlserver.access.page_splits{$scope}"
+                            }
+                        ],
+                        "formulas": [
+                            {
+                                "formula": "query1"
+                            }
+                        ]
                     }
                 ],
                 "type": "timeseries",
@@ -58,7 +106,19 @@
             "definition": {
                 "requests": [
                     {
-                        "q": "sum:sqlserver.stats.batch_requests{$scope}"
+                        "response_format": "timeseries",
+                        "queries": [
+                            {
+                                "data_source": "metrics",
+                                "name": "query1",
+                                "query": "sum:sqlserver.stats.batch_requests{$scope}"
+                            }
+                        ],
+                        "formulas": [
+                            {
+                                "formula": "query1"
+                            }
+                        ]
                     }
                 ],
                 "type": "timeseries",
@@ -69,7 +129,19 @@
             "definition": {
                 "requests": [
                     {
-                        "q": "sum:sqlserver.stats.sql_compilations{$scope}"
+                        "response_format": "timeseries",
+                        "queries": [
+                            {
+                                "data_source": "metrics",
+                                "name": "query1",
+                                "query": "sum:sqlserver.stats.sql_compilations{$scope}"
+                            }
+                        ],
+                        "formulas": [
+                            {
+                                "formula": "query1"
+                            }
+                        ]
                     }
                 ],
                 "type": "timeseries",
@@ -80,7 +152,19 @@
             "definition": {
                 "requests": [
                     {
-                        "q": "sum:sqlserver.buffer.page_life_expectancy{$scope}"
+                        "response_format": "timeseries",
+                        "queries": [
+                            {
+                                "data_source": "metrics",
+                                "name": "query1",
+                                "query": "sum:sqlserver.buffer.page_life_expectancy{$scope}"
+                            }
+                        ],
+                        "formulas": [
+                            {
+                                "formula": "query1"
+                            }
+                        ]
                     }
                 ],
                 "type": "timeseries",
@@ -91,7 +175,19 @@
             "definition": {
                 "requests": [
                     {
-                        "q": "sum:sqlserver.stats.lock_waits{$scope}"
+                        "response_format": "timeseries",
+                        "queries": [
+                            {
+                                "data_source": "metrics",
+                                "name": "query1",
+                                "query": "sum:sqlserver.stats.lock_waits{$scope}"
+                            }
+                        ],
+                        "formulas": [
+                            {
+                                "formula": "query1"
+                            }
+                        ]
                     }
                 ],
                 "type": "timeseries",
@@ -102,13 +198,49 @@
             "definition": {
                 "requests": [
                     {
-                        "q": "system.load.1{$scope}"
+                        "response_format": "timeseries",
+                        "queries": [
+                            {
+                                "data_source": "metrics",
+                                "name": "query1",
+                                "query": "system.load.1{$scope}"
+                            }
+                        ],
+                        "formulas": [
+                            {
+                                "formula": "query1"
+                            }
+                        ]
                     },
                     {
-                        "q": "system.load.5{$scope}"
+                        "response_format": "timeseries",
+                        "queries": [
+                            {
+                                "data_source": "metrics",
+                                "name": "query1",
+                                "query": "system.load.5{$scope}"
+                            }
+                        ],
+                        "formulas": [
+                            {
+                                "formula": "query1"
+                            }
+                        ]
                     },
                     {
-                        "q": "system.load.15{$scope}"
+                        "response_format": "timeseries",
+                        "queries": [
+                            {
+                                "data_source": "metrics",
+                                "name": "query1",
+                                "query": "system.load.15{$scope}"
+                            }
+                        ],
+                        "formulas": [
+                            {
+                                "formula": "query1"
+                            }
+                        ]
                     }
                 ],
                 "type": "timeseries",
@@ -119,7 +251,59 @@
             "definition": {
                 "requests": [
                     {
-                        "q": "system.cpu.idle{$scope}, system.cpu.system{$scope}, system.cpu.iowait{$scope}, system.cpu.user{$scope}, system.cpu.stolen{$scope}, system.cpu.guest{$scope}"
+                        "response_format": "timeseries",
+                        "queries": [
+                            {
+                                "data_source": "metrics",
+                                "name": "query1",
+                                "query": "system.cpu.idle{$scope}"
+                            },
+                            {
+                                "data_source": "metrics",
+                                "name": "query2",
+                                "query": "system.cpu.system{$scope}"
+                            },
+                            {
+                                "data_source": "metrics",
+                                "name": "query3",
+                                "query": "system.cpu.iowait{$scope}"
+                            },
+                            {
+                                "data_source": "metrics",
+                                "name": "query4",
+                                "query": "system.cpu.user{$scope}"
+                            },
+                            {
+                                "data_source": "metrics",
+                                "name": "query5",
+                                "query": "system.cpu.stolen{$scope}"
+                            },
+                            {
+                                "data_source": "metrics",
+                                "name": "query6",
+                                "query": "system.cpu.guest{$scope}"
+                            }
+                        ],
+                        "formulas": [
+                            {
+                                "formula": "query1"
+                            },
+                            {
+                                "formula": "query2"
+                            },
+                            {
+                                "formula": "query3"
+                            },
+                            {
+                                "formula": "query4"
+                            },
+                            {
+                                "formula": "query5"
+                            },
+                            {
+                                "formula": "query6"
+                            }
+                        ]
                     }
                 ],
                 "type": "timeseries",
@@ -130,7 +314,19 @@
             "definition": {
                 "requests": [
                     {
-                        "q": "max:system.cpu.iowait{$scope}"
+                        "response_format": "timeseries",
+                        "queries": [
+                            {
+                                "data_source": "metrics",
+                                "name": "query1",
+                                "query": "max:system.cpu.iowait{$scope}"
+                            }
+                        ],
+                        "formulas": [
+                            {
+                                "formula": "query1"
+                            }
+                        ]
                     }
                 ],
                 "type": "timeseries",
@@ -141,7 +337,27 @@
             "definition": {
                 "requests": [
                     {
-                        "q": "sum:system.mem.usable{$scope},sum:system.mem.total{$scope}-sum:system.mem.usable{$scope}"
+                        "response_format": "timeseries",
+                        "queries": [
+                            {
+                                "data_source": "metrics",
+                                "name": "query1",
+                                "query": "sum:system.mem.usable{$scope}"
+                            },
+                            {
+                                "data_source": "metrics",
+                                "name": "query2",
+                                "query": "sum:system.mem.total{$scope}"
+                            }
+                        ],
+                        "formulas": [
+                            {
+                                "formula": "query1"
+                            },
+                            {
+                                "formula": "query2 - query1"
+                            }
+                        ]
                     }
                 ],
                 "type": "timeseries",
@@ -152,10 +368,34 @@
             "definition": {
                 "requests": [
                     {
-                        "q": "sum:system.net.bytes_rcvd{$scope}"
+                        "response_format": "timeseries",
+                        "queries": [
+                            {
+                                "data_source": "metrics",
+                                "name": "query1",
+                                "query": "sum:system.net.bytes_rcvd{$scope}"
+                            }
+                        ],
+                        "formulas": [
+                            {
+                                "formula": "query1"
+                            }
+                        ]
                     },
                     {
-                        "q": "sum:system.net.bytes_sent{$scope}"
+                        "response_format": "timeseries",
+                        "queries": [
+                            {
+                                "data_source": "metrics",
+                                "name": "query1",
+                                "query": "sum:system.net.bytes_sent{$scope}"
+                            }
+                        ],
+                        "formulas": [
+                            {
+                                "formula": "query1"
+                            }
+                        ]
                     }
                 ],
                 "type": "timeseries",