Update ProxySQL to version 2.4

This patch is updating ProxySQL from
version 2.3 to version 2.4, which
has several new features and bugfixes.

Change-Id: I625f72aac591aee8b1efe51f0b4a9e7660e6dbdc

4 files changed, 10 insertions, 10 deletions

diff --git a/doc/source/contributor/versions.rst b/doc/source/contributor/versions.rst
index 7fc15142b..589488a41 100644
--- a/doc/source/contributor/versions.rst
+++ b/doc/source/contributor/versions.rst
@@ -15,7 +15,7 @@ information about those which come from 3rdparty sources.
  InfluxDB       1.8.10             `InfluxDB upstream repo`_
  Telegraf       1.23.0             `InfluxDB upstream repo`_
  TD Agent       4.3.1              `TreasureData install guide`_
- ProxySQL       2.3                `ProxySQL repository`_
+ ProxySQL       2.4                `ProxySQL repository`_
  HAProxy        2.2                - CentOS: "NFV extras" distro repository
                                    - Debian: distro repository
                                    - Ubuntu 20.04: `HAProxy PPA`_
@@ -48,7 +48,7 @@ information about those which come from 3rdparty sources.
 .. _`Kibana install guide`: https://www.elastic.co/guide/en/kibana/7.10/install.html
 .. _`Logstash install guide`: https://www.elastic.co/guide/en/logstash/7.9/installing-logstash.html
 .. _`TreasureData install guide`: https://www.fluentd.org/download
-.. _`ProxySQL repository`: https://repo.proxysql.com/ProxySQL/proxysql-2.3.x/
+.. _`ProxySQL repository`: https://repo.proxysql.com/ProxySQL/proxysql-2.4.x/
 
 .. _`HAProxy PPA`: https://launchpad.net/~vbernat/+archive/ubuntu/haproxy-2.2
 .. _`Cloudsmith.io modern Erlang`: https://www.rabbitmq.com/install-debian.html#apt-cloudsmith
diff --git a/docker/base/Dockerfile.j2 b/docker/base/Dockerfile.j2
index 290e64b65..a99462120 100644
--- a/docker/base/Dockerfile.j2
+++ b/docker/base/Dockerfile.j2
@@ -80,7 +80,7 @@ COPY dnf.conf /etc/dnf/dnf.conf
     'https://artifacts.elastic.co/GPG-KEY-elasticsearch',
     'https://packages.grafana.com/gpg.key',
     'https://downloads.mariadb.com/MariaDB/RPM-GPG-KEY-MariaDB',
-    'https://repo.proxysql.com/ProxySQL/repo_pub_key',
+    'https://repo.proxysql.com/ProxySQL/proxysql-2.4.x/repo_pub_key',
     'https://github.com/rabbitmq/signing-keys/releases/download/2.0/rabbitmq-release-signing-key.asc',
     'https://packages.treasuredata.com/GPG-KEY-td-agent',
 ] %}
@@ -324,7 +324,7 @@ COPY apt_preferences /etc/apt/preferences.d/kolla-custom
    {'name': 'grafana', 'url': 'https://packages.grafana.com/gpg.key'},
    {'name': 'influxdb', 'url': 'https://repos.influxdata.com/influxdb.key'},
    {'name': 'mariadb', 'url': 'https://downloads.mariadb.com/MariaDB/mariadb-keyring-2019.gpg', 'type': 'gpg'},
-   {'name': 'proxysql', 'url': 'https://repo.proxysql.com/ProxySQL/repo_pub_key'},
+   {'name': 'proxysql', 'url': 'https://repo.proxysql.com/ProxySQL/proxysql-2.4.x/repo_pub_key'},
    {'name': 'treasuredata', 'url': 'https://packages.treasuredata.com/GPG-KEY-td-agent'},
 ] %}
 
diff --git a/docker/base/proxysql.repo b/docker/base/proxysql.repo
index 70bc14d96..5276bbf67 100644
--- a/docker/base/proxysql.repo
+++ b/docker/base/proxysql.repo
@@ -1,6 +1,6 @@
 [proxysql]
 name = ProxySQL
-baseurl = https://repo.proxysql.com/ProxySQL/proxysql-2.3.x/centos/$releasever
-gpgkey = https://repo.proxysql.com/ProxySQL/repo_pub_key
+baseurl = https://repo.proxysql.com/ProxySQL/proxysql-2.4.x/centos/$releasever
+gpgkey = https://repo.proxysql.com/ProxySQL/proxysql-2.4.x/repo_pub_key
 gpgcheck = 1
 enabled = 0
diff --git a/kolla/template/repos.yaml b/kolla/template/repos.yaml
index 270eec2b3..79d4c3e88 100644
--- a/kolla/template/repos.yaml
+++ b/kolla/template/repos.yaml
@@ -87,7 +87,7 @@ debian:
     component: "contrib"
     gpg_key: "treasuredata.asc"
   proxysql:
-    url: "https://repo.proxysql.com/ProxySQL/proxysql-2.3.x/bullseye/"
+    url: "https://repo.proxysql.com/ProxySQL/proxysql-2.4.x/bullseye/"
     suite: "./"
     component: ""
     gpg_key: "proxysql.asc"
@@ -139,7 +139,7 @@ debian-aarch64:
     component: "contrib"
     gpg_key: "treasuredata.asc"
   proxysql:
-    url: "https://repo.proxysql.com/ProxySQL/proxysql-2.3.x/bullseye/"
+    url: "https://repo.proxysql.com/ProxySQL/proxysql-2.4.x/bullseye/"
     suite: "./"
     component: ""
     gpg_key: "proxysql.asc"
@@ -196,7 +196,7 @@ ubuntu:
     component: "contrib"
     gpg_key: "treasuredata.asc"
   proxysql:
-    url: "https://repo.proxysql.com/ProxySQL/proxysql-2.3.x/focal/"
+    url: "https://repo.proxysql.com/ProxySQL/proxysql-2.4.x/focal/"
     suite: "./"
     component: ""
     gpg_key: "proxysql.asc"
@@ -248,7 +248,7 @@ ubuntu-aarch64:
     component: "contrib"
     gpg_key: "treasuredata.asc"
   proxysql:
-    url: "https://repo.proxysql.com/ProxySQL/proxysql-2.3.x/focal/"
+    url: "https://repo.proxysql.com/ProxySQL/proxysql-2.4.x/focal/"
     suite: "./"
     component: ""
     gpg_key: "proxysql.asc"