diff --git a/README.md b/README.md index 0cb1b62..6351818 100644 --- a/README.md +++ b/README.md @@ -151,7 +151,7 @@ prometheus.cluster.settings: false #### Snapshot metrics -To enable exporting snapshot metrics use: +By default, snapshot metrics are disabled. To enable exporting snapshot metrics use: ``` prometheus.snapshots: true ``` diff --git a/build.gradle b/build.gradle index 3839c5a..265a4d9 100644 --- a/build.gradle +++ b/build.gradle @@ -126,7 +126,7 @@ tasks.named("check").configure { dependsOn(integTest) } testingConventions.enabled = false // Directory for snapshot repository -File repositoryDir = new File(project.buildDir, "shared-repository") +File repositoryDir = new File(project.layout.buildDirectory.get().asFile, "shared-repository") testClusters.all { numberOfNodes = 2 diff --git a/src/main/java/org/opensearch/action/NodePrometheusMetricsResponse.java b/src/main/java/org/opensearch/action/NodePrometheusMetricsResponse.java index 0468042..cee1a81 100644 --- a/src/main/java/org/opensearch/action/NodePrometheusMetricsResponse.java +++ b/src/main/java/org/opensearch/action/NodePrometheusMetricsResponse.java @@ -17,6 +17,7 @@ package org.opensearch.action; +import org.opensearch.Version; import org.opensearch.action.admin.cluster.health.ClusterHealthResponse; import org.opensearch.action.admin.cluster.node.info.NodesInfoResponse; import org.opensearch.action.admin.cluster.node.stats.NodeStats; @@ -29,6 +30,7 @@ import org.opensearch.core.common.io.stream.StreamOutput; import org.opensearch.common.settings.ClusterSettings; import org.opensearch.common.settings.Settings; +import org.opensearch.search.pipeline.SearchPipelineStats; import java.io.IOException; @@ -57,7 +59,11 @@ public NodePrometheusMetricsResponse(StreamInput in) throws IOException { nodeStats = in.readArray(NodeStats::new, NodeStats[]::new); indicesStats = PackageAccessHelper.createIndicesStatsResponse(in); clusterStatsData = new ClusterStatsData(in); - snapshotsResponse = new SnapshotsResponse(in); + if (in.getVersion().onOrAfter(Version.V_2_17_1)) { + snapshotsResponse = new SnapshotsResponse(in); + } else { + snapshotsResponse = null; + } } /** @@ -145,6 +151,8 @@ public void writeTo(StreamOutput out) throws IOException { out.writeArray(nodeStats); out.writeOptionalWriteable(indicesStats); clusterStatsData.writeTo(out); - snapshotsResponse.writeTo(out); + if (out.getVersion().onOrAfter(Version.V_2_17_1)) { + snapshotsResponse.writeTo(out); + } } }