diff --git a/puppet/zulip/files/postgresql/pg_backup_and_purge b/puppet/zulip/files/postgresql/pg_backup_and_purge index f4a036edd9..c3800bcfcc 100755 --- a/puppet/zulip/files/postgresql/pg_backup_and_purge +++ b/puppet/zulip/files/postgresql/pg_backup_and_purge @@ -67,7 +67,7 @@ backups = {} lines = subprocess.check_output(["env-wal-g", "backup-list"], text=True).split("\n") for line in lines[1:]: if line: - backup_name, date_str, _ = line.split() + backup_name, date_str = line.split()[0:2] backups[dateutil.parser.parse(date_str)] = backup_name one_month_ago = now - timedelta(days=30) diff --git a/puppet/zulip/manifests/common.pp b/puppet/zulip/manifests/common.pp index c6d2ab9938..91da157120 100644 --- a/puppet/zulip/manifests/common.pp +++ b/puppet/zulip/manifests/common.pp @@ -50,36 +50,36 @@ class zulip::common { $versions = { # https://github.com/cactus/go-camo/releases 'go-camo' => { - 'version' => '2.4.7', - 'goversion' => '1214', + 'version' => '2.4.11', + 'goversion' => '1222', 'sha256' => { - 'amd64' => '88742017c92ec71f386c343331b97ffe6fd14098d876cd902f86cfec2e47bb8a', - 'aarch64' => '85d5d0a13c50597a2f78c114fa5082417d2add385a90b175a076e49bf541e722', + 'amd64' => '41e21cc37bdfeef97f42a1cbf5c4730b148bd09aacaeb46d1634e8b931917853', + 'aarch64' => 'ff1e3f40abf24b92a0f9094a8e31cb499994889ab9be7e9431fa07158784e46e', }, }, # https://go.dev/dl/ 'golang' => { - 'version' => '1.21.5', + 'version' => '1.22.2', 'sha256' => { - 'amd64' => 'e2bc0b3e4b64111ec117295c088bde5f00eeed1567999ff77bc859d7df70078e', - 'aarch64' => '841cced7ecda9b2014f139f5bab5ae31785f35399f236b8b3e75dff2a2978d96', + 'amd64' => '5901c52b7a78002aeff14a21f93e0f064f74ce1360fce51c6ee68cd471216a17', + 'aarch64' => '36e720b2d564980c162a48c7e97da2e407dfcc4239e1e58d98082dfa2486a0c1', }, }, # https://github.com/stripe/smokescreen/tags 'smokescreen-src' => { - 'version' => '8c0fa26edf63f35d5632ba7682d78ff07a306819', + 'version' => '065ad0e4c5495caa7d0c979a7bb229da240cc3f8', # Source code, so arch-invariant sha256 - 'sha256' => '496cddca7081671806ca7a8820db6f664ae8e491b3a9828d2dc9af12cda052e4', + 'sha256' => '2ca4fb5ccc9fd9c6942eaa5b405099925e03e46ffbc711b76d72ec621d052663', }, # https://github.com/wal-g/wal-g/releases 'wal-g' => { - 'version' => '2.0.1', + 'version' => '3.0.0', 'sha256' => { - 'amd64' => '2640cb9110e802bf971efdc9b7a35515af7757e06693bf5c81bd4915d8d42b9c', - 'aarch64' => '9782bd6f4f08ec26d0f2f5f8fd8f9531e4fe39f14ef5f764cbec08e93da2bbcc', + 'amd64' => '430de92c8b76cade37e2f849394b761841278fb5e3a3992af3aa15c123163163', + 'aarch64' => '2223b18d62cfba32ad037ffbe515c365bd627a61f7051dd77340fc5d9e873bc6', }, }, @@ -97,19 +97,19 @@ class zulip::common { # https://release-registry.services.sentry.io/apps/sentry-cli/latest 'sentry-cli' => { - 'version' => '2.23.0', + 'version' => '2.31.0', 'sha256' => { - 'amd64' => '23d3fdb2e797a1f49917b13cd040874f6189aff3f24d56d3fb81d74c1f368372', - 'aarch64' => '66d0b504d983ff2f7b5f60ebf5b3c933ba8a93c2a608f759863fd2b446b344fd', + 'amd64' => 'baeb5b4ca0a5e500d667087f0b7fbb2865d3b8f01896cfba5144433dbe59bebd', + 'aarch64' => '2b92198d58ffd2f4551db6782b42b42ecc1ba3c7c7864f0c4ae84be940f927d3', }, }, # https://grafana.com/grafana/download?edition=oss 'grafana' => { - 'version' => '10.2.2', + 'version' => '10.4.2', 'sha256' => { - 'amd64' => '32dd2c8b94f1917190a79be6543dfb7e5dd6297bae21c24db624dc1180aba19f', - 'aarch64' => '96770f3f9bdfc662e0dbe57fbbb09206817935bca0e38755f942e0f65259e8c7', + 'amd64' => 'b12b55d4ea266fa298395c82d5f8372f544b386efab28e9d96ebc887aef37560', + 'aarch64' => '9ccd91189b540a1e8cde5028136609aa8ad4dd7332e670cb431d1e3fa28d90a4', }, }, @@ -148,19 +148,19 @@ class zulip::common { # https://prometheus.io/download/#prometheus 'prometheus' => { - 'version' => '2.48.0', + 'version' => '2.51.1', 'sha256' => { - 'amd64' => '5871ca9e01ae35bb7ab7a129a845a7a80f0e1453f00f776ac564dd41ff4d754e', - 'aarch64' => 'c6e85f7b4fd0785df48266c1ee53975f862996a99b7d96520dc730e65da7bcf6', + 'amd64' => '1f933ea7515e3a6e60374ee0bfdb62bc4701c7b12c1dbafe1865c327c6e0e7d2', + 'aarch64' => 'f281f674f2e7fb726a6066585197780f63bce8455a1773ec498b5be0c8732eb5', }, }, # https://github.com/oliver006/redis_exporter/releases 'redis_exporter' => { - 'version' => '1.55.0', + 'version' => '1.58.0', 'sha256' => { - 'amd64' => '9c0012dff5c0008f07ae126a6db81789e0f93a259c99889485cef9ea33edc585', - 'aarch64' => '938b774f60b677f72108c2246ebfda23fe803f1c158ff23e049c2c2a7b52937b', + 'amd64' => '6e7889e7e40c628c665c7c0e001c7f20ecefef5a254a714b748293adbb9d104e', + 'aarch64' => '4658746c9891359f4f5b369d643e120e24dcd61fb555c9742b831f1dc9d578e6', }, }, @@ -175,10 +175,10 @@ class zulip::common { # https://vector.dev/download/ 'vector' => { - 'version' => '0.34.1', + 'version' => '0.37.1', 'sha256' => { - 'amd64' => '81a8bba16c58f2d31a80c5b5c7975ad74ff108c8ca835ad3df4ad0afe165d154', - 'aarch64' => '93291615d72f906a69660ef1a80db8fa5db55f7905cc0c85fb8443dbab5f2e3b', + 'amd64' => '5cce336aa2b4f1666148b902a1fdc2d6e7c938265315051d35cc20da11f61873', + 'aarch64' => 'ea3cad95532f30854ea013409044adbf3911ece23f1af5472958e99f122fb9f5', }, }, } diff --git a/puppet/zulip/manifests/wal_g.pp b/puppet/zulip/manifests/wal_g.pp index 07556d22d4..671ea2155f 100644 --- a/puppet/zulip/manifests/wal_g.pp +++ b/puppet/zulip/manifests/wal_g.pp @@ -4,7 +4,12 @@ class zulip::wal_g { $wal_g_version = $zulip::common::versions['wal-g']['version'] $bin = "/srv/zulip-wal-g-${wal_g_version}" - $package = "wal-g-pg-ubuntu-20.04-${zulip::common::goarch}" + # For unfathomable reasons, the amd64 and aarch64 builds have slightly different shaped URLs + if $zulip::common::goarch == 'amd64' { + $package = "wal-g-pg-ubuntu-20.04-${zulip::common::goarch}" + } else { + $package = "wal-g-pg-ubuntu20.04-${zulip::common::goarch}" + } # This tarball contains only a single file, which is extracted as $bin zulip::external_dep { 'wal-g': version => $wal_g_version,