diff --git a/agent/vendor/github.com/aws/amazon-ecs-agent/ecs-agent/tcs/model/ecstcs/api.go b/agent/vendor/github.com/aws/amazon-ecs-agent/ecs-agent/tcs/model/ecstcs/api.go
index 54caf6ec2c5..64a38593ef2 100644
--- a/agent/vendor/github.com/aws/amazon-ecs-agent/ecs-agent/tcs/model/ecstcs/api.go
+++ b/agent/vendor/github.com/aws/amazon-ecs-agent/ecs-agent/tcs/model/ecstcs/api.go
@@ -196,6 +196,8 @@ type ContainerHealth struct {
 
 	HealthStatus *string `locationName:"healthStatus" type:"string" enum:"HealthStatus"`
 
+	StatusMessage *string `locationName:"statusMessage" type:"string"`
+
 	StatusSince *time.Time `locationName:"statusSince" type:"timestamp"`
 }
 
@@ -302,7 +304,7 @@ func (s Dimension) GoString() string {
 type EphemeralStorageMetrics struct {
 	_ struct{} `type:"structure"`
 
-	BytesUtilized *ULongStatsSet `locationName:"bytesUtilized" type:"structure"`
+	BytesUtilized *ULongStatsSet `type:"structure"`
 }
 
 // String returns the string representation.
@@ -494,6 +496,30 @@ func (s HeartbeatOutput) GoString() string {
 	return s.String()
 }
 
+type InstanceMetrics struct {
+	_ struct{} `type:"structure"`
+
+	Storage *InstanceStorageMetrics `locationName:"storage" type:"structure"`
+}
+
+// String returns the string representation.
+//
+// API parameter values that are decorated as "sensitive" in the API will not
+// be included in the string output. The member name will be present, but the
+// value will be replaced with "sensitive".
+func (s InstanceMetrics) String() string {
+	return awsutil.Prettify(s)
+}
+
+// GoString returns the string representation.
+//
+// API parameter values that are decorated as "sensitive" in the API will not
+// be included in the string output. The member name will be present, but the
+// value will be replaced with "sensitive".
+func (s InstanceMetrics) GoString() string {
+	return s.String()
+}
+
 type InstanceStatus struct {
 	_ struct{} `type:"structure"`
 
@@ -552,6 +578,32 @@ func (s InstanceStatusMetadata) GoString() string {
 	return s.String()
 }
 
+type InstanceStorageMetrics struct {
+	_ struct{} `type:"structure"`
+
+	DataFilesystem *float64 `type:"double"`
+
+	OSFilesystem *float64 `type:"double"`
+}
+
+// String returns the string representation.
+//
+// API parameter values that are decorated as "sensitive" in the API will not
+// be included in the string output. The member name will be present, but the
+// value will be replaced with "sensitive".
+func (s InstanceStorageMetrics) String() string {
+	return awsutil.Prettify(s)
+}
+
+// GoString returns the string representation.
+//
+// API parameter values that are decorated as "sensitive" in the API will not
+// be included in the string output. The member name will be present, but the
+// value will be replaced with "sensitive".
+func (s InstanceStorageMetrics) GoString() string {
+	return s.String()
+}
+
 type InvalidParameterException struct {
 	_            struct{}                  `type:"structure"`
 	RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"`
@@ -912,6 +964,8 @@ func (s PublishInstanceStatusRequest) GoString() string {
 type PublishMetricsInput struct {
 	_ struct{} `type:"structure"`
 
+	InstanceMetrics *InstanceMetrics `locationName:"instanceMetrics" type:"structure"`
+
 	Metadata *MetricsMetadata `locationName:"metadata" type:"structure"`
 
 	TaskMetrics []*TaskMetric `locationName:"taskMetrics" type:"list"`
@@ -984,6 +1038,8 @@ func (s PublishMetricsOutput) GoString() string {
 type PublishMetricsRequest struct {
 	_ struct{} `type:"structure"`
 
+	InstanceMetrics *InstanceMetrics `locationName:"instanceMetrics" type:"structure"`
+
 	Metadata *MetricsMetadata `locationName:"metadata" type:"structure"`
 
 	TaskMetrics []*TaskMetric `locationName:"taskMetrics" type:"list"`
diff --git a/ecs-agent/tcs/model/api/api-2.json b/ecs-agent/tcs/model/api/api-2.json
index 0f3a812d28f..e0b95e67d11 100644
--- a/ecs-agent/tcs/model/api/api-2.json
+++ b/ecs-agent/tcs/model/api/api-2.json
@@ -120,7 +120,8 @@
       "members":{
         "containerName":{"shape":"String"},
         "healthStatus":{"shape":"HealthStatus"},
-        "statusSince":{"shape":"Timestamp"}
+        "statusSince":{"shape":"Timestamp"},
+        "statusMessage":{"shape":"String"}
       }
     },
     "ContainerHealths":{
@@ -139,12 +140,6 @@
         "restartStatsSet":{"shape":"RestartStatsSet"}
       }
     },
-    "RestartStatsSet":{
-      "type":"structure",
-	  "members":{
-        "restartCount":{"shape":"UInteger"}
-      }
-    },
     "ContainerMetrics":{
       "type":"list",
       "member":{"shape":"ContainerMetric"}
@@ -164,7 +159,7 @@
     "EphemeralStorageMetrics":{
       "type":"structure",
       "members":{
-        "bytesUtilized":{"shape":"ULongStatsSet"}
+        "BytesUtilized":{"shape":"ULongStatsSet"}
       }
     },
     "GeneralMetric":{
@@ -219,6 +214,12 @@
         "INITIALIZING"
       ]
     },
+    "InstanceMetrics":{
+      "type":"structure",
+      "members":{
+        "storage":{"shape":"InstanceStorageMetrics"}
+      }
+    },
     "InstanceStatus":{
       "type":"structure",
       "members":{
@@ -240,6 +241,13 @@
       "type":"list",
       "member":{"shape":"InstanceStatus"}
     },
+    "InstanceStorageMetrics":{
+      "type":"structure",
+      "members":{
+        "OSFilesystem":{"shape":"Percentage"},
+        "DataFilesystem":{"shape":"Percentage"}
+      }
+    },
     "InvalidParameterException":{
       "type":"structure",
       "members":{
@@ -288,6 +296,11 @@
         "txPackets":{"shape":"ULongStatsSet"}
       }
     },
+    "Percentage":{
+      "type":"double",
+      "max":100.0,
+      "min":0.0
+    },
     "PublishHealthRequest":{
       "type":"structure",
       "members":{
@@ -308,6 +321,7 @@
       "type":"structure",
       "members":{
         "metadata":{"shape":"MetricsMetadata"},
+        "instanceMetrics":{"shape":"InstanceMetrics"},
         "taskMetrics":{"shape":"TaskMetrics"},
         "timestamp":{"shape":"Timestamp"}
       }
@@ -319,6 +333,12 @@
       },
       "exception":true
     },
+    "RestartStatsSet":{
+      "type":"structure",
+      "members":{
+        "restartCount":{"shape":"UInteger"}
+      }
+    },
     "ServerException":{
       "type":"structure",
       "members":{
diff --git a/ecs-agent/tcs/model/ecstcs/api.go b/ecs-agent/tcs/model/ecstcs/api.go
index 54caf6ec2c5..64a38593ef2 100644
--- a/ecs-agent/tcs/model/ecstcs/api.go
+++ b/ecs-agent/tcs/model/ecstcs/api.go
@@ -196,6 +196,8 @@ type ContainerHealth struct {
 
 	HealthStatus *string `locationName:"healthStatus" type:"string" enum:"HealthStatus"`
 
+	StatusMessage *string `locationName:"statusMessage" type:"string"`
+
 	StatusSince *time.Time `locationName:"statusSince" type:"timestamp"`
 }
 
@@ -302,7 +304,7 @@ func (s Dimension) GoString() string {
 type EphemeralStorageMetrics struct {
 	_ struct{} `type:"structure"`
 
-	BytesUtilized *ULongStatsSet `locationName:"bytesUtilized" type:"structure"`
+	BytesUtilized *ULongStatsSet `type:"structure"`
 }
 
 // String returns the string representation.
@@ -494,6 +496,30 @@ func (s HeartbeatOutput) GoString() string {
 	return s.String()
 }
 
+type InstanceMetrics struct {
+	_ struct{} `type:"structure"`
+
+	Storage *InstanceStorageMetrics `locationName:"storage" type:"structure"`
+}
+
+// String returns the string representation.
+//
+// API parameter values that are decorated as "sensitive" in the API will not
+// be included in the string output. The member name will be present, but the
+// value will be replaced with "sensitive".
+func (s InstanceMetrics) String() string {
+	return awsutil.Prettify(s)
+}
+
+// GoString returns the string representation.
+//
+// API parameter values that are decorated as "sensitive" in the API will not
+// be included in the string output. The member name will be present, but the
+// value will be replaced with "sensitive".
+func (s InstanceMetrics) GoString() string {
+	return s.String()
+}
+
 type InstanceStatus struct {
 	_ struct{} `type:"structure"`
 
@@ -552,6 +578,32 @@ func (s InstanceStatusMetadata) GoString() string {
 	return s.String()
 }
 
+type InstanceStorageMetrics struct {
+	_ struct{} `type:"structure"`
+
+	DataFilesystem *float64 `type:"double"`
+
+	OSFilesystem *float64 `type:"double"`
+}
+
+// String returns the string representation.
+//
+// API parameter values that are decorated as "sensitive" in the API will not
+// be included in the string output. The member name will be present, but the
+// value will be replaced with "sensitive".
+func (s InstanceStorageMetrics) String() string {
+	return awsutil.Prettify(s)
+}
+
+// GoString returns the string representation.
+//
+// API parameter values that are decorated as "sensitive" in the API will not
+// be included in the string output. The member name will be present, but the
+// value will be replaced with "sensitive".
+func (s InstanceStorageMetrics) GoString() string {
+	return s.String()
+}
+
 type InvalidParameterException struct {
 	_            struct{}                  `type:"structure"`
 	RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"`
@@ -912,6 +964,8 @@ func (s PublishInstanceStatusRequest) GoString() string {
 type PublishMetricsInput struct {
 	_ struct{} `type:"structure"`
 
+	InstanceMetrics *InstanceMetrics `locationName:"instanceMetrics" type:"structure"`
+
 	Metadata *MetricsMetadata `locationName:"metadata" type:"structure"`
 
 	TaskMetrics []*TaskMetric `locationName:"taskMetrics" type:"list"`
@@ -984,6 +1038,8 @@ func (s PublishMetricsOutput) GoString() string {
 type PublishMetricsRequest struct {
 	_ struct{} `type:"structure"`
 
+	InstanceMetrics *InstanceMetrics `locationName:"instanceMetrics" type:"structure"`
+
 	Metadata *MetricsMetadata `locationName:"metadata" type:"structure"`
 
 	TaskMetrics []*TaskMetric `locationName:"taskMetrics" type:"list"`