Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

chore(docker): bump docker image and dependencies #627

Open
wants to merge 3 commits into
base: main
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions demo/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -217,8 +217,8 @@ and set paths on `compose.yml` file:

### Metrics

Metrics are available as JMX MBeans, and exposed using [JMX Exporter](https://github.com/prometheus/jmx_exporter) at port `7000`
Metrics are available as JMX MBeans, and exposed using [JMX Exporter](https://github.com/prometheus/jmx_exporter) at port `7001`

```shell
curl http://localhost:7000 | grep kafka_tiered
curl http://localhost:7001/metrics | grep kafka_tiered
```
3 changes: 1 addition & 2 deletions demo/compose-azure-blob-azurite.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,6 @@
# See the License for the specific language governing permissions and
# limitations under the License.
##
version: '3.8'
services:
zookeeper:
image: "confluentinc/cp-zookeeper:7.3.3"
Expand All @@ -30,7 +29,7 @@ services:
- azurite
ports:
- "9092:9092"
- "7000:7000" #prometheus metrics
- "7001:7001" #prometheus metrics
environment:
KAFKA_BROKER_ID: 0
KAFKA_ZOOKEEPER_CONNECT: "zookeeper:2181"
Expand Down
3 changes: 1 addition & 2 deletions demo/compose-gcs-fake-gcs-server.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,6 @@
# See the License for the specific language governing permissions and
# limitations under the License.
##
version: '3.8'
services:
zookeeper:
image: "confluentinc/cp-zookeeper:7.3.3"
Expand All @@ -30,7 +29,7 @@ services:
- fake-gcs-server
ports:
- "9092:9092"
- "7000:7000" #prometheus metrics
- "7001:7001" #prometheus metrics
environment:
KAFKA_BROKER_ID: 0
KAFKA_ZOOKEEPER_CONNECT: "zookeeper:2181"
Expand Down
3 changes: 1 addition & 2 deletions demo/compose-local-fs.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,6 @@
# See the License for the specific language governing permissions and
# limitations under the License.
##
version: '3.8'
services:
zookeeper:
image: "confluentinc/cp-zookeeper:7.3.3"
Expand All @@ -29,7 +28,7 @@ services:
- zookeeper
ports:
- "9092:9092"
- "7000:7000" #prometheus metrics
- "7001:7001" #prometheus metrics
environment:
KAFKA_BROKER_ID: 0
KAFKA_ZOOKEEPER_CONNECT: "zookeeper:2181"
Expand Down
3 changes: 1 addition & 2 deletions demo/compose-s3-aws.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,6 @@
# See the License for the specific language governing permissions and
# limitations under the License.
##
version: '3.8'
services:
zookeeper:
image: "confluentinc/cp-zookeeper:7.3.3"
Expand All @@ -29,7 +28,7 @@ services:
- zookeeper
ports:
- "9092:9092"
- "7000:7000" #prometheus metrics
- "7001:7001" #prometheus metrics
environment:
KAFKA_BROKER_ID: 0
KAFKA_ZOOKEEPER_CONNECT: "zookeeper:2181"
Expand Down
3 changes: 1 addition & 2 deletions demo/compose-s3-minio.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,6 @@
# See the License for the specific language governing permissions and
# limitations under the License.
##
version: '3.8'
services:
zookeeper:
image: "confluentinc/cp-zookeeper:7.3.3"
Expand All @@ -30,7 +29,7 @@ services:
- minio
ports:
- "9092:9092"
- "7000:7000" #prometheus metrics
- "7001:7001" #prometheus metrics
environment:
KAFKA_BROKER_ID: 0
KAFKA_ZOOKEEPER_CONNECT: "zookeeper:2181"
Expand Down
10 changes: 5 additions & 5 deletions docker/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -15,9 +15,9 @@
##

# Base image based 3.8.0 + minor changes unrelated to TS included on this branch:
# https://github.com/apache/kafka/compare/3.8...aiven:kafka:3.8.0-2024-07-30
# https://github.com/apache/kafka/compare/3.8...aiven:kafka:3.8.1-2024-11-21
# See commits and Dockerfile for more details on base image
FROM docker.io/aivenoy/kafka:3.8.0-2024-07-30
FROM docker.io/aivenoy/kafka:3.8.1-2024-11-21

ARG _VERSION

Expand Down Expand Up @@ -49,12 +49,12 @@ RUN cd /tiered-storage-for-apache-kafka/azure \
&& rm azure-${_VERSION}.tgz

# Installing JMX exporter agent
ARG JMX_EXPORTER_VERSION=0.18.0
ARG JMX_EXPORTER_VERSION=1.0.1
RUN mkdir -p /opt/prometheus/jmx-exporter
RUN wget https://repo1.maven.org/maven2/io/prometheus/jmx/jmx_prometheus_javaagent/${JMX_EXPORTER_VERSION}/jmx_prometheus_javaagent-${JMX_EXPORTER_VERSION}.jar \
RUN wget https://repo.maven.apache.org/maven2/io/prometheus/jmx/jmx_prometheus_javaagent/${JMX_EXPORTER_VERSION}/jmx_prometheus_javaagent-${JMX_EXPORTER_VERSION}.jar \
-O /opt/prometheus/jmx-exporter/jmx_prometheus_javaagent-${JMX_EXPORTER_VERSION}.jar
COPY docker/kafka-jmx-exporter.yml /opt/prometheus/jmx-exporter/.
ENV KAFKA_OPTS="-javaagent:/opt/prometheus/jmx-exporter/jmx_prometheus_javaagent-${JMX_EXPORTER_VERSION}.jar=7000:/opt/prometheus/jmx-exporter/kafka-jmx-exporter.yml"
ENV KAFKA_OPTS="-javaagent:/opt/prometheus/jmx-exporter/jmx_prometheus_javaagent-${JMX_EXPORTER_VERSION}.jar=7001:/opt/prometheus/jmx-exporter/kafka-jmx-exporter.yml"

# Restore the user.
USER appuser
Expand Down
1 change: 0 additions & 1 deletion docker/kafka-jmx-exporter.yml
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
# base configs from: https://raw.githubusercontent.com/prometheus/jmx_exporter/main/example_configs/kafka-2_0_0.yml
lowercaseOutputName: true
lowercaseOutputLabelNames: true
whitelistObjectNames: ["*:*"]