Merge pull request #113 from Telecominfraproject/alarmImprovement1516

Changed AccessPointIsUnreachable to NoMetricsReceived Alarm

alarm-models/src/main/java/com/telecominfraproject/wlan/alarm/models/AlarmCode.java

@@ -53,7 +53,7 @@ public class AlarmCode implements EnumWithId {
     public static final AlarmCode 
     LimitedCloudConnectivity = new AlarmCode(3, "LimitedCloudConnectivity", "Equipment is connected, however it's not reporting status or metrics", StatusCode.error, "Service AP and verify networking path to cloud"),
     AccessPointIsUnreachable = new AlarmCode(4, "AccessPointIsUnreachable", "Equipment is not reachable from cloud", StatusCode.error, "Service AP and verify networking path to cloud"),
-    NoMetricsReceived = new AlarmCode(6, "NoMetricsReceived", "Equipment is not report metrics"),
+    NoMetricsReceived = new AlarmCode(6, "NoMetricsReceived", "Metrics are not received from the equipment"),
     NoiseFloor2G = new AlarmCode(7, "NoiseFloor2G", "Noise floor is too high on 2G radio", StatusCode.requiresAttention, "Investigate interference sources"),
     ChannelUtilization2G = new AlarmCode(8, "ChannelUtilization2G", "Channel utilization is too high on 2G radio", StatusCode.requiresAttention, "Consider adding more APs"),
     NoiseFloor5G = new AlarmCode(9, "NoiseFloor5G", "Noise floor is too high on 5G radio", StatusCode.requiresAttention, "Investigate interference sources"),

equipment-alarms-sp/src/main/java/com/telecominfraproject/wlan/streams/equipmentalarms/EquipmentAlarmsContext.java

@@ -15,7 +15,7 @@ import com.telecominfraproject.wlan.servicemetric.apnode.models.ApNodeMetrics;
  * 	<li>AlarmCode.CPUTemperature
  * 	<li>AlarmCode.CPUUtilization
  * 	<li>AlarmCode.MemoryUtilization
- * 	<li>AlarmCode.AccessPointIsUnreachable
+ * 	<li>AlarmCode.NoMetricsReceived
  * </ul>
  * 
  * @author dtop
@@ -112,7 +112,7 @@ public class EquipmentAlarmsContext {
 		AtomicInteger count = new AtomicInteger();
 		
 		//check alarms against thresholds
-		if(alarmCode.getId() == AlarmCode.AccessPointIsUnreachable.getId()) {
+		if(alarmCode.getId() == AlarmCode.NoMetricsReceived.getId()) {
 			ret = metricReceivedTimestamps.isEmpty();
 		} else if(alarmCode.getId() == AlarmCode.CPUTemperature.getId()) {
 			cpuTempSamples.values().forEach(v -> { sum.addAndGet(v); count.incrementAndGet(); });
@@ -149,7 +149,7 @@ public class EquipmentAlarmsContext {
 		AtomicInteger count = new AtomicInteger();
 		
 		//check alarms against thresholds
-        if(alarmCode.getId() == AlarmCode.AccessPointIsUnreachable.getId()) {
+        if(alarmCode.getId() == AlarmCode.NoMetricsReceived.getId()) {
 			ret = !metricReceivedTimestamps.isEmpty();
         } else if(alarmCode.getId() == AlarmCode.CPUTemperature.getId()) {
 			cpuTempSamples.values().forEach(v -> { sum.addAndGet(v); count.incrementAndGet(); });

equipment-alarms-sp/src/main/java/com/telecominfraproject/wlan/streams/equipmentalarms/EquipmentAlarmsProcessor.java

@@ -40,7 +40,7 @@ import com.telecominfraproject.wlan.stream.StreamProcessor;
 /**
  * @author dtop 
  * <br> This stream processor is listening for APNodeMetrics, aggregating them in sliding windows of 5 minutes and raising/clearing alarms based on preconfigured thresholds.
- * <br> "AP out of reach" alarm is raised when no APNodeMetrics have been received for the equipment in the last interval, cleared when APNodeMetrics appear again
+ * <br> "No metrics received" alarm is raised when no APNodeMetrics have been received for the equipment in the last interval, cleared when APNodeMetrics appear again
  * <br> "Temperature too high" alarm is raised when average temperature over the last interval goes above the configured threshold of 80C, cleared when average temperature goes below the threshold
  * <br> "CPU utilization is too high" alarm is raised when average CPU utilization on AP over the last interval goes above the configured threshold of 80%, cleared when average CPU utilization goes below the threshold
  * <br> "Memory utilization is too high" alarm is raised when average RAM utilization on AP over the last interval goes above the configured threshold of 70%, cleared when average RAM utilization goes below the threshold
@@ -304,10 +304,10 @@ public class EquipmentAlarmsProcessor extends StreamProcessor {
 	    	equipmentAlarmsThread.start();
 	    	
 	    	//populate alarm codes this SP is responsible for
+	    	alarmCodeSet.add(AlarmCode.NoMetricsReceived);
 			alarmCodeSet.add(AlarmCode.CPUTemperature);
 			alarmCodeSet.add(AlarmCode.CPUUtilization);
 			alarmCodeSet.add(AlarmCode.MemoryUtilization);
-			alarmCodeSet.add(AlarmCode.AccessPointIsUnreachable);
 
 	    }