Skip to content

Commit abcbba6

Browse files
sberdyshevsberdyshev
authored
Merge pull request #66 from Cinimex-Informatica/feature/issue53_wrong_subdomain
Feature/issue53, issue54, issue47, issue51 wrong subdomain
2 parents 4f96bf6 + a9e8bb6 commit abcbba6

File tree

2 files changed

+37
-30
lines changed

2 files changed

+37
-30
lines changed

‎README.md

Lines changed: 25 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -208,8 +208,8 @@ This section provides a description of domains and subdomains and reflects their
208208
<td><strong>Subdomain description</strong></td>
209209
</tr>
210210
<tr>
211-
<td rowspan="2">system</td>
212-
<td rowspan="2">Platform wide system metrics</td>
211+
<td rowspan="3">system</td>
212+
<td rowspan="3">Platform wide system metrics</td>
213213
<td>cpu</td>
214214
<td>CPU-related performance metrics</td>
215215
</tr>
@@ -218,11 +218,18 @@ This section provides a description of domains and subdomains and reflects their
218218
<td>RAM-related performance metrics</td>
219219
</tr>
220220
<tr>
221-
<td rowspan="15">mq</td>
222-
<td rowspan="15">MQ manager wide metrics</td>
221+
<td>disk</td>
222+
<td>Disk usage metrics</td>
223+
</tr>
224+
<tr>
225+
<td rowspan="16">mq</td>
226+
<td rowspan="16">MQ manager wide metrics</td>
223227
<td>cpu</td>
224228
<td>CPU metrics of a running queue manager</td>
225229
</tr>
230+
<td>ram</td>
231+
<td>RAM-related metrics, related to a running queue manager</td>
232+
</tr>
226233
<tr>
227234
<td>disk</td>
228235
<td>Disk usage metrics, related to a running queue manager</td>
@@ -476,7 +483,7 @@ This section provides a description of CPU metrics of a running queue manager.
476483
<td>System CPU time - percentage estimate for queue manager</td>
477484
</tr>
478485
<tr>
479-
<td>mq_cpu_ram_total_estimate_megabytes</td>
486+
<td>mq_ram_ram_total_estimate_megabytes</td>
480487
<td>gauge</td>
481488
<td>Estimates the total bytes of RAM in use by the queue managers that are being monitored.</td>
482489
<td>RAM total bytes - estimate for queue manager</td>
@@ -497,31 +504,31 @@ This section provides a description of disk usage metrics.
497504
<td><strong>MQ metric element</strong></td>
498505
</tr>
499506
<tr>
500-
<td>mq_disk_trace_file_system_in_use_megabytes</td>
507+
<td>system_disk_trace_file_system_in_use_megabytes</td>
501508
<td>gauge</td>
502509
<td>Shows the number of bytes of disk storage that are being used by the trace file system.</td>
503510
<td>MQ trace file system - bytes in use</td>
504511
</tr>
505512
<tr>
506-
<td>mq_disk_trace_file_system_free_space_percentage</td>
513+
<td>system_disk_trace_file_system_free_space_percentage</td>
507514
<td>gauge</td>
508515
<td>Shows the disk storage that is reserved for the trace file system that is free.</td>
509516
<td>MQ trace file system - free space</td>
510517
</tr>
511518
<tr>
512-
<td>mq_disk_errors_file_system_in_use_megabytes</td>
519+
<td>system_disk_errors_file_system_in_use_megabytes</td>
513520
<td>gauge</td>
514521
<td>Shows the number of bytes of disk storage that is being used by error data.</td>
515522
<td>MQ errors file system - bytes in use</td>
516523
</tr>
517524
<tr>
518-
<td>mq_disk_errors_file_system_free_space_percentage</td>
525+
<td>system_disk_errors_file_system_free_space_percentage</td>
519526
<td>gauge</td>
520527
<td>Shows the disk storage that is reserved for error data that is free.</td>
521528
<td>MQ errors file system - free space</td>
522529
</tr>
523530
<tr>
524-
<td>mq_disk_fdc_file_count_files</td>
531+
<td>system_disk_fdc_file_count_files</td>
525532
<td>gauge</td>
526533
<td>Shows the current number of FDC files.</td>
527534
<td>MQ FDC file count</td>
@@ -1309,25 +1316,25 @@ This section provides a description of metrics related to MQGET calls to a speci
13091316
<td>MQGET browse persistent byte count</td>
13101317
</tr>
13111318
<tr>
1312-
<td>mqobject_get_messages_expired_totalmessages</td>
1319+
<td>mqobject_queue_messages_expired_totalmessages</td>
13131320
<td>counter</td>
13141321
<td>Shows a count of expired messages.</td>
13151322
<td>messages expired</td>
13161323
</tr>
13171324
<tr>
1318-
<td>mqobject_get_queue_purged_count_totalqueues</td>
1325+
<td>mqobject_queue_queue_purged_count_totalqueues</td>
13191326
<td>counter</td>
13201327
<td>Shows a count of queues that have been purged.</td>
13211328
<td>queue purged count</td>
13221329
</tr>
13231330
<tr>
1324-
<td>mqobject_get_average_queue_time_microseconds</td>
1331+
<td>mqobject_queue_average_queue_time_microseconds</td>
13251332
<td>gauge</td>
13261333
<td>Shows the average latency of messages that are retrieved from the queue.</td>
13271334
<td>average queue time</td>
13281335
</tr>
13291336
<tr>
1330-
<td>mqobject_get_queue_depth_messages</td>
1337+
<td>mqobject_queue_queue_depth_messages</td>
13311338
<td>gauge</td>
13321339
<td>Shows the number of messages on the queue.</td>
13331340
<td>Queue depth</td>
@@ -1347,17 +1354,17 @@ This section provides a description of metrics of queues, channels and listeners
13471354
<td><strong>Short description</strong></td>
13481355
</tr>
13491356
<tr>
1350-
<td>mqobject_queue_max_depth_messages</td>
1357+
<td>mqobject_queue_queue_max_depth_messages</td>
13511358
<td>gauge</td>
13521359
<td>Shows maximum number of messages that are allowed on the queue.</td>
13531360
</tr>
13541361
<tr>
1355-
<td>mqobject_channel_status_code</td>
1362+
<td>mqobject_channel_channel_status_code</td>
13561363
<td>gauge</td>
13571364
<td>Shows current channel status. Mapping of channel statuses to prometheus metric values can be found <a href="#channel-status-mapping">here</a>.</td>
13581365
</tr>
13591366
<tr>
1360-
<td>mqobject_listener_status_code</td>
1367+
<td>mqobject_listener_listener_status_code</td>
13611368
<td>gauge</td>
13621369
<td>Shows current listener status. Mapping of listener statuses to prometheus metric values can be found <a href="#listener-status-mapping">here</a>.</td>
13631370
</tr>
@@ -1455,7 +1462,7 @@ Pull requests are always welcome.
14551462
## Known issues
14561463
The following are known issues and may affect your use of exporter.
14571464

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

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

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -21,12 +21,12 @@ public class MetricsReference {
2121
put("RAM total bytes", new Metric("system_ram_ram_total_megabytes", Metric.Type.SimpleGauge));
2222
put("User CPU time - percentage estimate for queue manager", new Metric("mq_cpu_user_cpu_time_estimate_percentage", Metric.Type.SimpleGauge));
2323
put("System CPU time - percentage estimate for queue manager", new Metric("mq_cpu_system_cpu_time_estimat_percentage", Metric.Type.SimpleGauge));
24-
put("RAM total bytes - estimate for queue manager", new Metric("mq_cpu_ram_total_estimate_megabytes", Metric.Type.SimpleGauge));
25-
put("MQ trace file system - bytes in use", new Metric("mq_disk_trace_file_system_in_use_megabytes", Metric.Type.SimpleGauge));
26-
put("MQ trace file system - free space", new Metric("mq_disk_trace_file_system_free_space_percentage", Metric.Type.SimpleGauge));
27-
put("MQ errors file system - bytes in use", new Metric("mq_disk_errors_file_system_in_use_megabytes", Metric.Type.SimpleGauge));
28-
put("MQ errors file system - free space", new Metric("mq_disk_errors_file_system_free_space_percentage", Metric.Type.SimpleGauge));
29-
put("MQ FDC file count", new Metric("mq_disk_fdc_file_count_files", Metric.Type.SimpleGauge));
24+
put("RAM total bytes - estimate for queue manager", new Metric("mq_ram_ram_total_estimate_megabytes", Metric.Type.SimpleGauge));
25+
put("MQ trace file system - bytes in use", new Metric("system_disk_trace_file_system_in_use_megabytes", Metric.Type.SimpleGauge));
26+
put("MQ trace file system - free space", new Metric("system_disk_trace_file_system_free_space_percentage", Metric.Type.SimpleGauge));
27+
put("MQ errors file system - bytes in use", new Metric("system_disk_errors_file_system_in_use_megabytes", Metric.Type.SimpleGauge));
28+
put("MQ errors file system - free space", new Metric("system_disk_errors_file_system_free_space_percentage", Metric.Type.SimpleGauge));
29+
put("MQ FDC file count", new Metric("system_disk_fdc_file_count_files", Metric.Type.SimpleGauge));
3030
put("Queue Manager file system - bytes in use", new Metric("mq_disk_file_system_in_use_megabytes", Metric.Type.SimpleGauge));
3131
put("Queue Manager file system - free space", new Metric("mq_disk_file_system_free_space_percentage", Metric.Type.SimpleGauge));
3232
put("Log - bytes in use", new Metric("mq_rlog_log_bytes_in_use_bytes", Metric.Type.SimpleGauge));
@@ -104,9 +104,9 @@ public class MetricsReference {
104104

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

@@ -138,9 +138,9 @@ public class MetricsReference {
138138
put("MQGET browse non-persistent byte count", new Metric("mqobject_get_mqget_browse_non_persistent_byte_count_totalbytes", Metric.Type.SimpleCounter));
139139
put("MQGET browse persistent byte count", new Metric("mqobject_get_mqget_browse_persistent_byte_count_totalbytes", Metric.Type.SimpleCounter));
140140
put("messages expired", new Metric("mqobject_get_messages_expired_totalmessages", Metric.Type.SimpleCounter));
141-
put("queue purged count", new Metric("mqobject_get_queue_purged_count_totalqueues", Metric.Type.SimpleCounter));
142-
put("average queue time", new Metric("mqobject_get_average_queue_time_microseconds", Metric.Type.SimpleGauge));
143-
put("Queue depth", new Metric("mqobject_get_queue_depth_messages", Metric.Type.SimpleGauge));
141+
put("queue purged count", new Metric("mqobject_queue_queue_purged_count_totalqueues", Metric.Type.SimpleCounter));
142+
put("average queue time", new Metric("mqobject_queue_average_queue_time_microseconds", Metric.Type.SimpleGauge));
143+
put("Queue depth", new Metric("mqobject_queue_queue_depth_messages", Metric.Type.SimpleGauge));
144144
}
145145
};
146146

0 commit comments

Comments
 (0)