This is an automated email from the ASF dual-hosted git repository.
kturner pushed a commit to branch elasticity
in repository https://gitbox.apache.org/repos/asf/accumulo.git
commit a61da25742eb4a3ab4860d71f24aeb156ad8ed25
Merge: 665484b029 90821b115c
Author: Keith Turner <ktur...@apache.org>
AuthorDate: Mon Nov 20 21:18:15 2023 -0500
Merge branch 'main' into elasticity
.../accumulo/core/metrics/MetricsProducer.java | 144 ++++++++++-----------
1 file changed, 72 insertions(+), 72 deletions(-)
diff --cc
core/src/main/java/org/apache/accumulo/core/metrics/MetricsProducer.java
index 021c045cc0,7aea9a7a6c..6bfc307fe6
--- a/core/src/main/java/org/apache/accumulo/core/metrics/MetricsProducer.java
+++ b/core/src/main/java/org/apache/accumulo/core/metrics/MetricsProducer.java
@@@ -47,8 -47,8 +47,8 @@@ import io.micrometer.core.instrument.Me
* <tr>
* <td>N/A</td>
* <td>N/A</td>
- * <td>{@link #METRICS_LOW_MEMORY}</td>
+ * <td>{@value #METRICS_LOW_MEMORY}</td>
- * <td>Guage</td>
+ * <td>Gauge</td>
* <td>reports 1 when process memory usage is above threshold, 0 when memory
is okay</td>
* </tr>
* <tr>
@@@ -59,51 -59,9 +59,51 @@@
* <td></td>
* </tr>
* <tr>
+ * <td>N/A</td>
+ * <td>N/A</td>
+ * <td>{@link #METRICS_COMPACTOR_JOB_PRIORITY_QUEUES}</td>
+ * <td>Gauge</td>
+ * <td></td>
+ * </tr>
+ * <tr>
+ * <td>N/A</td>
+ * <td>N/A</td>
+ * <td>{@link #METRICS_COMPACTOR_JOB_PRIORITY_QUEUE_LENGTH}</td>
+ * <td>Gauge</td>
+ * <td></td>
+ * </tr>
+ * <tr>
+ * <td>N/A</td>
+ * <td>N/A</td>
+ * <td>{@link #METRICS_COMPACTOR_JOB_PRIORITY_QUEUE_JOBS_PRIORITY}</td>
+ * <td>Gauge</td>
+ * <td></td>
+ * </tr>
+ * <tr>
+ * <td>N/A</td>
+ * <td>N/A</td>
+ * <td>{@link #METRICS_COMPACTOR_JOB_PRIORITY_QUEUE_JOBS_QUEUED}</td>
+ * <td>Gauge</td>
+ * <td></td>
+ * </tr>
+ * <tr>
+ * <td>N/A</td>
+ * <td>N/A</td>
+ * <td>{@link #METRICS_COMPACTOR_JOB_PRIORITY_QUEUE_JOBS_DEQUEUED}</td>
+ * <td>Gauge</td>
+ * <td></td>
+ * </tr>
+ * <tr>
+ * <td>N/A</td>
+ * <td>N/A</td>
+ * <td>{@link #METRICS_COMPACTOR_JOB_PRIORITY_QUEUE_JOBS_REJECTED}</td>
+ * <td>Gauge</td>
+ * <td></td>
+ * </tr>
+ * <tr>
* <td>currentFateOps</td>
* <td>Gauge</td>
- * <td>{@link #METRICS_FATE_TOTAL_IN_PROGRESS}</td>
+ * <td>{@value #METRICS_FATE_TOTAL_IN_PROGRESS}</td>
* <td>Gauge</td>
* <td></td>
* </tr>
@@@ -286,9 -244,30 +286,9 @@@
* <td></td>
* </tr>
* <tr>
- * <td>activeMajCs</td>
- * <td>Gauge</td>
- * <td>{@value #METRICS_TSERVER_MAJC_RUNNING}</td>
- * <td>Gauge</td>
- * <td></td>
- * </tr>
- * <tr>
- * <td>N/A</td>
- * <td>N/A</td>
- * <td>{@value #METRICS_TSERVER_MAJC_STUCK}</td>
- * <td>LongTaskTimer</td>
- * <td></td>
- * </tr>
- * <tr>
- * <td>queuedMajCs</td>
- * <td>Gauge</td>
- * <td>{@value #METRICS_TSERVER_MAJC_QUEUED}</td>
- * <td>Gauge</td>
- * <td></td>
- * </tr>
- * <tr>
* <td>activeMinCs</td>
* <td>Gauge</td>
- * <td>{@link #METRICS_TSERVER_MINC_RUNNING}</td>
+ * <td>{@value #METRICS_TSERVER_MINC_RUNNING}</td>
* <td>Gauge</td>
* <td></td>
* </tr>
@@@ -314,24 -293,9 +314,24 @@@
* <td></td>
* </tr>
* <tr>
+ * <td></td>
+ * <td></td>
+ * <td>{@link #METRICS_TSERVER_TABLETS_ONLINE_ONDEMAND}</td>
+ * <td>Gauge</td>
+ * <td>Represents the number of on-demand tablets that are online</td>
+ * </tr>
+ * <tr>
+ * <td></td>
+ * <td></td>
+ * <td>{@link #METRICS_TSERVER_TABLETS_ONDEMAND_UNLOADED_FOR_MEM}</td>
+ * <td>Gauge</td>
+ * <td>Represents the number of on-demand tablets that were unloaded due to
low memory
+ * condition</td>
+ * </tr>
+ * <tr>
* <td>N/A</td>
* <td>N/A</td>
- * <td>{@link #METRICS_TSERVER_TABLETS_LONG_ASSIGNMENTS}</td>
+ * <td>{@value #METRICS_TSERVER_TABLETS_LONG_ASSIGNMENTS}</td>
* <td>Gauge</td>
* <td></td>
* </tr>
