Merge pull request #77 from Cinimex-Informatica/feature/issue74_expand_listener_statuses

issue74 added "STOPPED" status for listener - #74

Author: sberdyshev

README.md

@@ -1445,12 +1445,17 @@ This section provides a mapping between MQ listener statuses and metric values,
 </tr>
 <tr>
 <td>STARTING</td>
-<td>0.5</td>
+<td>0.75</td>
 </tr>
 <tr>
 <td>STOPPING</td>
+<td>0.5</td>
+</tr>
+<tr>
+<td>STOPPED</td>
 <td>0</td>
 </tr>
+
 </tbody>
 </table>
 

src/main/java/ru/cinimex/exporter/mq/MQPCFSubscriber.java

@@ -116,9 +116,13 @@ private void updateMetricsWithWildcards(PCFMessage[] pcfResponse) {
                     updateMetricWithoutWildcards(directPCFResponse[0], objectName);
                 } catch (PCFException e) {
                     //This error means, that channel has status "inactive".
-                    logger.warn("Channel {} is possibly inactive.", objectName);
-                    if (e.reasonCode == MQConstants.MQRCCF_CHL_STATUS_NOT_FOUND) {
+                    if (object.getType() == MQObject.MQType.CHANNEL && e.reasonCode == MQConstants.MQRCCF_CHL_STATUS_NOT_FOUND) {
                         MetricsManager.updateMetric(MetricsReference.getMetricName(object.getType()), MetricsReference.getMetricValue(object.getType(), MQConstants.MQCHS_INACTIVE), queueManagerName, objectName);
+                        logger.warn("Channel {} is possibly inactive.", objectName);
+                    }
+                    if (object.getType() == MQObject.MQType.LISTENER && e.reasonCode == MQConstants.MQRC_UNKNOWN_OBJECT_NAME) {
+                        MetricsManager.updateMetric(MetricsReference.getMetricName(object.getType()), MetricsReference.getMetricValue(object.getType(), MQConstants.MQSVC_STATUS_STOPPED), queueManagerName, objectName);
+                        logger.warn("Listener {} is possibly stopped.", objectName);
                     }
                 } catch (IOException | MQException e) {
                     logger.error("Error occurred during sending PCF command: ", e);
@@ -145,6 +149,10 @@ public void run() {
                 logger.warn("Channel {} is possibly inactive.", object.getName());
                 MetricsManager.updateMetric(MetricsReference.getMetricName(object.getType()), MetricsReference.getMetricValue(object.getType(), MQConstants.MQCHS_INACTIVE), queueManagerName, object.getName());
             }
+            if (object.getType() == MQObject.MQType.LISTENER && e.reasonCode == MQConstants.MQRC_UNKNOWN_OBJECT_NAME) {
+                MetricsManager.updateMetric(MetricsReference.getMetricName(object.getType()), MetricsReference.getMetricValue(object.getType(), MQConstants.MQSVC_STATUS_STOPPED), queueManagerName, object.getName());
+                logger.warn("Listener {} is possibly stopped.", object.getName());
+            }
         } catch (MQException | IOException e) {
             logger.error("Error occurred during sending PCF command: ", e);
         }

src/main/java/ru/cinimex/exporter/prometheus/metrics/MetricsReference.java

@@ -162,9 +162,10 @@ public class MetricsReference {
 
     private static HashMap<Integer, Double> listenerStatus = new HashMap<Integer, Double>() {
         {
-            put(MQConstants.MQSVC_STATUS_RUNNING, (double) 1);
-            put(MQConstants.MQSVC_STATUS_STARTING, 0.5);
-            put(MQConstants.MQSVC_STATUS_STOPPING, (double) 0);
+            put(MQConstants.MQSVC_STATUS_RUNNING, 1.0);
+            put(MQConstants.MQSVC_STATUS_STARTING, 0.75);
+            put(MQConstants.MQSVC_STATUS_STOPPING, 0.5);
+            put(MQConstants.MQSVC_STATUS_STOPPED, 0.0);
         }
     };