Merge branch 'apache:master' into master

apache · Sep 11, 2023 · 6f113fb · 6f113fb
2 parents 86bd42a + 24754c2
commit 6f113fb
Show file tree

Hide file tree

Showing 14 changed files with 642 additions and 572 deletions.
diff --git a/docs/_data/toc.yaml b/docs/_data/toc.yaml
@@ -430,16 +430,12 @@
       url: monitoring-metrics/cluster-id
     - title: Cluster States
       url: monitoring-metrics/cluster-states
-    - title: Metrics
-      items: 
-        - title: Configuring Metrics
-          url: monitoring-metrics/configuring-metrics
-        - title: JMX Metrics
-          url: monitoring-metrics/metrics
-    - title: New Metrics System 
+    - title: Metrics System 
       items:
         - title: Introduction 
           url: monitoring-metrics/new-metrics-system
+        - title: Configuring Metrics
+          url: monitoring-metrics/configuring-metrics
         - title: Metrics
           url: monitoring-metrics/new-metrics
     - title: System Views

diff --git a/docs/_docs/includes/java9.adoc b/docs/_docs/includes/java9.adoc
@@ -41,17 +41,22 @@ tab:Java 11[]
 tab:Java 17[]
 [source,shell]
 ----
---add-opens=jdk.management/com.sun.management.internal=ALL-UNNAMED \
---add-opens=java.base/jdk.internal.misc=ALL-UNNAMED \
---add-opens=java.base/sun.nio.ch=ALL-UNNAMED \
---add-opens=java.management/com.sun.jmx.mbeanserver=ALL-UNNAMED \
---add-opens=jdk.internal.jvmstat/sun.jvmstat.monitor=ALL-UNNAMED \
---add-opens=java.base/sun.reflect.generics.reflectiveObjects=ALL-UNNAMED \
---add-opens=java.base/java.io=ALL-UNNAMED \
---add-opens=java.base/java.nio=ALL-UNNAMED \
---add-opens=java.base/java.util=ALL-UNNAMED \
---add-opens=java.base/java.util.concurrent=ALL-UNNAMED \
---add-opens=java.base/java.util.concurrent.locks=ALL-UNNAMED \
+--add-opens=java.base/jdk.internal.misc=ALL-UNNAMED
+--add-opens=java.base/sun.nio.ch=ALL-UNNAMED
+--add-opens=java.management/com.sun.jmx.mbeanserver=ALL-UNNAMED
+--add-opens=jdk.internal.jvmstat/sun.jvmstat.monitor=ALL-UNNAMED
+--add-opens=java.base/sun.reflect.generics.reflectiveObjects=ALL-UNNAMED
+--add-opens=jdk.management/com.sun.management.internal=ALL-UNNAMED
+--add-opens=java.base/java.io=ALL-UNNAMED
+--add-opens=java.base/java.nio=ALL-UNNAMED
+--add-opens=java.base/java.util=ALL-UNNAMED
+--add-opens=java.base/java.util.concurrent=ALL-UNNAMED
+--add-opens=java.base/java.util.concurrent.locks=ALL-UNNAMED
+--add-opens=java.base/java.util.concurrent.atomic=ALL-UNNAMED
 --add-opens=java.base/java.lang=ALL-UNNAMED
+--add-opens=java.base/java.lang.invoke=ALL-UNNAMED
+--add-opens=java.base/java.math=ALL-UNNAMED
+--add-opens=java.sql/java.sql=ALL-UNNAMED
+--add-opens=java.base/java.net=ALL-UNNAMED
 ----
 --
diff --git a/docs/_docs/monitoring-metrics/configuring-metrics.adoc b/docs/_docs/monitoring-metrics/configuring-metrics.adoc
@@ -80,14 +80,6 @@ include::{dotnetFile}[tags=data-region-metrics,indent=0]
 tab:C++[unsupported]
 --
 
-Data region metrics can be enabled/disabled at runtime via the following JMX Bean:
-
-*Data Region MBean*::
-+
-----
-org.apache:group=DataRegionMetrics,name=<Data Region Name>
-----
-
 == Enabling Persistence-related Metrics
 Persistence-related metrics can be enabled/disabled in the data storage configuration:
 
@@ -110,22 +102,3 @@ include::{dotnetFile}[tags=data-storage-metrics,indent=0]
 ----
 tab:C++[unsupported]
 --
-
-
-You can enable "Persistent Store" metrics at runtime via the following MXBean:
-
-*Persistent Store MBean*::
-+
---
-----
-org.apache:group="Persistent Store",name=DataStorageMetrics
-----
-[cols="1,4",opts="header"]
-|===
-| Operation | Description
-| EnableMetrics | Enable persistent data storage metrics.
-|===
---
-
-
-