diff --git a/agent/src/main/resources/marvel_index_template.json b/agent/src/main/resources/marvel_index_template.json
index 933e37d873ff6..1fa44c9115c92 100644
--- a/agent/src/main/resources/marvel_index_template.json
+++ b/agent/src/main/resources/marvel_index_template.json
@@ -42,13 +42,46 @@
     },
     "node_stats": {
       "properties": {
-        "fielddata_breaker": {
+        "breakers": {
           "properties": {
-            "estimated_size_in_bytes": {
-              "type": "long"
+            "fielddata": {
+              "properties": {
+                "estimated_size_in_bytes": {
+                  "type": "long"
+                },
+                "tripped": {
+                  "type": "long"
+                },
+                "limit_size_in_bytes": {
+                  "type": "long"
+                }
+              }
+            },
+            "request": {
+              "properties": {
+                "estimated_size_in_bytes": {
+                  "type": "long"
+                },
+                "tripped": {
+                  "type": "long"
+                },
+                "limit_size_in_bytes": {
+                  "type": "long"
+                }
+              }
             },
-            "tripped": {
-              "type": "long"
+            "parent": {
+              "properties": {
+                "estimated_size_in_bytes": {
+                  "type": "long"
+                },
+                "tripped": {
+                  "type": "long"
+                },
+                "limit_size_in_bytes": {
+                  "type": "long"
+                }
+              }
             }
           }
         },
diff --git a/kibana/dashboards/nodes_stats.js b/kibana/dashboards/nodes_stats.js
index 1634f7ce2c788..5c437484c64c3 100644
--- a/kibana/dashboards/nodes_stats.js
+++ b/kibana/dashboards/nodes_stats.js
@@ -646,16 +646,56 @@ var rows = [
     "title": "Circuit Breakers",
     "panels": [
       {
-        "value_field": "fielddata_breaker.estimated_size_in_bytes",
+        "value_field": "breakers.parent.estimated_size_in_bytes",
+        "mode": "max",
+        "title": "Parent Circuit Breaker Estimated Size",
+        "y_format": "bytes"
+      },
+      {
+        "value_field": "breakers.parent.tripped",
+        "mode": "max",
+        "title": "Parent Circuit Breaker Trip Count"
+      },
+      {
+        "value_field": "breakers.parent.limit_size_in_bytes",
+        "mode": "max",
+        "title": "Parent Circuit Breaker Limit",
+        "y_format": "bytes"
+      },
+      {
+        "value_field": "breakers.fielddata.estimated_size_in_bytes",
         "mode": "max",
         "title": "Field Data Circuit Breaker Estimated Size",
         "y_format": "bytes"
       },
       {
-        "value_field": "fielddata_breaker.tripped",
+        "value_field": "breakers.fielddata.tripped",
         "mode": "max",
         "title": "Field Data Circuit Breaker Trip Count"
-      }      
+      },
+      {
+        "value_field": "breakers.fielddata.limit_size_in_bytes",
+        "mode": "max",
+        "title": "Field Data Circuit Breaker Limit",
+        "y_format": "bytes"
+      },
+      {
+        "value_field": "breakers.request.estimated_size_in_bytes",
+        "mode": "max",
+        "title": "Request Circuit Breaker Estimated Size",
+        "y_format": "bytes"
+      },
+      {
+        "value_field": "breakers.request.tripped",
+        "mode": "max",
+        "title": "Request Circuit Breaker Trip Count"
+      },
+      {
+        "value_field": "breakers.request.limit_size_in_bytes",
+        "mode": "max",
+        "title": "Request Circuit Breaker Limit",
+        "y_format": "bytes"
+      }
     ]
   },
   {
diff --git a/sense/app/kb/api_1_0/cluster.js b/sense/app/kb/api_1_0/cluster.js
index ee14ac6f785c9..1d20f5133fb84 100644
--- a/sense/app/kb/api_1_0/cluster.js
+++ b/sense/app/kb/api_1_0/cluster.js
@@ -85,8 +85,16 @@ define(function () {
               'allocation.node_concurrent_recoveries': 2,
               'allocation.same_shard.host': { __one_of: [ false, true ]}
             }
+          },
+          indices: {
+            breaker: {
+              "total.limit": "70%",
+              "fielddata.limit": "60%",
+              "fielddata.overhead": 1.03,
+              "request.limit": "40%",
+              "request.overhead": 1.0
+            }
           }
-
         },
         transient: {
           __scope_link: '.persistent'