Merge branch 'main' into feat/opensearch-dashboards

Author: labrenbe

.github/ISSUE_TEMPLATE/update-product-druid.md

@@ -27,13 +27,13 @@ Add/Change/Remove anything that isn't applicable anymore
 
 ## Update tasks
 
-- [ ] Release a new version of [druid-opa-authorizer](https://github.com/stackabletech/druid-opa-authorizer)
+- [ ] Update the [druid-opa-authorizer](https://github.com/stackabletech/druid-opa-authorizer/) with the new set of versions (profiles).
+- [ ] Release a new version of [druid-opa-authorizer](https://github.com/stackabletech/druid-opa-authorizer), if compiling against the new Druid version(s) requires changes in the code.
 - [ ] Update `boil-config.toml` to reflect the agreed upon versions in the spreadsheet (including the removal of old versions).
-- [ ] Update the [druid-opa-authorizer](https://github.com/stackabletech/druid-opa-authorizer/) with the new set of versions.
-- [ ] Upload new version (see `druid/upload_new_druid_version.sh`).
-- [ ] Create a file: `druid/stackable/patches/x.y.z/.gitkeep`, add patches if applicable.
-- [ ] Delete old patch directories.
 - [ ] Update `boil-config.toml` to the latest supported version of JVM (base and devel).
+- [ ] Initialize new product versions with patchable and add patches if applicable.
+- [ ] Delete old patch directories.
+- [ ] Check the corresponding operator (getting_started / kuttl / supported-versions) for usage of the versions.
 - [ ] Check other operators (getting_started / kuttl / supported-versions) for usage of the versions. Add the PR(s) to the list below.
 - [ ] Ensure prerequisites are up to date (required-external-components.adoc).
 - [ ] Update the version in demos. Add the PR(s) to the list below.

CHANGELOG.md

@@ -15,6 +15,8 @@ All notable changes to this project will be documented in this file.
 - nifi: Backport NIFI-14848 to NiFi ([#1225]).
 - stackable-base: Add cert-tools ([#1247]).
 - kafka: Add jackson xml dataformat for Kafka 4.0.0 ([#1262]).
+- kafka: Add version `4.1.0` ([#1277]).
+- druid: Add `34.0.0` ([#1263]).
 
 ### Changed
 
@@ -24,10 +26,14 @@ All notable changes to this project will be documented in this file.
 - stackable-base: Bump ubi9 base image ([#1253]).
 - stackable-devel: Bump ubi9 base image and update cargo-auditable to `0.7.0` ([#1253]).
 - vector: Bump to `0.49.0` ([#1258]).
+- airflow: Bump uvicorn dependency to `0.37.0` ([#1264]).
+- druid: Deprecate `33.0.0` ([#1263]).
 
 ### Removed
 
-- opensearch: stop applying formatting plugin ([#1230]).
+- opensearch: Stop applying formatting plugin ([#1230]).
+- kafka: Remove version `4.0.0` ([#1277]).
+- druid: Remove `31.0.1` ([#1263]).
 
 [#1207]: https://github.com/stackabletech/docker-images/pull/1207
 [#1215]: https://github.com/stackabletech/docker-images/pull/1215
@@ -43,6 +49,9 @@ All notable changes to this project will be documented in this file.
 [#1253]: https://github.com/stackabletech/docker-images/pull/1253
 [#1258]: https://github.com/stackabletech/docker-images/pull/1258
 [#1262]: https://github.com/stackabletech/docker-images/pull/1262
+[#1264]: https://github.com/stackabletech/docker-images/pull/1264
+[#1277]: https://github.com/stackabletech/docker-images/pull/1277
+[#1263]: https://github.com/stackabletech/docker-images/pull/1263
 
 ## [25.7.0] - 2025-07-23
 

airflow/stackable/constraints/3.0.1/constraints-python3.12.txt

@@ -788,7 +788,13 @@ urllib3==2.4.0
 userpath==1.9.2
 uuid6==2024.7.10
 uv==0.7.3
-uvicorn==0.34.2
+# Stackable patch:
+# The original version 0.34.2 hard codes the worker timeout to 5s.
+# This has been fixed in 0.37.0 so that the value passed through from Airflow
+# (default 120s) is honoured.
+# See discussion here: https://github.com/apache/airflow/discussions/50170#discussioncomment-13265000.
+# Uvicorn release notes: https://github.com/Kludex/uvicorn/commit/4098bcac97aa0fbda2f4e73278fbbe3b128be940
+uvicorn==0.37.0
 uvloop==0.21.0
 validators==0.34.0
 vertica-python==1.4.0

druid/boil-config.toml

@@ -7,20 +7,20 @@ java-devel = "17"
 [versions."30.0.1".build-arguments]
 authorizer-version = "0.7.0"
 
-[versions."31.0.1".local-images]
-# https://druid.apache.org/docs/31.0.1/operations/java/
+[versions."33.0.0".local-images]
+# https://druid.apache.org/docs/33.0.0/operations/java/
 java-base = "17"
 java-devel = "17"
 "hadoop/hadoop" = "3.3.6"
 
-[versions."31.0.1".build-arguments]
+[versions."33.0.0".build-arguments]
 authorizer-version = "0.7.0"
 
-[versions."33.0.0".local-images]
-# https://druid.apache.org/docs/33.0.0/operations/java/
+[versions."34.0.0".local-images]
+# https://druid.apache.org/docs/34.0.0/operations/java/
 java-base = "17"
 java-devel = "17"
-"hadoop/hadoop" = "3.3.6"
+"hadoop/hadoop" = "3.4.1"
 
-[versions."33.0.0".build-arguments]
+[versions."34.0.0".build-arguments]
 authorizer-version = "0.7.0"

druid/stackable/patches/31.0.1/0001-Removes-all-traces-of-the-druid-ranger-extension.patch

@@ -0,0 +1,35 @@
+From 515da2a96db1835133e2b367d4c006ce4fcf8a3a Mon Sep 17 00:00:00 2001
+From: xeniape <[email protected]>
+Date: Mon, 22 Sep 2025 14:20:53 +0200
+Subject: Removes all traces of the druid ranger extension
+
+---
+ distribution/pom.xml | 2 --
+ pom.xml              | 1 -
+ 2 files changed, 3 deletions(-)
+
+diff --git a/distribution/pom.xml b/distribution/pom.xml
+index f7e9766494..7c2573fbd4 100644
+--- a/distribution/pom.xml
++++ b/distribution/pom.xml
+@@ -460,8 +460,6 @@
+                                         <argument>org.apache.druid.extensions.contrib:druid-rabbit-indexing-service</argument>
+                                         <argument>-c</argument>
+                                         <argument>org.apache.druid.extensions.contrib:grpc-query</argument>
+-                                        <argument>-c</argument>
+-                                        <argument>org.apache.druid.extensions.contrib:druid-ranger-security</argument>
+                                     </arguments>
+                                 </configuration>
+                             </execution>
+diff --git a/pom.xml b/pom.xml
+index 35ebdfdc34..829ddbd9e7 100644
+--- a/pom.xml
++++ b/pom.xml
+@@ -260,7 +260,6 @@
+         <module>extensions-contrib/druid-deltalake-extensions</module>
+         <module>extensions-contrib/spectator-histogram</module>
+         <module>extensions-contrib/rabbit-stream-indexing-service</module>
+-        <module>extensions-contrib/druid-ranger-security</module>
+         <!-- distribution packaging -->
+         <module>distribution</module>
+         <!-- Revised integration tests -->

druid/stackable/patches/34.0.0/0001-Removes-all-traces-of-the-druid-ranger-extension.patch

@@ -1,17 +1,17 @@
-From 484bd7f13890823fdfdcbec5bd21b046ac885015 Mon Sep 17 00:00:00 2001
-From: Lars Francke <[email protected]>
-Date: Mon, 17 Feb 2025 16:42:34 +0100
+From c836d04ca08c6f341817096dcca7d8231c25ed66 Mon Sep 17 00:00:00 2001
+From: xeniape <[email protected]>
+Date: Mon, 22 Sep 2025 14:23:11 +0200
 Subject: Include Prometheus emitter in distribution
 
 ---
  distribution/pom.xml | 46 ++++++++++++++++++++++++++++++++++++++++++++
  1 file changed, 46 insertions(+)
 
 diff --git a/distribution/pom.xml b/distribution/pom.xml
-index 1a4f7df716..a28e34bb6a 100644
+index 7c2573fbd4..21954e8fb4 100644
 --- a/distribution/pom.xml
 +++ b/distribution/pom.xml
-@@ -464,6 +464,52 @@
+@@ -468,6 +468,52 @@
                  </plugins>
              </build>
          </profile>

druid/stackable/patches/31.0.1/0002-Include-Prometheus-emitter-in-distribution.patch renamed to druid/stackable/patches/34.0.0/0002-Include-Prometheus-emitter-in-distribution.patch

@@ -1,26 +1,23 @@
-From 540182e6a1169103cb77ff37d963186f23204800 Mon Sep 17 00:00:00 2001
-From: Lars Francke <[email protected]>
-Date: Mon, 17 Feb 2025 16:42:34 +0100
+From 8a1e8f9c4eaa419bb59825e645cbacd0b4ec7d34 Mon Sep 17 00:00:00 2001
+From: xeniape <[email protected]>
+Date: Tue, 23 Sep 2025 09:31:00 +0200
 Subject: Stop building unused extensions.
 
 By default Druid builds all community extensions and then discards them
 while assembling the final distribution. This patch removes unused
 extensions from the build.
 ---
- pom.xml | 32 +-------------------------------
- 1 file changed, 1 insertion(+), 31 deletions(-)
+ pom.xml | 29 -----------------------------
+ 1 file changed, 29 deletions(-)
 
 diff --git a/pom.xml b/pom.xml
-index 807f9f11df..e9e19f7920 100644
+index 829ddbd9e7..369550e166 100644
 --- a/pom.xml
 +++ b/pom.xml
-@@ -200,39 +200,9 @@
-         <module>extensions-core/google-extensions</module>
-         <module>extensions-core/druid-catalog</module>
+@@ -229,37 +229,8 @@
          <module>extensions-core/testing-tools</module>
-+
          <!-- Community extensions -->
--        <module>extensions-contrib/compressed-bigdecimal</module>
+         <module>extensions-contrib/compressed-bigdecimal</module>
 -        <module>extensions-contrib/influx-extensions</module>
 -        <module>extensions-contrib/cassandra-storage</module>
 -        <module>extensions-contrib/dropwizard-emitter</module>
@@ -33,7 +30,7 @@ index 807f9f11df..e9e19f7920 100644
 -        <module>extensions-contrib/thrift-extensions</module>
 -        <module>extensions-contrib/ambari-metrics-emitter</module>
 -        <module>extensions-contrib/sqlserver-metadata-storage</module>
--        <module>extensions-contrib/kafka-emitter</module>
+         <module>extensions-contrib/kafka-emitter</module>
 -        <module>extensions-contrib/redis-cache</module>
 -        <module>extensions-contrib/opentsdb-emitter</module>
 -        <module>extensions-contrib/materialized-view-maintenance</module>
@@ -47,11 +44,11 @@ index 807f9f11df..e9e19f7920 100644
 -        <module>extensions-contrib/aliyun-oss-extensions</module>
          <module>extensions-contrib/prometheus-emitter</module>
 -        <module>extensions-contrib/opentelemetry-emitter</module>
--        <module>extensions-contrib/kubernetes-overlord-extensions</module>
+-        <module>extensions-contrib/grpc-query</module>
 -        <module>extensions-contrib/druid-iceberg-extensions</module>
 -        <module>extensions-contrib/druid-deltalake-extensions</module>
 -        <module>extensions-contrib/spectator-histogram</module>
 -        <module>extensions-contrib/rabbit-stream-indexing-service</module>
- 
          <!-- distribution packaging -->
          <module>distribution</module>
+         <!-- Revised integration tests -->