From 5983f0b007bb2e0e54f8657b170768791ab03334 Mon Sep 17 00:00:00 2001 From: Nick Vigilante Date: Wed, 27 Sep 2023 15:54:01 -0400 Subject: [PATCH] Add site.release_info to Jekyll, retire config in _config_base.yml Fixes DOC-8924 --- src/current/_config_base.yml | 95 ------------------- src/current/_data/versions.csv | 30 +++--- .../v19.2/start-in-docker/mac-linux-steps.md | 2 +- .../v20.1/start-in-docker/mac-linux-steps.md | 2 +- src/current/_plugins/versions.rb | 1 + src/current/_plugins/versions/config.rb | 12 ++- src/current/_plugins/versions/generator.rb | 3 +- src/current/_plugins/versions/release_info.rb | 46 +++++++++ src/current/_plugins/versions/version.rb | 2 +- .../v1.0/demo-fault-tolerance-and-recovery.md | 4 +- src/current/v1.0/secure-a-cluster.md | 2 +- src/current/v1.0/start-a-local-cluster.md | 2 +- src/current/v1.0/start-a-node.md | 2 +- .../v1.1/demo-fault-tolerance-and-recovery.md | 4 +- src/current/v1.1/secure-a-cluster.md | 2 +- src/current/v1.1/start-a-local-cluster.md | 2 +- src/current/v1.1/start-a-node.md | 2 +- .../demo-fault-tolerance-and-recovery.md | 4 +- src/current/v19.1/start-a-node.md | 2 +- .../v19.2/cockroach-start-single-node.md | 2 +- src/current/v19.2/cockroach-start.md | 2 +- src/current/v19.2/secure-a-cluster.md | 2 +- src/current/v19.2/start-a-local-cluster.md | 2 +- .../v2.0/demo-fault-tolerance-and-recovery.md | 4 +- src/current/v2.0/secure-a-cluster.md | 2 +- src/current/v2.0/start-a-local-cluster.md | 2 +- src/current/v2.0/start-a-node.md | 2 +- .../v2.1/demo-fault-tolerance-and-recovery.md | 4 +- src/current/v2.1/start-a-node.md | 2 +- .../v20.1/cockroach-start-single-node.md | 2 +- src/current/v20.1/cockroach-start.md | 2 +- src/current/v20.1/secure-a-cluster.md | 2 +- src/current/v20.1/start-a-local-cluster.md | 2 +- 33 files changed, 103 insertions(+), 148 deletions(-) create mode 100644 src/current/_plugins/versions/release_info.rb diff --git a/src/current/_config_base.yml b/src/current/_config_base.yml index 5e4600568fb..df20c90b60c 100644 --- a/src/current/_config_base.yml +++ b/src/current/_config_base.yml @@ -70,101 +70,6 @@ plugins: - jekyll-last-modified-at - jekyll-minifier - jekyll-get-json -release_info: - v1.0: - build_time: 2018/02/13 15:13:51 (go1.8.3) - docker_image: cockroachdb/cockroach - name: v1.0.7 - start_time: 2017-02-13 13:33:22.046027038 -0400 EDT - version: v1.0.7 - v1.1: - build_time: 2018/10/01 14:48:26 (go1.8.3) - docker_image: cockroachdb/cockroach - name: v1.1.9 - start_time: 2018-10-01 15:10:52.34274101 +0000 UTC - version: v1.1.9 - v19.1: - build_time: 2020/07/07 14:48:26 (go1.11.6) - crdb_branch_name: release-19.1 - docker_image: cockroachdb/cockroach - name: v19.1.11 - start_time: 2020-07-07 15:10:52.34274101 +0000 UTC - version: v19.1.11 - v19.2: - build_time: 2021/01/19 11:00:26 (go1.12.12) - crdb_branch_name: release-19.2 - docker_image: cockroachdb/cockroach - name: v19.2.12 - start_time: 2021-01-19 11:01:26.34274101 +0000 UTC - version: v19.2.12 - v2.0: - build_time: 2018/12/10 14:48:26 (go1.10) - docker_image: cockroachdb/cockroach - name: v2.0.7 - start_time: 2018-12-10 15:10:52.34274101 +0000 UTC - version: v2.0.7 - v2.1: - build_time: 2019/01/29 14:48:26 (go1.10.3) - docker_image: cockroachdb/cockroach - name: v2.1.11 - start_time: 2019-01-29 15:10:52.34274101 +0000 UTC - version: v2.1.11 - v20.1: - build_time: 2021/05/17 11:00:26 (go1.13.4) - crdb_branch_name: release-20.1 - docker_image: cockroachdb/cockroach - name: v20.1.17 - start_time: 2021-05-17 11:01:26.34274101 +0000 UTC - version: v20.1.17 - v20.2: - build_time: 2022/02/09 11:00:26 (go1.13.4) - crdb_branch_name: release-20.2 - docker_image: cockroachdb/cockroach - name: v20.2.19 - start_time: 2022-02-09 11:01:26.34274101 +0000 UTC - version: v20.2.19 - v21.1: - build_time: 2022-09-15 00:00:00 (go1.17) - crdb_branch_name: release-21.1 - docker_image: cockroachdb/cockroach - name: v21.1.21 - start_time: 2022-09-14 12:48:52.570761 +0000 UTC - version: v21.1.21 - v21.2: - build_time: 2022-10-17 00:00:00 (go1.18) - crdb_branch_name: release-21.2 - docker_image: cockroachdb/cockroach - name: v21.2.17 - start_time: 2022-10-13 17:45:03.909127 +0000 UTC - version: v21.2.17 - v22.1: - build_time: 2023-08-14 00:00:00 (go1.19) - crdb_branch_name: release-22.1 - docker_image: cockroachdb/cockroach - name: v22.1.22 - start_time: 2023-08-11 12:11:37.108514 +0000 UTC - version: v22.1.22 - v22.2: - build_time: 2023-09-11 00:00:00 (go1.19) - crdb_branch_name: release-22.2 - docker_image: cockroachdb/cockroach - name: v22.2.14 - start_time: 2023-09-07 15:02:10.181670 +0000 UTC - version: v22.2.14 - v23.1: - build_time: 2023-09-18 00:00:00 (go1.20) - crdb_branch_name: release-23.1 - docker_image: cockroachdb/cockroach - name: v23.1.10 - start_time: 2023-09-18 11:34:06.638434 +0000 UTC - version: v23.1.10 - v23.2: - build_time: 2023-09-23 00:00:00 (go1.20) - crdb_branch_name: master - docker_image: cockroachdb/cockroach-unstable - name: v23.2.0-alpha1 - start_time: 2023-09-14 15:11:55.322342 +0000 UTC - version: v23.2.0-alpha1 sass: quiet_deps: 'true' sass_dir: css diff --git a/src/current/_data/versions.csv b/src/current/_data/versions.csv index 352b03561dc..e0889e83421 100644 --- a/src/current/_data/versions.csv +++ b/src/current/_data/versions.csv @@ -1,15 +1,15 @@ -major_version,release_date,maint_supp_exp_date,asst_supp_exp_date,previous_version -v1.0,2017-05-10,2018-05-10,2018-11-10,N/A -v1.1,2017-10-12,2018-10-12,2019-04-12,v1.0 -v2.0,2018-04-04,2019-04-04,2019-10-04,v1.1 -v2.1,2018-10-30,2019-10-30,2020-04-30,v2.0 -v19.1,2019-04-30,2020-04-30,2020-10-30,v2.1 -v19.2,2019-11-12,2020-11-12,2021-05-12,v19.1 -v20.1,2020-05-12,2021-05-12,2021-11-12,v19.2 -v20.2,2020-11-10,2021-11-10,2022-05-10,v20.1 -v21.1,2021-05-18,2022-05-18,2022-11-18,v20.2 -v21.2,2021-11-16,2022-11-16,2023-05-16,v21.1 -v22.1,2022-05-24,2023-05-24,2023-11-24,v21.2 -v22.2,2022-12-05,2023-12-05,2024-06-05,v22.1 -v23.1,2023-05-15,2024-05-15,2024-11-15,v22.2 -v23.2,N/A,N/A,N/A,v23.1 +major_version,release_date,maint_supp_exp_date,asst_supp_exp_date,previous_version,crdb_branch_name +v1.0,2017-05-10,2018-05-10,2018-11-10,N/A,release-1.0 +v1.1,2017-10-12,2018-10-12,2019-04-12,v1.0,release-1.1 +v2.0,2018-04-04,2019-04-04,2019-10-04,v1.1,release-2.0 +v2.1,2018-10-30,2019-10-30,2020-04-30,v2.0,release-2.1 +v19.1,2019-04-30,2020-04-30,2020-10-30,v2.1,release-19.1 +v19.2,2019-11-12,2020-11-12,2021-05-12,v19.1,release-19.2 +v20.1,2020-05-12,2021-05-12,2021-11-12,v19.2,release-20.1 +v20.2,2020-11-10,2021-11-10,2022-05-10,v20.1,release-20.2 +v21.1,2021-05-18,2022-05-18,2022-11-18,v20.2,release-21.1 +v21.2,2021-11-16,2022-11-16,2023-05-16,v21.1,release-21.2 +v22.1,2022-05-24,2023-05-24,2023-11-24,v21.2,release-22.1 +v22.2,2022-12-05,2023-12-05,2024-06-05,v22.1,release-22.2 +v23.1,2023-05-15,2024-05-15,2024-11-15,v22.2,release-23.1 +v23.2,N/A,N/A,N/A,v23.1,master diff --git a/src/current/_includes/v19.2/start-in-docker/mac-linux-steps.md b/src/current/_includes/v19.2/start-in-docker/mac-linux-steps.md index cf9b857842f..c75980f7874 100644 --- a/src/current/_includes/v19.2/start-in-docker/mac-linux-steps.md +++ b/src/current/_includes/v19.2/start-in-docker/mac-linux-steps.md @@ -102,7 +102,7 @@ We've used `roachnet` as the network name here and in subsequent steps, but feel The output will look something like this: ~~~ - CockroachDB node starting at {{page.release_info.start_time}} + CockroachDB node starting at {{ now | date: "%Y-%m-%d %H:%M:%S.%6 +0000 UTC" }} build: CCL {{page.release_info.version}} @ {{page.release_info.build_time}} (go1.12.6) webui: http://roach1:8080 sql: postgresql://root@roach1:26257?sslmode=disable diff --git a/src/current/_includes/v20.1/start-in-docker/mac-linux-steps.md b/src/current/_includes/v20.1/start-in-docker/mac-linux-steps.md index ec73bea4cd1..733df273ef5 100644 --- a/src/current/_includes/v20.1/start-in-docker/mac-linux-steps.md +++ b/src/current/_includes/v20.1/start-in-docker/mac-linux-steps.md @@ -102,7 +102,7 @@ We've used `roachnet` as the network name here and in subsequent steps, but feel The output will look something like this: ~~~ - CockroachDB node starting at {{page.release_info.start_time}} + CockroachDB node starting at {{ now | date: "%Y-%m-%d %H:%M:%S.%6 +0000 UTC" }} build: CCL {{page.release_info.version}} @ {{page.release_info.build_time}} (go1.12.6) webui: http://roach1:8080 sql: postgresql://root@roach1:26257?sslmode=disable diff --git a/src/current/_plugins/versions.rb b/src/current/_plugins/versions.rb index 53e3c3a7a2e..d6ab82614a1 100644 --- a/src/current/_plugins/versions.rb +++ b/src/current/_plugins/versions.rb @@ -33,6 +33,7 @@ require_relative 'versions/version' require_relative 'versions/versioned_page' require_relative 'versions/generator' +require_relative 'versions/release_info' # Silence annoying "directory is already being watched" warning due to harmless # symlink usage. diff --git a/src/current/_plugins/versions/config.rb b/src/current/_plugins/versions/config.rb index 890c42357f1..2774dd4fa0e 100644 --- a/src/current/_plugins/versions/config.rb +++ b/src/current/_plugins/versions/config.rb @@ -2,16 +2,18 @@ module JekyllVersions class Config attr_reader :versions, :release_info, :cockroachcloud - def initialize(config) - ['versions', 'release_info'].each do |key| + def initialize(config, site) + all_versions = site.config['release_info']&.keys || [] + + ['versions'].each do |key| raise "Config missing `#{key}` key" if config[key].nil? end raise "Config missing `versions.stable` key" if config['versions']['stable'].nil? - config['versions'].each do |_, v| - raise "Config missing `release_info.#{v}` key" if config['release_info'][v].nil? + all_versions.each do |version| + raise "Config missing `release_info.#{version}` key" if site.config['release_info'][version].nil? end @versions = config['versions'] - @release_info = config['release_info'] + @release_info = site.config['release_info'] @cockroachcloud = !!config['cockroachcloud'] end diff --git a/src/current/_plugins/versions/generator.rb b/src/current/_plugins/versions/generator.rb index cab46dd91d6..a52cbfe1f9b 100644 --- a/src/current/_plugins/versions/generator.rb +++ b/src/current/_plugins/versions/generator.rb @@ -6,10 +6,11 @@ class JekyllGenerator < Jekyll::Generator priority :lowest def initialize(config) - @config = Config.new(config) + @jekyll_config = config end def generate(site) + @config = Config.new(@jekyll_config, site) Generator.new(@config, site).generate end end diff --git a/src/current/_plugins/versions/release_info.rb b/src/current/_plugins/versions/release_info.rb new file mode 100644 index 00000000000..5308f6c21d1 --- /dev/null +++ b/src/current/_plugins/versions/release_info.rb @@ -0,0 +1,46 @@ +require 'csv' +require 'yaml' + +module Jekyll + class ReleaseInfoGenerator < Jekyll::Generator + safe true + priority -100 # Making sure it runs first + + def generate(site) + # Step 1: Determine the parent directory of the current site + parent_dir = File.expand_path('..', site.source) + + # Step 2: Construct the paths to versions.csv and releases.yml + versions_path = File.join(parent_dir, "current/_data/versions.csv") + releases_path = File.join(parent_dir, "current/_data/releases.yml") + + # Load versions and releases data + versions_data = CSV.read(versions_path, headers: true) + releases_data = YAML.load_file(releases_path) + + # Process the data + release_info = {} + versions_data.each do |version| + major_version = version['major_version'] + relevant_releases = releases_data.select { |release| release['major_version'] == major_version } + latest_release = relevant_releases.max_by { |release| Date.parse(release['release_date']) } + + # Populate release info + release_info[major_version] = { + "version" => latest_release['release_name'], + "release_name" => latest_release['release_name'], + "major_version" => major_version, + "build_time" => "#{latest_release['release_date']} 00:00:00", + "go_version" => latest_release['go_version'], + "docker_image" => latest_release['docker']['docker_image'], + "release_type" => latest_release['release_type'], + "crdb_branch_name" => version['crdb_branch_name'], + "all_releases" => relevant_releases + } + end + + # Add the data to site object + site.config['release_info'] = release_info + end + end +end diff --git a/src/current/_plugins/versions/version.rb b/src/current/_plugins/versions/version.rb index f130a8d7c53..1c1d4b86087 100644 --- a/src/current/_plugins/versions/version.rb +++ b/src/current/_plugins/versions/version.rb @@ -18,7 +18,7 @@ def initialize(config, v) end def name - if @config.release_info[version] && (name = @config.release_info[version]['name']) + if @config.release_info[version] && (name = @config.release_info[version]['release_name']) name else version diff --git a/src/current/v1.0/demo-fault-tolerance-and-recovery.md b/src/current/v1.0/demo-fault-tolerance-and-recovery.md index 8aaf7ab8d46..2cb9be46540 100644 --- a/src/current/v1.0/demo-fault-tolerance-and-recovery.md +++ b/src/current/v1.0/demo-fault-tolerance-and-recovery.md @@ -222,7 +222,7 @@ $ cockroach start --insecure \ ~~~ ~~~ -CockroachDB node starting at {{page.release_info.start_time}} +CockroachDB node starting at {{ now | date: "%Y-%m-%d %H:%M:%S.%6 +0000 UTC" }} build: CCL {{page.release_info.version}} @ {{page.release_info.build_time}} admin: http://localhost:8081 sql: postgresql://root@localhost:26258?sslmode=disable @@ -288,7 +288,7 @@ $ cockroach start --insecure \ ~~~ ~~~ -CockroachDB node starting at {{page.release_info.start_time}} +CockroachDB node starting at {{ now | date: "%Y-%m-%d %H:%M:%S.%6 +0000 UTC" }} build: CCL {{page.release_info.version}} @ {{page.release_info.build_time}} admin: http://localhost:8083 sql: postgresql://root@localhost:26260?sslmode=disable diff --git a/src/current/v1.0/secure-a-cluster.md b/src/current/v1.0/secure-a-cluster.md index 8d848b61fc7..1a29463d508 100644 --- a/src/current/v1.0/secure-a-cluster.md +++ b/src/current/v1.0/secure-a-cluster.md @@ -60,7 +60,7 @@ $ cockroach start \ ~~~ ~~~ -CockroachDB node starting at {{page.release_info.start_time}} +CockroachDB node starting at {{ now | date: "%Y-%m-%d %H:%M:%S.%6 +0000 UTC" }} build: CCL {{page.release_info.version}} @ {{page.release_info.build_time}} admin: https://ROACHs-MBP:8080 sql: postgresql://root@ROACHs-MBP:26257?sslcert=%2FUsers%2F... diff --git a/src/current/v1.0/start-a-local-cluster.md b/src/current/v1.0/start-a-local-cluster.md index ca911a2209f..572057b0d12 100644 --- a/src/current/v1.0/start-a-local-cluster.md +++ b/src/current/v1.0/start-a-local-cluster.md @@ -28,7 +28,7 @@ $ cockroach start --insecure \ ~~~ ~~~ -CockroachDB node starting at {{page.release_info.start_time}} +CockroachDB node starting at {{ now | date: "%Y-%m-%d %H:%M:%S.%6 +0000 UTC" }} build: CCL {{page.release_info.version}} @ {{page.release_info.build_time}} admin: http://localhost:8080 sql: postgresql://root@localhost:26257?sslmode=disable diff --git a/src/current/v1.0/start-a-node.md b/src/current/v1.0/start-a-node.md index 4dcf3571c2f..1a42c4e22a6 100644 --- a/src/current/v1.0/start-a-node.md +++ b/src/current/v1.0/start-a-node.md @@ -89,7 +89,7 @@ Field | Description When you run `cockroach start`, some helpful details are printed to the standard output: ~~~ shell -CockroachDB node starting at {{page.release_info.start_time}} +CockroachDB node starting at {{ now | date: "%Y-%m-%d %H:%M:%S.%6 +0000 UTC" }} build: CCL {{page.release_info.version}} @ {{page.release_info.build_time}} admin: http://ROACHs-MBP:8080 sql: postgresql://root@ROACHs-MBP:26257?sslmode=disable diff --git a/src/current/v1.1/demo-fault-tolerance-and-recovery.md b/src/current/v1.1/demo-fault-tolerance-and-recovery.md index 3f85d614268..f8b29177beb 100644 --- a/src/current/v1.1/demo-fault-tolerance-and-recovery.md +++ b/src/current/v1.1/demo-fault-tolerance-and-recovery.md @@ -252,7 +252,7 @@ $ cockroach start --insecure \ ~~~ ~~~ -CockroachDB node starting at {{page.release_info.start_time}} +CockroachDB node starting at {{ now | date: "%Y-%m-%d %H:%M:%S.%6 +0000 UTC" }} build: CCL {{page.release_info.version}} @ {{page.release_info.build_time}} admin: http://localhost:8081 sql: postgresql://root@localhost:26258?sslmode=disable @@ -319,7 +319,7 @@ $ cockroach start \ ~~~ ~~~ -CockroachDB node starting at {{page.release_info.start_time}} +CockroachDB node starting at {{ now | date: "%Y-%m-%d %H:%M:%S.%6 +0000 UTC" }} build: CCL {{page.release_info.version}} @ {{page.release_info.build_time}} admin: http://localhost:8083 sql: postgresql://root@localhost:26260?sslmode=disable diff --git a/src/current/v1.1/secure-a-cluster.md b/src/current/v1.1/secure-a-cluster.md index c6063908f32..3fb69cb56ce 100644 --- a/src/current/v1.1/secure-a-cluster.md +++ b/src/current/v1.1/secure-a-cluster.md @@ -62,7 +62,7 @@ $ cockroach start \ ~~~ ~~~ -CockroachDB node starting at {{page.release_info.start_time}} +CockroachDB node starting at {{ now | date: "%Y-%m-%d %H:%M:%S.%6 +0000 UTC" }} build: CCL {{page.release_info.version}} @ {{page.release_info.build_time}} admin: https://ROACHs-MBP:8080 sql: postgresql://root@ROACHs-MBP:26257?sslcert=%2FUsers%2F... diff --git a/src/current/v1.1/start-a-local-cluster.md b/src/current/v1.1/start-a-local-cluster.md index 2268c49b53b..44f4652b98b 100644 --- a/src/current/v1.1/start-a-local-cluster.md +++ b/src/current/v1.1/start-a-local-cluster.md @@ -28,7 +28,7 @@ $ cockroach start --insecure \ ~~~ ~~~ -CockroachDB node starting at {{page.release_info.start_time}} +CockroachDB node starting at {{ now | date: "%Y-%m-%d %H:%M:%S.%6 +0000 UTC" }} build: CCL {{page.release_info.version}} @ {{page.release_info.build_time}} admin: http://localhost:8080 sql: postgresql://root@localhost:26257?sslmode=disable diff --git a/src/current/v1.1/start-a-node.md b/src/current/v1.1/start-a-node.md index 360bb48cfea..3edaa9dfa9c 100644 --- a/src/current/v1.1/start-a-node.md +++ b/src/current/v1.1/start-a-node.md @@ -94,7 +94,7 @@ Field | Description When you run `cockroach start`, some helpful details are printed to the standard output: ~~~ shell -CockroachDB node starting at {{page.release_info.start_time}} +CockroachDB node starting at {{ now | date: "%Y-%m-%d %H:%M:%S.%6 +0000 UTC" }} build: CCL {{page.release_info.version}} @ {{page.release_info.build_time}} admin: http://ROACHs-MBP:8080 sql: postgresql://root@ROACHs-MBP:26257?sslmode=disable diff --git a/src/current/v19.1/demo-fault-tolerance-and-recovery.md b/src/current/v19.1/demo-fault-tolerance-and-recovery.md index 12f9cecab08..a70d3c493a6 100644 --- a/src/current/v19.1/demo-fault-tolerance-and-recovery.md +++ b/src/current/v19.1/demo-fault-tolerance-and-recovery.md @@ -226,7 +226,7 @@ $ cockroach start --insecure \ ~~~ ~~~ -CockroachDB node starting at {{page.release_info.start_time}} +CockroachDB node starting at {{ now | date: "%Y-%m-%d %H:%M:%S.%6 +0000 UTC" }} build: CCL {{page.release_info.version}} @ {{page.release_info.build_time}} admin: http://localhost:8081 sql: postgresql://root@localhost:26258?sslmode=disable @@ -294,7 +294,7 @@ $ cockroach start \ ~~~ ~~~ -CockroachDB node starting at {{page.release_info.start_time}} +CockroachDB node starting at {{ now | date: "%Y-%m-%d %H:%M:%S.%6 +0000 UTC" }} build: CCL {{page.release_info.version}} @ {{page.release_info.build_time}} admin: http://localhost:8083 sql: postgresql://root@localhost:26260?sslmode=disable diff --git a/src/current/v19.1/start-a-node.md b/src/current/v19.1/start-a-node.md index 905c192e9f6..4a4c85e7e88 100644 --- a/src/current/v19.1/start-a-node.md +++ b/src/current/v19.1/start-a-node.md @@ -152,7 +152,7 @@ This means, by default, CockroachDB writes all messages to log files, and never When you run `cockroach start`, some helpful details are printed to the standard output: ~~~ shell -CockroachDB node starting at {{page.release_info.start_time}} +CockroachDB node starting at {{ now | date: "%Y-%m-%d %H:%M:%S.%6 +0000 UTC" }} build: CCL {{page.release_info.version}} @ {{page.release_info.build_time}} webui: http://localhost:8080 sql: postgresql://root@localhost:26257?sslmode=disable diff --git a/src/current/v19.2/cockroach-start-single-node.md b/src/current/v19.2/cockroach-start-single-node.md index d9e47de709c..c89f79580a3 100644 --- a/src/current/v19.2/cockroach-start-single-node.md +++ b/src/current/v19.2/cockroach-start-single-node.md @@ -100,7 +100,7 @@ This means, by default, CockroachDB writes all messages to log files, and never When you run `cockroach start-single-node`, some helpful details are printed to the standard output: ~~~ shell -CockroachDB node starting at {{page.release_info.start_time}} +CockroachDB node starting at {{ now | date: "%Y-%m-%d %H:%M:%S.%6 +0000 UTC" }} build: CCL {{page.release_info.version}} @ {{page.release_info.build_time}} (go1.12.6) webui: http://localhost:8080 sql: postgresql://root@localhost:26257?sslmode=disable diff --git a/src/current/v19.2/cockroach-start.md b/src/current/v19.2/cockroach-start.md index ed4157afa40..64f61f1ba3f 100644 --- a/src/current/v19.2/cockroach-start.md +++ b/src/current/v19.2/cockroach-start.md @@ -147,7 +147,7 @@ This means, by default, CockroachDB writes all messages to log files, and never When you run `cockroach start`, some helpful details are printed to the standard output: ~~~ shell -CockroachDB node starting at {{page.release_info.start_time}} +CockroachDB node starting at {{ now | date: "%Y-%m-%d %H:%M:%S.%6 +0000 UTC" }} build: CCL {{page.release_info.version}} @ {{page.release_info.build_time}} (go1.12.6) webui: http://localhost:8080 sql: postgresql://root@localhost:26257?sslmode=disable diff --git a/src/current/v19.2/secure-a-cluster.md b/src/current/v19.2/secure-a-cluster.md index 40ebbf0429d..1a4b1c620b3 100644 --- a/src/current/v19.2/secure-a-cluster.md +++ b/src/current/v19.2/secure-a-cluster.md @@ -152,7 +152,7 @@ You can use either [`cockroach cert`](cockroach-cert.html) commands or [`openssl The output will look something like this: ~~~ - CockroachDB node starting at {{page.release_info.start_time}} + CockroachDB node starting at {{ now | date: "%Y-%m-%d %H:%M:%S.%6 +0000 UTC" }} build: CCL {{page.release_info.version}} @ {{page.release_info.build_time}} (go1.12.6) webui: https://localhost:8080 sql: postgresql://root@localhost:26257?sslcert=certs%2Fclient.root.crt&sslkey=certs%2Fclient.root.key&sslmode=verify-full&sslrootcert=certs%2Fca.crt diff --git a/src/current/v19.2/start-a-local-cluster.md b/src/current/v19.2/start-a-local-cluster.md index 923a94a8cbf..a9d1f74353f 100644 --- a/src/current/v19.2/start-a-local-cluster.md +++ b/src/current/v19.2/start-a-local-cluster.md @@ -115,7 +115,7 @@ Running multiple nodes on a single host is useful for testing CockroachDB, but i The output will look something like this: ~~~ - CockroachDB node starting at {{page.release_info.start_time}} + CockroachDB node starting at {{ now | date: "%Y-%m-%d %H:%M:%S.%6 +0000 UTC" }} build: CCL {{page.release_info.version}} @ {{page.release_info.build_time}} (go1.12.6) webui: http://localhost:8080 sql: postgresql://root@localhost:26257?sslmode=disable diff --git a/src/current/v2.0/demo-fault-tolerance-and-recovery.md b/src/current/v2.0/demo-fault-tolerance-and-recovery.md index 416ecc3a797..ca8adc08d8b 100644 --- a/src/current/v2.0/demo-fault-tolerance-and-recovery.md +++ b/src/current/v2.0/demo-fault-tolerance-and-recovery.md @@ -244,7 +244,7 @@ $ cockroach start --insecure \ ~~~ ~~~ -CockroachDB node starting at {{page.release_info.start_time}} +CockroachDB node starting at {{ now | date: "%Y-%m-%d %H:%M:%S.%6 +0000 UTC" }} build: CCL {{page.release_info.version}} @ {{page.release_info.build_time}} admin: http://localhost:8081 sql: postgresql://root@localhost:26258?sslmode=disable @@ -311,7 +311,7 @@ $ cockroach start \ ~~~ ~~~ -CockroachDB node starting at {{page.release_info.start_time}} +CockroachDB node starting at {{ now | date: "%Y-%m-%d %H:%M:%S.%6 +0000 UTC" }} build: CCL {{page.release_info.version}} @ {{page.release_info.build_time}} admin: http://localhost:8083 sql: postgresql://root@localhost:26260?sslmode=disable diff --git a/src/current/v2.0/secure-a-cluster.md b/src/current/v2.0/secure-a-cluster.md index 9416eab14af..a0b4bf3e96e 100644 --- a/src/current/v2.0/secure-a-cluster.md +++ b/src/current/v2.0/secure-a-cluster.md @@ -77,7 +77,7 @@ $ cockroach start \ ~~~ ~~~ -CockroachDB node starting at {{page.release_info.start_time}} +CockroachDB node starting at {{ now | date: "%Y-%m-%d %H:%M:%S.%6 +0000 UTC" }} build: CCL {{page.release_info.version}} @ {{page.release_info.build_time}} admin: https://ROACHs-MBP:8080 sql: postgresql://root@ROACHs-MBP:26257?sslcert=%2FUsers%2F... diff --git a/src/current/v2.0/start-a-local-cluster.md b/src/current/v2.0/start-a-local-cluster.md index ddd5b4f291c..3463a64130d 100644 --- a/src/current/v2.0/start-a-local-cluster.md +++ b/src/current/v2.0/start-a-local-cluster.md @@ -28,7 +28,7 @@ $ cockroach start --insecure \ ~~~ ~~~ -CockroachDB node starting at {{page.release_info.start_time}} +CockroachDB node starting at {{ now | date: "%Y-%m-%d %H:%M:%S.%6 +0000 UTC" }} build: CCL {{page.release_info.version}} @ {{page.release_info.build_time}} admin: http://localhost:8080 sql: postgresql://root@localhost:26257?sslmode=disable diff --git a/src/current/v2.0/start-a-node.md b/src/current/v2.0/start-a-node.md index 38a4513ee19..9f112266a21 100644 --- a/src/current/v2.0/start-a-node.md +++ b/src/current/v2.0/start-a-node.md @@ -119,7 +119,7 @@ This means, by default, CockroachDB writes all messages to log files, and never When you run `cockroach start`, some helpful details are printed to the standard output: ~~~ shell -CockroachDB node starting at {{page.release_info.start_time}} +CockroachDB node starting at {{ now | date: "%Y-%m-%d %H:%M:%S.%6 +0000 UTC" }} build: CCL {{page.release_info.version}} @ {{page.release_info.build_time}} admin: http://ROACHs-MBP:8080 sql: postgresql://root@ROACHs-MBP:26257?sslmode=disable diff --git a/src/current/v2.1/demo-fault-tolerance-and-recovery.md b/src/current/v2.1/demo-fault-tolerance-and-recovery.md index 5c5c072a200..76e146f9701 100644 --- a/src/current/v2.1/demo-fault-tolerance-and-recovery.md +++ b/src/current/v2.1/demo-fault-tolerance-and-recovery.md @@ -226,7 +226,7 @@ $ cockroach start --insecure \ ~~~ ~~~ -CockroachDB node starting at {{page.release_info.start_time}} +CockroachDB node starting at {{ now | date: "%Y-%m-%d %H:%M:%S.%6 +0000 UTC" }} build: CCL {{page.release_info.version}} @ {{page.release_info.build_time}} admin: http://localhost:8081 sql: postgresql://root@localhost:26258?sslmode=disable @@ -294,7 +294,7 @@ $ cockroach start \ ~~~ ~~~ -CockroachDB node starting at {{page.release_info.start_time}} +CockroachDB node starting at {{ now | date: "%Y-%m-%d %H:%M:%S.%6 +0000 UTC" }} build: CCL {{page.release_info.version}} @ {{page.release_info.build_time}} admin: http://localhost:8083 sql: postgresql://root@localhost:26260?sslmode=disable diff --git a/src/current/v2.1/start-a-node.md b/src/current/v2.1/start-a-node.md index 3aa760b7473..380abbdf7ca 100644 --- a/src/current/v2.1/start-a-node.md +++ b/src/current/v2.1/start-a-node.md @@ -137,7 +137,7 @@ This means, by default, CockroachDB writes all messages to log files, and never When you run `cockroach start`, some helpful details are printed to the standard output: ~~~ shell -CockroachDB node starting at {{page.release_info.start_time}} +CockroachDB node starting at {{ now | date: "%Y-%m-%d %H:%M:%S.%6 +0000 UTC" }} build: CCL {{page.release_info.version}} @ {{page.release_info.build_time}} webui: http://localhost:8080 sql: postgresql://root@localhost:26257?sslmode=disable diff --git a/src/current/v20.1/cockroach-start-single-node.md b/src/current/v20.1/cockroach-start-single-node.md index 64fcd252512..fd4df5375fc 100644 --- a/src/current/v20.1/cockroach-start-single-node.md +++ b/src/current/v20.1/cockroach-start-single-node.md @@ -102,7 +102,7 @@ This means, by default, CockroachDB writes all messages to log files, and never When you run `cockroach start-single-node`, some helpful details are printed to the standard output: ~~~ shell -CockroachDB node starting at {{page.release_info.start_time}} +CockroachDB node starting at {{ now | date: "%Y-%m-%d %H:%M:%S.%6 +0000 UTC" }} build: CCL {{page.release_info.version}} @ {{page.release_info.build_time}} (go1.12.6) webui: http://localhost:8080 sql: postgresql://root@localhost:26257?sslmode=disable diff --git a/src/current/v20.1/cockroach-start.md b/src/current/v20.1/cockroach-start.md index 58c50f77e96..a965a537efc 100644 --- a/src/current/v20.1/cockroach-start.md +++ b/src/current/v20.1/cockroach-start.md @@ -167,7 +167,7 @@ This means, by default, CockroachDB writes all messages to log files, and never When you run `cockroach start`, some helpful details are printed to the standard output: ~~~ shell -CockroachDB node starting at {{page.release_info.start_time}} +CockroachDB node starting at {{ now | date: "%Y-%m-%d %H:%M:%S.%6 +0000 UTC" }} build: CCL {{page.release_info.version}} @ {{page.release_info.build_time}} (go1.12.6) webui: http://localhost:8080 sql: postgresql://root@localhost:26257?sslmode=disable diff --git a/src/current/v20.1/secure-a-cluster.md b/src/current/v20.1/secure-a-cluster.md index 0ca04e1a257..650ebee1b95 100644 --- a/src/current/v20.1/secure-a-cluster.md +++ b/src/current/v20.1/secure-a-cluster.md @@ -151,7 +151,7 @@ You can use either [`cockroach cert`](cockroach-cert.html) commands or [`openssl The output will look something like this: ~~~ - CockroachDB node starting at {{page.release_info.start_time}} + CockroachDB node starting at {{ now | date: "%Y-%m-%d %H:%M:%S.%6 +0000 UTC" }} build: CCL {{page.release_info.version}} @ {{page.release_info.build_time}} (go1.12.6) webui: https://localhost:8080 sql: postgresql://root@localhost:26257?sslcert=certs%2Fclient.root.crt&sslkey=certs%2Fclient.root.key&sslmode=verify-full&sslrootcert=certs%2Fca.crt diff --git a/src/current/v20.1/start-a-local-cluster.md b/src/current/v20.1/start-a-local-cluster.md index 27ee7bda99a..513b3504075 100644 --- a/src/current/v20.1/start-a-local-cluster.md +++ b/src/current/v20.1/start-a-local-cluster.md @@ -114,7 +114,7 @@ Once you've [installed CockroachDB](install-cockroachdb.html), it's simple to ru The output will look something like this: ~~~ - CockroachDB node starting at {{page.release_info.start_time}} + CockroachDB node starting at {{ now | date: "%Y-%m-%d %H:%M:%S.%6 +0000 UTC" }} build: CCL {{page.release_info.version}} @ {{page.release_info.build_time}} (go1.12.6) webui: http://localhost:8080 sql: postgresql://root@localhost:26257?sslmode=disable