8.13.2.0

Author: mindw

.github/workflows/ci.yml

@@ -11,7 +11,7 @@ on:
     - "7.x"
 
 env:
-  gradle-version: "8.5"
+  gradle-version: "8.7"
   java-version: "17"
 
 jobs:

README.md

@@ -56,6 +56,7 @@ It collects all relevant metrics and makes them available to Prometheus via the
 
 | Elasticsearch | Plugin   | Release date |
 |---------------|----------|--------------|
+| 8.13.2        | 8.13.2.0 | Apr 20, 2024 |
 | 8.12.2        | 8.12.2.0 | Feb 24, 2024 |
 | 8.12.1        | 8.12.1.0 | Feb 10, 2024 |
 | 8.12.0        | 8.12.0.0 | Jan 19, 2024 |
@@ -104,7 +105,7 @@ It collects all relevant metrics and makes them available to Prometheus via the
 
 ```
 ./bin/elasticsearch-plugin install -b \
-  https://github.com/mindw/elasticsearch-prometheus-exporter/releases/download/8.12.2.0/prometheus-exporter-8.12.2.0.zip
+  https://github.com/mindw/elasticsearch-prometheus-exporter/releases/download/8.13.2.0/prometheus-exporter-8.13.2.0.zip
 ```
 
 **Do not forget to restart the node after the installation!**

build.gradle

@@ -85,7 +85,7 @@ dependencies {
     releaseJars "${project.group}:${project.name}:${project.version}"
 }
 
-tasks.withType(JavaCompile) {
+tasks.withType(JavaCompile).configureEach {
     options.compilerArgs << "-Xlint:unchecked,deprecation"
 }
 
@@ -97,7 +97,7 @@ esplugin {
     classname pluginClassname
 }
 
-testClusters.all {
+testClusters.configureEach {
     numberOfNodes = 2
 }
 

gradle.properties

@@ -1,6 +1,6 @@
 group = org.elasticsearch.plugin.prometheus
 
-version = 8.12.2.1-SNAPSHOT
+version = 8.13.2.0
 
 pluginName = prometheus-exporter
 pluginClassname = org.elasticsearch.plugin.prometheus.PrometheusExporterPlugin

gradlew.bat

@@ -43,11 +43,11 @@ set JAVA_EXE=java.exe
 %JAVA_EXE% -version >NUL 2>&1
 if %ERRORLEVEL% equ 0 goto execute
 
-echo.
-echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
-echo.
-echo Please set the JAVA_HOME variable in your environment to match the
-echo location of your Java installation.
+echo. 1>&2
+echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. 1>&2
+echo. 1>&2
+echo Please set the JAVA_HOME variable in your environment to match the 1>&2
+echo location of your Java installation. 1>&2
 
 goto fail
 
@@ -57,11 +57,11 @@ set JAVA_EXE=%JAVA_HOME%/bin/java.exe
 
 if exist "%JAVA_EXE%" goto execute
 
-echo.
-echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME%
-echo.
-echo Please set the JAVA_HOME variable in your environment to match the
-echo location of your Java installation.
+echo. 1>&2
+echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% 1>&2
+echo. 1>&2
+echo Please set the JAVA_HOME variable in your environment to match the 1>&2
+echo location of your Java installation. 1>&2
 
 goto fail
 

src/main/java/org/compuscene/metrics/prometheus/PrometheusMetricsCollector.java

@@ -566,7 +566,7 @@ private void updatePerIndexContextMetrics(String indexName, String context, Comm
         catalog.setClusterGauge("index_doc_number", idx.getDocs().getCount(), indexName, context);
         catalog.setClusterGauge("index_doc_deleted_number", idx.getDocs().getDeleted(), indexName, context);
 
-        catalog.setClusterGauge("index_store_size", idx.getStore().getSizeInBytes(), indexName, context);
+        catalog.setClusterGauge("index_store_size", idx.getStore().sizeInBytes(), indexName, context);
 
         var idxTotal = idx.getIndexing().getTotal();
         catalog.setClusterGauge("index_indexing_delete_count", idxTotal.getDeleteCount(), indexName, context);

src/main/java/org/elasticsearch/action/NodePrometheusMetricsAction.java

@@ -25,6 +25,6 @@ public class NodePrometheusMetricsAction extends ActionType<NodePrometheusMetric
     public static final String NAME = "cluster:monitor/prometheus/metrics";
 
     private NodePrometheusMetricsAction() {
-        super(NAME,  NodePrometheusMetricsResponse::new);
+        super(NAME);
     }
 }

src/main/java/org/elasticsearch/plugin/prometheus/PrometheusExporterPlugin.java

@@ -28,7 +28,9 @@
 import org.elasticsearch.action.TransportNodePrometheusMetricsAction;
 import org.elasticsearch.cluster.metadata.IndexNameExpressionResolver;
 import org.elasticsearch.cluster.node.DiscoveryNodes;
+import org.elasticsearch.common.io.stream.NamedWriteableRegistry;
 import org.elasticsearch.common.settings.*;
+import org.elasticsearch.features.NodeFeature;
 import org.elasticsearch.plugins.ActionPlugin;
 import org.elasticsearch.plugins.Plugin;
 import org.elasticsearch.rest.RestController;
@@ -38,6 +40,7 @@
 import java.util.Arrays;
 import java.util.Collections;
 import java.util.List;
+import java.util.function.Predicate;
 import java.util.function.Supplier;
 
 /**
@@ -53,17 +56,30 @@ public PrometheusExporterPlugin() {
     @Override
     public List<ActionHandler<? extends ActionRequest, ? extends ActionResponse>> getActions() {
         return singletonList(
-                new ActionHandler<>(NodePrometheusMetricsAction.INSTANCE, TransportNodePrometheusMetricsAction.class)
+                new ActionHandler<>(
+                        NodePrometheusMetricsAction.INSTANCE,
+                        TransportNodePrometheusMetricsAction.class
+                )
         );
     }
 
     @Override
-    public List<RestHandler> getRestHandlers(Settings settings, RestController restController, ClusterSettings clusterSettings,
-                                             IndexScopedSettings indexScopedSettings, SettingsFilter settingsFilter,
-                                             IndexNameExpressionResolver indexNameExpressionResolver,
-                                             Supplier<DiscoveryNodes> nodesInCluster) {
+    public List<RestHandler> getRestHandlers(
+            Settings settings,
+            NamedWriteableRegistry namedWriteableRegistry,
+            RestController restController,
+            ClusterSettings clusterSettings,
+            IndexScopedSettings indexScopedSettings,
+            SettingsFilter settingsFilter,
+            IndexNameExpressionResolver indexNameExpressionResolver,
+            Supplier<DiscoveryNodes> nodesInCluster,
+            Predicate<NodeFeature> clusterSupportsFeature
+    ) {
         return singletonList(
-                new RestPrometheusMetricsAction(settings, clusterSettings)
+                new RestPrometheusMetricsAction(
+                        settings,
+                        clusterSettings
+                )
         );
     }