From 3efa32684d2785cbc9d077a3e797f009e032e0b5 Mon Sep 17 00:00:00 2001 From: mishaschwartz <4380924+mishaschwartz@users.noreply.github.com> Date: Thu, 23 May 2024 15:00:30 -0400 Subject: [PATCH 1/3] bump cadvisor v0.49.1 --- CHANGES.md | 6 ++++++ birdhouse/components/monitoring/default.env | 4 ++-- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/CHANGES.md b/CHANGES.md index 4035c6608..f67ab787c 100644 --- a/CHANGES.md +++ b/CHANGES.md @@ -32,6 +32,12 @@ - `ALERTMANAGER_DOCKER` - Note that the defaults are the same as the previous hardcoded versions so this change is fully backwards compatible. +- Bump cadvisor version to the latest version: v0.49.1 + - See the cadvisor repo for all changes: https://github.com/google/cadvisor/compare/v0.36.0...v0.49.1 + - This updated was prompted by the fact that the previously installed version of cadvisor (v0.36.0) did not support + newer versions of docker. When deploying this repo with recent docker version, cadvisor was unable to discover or + monitor running containers. + [2.3.1](https://github.com/bird-house/birdhouse-deploy/tree/2.3.1) (2024-05-21) ------------------------------------------------------------------------------------------------------------------ diff --git a/birdhouse/components/monitoring/default.env b/birdhouse/components/monitoring/default.env index 943a7f25d..1ecb61b81 100644 --- a/birdhouse/components/monitoring/default.env +++ b/birdhouse/components/monitoring/default.env @@ -12,8 +12,8 @@ export PROMETHEUS_VERSION="v2.19.0" export PROMETHEUS_DOCKER=prom/prometheus export PROMETHEUS_IMAGE='${PROMETHEUS_DOCKER}:${PROMETHEUS_VERSION}' -export CADVISOR_VERSION="v0.36.0" -export CADVISOR_DOCKER="gcr.io/google-containers/cadvisor" +export CADVISOR_VERSION="v0.49.1" +export CADVISOR_DOCKER="gcr.io/cadvisor/cadvisor" export CADVISOR_IMAGE='${CADVISOR_DOCKER}:${CADVISOR_VERSION}' export NODE_EXPORTER_VERSION="v1.0.0" From 8bfc38b59ead0394a8c28c4d0e468aa75c4e2bf7 Mon Sep 17 00:00:00 2001 From: mishaschwartz <4380924+mishaschwartz@users.noreply.github.com> Date: Wed, 29 May 2024 08:13:00 -0400 Subject: [PATCH 2/3] =?UTF-8?q?Bump=20version:=202.3.2=20=E2=86=92=202.3.3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .bumpversion.cfg | 6 +++--- CHANGES.md | 5 +++++ Makefile | 2 +- README.rst | 8 ++++---- RELEASE.txt | 2 +- .../canarie-api/docker_configuration.py.template | 8 ++++---- docs/source/conf.py | 4 ++-- 7 files changed, 20 insertions(+), 15 deletions(-) diff --git a/.bumpversion.cfg b/.bumpversion.cfg index f3c073502..8cd2a082d 100644 --- a/.bumpversion.cfg +++ b/.bumpversion.cfg @@ -1,5 +1,5 @@ [bumpversion] -current_version = 2.3.2 +current_version = 2.3.3 commit = True tag = False tag_name = {new_version} @@ -30,11 +30,11 @@ search = {current_version} replace = {new_version} [bumpversion:file:RELEASE.txt] -search = {current_version} 2024-05-27T13:26:27Z +search = {current_version} 2024-05-29T12:13:00Z replace = {new_version} {utcnow:%Y-%m-%dT%H:%M:%SZ} [bumpversion:part:releaseTime] -values = 2024-05-27T13:26:27Z +values = 2024-05-29T12:13:00Z [bumpversion:file(version):birdhouse/components/canarie-api/docker_configuration.py.template] search = 'version': '{current_version}' diff --git a/CHANGES.md b/CHANGES.md index 6bfe1c358..4964e0903 100644 --- a/CHANGES.md +++ b/CHANGES.md @@ -17,6 +17,11 @@ [//]: # (list changes here, using '-' for each new entry, remove this when items are added) +[2.3.3](https://github.com/bird-house/birdhouse-deploy/tree/2.3.3) (2024-05-29) +------------------------------------------------------------------------------------------------------------------ + +[//]: # (list changes here, using '-' for each new entry, remove this when items are added) + [2.3.2](https://github.com/bird-house/birdhouse-deploy/tree/2.3.2) (2024-05-27) ------------------------------------------------------------------------------------------------------------------ diff --git a/Makefile b/Makefile index 3259ad215..b137969c5 100644 --- a/Makefile +++ b/Makefile @@ -1,7 +1,7 @@ # Generic variables override SHELL := bash override APP_NAME := birdhouse-deploy -override APP_VERSION := 2.3.2 +override APP_VERSION := 2.3.3 # utility to remove comments after value of an option variable override clean_opt = $(shell echo "$(1)" | $(_SED) -r -e "s/[ '$'\t'']+$$//g") diff --git a/README.rst b/README.rst index 0cf566390..c55ac3b5d 100644 --- a/README.rst +++ b/README.rst @@ -18,13 +18,13 @@ for a full-fledged production platform. * - citation - | |citation| -.. |commits-since| image:: https://img.shields.io/github/commits-since/bird-house/birdhouse-deploy/2.3.2.svg +.. |commits-since| image:: https://img.shields.io/github/commits-since/bird-house/birdhouse-deploy/2.3.3.svg :alt: Commits since latest release - :target: https://github.com/bird-house/birdhouse-deploy/compare/2.3.2...master + :target: https://github.com/bird-house/birdhouse-deploy/compare/2.3.3...master -.. |latest-version| image:: https://img.shields.io/badge/tag-2.3.2-blue.svg?style=flat +.. |latest-version| image:: https://img.shields.io/badge/tag-2.3.3-blue.svg?style=flat :alt: Latest Tag - :target: https://github.com/bird-house/birdhouse-deploy/tree/2.3.2 + :target: https://github.com/bird-house/birdhouse-deploy/tree/2.3.3 .. |readthedocs| image:: https://readthedocs.org/projects/birdhouse-deploy/badge/?version=latest :alt: ReadTheDocs Build Status (latest version) diff --git a/RELEASE.txt b/RELEASE.txt index 93b1b316e..2c502a2e5 100644 --- a/RELEASE.txt +++ b/RELEASE.txt @@ -1 +1 @@ -2.3.2 2024-05-27T13:26:27Z +2.3.3 2024-05-29T12:13:00Z diff --git a/birdhouse/components/canarie-api/docker_configuration.py.template b/birdhouse/components/canarie-api/docker_configuration.py.template index ff45b394f..43ea1079c 100644 --- a/birdhouse/components/canarie-api/docker_configuration.py.template +++ b/birdhouse/components/canarie-api/docker_configuration.py.template @@ -108,8 +108,8 @@ SERVICES = { # NOTE: # Below version and release time auto-managed by 'make VERSION=x.y.z bump'. # Do NOT modify it manually. See 'Tagging policy' in 'birdhouse/README.rst'. - 'version': '2.3.2', - 'releaseTime': '2024-05-27T13:26:27Z', + 'version': '2.3.3', + 'releaseTime': '2024-05-29T12:13:00Z', 'institution': '${SERVER_INSTITUTION}', 'researchSubject': '${SERVER_SUBJECT}', 'supportEmail': '${SUPPORT_EMAIL}', @@ -141,8 +141,8 @@ PLATFORMS = { # NOTE: # Below version and release time auto-managed by 'make VERSION=x.y.z bump'. # Do NOT modify it manually. See 'Tagging policy' in 'birdhouse/README.rst'. - 'version': '2.3.2', - 'releaseTime': '2024-05-27T13:26:27Z', + 'version': '2.3.3', + 'releaseTime': '2024-05-29T12:13:00Z', 'institution': '${SERVER_INSTITUTION}', 'researchSubject': '${SERVER_SUBJECT}', 'supportEmail': '${SUPPORT_EMAIL}', diff --git a/docs/source/conf.py b/docs/source/conf.py index 48c959fda..a2d993b6b 100644 --- a/docs/source/conf.py +++ b/docs/source/conf.py @@ -69,9 +69,9 @@ # built documents. # # The short X.Y version. -version = '2.3.2' +version = '2.3.3' # The full version, including alpha/beta/rc tags. -release = '2.3.2' +release = '2.3.3' # The language for content autogenerated by Sphinx. Refer to documentation # for a list of supported languages. From e502d127c2c3e37e2f5f8af995cff93f1ef43bf5 Mon Sep 17 00:00:00 2001 From: mishaschwartz <4380924+mishaschwartz@users.noreply.github.com> Date: Wed, 29 May 2024 08:14:38 -0400 Subject: [PATCH 3/3] fix CHANGES.md after merge --- CHANGES.md | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/CHANGES.md b/CHANGES.md index 4964e0903..b0050708a 100644 --- a/CHANGES.md +++ b/CHANGES.md @@ -20,7 +20,13 @@ [2.3.3](https://github.com/bird-house/birdhouse-deploy/tree/2.3.3) (2024-05-29) ------------------------------------------------------------------------------------------------------------------ -[//]: # (list changes here, using '-' for each new entry, remove this when items are added) +## Changes + +- Bump cadvisor version to the latest version: v0.49.1 + - See the cadvisor repo for all changes: https://github.com/google/cadvisor/compare/v0.36.0...v0.49.1 + - This updated was prompted by the fact that the previously installed version of cadvisor (v0.36.0) did not support + newer versions of docker. When deploying this repo with recent docker version, cadvisor was unable to discover or + monitor running containers. [2.3.2](https://github.com/bird-house/birdhouse-deploy/tree/2.3.2) (2024-05-27) ------------------------------------------------------------------------------------------------------------------ @@ -42,12 +48,6 @@ - `ALERTMANAGER_DOCKER` - Note that the defaults are the same as the previous hardcoded versions so this change is fully backwards compatible. -- Bump cadvisor version to the latest version: v0.49.1 - - See the cadvisor repo for all changes: https://github.com/google/cadvisor/compare/v0.36.0...v0.49.1 - - This updated was prompted by the fact that the previously installed version of cadvisor (v0.36.0) did not support - newer versions of docker. When deploying this repo with recent docker version, cadvisor was unable to discover or - monitor running containers. - [2.3.1](https://github.com/bird-house/birdhouse-deploy/tree/2.3.1) (2024-05-21) ------------------------------------------------------------------------------------------------------------------