diff --git a/dashboards/Experimental/MongoDB_Cluster_Summary_(new).json b/dashboards/Experimental/MongoDB_Cluster_Summary_(new).json
index 8b6c354f64..ed37171916 100644
--- a/dashboards/Experimental/MongoDB_Cluster_Summary_(new).json
+++ b/dashboards/Experimental/MongoDB_Cluster_Summary_(new).json
@@ -160,6 +160,12 @@
             "mode": "fixed"
           },
           "decimals": 0,
+          "links": [
+            {
+              "title": "",
+              "url": "/graph/d/mongodb-replicaset-summary/mongodb-replset-summary?${cluster:queryparam}&${__field.labels.rs_nm}&${interval:queryparam}&${__url_time_range}"
+            }
+          ],
           "mappings": [],
           "thresholds": {
             "mode": "absolute",
@@ -808,7 +814,8 @@
       "fieldConfig": {
         "defaults": {
           "color": {
-            "mode": "thresholds"
+            "fixedColor": "blue",
+            "mode": "fixed"
           },
           "mappings": [],
           "max": 1,
@@ -1409,13 +1416,7 @@
               },
               {
                 "id": "links",
-                "value": [
-                  {
-                    "targetBlank": true,
-                    "title": "MongoDB Instance Summary - ${__cell}",
-                    "url": "/graph/d/mongodb-instance-summary/mongodb-instance-summary?var-service_name=${__cell}"
-                  }
-                ]
+                "value": []
               },
               {
                 "id": "custom.align"
@@ -1464,7 +1465,7 @@
           {
             "matcher": {
               "id": "byName",
-              "options": "Service Name"
+              "options": "service_name"
             },
             "properties": [
               {
@@ -1717,8 +1718,7 @@
             "mode": "absolute",
             "steps": [
               {
-                "color": "red",
-                "value": null
+                "color": "red"
               }
             ]
           },
@@ -1892,8 +1892,7 @@
             "mode": "absolute",
             "steps": [
               {
-                "color": "red",
-                "value": null
+                "color": "red"
               }
             ]
           }
@@ -2014,7 +2013,7 @@
       "legend": {
         "alignAsTable": true,
         "avg": true,
-        "current": true,
+        "current": false,
         "hideEmpty": false,
         "hideZero": false,
         "max": true,
@@ -2234,13 +2233,30 @@
             "mode": "absolute",
             "steps": [
               {
-                "color": "red",
-                "value": null
+                "color": "red"
               }
             ]
           }
         },
-        "overrides": []
+        "overrides": [
+          {
+            "matcher": {
+              "id": "byName",
+              "options": "Shard Name"
+            },
+            "properties": [
+              {
+                "id": "links",
+                "value": [
+                  {
+                    "title": "",
+                    "url": "/graph/d/mongodb-replicaset-summary/mongodb-replset-summary?${cluster:queryparam}&${__value.text}&${interval:queryparam}&${__url_time_range}"
+                  }
+                ]
+              }
+            ]
+          }
+        ]
       },
       "gridPos": {
         "h": 8,
@@ -2965,7 +2981,7 @@
           ]
         },
         "definition": "label_values(mongodb_mongod_replset_my_state{environment=~\"$environment\",cluster=~\"$cluster\"}, set)",
-        "hide": 0,
+        "hide": 2,
         "includeAll": true,
         "label": "Replica Set",
         "multi": true,
@@ -2991,7 +3007,7 @@
           "value": "$__all"
         },
         "definition": "label_values(mongodb_mongod_replset_my_state{environment=~\"$environment\",cluster=~\"$cluster\",set=~\"$set\"}, service_name)",
-        "hide": 0,
+        "hide": 2,
         "includeAll": true,
         "label": "Node",
         "multi": true,
diff --git a/dashboards/Experimental/MongoDB_Collections_Overview.json b/dashboards/Experimental/MongoDB_Collections_Overview.json
index 2a2f21d800..a1585b1613 100644
--- a/dashboards/Experimental/MongoDB_Collections_Overview.json
+++ b/dashboards/Experimental/MongoDB_Collections_Overview.json
@@ -41,46 +41,46 @@
   "editable": false,
   "fiscalYearStartMonth": 0,
   "graphTooltip": 1,
+  "id": null,
   "links": [
     {
-      "asDropdown": false,
       "icon": "doc",
       "includeVars": true,
       "keepTime": true,
-      "tags": [],
+      "tags": [
+        "Home"
+      ],
       "targetBlank": false,
       "title": "Home",
-      "tooltip": "",
       "type": "link",
       "url": "/graph/d/pmm-home/home-dashboard"
     },
     {
-      "asDropdown": false,
       "icon": "dashboard",
       "includeVars": true,
       "keepTime": true,
-      "tags": [],
+      "tags": [
+        "Query Analytics"
+      ],
       "targetBlank": false,
       "title": "Query Analytics",
-      "tooltip": "",
       "type": "link",
       "url": "/graph/d/pmm-qan/pmm-query-analytics"
     },
     {
-      "asDropdown": false,
       "icon": "bolt",
       "includeVars": true,
       "keepTime": true,
-      "tags": [],
+      "tags": [
+        "Compare"
+      ],
       "targetBlank": false,
       "title": "Compare",
-      "tooltip": "",
       "type": "link",
       "url": "/graph/d/mongodb-instance-compare/mongodb-instances-compare"
     },
     {
       "asDropdown": true,
-      "icon": "external link",
       "includeVars": true,
       "keepTime": true,
       "tags": [
@@ -88,13 +88,10 @@
       ],
       "targetBlank": false,
       "title": "MongoDB",
-      "tooltip": "",
-      "type": "dashboards",
-      "url": ""
+      "type": "dashboards"
     },
     {
       "asDropdown": true,
-      "icon": "external link",
       "includeVars": true,
       "keepTime": true,
       "tags": [
@@ -102,13 +99,10 @@
       ],
       "targetBlank": false,
       "title": "HA",
-      "tooltip": "",
-      "type": "dashboards",
-      "url": ""
+      "type": "dashboards"
     },
     {
       "asDropdown": true,
-      "icon": "external link",
       "includeVars": false,
       "keepTime": true,
       "tags": [
@@ -116,21 +110,18 @@
       ],
       "targetBlank": false,
       "title": "Services",
-      "tooltip": "",
-      "type": "dashboards",
-      "url": ""
+      "type": "dashboards"
     },
     {
       "asDropdown": true,
-      "icon": "external link",
       "includeVars": false,
       "keepTime": true,
-      "tags": [],
+      "tags": [
+        "PMM"
+      ],
       "targetBlank": false,
       "title": "PMM",
-      "tooltip": "",
-      "type": "dashboards",
-      "url": ""
+      "type": "dashboards"
     }
   ],
   "liveNow": false,
@@ -145,68 +136,25 @@
       },
       "id": 29,
       "panels": [],
