Skip to content

Commit

Permalink
issue53 metric names updated. Resolves: #47, #51, #53, #54
Browse files Browse the repository at this point in the history
  • Loading branch information
@echerniak
echerniak committed Mar 20, 2019
1 parent 4f96bf6 commit 7d61069
Show file tree
Hide file tree
Showing 2 changed files with 32 additions and 26 deletions.
34 changes: 20 additions & 14 deletions README.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -217,12 +217,18 @@ This section provides a description of domains and subdomains and reflects their
<td>ram</td>
<td>RAM-related performance metrics</td>
</tr>
<td>disk</td>
<td>Disk usage metrics</td>
</tr>
<tr>
<td rowspan="15">mq</td>
<td rowspan="15">MQ manager wide metrics</td>
<td>cpu</td>
<td>CPU metrics of a running queue manager</td>
</tr>
<td>ram</td>
<td>RAM-related metrics, related to a running queue manager</td>
</tr>
<tr>
<td>disk</td>
<td>Disk usage metrics, related to a running queue manager</td>
Expand Down Expand Up @@ -476,7 +482,7 @@ This section provides a description of CPU metrics of a running queue manager.
<td>System CPU time - percentage estimate for queue manager</td>
</tr>
<tr>
<td>mq_cpu_ram_total_estimate_megabytes</td>
<td>mq_ram_ram_total_estimate_megabytes</td>
<td>gauge</td>
<td>Estimates the total bytes of RAM in use by the queue managers that are being monitored.</td>
<td>RAM total bytes - estimate for queue manager</td>
Expand All @@ -497,31 +503,31 @@ This section provides a description of disk usage metrics.
<td><strong>MQ metric element</strong></td>
</tr>
<tr>
<td>mq_disk_trace_file_system_in_use_megabytes</td>
<td>system_disk_trace_file_system_in_use_megabytes</td>
<td>gauge</td>
<td>Shows the number of bytes of disk storage that are being used by the trace file system.</td>
<td>MQ trace file system - bytes in use</td>
</tr>
<tr>
<td>mq_disk_trace_file_system_free_space_percentage</td>
<td>system_disk_trace_file_system_free_space_percentage</td>
<td>gauge</td>
<td>Shows the disk storage that is reserved for the trace file system that is free.</td>
<td>MQ trace file system - free space</td>
</tr>
<tr>
<td>mq_disk_errors_file_system_in_use_megabytes</td>
<td>system_disk_errors_file_system_in_use_megabytes</td>
<td>gauge</td>
<td>Shows the number of bytes of disk storage that is being used by error data.</td>
<td>MQ errors file system - bytes in use</td>
</tr>
<tr>
<td>mq_disk_errors_file_system_free_space_percentage</td>
<td>system_disk_errors_file_system_free_space_percentage</td>
<td>gauge</td>
<td>Shows the disk storage that is reserved for error data that is free.</td>
<td>MQ errors file system - free space</td>
</tr>
<tr>
<td>mq_disk_fdc_file_count_files</td>
<td>system_disk_fdc_file_count_files</td>
<td>gauge</td>
<td>Shows the current number of FDC files.</td>
<td>MQ FDC file count</td>
Expand Down Expand Up @@ -1309,25 +1315,25 @@ This section provides a description of metrics related to MQGET calls to a speci
<td>MQGET browse persistent byte count</td>
</tr>
<tr>
<td>mqobject_get_messages_expired_totalmessages</td>
<td>mqobject_queue_messages_expired_totalmessages</td>
<td>counter</td>
<td>Shows a count of expired messages.</td>
<td>messages expired</td>
</tr>
<tr>
<td>mqobject_get_queue_purged_count_totalqueues</td>
<td>mqobject_queue_queue_purged_count_totalqueues</td>
<td>counter</td>
<td>Shows a count of queues that have been purged.</td>
<td>queue purged count</td>
</tr>
<tr>
<td>mqobject_get_average_queue_time_microseconds</td>
<td>mqobject_queue_average_queue_time_microseconds</td>
<td>gauge</td>
<td>Shows the average latency of messages that are retrieved from the queue.</td>
<td>average queue time</td>
</tr>
<tr>
<td>mqobject_get_queue_depth_messages</td>
<td>mqobject_queue_queue_depth_messages</td>
<td>gauge</td>
<td>Shows the number of messages on the queue.</td>
<td>Queue depth</td>
Expand All @@ -1347,17 +1353,17 @@ This section provides a description of metrics of queues, channels and listeners
<td><strong>Short description</strong></td>
</tr>
<tr>
<td>mqobject_queue_max_depth_messages</td>
<td>mqobject_queue_queue_max_depth_messages</td>
<td>gauge</td>
<td>Shows maximum number of messages that are allowed on the queue.</td>
</tr>
<tr>
<td>mqobject_channel_status_code</td>
<td>mqobject_channel_channel_status_code</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>
</tr>
<tr>
<td>mqobject_listener_status_code</td>
<td>mqobject_listener_listener_status_code</td>
<td>gauge</td>
<td>Shows current listener status. Mapping of listener statuses to prometheus metric values can be found <a href="#listener-status-mapping">here</a>.</td>
</tr>
Expand Down Expand Up @@ -1455,7 +1461,7 @@ Pull requests are always welcome.
## Known issues
The following are known issues and may affect your use of exporter.

