Merge branch 'stackhpc/victoria' into upstream/victoria-2022-09-05

Author: markgoddard

.github/CODEOWNERS

@@ -0,0 +1 @@
+* @stackhpc/kayobe

.github/workflows/tag-and-release.yml

@@ -0,0 +1,11 @@
+---
+name: Tag & Release
+'on':
+  push:
+    branches:
+      - stackhpc/victoria
+permissions:
+  contents: write
+jobs:
+  tag-and-release:
+    uses: stackhpc/.github/.github/workflows/tag-and-release.yml@main

.github/workflows/tox.yml

@@ -0,0 +1,7 @@
+---
+name: Tox Continuous Integration
+'on':
+  pull_request:
+jobs:
+  tox:
+    uses: stackhpc/.github/.github/workflows/tox.yml@main

docker/base/elasticsearch.repo

@@ -1,6 +1,6 @@
-[elasticsearch-kibana-logstash-6.x]
-name=ELK repository for 6.x packages
-baseurl=https://artifacts.elastic.co/packages/oss-6.x/yum
+[elasticsearch-kibana-logstash-7.x]
+name=ELK repository for 7.x packages
+baseurl=https://artifacts.elastic.co/packages/oss-7.x/yum
 gpgcheck=1
 gpgkey=https://artifacts.elastic.co/GPG-KEY-elasticsearch
 enabled=0

docker/elasticsearch/elasticsearch-curator/Dockerfile.j2

@@ -26,7 +26,9 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build
 
 {{ macros.configure_user(name='elasticsearch') }}
 
+# NOTE(parallax): pin elasticsearch due to bug: https://bugs.launchpad.net/kolla/+bug/1941073
 {% set elasticsearch_curator_pip_packages = [
+    'elasticsearch==7.13.*',
     'elasticsearch-curator'
 ] %}
 

docker/prometheus/prometheus-cadvisor/Dockerfile.j2

@@ -8,13 +8,17 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build
 {% import "macros.j2" as macros with context %}
 
 {% block prometheus_cadvisor_repository_version %}
-ENV prometheus_cadvisor_version=0.35.0
+ENV prometheus_cadvisor_version=0.38.7
+ENV prometheus_cadvisor_sha256sum=fdb86c256df682cfec2abd57a4405c919ed26f1e27ebfabf487f6c516bc7f6c7
 {% endblock %}
 
 {% if base_arch in ['x86_64'] %}
 
 {% block prometheus_cadvisor_install %}
-RUN curl -o /opt/cadvisor https://github.com/google/cadvisor/releases/download/v${prometheus_cadvisor_version}/cadvisor && chmod 0755 /opt/cadvisor
+RUN curl -o /tmp/cadvisor https://github.com/google/cadvisor/releases/download/v${prometheus_cadvisor_version}/cadvisor \
+    && echo "${prometheus_cadvisor_sha256sum} /tmp/cadvisor" | sha256sum -c \
+    && mv /tmp/cadvisor /opt \
+    && chmod 0755 /opt/cadvisor
 {% endblock %}
 
 {% else %}
@@ -24,7 +28,7 @@ RUN curl -o /opt/cadvisor https://github.com/google/cadvisor/releases/download/v
         {% set cadvisor_packages = [
              'libjs-bootstrap',
              'libjs-jquery',
-             'https://snapshot.debian.org/archive/debian/20180503T060640Z/pool/main/c/cadvisor/cadvisor_0.27.1+dfsg2-1_arm64.deb'
+             'cadvisor'
         ] %}
 
 {{ macros.install_packages(cadvisor_packages | customizable("packages")) }}

docker/prometheus/prometheus-server/Dockerfile.j2

@@ -6,7 +6,7 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build
 {% block prometheus_server_header %}{% endblock %}
 
 {% block prometheus_server_repository_version %}
-ENV prometheus_version=1.8.2
+ENV prometheus_version=2.25.0
 {% endblock %}
 
 {% block prometheus_server_install %}

kolla/template/repos.yaml

@@ -2,42 +2,42 @@
 # TODO(mnasiadka): Rework the repo list once Ceph Octopus is released
 centos:
   ceph: "centos-ceph-nautilus"
