From 24c33ca275b0f7082e1fc94fe53feb64dddacd85 Mon Sep 17 00:00:00 2001 From: "campaigner-prod[bot]" <87874424+campaigner-prod[bot]@users.noreply.github.com> Date: Thu, 14 Aug 2025 19:10:47 +0000 Subject: [PATCH] Replace Bitnami image references with bitnamilegacy --- kafka_consumer/tests/docker/noauth/docker-compose.yaml | 6 +++--- kafka_consumer/tests/docker/ssl/docker-compose.yaml | 6 +++--- .../assets/dashboards/rabbitmq_screenboard_dashboard.json | 4 ++-- 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/kafka_consumer/tests/docker/noauth/docker-compose.yaml b/kafka_consumer/tests/docker/noauth/docker-compose.yaml index a08bee122530b..9d6c87544976e 100644 --- a/kafka_consumer/tests/docker/noauth/docker-compose.yaml +++ b/kafka_consumer/tests/docker/noauth/docker-compose.yaml @@ -1,6 +1,6 @@ services: zookeeper: - image: docker.io/bitnami/zookeeper:${ZK_VERSION} + image: docker.io/bitnamilegacy/zookeeper:${ZK_VERSION} container_name: zookeeper hostname: zookeeper ports: @@ -15,7 +15,7 @@ services: retries: 10 kafka1: - image: docker.io/bitnami/kafka:${KAFKA_VERSION} + image: docker.io/bitnamilegacy/kafka:${KAFKA_VERSION} container_name: kafka1 hostname: kafka1 ports: @@ -34,7 +34,7 @@ services: condition: service_healthy kafka2: - image: docker.io/bitnami/kafka:${KAFKA_VERSION} + image: docker.io/bitnamilegacy/kafka:${KAFKA_VERSION} ports: - 9093:9093 container_name: kafka2 diff --git a/kafka_consumer/tests/docker/ssl/docker-compose.yaml b/kafka_consumer/tests/docker/ssl/docker-compose.yaml index 09f93d41fc80f..40770719845d7 100644 --- a/kafka_consumer/tests/docker/ssl/docker-compose.yaml +++ b/kafka_consumer/tests/docker/ssl/docker-compose.yaml @@ -1,6 +1,6 @@ services: zookeeper: - image: docker.io/bitnami/zookeeper:${ZK_VERSION} + image: docker.io/bitnamilegacy/zookeeper:${ZK_VERSION} ports: - 2181:2181 container_name: zookeeper @@ -15,7 +15,7 @@ services: retries: 10 kafka1: - image: docker.io/bitnami/kafka:${KAFKA_VERSION} + image: docker.io/bitnamilegacy/kafka:${KAFKA_VERSION} container_name: kafka1 hostname: kafka1 ports: @@ -48,7 +48,7 @@ services: condition: service_healthy kafka2: - image: docker.io/bitnami/kafka:${KAFKA_VERSION} + image: docker.io/bitnamilegacy/kafka:${KAFKA_VERSION} container_name: kafka2 hostname: kafka2 ports: diff --git a/rabbitmq/assets/dashboards/rabbitmq_screenboard_dashboard.json b/rabbitmq/assets/dashboards/rabbitmq_screenboard_dashboard.json index 14b2a41f54c77..f33d7e17c3148 100644 --- a/rabbitmq/assets/dashboards/rabbitmq_screenboard_dashboard.json +++ b/rabbitmq/assets/dashboards/rabbitmq_screenboard_dashboard.json @@ -82,7 +82,7 @@ "type": "check_status", "check": "rabbitmq.status", "grouping": "cluster", - "group": "app:rabbitmq-node3,cluster_name:stripe,cpu_arch:amd64,datacenter:us1.staging.dog,env:dev,env:staging,git.repository_url:https://github.com/bitnami/containers/tree/main/bitnami/rabbitmq,host:i-01de4e62a09bafe36,image_id:registry.ddbuild.io/images/mirror/bitnami/rabbitmq_sha256:30d7bc0faddf02d67e5bdcd8b00e0d6a444c0b7cc71dff3b6fa13db5062b4a27,image_name:registry.ddbuild.io/images/mirror/bitnami/rabbitmq,image_tag:3.10.8-debian-11-r4,instance_type:m5n.2xlarge,kube_cluster_name:stripe,kube_container_name:rabbitmq-node3,kube_deployment:rabbitmq-node3,kube_namespace:dsm-dev-rabbit,kube_node_role:compute,kube_node_role:nodeless,kube_node_role:nodeless-amd64-8c32g-v3,kube_ownerref_kind:replicaset,kube_ownerref_name:rabbitmq-node3-6999cd7b48,kube_qos:burstable,kube_replica_set:rabbitmq-node3-6999cd7b48,kube_service:rabbitmq-node3,ng_cluster_autoscaler:true,ng_local_storage:false,node.datadoghq.com/version:v6-1-16,pod_name:rabbitmq-node3-6999cd7b48-dkw2v,pod_phase:running,service:rabbitmq-node3,short_image:rabbitmq,site:datad0g.com,version:latest", + "group": "app:rabbitmq-node3,cluster_name:stripe,cpu_arch:amd64,datacenter:us1.staging.dog,env:dev,env:staging,git.repository_url:https://github.com/bitnami/containers/tree/main/bitnami/rabbitmq,host:i-01de4e62a09bafe36,image_id:registry.ddbuild.io/images/mirror/bitnamilegacy/rabbitmq_sha256:30d7bc0faddf02d67e5bdcd8b00e0d6a444c0b7cc71dff3b6fa13db5062b4a27,image_name:registry.ddbuild.io/images/mirror/bitnamilegacy/rabbitmq,image_tag:3.10.8-debian-11-r4,instance_type:m5n.2xlarge,kube_cluster_name:stripe,kube_container_name:rabbitmq-node3,kube_deployment:rabbitmq-node3,kube_namespace:dsm-dev-rabbit,kube_node_role:compute,kube_node_role:nodeless,kube_node_role:nodeless-amd64-8c32g-v3,kube_ownerref_kind:replicaset,kube_ownerref_name:rabbitmq-node3-6999cd7b48,kube_qos:burstable,kube_replica_set:rabbitmq-node3-6999cd7b48,kube_service:rabbitmq-node3,ng_cluster_autoscaler:true,ng_local_storage:false,node.datadoghq.com/version:v6-1-16,pod_name:rabbitmq-node3-6999cd7b48-dkw2v,pod_phase:running,service:rabbitmq-node3,short_image:rabbitmq,site:datad0g.com,version:latest", "group_by": [], "tags": [] }, @@ -145,7 +145,7 @@ "type": "check_status", "check": "rabbitmq.aliveness", "grouping": "cluster", - "group": "app:rabbitmq-node1,cluster_name:stripe,cpu_arch:amd64,datacenter:us1.staging.dog,env:dev,env:staging,git.repository_url:https://github.com/bitnami/containers/tree/main/bitnami/rabbitmq,host:i-09baa95e1d76eef8b,image_id:registry.ddbuild.io/images/mirror/bitnami/rabbitmq_sha256:30d7bc0faddf02d67e5bdcd8b00e0d6a444c0b7cc71dff3b6fa13db5062b4a27,image_name:registry.ddbuild.io/images/mirror/bitnami/rabbitmq,image_tag:3.10.8-debian-11-r4,instance_type:m5n.4xlarge,kube_cluster_name:stripe,kube_container_name:rabbitmq-node1,kube_deployment:rabbitmq-node1,kube_namespace:dsm-dev-rabbit,kube_node_role:compute,kube_node_role:nodeless,kube_node_role:nodeless-amd64-16c64g-v2,kube_ownerref_kind:replicaset,kube_ownerref_name:rabbitmq-node1-568dc6fd6,kube_qos:burstable,kube_replica_set:rabbitmq-node1-568dc6fd6,kube_service:rabbitmq-node1,ng_cluster_autoscaler:true,ng_local_storage:false,node.datadoghq.com/version:v6-1-16,pod_name:rabbitmq-node1-568dc6fd6-58zds,pod_phase:running,service:rabbitmq-node1,short_image:rabbitmq,site:datad0g.com,version:latest,vhost:/", + "group": "app:rabbitmq-node1,cluster_name:stripe,cpu_arch:amd64,datacenter:us1.staging.dog,env:dev,env:staging,git.repository_url:https://github.com/bitnami/containers/tree/main/bitnami/rabbitmq,host:i-09baa95e1d76eef8b,image_id:registry.ddbuild.io/images/mirror/bitnamilegacy/rabbitmq_sha256:30d7bc0faddf02d67e5bdcd8b00e0d6a444c0b7cc71dff3b6fa13db5062b4a27,image_name:registry.ddbuild.io/images/mirror/bitnamilegacy/rabbitmq,image_tag:3.10.8-debian-11-r4,instance_type:m5n.4xlarge,kube_cluster_name:stripe,kube_container_name:rabbitmq-node1,kube_deployment:rabbitmq-node1,kube_namespace:dsm-dev-rabbit,kube_node_role:compute,kube_node_role:nodeless,kube_node_role:nodeless-amd64-16c64g-v2,kube_ownerref_kind:replicaset,kube_ownerref_name:rabbitmq-node1-568dc6fd6,kube_qos:burstable,kube_replica_set:rabbitmq-node1-568dc6fd6,kube_service:rabbitmq-node1,ng_cluster_autoscaler:true,ng_local_storage:false,node.datadoghq.com/version:v6-1-16,pod_name:rabbitmq-node1-568dc6fd6-58zds,pod_phase:running,service:rabbitmq-node1,short_image:rabbitmq,site:datad0g.com,version:latest,vhost:/", "group_by": ["host"], "tags": [] },