Merge "Drop elasticsearch, kibana and logstash"

5 files changed, 12 insertions, 91 deletions

diff --git a/kolla/common/config.py b/kolla/common/config.py
index 69c5d244a..1d24f995e 100644
--- a/kolla/common/config.py
+++ b/kolla/common/config.py
@@ -52,16 +52,13 @@ _PROFILE_OPTS = [
     cfg.ListOpt('infra',
                 default=[
                     'cron',
-                    'elasticsearch',
                     'etcd',
                     'fluentd',
                     'haproxy',
                     'hacluster',
                     'keepalived',
-                    'kibana',
                     'kolla-toolbox',
                     'letsencrypt',
-                    'logstash',
                     'mariadb',
                     'memcached',
                     'opensearch',
diff --git a/kolla/common/users.py b/kolla/common/users.py
index f001da24b..c47528d93 100644
--- a/kolla/common/users.py
+++ b/kolla/common/users.py
@@ -57,7 +57,7 @@ USERS = {
         'uid': 42411,
         'gid': 42411,
     },
-    'elasticsearch-user': {
+    'elasticsearch-user': {  # unused user (elasticsearch dropped)
         'uid': 42412,
         'gid': 42412,
     },
@@ -105,7 +105,7 @@ USERS = {
         'uid': 42425,
         'gid': 42425,
     },
-    'kibana-user': {
+    'kibana-user': {  # unused user (kibana dropped)
         'uid': 42426,
         'gid': 42426,
     },
@@ -285,7 +285,7 @@ USERS = {
         'uid': 42477,  # unused user, but we need the group for vhost socket
         'gid': 42477,
     },
-    'logstash-user': {
+    'logstash-user': {  # unused user (elasticsearch dropped)
         'uid': 42478,
         'gid': 42478,
     },
diff --git a/kolla/image/unbuildable.py b/kolla/image/unbuildable.py
index 092b5cc33..b401a812b 100644
--- a/kolla/image/unbuildable.py
+++ b/kolla/image/unbuildable.py
@@ -23,13 +23,9 @@ UNBUILDABLE_IMAGES = {
     },
 
     # Issues for SHA1 keys:
-    # https://github.com/elastic/elasticsearch/issues/85876
     # https://github.com/grafana/grafana/issues/41036
     'centos': {
-        "elasticsearch",         # SHA1 gpg key
         "hacluster-pcs",         # Missing crmsh package
-        "kibana",                # SHA1 gpg key
-        "logstash",              # SHA1 gpg key
         "nova-spicehtml5proxy",  # Missing spicehtml5 package
         "ovsdpdk",               # Not supported on CentOS
         "tgtd",                  # Not supported on CentOS
@@ -39,10 +35,7 @@ UNBUILDABLE_IMAGES = {
     },
 
     'rocky': {
-        "elasticsearch",         # SHA1 gpg key
         "hacluster-pcs",         # Missing crmsh package
-        "kibana",                # SHA1 gpg key
-        "logstash",              # SHA1 gpg key
         "nova-spicehtml5proxy",  # Missing spicehtml5 package
         "ovsdpdk",               # Not supported on CentOS
         "tgtd",                  # Not supported on CentOS
@@ -55,11 +48,9 @@ UNBUILDABLE_IMAGES = {
 
     'ubuntu+aarch64': {
         "barbican-base",  # https://github.com/unbit/uwsgi/issues/2434
-        "kibana",         # no binary package
     },
 
     'centos+aarch64': {
-        "kibana",         # no binary package
         "telegraf",       # no binary package
     },
 }
diff --git a/kolla/template/repos.yaml b/kolla/template/repos.yaml
index 5f18d9d8c..3aed5d405 100644
--- a/kolla/template/repos.yaml
+++ b/kolla/template/repos.yaml
@@ -2,15 +2,12 @@
 centos:
   ceph: "centos-ceph-quincy"
   crb: "crb"
-  elasticsearch: "elasticsearch-kibana-logstash-7.x"
   epel: "epel"
   erlang: "rabbitmq_rabbitmq-erlang"
   extras: "extras"
   grafana: "grafana"
   hacluster: "highavailability"
   influxdb: "influxdb"
-  kibana: "elasticsearch-kibana-logstash-7.x"
-  logstash: "elasticsearch-kibana-logstash-7.x"
   mariadb: "mariadb"
   openvswitch: "centos-nfv-openvswitch"
   opstools: "centos-opstools"
@@ -21,15 +18,12 @@ centos:
 centos-aarch64:
   ceph: "centos-ceph-quincy"
   crb: "crb"
-  elasticsearch: "elasticsearch-kibana-logstash-7.x"
   epel: "epel"
   erlang: "copr-hrw-erlang-for-rabbitmq"
   extras: "extras"
   grafana: "grafana"
   hacluster: "highavailability"
   influxdb: "influxdb"
-  kibana: "elasticsearch-kibana-logstash-7.x"
-  logstash: "elasticsearch-kibana-logstash-7.x"
   mariadb: "mariadb"
   openvswitch: "centos-nfv-openvswitch"
   opstools: "centos-opstools"
@@ -38,11 +32,6 @@ centos-aarch64:
   td-agent: "treasuredata"
 
 debian:
-  elasticsearch:
-    url: "https://artifacts.elastic.co/packages/oss-7.x/apt"
-    suite: "stable"
-    component: "main"
-    gpg_key: "elasticsearch.asc"
   erlang:
     url: "https://ppa.launchpadcontent.net/rabbitmq/rabbitmq-erlang/ubuntu"
     suite: "focal"
@@ -58,16 +47,6 @@ debian:
     suite: "bullseye"
     component: "stable"
     gpg_key: "influxdb.asc"
-  logstash:
-    url: "https://artifacts.elastic.co/packages/oss-7.x/apt"
-    suite: "stable"
-    component: "main"
-    gpg_key: "elasticsearch.asc"
-  kibana:
-    url: "https://artifacts.elastic.co/packages/oss-7.x/apt"
-    suite: "stable"
-    component: "main"
-    gpg_key: "elasticsearch.asc"
   mariadb:
     url: "https://dlm.mariadb.com/repo/mariadb-server/10.6/repo/debian"
     suite: "bullseye"
@@ -90,11 +69,6 @@ debian:
     gpg_key: "proxysql.asc"
 
 debian-aarch64:
-  elasticsearch:
-    url: "https://artifacts.elastic.co/packages/oss-7.x/apt"
-    suite: "stable"
-    component: "main"
-    gpg_key: "elasticsearch.asc"
   erlang:
     url: "https://ppa.launchpadcontent.net/rabbitmq/rabbitmq-erlang/ubuntu"
     suite: "focal"
@@ -110,16 +84,6 @@ debian-aarch64:
     suite: "bullseye"
     component: "stable"
     gpg_key: "influxdb.asc"
-  logstash:
-    url: "https://artifacts.elastic.co/packages/oss-7.x/apt"
-    suite: "stable"
-    component: "main"
-    gpg_key: "elasticsearch.asc"
-  kibana:
-    url: "https://artifacts.elastic.co/packages/oss-7.x/apt"
-    suite: "stable"
-    component: "main"
-    gpg_key: "elasticsearch.asc"
   mariadb:
     url: "https://dlm.mariadb.com/repo/mariadb-server/10.6/repo/debian"
     suite: "bullseye"
@@ -144,15 +108,12 @@ debian-aarch64:
 rocky:
   ceph: "centos-ceph-quincy"
   crb: "crb"
-  elasticsearch: "elasticsearch-kibana-logstash-7.x"
   epel: "epel"
   erlang: "rabbitmq_rabbitmq-erlang"
   extras: "extras"
   grafana: "grafana"
   hacluster: "highavailability"
   influxdb: "influxdb"
-  kibana: "elasticsearch-kibana-logstash-7.x"
-  logstash: "elasticsearch-kibana-logstash-7.x"
   mariadb: "mariadb"
   openvswitch: "centos-nfv-openvswitch"
   opstools: "centos-opstools"
@@ -163,15 +124,12 @@ rocky:
 rocky-aarch64:
   ceph: "centos-ceph-quincy"
   crb: "crb"
-  elasticsearch: "elasticsearch-kibana-logstash-7.x"
   epel: "epel"
   erlang: "copr-hrw-erlang-for-rabbitmq"
   extras: "extras"
   grafana: "grafana"
   influxdb: "influxdb"
   hacluster: "highavailability"
-  kibana: "elasticsearch-kibana-logstash-7.x"
-  logstash: "elasticsearch-kibana-logstash-7.x"
   mariadb: "mariadb"
   openvswitch: "centos-nfv-openvswitch"
   opstools: "centos-opstools"
@@ -180,11 +138,6 @@ rocky-aarch64:
   td-agent: "treasuredata"
 
 ubuntu:
-  elasticsearch:
-    url: "https://artifacts.elastic.co/packages/oss-7.x/apt"
-    suite: "stable"
-    component: "main"
-    gpg_key: "elasticsearch.asc"
   erlang:
     url: "https://ppa.launchpadcontent.net/rabbitmq/rabbitmq-erlang/ubuntu"
     suite: "jammy"
@@ -200,16 +153,6 @@ ubuntu:
     suite: "jammy"
     component: "stable"
     gpg_key: "influxdb.asc"
-  logstash:
-    url: "https://artifacts.elastic.co/packages/oss-7.x/apt"
-    suite: "stable"
-    component: "main"
-    gpg_key: "elasticsearch.asc"
-  kibana:
-    url: "https://artifacts.elastic.co/packages/oss-7.x/apt"
-    suite: "stable"
-    component: "main"
-    gpg_key: "elasticsearch.asc"
   mariadb:
     url: "https://dlm.mariadb.com/repo/mariadb-server/10.6/repo/ubuntu"
     suite: "jammy"
@@ -232,11 +175,6 @@ ubuntu:
     gpg_key: "proxysql.asc"
 
 ubuntu-aarch64:
-  elasticsearch:
-    url: "https://artifacts.elastic.co/packages/oss-7.x/apt"
-    suite: "stable"
-    component: "main"
-    gpg_key: "elasticsearch.asc"
   erlang:
     url: "https://ppa.launchpadcontent.net/rabbitmq/rabbitmq-erlang/ubuntu"
     suite: "jammy"
@@ -252,11 +190,6 @@ ubuntu-aarch64:
     suite: "jammy"
     component: "stable"
     gpg_key: "influxdb.asc"
-  logstash:
-    url: "https://artifacts.elastic.co/packages/oss-7.x/apt"
-    suite: "stable"
-    component: "main"
-    gpg_key: "elasticsearch.asc"
   mariadb:
     url: "https://dlm.mariadb.com/repo/mariadb-server/10.6/repo/ubuntu"
     suite: "jammy"
diff --git a/kolla/tests/test_methods.py b/kolla/tests/test_methods.py
index d98fa8825..39ef20c64 100644
--- a/kolla/tests/test_methods.py
+++ b/kolla/tests/test_methods.py
@@ -97,7 +97,7 @@ class MethodsTest(base.TestCase):
             'base_package_type': 'deb'
         }
 
-        result = methods.handle_repos(template_vars, ['grafana', 'kibana'],
+        result = methods.handle_repos(template_vars, ['grafana', 'rabbitmq'],
                                       'enable')
         expectCmd = "RUN echo 'Uris: https://packages.grafana.com/oss/deb' "
         expectCmd += ">/etc/apt/sources.list.d/grafana.sources && "
@@ -111,16 +111,16 @@ class MethodsTest(base.TestCase):
         expectCmd += ">>/etc/apt/sources.list.d/grafana.sources && "
 
         expectCmd += "echo 'Uris: "
-        expectCmd += "https://artifacts.elastic.co/packages/oss-7.x/apt' "
-        expectCmd += ">/etc/apt/sources.list.d/kibana.sources && "
+        expectCmd += "https://dl.cloudsmith.io/public/rabbitmq/rabbitmq-server/deb/debian' "  # noqa: E501
+        expectCmd += ">/etc/apt/sources.list.d/rabbitmq.sources && "
         expectCmd += "echo 'Components: main' "
-        expectCmd += ">>/etc/apt/sources.list.d/kibana.sources && "
+        expectCmd += ">>/etc/apt/sources.list.d/rabbitmq.sources && "
         expectCmd += "echo 'Types: deb' "
-        expectCmd += ">>/etc/apt/sources.list.d/kibana.sources && "
-        expectCmd += "echo 'Suites: stable' "
-        expectCmd += ">>/etc/apt/sources.list.d/kibana.sources && "
-        expectCmd += "echo 'Signed-By: /etc/kolla/apt-keys/elasticsearch.asc' "
-        expectCmd += ">>/etc/apt/sources.list.d/kibana.sources"
+        expectCmd += ">>/etc/apt/sources.list.d/rabbitmq.sources && "
+        expectCmd += "echo 'Suites: bullseye' "
+        expectCmd += ">>/etc/apt/sources.list.d/rabbitmq.sources && "
+        expectCmd += "echo 'Signed-By: /etc/kolla/apt-keys/rabbitmq.gpg' "
+        expectCmd += ">>/etc/apt/sources.list.d/rabbitmq.sources"
 
         self.assertEqual(expectCmd, result)