-  elasticsearch: "elasticsearch-kibana-logstash-6.x"
+  elasticsearch: "elasticsearch-kibana-logstash-7.x"
   epel: "epel"
   epel-modular: "epel-modular"
   erlang: "rabbitmq_rabbitmq-erlang"
   extras: "extras"
   grafana: "grafana"
   hacluster: "ha"
   influxdb: "influxdb"
-  logstash: "elasticsearch-kibana-logstash-6.x"
-  kibana: "elasticsearch-kibana-logstash-6.x"
+  logstash: "elasticsearch-kibana-logstash-7.x"
+  kibana: "elasticsearch-kibana-logstash-7.x"
   opstools: "centos-opstools"
   rabbitmq: "rabbitmq_rabbitmq-server"
   td-agent: "treasuredata"
 
 centos-aarch64:
   ceph: "centos-ceph-nautilus"
-  elasticsearch: "elasticsearch-kibana-logstash-6.x"
+  elasticsearch: "elasticsearch-kibana-logstash-7.x"
   epel: "epel"
   epel-modular: "epel-modular"
   erlang: "erlang-solutions"
   extras: "extras"
   grafana: "grafana"
   hacluster: "ha"
-  logstash: "elasticsearch-kibana-logstash-6.x"
+  logstash: "elasticsearch-kibana-logstash-7.x"
   opstools: "centos-opstools"
   rabbitmq: "rabbitmq_rabbitmq-server"
   td-agent: "treasuredata"
 
 centos-ppc64le:
   ceph: "centos-ceph-nautilus"
-  elasticsearch: "elasticsearch-kibana-logstash-6.x"
+  elasticsearch: "elasticsearch-kibana-logstash-7.x"
   epel: "epel"
   epel-modular: "epel-modular"
   extras: "extras"
   hacluster: "ha"
-  logstash: "elasticsearch-kibana-logstash-6.x"
+  logstash: "elasticsearch-kibana-logstash-7.x"
   opstools: "centos-opstools"
   rabbitmq: "rabbitmq_rabbitmq-server"
 
@@ -48,46 +48,46 @@ rhel:
   rabbitmq: "centos-rabbitmq-38"
 
 debian:
-  elasticsearch: "deb [arch=amd64] https://artifacts.elastic.co/packages/oss-6.x/apt stable main"
+  elasticsearch: "deb https://artifacts.elastic.co/packages/oss-7.x/apt stable main"
   erlang: "deb https://dl.cloudsmith.io/public/rabbitmq/rabbitmq-erlang/deb/debian buster main"
   grafana: "deb https://packages.grafana.com/oss/deb stable main"
   influxdb: "deb https://repos.influxdata.com/debian buster stable"
-  logstash: "deb [arch=amd64] https://artifacts.elastic.co/packages/oss-6.x/apt stable main"
-  kibana: "deb [arch=amd64] https://artifacts.elastic.co/packages/oss-6.x/apt stable main"
+  logstash: "deb https://artifacts.elastic.co/packages/oss-7.x/apt stable main"
+  kibana: "deb [arch=amd64] https://artifacts.elastic.co/packages/oss-7.x/apt stable main"
   mariadb: "deb https://dlm.mariadb.com/repo/mariadb-server/10.3/repo/debian buster main"
   rabbitmq: "deb https://dl.cloudsmith.io/public/rabbitmq/rabbitmq-server/deb/debian buster main"
   td-agent: "deb http://packages.treasuredata.com/4/debian/buster buster contrib"
 
 debian-aarch64:
-  elasticsearch: "deb [arch=amd64] https://artifacts.elastic.co/packages/oss-6.x/apt stable main"
+  elasticsearch: "deb https://artifacts.elastic.co/packages/oss-7.x/apt stable main"
   erlang: "deb https://dl.cloudsmith.io/public/rabbitmq/rabbitmq-erlang/deb/debian buster main"
   grafana: "deb https://packages.grafana.com/oss/deb stable main"
   influxdb: "deb https://repos.influxdata.com/debian buster stable"
