diff --git a/README.md b/README.md index bfb863d..e1ecfc8 100644 --- a/README.md +++ b/README.md @@ -114,8 +114,8 @@ MONITORING_STACK=datadog 3. Clone `cp-demo` and checkout a branch. ```bash -# Example with CP-DEMO 7.7.1 version -CP_DEMO_VERSION=7.7.1-post +# Example with CP-DEMO 7.8.1 version +CP_DEMO_VERSION=7.8.1-post [[ -d "cp-demo" ]] || git clone https://github.com/confluentinc/cp-demo.git (cd cp-demo && git fetch && git checkout $CP_DEMO_VERSION && git pull) @@ -151,7 +151,7 @@ For an example that showcases how to monitor Apache Kafka client applications, a Dev-toolkit is an environment that allows you to easily create different configurations and deployments to verify the metrics exposed by different components of the Confluent Platform. Dev-toolkit is based on: - - Confluent Platform _(current 7.8.0)_ + - Confluent Platform _(current 7.8.1)_ - Prometheus and Grafana stack. - JMX Exporter 1.1.0 diff --git a/dev-toolkit/.env b/dev-toolkit/.env index 8f3a3b1..379e7e2 100644 --- a/dev-toolkit/.env +++ b/dev-toolkit/.env @@ -1,4 +1,4 @@ -CFLT_TAG=7.8.0 +CFLT_TAG=7.8.1 PROM_TAG=v3.0.0 GRAFANA_TAG=10.2.0 JR_TAG=latest \ No newline at end of file diff --git a/dev-toolkit/docker-compose.connect.yaml b/dev-toolkit/docker-compose.connect.yaml index 2488692..17168b1 100644 --- a/dev-toolkit/docker-compose.connect.yaml +++ b/dev-toolkit/docker-compose.connect.yaml @@ -44,7 +44,6 @@ services: - | echo "Installing Connector" confluent-hub install --no-prompt confluentinc/kafka-connect-datagen:0.6.6 - confluent-hub install --no-prompt confluentinc/kafka-connect-replicator:7.8.0 cp /usr/share/java/kafka-connect-replicator/replicator-rest-extension-*.jar /etc/kafka-connect/jars/ # echo "Launching Kafka Connect worker" diff --git a/dev-toolkit/docker-compose.replicator.yaml b/dev-toolkit/docker-compose.replicator.yaml index aeace80..c85f723 100644 --- a/dev-toolkit/docker-compose.replicator.yaml +++ b/dev-toolkit/docker-compose.replicator.yaml @@ -37,7 +37,7 @@ services: - -c - | echo "Installing Connector" - confluent-hub install --no-prompt confluentinc/kafka-connect-replicator:7.8.0 + confluent-hub install --no-prompt confluentinc/kafka-connect-replicator:7.8.1 cp /usr/share/java/kafka-connect-replicator/replicator-rest-extension-*.jar /etc/kafka-connect/jars/ # echo "Launching Kafka Connect worker" diff --git a/jmxexporter-prometheus-grafana/cfk/Dockerfile b/jmxexporter-prometheus-grafana/cfk/Dockerfile index 49b5cae..722b52f 100644 --- a/jmxexporter-prometheus-grafana/cfk/Dockerfile +++ b/jmxexporter-prometheus-grafana/cfk/Dockerfile @@ -1,6 +1,6 @@ -FROM confluentinc/cp-server:7.8.0 +FROM confluentinc/cp-server:7.8.1 USER root RUN rm -f /usr/share/java/cp-base-new/jmx_prometheus_javaagent* COPY jmx_prometheus_javaagent-1.1.0.jar /usr/share/java/cp-base-new/ -RUN chown --reference=/usr/share/java/cp-base-new/disk-usage-agent-7.8.0.jar /usr/share/java/cp-base-new/jmx_prometheus_javaagent-1.1.0.jar +RUN chown --reference=/usr/share/java/cp-base-new/disk-usage-agent-7.8.1.jar /usr/share/java/cp-base-new/jmx_prometheus_javaagent-1.1.0.jar USER appuser diff --git a/jmxexporter-prometheus-grafana/cfk/demo/confluent-platform-singlenode.yaml b/jmxexporter-prometheus-grafana/cfk/demo/confluent-platform-singlenode.yaml index 6f38c97..9bd065f 100644 --- a/jmxexporter-prometheus-grafana/cfk/demo/confluent-platform-singlenode.yaml +++ b/jmxexporter-prometheus-grafana/cfk/demo/confluent-platform-singlenode.yaml @@ -6,7 +6,7 @@ metadata: spec: replicas: 1 image: - application: confluentinc/cp-zookeeper:7.8.0 + application: confluentinc/cp-zookeeper:7.8.1 init: confluentinc/confluent-init-container:2.10.0 dataVolumeCapacity: 10Gi logVolumeCapacity: 10Gi @@ -120,8 +120,8 @@ metadata: spec: replicas: 1 image: - # application: confluentinc/cp-server:7.8.0 - application: local/cp-server:7.8.0 + # application: confluentinc/cp-server:7.8.1 + application: local/cp-server:7.8.1 init: confluentinc/confluent-init-container:2.10.0 dataVolumeCapacity: 10Gi configOverrides: diff --git a/jmxexporter-prometheus-grafana/cfk/up.sh b/jmxexporter-prometheus-grafana/cfk/up.sh index c8c47d0..869a5c3 100755 --- a/jmxexporter-prometheus-grafana/cfk/up.sh +++ b/jmxexporter-prometheus-grafana/cfk/up.sh @@ -1,8 +1,8 @@ #!/usr/bin/env bash # build docker image with jmx exporter version 1.1.0 -docker build . --no-cache --pull -t local/cp-server:7.8.0 -docker save local/cp-server:7.8.0 -o cp-server.tar +docker build . --no-cache --pull -t local/cp-server:7.8.1 +docker save local/cp-server:7.8.1 -o cp-server.tar # Start local k8s cluster with kind echo "Starting local k8s cluster with kind"