From 60abfdf562dd9560bea45898274690052c02a57d Mon Sep 17 00:00:00 2001 From: Jamie Strandboge Date: Tue, 8 Jul 2025 12:26:15 -0500 Subject: [PATCH] chore: document and use modern influxdata-archive.gpg --- Dockerfile.pytest | 13 +++++----- .../installation/data_node_installation.md | 4 +-- .../installation/meta_node_installation.md | 4 +-- .../installation/single-server.md | 8 +++--- content/influxdb/v1/introduction/install.md | 26 +++++++++++-------- .../reference/cli/influxctl/_index.md | 18 +++++++------ .../reference/cli/influxctl/_index.md | 20 +++++++------- layouts/shortcodes/telegraf/verify.md | 4 +-- 8 files changed, 52 insertions(+), 45 deletions(-) diff --git a/Dockerfile.pytest b/Dockerfile.pytest index 2199dcb15..0253c33e8 100644 --- a/Dockerfile.pytest +++ b/Dockerfile.pytest @@ -3,12 +3,13 @@ FROM golang:latest ### Install InfluxDB clients for testing # Install InfluxDB keys to verify client installs. # Follow the install instructions (https://docs.influxdata.com/telegraf/v1/install/?t=curl), except for sudo (which isn't available in Docker). -# influxdata-archive_compat.key GPG fingerprint: -# 9D53 9D90 D332 8DC7 D6C8 D3B9 D8FF 8E1F 7DF8 B07E -ADD https://repos.influxdata.com/influxdata-archive_compat.key ./influxdata-archive_compat.key -RUN echo '393e8779c89ac8d958f81f942f9ad7fb82a25e133faddaf92e15b16e6ac9ce4c influxdata-archive_compat.key' | sha256sum -c && cat influxdata-archive_compat.key | gpg --dearmor | tee /etc/apt/trusted.gpg.d/influxdata-archive_compat.gpg > /dev/null +# influxdata-archive.key GPG fingerprint: +# Primary key fingerprint: 24C9 75CB A61A 024E E1B6 3178 7C3D 5715 9FC2 F927 +# Subkey fingerprint: 9D53 9D90 D332 8DC7 D6C8 D3B9 D8FF 8E1F 7DF8 B07E +ADD https://repos.influxdata.com/influxdata-archive.key ./influxdata-archive.key +RUN echo '943666881a1b8d9b849b74caebf02d3465d6beb716510d86a39f6c8e8dac7515 influxdata-archive.key' | sha256sum -c && cat influxdata-archive.key | gpg --dearmor | tee /etc/apt/trusted.gpg.d/influxdata-archive.gpg > /dev/null -RUN echo 'deb [signed-by=/etc/apt/trusted.gpg.d/influxdata-archive_compat.gpg] https://repos.influxdata.com/debian stable main' | tee /etc/apt/sources.list.d/influxdata.list +RUN echo 'deb [signed-by=/etc/apt/trusted.gpg.d/influxdata-archive.gpg] https://repos.influxdata.com/debian stable main' | tee /etc/apt/sources.list.d/influxdata.list # Vault is used for testing InfluxDB 2.0 Secrets # Fetch vault package information from HashiCorp repository @@ -100,4 +101,4 @@ ENTRYPOINT [ "pytest" ] # Specify command arguments: # --env-file to pass environment variables to the test suite. # the test directory to run the test suite. -CMD [ "--codeblocks", "" ] \ No newline at end of file +CMD [ "--codeblocks", "" ] diff --git a/content/enterprise_influxdb/v1/introduction/installation/data_node_installation.md b/content/enterprise_influxdb/v1/introduction/installation/data_node_installation.md index 1648448cb..08aeb0437 100644 --- a/content/enterprise_influxdb/v1/introduction/installation/data_node_installation.md +++ b/content/enterprise_influxdb/v1/introduction/installation/data_node_installation.md @@ -193,7 +193,7 @@ For added security, follow these steps to verify the signature of your InfluxDB 1. Download and import InfluxData's public key: ```sh - curl -s https://repos.influxdata.com/influxdata-archive_compat.key | gpg --import + curl -s https://repos.influxdata.com/influxdata-archive.key | gpg --import ``` 2. Download the signature file for the release by adding `.asc` to the download URL. For example: @@ -224,7 +224,7 @@ wget https://dl.influxdata.com/enterprise/releases/fips/influxdb-data-{{< latest The output from this command should include the following: ```sh - gpg: Good signature from "InfluxDB Packaging Service " [unknown] + gpg: Good signature from "InfluxData Package Signing Key " [unknown] ``` {{% /expand %}} {{< /expand-wrapper >}} diff --git a/content/enterprise_influxdb/v1/introduction/installation/meta_node_installation.md b/content/enterprise_influxdb/v1/introduction/installation/meta_node_installation.md index 3f5c752ac..7e627b448 100644 --- a/content/enterprise_influxdb/v1/introduction/installation/meta_node_installation.md +++ b/content/enterprise_influxdb/v1/introduction/installation/meta_node_installation.md @@ -200,7 +200,7 @@ For added security, follow these steps to verify the signature of your InfluxDB 1. Download and import InfluxData's public key: ```sh - curl -s https://repos.influxdata.com/influxdata-archive_compat.key | gpg --import + curl -s https://repos.influxdata.com/influxdata-archive.key | gpg --import ``` 2. Download the signature file for the release by adding `.asc` to the download URL. @@ -232,7 +232,7 @@ wget https://dl.influxdata.com/enterprise/releases/fips/influxdb-meta-{{< latest The output from this command should include the following: ```sh - gpg: Good signature from "InfluxDB Packaging Service " [unknown] + gpg: Good signature from "InfluxData Package Signing Key " [unknown] ``` {{% /expand %}} {{< /expand-wrapper >}} diff --git a/content/enterprise_influxdb/v1/introduction/installation/single-server.md b/content/enterprise_influxdb/v1/introduction/installation/single-server.md index a440400e2..0b3ef3554 100644 --- a/content/enterprise_influxdb/v1/introduction/installation/single-server.md +++ b/content/enterprise_influxdb/v1/introduction/installation/single-server.md @@ -111,7 +111,7 @@ InfluxDB Enterprise meta service download with `gpg`. 1. Download and import InfluxData's public key: ```sh - curl -s https://repos.influxdata.com/influxdata-archive_compat.key | gpg --import + curl -s https://repos.influxdata.com/influxdata-archive.key | gpg --import ``` 2. Download the signature file for the release by adding `.asc` to the download URL. @@ -130,7 +130,7 @@ InfluxDB Enterprise meta service download with `gpg`. The output from this command should include the following: ``` - gpg: Good signature from "InfluxDB Packaging Service " [unknown] + gpg: Good signature from "InfluxData Package Signing Key " [unknown] ``` {{% /expand %}} {{< /expand-wrapper >}} @@ -356,7 +356,7 @@ InfluxDB Enterprise data service download with `gpg`. 1. Download and import InfluxData's public key: ```sh - curl -s https://repos.influxdata.com/influxdata-archive_compat.key | gpg --import + curl -s https://repos.influxdata.com/influxdata-archive.key | gpg --import ``` 2. Download the signature file for the release by adding `.asc` to the download URL. @@ -375,7 +375,7 @@ InfluxDB Enterprise data service download with `gpg`. The output from this command should include the following: ``` - gpg: Good signature from "InfluxDB Packaging Service " [unknown] + gpg: Good signature from "InfluxData Package Signing Key " [unknown] ``` {{% /expand %}} {{< /expand-wrapper >}} diff --git a/content/influxdb/v1/introduction/install.md b/content/influxdb/v1/introduction/install.md index dce3660f4..643187f60 100644 --- a/content/influxdb/v1/introduction/install.md +++ b/content/influxdb/v1/introduction/install.md @@ -71,19 +71,23 @@ For Ubuntu/Debian users, add the InfluxData repository with the following comman {{% /code-tabs %}} {{% code-tab-content %}} ```sh -# influxdata-archive_compat.key GPG Fingerprint: 9D539D90D3328DC7D6C8D3B9D8FF8E1F7DF8B07E -wget -q https://repos.influxdata.com/influxdata-archive_compat.key -echo '393e8779c89ac8d958f81f942f9ad7fb82a25e133faddaf92e15b16e6ac9ce4c influxdata-archive_compat.key' | sha256sum -c && cat influxdata-archive_compat.key | gpg --dearmor | sudo tee /etc/apt/trusted.gpg.d/influxdata-archive_compat.gpg > /dev/null -echo 'deb [signed-by=/etc/apt/trusted.gpg.d/influxdata-archive_compat.gpg] https://repos.influxdata.com/debian stable main' | sudo tee /etc/apt/sources.list.d/influxdata.list +# influxdata-archive.key GPG fingerprint: +# Primary key fingerprint: 24C9 75CB A61A 024E E1B6 3178 7C3D 5715 9FC2 F927 +# Subkey fingerprint: 9D53 9D90 D332 8DC7 D6C8 D3B9 D8FF 8E1F 7DF8 B07E +wget -q https://repos.influxdata.com/influxdata-archive.key +echo '943666881a1b8d9b849b74caebf02d3465d6beb716510d86a39f6c8e8dac7515 influxdata-archive.key' | sha256sum -c && cat influxdata-archive.key | gpg --dearmor | sudo tee /etc/apt/trusted.gpg.d/influxdata-archive.gpg > /dev/null +echo 'deb [signed-by=/etc/apt/trusted.gpg.d/influxdata-archive.gpg] https://repos.influxdata.com/debian stable main' | sudo tee /etc/apt/sources.list.d/influxdata.list ``` {{% /code-tab-content %}} {{% code-tab-content %}} ```sh -# influxdata-archive_compat.key GPG Fingerprint: 9D539D90D3328DC7D6C8D3B9D8FF8E1F7DF8B07E -curl -s https://repos.influxdata.com/influxdata-archive_compat.key > influxdata-archive_compat.key -echo '393e8779c89ac8d958f81f942f9ad7fb82a25e133faddaf92e15b16e6ac9ce4c influxdata-archive_compat.key' | sha256sum -c && cat influxdata-archive_compat.key | gpg --dearmor | sudo tee /etc/apt/trusted.gpg.d/influxdata-archive_compat.gpg > /dev/null -echo 'deb [signed-by=/etc/apt/trusted.gpg.d/influxdata-archive_compat.gpg] https://repos.influxdata.com/debian stable main' | sudo tee /etc/apt/sources.list.d/influxdata.list +# influxdata-archive.key GPG fingerprint: +# Primary key fingerprint: 24C9 75CB A61A 024E E1B6 3178 7C3D 5715 9FC2 F927 +# Subkey fingerprint: 9D53 9D90 D332 8DC7 D6C8 D3B9 D8FF 8E1F 7DF8 B07E +wget -q https://repos.influxdata.com/influxdata-archive.key +echo '943666881a1b8d9b849b74caebf02d3465d6beb716510d86a39f6c8e8dac7515 influxdata-archive.key' | sha256sum -c && cat influxdata-archive.key | gpg --dearmor | sudo tee /etc/apt/trusted.gpg.d/influxdata-archive.gpg > /dev/null +echo 'deb [signed-by=/etc/apt/trusted.gpg.d/influxdata-archive.gpg] https://repos.influxdata.com/debian stable main' | sudo tee /etc/apt/sources.list.d/influxdata.list ``` {{% /code-tab-content %}} {{< /code-tabs-wrapper >}} @@ -118,7 +122,7 @@ name = InfluxDB Repository - RHEL \$releasever baseurl = https://repos.influxdata.com/rhel/\$releasever/\$basearch/stable enabled = 1 gpgcheck = 1 -gpgkey = https://repos.influxdata.com/influxdata-archive_compat.key +gpgkey = https://repos.influxdata.com/influxdata-archive.key EOF ``` @@ -231,7 +235,7 @@ If `gpg` is not available, see the [GnuPG homepage](https://gnupg.org/download/) 1. Download and import InfluxData's public key: ``` - curl -s https://repos.influxdata.com/influxdata-archive_compat.key | gpg --import + curl -s https://repos.influxdata.com/influxdata-archive.key | gpg --import ``` 2. Download the signature file for the release by adding `.asc` to the download URL. @@ -250,7 +254,7 @@ If `gpg` is not available, see the [GnuPG homepage](https://gnupg.org/download/) The output from this command should include the following: ``` - gpg: Good signature from "InfluxDB Packaging Service " [unknown] + gpg: Good signature from "InfluxData Package Signing Key " [unknown] ``` diff --git a/content/influxdb3/cloud-dedicated/reference/cli/influxctl/_index.md b/content/influxdb3/cloud-dedicated/reference/cli/influxctl/_index.md index 7dd0ced1c..e00bbcb39 100644 --- a/content/influxdb3/cloud-dedicated/reference/cli/influxctl/_index.md +++ b/content/influxdb3/cloud-dedicated/reference/cli/influxctl/_index.md @@ -172,11 +172,12 @@ To download the Linux `influxctl` package, do one of the following: {{% code-tab-content %}} ```sh -# influxdata-archive_compat.key GPG fingerprint: -# 9D53 9D90 D332 8DC7 D6C8 D3B9 D8FF 8E1F 7DF8 B07E -wget -q https://repos.influxdata.com/influxdata-archive_compat.key -echo '393e8779c89ac8d958f81f942f9ad7fb82a25e133faddaf92e15b16e6ac9ce4c influxdata-archive_compat.key' | sha256sum -c && cat influxdata-archive_compat.key | gpg --dearmor | sudo tee /etc/apt/trusted.gpg.d/influxdata-archive_compat.gpg > /dev/null -echo 'deb [signed-by=/etc/apt/trusted.gpg.d/influxdata-archive_compat.gpg] https://repos.influxdata.com/debian stable main' | sudo tee /etc/apt/sources.list.d/influxdata.list +# influxdata-archive.key GPG fingerprint: +# Primary key fingerprint: 24C9 75CB A61A 024E E1B6 3178 7C3D 5715 9FC2 F927 +# Subkey fingerprint: 9D53 9D90 D332 8DC7 D6C8 D3B9 D8FF 8E1F 7DF8 B07E +wget -q https://repos.influxdata.com/influxdata-archive.key +echo '943666881a1b8d9b849b74caebf02d3465d6beb716510d86a39f6c8e8dac7515 influxdata-archive.key' | sha256sum -c && cat influxdata-archive.key | gpg --dearmor | sudo tee /etc/apt/trusted.gpg.d/influxdata-archive.gpg > /dev/null +echo 'deb [signed-by=/etc/apt/trusted.gpg.d/influxdata-archive.gpg] https://repos.influxdata.com/debian stable main' | sudo tee /etc/apt/sources.list.d/influxdata.list sudo apt-get update && sudo apt-get install influxctl ``` @@ -185,15 +186,16 @@ sudo apt-get update && sudo apt-get install influxctl {{% code-tab-content %}} ```sh -# influxdata-archive_compat.key GPG fingerprint: -# 9D53 9D90 D332 8DC7 D6C8 D3B9 D8FF 8E1F 7DF8 B07E +# influxdata-archive.key GPG fingerprint: +# Primary key fingerprint: 24C9 75CB A61A 024E E1B6 3178 7C3D 5715 9FC2 F927 +# Subkey fingerprint: 9D53 9D90 D332 8DC7 D6C8 D3B9 D8FF 8E1F 7DF8 B07E cat < /dev/null -echo 'deb [signed-by=/etc/apt/trusted.gpg.d/influxdata-archive_compat.gpg] https://repos.influxdata.com/debian stable main' | sudo tee /etc/apt/sources.list.d/influxdata.list - -sudo apt-get update && sudo apt-get install influxctl +# influxdata-archive.key GPG fingerprint: +# Primary key fingerprint: 24C9 75CB A61A 024E E1B6 3178 7C3D 5715 9FC2 F927 +# Subkey fingerprint: 9D53 9D90 D332 8DC7 D6C8 D3B9 D8FF 8E1F 7DF8 B07E +wget -q https://repos.influxdata.com/influxdata-archive.key +echo '943666881a1b8d9b849b74caebf02d3465d6beb716510d86a39f6c8e8dac7515 influxdata-archive.key' | sha256sum -c && cat influxdata-archive.key | gpg --dearmor | sudo tee /etc/apt/trusted.gpg.d/influxdata-archive.gpg > /dev/null +echo 'deb [signed-by=/etc/apt/trusted.gpg.d/influxdata-archive.gpg] https://repos.influxdata.com/debian stable main' | sudo tee /etc/apt/sources.list.d/influxdata.list ``` {{% /code-tab-content %}} {{% code-tab-content %}} ```sh -# influxdata-archive_compat.key GPG fingerprint: -# 9D53 9D90 D332 8DC7 D6C8 D3B9 D8FF 8E1F 7DF8 B07E +# influxdata-archive.key GPG fingerprint: +# Primary key fingerprint: 24C9 75CB A61A 024E E1B6 3178 7C3D 5715 9FC2 F927 +# Subkey fingerprint: 9D53 9D90 D332 8DC7 D6C8 D3B9 D8FF 8E1F 7DF8 B07E cat <" [unknown] + gpg: Good signature from "InfluxData Package Signing Key " [unknown] ```