* Metric mq_cpu_ram_total_estimate_megabytes may contain negative
* Metric mq_ram_ram_total_estimate_megabytes may contain negative
values.
[#62](https://github.com/Cinimex-Informatica/mq-java-exporter/issues/62)

Expand Down
24 changes: 12 additions & 12 deletions src/main/java/ru/cinimex/exporter/prometheus/metrics/MetricsReference.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -21,12 +21,12 @@ public class MetricsReference {
put("RAM total bytes", new Metric("system_ram_ram_total_megabytes", Metric.Type.SimpleGauge));
put("User CPU time - percentage estimate for queue manager", new Metric("mq_cpu_user_cpu_time_estimate_percentage", Metric.Type.SimpleGauge));
put("System CPU time - percentage estimate for queue manager", new Metric("mq_cpu_system_cpu_time_estimat_percentage", Metric.Type.SimpleGauge));
put("RAM total bytes - estimate for queue manager", new Metric("mq_cpu_ram_total_estimate_megabytes", Metric.Type.SimpleGauge));
put("MQ trace file system - bytes in use", new Metric("mq_disk_trace_file_system_in_use_megabytes", Metric.Type.SimpleGauge));
put("MQ trace file system - free space", new Metric("mq_disk_trace_file_system_free_space_percentage", Metric.Type.SimpleGauge));
put("MQ errors file system - bytes in use", new Metric("mq_disk_errors_file_system_in_use_megabytes", Metric.Type.SimpleGauge));
put("MQ errors file system - free space", new Metric("mq_disk_errors_file_system_free_space_percentage", Metric.Type.SimpleGauge));
put("MQ FDC file count", new Metric("mq_disk_fdc_file_count_files", Metric.Type.SimpleGauge));
put("RAM total bytes - estimate for queue manager", new Metric("mq_ram_ram_total_estimate_megabytes", Metric.Type.SimpleGauge));
put("MQ trace file system - bytes in use", new Metric("system_disk_trace_file_system_in_use_megabytes", Metric.Type.SimpleGauge));
put("MQ trace file system - free space", new Metric("system_disk_trace_file_system_free_space_percentage", Metric.Type.SimpleGauge));
put("MQ errors file system - bytes in use", new Metric("system_disk_errors_file_system_in_use_megabytes", Metric.Type.SimpleGauge));
put("MQ errors file system - free space", new Metric("system_disk_errors_file_system_free_space_percentage", Metric.Type.SimpleGauge));
put("MQ FDC file count", new Metric("system_disk_fdc_file_count_files", Metric.Type.SimpleGauge));
put("Queue Manager file system - bytes in use", new Metric("mq_disk_file_system_in_use_megabytes", Metric.Type.SimpleGauge));
put("Queue Manager file system - free space", new Metric("mq_disk_file_system_free_space_percentage", Metric.Type.SimpleGauge));
put("Log - bytes in use", new Metric("mq_rlog_log_bytes_in_use_bytes", Metric.Type.SimpleGauge));
Expand Down Expand Up @@ -104,9 +104,9 @@ public class MetricsReference {

private static HashMap<MQObject.MQType, AdditionalMetric> MQ_OBJECT_ADDITIONAL_METRICS_REFERENCE = new HashMap<MQObject.MQType, AdditionalMetric>() {
{
put(MQObject.MQType.QUEUE, new AdditionalMetric("mqobject_queue_max_depth_messages", "The maximum number of messages that are allowed on the queue"));
put(MQObject.MQType.CHANNEL, new AdditionalMetric("mqobject_channel_status_code", "The status of the channel"));
put(MQObject.MQType.LISTENER, new AdditionalMetric("mqobject_listener_status_code", "The status of the listener"));
put(MQObject.MQType.QUEUE, new AdditionalMetric("mqobject_queue_queue_max_depth_messages", "The maximum " + "number of messages that are allowed on the queue"));
put(MQObject.MQType.CHANNEL, new AdditionalMetric("mqobject_channel_channel_status_code", "The status of " + "the channel"));
put(MQObject.MQType.LISTENER, new AdditionalMetric("mqobject_listener_listener_status_code", "The status " + "of the listener"));
}
};

Expand Down Expand Up @@ -138,9 +138,9 @@ public class MetricsReference {
put("MQGET browse non-persistent byte count", new Metric("mqobject_get_mqget_browse_non_persistent_byte_count_totalbytes", Metric.Type.SimpleCounter));
put("MQGET browse persistent byte count", new Metric("mqobject_get_mqget_browse_persistent_byte_count_totalbytes", Metric.Type.SimpleCounter));
put("messages expired", new Metric("mqobject_get_messages_expired_totalmessages", Metric.Type.SimpleCounter));
put("queue purged count", new Metric("mqobject_get_queue_purged_count_totalqueues", Metric.Type.SimpleCounter));
put("average queue time", new Metric("mqobject_get_average_queue_time_microseconds", Metric.Type.SimpleGauge));
put("Queue depth", new Metric("mqobject_get_queue_depth_messages", Metric.Type.SimpleGauge));
put("queue purged count", new Metric("mqobject_queue_queue_purged_count_totalqueues", Metric.Type.SimpleCounter));
put("average queue time", new Metric("mqobject_queue_average_queue_time_microseconds", Metric.Type.SimpleGauge));
put("Queue depth", new Metric("mqobject_queue_queue_depth_messages", Metric.Type.SimpleGauge));
}
};

Expand Down

0 comments on commit 7d61069

Please sign in to comment.