diff --git a/lib/insights/diagram/components/tooltip/diagram-tooltip.component.html b/lib/insights/diagram/components/tooltip/diagram-tooltip.component.html
index 39f606a33b..3e91ad3f70 100644
--- a/lib/insights/diagram/components/tooltip/diagram-tooltip.component.html
+++ b/lib/insights/diagram/components/tooltip/diagram-tooltip.component.html
@@ -1,6 +1,10 @@
 <div #tooltipContent class="{{adf}}-diagram-tooltip">
     <div class="{{adf}}-diagram-tooltip-header">{{ data.type }} {{ data.name || data.id }}</div>
     <div class="{{adf}}-diagram-tooltip-body">
+        <div *ngIf="data.value" class="{{adf}}-diagram-heat-value">
+            <span class="{{adf}}-diagram-value">{{ data.value }}</span>
+            <span class="{{adf}}-diagram-valuetype"> {{ data.dataType }}</span>
+        </div>
         <div *ngIf="data.name" class="{{adf}}-diagram-name-property">
             <span class="{{adf}}-diagram-propertyName">Name:</span>
             <span class="{{adf}}-diagram-propertyValue">{{ data.name }}</span>
diff --git a/lib/insights/diagram/components/tooltip/diagram-tooltip.component.spec.ts b/lib/insights/diagram/components/tooltip/diagram-tooltip.component.spec.ts
index 55e9e1ac0c..0fdbaf7c70 100644
--- a/lib/insights/diagram/components/tooltip/diagram-tooltip.component.spec.ts
+++ b/lib/insights/diagram/components/tooltip/diagram-tooltip.component.spec.ts
@@ -41,7 +41,7 @@ describe('DiagramTooltipComponent', () => {
 
         beforeEach(async(() => {
             TestBed.configureTestingModule({
-                declarations: [ DiagramTooltipComponent ]
+                declarations: [DiagramTooltipComponent]
             }).compileComponents();
         }));
 
@@ -91,8 +91,8 @@ describe('DiagramTooltipComponent', () => {
 
         it('should render the properties, if there is any', () => {
             data.properties = [
-                { name: 'property-1-name', value: 'property-1-value' },
-                { name: 'property-2-name', value: 'property-2-value' }
+                {name: 'property-1-name', value: 'property-1-value'},
+                {name: 'property-2-name', value: 'property-2-value'}
             ];
             fixture.detectChanges();
 
@@ -106,6 +106,21 @@ describe('DiagramTooltipComponent', () => {
             expect(propertyValues[0].nativeElement.innerText).toBe('property-1-value');
             expect(propertyValues[1].nativeElement.innerText).toBe('property-2-value');
         });
+
+        it('should render value and data type', () => {
+            data.value = '1';
+            data.dataType = 'hour';
+
+            fixture.detectChanges();
+
+            let propertyValue = fixture.debugElement.queryAll(By.css('.adf-diagram-heat-value > .adf-diagram-value')),
+                propertyValueType = fixture.debugElement.queryAll(By.css('.adf-diagram-heat-value > .adf-diagram-valuetype'));
+
+            expect(propertyValue.length).toBe(1);
+            expect(propertyValueType.length).toBe(1);
+            expect(propertyValue[0].nativeElement.innerText).toBe('1');
+            expect(propertyValueType[0].nativeElement.innerText).toBe(' hour');
+        });
     });
 
     describe('Tooltip functionality', () => {
@@ -114,12 +129,12 @@ describe('DiagramTooltipComponent', () => {
 
         beforeEach(async(() => {
             TestBed.configureTestingModule({
-                declarations: [ DiagramTooltipComponent, TestHostComponent ]
+                declarations: [DiagramTooltipComponent, TestHostComponent]
             }).compileComponents();
         }));
 
         beforeEach(() => {
-            fixture  = TestBed.createComponent(TestHostComponent);
+            fixture = TestBed.createComponent(TestHostComponent);
 
             fixture.detectChanges();
         });