Merge branch 'dev' into jeffrey/metrics

Author: Jeffrey Na

__tests__/charts/HealthChart.test.tsx

@@ -30,6 +30,7 @@ describe('HealthChart', () => {
   const props = {
     key: 'testKey',
     dataType: 'Memory in Megabytes',
+    serviceName: 'serviceName',
     chartData: mockData,
     categoryName: 'Test Name',
     sizing: 'all',