Add storage pool used IOPS metric to resource alerts

Author: Damans227

plugins/resource-alerts/src/main/java/org/apache/cloudstack/resourcealert/ResourceAlertManagerImpl.java

@@ -288,6 +288,11 @@ private Double getMetricValue(ResourceAlertRule.ResourceType type, ResourceAlert
                 VmStats s = statsCollector.getVmStats(resourceId, false);
                 return s != null ? s.getNetworkWriteKBs() : null;
             }
+            case STORAGE_USED_IOPS: {
+                // only reported by storage drivers that track IOPS
+                StorageStats pool = statsCollector.getStoragePoolStats(resourceId);
+                return pool != null && pool.getUsedIops() != null ? pool.getUsedIops().doubleValue() : null;
+            }
             case VOLUME_SIZE_GB: {
                 VolumeStats s = getVolumeStats(resourceId);
                 return s != null ? s.getPhysicalSize() / (1024.0 * 1024.0 * 1024.0) : null;

plugins/resource-alerts/src/main/java/org/apache/cloudstack/resourcealert/ResourceAlertMetric.java

@@ -32,7 +32,8 @@ public enum ResourceAlertMetric {
     NETWORK_READ_KBPS(ResourceAlertRule.ResourceType.VirtualMachine, ResourceAlertRule.ResourceType.Host),
     NETWORK_WRITE_KBPS(ResourceAlertRule.ResourceType.VirtualMachine, ResourceAlertRule.ResourceType.Host),
     LOAD_AVERAGE(ResourceAlertRule.ResourceType.Host),
-    VOLUME_SIZE_GB(ResourceAlertRule.ResourceType.Volume);
+    VOLUME_SIZE_GB(ResourceAlertRule.ResourceType.Volume),
+    STORAGE_USED_IOPS(ResourceAlertRule.ResourceType.StoragePool);
 
     private final Set<ResourceAlertRule.ResourceType> applicableTypes;
 

plugins/resource-alerts/src/test/java/org/apache/cloudstack/resourcealert/ResourceAlertManagerImplTest.java

@@ -711,4 +711,35 @@ public void testVolumeSizeRuleUsesChainInfoForOva() {
         verify(statsCollector).getVolumeStats("chain-info");
         verify(alertDao, never()).persist(any());
     }
+
+    private ResourceAlertRuleVO poolIopsRule(double threshold) {
+        return new ResourceAlertRuleVO("pool-iops", ResourceAlertRule.ResourceType.StoragePool,
+                POOL_ID, 1L, 1L, "STORAGE_USED_IOPS", AlertCondition.GT, threshold,
+                AlertSeverity.HIGH, null, false, 600);
+    }
+
+    @Test
+    public void testStoragePoolIopsRuleFires() {
+        when(ruleDao.listActive()).thenReturn(Collections.singletonList(poolIopsRule(1000.0)));
+        StorageStats stats = mock(StorageStats.class);
+        when(stats.getUsedIops()).thenReturn(5000L);
+        when(statsCollector.getStoragePoolStats(POOL_ID)).thenReturn(stats);
+
+        manager.evaluateRules();
+
+        verify(alertDao).persist(alertCaptor.capture());
+        assertEquals(5000.0, alertCaptor.getValue().getMetricValue(), 0.001);
+    }
+
+    @Test
+    public void testStoragePoolIopsRuleSkippedWhenDriverDoesNotReportIops() {
+        when(ruleDao.listActive()).thenReturn(Collections.singletonList(poolIopsRule(1000.0)));
+        StorageStats stats = mock(StorageStats.class);
+        when(stats.getUsedIops()).thenReturn(null);
+        when(statsCollector.getStoragePoolStats(POOL_ID)).thenReturn(stats);
+
+        manager.evaluateRules();
+
+        verify(alertDao, never()).persist(any());
+    }
 }

plugins/resource-alerts/src/test/java/org/apache/cloudstack/resourcealert/ResourceAlertMetricTest.java

@@ -86,4 +86,12 @@ public void testVolumeSizeAppliesToVolumeOnly() {
         assertFalse(ResourceAlertMetric.VOLUME_SIZE_GB.appliesTo(ResourceAlertRule.ResourceType.Host));
         assertFalse(ResourceAlertMetric.VOLUME_SIZE_GB.appliesTo(ResourceAlertRule.ResourceType.StoragePool));
     }
+
+    @Test
+    public void testStorageUsedIopsAppliesToStoragePoolOnly() {
+        assertTrue(ResourceAlertMetric.STORAGE_USED_IOPS.appliesTo(ResourceAlertRule.ResourceType.StoragePool));
+        assertFalse(ResourceAlertMetric.STORAGE_USED_IOPS.appliesTo(ResourceAlertRule.ResourceType.Volume));
+        assertFalse(ResourceAlertMetric.STORAGE_USED_IOPS.appliesTo(ResourceAlertRule.ResourceType.Host));
+        assertFalse(ResourceAlertMetric.STORAGE_USED_IOPS.appliesTo(ResourceAlertRule.ResourceType.VirtualMachine));
+    }
 }

ui/src/views/resourcealert/CreateResourceAlertRule.vue

@@ -106,7 +106,7 @@ const METRICS_BY_TYPE = {
   VirtualMachine: ['CPU_UTILIZATION', 'MEMORY_UTILIZATION', 'DISK_READ_IOPS', 'DISK_WRITE_IOPS', 'DISK_READ_KBPS', 'DISK_WRITE_KBPS', 'NETWORK_READ_KBPS', 'NETWORK_WRITE_KBPS'],
   Host: ['CPU_UTILIZATION', 'MEMORY_UTILIZATION', 'LOAD_AVERAGE', 'NETWORK_READ_KBPS', 'NETWORK_WRITE_KBPS'],
   Volume: ['DISK_READ_IOPS', 'DISK_WRITE_IOPS', 'DISK_READ_KBPS', 'DISK_WRITE_KBPS', 'VOLUME_SIZE_GB'],
-  StoragePool: ['STORAGE_UTILIZATION']
+  StoragePool: ['STORAGE_UTILIZATION', 'STORAGE_USED_IOPS']
 }
 
 export default {
@@ -156,7 +156,8 @@ export default {
         NETWORK_WRITE_KBPS: 'Network Out KB/s',
         STORAGE_UTILIZATION: 'Storage Utilization %',
         LOAD_AVERAGE: 'Load Average',
-        VOLUME_SIZE_GB: 'Volume Size (GB)'
+        VOLUME_SIZE_GB: 'Volume Size (GB)',
+        STORAGE_USED_IOPS: 'Storage Used IOPS'
       },
       conditionLabels: {
         GT: 'Is above',