diff --git a/CHANGELOG.md b/CHANGELOG.md index fb2053894..9dadd71fd 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -9,6 +9,7 @@ All notable changes to this project will be documented in this file. - ubi9-rust-builder: Include `.tar.gz` snapshots of the operator source code in container images ([#1207]) - opensearch: Add Opensearch as new product with version `3.1.0` ([#1215]). - opensearch: Use build-repo.stackable.tech instead of Maven Central ([#1222]). +- opensearch: Add the `opensearch-prometheus-exporter` plugin to the image ([#1223]). - nifi: Backport NIFI-14848 to NiFi ([#1225]) ### Changed @@ -21,6 +22,7 @@ All notable changes to this project will be documented in this file. [#1219]: https://github.com/stackabletech/docker-images/pull/1219 [#1220]: https://github.com/stackabletech/docker-images/pull/1220 [#1222]: https://github.com/stackabletech/docker-images/pull/1222 +[#1223]: https://github.com/stackabletech/docker-images/pull/1223 [#1225]: https://github.com/stackabletech/docker-images/pull/1225 ## [25.7.0] - 2025-07-23 diff --git a/conf.py b/conf.py index fa4c83017..bf62bbad2 100644 --- a/conf.py +++ b/conf.py @@ -33,6 +33,9 @@ opensearch_security_plugin = importlib.import_module( "opensearch.security-plugin.versions" ) +opensearch_prometheus_exporter = importlib.import_module( + "opensearch.opensearch-prometheus-exporter.versions" +) spark_k8s = importlib.import_module("spark-k8s.versions") stackable_base = importlib.import_module("stackable-base.versions") stackable_devel = importlib.import_module("stackable-devel.versions") @@ -75,6 +78,10 @@ "name": "opensearch/security-plugin", "versions": opensearch_security_plugin.versions, }, + { + "name": "opensearch/opensearch-prometheus-exporter", + "versions": opensearch_prometheus_exporter.versions, + }, {"name": "spark-k8s", "versions": spark_k8s.versions}, {"name": "stackable-base", "versions": stackable_base.versions}, {"name": "stackable-devel", "versions": stackable_devel.versions}, diff --git a/opensearch/Dockerfile b/opensearch/Dockerfile index 7fb712445..f684c5441 100644 --- a/opensearch/Dockerfile +++ b/opensearch/Dockerfile @@ -2,11 +2,13 @@ # check=error=true FROM stackable/image/opensearch/security-plugin AS opensearch-security-plugin +FROM stackable/image/opensearch/opensearch-prometheus-exporter AS opensearch-prometheus-exporter FROM stackable/image/java-devel AS opensearch-builder ARG PRODUCT ARG RELEASE ARG OPENSEARCH_SECURITY_PLUGIN +ARG OPENSEARCH_OPENSEARCH_PROMETHEUS_EXPORTER ARG STACKABLE_USER_UID ARG TARGETARCH @@ -56,6 +58,18 @@ rm opensearch-security-${OPENSEARCH_SECURITY_PLUGIN}.zip mv config /stackable/opensearch-${PRODUCT}/config/opensearch-security EOF +WORKDIR /stackable/opensearch-prometheus-exporter +COPY \ + --chown=${STACKABLE_USER_UID}:0 \ + --from=opensearch-prometheus-exporter \ + /stackable/src/opensearch/opensearch-prometheus-exporter/patchable-work/worktree/${OPENSEARCH_OPENSEARCH_PROMETHEUS_EXPORTER}/build/distributions/prometheus-exporter-${OPENSEARCH_OPENSEARCH_PROMETHEUS_EXPORTER}.zip \ + opensearch-prometheus-exporter-${OPENSEARCH_OPENSEARCH_PROMETHEUS_EXPORTER}.zip + +RUN < +Date: Tue, 12 Aug 2025 14:59:12 +0200 +Subject: Add CycloneDX plugin + +--- + build.gradle | 14 ++++++++++++++ + 1 file changed, 14 insertions(+) + +diff --git a/build.gradle b/build.gradle +index 6c09118..d47ae14 100644 +--- a/build.gradle ++++ b/build.gradle +@@ -63,6 +63,20 @@ buildscript { + } + } + ++plugins { ++ id "org.cyclonedx.bom" version "2.3.1" ++} ++ ++cyclonedxBom { ++ includeConfigs = ["runtimeClasspath"] ++ includeLicenseText = false ++ skipConfigs = ["compileClasspath", "testCompileClasspath"] ++ projectType = "application" ++ schemaVersion = "1.6" ++ outputFormat = "json" ++ componentVersion = versions.version ++} ++ + apply plugin: 'java' + apply plugin: 'idea' + apply plugin: 'opensearch.opensearchplugin' diff --git a/opensearch/opensearch-prometheus-exporter/stackable/patches/3.1.0.0/patchable.toml b/opensearch/opensearch-prometheus-exporter/stackable/patches/3.1.0.0/patchable.toml new file mode 100644 index 000000000..6a7e585eb --- /dev/null +++ b/opensearch/opensearch-prometheus-exporter/stackable/patches/3.1.0.0/patchable.toml @@ -0,0 +1 @@ +base = "df60b43e34d0f7fba6be9e003924a413764df85e" diff --git a/opensearch/opensearch-prometheus-exporter/stackable/patches/patchable.toml b/opensearch/opensearch-prometheus-exporter/stackable/patches/patchable.toml new file mode 100644 index 000000000..9ead9ac2c --- /dev/null +++ b/opensearch/opensearch-prometheus-exporter/stackable/patches/patchable.toml @@ -0,0 +1,2 @@ +upstream = "https://github.com/opensearch-project/opensearch-prometheus-exporter" +default-mirror = "https://github.com/stackabletech/opensearch-prometheus-exporter" diff --git a/opensearch/opensearch-prometheus-exporter/versions.py b/opensearch/opensearch-prometheus-exporter/versions.py new file mode 100644 index 000000000..a46fa4c9f --- /dev/null +++ b/opensearch/opensearch-prometheus-exporter/versions.py @@ -0,0 +1,6 @@ +versions = [ + { + "product": "3.1.0.0", + "java-devel": "21", + }, +] diff --git a/opensearch/versions.py b/opensearch/versions.py index 708e430d7..d35d2027e 100644 --- a/opensearch/versions.py +++ b/opensearch/versions.py @@ -4,5 +4,6 @@ "java-devel": "21", "jdk-base": "21", "opensearch/security-plugin": "3.1.0.0", + "opensearch/opensearch-prometheus-exporter": "3.1.0.0", }, ]