-  logstash: "deb [arch=amd64] https://artifacts.elastic.co/packages/oss-6.x/apt stable main"
-  kibana: "deb [arch=amd64] https://artifacts.elastic.co/packages/oss-6.x/apt stable main"
+  logstash: "deb https://artifacts.elastic.co/packages/oss-7.x/apt stable main"
+  kibana: "deb [arch=amd64] https://artifacts.elastic.co/packages/oss-7.x/apt stable main"
   libvirt: "deb https://obs.linaro.org/repos/home:/marcin.juszkiewicz/debian-buster ./"
   mariadb: "deb https://dlm.mariadb.com/repo/mariadb-server/10.3/repo/debian buster main"
   rabbitmq: "deb https://dl.cloudsmith.io/public/rabbitmq/rabbitmq-server/deb/debian buster main"
   td-agent: "deb http://packages.treasuredata.com/4/debian/buster buster contrib"
 
 ubuntu:
-  elasticsearch: "deb https://artifacts.elastic.co/packages/oss-6.x/apt stable main"
+  elasticsearch: "deb https://artifacts.elastic.co/packages/oss-7.x/apt stable main"
   erlang: "deb https://dl.cloudsmith.io/public/rabbitmq/rabbitmq-erlang/deb/ubuntu focal main"
   grafana: "deb https://packages.grafana.com/oss/deb stable main"
   influxdb: "deb https://repos.influxdata.com/ubuntu focal stable"
-  logstash: "deb https://artifacts.elastic.co/packages/oss-6.x/apt stable main"
-  kibana: "deb https://artifacts.elastic.co/packages/oss-6.x/apt stable main"
+  logstash: "deb https://artifacts.elastic.co/packages/oss-7.x/apt stable main"
+  kibana: "deb https://artifacts.elastic.co/packages/oss-7.x/apt stable main"
   mariadb: "deb https://dlm.mariadb.com/repo/mariadb-server/10.3/repo/ubuntu focal main"
   qdrouterd: "deb http://ppa.launchpad.net/qpid/released/ubuntu/ focal main"
   rabbitmq: "deb https://dl.cloudsmith.io/public/rabbitmq/rabbitmq-server/deb/ubuntu focal main"
   td-agent: "deb http://packages.treasuredata.com/4/ubuntu/focal/ focal contrib"
 
 ubuntu-aarch64:
-  elasticsearch: "deb [arch=amd64] https://artifacts.elastic.co/packages/oss-6.x/apt stable main"
+  elasticsearch: "deb https://artifacts.elastic.co/packages/oss-7.x/apt stable main"
   erlang: "deb https://dl.cloudsmith.io/public/rabbitmq/rabbitmq-erlang/deb/ubuntu focal main"
   grafana: "deb https://packages.grafana.com/oss/deb stable main"
   influxdb: "deb https://repos.influxdata.com/ubuntu focal stable"
-  logstash: "deb [arch=amd64] https://artifacts.elastic.co/packages/oss-6.x/apt stable main"
+  logstash: "deb https://artifacts.elastic.co/packages/oss-7.x/apt stable main"
   mariadb: "deb https://dlm.mariadb.com/repo/mariadb-server/10.3/repo/ubuntu bionic main"
   rabbitmq: "deb https://dl.cloudsmith.io/public/rabbitmq/rabbitmq-server/deb/ubuntu focal main"
   td-agent: "deb http://packages.treasuredata.com/4/ubuntu/focal/ focal contrib"

kolla/tests/test_methods.py

@@ -105,7 +105,7 @@ def test_enable_repos_debian_multiple(self):
         expectCmd = 'RUN echo "deb https://packages.grafana.com/oss/deb '
         expectCmd += 'stable main" >/etc/apt/sources.list.d/grafana.list && '
         expectCmd += 'echo "deb [arch=amd64] '
-        expectCmd += 'https://artifacts.elastic.co/packages/oss-6.x/apt '
+        expectCmd += 'https://artifacts.elastic.co/packages/oss-7.x/apt '
         expectCmd += 'stable main" >/etc/apt/sources.list.d/kibana.list'
         self.assertEqual(expectCmd, result)
 

releasenotes/notes/fix-elasticsearch-curator-7876896ebbd41ad3.yaml

@@ -0,0 +1,6 @@
+---
+fixes:
+  - |
+    Fixes an issue with Elasticsearch curator not working due to too new
+    python elasticsearch library.
+    `LP#1941073 <https://bugs.launchpad.net/kolla-ansible/+bug/1941073>`__