From a832ae66f878f8a36314d8f75864823862667c3d Mon Sep 17 00:00:00 2001 From: Benjamin Naecker Date: Thu, 8 Aug 2024 18:20:22 +0000 Subject: [PATCH] Update Dendrite to use new timeseries, expunge the old --- .../replicated/9/timeseries-to-delete.txt | 47 +++++++++++++++++++ .../single-node/9/timeseries-to-delete.txt | 47 +++++++++++++++++++ oximeter/db/src/model.rs | 2 +- package-manifest.toml | 12 ++--- tools/dendrite_openapi_version | 4 +- tools/dendrite_stub_checksums | 6 +-- 6 files changed, 106 insertions(+), 12 deletions(-) create mode 100644 oximeter/db/schema/replicated/9/timeseries-to-delete.txt create mode 100644 oximeter/db/schema/single-node/9/timeseries-to-delete.txt diff --git a/oximeter/db/schema/replicated/9/timeseries-to-delete.txt b/oximeter/db/schema/replicated/9/timeseries-to-delete.txt new file mode 100644 index 0000000000..449d2e9155 --- /dev/null +++ b/oximeter/db/schema/replicated/9/timeseries-to-delete.txt @@ -0,0 +1,47 @@ +data_link:abort +data_link:b_e_r_check_done +data_link:b_e_r_check_start +data_link:bad_sync_headers +data_link:disabled +data_link:enabled +data_link:end +data_link:errored_blocks +data_link:fec_align +data_link:fec_corr_cnt +data_link:fec_hi_ser +data_link:fec_ser_lane0 +data_link:fec_ser_lane1 +data_link:fec_ser_lane2 +data_link:fec_ser_lane3 +data_link:fec_ser_lane4 +data_link:fec_ser_lane5 +data_link:fec_ser_lane6 +data_link:fec_ser_lane7 +data_link:fec_uncorr_cnt +data_link:idle +data_link:link_down +data_link:link_up +data_link:monitor_p_r_b_s_errors +data_link:pci_hi_ber +data_link:pcs_block_lock_loss +data_link:pcs_invalid_errors +data_link:pcs_sync_loss +data_link:pcs_unknown_errors +data_link:pcs_valid_errors +data_link:remote_fault +data_link:rx_buf_full +data_link:rx_bytes +data_link:rx_crc_errs +data_link:rx_errs +data_link:rx_pkts +data_link:tofino3_states +data_link:tx_bytes +data_link:tx_errs +data_link:tx_pkts +data_link:wait_auto_neg_done +data_link:wait_auto_neg_link_training_done +data_link:wait_d_f_e_done +data_link:wait_p_l_l_ready +data_link:wait_signal_o_k +data_link:wait_test_done +sidecar:sample_time diff --git a/oximeter/db/schema/single-node/9/timeseries-to-delete.txt b/oximeter/db/schema/single-node/9/timeseries-to-delete.txt new file mode 100644 index 0000000000..449d2e9155 --- /dev/null +++ b/oximeter/db/schema/single-node/9/timeseries-to-delete.txt @@ -0,0 +1,47 @@ +data_link:abort +data_link:b_e_r_check_done +data_link:b_e_r_check_start +data_link:bad_sync_headers +data_link:disabled +data_link:enabled +data_link:end +data_link:errored_blocks +data_link:fec_align +data_link:fec_corr_cnt +data_link:fec_hi_ser +data_link:fec_ser_lane0 +data_link:fec_ser_lane1 +data_link:fec_ser_lane2 +data_link:fec_ser_lane3 +data_link:fec_ser_lane4 +data_link:fec_ser_lane5 +data_link:fec_ser_lane6 +data_link:fec_ser_lane7 +data_link:fec_uncorr_cnt +data_link:idle +data_link:link_down +data_link:link_up +data_link:monitor_p_r_b_s_errors +data_link:pci_hi_ber +data_link:pcs_block_lock_loss +data_link:pcs_invalid_errors +data_link:pcs_sync_loss +data_link:pcs_unknown_errors +data_link:pcs_valid_errors +data_link:remote_fault +data_link:rx_buf_full +data_link:rx_bytes +data_link:rx_crc_errs +data_link:rx_errs +data_link:rx_pkts +data_link:tofino3_states +data_link:tx_bytes +data_link:tx_errs +data_link:tx_pkts +data_link:wait_auto_neg_done +data_link:wait_auto_neg_link_training_done +data_link:wait_d_f_e_done +data_link:wait_p_l_l_ready +data_link:wait_signal_o_k +data_link:wait_test_done +sidecar:sample_time diff --git a/oximeter/db/src/model.rs b/oximeter/db/src/model.rs index 05667058b5..f27df4ed49 100644 --- a/oximeter/db/src/model.rs +++ b/oximeter/db/src/model.rs @@ -45,7 +45,7 @@ use uuid::Uuid; /// - [`crate::Client::initialize_db_with_version`] /// - [`crate::Client::ensure_schema`] /// - The `clickhouse-schema-updater` binary in this crate -pub const OXIMETER_VERSION: u64 = 8; +pub const OXIMETER_VERSION: u64 = 9; // Wrapper type to represent a boolean in the database. // diff --git a/package-manifest.toml b/package-manifest.toml index 24f848c31a..42b25f4767 100644 --- a/package-manifest.toml +++ b/package-manifest.toml @@ -660,8 +660,8 @@ only_for_targets.image = "standard" # the other `source.*` keys. source.type = "prebuilt" source.repo = "dendrite" -source.commit = "9811438cc91c6ec4e8a8ca12479c920bb25fec81" -source.sha256 = "4b09ea6d89af353fd4240a3cfde8655c555f6f42e05c6fc4a4e32724f86bb749" +source.commit = "8293f28df659c070b48e13f87a51b836238b406e" +source.sha256 = "7400e4b0942b33af64a9aad1a429b0e2446e126f58a780328cf10eb46c63b7f8" output.type = "zone" output.intermediate_only = true @@ -687,8 +687,8 @@ only_for_targets.image = "standard" # the other `source.*` keys. source.type = "prebuilt" source.repo = "dendrite" -source.commit = "9811438cc91c6ec4e8a8ca12479c920bb25fec81" -source.sha256 = "224ff076a3031d5b913e40084a48fce7bdd08e8ef1abd1ab74df0058963bb3b2" +source.commit = "8293f28df659c070b48e13f87a51b836238b406e" +source.sha256 = "68bf16452a3159529fb1bd11f43adfb002020d086e0f64f48bd766bf47843ae9" output.type = "zone" output.intermediate_only = true @@ -707,8 +707,8 @@ only_for_targets.image = "standard" # the other `source.*` keys. source.type = "prebuilt" source.repo = "dendrite" -source.commit = "9811438cc91c6ec4e8a8ca12479c920bb25fec81" -source.sha256 = "66b04128c41ad9cd26ca3746d51fff5d295ca65f48e7aabee616026934cc8d5e" +source.commit = "8293f28df659c070b48e13f87a51b836238b406e" +source.sha256 = "b7d6a1a20f302ded9c6e4bbba66b9432bec5edda593edfcdbb9429a95201655a" output.type = "zone" output.intermediate_only = true diff --git a/tools/dendrite_openapi_version b/tools/dendrite_openapi_version index b7d34debd1..652ebc31eb 100755 --- a/tools/dendrite_openapi_version +++ b/tools/dendrite_openapi_version @@ -1,2 +1,2 @@ -COMMIT="9811438cc91c6ec4e8a8ca12479c920bb25fec81" -SHA2="12dc61e7c62b2e1ee1cf3c2bf7cdda6bee6ec96925d2fc1c021c6c1a8fdd56cd" +COMMIT="8293f28df659c070b48e13f87a51b836238b406e" +SHA2="3a54305ab4b1270c9a5fb0603f481fce199f3767c174a03559ff642f7f44687e" diff --git a/tools/dendrite_stub_checksums b/tools/dendrite_stub_checksums index 5d5b60ff57..cd8eb65a3e 100644 --- a/tools/dendrite_stub_checksums +++ b/tools/dendrite_stub_checksums @@ -1,3 +1,3 @@ -CIDL_SHA256_ILLUMOS="4b09ea6d89af353fd4240a3cfde8655c555f6f42e05c6fc4a4e32724f86bb749" -CIDL_SHA256_LINUX_DPD="fb597785b6fd94b0840a80ff82bc596426aa6b815dd64793075f05d2ba5db38d" -CIDL_SHA256_LINUX_SWADM="9be30b688301debe4103057730ff9a426c96b45d571a6287268f381d8a11dbc1" +CIDL_SHA256_ILLUMOS="7400e4b0942b33af64a9aad1a429b0e2446e126f58a780328cf10eb46c63b7f8" +CIDL_SHA256_LINUX_DPD="290edfc4076d31d6f70aa7cc16ce758e10d14777d8542b688fa2880fdfde398c" +CIDL_SHA256_LINUX_SWADM="e1e35784538a4fdd76dc257cc636ac3f43f7ef2842dabfe981f17f8ce6b8e1a2"