diff --git a/src/main/java/org/jmxtrans/embedded/EmbeddedJmxTrans.java b/src/main/java/org/jmxtrans/embedded/EmbeddedJmxTrans.java index d10b7fec..3204fe86 100644 --- a/src/main/java/org/jmxtrans/embedded/EmbeddedJmxTrans.java +++ b/src/main/java/org/jmxtrans/embedded/EmbeddedJmxTrans.java @@ -43,29 +43,29 @@ import java.util.concurrent.atomic.AtomicBoolean; /** - *
+ * * JMX Queries - * + * * If the JMX query returns several mbeans (thanks to '*' or '?' wildcards), * then the configured attributes are collected on all the returned mbeans. - * - * + * + * * Output Writers - * + * * {@linkplain OutputWriter}s can be defined at the query level or globally at the {@link EmbeddedJmxTrans} level. * The {@linkplain OutputWriter}s that are effective for a {@linkplain Query} are accessible * via {@link Query#getEffectiveOutputWriters()} - * - * + * + * * Collected Metrics / Query Results - * + * * Default behavior is to store the query results at the query level (see {@linkplain Query#queryResults}) to resolve the * effective {@linkplain OutputWriter}s at result export time ({@linkplain org.jmxtrans.embedded.Query#getEffectiveOutputWriters()}). - *null
if not defined in the configuration. The {@link #name} is then used to build to {@linkplain QueryResult}
*
* @see org.jmxtrans.embedded.QueryResult#getName()
diff --git a/src/main/java/org/jmxtrans/embedded/ResultNameStrategy.java b/src/main/java/org/jmxtrans/embedded/ResultNameStrategy.java
index 17995046..65f4b59d 100644
--- a/src/main/java/org/jmxtrans/embedded/ResultNameStrategy.java
+++ b/src/main/java/org/jmxtrans/embedded/ResultNameStrategy.java
@@ -35,14 +35,14 @@
/**
* Build a {@linkplain QueryResult#name} from a collected metric ({@linkplain QueryAttribute}, {@linkplain Query}).
- *
+ *
* Build name must be escaped to be compatible with all {@linkplain org.jmxtrans.embedded.output.OutputWriter}.
* The approach is to escape non alpha-numeric chars.
- *
+ *
* Expressions support '#' based keywords (e.g. #hostname#
) and with '%' based variables mapped to objectname properties.
- *
- * Supported '#' based 'functions':
+ *
* Function | *Description | @@ -259,8 +259,8 @@ protected String resolveExpression(String expression, ObjectName exactObjectName } /** - * Transforms an {@linkplain ObjectName} into a plain {@linkplain String} only composed of (a->Z, A-Z, '_'). - * + * Transforms an {@linkplain ObjectName} into a plain {@linkplain String} only composed of (a-z, A-Z, '_'). + * * '_' is the escape char for not compliant chars. */ protected String escapeObjectName(ObjectName objectName) { @@ -283,7 +283,7 @@ protected String escapeObjectName(ObjectName objectName) { } /** - * Escape all non a->z,A->Z, 0->9 and '-' with a '_'. + * Escape all non a-z,A-Z, 0-9 and '-' with a '_'. * * @param str the string to escape * @param result the {@linkplain StringBuilder} in which the escaped string is appended @@ -293,9 +293,9 @@ private void appendEscapedNonAlphaNumericChars(String str, StringBuilder result) } /** - * Escape all non a->z,A->Z, 0->9 and '-' with a '_'. - * - * '.' is escaped with a '_' if {@code escapeDot} is
---|