[mysql] Docker images updates - 2023-09-14-124342

exporter/Dockerfile

@@ -2,8 +2,8 @@ FROM marketplace.gcr.io/google/c2d-debian11 as exporter-builder
 
 ENV GOPATH /usr/local
 
-ENV EXPORTER_VERSION 0.14.0
-ENV EXPORTER_SHA256 c17402137a4e9745f593127f162c1003298910cb8aa7d05bee3384738de094ae
+ENV EXPORTER_VERSION 0.15.0
+ENV EXPORTER_SHA256 3973db1c46b0323a957a43916b759ee71ddab9096958ce78401fdff894b0dc51
 
 # Installs packages
 RUN set -eux \

tests/functional_tests/mysqld_exporter_test.yaml

@@ -1,4 +1,4 @@
-# Copyright (C) 2019 Google Inc.
+# Copyright (C) 2023 Google Inc.
 #
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -16,9 +16,9 @@
 
 setup:
 - command: [docker, network, create, -d, bridge, testbridge-$UNIQUE-id]
-- command: [docker, run, --net, testbridge-$UNIQUE-id, --name, mysql-server-$UNIQUE-id, -e, 'MYSQL_ROOT_PASSWORD=example-password', -d, 'launcher.gcr.io/google/mysql5']
+- command: [docker, run, --net, testbridge-$UNIQUE-id, --name, mysql-server-$UNIQUE-id, -e, 'MYSQL_ROOT_PASSWORD=example-password', -d, 'marketplace.gcr.io/google/mysql8']
 - command: [sleep, 30s]
-- command: [docker, run, --net, testbridge-$UNIQUE-id, --name, mysqld-exporter-$UNIQUE-id, -e, 'DATA_SOURCE_NAME=root:example-password@(mysql-server-$UNIQUE-id:3306)/', -d, '$IMAGE']
+- command: [docker, run, --net, testbridge-$UNIQUE-id, --name, mysqld-exporter-$UNIQUE-id, -e, 'MYSQLD_EXPORTER_PASSWORD=example-password', -d, '$IMAGE', --mysqld.address, "mysql-server-$UNIQUE-id:3306", --mysqld.username, root]
 - command: [sleep, 10s]
 - command: [docker, exec, mysqld-exporter-$UNIQUE-id, apt, update]
 - command: [docker, exec, mysqld-exporter-$UNIQUE-id, apt, install, curl, -y]

versions.yaml

@@ -40,8 +40,8 @@ versions:
   - '8'
   - latest
   templateArgs:
-    distroMajor: '11'
     distroCodename: bullseye
+    distroMajor: '11'
   templateSubDir: debian11
 - dir: 5/debian11/5.7
   excludeTests:
@@ -65,8 +65,8 @@ versions:
   - '5'
   - latest
   templateArgs:
-    distroMajor: '10'
     distroCodename: buster
+    distroMajor: '10'
   templateSubDir: debian11
 - dir: exporter
   excludeTests:
@@ -75,13 +75,13 @@ versions:
   from: marketplace.gcr.io/google/c2d-debian11
   packages:
     mysqld_exporter:
-      sha256: c17402137a4e9745f593127f162c1003298910cb8aa7d05bee3384738de094ae
-      version: 0.14.0
+      sha256: 3973db1c46b0323a957a43916b759ee71ddab9096958ce78401fdff894b0dc51
+      version: 0.15.0
   repo: mysql8
   tags:
   - exporter
-  - exporter-0.14
-  - exporter-0.14.0
+  - exporter-0.15
+  - exporter-0.15.0
   templateSubDir: exporter
 - dir: exporter
   excludeTests:
@@ -90,11 +90,12 @@ versions:
   from: marketplace.gcr.io/google/c2d-debian11
   packages:
     mysqld_exporter:
-      sha256: c17402137a4e9745f593127f162c1003298910cb8aa7d05bee3384738de094ae
-      version: 0.14.0
+      sha256: 3973db1c46b0323a957a43916b759ee71ddab9096958ce78401fdff894b0dc51
+      version: 0.15.0
   repo: mysql5
   tags:
   - exporter
-  - exporter-0.14
-  - exporter-0.14.0
+  - exporter-0.15
+  - exporter-0.15.0
   templateSubDir: exporter
+