-      "targets": [
-        {
-          "refId": "A"
-        }
-      ],
       "title": "Datasize",
       "type": "row"
     },
     {
+      "aliasColors": {},
+      "bars": false,
+      "dashLength": 10,
+      "dashes": false,
+      "datasource": "Metrics",
+      "decimals": 2,
       "description": "Provides the names and sizes of the 5 largest databases in an instance/cluster. Data showing only from Primary node in replica set.",
-      "fieldConfig": {
-        "defaults": {
-          "color": {
-            "mode": "palette-classic"
-          },
-          "custom": {
-            "axisCenteredZero": false,
-            "axisColorMode": "text",
-            "axisLabel": "",
-            "axisPlacement": "auto",
-            "barAlignment": 0,
-            "drawStyle": "line",
-            "fillOpacity": 0,
-            "gradientMode": "none",
-            "hideFrom": {
-              "legend": false,
-              "tooltip": false,
-              "viz": false
-            },
-            "lineInterpolation": "linear",
-            "lineWidth": 1,
-            "pointSize": 5,
-            "scaleDistribution": {
-              "type": "linear"
-            },
-            "showPoints": "auto",
-            "spanNulls": false,
-            "stacking": {
-              "group": "A",
-              "mode": "none"
-            },
-            "thresholdsStyle": {
-              "mode": "off"
-            }
-          },
-          "mappings": [],
-          "thresholds": {
-            "mode": "absolute",
-            "steps": [
-              {
-                "color": "green",
-                "value": null
-              },
-              {
-                "color": "red",
-                "value": 80
-              }
-            ]
-          },
-          "unit": "decmbytes"
-        },
-        "overrides": []
+      "editable": true,
+      "error": false,
+      "fill": 2,
+      "fillGradient": 0,
+      "grid": {
+        "leftLogBase": 1,
+        "leftMin": 0,
+        "rightLogBase": 1
       },
       "gridPos": {
         "h": 8,
@@ -214,21 +162,38 @@
         "x": 0,
         "y": 1
       },
+      "hiddenSeries": false,
       "id": 31,
+      "legend": {
+        "alignAsTable": true,
+        "avg": true,
+        "current": false,
+        "max": true,
+        "min": true,
+        "show": true,
+        "sort": "avg",
+        "sortDesc": true,
+        "total": false,
+        "values": true
+      },
+      "lines": true,
+      "linewidth": 2,
+      "links": [],
+      "nullPointMode": "null",
       "options": {
-        "legend": {
-          "calcs": [
-            "last"
-          ],
-          "displayMode": "table",
-          "placement": "bottom",
-          "showLegend": true
-        },
-        "tooltip": {
-          "mode": "single",
-          "sort": "none"
-        }
+        "alertThreshold": true
       },
+      "paceLength": 10,
+      "percentage": false,
+      "pluginVersion": "9.2.20",
+      "pointradius": 5,
+      "points": false,
+      "renderer": "flot",
+      "repeatDirection": "h",
+      "seriesOverrides": [],
+      "spaceLength": 10,
+      "stack": false,
+      "steppedLine": false,
       "targets": [
         {
           "exemplar": true,
@@ -238,16 +203,53 @@
           "refId": "A"
         }
       ],
+      "thresholds": [],
+      "timeRegions": [],
       "title": "Top 5 Databases By Size",
-      "type": "timeseries"
+      "tooltip": {
+        "msResolution": false,
+        "shared": true,
+        "sort": 5,
+        "value_type": "cumulative"
+      },
+      "type": "graph",
+      "x-axis": true,
+      "xaxis": {
+        "mode": "time",
+        "show": true,
+        "values": []
+      },
+      "y-axis": true,
+      "y_formats": [
+        "ms",
+        "short"
+      ],
+      "yaxes": [
+        {
+          "decimals": 2,
+          "format": "decmbytes",
+          "label": "",
+          "logBase": 1,
+          "min": 0,
+          "show": true
+        },
+        {
+          "format": "short",
+          "logBase": 1,
+          "show": false
+        }
+      ],
+      "yaxis": {
+        "align": false
+      }
     },
     {
-      "datasource": "Metrics",
       "description": "Provides the number of collections in the selected databases",
       "fieldConfig": {
         "defaults": {
           "color": {
-            "mode": "thresholds"
+            "fixedColor": "blue",
+            "mode": "fixed"
           },
           "mappings": [],
           "thresholds": {
@@ -291,10 +293,12 @@
       "targets": [
         {
           "datasource": "Metrics",
+          "editorMode": "code",
           "exemplar": true,
-          "expr": "count(mongodb_top_commands_time{database=~\"$database\"})",
+          "expr": "count(mongodb_top_commands_time{database=~\"$database\",service_name=~\"$service_name\"})",
           "interval": "$interval",
           "legendFormat": "",
+          "range": true,
           "refId": "A"
         }
       ],
@@ -302,12 +306,12 @@
       "type": "stat"
     },
     {
-      "datasource": "Metrics",
       "description": "Provides the number of indexes in the selected databases",
       "fieldConfig": {
         "defaults": {
           "color": {
-            "mode": "thresholds"
+            "fixedColor": "blue",
+            "mode": "fixed"
           },
           "mappings": [],
           "thresholds": {
@@ -351,10 +355,12 @@
       "targets": [
         {
           "datasource": "Metrics",
+          "editorMode": "code",
           "exemplar": true,
-          "expr": "sum(mongodb_dbstats_indexes{database=~\"$database\"})",
+          "expr": "sum(mongodb_dbstats_indexes{database=~\"$database\",service_name=~\"$service_name\"})",
           "interval": "$interval",
           "legendFormat": "",
+          "range": true,
           "refId": "A"
         }
       ],
@@ -362,286 +368,328 @@
       "type": "stat"
     },
     {
-      "datasource": "Metrics",
+      "aliasColors": {},
+      "bars": false,
+      "dashLength": 10,
+      "dashes": false,
+      "decimals": 2,
       "description": "Average size of each document in bytes. dataSize divided by number of documents",
-      "fieldConfig": {
-        "defaults": {
-          "color": {
-            "mode": "palette-classic"
-          },
-          "custom": {
-            "axisCenteredZero": false,
-            "axisColorMode": "text",
-            "axisLabel": "",
-            "axisPlacement": "auto",
-            "barAlignment": 0,
-            "drawStyle": "line",
-            "fillOpacity": 20,
-            "gradientMode": "none",
-            "hideFrom": {
-              "legend": false,
-              "tooltip": false,
-              "viz": false
-            },
-            "lineInterpolation": "linear",
-            "lineWidth": 2,
-            "pointSize": 5,
-            "scaleDistribution": {
-              "type": "linear"
-            },
-            "showPoints": "never",
-            "spanNulls": false,
-            "stacking": {
-              "group": "A",
-              "mode": "none"
-            },
-            "thresholdsStyle": {
-              "mode": "off"
-            }
-          },
-          "links": [],
-          "mappings": [],
-          "min": 0,
-          "thresholds": {
-            "mode": "absolute",
-            "steps": [
-              {
-                "color": "green",
-                "value": null
-              }
-            ]
-          },
-          "unit": "none"
-        },
-        "overrides": []
+      "editable": true,
+      "error": false,
+      "fill": 2,
+      "fillGradient": 0,
+      "grid": {
+        "leftLogBase": 1,
+        "leftMin": 0,
+        "rightLogBase": 1
       },
       "gridPos": {
-        "h": 9,
-        "w": 12,
+        "h": 8,
+        "w": 24,
         "x": 0,
         "y": 12
       },
+      "hiddenSeries": false,
       "id": 37,
+      "legend": {
+        "alignAsTable": true,
+        "avg": true,
+        "current": false,
+        "max": true,
+        "min": true,
+        "show": true,
+        "sort": "avg",
+        "sortDesc": true,
+        "total": false,
+        "values": true
+      },
+      "lines": true,
+      "linewidth": 2,
       "links": [],
+      "nullPointMode": "null",
       "options": {
-        "legend": {
-          "calcs": [
-            "mean",
-            "max",
-            "min"
-          ],
-          "displayMode": "table",
-          "placement": "bottom",
-          "showLegend": true
-        },
-        "tooltip": {
-          "mode": "single",
-          "sort": "none"
-        }
+        "alertThreshold": true
       },
-      "pluginVersion": "8.3.5",
+      "paceLength": 10,
+      "percentage": false,
+      "pluginVersion": "9.2.20",
+      "pointradius": 5,
+      "points": false,
+      "renderer": "flot",
+      "repeatDirection": "h",
+      "seriesOverrides": [],
+      "spaceLength": 10,
+      "stack": false,
+      "steppedLine": false,
       "targets": [
         {
           "datasource": "Metrics",
+          "editorMode": "code",
           "exemplar": true,
-          "expr": "sum(mongodb_dbstats_avgObjSize{database=~\"$database\"})",
+          "expr": "sum(mongodb_dbstats_avgObjSize{ service_name=~\"$service_name\", database=~\"$database\"})",
           "interval": "$interval",
           "intervalFactor": 1,
-          "legendFormat": "$database",
+          "legendFormat": "{{database}}",
+          "range": true,
           "refId": "A",
           "step": 300
         }
       ],
+      "thresholds": [],
+      "timeRegions": [],
       "title": "Avg Object Size in Database ($database)",
-      "type": "timeseries"
+      "tooltip": {
+        "msResolution": false,
+        "shared": true,
+        "sort": 5,
+        "value_type": "cumulative"
+      },
+      "type": "graph",
+      "x-axis": true,
+      "xaxis": {
+        "mode": "time",
+        "show": true,
+        "values": []
+      },
+      "y-axis": true,
+      "y_formats": [
+        "ms",
+        "short"
+      ],
+      "yaxes": [
+        {
+          "decimals": 2,
+          "format": "decmbytes",
+          "label": "",
+          "logBase": 1,
+          "min": 0,
+          "show": true
+        },
+        {
+          "format": "short",
+          "logBase": 1,
+          "show": false
+        }
+      ],
+      "yaxis": {
+        "align": false
+      }
     },
     {
-      "datasource": "Metrics",
+      "aliasColors": {},
+      "bars": false,
+      "dashLength": 10,
+      "dashes": false,
+      "decimals": 2,
       "description": "Total size of all indexes in a given database",
-      "fieldConfig": {
-        "defaults": {
-          "color": {
-            "mode": "palette-classic"
-          },
-          "custom": {
-            "axisCenteredZero": false,
-            "axisColorMode": "text",
-            "axisLabel": "",
-            "axisPlacement": "auto",
-            "barAlignment": 0,
-            "drawStyle": "line",
-            "fillOpacity": 20,
-            "gradientMode": "none",
-            "hideFrom": {
-              "legend": false,
-              "tooltip": false,
-              "viz": false
-            },
-            "lineInterpolation": "linear",
-            "lineWidth": 2,
-            "pointSize": 5,
-            "scaleDistribution": {
-              "type": "linear"
-            },
-            "showPoints": "never",
-            "spanNulls": false,
-            "stacking": {
-              "group": "A",
-              "mode": "none"
-            },
-            "thresholdsStyle": {
-              "mode": "off"
-            }
-          },
-          "links": [],
-          "mappings": [],
-          "min": 0,
-          "thresholds": {
-            "mode": "absolute",
-            "steps": [
-              {
-                "color": "green",
-                "value": null
-              }
-            ]
-          },
-          "unit": "none"
-        },
-        "overrides": []
+      "editable": true,
+      "error": false,
+      "fill": 2,
+      "fillGradient": 0,
+      "grid": {
+        "leftLogBase": 1,
+        "leftMin": 0,
+        "rightLogBase": 1
       },
       "gridPos": {
-        "h": 9,
-        "w": 12,
-        "x": 12,
-        "y": 12
+        "h": 8,
+        "w": 24,
+        "x": 0,
+        "y": 20
       },
+      "hiddenSeries": false,
       "id": 39,
+      "legend": {
+        "alignAsTable": true,
+        "avg": true,
+        "current": false,
+        "max": true,
+        "min": true,
+        "show": true,
+        "sort": "avg",
+        "sortDesc": true,
+        "total": false,
+        "values": true
+      },
+      "lines": true,
+      "linewidth": 2,
       "links": [],
+      "nullPointMode": "null",
       "options": {
-        "legend": {
-          "calcs": [
-            "mean",
-            "max",
-            "min"
-          ],
-          "displayMode": "table",
-          "placement": "bottom",
-          "showLegend": true
-        },
-        "tooltip": {
-          "mode": "single",
-          "sort": "none"
-        }
+        "alertThreshold": true
       },
-      "pluginVersion": "8.3.5",
+      "paceLength": 10,
+      "percentage": false,
+      "pluginVersion": "9.2.20",
+      "pointradius": 5,
+      "points": false,
+      "renderer": "flot",
+      "repeatDirection": "h",
+      "seriesOverrides": [],
+      "spaceLength": 10,
+      "stack": false,
+      "steppedLine": false,
       "targets": [
         {
           "datasource": "Metrics",
+          "editorMode": "code",
           "exemplar": true,
-          "expr": "sum(mongodb_dbstats_indexSize{database=~\"$database\"})",
+          "expr": "sum(mongodb_dbstats_indexSize{database=~\"$database\", service_name=~\"$service_name\"})",
           "interval": "$interval",
           "intervalFactor": 1,
-          "legendFormat": "$database",
+          "legendFormat": "{{database}}",
+          "range": true,
           "refId": "A",
           "step": 300
         }
       ],
+      "thresholds": [],
+      "timeRegions": [],
       "title": "Index Size in Database ($database)",
-      "type": "timeseries"
+      "tooltip": {
+        "msResolution": false,
+        "shared": true,
+        "sort": 5,
+        "value_type": "cumulative"
+      },
+      "type": "graph",
+      "x-axis": true,
+      "xaxis": {
+        "mode": "time",
+        "show": true,
+        "values": []
+      },
+      "y-axis": true,
+      "y_formats": [
+        "ms",
+        "short"
+      ],
+      "yaxes": [
+        {
+          "decimals": 2,
+          "format": "decmbytes",
+          "label": "",
+          "logBase": 1,
+          "min": 0,
+          "show": true
+        },
+        {
+          "format": "short",
+          "logBase": 1,
+          "show": false
+        }
+      ],
+      "yaxis": {
+        "align": false
+      }
     },
     {
-      "datasource": "Metrics",
+      "aliasColors": {},
+      "bars": false,
+      "dashLength": 10,
+      "dashes": false,
+      "decimals": 2,
       "description": "Total size of uncompressed data in a database in bytes. May be larger than storageSize due to WT compression. ",
-      "fieldConfig": {
-        "defaults": {
-          "color": {
-            "mode": "palette-classic"
-          },
-          "custom": {
-            "axisCenteredZero": false,
-            "axisColorMode": "text",
-            "axisLabel": "",
-            "axisPlacement": "auto",
-            "barAlignment": 0,
-            "drawStyle": "line",
-            "fillOpacity": 20,
-            "gradientMode": "none",
-            "hideFrom": {
-              "legend": false,
-              "tooltip": false,
-              "viz": false
-            },
-            "lineInterpolation": "linear",
-            "lineWidth": 2,
-            "pointSize": 5,
-            "scaleDistribution": {
-              "type": "linear"
-            },
-            "showPoints": "never",
-            "spanNulls": false,
-            "stacking": {
-              "group": "A",
-              "mode": "none"
-            },
-            "thresholdsStyle": {
-              "mode": "off"
-            }
-          },
-          "links": [],
-          "mappings": [],
-          "min": 0,
-          "thresholds": {
-            "mode": "absolute",
-            "steps": [
-              {
-                "color": "green",
-                "value": null
-              }
-            ]
-          },
-          "unit": "none"
-        },
-        "overrides": []
+      "editable": true,
+      "error": false,
+      "fill": 2,
+      "fillGradient": 0,
+      "grid": {
+        "leftLogBase": 1,
+        "leftMin": 0,
+        "rightLogBase": 1
       },
       "gridPos": {
-        "h": 7,
+        "h": 8,
         "w": 24,
         "x": 0,
-        "y": 21
+        "y": 28
       },
+      "hiddenSeries": false,
       "id": 41,
+      "legend": {
+        "alignAsTable": true,
+        "avg": true,
+        "current": false,
+        "max": true,
+        "min": true,
+        "show": true,
+        "sort": "avg",
+        "sortDesc": true,
+        "total": false,
+        "values": true
+      },
+      "lines": true,
+      "linewidth": 2,
       "links": [],
+      "nullPointMode": "null",
       "options": {
-        "legend": {
-          "calcs": [
-            "mean",
-            "max",
-            "min"
-          ],
-          "displayMode": "table",
-          "placement": "bottom",
-          "showLegend": true
-        },
-        "tooltip": {
-          "mode": "single",
-          "sort": "none"
-        }
+        "alertThreshold": true
       },
-      "pluginVersion": "8.3.5",
+      "paceLength": 10,
+      "percentage": false,
+      "pluginVersion": "9.2.20",
+      "pointradius": 5,
+      "points": false,
+      "renderer": "flot",
+      "repeatDirection": "h",
+      "seriesOverrides": [],
+      "spaceLength": 10,
+      "stack": false,
+      "steppedLine": false,
       "targets": [
         {
           "datasource": "Metrics",
+          "editorMode": "code",
           "exemplar": true,
-          "expr": "sum(mongodb_dbstats_dataSize{database=~\"$database\"})",
+          "expr": "sum(mongodb_dbstats_dataSize{database=~\"$database\",service_name=~\"$service_name\"})",
           "interval": "$interval",
           "intervalFactor": 1,
-          "legendFormat": "$database",
+          "legendFormat": "{{database}}",
+          "range": true,
           "refId": "A",
           "step": 300
         }
       ],
+      "thresholds": [],
+      "timeRegions": [],
       "title": "Data Size for Database ($database)",
-      "type": "timeseries"
+      "tooltip": {
+        "msResolution": false,
+        "shared": true,
+        "sort": 5,
+        "value_type": "cumulative"
+      },
+      "type": "graph",
+      "x-axis": true,
+      "xaxis": {
+        "mode": "time",
+        "show": true,
+        "values": []
+      },
+      "y-axis": true,
+      "y_formats": [
+        "ms",
+        "short"
+      ],
+      "yaxes": [
+        {
+          "decimals": 2,
+          "format": "decmbytes",
+          "label": "",
+          "logBase": 1,
+          "min": 0,
+          "show": true
+        },
+        {
+          "format": "short",
+          "logBase": 1,
+          "show": false
+        }
+      ],
+      "yaxis": {
+        "align": false
+      }
     },
     {
       "collapsed": false,
@@ -650,7 +698,7 @@
         "h": 1,
         "w": 24,
         "x": 0,
-        "y": 28
+        "y": 36
       },
       "id": 16,
       "panels": [],
@@ -681,8 +729,7 @@
             "mode": "absolute",
             "steps": [
               {
-                "color": "green",
-                "value": null
+                "color": "green"
               },
               {
                 "color": "red",
@@ -721,7 +768,7 @@
         "h": 7,
         "w": 12,
         "x": 0,
-        "y": 29
+        "y": 37
       },
       "id": 3,
       "links": [],
@@ -741,7 +788,7 @@
           "datasource": "Metrics",
           "editorMode": "code",
           "exemplar": false,
-          "expr": "topk (5,sum by (database, collection) (mongodb_top_queries_count{database =~ \"$database\"}))",
+          "expr": "topk (5,sum by (database, collection) (mongodb_top_queries_count{database =~ \"$database\",service_name=~\"$service_name\"}))",
           "format": "table",
           "hide": false,
           "instant": true,
@@ -806,8 +853,7 @@
             "mode": "absolute",
             "steps": [
               {
-                "color": "green",
-                "value": null
+                "color": "green"
               },
               {
                 "color": "red",
@@ -857,7 +903,7 @@
         "h": 7,
         "w": 12,
         "x": 12,
-        "y": 29
+        "y": 37
       },
       "id": 19,
       "links": [],
@@ -884,7 +930,7 @@
           "datasource": "Metrics",
           "editorMode": "code",
           "exemplar": false,
-          "expr": "topk(5,sum by (database,collection) (mongodb_top_insert_count{database =~ \"$database\"})+sum by (database,collection) (mongodb_top_insert_count{database =~ \"$database\"})+sum by (database,collection) (mongodb_top_remove_count{database =~ \"$database\"})+sum by (database,collection) (mongodb_top_update_count{database =~ \"$database\"}))",
+          "expr": "topk(5,sum by (database,collection) (mongodb_top_insert_count{database =~ \"$database\",service_name=~\"$service_name\"})+sum by (database,collection) (mongodb_top_insert_count{database =~ \"$database\",service_name=~\"$service_name\"})+sum by (database,collection) (mongodb_top_remove_count{database =~ \"$database\",service_name=~\"$service_name\"})+sum by (database,collection) (mongodb_top_update_count{database =~ \"$database\",service_name=~\"$service_name\"}))",
           "format": "table",
           "hide": false,
           "instant": true,
@@ -935,15 +981,15 @@
       "fieldConfig": {
         "defaults": {
           "color": {
-            "mode": "thresholds"
+            "fixedColor": "blue",
+            "mode": "fixed"
           },
           "mappings": [],
           "thresholds": {
             "mode": "absolute",
             "steps": [
               {
-                "color": "green",
-                "value": null
+                "color": "green"
               }
             ]
           }
@@ -954,7 +1000,7 @@
         "h": 7,
         "w": 12,
         "x": 0,
-        "y": 36
+        "y": 44
       },
       "id": 24,
       "links": [],
@@ -980,7 +1026,7 @@
           "datasource": "Metrics",
           "editorMode": "code",
           "exemplar": false,
-          "expr": "topk (5, rate(sum by (environment, cluster, database, collection) (mongodb_top_queries_count{database =~ \"$database\"})[$interval]))",
+          "expr": "topk (5, rate(sum by (environment, cluster, database, collection) (mongodb_top_queries_count{database =~ \"$database\",service_name=~\"$service_name\"})[$interval]))",
           "format": "time_series",
           "hide": false,
           "instant": true,
@@ -1000,15 +1046,15 @@
       "fieldConfig": {
         "defaults": {
           "color": {
-            "mode": "thresholds"
+            "fixedColor": "blue",
+            "mode": "fixed"
           },
           "mappings": [],
           "thresholds": {
             "mode": "absolute",
             "steps": [
               {
-                "color": "green",
-                "value": null
+                "color": "green"
               }
             ]
           }
@@ -1019,7 +1065,7 @@
         "h": 7,
         "w": 12,
         "x": 12,
-        "y": 36
+        "y": 44
       },
       "id": 20,
       "links": [],
@@ -1045,7 +1091,7 @@
           "datasource": "Metrics",
           "editorMode": "code",
           "exemplar": false,
-          "expr": "topk (5, rate(sum by (environment, cluster, database, collection) (mongodb_top_insert_count{database =~ \"$database\"})+sum by (environment, cluster, database, collection) (mongodb_top_insert_count{database =~ \"$database\"})+sum by (environment, cluster, database, collection) (mongodb_top_remove_count{database =~ \"$database\"})+sum by (environment, cluster, database, collection) (mongodb_top_update_count{database =~ \"$database\"})))",
+          "expr": "topk (5, rate(sum by (environment, cluster, database, collection) (mongodb_top_insert_count{database =~ \"$database\",service_name=~\"$service_name\"})+sum by (environment, cluster, database, collection) (mongodb_top_insert_count{database =~ \"$database\",service_name=~\"$service_name\"})+sum by (environment, cluster, database, collection) (mongodb_top_remove_count{database =~ \"$database\",service_name=~\"$service_name\"})+sum by (environment, cluster, database, collection) (mongodb_top_update_count{database =~ \"$database\",service_name=~\"$service_name\"})))",
           "format": "time_series",
           "hide": false,
           "instant": true,
@@ -1067,7 +1113,7 @@
         "h": 1,
         "w": 24,
         "x": 0,
-        "y": 43
+        "y": 51
       },
       "id": 12,
       "panels": [],
@@ -1081,287 +1127,328 @@
       "type": "row"
     },
     {
-      "datasource": "Metrics",
+      "aliasColors": {},
+      "bars": false,
+      "dashLength": 10,
+      "dashes": false,
+      "decimals": 2,
       "description": "Provides information on the rate of activity against the database then breaks down into activity type over the selected time period",
-      "fieldConfig": {
-        "defaults": {
-          "color": {
-            "mode": "palette-classic"
-          },
-          "custom": {
-            "axisCenteredZero": false,
-            "axisColorMode": "text",
-            "axisLabel": "",
-            "axisPlacement": "auto",
-            "barAlignment": 0,
-            "drawStyle": "line",
-            "fillOpacity": 10,
-            "gradientMode": "none",
-            "hideFrom": {
-              "legend": false,
-              "tooltip": false,
-              "viz": false
-            },
-            "lineInterpolation": "linear",
-            "lineWidth": 1,
-            "pointSize": 5,
-            "scaleDistribution": {
-              "type": "linear"
-            },
-            "showPoints": "never",
-            "spanNulls": true,
-            "stacking": {
-              "group": "A",
-              "mode": "none"
-            },
-            "thresholdsStyle": {
-              "mode": "off"
-            }
-          },
-          "mappings": [],
-          "thresholds": {
-            "mode": "absolute",
-            "steps": [
-              {
-                "color": "green",
-                "value": null
-              },
-              {
-                "color": "red",
-                "value": 80
-              }
-            ]
-          },
-          "unit": "short"
-        },
-        "overrides": []
+      "editable": true,
+      "error": false,
+      "fill": 2,
+      "fillGradient": 0,
+      "grid": {
+        "leftLogBase": 1,
+        "leftMin": 0,
+        "rightLogBase": 1
       },
       "gridPos": {
         "h": 8,
         "w": 24,
         "x": 0,
-        "y": 44
+        "y": 52
       },
+      "hiddenSeries": false,
       "id": 8,
+      "legend": {
+        "alignAsTable": true,
+        "avg": true,
+        "current": false,
+        "max": true,
+        "min": true,
+        "show": true,
+        "sort": "avg",
+        "sortDesc": true,
+        "total": false,
+        "values": true
+      },
+      "lines": true,
+      "linewidth": 2,
       "links": [],
+      "nullPointMode": "null",
       "options": {
-        "legend": {
-          "calcs": [],
-          "displayMode": "list",
-          "placement": "bottom",
-          "showLegend": true
-        },
-        "tooltip": {
-          "mode": "single",
-          "sort": "none"
-        }
+        "alertThreshold": true
       },
-      "pluginVersion": "8.3.5",
-      "repeat": "Database",
+      "paceLength": 10,
+      "percentage": false,
+      "pluginVersion": "9.2.20",
+      "pointradius": 5,
+      "points": false,
+      "renderer": "flot",
       "repeatDirection": "v",
+      "seriesOverrides": [],
+      "spaceLength": 10,
+      "stack": false,
+      "steppedLine": false,
       "targets": [
         {
           "datasource": "Metrics",
+          "editorMode": "code",
           "exemplar": true,
-          "expr": "rate(sum by (database) (mongodb_top_commands_count {database=~\"$database\"}[$interval]))",
+          "expr": "rate(sum by (database) (mongodb_top_commands_count{database=~\"$database\",service_name=~\"$service_name\"}[$interval]))",
           "format": "time_series",
           "hide": false,
           "instant": false,
           "interval": "",
           "intervalFactor": 2,
-          "legendFormat": "Commands",
+          "legendFormat": "Commands - {{database}}",
           "refId": "A",
           "step": 10
         },
         {
           "datasource": "Metrics",
+          "editorMode": "code",
           "exemplar": true,
-          "expr": "rate(sum by (database) (mongodb_top_insert_count {database=~\"$database\"}[$interval]))",
+          "expr": "rate(sum by (database) (mongodb_top_insert_count {database=~\"$database\",service_name=~\"$service_name\"}[$interval]))",
           "format": "time_series",
           "hide": false,
           "instant": false,
           "interval": "",
           "intervalFactor": 2,
-          "legendFormat": "Insert",
+          "legendFormat": "Insert - {{database}}",
           "refId": "B",
           "step": 10
         },
         {
           "datasource": "Metrics",
+          "editorMode": "code",
           "exemplar": true,
-          "expr": "rate(sum by (database) (mongodb_top_update_count {database=~\"$database\"}[$interval]))",
+          "expr": "rate(sum by (database) (mongodb_top_update_count {database=~\"$database\", service_name=~\"$service_name\"}[$interval]))",
           "format": "time_series",
           "hide": false,
           "instant": false,
           "interval": "",
-          "legendFormat": "Update",
+          "legendFormat": "Update - {{database}}",
           "refId": "C"
         },
         {
           "datasource": "Metrics",
+          "editorMode": "code",
           "exemplar": true,
-          "expr": "rate(sum by (database) (mongodb_top_remove_count {database=~\"$database\"}[$interval]))",
+          "expr": "rate(sum by (database) (mongodb_top_remove_count {database=~\"$database\", service_name=~\"$service_name\"}[$interval]))",
           "format": "time_series",
           "hide": false,
           "instant": false,
           "interval": "",
-          "legendFormat": "Remove",
+          "legendFormat": "Remove - {{database}}",
           "refId": "D"
         },
         {
           "datasource": "Metrics",
+          "editorMode": "code",
           "exemplar": true,
-          "expr": "rate(sum by (database) (mongodb_top_getmore_count {database=~\"$database\"}[$interval]))",
+          "expr": "rate(sum by (database) (mongodb_top_getmore_count {database=~\"$database\",service_name=~\"$service_name\"}[$interval]))",
           "hide": false,
           "interval": "",
-          "legendFormat": "Getmore",
+          "legendFormat": "Getmore - {{database}}",
+          "range": true,
           "refId": "E"
         }
       ],
+      "thresholds": [],
+      "timeRegions": [],
       "title": "Collections statistics  for $database (rate)",
-      "transformations": [],
-      "type": "timeseries"
+      "tooltip": {
+        "msResolution": false,
+        "shared": true,
+        "sort": 5,
+        "value_type": "cumulative"
+      },
+      "type": "graph",
+      "x-axis": true,
+      "xaxis": {
+        "mode": "time",
+        "show": true,
+        "values": []
+      },
+      "y-axis": true,
+      "y_formats": [
+        "ms",
+        "short"
+      ],
+      "yaxes": [
+        {
+          "decimals": 2,
+          "format": "short",
+          "label": "",
+          "logBase": 1,
+          "min": 0,
+          "show": true
+        },
+        {
+          "format": "short",
+          "logBase": 1,
+          "show": false
+        }
+      ],
+      "yaxis": {
+        "align": false
+      }
     },
     {
-      "datasource": "Metrics",
+      "aliasColors": {},
+      "bars": false,
+      "dashLength": 10,
+      "dashes": false,
+      "decimals": 2,
       "description": "Provides summary information on the activity running against the database then breaks down into activity type over the selected time period",
+      "editable": true,
+      "error": false,
       "fieldConfig": {
         "defaults": {
-          "color": {
-            "mode": "palette-classic"
-          },
-          "custom": {
-            "axisCenteredZero": false,
-            "axisColorMode": "text",
-            "axisLabel": "",
-            "axisPlacement": "auto",
-            "barAlignment": 0,
-            "drawStyle": "line",
-            "fillOpacity": 10,
-            "gradientMode": "none",
-            "hideFrom": {
-              "legend": false,
-              "tooltip": false,
-              "viz": false
-            },
-            "lineInterpolation": "linear",
-            "lineWidth": 1,
-            "pointSize": 5,
-            "scaleDistribution": {
-              "type": "linear"
-            },
-            "showPoints": "never",
-            "spanNulls": true,
-            "stacking": {
-              "group": "A",
-              "mode": "none"
-            },
-            "thresholdsStyle": {
-              "mode": "off"
-            }
-          },
-          "mappings": [],
-          "thresholds": {
-            "mode": "absolute",
-            "steps": [
-              {
-                "color": "green",
-                "value": null
-              },
-              {
-                "color": "red",
-                "value": 80
-              }
-            ]
-          },
           "unit": "short"
         },
         "overrides": []
       },
+      "fill": 2,
+      "fillGradient": 0,
+      "grid": {
+        "leftLogBase": 1,
+        "leftMin": 0,
+        "rightLogBase": 1
+      },
       "gridPos": {
         "h": 8,
         "w": 24,
         "x": 0,
-        "y": 52
+        "y": 60
       },
+      "hiddenSeries": false,
       "id": 25,
+      "legend": {
+        "alignAsTable": true,
+        "avg": true,
+        "current": false,
+        "max": true,
+        "min": true,
+        "show": true,
+        "sort": "avg",
+        "sortDesc": true,
+        "total": false,
+        "values": true
+      },
+      "lines": true,
+      "linewidth": 2,
       "links": [],
+      "nullPointMode": "null",
       "options": {
-        "legend": {
-          "calcs": [],
-          "displayMode": "list",
-          "placement": "bottom",
-          "showLegend": true
-        },
-        "tooltip": {
-          "mode": "single",
-          "sort": "none"
-        }
+        "alertThreshold": true
       },
-      "pluginVersion": "8.3.5",
+      "paceLength": 10,
+      "percentage": false,
+      "pluginVersion": "9.2.20",
+      "pointradius": 5,
+      "points": false,
+      "renderer": "flot",
       "repeatDirection": "v",
+      "seriesOverrides": [],
+      "spaceLength": 10,
+      "stack": false,
+      "steppedLine": false,
       "targets": [
         {
           "datasource": "Metrics",
+          "editorMode": "code",
           "exemplar": true,
-          "expr": "sum by (database) (mongodb_top_commands_count {database=~\"$database\"}[$interval])",
+          "expr": "sum by (database) (mongodb_top_commands_count {database=~\"$database\",service_name=~\"$service_name\"}[$interval])",
           "format": "time_series",
           "hide": false,
           "instant": false,
           "interval": "",
           "intervalFactor": 2,
-          "legendFormat": "Commands",
+          "legendFormat": "Commands - {{database}}",
           "refId": "A",
           "step": 10
         },
         {
           "datasource": "Metrics",
+          "editorMode": "code",
           "exemplar": true,
-          "expr": "sum by (database) (mongodb_top_insert_count {database=~\"$database\"}[$interval])",
+          "expr": "sum by (database) (mongodb_top_insert_count {database=~\"$database\",service_name=~\"$service_name\"}[$interval])",
           "format": "time_series",
           "hide": false,
           "instant": false,
           "interval": "",
           "intervalFactor": 2,
-          "legendFormat": "Insert",
+          "legendFormat": "Insert - {{database}}",
           "refId": "B",
           "step": 10
         },
         {
           "datasource": "Metrics",
+          "editorMode": "code",
           "exemplar": true,
-          "expr": "sum by (database) (mongodb_top_update_count {database=~\"$database\"}[$interval])",
+          "expr": "sum by (database) (mongodb_top_update_count {database=~\"$database\",service_name=~\"$service_name\"}[$interval])",
           "format": "time_series",
           "hide": false,
           "instant": false,
           "interval": "",
-          "legendFormat": "Update",
+          "legendFormat": "Update - {{database}}",
           "refId": "C"
         },
         {
           "datasource": "Metrics",
+          "editorMode": "code",
           "exemplar": true,
-          "expr": "sum by (database) (mongodb_top_remove_count {database=~\"$database\"}[$interval])",
+          "expr": "sum by (database) (mongodb_top_remove_count {database=~\"$database\",service_name=~\"$service_name\"}[$interval])",
           "format": "time_series",
           "hide": false,
           "instant": false,
           "interval": "",
-          "legendFormat": "Remove",
+          "legendFormat": "Remove - {{database}}",
           "refId": "D"
         },
         {
           "datasource": "Metrics",
+          "editorMode": "code",
           "exemplar": true,
-          "expr": "sum by (database) (mongodb_top_getmore_count {database=~\"$database\"}[$interval])",
+          "expr": "sum by (database) (mongodb_top_getmore_count {database=~\"$database\",service_name=~\"$service_name\"}[$interval])",
           "hide": false,
           "interval": "",
-          "legendFormat": "Getmore",
+          "legendFormat": "Getmore - {{database}}",
+          "range": true,
           "refId": "E"
         }
       ],
+      "thresholds": [],
+      "timeRegions": [],
       "title": "Collections statistics  for $database (summary)",
-      "transformations": [],
-      "type": "timeseries"
+      "tooltip": {
+        "msResolution": false,
+        "shared": true,
+        "sort": 5,
+        "value_type": "cumulative"
+      },
+      "type": "graph",
+      "x-axis": true,
+      "xaxis": {
+        "mode": "time",
+        "show": true,
+        "values": []
+      },
+      "y-axis": true,
+      "y_formats": [
+        "ms",
+        "short"
+      ],
+      "yaxes": [
+        {
+          "decimals": 2,
+          "format": "short",
+          "label": "",
+          "logBase": 1,
+          "min": 0,
+          "show": true
+        },
+        {
+          "format": "short",
+          "logBase": 1,
+          "show": false
+        }
+      ],
+      "yaxis": {
+        "align": false
+      }
     },
     {
       "datasource": "Metrics",
@@ -1382,8 +1469,7 @@
             "mode": "absolute",
             "steps": [
               {
-                "color": "green",
-                "value": null
+                "color": "green"
               }
             ]
           },
@@ -1474,7 +1560,7 @@
         "h": 7,
         "w": 24,
         "x": 0,
-        "y": 60
+        "y": 68
       },
       "id": 27,
       "options": {
@@ -1650,9 +1736,13 @@
       {
         "allValue": ".*",
         "current": {
-          "selected": false,
-          "text": "All",
-          "value": "$__all"
+          "selected": true,
+          "text": [
+            "All"
+          ],
+          "value": [
+            "$__all"
+          ]
         },
         "definition": "label_values({__name__=~\"mongodb_up\"}, environment)",
         "hide": 0,
@@ -1674,9 +1764,13 @@
       {
         "allValue": ".*",
         "current": {
-          "selected": false,
-          "text": "All",
-          "value": "$__all"
+          "selected": true,
+          "text": [
+            "All"
+          ],
+          "value": [
+            "$__all"
+          ]
         },
         "definition": "label_values(mongodb_up{environment=~\"$environment\"},cluster)",
         "hide": 0,
@@ -1721,19 +1815,23 @@
       },
       {
         "current": {
-          "selected": false,
-          "text": "",
-          "value": ""
+          "selected": true,
+          "text": [
+            "All"
+          ],
+          "value": [
+            "$__all"
+          ]
         },
-        "definition": "label_values(mongodb_up{environment=~\"$environment\",cluster=~\"$cluster\",node_name=~\"$node_name\"}, service_name)",
+        "definition": "label_values(mongodb_mongod_replset_my_state{cluster=~\"$cluster\"}, set)",
         "hide": 0,
-        "includeAll": false,
-        "label": "Service Name",
+        "includeAll": true,
+        "label": "Replication Set",
         "multi": true,
-        "name": "service_name",
+        "name": "replication_set",
         "options": [],
         "query": {
-          "query": "label_values(mongodb_up{environment=~\"$environment\",cluster=~\"$cluster\",node_name=~\"$node_name\"}, service_name)",
+          "query": "label_values(mongodb_mongod_replset_my_state{cluster=~\"$cluster\"}, set)",
           "refId": "StandardVariableQuery"
         },
         "refresh": 2,
@@ -1744,19 +1842,23 @@
       },
       {
         "current": {
-          "selected": false,
-          "text": "",
-          "value": ""
+          "selected": true,
+          "text": [
+            "All"
+          ],
+          "value": [
+            "$__all"
+          ]
         },
-        "definition": "label_values(mongodb_mongod_replset_my_state{cluster=~\"$cluster\"}, set)",
+        "definition": "label_values(mongodb_up{environment=~\"$environment\",cluster=~\"$cluster\",node_name=~\"$node_name\",replication_set=~\"$replication_set\"}, service_name)",
         "hide": 0,
-        "includeAll": false,
-        "label": "Replication Set",
+        "includeAll": true,
+        "label": "MongoDB Node",
         "multi": true,
-        "name": "replication_set",
+        "name": "service_name",
         "options": [],
         "query": {
-          "query": "label_values(mongodb_mongod_replset_my_state{cluster=~\"$cluster\"}, set)",
+          "query": "label_values(mongodb_up{environment=~\"$environment\",cluster=~\"$cluster\",node_name=~\"$node_name\",replication_set=~\"$replication_set\"}, service_name)",
           "refId": "StandardVariableQuery"
         },
         "refresh": 2,
@@ -1769,13 +1871,13 @@
         "current": {
           "selected": true,
           "text": [
-            "admin"
+            "All"
           ],
           "value": [
-            "admin"
+            "$__all"
           ]
         },
-        "definition": "label_values(mongodb_top_commands_count{cluster=~\"$cluster\"}, database)",
+        "definition": "label_values(mongodb_top_commands_count{cluster=~\"$cluster\",service_name=~\"$service_name\"}, database)",
         "hide": 0,
         "includeAll": true,
         "label": "Database",
@@ -1783,7 +1885,7 @@
         "name": "database",
         "options": [],
         "query": {
-          "query": "label_values(mongodb_top_commands_count{cluster=~\"$cluster\"}, database)",
+          "query": "label_values(mongodb_top_commands_count{cluster=~\"$cluster\",service_name=~\"$service_name\"}, database)",
           "refId": "StandardVariableQuery"
         },
         "refresh": 2,
@@ -1798,8 +1900,8 @@
       {
         "current": {
           "selected": false,
-          "text": "$cmd.aggregate",
-          "value": "$cmd.aggregate"
+          "text": "",
+          "value": ""
         },
         "definition": "label_values(mongodb_top_commands_count{database=~\"$database\"}, collection)",
         "hide": 2,
@@ -1833,15 +1935,12 @@
     "notice": false,
     "now": true,
     "refresh_intervals": [
+      "1s",
       "5s",
-      "10s",
-      "30s",
       "1m",
       "5m",
-      "15m",
-      "30m",
       "1h",
-      "2h",
+      "6h",
       "1d"
     ],
     "status": "Stable",
@@ -1858,7 +1957,7 @@
     ],
     "type": "timepicker"
   },
-  "timezone": "",
+  "timezone": "browser",
   "title": "MongoDB Collections Overview",
   "uid": "mongodb-collections-overview",
   "version": 1,
diff --git a/dashboards/Experimental/MongoDB_Oplog_Details.json b/dashboards/Experimental/MongoDB_Oplog_Details.json
index 146196bfc9..f15cdd7ecb 100644
--- a/dashboards/Experimental/MongoDB_Oplog_Details.json
+++ b/dashboards/Experimental/MongoDB_Oplog_Details.json
@@ -142,7 +142,7 @@
   "panels": [
     {
       "collapsed": false,
-     "datasource": "Metrics",
+      "datasource": "Metrics",
       "gridPos": {
         "h": 1,
         "w": 24,
@@ -165,7 +165,7 @@
       "bars": false,
       "dashLength": 10,
       "dashes": false,
-     "datasource": "Metrics",
+      "datasource": "Metrics",
       "decimals": 2,
       "description": "This panel provides details about your recovery window over a time interval based on your oplog activities. It coordinates with replication and backup activities.",
       "editable": true,
@@ -218,7 +218,7 @@
       },
       "paceLength": 10,
       "percentage": false,
-      "pluginVersion": "9.1.2",
+      "pluginVersion": "9.2.20",
       "pointradius": 5,
       "points": false,
       "renderer": "flot",
@@ -281,7 +281,6 @@
       ],
       "yaxes": [
         {
-          "$$hashKey": "object:1859",
           "decimals": 2,
           "format": "s",
           "label": "",
@@ -290,7 +289,6 @@
           "show": true
         },
         {
-          "$$hashKey": "object:1860",
           "format": "s",
           "logBase": 1,
           "show": true
@@ -302,12 +300,12 @@
     },
     {
       "collapsed": false,
-     "datasource": "Metrics",
+      "datasource": "Metrics",
       "gridPos": {
         "h": 1,
         "w": 24,
         "x": 0,
-        "y": 73
+        "y": 41
       },
       "id": 1070,
       "panels": [],
@@ -325,7 +323,7 @@
       "bars": false,
       "dashLength": 10,
       "dashes": false,
-     "datasource": "Metrics",
+      "datasource": "Metrics",
       "decimals": 2,
       "description": "Repl buffer ops applied per sec.",
       "editable": true,
@@ -353,7 +351,7 @@
         "h": 8,
         "w": 12,
         "x": 0,
-        "y": 74
+        "y": 42
       },
       "hiddenSeries": false,
       "id": 85,
@@ -379,7 +377,7 @@
       },
       "paceLength": 10,
       "percentage": false,
-      "pluginVersion": "9.1.2",
+      "pluginVersion": "9.2.20",
       "pointradius": 5,
       "points": false,
       "renderer": "flot",
@@ -421,7 +419,6 @@
       ],
       "yaxes": [
         {
-          "$$hashKey": "object:1943",
           "decimals": 2,
           "format": "ops",
           "label": "",
@@ -430,7 +427,6 @@
           "show": true
         },
         {
-          "$$hashKey": "object:1944",
           "format": "short",
           "logBase": 1,
           "show": false
@@ -445,7 +441,7 @@
       "bars": false,
       "dashLength": 10,
       "dashes": false,
-     "datasource": "Metrics",
+      "datasource": "Metrics",
       "decimals": 2,
       "description": "Provides information related to the number of getmore commands erlated to the local db oplog.rs collection",
       "editable": true,
@@ -473,7 +469,7 @@
         "h": 8,
         "w": 12,
         "x": 12,
-        "y": 74
+        "y": 42
       },
       "hiddenSeries": false,
       "id": 79,
@@ -499,7 +495,7 @@
       },
       "paceLength": 10,
       "percentage": false,
-      "pluginVersion": "9.1.2",
+      "pluginVersion": "9.2.20",
       "pointradius": 5,
       "points": false,
       "renderer": "flot",
@@ -541,7 +537,6 @@
       ],
       "yaxes": [
         {
-          "$$hashKey": "object:140",
           "decimals": 2,
           "format": "ms",
           "label": "",
@@ -550,7 +545,6 @@
           "show": true
         },
         {
-          "$$hashKey": "object:141",
           "format": "short",
           "logBase": 1,
           "show": false
@@ -565,7 +559,7 @@
       "bars": false,
       "dashLength": 10,
       "dashes": false,
-     "datasource": "Metrics",
+      "datasource": "Metrics",
       "decimals": 2,
       "description": "Times spent per second A) pre-loading oplog ops into parallel-executable batches B) Times spent pre-loading index values and C) repl batch apply phase.",
       "editable": true,
@@ -593,7 +587,7 @@
         "h": 8,
         "w": 24,
         "x": 0,
-        "y": 82
+        "y": 50
       },
       "hiddenSeries": false,
       "id": 84,
@@ -618,7 +612,7 @@
       },
       "paceLength": 10,
       "percentage": false,
-      "pluginVersion": "9.1.2",
+      "pluginVersion": "9.2.20",
       "pointradius": 5,
       "points": false,
       "renderer": "flot",
@@ -682,7 +676,6 @@
       ],
       "yaxes": [
         {
-          "$$hashKey": "object:216",
           "decimals": 2,
           "format": "ms",
           "label": "",
@@ -691,7 +684,6 @@
           "show": true
         },
         {
-          "$$hashKey": "object:217",
           "format": "short",
           "logBase": 1,
           "show": false
@@ -706,7 +698,7 @@
       "bars": false,
       "dashLength": 10,
       "dashes": false,
-     "datasource": "Metrics",
+      "datasource": "Metrics",
       "decimals": 2,
       "description": "Provides info on the current usage and actual size of the replication buffer as defined by the maximum oplog size",
       "editable": true,
@@ -734,7 +726,7 @@
         "h": 8,
         "w": 24,
         "x": 0,
-        "y": 154
+        "y": 90
       },
       "hiddenSeries": false,
       "id": 80,
@@ -759,7 +751,7 @@
       },
       "paceLength": 10,
       "percentage": false,
-      "pluginVersion": "9.1.2",
+      "pluginVersion": "9.2.20",
       "pointradius": 5,
       "points": false,
       "renderer": "flot",
@@ -818,7 +810,6 @@
       ],
       "yaxes": [
         {
-          "$$hashKey": "object:288",
           "decimals": 2,
           "format": "bytes",
           "label": "",
@@ -827,7 +818,6 @@
           "show": true
         },
         {
-          "$$hashKey": "object:289",
           "format": "short",
           "logBase": 1,
           "show": false
@@ -842,7 +832,7 @@
       "bars": false,
       "dashLength": 10,
       "dashes": false,
-     "datasource": "Metrics",
+      "datasource": "Metrics",
       "decimals": 2,
       "description": "Provides information on the number of write operations recorded in the oplog collection over a period of time",
       "editable": true,
@@ -870,7 +860,7 @@
         "h": 8,
         "w": 24,
         "x": 0,
-        "y": 226
+        "y": 130
       },
       "hiddenSeries": false,
       "id": 81,
@@ -895,7 +885,7 @@
       },
       "paceLength": 10,
       "percentage": false,
-      "pluginVersion": "9.1.2",
+      "pluginVersion": "9.2.20",
       "pointradius": 5,
       "points": false,
       "renderer": "flot",
@@ -959,7 +949,6 @@
       ],
       "yaxes": [
         {
-          "$$hashKey": "object:364",
           "decimals": 2,
           "format": "ops",
           "label": "",
@@ -968,7 +957,6 @@
           "show": true
         },
         {
-          "$$hashKey": "object:365",
           "format": "short",
           "logBase": 1,
           "show": false
@@ -980,12 +968,12 @@
     },
     {
       "collapsed": false,
-     "datasource": "Metrics",
+      "datasource": "Metrics",
       "gridPos": {
         "h": 1,
         "w": 24,
         "x": 0,
-        "y": 298
+        "y": 170
       },
       "id": 1551,
       "panels": [],
@@ -999,166 +987,174 @@
       "type": "row"
     },
     {
-     "datasource": "Metrics",
+      "aliasColors": {},
+      "bars": false,
+      "dashLength": 10,
+      "dashes": false,
+      "decimals": 2,
       "description": "The average amount of data in GB that the PRIMARY generate per hour",
-      "fieldConfig": {
-        "defaults": {
-          "color": {
-            "mode": "palette-classic"
-          },
-          "custom": {
-            "axisCenteredZero": false,
-            "axisColorMode": "text",
-            "axisLabel": "",
-            "axisPlacement": "auto",
-            "barAlignment": 0,
-            "drawStyle": "line",
-            "fillOpacity": 0,
-            "gradientMode": "none",
-            "hideFrom": {
-              "legend": false,
-              "tooltip": false,
-              "viz": false
-            },
-            "lineInterpolation": "linear",
-            "lineWidth": 1,
-            "pointSize": 5,
-            "scaleDistribution": {
-              "type": "linear"
-            },
-            "showPoints": "auto",
-            "spanNulls": false,
-            "stacking": {
-              "group": "A",
-              "mode": "none"
-            },
-            "thresholdsStyle": {
-              "mode": "off"
-            }
-          },
-          "mappings": [],
-          "thresholds": {
-            "mode": "absolute",
-            "steps": [
-              {
-                "color": "green",
-                "value": null
-              }
-            ]
-          },
-          "unit": "bytes"
-        },
-        "overrides": []
+      "editable": true,
+      "error": false,
+      "fill": 2,
+      "fillGradient": 0,
+      "grid": {
+        "leftLogBase": 1,
+        "leftMin": 0,
+        "rightLogBase": 1
       },
       "gridPos": {
-        "h": 10,
+        "h": 8,
         "w": 24,
         "x": 0,
-        "y": 299
+        "y": 171
       },
+      "hiddenSeries": false,
       "id": 1549,
+      "legend": {
+        "alignAsTable": true,
+        "avg": true,
+        "current": false,
+        "max": true,
+        "min": true,
+        "show": true,
+        "sort": "avg",
+        "sortDesc": true,
+        "total": false,
+        "values": true
+      },
+      "lines": true,
+      "linewidth": 2,
+      "links": [],
+      "nullPointMode": "null",
       "options": {
-        "legend": {
-          "calcs": [],
-          "displayMode": "list",
-          "placement": "bottom",
-          "showLegend": true
-        },
-        "tooltip": {
-          "mode": "single",
-          "sort": "none"
-        }
+        "alertThreshold": true
       },
+      "paceLength": 10,
+      "percentage": false,
+      "pluginVersion": "9.2.20",
+      "pointradius": 5,
+      "points": false,
+      "renderer": "flot",
+      "repeat": "service_name",
+      "repeatDirection": "h",
+      "seriesOverrides": [],
+      "spaceLength": 10,
+      "stack": false,
+      "steppedLine": false,
       "targets": [
         {
           "datasource": "Metrics",
+          "editorMode": "code",
           "exemplar": true,
-          "expr": "avg by (service_name) (rate(mongodb_oplog_stats_wt_cache_bytes_written_from_cache{rs_state=\"1\"})[$interval])",
+          "expr": "avg by (service_name) (rate(mongodb_oplog_stats_wt_cache_bytes_written_from_cache{rs_state=\"1\",service_name=~\"$service_name\"})[$interval])",
           "interval": "$interval",
           "legendFormat": "{{service_name}}",
+          "range": true,
           "refId": "A"
         }
       ],
+      "thresholds": [],
+      "timeRegions": [],
       "title": "Oplog GB/Hour",
-      "type": "timeseries"
+      "tooltip": {
+        "msResolution": false,
+        "shared": true,
+        "sort": 5,
+        "value_type": "cumulative"
+      },
+      "type": "graph",
+      "x-axis": true,
+      "xaxis": {
+        "mode": "time",
+        "show": true,
+        "values": []
+      },
+      "y-axis": true,
+      "y_formats": [
+        "ms",
+        "short"
+      ],
+      "yaxes": [
+        {
+          "decimals": 2,
+          "format": "bytes",
+          "label": "",
+          "logBase": 1,
+          "min": 0,
+          "show": true
+        },
+        {
+          "format": "short",
+          "logBase": 1,
+          "show": false
+        }
+      ],
+      "yaxis": {
+        "align": false
+      }
     },
     {
-     "datasource": "Metrics",
+      "aliasColors": {},
+      "bars": false,
+      "dashLength": 10,
+      "dashes": false,
+      "datasource": "Metrics",
+      "decimals": 2,
       "description": "Provides information about the contents of your oplog. The difference between the first and latest entries provides info data regarding which operations can possibly be repeated if necessary. ",
+      "editable": true,
+      "error": false,
       "fieldConfig": {
         "defaults": {
-          "color": {
-            "mode": "palette-classic"
-          },
-          "custom": {
-            "axisCenteredZero": false,
-            "axisColorMode": "text",
-            "axisLabel": "",
-            "axisPlacement": "auto",
-            "barAlignment": 0,
-            "drawStyle": "line",
-            "fillOpacity": 0,
-            "gradientMode": "none",
-            "hideFrom": {
-              "legend": false,
-              "tooltip": false,
-              "viz": false
-            },
-            "lineInterpolation": "linear",
-            "lineWidth": 1,
-            "pointSize": 5,
-            "scaleDistribution": {
-              "type": "linear"
-            },
-            "showPoints": "auto",
-            "spanNulls": false,
-            "stacking": {
-              "group": "A",
-              "mode": "none"
-            },
-            "thresholdsStyle": {
-              "mode": "off"
-            }
-          },
-          "mappings": [],
-          "thresholds": {
-            "mode": "absolute",
-            "steps": [
-              {
-                "color": "green",
-                "value": null
-              },
-              {
-                "color": "red",
-                "value": 80
-              }
-            ]
-          },
-          "unit": "hour"
+          "unit": "h"
         },
         "overrides": []
       },
+      "fill": 2,
+      "fillGradient": 0,
+      "grid": {
+        "leftLogBase": 1,
+        "leftMin": 0,
+        "rightLogBase": 1
+      },
       "gridPos": {
-        "h": 11,
+        "h": 8,
         "w": 24,
         "x": 0,
-        "y": 309
+        "y": 211
       },
+      "hiddenSeries": false,
       "id": 1553,
+      "legend": {
+        "alignAsTable": true,
+        "avg": true,
+        "current": false,
+        "max": true,
+        "min": true,
+        "show": true,
+        "sort": "avg",
+        "sortDesc": true,
+        "total": false,
+        "values": true
+      },
+      "lines": true,
+      "linewidth": 2,
+      "links": [],
+      "nullPointMode": "null",
       "options": {
-        "legend": {
-          "calcs": [
-            "lastNotNull"
-          ],
-          "displayMode": "table",
-          "placement": "bottom",
-          "showLegend": true
-        },
-        "tooltip": {
-          "mode": "single",
-          "sort": "none"
-        }
+        "alertThreshold": true
       },
+      "paceLength": 10,
+      "percentage": false,
+      "pluginVersion": "9.2.20",
+      "pointradius": 5,
+      "points": false,
+      "renderer": "flot",
+      "repeat": "service_name",
+      "repeatDirection": "h",
+      "seriesOverrides": [],
+      "spaceLength": 10,
+      "stack": false,
+      "steppedLine": false,
       "targets": [
         {
           "datasource": "Metrics",
@@ -1169,8 +1165,45 @@
           "refId": "A"
         }
       ],
+      "thresholds": [],
+      "timeRegions": [],
       "title": "Oplog Window",
-      "type": "timeseries"
+      "tooltip": {
+        "msResolution": false,
+        "shared": true,
+        "sort": 5,
+        "value_type": "cumulative"
+      },
+      "type": "graph",
+      "x-axis": true,
+      "xaxis": {
+        "mode": "time",
+        "show": true,
+        "values": []
+      },
+      "y-axis": true,
+      "y_formats": [
+        "ms",
+        "short"
+      ],
+      "yaxes": [
+        {
+          "decimals": 2,
+          "format": "h",
+          "label": "",
+          "logBase": 1,
+          "min": 0,
+          "show": true
+        },
+        {
+          "format": "short",
+          "logBase": 1,
+          "show": false
+        }
+      ],
+      "yaxis": {
+        "align": false
+      }
     }
   ],
   "refresh": "",
@@ -1254,7 +1287,6 @@
           "text": "All",
           "value": "$__all"
         },
-        "datasource": "Metrics",
         "definition": "label_values({__name__=~\"pg_up|mysql_up|mongodb_up|proxysql_mysql_status_active_transactions\"}, environment)",
         "hide": 0,
         "includeAll": true,
@@ -1283,7 +1315,6 @@
           "text": "",
           "value": ""
         },
-        "datasource": "Metrics",
         "definition": "label_values(mongodb_up{environment=~\"$environment\"},cluster)",
         "hide": 0,
         "includeAll": false,
@@ -1306,15 +1337,13 @@
       {
         "allFormat": "glob",
         "current": {
-          "isNone": true,
           "selected": false,
-          "text": "None",
-          "value": ""
+          "text": "All",
+          "value": "$__all"
         },
-        "datasource": "Metrics",
         "definition": "label_values(mongodb_mongod_replset_my_state{cluster=~\"$cluster\"}, set)",
         "hide": 0,
-        "includeAll": false,
+        "includeAll": true,
         "label": "Replica Set",
         "multi": true,
         "multiFormat": "glob",
@@ -1338,9 +1367,8 @@
           "text": "",
           "value": ""
         },
-        "datasource": "Metrics",
         "definition": "label_values(mongodb_up{environment=~\"$environment\",cluster=~\"$cluster\"}, node_name)",
-        "hide": 0,
+        "hide": 2,
         "includeAll": false,
         "label": "Node Name",
         "multi": true,
@@ -1366,17 +1394,16 @@
           "text": "",
           "value": ""
         },
-        "datasource": "Metrics",
-        "definition": "label_values(mongodb_up{environment=~\"$environment\",cluster=~\"$cluster\",node_name=~\"$node_name\"}, service_name)",
+        "definition": "label_values(mongodb_up{environment=~\"$environment\",cluster=~\"$cluster\",node_name=~\"$node_name\",replication_set=~\"$replset\"}, service_name)",
         "hide": 0,
         "includeAll": false,
-        "label": "Service Name",
-        "multi": true,
+        "label": "MongoDB Node",
+        "multi": false,
         "multiFormat": "glob",
         "name": "service_name",
         "options": [],
         "query": {
-          "query": "label_values(mongodb_up{environment=~\"$environment\",cluster=~\"$cluster\",node_name=~\"$node_name\"}, service_name)",
+          "query": "label_values(mongodb_up{environment=~\"$environment\",cluster=~\"$cluster\",node_name=~\"$node_name\",replication_set=~\"$replset\"}, service_name)",
           "refId": "StandardVariableQuery"
         },
         "refresh": 2,
@@ -1389,15 +1416,13 @@
       },
       {
         "current": {
-          "isNone": true,
           "selected": false,
-          "text": "None",
-          "value": ""
+          "text": "All",
+          "value": "$__all"
         },
-        "datasource": "Metrics",
         "definition": "label_values(mongodb_mongod_replset_my_state{cluster=~\"$cluster\"}, set)",
         "hide": 2,
-        "includeAll": false,
+        "includeAll": true,
         "label": "Replication Set",
         "multi": true,
         "name": "replication_set",
@@ -1417,12 +1442,10 @@
       },
       {
         "current": {
-          "isNone": true,
           "selected": false,
-          "text": "None",
+          "text": "",
           "value": ""
         },
-        "datasource": "Metrics",
         "definition": "label_values(mongodb_top_commands_count{cluster=~\"$cluster\"}, database)",
         "hide": 2,
         "includeAll": false,
@@ -1449,7 +1472,6 @@
           "text": "All",
           "value": "$__all"
         },
-        "datasource": "Metrics",
         "definition": "label_values({__name__=~\"pg_up|mysql_up|mongodb_up|proxysql_mysql_status_active_transactions\"}, node_type)",
         "hide": 2,
         "includeAll": true,
@@ -1476,7 +1498,6 @@
           "text": "All",
           "value": "$__all"
         },
-        "datasource": "Metrics",
         "definition": "label_values({__name__=~\"pg_up|mysql_up|mongodb_up|proxysql_mysql_status_active_transactions\"}, service_type)",
         "hide": 2,
         "includeAll": true,
@@ -1503,7 +1524,6 @@
           "text": "All",
           "value": "$__all"
         },
-        "datasource": "Metrics",
         "definition": "label_values({__name__=~\"pg_up|mysql_up|mongodb_up|proxysql_mysql_status_active_transactions\"}, schema)",
         "hide": 2,
         "includeAll": true,
@@ -1530,7 +1550,6 @@
           "text": "All",
           "value": "$__all"
         },
-        "datasource": "Metrics",
         "definition": "label_values(mysql_info_schema_user_statistics_connected_time_seconds_total{service_name=\"$service_name\"},user)",
         "hide": 2,
         "includeAll": true,
@@ -1555,12 +1574,10 @@
         "allFormat": "blob",
         "allValue": ".*",
         "current": {
-          "isNone": true,
           "selected": false,
-          "text": "None",
+          "text": "",
           "value": ""
         },
-        "datasource": "Metrics",
         "definition": "label_values(mongodb_mongod_replset_my_state{set=~\"$replset\"},cluster)",
         "hide": 2,
         "includeAll": false,
@@ -1571,7 +1588,7 @@
         "options": [],
         "query": {
           "query": "label_values(mongodb_mongod_replset_my_state{set=~\"$replset\"},cluster)",
-          "refId": "Metrics-current_cluster-Variable-Query"
+          "refId": "StandardVariableQuery"
         },
         "refresh": 2,
         "regex": "",
@@ -1586,7 +1603,6 @@
           "text": "All",
           "value": "$__all"
         },
-        "datasource": "Metrics",
         "definition": "query_result(mongodb_mongod_replset_my_state{cluster=~\"$cluster\",set=\"$replset\"}==2)",
         "hide": 2,
         "includeAll": true,
@@ -1620,15 +1636,12 @@
     "notice": false,
     "now": true,
     "refresh_intervals": [
+      "1s",
       "5s",
-      "10s",
-      "30s",
       "1m",
       "5m",
-      "15m",
-      "30m",
       "1h",
-      "2h",
+      "6h",
       "1d"
     ],
     "status": "Stable",
@@ -1645,7 +1658,7 @@
     ],
     "type": "timepicker"
   },
-  "timezone": "",
+  "timezone": "browser",
   "title": "MongoDB Oplog Details",
   "uid": "mongodb-oplog-details",
   "version": 1,