update JFR and monitoring docs

core/deployment/src/main/java/io/quarkus/deployment/pkg/NativeConfig.java

@@ -247,7 +247,15 @@ default String getEffectiveBuilderImage() {
     boolean enableVmInspection();
 
     /**
-     * Enable monitoring options that allow the VM to be inspected at run time.
+     * Enable monitoring various monitoring options. The value should be comma separated.
+     * <ul>
+     * <li><code>jfr</code> for JDK flight recorder support</li>
+     * <li><code>jvmstat</code> for JVMStat support</li>
+     * <li><code>heapdump</code> for heampdump support</li>
+     * <li><code>jmxclient</code> for JMX client support (experimental)</li>
+     * <li><code>jmxserver</code> for JMX server support (experimental)</li>
+     * <li><code>all</code> for all monitoring features</li>
+     * </ul>
      */
     Optional<List<MonitoringOption>> monitoring();
 
@@ -454,6 +462,8 @@ enum MonitoringOption {
         HEAPDUMP,
         JVMSTAT,
         JFR,
+        JMXSERVER,
+        JMXCLIENT,
         ALL
     }
 }

docs/src/main/asciidoc/building-native-image.adoc

@@ -880,6 +880,46 @@ gdb -ex 'directory ./target' ./target/getting-started-1.0.0-SNAPSHOT-runner
 
 For a more detailed guide about debugging native images please refer to the xref:native-reference.adoc[Native Reference Guide].
 
+== Using Monitoring Options
+
+Monitoring options such as JDK flight recorder, jvmstat, heap dumps, and remote JMX (experimental in Mandrel 23)
+can be added to the native executable build. Simply supply a comma separated list of the monitoring options you wish to
+include at build time.
+[source,bash]
+----
+-Dquarkus.native.monitoring=<comma separated list of options>
+----
+
+|===
+|Monitoring Option |Description |Availability As Of
+
+|jfr
+|Include JDK Flight Recorder support
+|GraalVM CE 21.3 Mandrel 21.3
+
+|jvmstat
+|Adds jvmstat support
+|GraalVM 22.3 Mandrel 22.3
+
+|heapdump
+|Adds support for generating heap dumps
+|GraalVM 22.3 Mandrel 22.3
+
+|jmxclient
+|Adds support for connections to JMX servers.
+|GraalVM for JDK 17/20 Mandrel 23.0
+
+|jmxserver
+|Adds support for accepting connections from JMX clients.
+|GraalVM for JDK 17/20 Mandrel 23.0
+
+|all
+|Adds all monitoring options.
+|GraalVM 22.3 Mandrel 22.3
+|===
+
+Please see the Quarkus Native Reference Guide for more detailed information on these monitoring options.
+
 [[configuration-reference]]
 == Configuring the Native Executable
 

docs/src/main/asciidoc/native-reference.adoc

@@ -2133,23 +2133,50 @@ $ ./mvnw package -DskipTests -Dnative \
 https://docs.oracle.com/javacomponents/jmc-5-4/jfr-runtime-guide/about.htm#JFRUH170[Java Flight Recorder (JFR)] and
 https://www.oracle.com/java/technologies/jdk-mission-control.html[JDK Mission Control (JMC)]
 can be used to profile native binaries since GraalVM CE 21.2.0.
-However, JFR in GraalVM is currently significantly limited in capabilities compared to HotSpot.
-The custom event API is fully supported, but many VM level features are unavailable.
-They will be added in future releases. Current limitations are:
-
-* Minimal VM level events
+However, JFR in GraalVM is currently limited in capabilities compared to HotSpot.
+The custom event API is fully supported, but some VM level features are unavailable.
+More events and JFR features will continue to be added in later releases.
+The following table outlines Native Image JFR support and limitations by version.
+
+[cols="2,5a,5a"]
+|===
+|GraalVM Version |Supports |Limitations
+
+|GraalVM CE 21.3
+|* Minimal VM Level events
+* Custom events API
+* Start recordings upon executabe run or JFR Recording API
+|
 * No old object sampling
 * No stacktrace tracing
-* No Streaming API for JDK 17
+* No event streaming
+
+|GraalVM CE 22.3
+|* Everything from GraalVM CE 21.3
+* Additional monitor and thread events
+|* No old object sampling
+* No stacktrace tracing
+* No event streaming
+
+|GraalVM CE for JDK 17/20
+|* Everything from GraalVM CE 22.3
+* Additional monitor, thread, container, and allocation events
+* Stacktraces
+* Sampling based method profiling
+* Event streaming
+|* No old object sampling
+
+|===
+
 
-To use JFR add the application property: `-Dquarkus.native.enable-vm-inspection=true`.
+To add JFR support to your Quarkus executable, add the application property: `-Dquarkus.native.monitoring=jfr`.
 E.g.
 
 [source,bash,subs=attributes+]
 ----
 ./mvnw package -DskipTests -Dnative -Dquarkus.native.container-build=true \
     -Dquarkus.native.builder-image=quay.io/quarkus/ubi-quarkus-mandrel-builder-image:{mandrel-flavor} \
-    -Dquarkus.native.enable-vm-inspection=true
+    -Dquarkus.native.monitoring=jfr
 ----
 
 Once the image is compiled, enable and start JFR via runtime flags: `-XX:+FlightRecorder` and `-XX:StartFlightRecording`. For example: