Merge branch 'master' into feature/issue122_untyped_metrics

Author: echerniak

.travis.yml

@@ -0,0 +1,11 @@
+language: java
+jdk:
+- openjdk8
+notifications:
+  email:
+    on_success: never
+    on_failure: always
+  slack:
+    secure: UW1NBLkywVypP4ZmZsWpRe2evVtiheLeDcot9Y6se0xeE0uGAn5VHwgYI3i6to8trWOcUzkWF//M0WUHdLPHYzVfDUKXI7naNKX1lvc5mOaJyt8bzqLZTB68rX0/Lu0eYPrKRZAOfrVYpG3F3gbiO3Cc10hdED4peqrPM3n6M5Nv4VL56XzFLjfdORT0K3I9DpJY00enLey5Uk/KyPFChIYp3wdBoPKa2n/7kofeJ9AdfI/RrDAcK73uYdoRJptiwKZBT8QsXFRHKE5H4xyg5GyZMUpD0+4wMSVKCBBit+ffu8Gn24pw/orGD1t7Oydozsfucw0rer/5YTJ03Ub4C3J8FwEGK4d4ub51iCnLoef68m7blwsiQNtrVTDSOBYMsO2WbM4L5IHk9IU8lVDNGc3BjED8EvElJvtTEg/JHTPBBeXDAnM7oIlM+qJxpJhEtCxHGBfkf+6waGRk4tvc3X8cJQ4FApbRoUYqJdRZQMihJ2kjiBCgX5kVfT0qRaMUoLpMw5K5wLnWzDERxICbaTh96zrYvFqL55p7gtVa2cfbG8cGiyhsldIwVsWyrF/vEBzIKDYeNmpLcEK5pcKIIvTrZNSFIKlvTESeTE2tOnzSZ6UDMbjKiouLAyui++Xp9BZIdCvIG0wiQ91TdCSUbOOop2pNpufZW+WwoaxlXr8=
+    on_success: always
+    on_failure: always

README.md

@@ -1402,6 +1402,11 @@ This section provides a description of metrics of queues, channels and listeners
 <td>Shows maximum number of messages that are allowed on the queue.</td>
 </tr>
 <tr>
+<td>mqobject_queue_queue_fill_percentage</td>
+<td>gauge</td>
+<td>Shows queue fill percentage.</td>
+</tr>
+<tr>
 <td>mqobject_channel_channel_status_untyped</td>
 <td>gauge</td>
 <td>Shows current channel status. Mapping of channel statuses to prometheus metric values can be found <a href="#channel-status-mapping">here</a>.</td>

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

@@ -32,6 +32,7 @@ public static List<String> getUpdatedMetricNames() {
         updatedMetricNames.add("mqobject_get_average_destructive_mqget_persistent_message_size_bytes");
         updatedMetricNames.add("mqobject_get_average_destructive_mqget_non_persistent_message_size_bytes");
         updatedMetricNames.add("mqobject_get_average_destructive_mqget_persistent_and_non_persistent_message_size_bytes");
+        updatedMetricNames.add("mqobject_queue_queue_fill_percentage");
         return updatedMetricNames;
     }
 
@@ -57,6 +58,10 @@ public static List<String> getMetricsNamesUsedToUpdate(String updatedMetricName)
                 listWithNames.add("mqobject_get_destructive_mqget_persistent_message_count_totalmessages");
                 listWithNames.add("mqobject_get_destructive_mqget_non_persistent_message_count_totalmessages");
                 break;
+            case "mqobject_queue_queue_fill_percentage":
+                listWithNames.add("mqobject_queue_queue_depth_messages");
+                listWithNames.add("mqobject_queue_queue_max_depth_messages");
+                break;
             default:
                 break;
         }
@@ -74,6 +79,8 @@ public static Function<List<Double>, Double> getConversionFunction(String update
                 return MetricManagerUtils::division;
             case "mqobject_get_average_destructive_mqget_persistent_and_non_persistent_message_size_bytes":
                 return MetricManagerUtils::averageSum;
+            case "mqobject_get_queue_queue_fill_percentage":
+                return MetricManagerUtils::divisionInPercentage;
             default:
                 return MetricManagerUtils::defaultConversion;
         }
@@ -91,6 +98,12 @@ private static Double division(List<Double> params) {
         return params.get(1) == 0.0 ? 0.0 : params.get(0) / params.get(1);
     }
 
+    private static Double divisionInPercentage(List<Double> params) {
+        Objects.requireNonNull(params);
+        if (params.size() != 2) throw new IllegalArgumentException();
+        return params.get(1) == 0.0 ? 0.0 : params.get(0) / (params.get(1) * 100);
+    }
+
     private static Double defaultConversion(List<Double> params) {
         return Objects.requireNonNull(params).get(0);
     }

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

@@ -174,6 +174,7 @@ public static Map<String, Metric> getAdditionalMqObjectMetricsReference() {
         metrics.put("destructive MQGET persistent average message byte count", new Metric("mqobject_get_average_destructive_mqget_persistent_message_size_bytes", Metric.Type.SIMPLE_GAUGE));
         metrics.put("destructive MQGET non-persistent average message byte count", new Metric("mqobject_get_average_destructive_mqget_non_persistent_message_size_bytes", Metric.Type.SIMPLE_GAUGE));
         metrics.put("destructive MQGET persistent and non-persistent average message byte count", new Metric("mqobject_get_average_destructive_mqget_persistent_and_non_persistent_message_size_bytes", Metric.Type.SIMPLE_GAUGE));
+        metrics.put("queue fill percentage", new Metric("mqobject_queue_queue_fill_percentage", Metric.Type.SIMPLE_GAUGE));
         return metrics;
     }
 

src/test/java/ru/cinimex/exporter/prometheus/metrics/MetricManagerUtilsTest.java

@@ -16,6 +16,7 @@ static void initMetrics() {
         updatedMetricNames.add("mqobject_get_average_destructive_mqget_persistent_message_size_bytes");
         updatedMetricNames.add("mqobject_get_average_destructive_mqget_non_persistent_message_size_bytes");
         updatedMetricNames.add("mqobject_get_average_destructive_mqget_persistent_and_non_persistent_message_size_bytes");
+        updatedMetricNames.add("mqobject_queue_queue_fill_percentage");
     }
 
     @Test
@@ -44,5 +45,11 @@ void getMetricsNamesUsedToUpdate() {
         listWithNames.add("mqobject_get_destructive_mqget_non_persistent_message_count_totalmessages");
 
         assertEquals(listWithNames, MetricManagerUtils.getMetricsNamesUsedToUpdate(updatedMetricNames.get(2)));
+
+        listWithNames = new ArrayList<>();
+        listWithNames.add("mqobject_queue_queue_depth_messages");
+        listWithNames.add("mqobject_queue_queue_max_depth_messages");
+
+        assertEquals(listWithNames, MetricManagerUtils.getMetricsNamesUsedToUpdate(updatedMetricNames.get(3)));
     }
 }