Merge branch 'stackhpc/victoria' into sync-stable/victoria

bbezak · web-flow · commit a86c0d0626e2 · 2021-09-22T13:05:41.000+02:00
diff --git a/docker/base/elasticsearch.repo b/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
diff --git a/docker/prometheus/prometheus-cadvisor/Dockerfile.j2 b/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")) }}
diff --git a/docker/prometheus/prometheus-server/Dockerfile.j2 b/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 %}
diff --git a/kolla/template/repos.yaml b/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: "centos-rabbitmq-38"
   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"
 
@@ -49,44 +49,45 @@ rhel:
 
 # NOTE(mnasiadka): Erlang repo - Debian Buster/Bullseye needs to use bionic as per RabbitMQ docs
 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 http://ppa.launchpad.net/rabbitmq/rabbitmq-erlang/ubuntu bionic 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"
   rabbitmq: "deb https://packagecloud.io/rabbitmq/rabbitmq-server/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 http://ppa.launchpad.net/rabbitmq/rabbitmq-erlang/ubuntu bionic 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 ./"
   rabbitmq: "deb https://packagecloud.io/rabbitmq/rabbitmq-server/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 http://ppa.launchpad.net/rabbitmq/rabbitmq-erlang/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 http://downloads.mariadb.com/MariaDB/mariadb-10.3/repo/ubuntu focal main"
   qdrouterd: "deb http://ppa.launchpad.net/qpid/released/ubuntu/ focal main"
   rabbitmq: "deb https://packagecloud.io/rabbitmq/rabbitmq-server/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 http://ppa.launchpad.net/rabbitmq/rabbitmq-erlang/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 http://downloads.mariadb.com/MariaDB/mariadb-10.3/repo/ubuntu bionic main"
   rabbitmq: "deb https://packagecloud.io/rabbitmq/rabbitmq-server/ubuntu/ focal main"
   td-agent: "deb http://packages.treasuredata.com/4/ubuntu/focal/ focal contrib"
diff --git a/kolla/tests/test_methods.py b/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)
 
diff --git a/releasenotes/notes/update-cadvisor-v0.38.7-a0ff88006b5ff3f7.yaml b/releasenotes/notes/update-cadvisor-v0.38.7-a0ff88006b5ff3f7.yaml
@@ -0,0 +1,4 @@
+---
+features:
+  - |
+    cAdvisor has been updated to 0.38.7 version.
diff --git a/releasenotes/notes/upgrade-to-elk7-1816e69663735a98.yaml b/releasenotes/notes/upgrade-to-elk7-1816e69663735a98.yaml
@@ -0,0 +1,6 @@
+---
+upgrade:
+  - |
+    Upgrades Elasticsearch, Logstash and Kibana (ELK) 6 images to ELK 7. Please
+    see the upgrade notes in the official `documentation
+    <https://www.elastic.co/guide/en/elasticsearch/reference/current/rolling-upgrades.html>`__

-Original file line number
+Diff line change
@@ @@ -0,0 +1,4 @@ @@
 +---
 +features:
 +  - |
 +    cAdvisor has been updated to 0.38.7 version.