Skip to content

Commit 64082e9

Browse files
authored
Merge pull request #6298 from influxdata/copilot/fix-6297
Update Debian/Ubuntu package signing key location to /etc/apt/keyrings for improved security
2 parents e2c7d72 + fe45552 commit 64082e9

File tree

7 files changed

+47
-23
lines changed

7 files changed

+47
-23
lines changed

.ci/link-checker/default.lycherc.toml

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -50,6 +50,14 @@ exclude = [
5050
# detection)
5151
"^https?://github\\.com",
5252

53+
# StackExchange network URLs (often block automated requests)
54+
"^https?://.*\\.stackexchange\\.com",
55+
"^https?://stackoverflow\\.com",
56+
"^https?://.*\\.stackoverflow\\.com",
57+
58+
# Docker Hub URLs (rate limiting and bot detection)
59+
"^https?://hub\\.docker\\.com",
60+
5361
# Common documentation placeholders
5462
"YOUR_.*",
5563
"REPLACE_.*",

.ci/link-checker/production.lycherc.toml

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -58,6 +58,14 @@ exclude = [
5858
"^https?://reddit\\.com",
5959
"^https?://.*\\.reddit\\.com",
6060

61+
# StackExchange network URLs (often block automated requests)
62+
"^https?://.*\\.stackexchange\\.com",
63+
"^https?://stackoverflow\\.com",
64+
"^https?://.*\\.stackoverflow\\.com",
65+
66+
# Docker Hub URLs (rate limiting and bot detection)
67+
"^https?://hub\\.docker\\.com",
68+
6169
# InfluxData support URLs (certificate/SSL issues in CI)
6270
"^https?://support\\.influxdata\\.com",
6371

content/influxdb/v1/introduction/install.md

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -75,8 +75,8 @@ For Ubuntu/Debian users, add the InfluxData repository with the following comman
7575
# Primary key fingerprint: 24C9 75CB A61A 024E E1B6 3178 7C3D 5715 9FC2 F927
7676
# Subkey fingerprint: 9D53 9D90 D332 8DC7 D6C8 D3B9 D8FF 8E1F 7DF8 B07E
7777
wget -q https://repos.influxdata.com/influxdata-archive.key
78-
gpg --show-keys --with-fingerprint --with-colons ./influxdata-archive.key 2>&1 | grep -q '^fpr:\+24C975CBA61A024EE1B631787C3D57159FC2F927:$' && cat influxdata-archive.key | gpg --dearmor | sudo tee /etc/apt/trusted.gpg.d/influxdata-archive.gpg > /dev/null
79-
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
78+
gpg --show-keys --with-fingerprint --with-colons ./influxdata-archive.key 2>&1 | grep -q '^fpr:\+24C975CBA61A024EE1B631787C3D57159FC2F927:$' && cat influxdata-archive.key | gpg --dearmor | sudo tee /etc/apt/keyrings/influxdata-archive.gpg > /dev/null
79+
echo 'deb [signed-by=/etc/apt/keyrings/influxdata-archive.gpg] https://repos.influxdata.com/debian stable main' | sudo tee /etc/apt/sources.list.d/influxdata.list
8080
```
8181
{{% /code-tab-content %}}
8282

@@ -86,8 +86,8 @@ echo 'deb [signed-by=/etc/apt/trusted.gpg.d/influxdata-archive.gpg] https://repo
8686
# Primary key fingerprint: 24C9 75CB A61A 024E E1B6 3178 7C3D 5715 9FC2 F927
8787
# Subkey fingerprint: 9D53 9D90 D332 8DC7 D6C8 D3B9 D8FF 8E1F 7DF8 B07E
8888
curl --silent --location -O https://repos.influxdata.com/influxdata-archive.key
89-
gpg --show-keys --with-fingerprint --with-colons ./influxdata-archive.key 2>&1 | grep -q '^fpr:\+24C975CBA61A024EE1B631787C3D57159FC2F927:$' && cat influxdata-archive.key | gpg --dearmor | sudo tee /etc/apt/trusted.gpg.d/influxdata-archive.gpg > /dev/null
90-
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
89+
gpg --show-keys --with-fingerprint --with-colons ./influxdata-archive.key 2>&1 | grep -q '^fpr:\+24C975CBA61A024EE1B631787C3D57159FC2F927:$' && cat influxdata-archive.key | gpg --dearmor | sudo tee /etc/apt/keyrings/influxdata-archive.gpg > /dev/null
90+
echo 'deb [signed-by=/etc/apt/keyrings/influxdata-archive.gpg] https://repos.influxdata.com/debian stable main' | sudo tee /etc/apt/sources.list.d/influxdata.list
9191
```
9292
{{% /code-tab-content %}}
9393
{{< /code-tabs-wrapper >}}

content/influxdb/v2/install/_index.md

Lines changed: 14 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -112,7 +112,7 @@ _If `gpg` isn't available on your system, see
112112
The following steps guide you through using GPG to verify InfluxDB
113113
binary releases:
114114

115-
1. [Choose the InfluxData key-pair for your OS version](#choose-the-influxdata-key-pair-for-your-system).
115+
1. [Choose the InfluxData key-pair for your OS version](#choose-the-influxdata-key-pair-for-your-os-version).
116116
2. Download and import the InfluxData public key.
117117

118118
`gpg --import` outputs to stderr.
@@ -354,8 +354,8 @@ To install {{% product-name %}} on Linux, do one of the following:
354354
| grep -q '^fpr:\+24C975CBA61A024EE1B631787C3D57159FC2F927:$' \
355355
&& cat influxdata-archive.key \
356356
| gpg --dearmor \
357-
| sudo tee /etc/apt/trusted.gpg.d/influxdata-archive.gpg > /dev/null \
358-
&& echo 'deb [signed-by=/etc/apt/trusted.gpg.d/influxdata-archive.gpg] https://repos.influxdata.com/debian stable main' \
357+
| sudo tee /etc/apt/keyrings/influxdata-archive.gpg > /dev/null \
358+
&& echo 'deb [signed-by=/etc/apt/keyrings/influxdata-archive.gpg] https://repos.influxdata.com/debian stable main' \
359359
| sudo tee /etc/apt/sources.list.d/influxdata.list
360360
# Install influxdb
361361
sudo apt-get update && sudo apt-get install influxdb2
@@ -473,7 +473,7 @@ _If necessary, adjust the example file paths and utilities for your system._
473473
https://download.influxdata.com/influxdb/releases/v{{< latest-patch >}}/influxdb2-{{< latest-patch >}}_linux_arm64.tar.gz
474474
```
475475
476-
2. [Choose the InfluxData key-pair for your OS version](#choose-the-influxdata-key-pair-for-your-system).
476+
2. [Choose the InfluxData key-pair for your OS version](#choose-the-influxdata-key-pair-for-your-os-version).
477477
478478
3. {{< req text="Recommended:" color="magenta" >}}: Verify the authenticity of the downloaded binary--for example,
479479
enter the following command in your terminal.
@@ -675,7 +675,7 @@ data isn't deleted if you delete the container._
675675
flags for initial setup options and file system mounts.
676676
677677
_If you don't specify InfluxDB initial setup options, you can
678-
[set up manually](#set-up-influxdb) later using the UI or CLI in a running
678+
[set up manually](/influxdb/v2/get-started/setup/) later using the UI or CLI in a running
679679
container._
680680
681681
{{% code-placeholders "ADMIN_(USERNAME|PASSWORD)|ORG_NAME|BUCKET_NAME" %}}
@@ -731,7 +731,8 @@ and _[Operator token](/influxdb/v2/admin/tokens/#operator-token)_, and logs to s
731731
732732
You can view the Operator token in the `/etc/influxdb2/influx-configs` file and
733733
use it to authorize
734-
[creating an All Access token](#optional-create-all-access-tokens).
734+
[creating an All Access token](#examples).
735+
For more information, see [API token types](/influxdb/v2/admin/tokens/#api-token-types).
735736
736737
_To run the InfluxDB container in
737738
[detached mode](https://docs.docker.com/engine/reference/run/#detached-vs-foreground),
@@ -761,6 +762,13 @@ docker exec -it <CONTAINER_NAME> <CLI_NAME> <COMMAND>`
761762
762763
<!--pytest.mark.skip-->
763764
765+
```bash
766+
# Create an All Access token
767+
docker exec -it influxdb2 influx auth create \
768+
--all-access \
769+
--token OPERATOR_TOKEN
770+
```
771+
764772
```bash
765773
# List CLI configurations
766774
docker exec -it influxdb2 influx config ls

content/influxdb3/cloud-dedicated/reference/cli/influxctl/_index.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -176,8 +176,8 @@ To download the Linux `influxctl` package, do one of the following:
176176
# Primary key fingerprint: 24C9 75CB A61A 024E E1B6 3178 7C3D 5715 9FC2 F927
177177
# Subkey fingerprint: 9D53 9D90 D332 8DC7 D6C8 D3B9 D8FF 8E1F 7DF8 B07E
178178
wget -q https://repos.influxdata.com/influxdata-archive.key
179-
gpg --show-keys --with-fingerprint --with-colons ./influxdata-archive.key 2>&1 | grep -q '^fpr:\+24C975CBA61A024EE1B631787C3D57159FC2F927:$' && cat influxdata-archive.key | gpg --dearmor | sudo tee /etc/apt/trusted.gpg.d/influxdata-archive.gpg > /dev/null
180-
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
179+
gpg --show-keys --with-fingerprint --with-colons ./influxdata-archive.key 2>&1 | grep -q '^fpr:\+24C975CBA61A024EE1B631787C3D57159FC2F927:$' && cat influxdata-archive.key | gpg --dearmor | sudo tee /etc/apt/keyrings/influxdata-archive.gpg > /dev/null
180+
echo 'deb [signed-by=/etc/apt/keyrings/influxdata-archive.gpg] https://repos.influxdata.com/debian stable main' | sudo tee /etc/apt/sources.list.d/influxdata.list
181181
182182
sudo apt-get update && sudo apt-get install influxctl
183183
```

content/influxdb3/clustered/reference/cli/influxctl/_index.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -166,8 +166,8 @@ To download the Linux `influxctl` package, do one of the following:
166166
# Primary key fingerprint: 24C9 75CB A61A 024E E1B6 3178 7C3D 5715 9FC2 F927
167167
# Subkey fingerprint: 9D53 9D90 D332 8DC7 D6C8 D3B9 D8FF 8E1F 7DF8 B07E
168168
wget -q https://repos.influxdata.com/influxdata-archive.key
169-
gpg --show-keys --with-fingerprint --with-colons ./influxdata-archive.key 2>&1 | grep -q '^fpr:\+24C975CBA61A024EE1B631787C3D57159FC2F927:$' && cat influxdata-archive.key | gpg --dearmor | sudo tee /etc/apt/trusted.gpg.d/influxdata-archive.gpg > /dev/null
170-
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
169+
gpg --show-keys --with-fingerprint --with-colons ./influxdata-archive.key 2>&1 | grep -q '^fpr:\+24C975CBA61A024EE1B631787C3D57159FC2F927:$' && cat influxdata-archive.key | gpg --dearmor | sudo tee /etc/apt/keyrings/influxdata-archive.gpg > /dev/null
170+
echo 'deb [signed-by=/etc/apt/keyrings/influxdata-archive.gpg] https://repos.influxdata.com/debian stable main' | sudo tee /etc/apt/sources.list.d/influxdata.list
171171
```
172172

173173
{{% /code-tab-content %}}

content/telegraf/v1/install.md

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ To install Telegraf, do the following:
1515

1616
- [Review requirements](#requirements)
1717
- [Download and install Telegraf](#download-and-install-telegraf)
18-
- [Custom compile Telegraf](#custom-compile)
18+
- [Custom compile Telegraf](#custom-compile-telegraf)
1919

2020
## Requirements
2121

@@ -121,7 +121,7 @@ InfluxData uses [GPG (GnuPG)](https://www.gnupg.org/software/) to sign released
121121
public key and encrypted private key (`.key` file) pairs that you can use to
122122
verify the integrity of packages and binaries from the InfluxData repository.
123123

124-
Before running the [install](#install) sample code, substitute the key-pair compatible with your OS version:
124+
Before running the [install](#download-and-install-instructions) sample code, substitute the key-pair compatible with your OS version:
125125

126126
For newer OS releases (for example, Ubuntu 20.04 LTS and newer, Debian Buster
127127
and newer) that support subkey verification:
@@ -180,8 +180,8 @@ gpg --show-keys --with-fingerprint --with-colons ./influxdata-archive.key 2>&1 \
180180
| grep -q '^fpr:\+24C975CBA61A024EE1B631787C3D57159FC2F927:$' \
181181
&& cat influxdata-archive.key \
182182
| gpg --dearmor \
183-
| sudo tee /etc/apt/trusted.gpg.d/influxdata-archive.gpg > /dev/null \
184-
&& echo 'deb [signed-by=/etc/apt/trusted.gpg.d/influxdata-archive.gpg] https://repos.influxdata.com/debian stable main' \
183+
| sudo tee /etc/apt/keyrings/influxdata-archive.gpg > /dev/null \
184+
&& echo 'deb [signed-by=/etc/apt/keyrings/influxdata-archive.gpg] https://repos.influxdata.com/debian stable main' \
185185
| sudo tee /etc/apt/sources.list.d/influxdata.list
186186
sudo apt-get update && sudo apt-get install telegraf
187187
```
@@ -198,8 +198,8 @@ gpg --show-keys --with-fingerprint --with-colons ./influxdata-archive_compat.key
198198
| grep -q '^fpr:\+9D539D90D3328DC7D6C8D3B9D8FF8E1F7DF8B07E:$' \
199199
&& cat influxdata-archive_compat.key \
200200
| gpg --dearmor \
201-
| sudo tee /etc/apt/trusted.gpg.d/influxdata-archive_compat.gpg > /dev/null
202-
echo 'deb [signed-by=/etc/apt/trusted.gpg.d/influxdata-archive_compat.gpg] https://repos.influxdata.com/debian stable main' \
201+
| sudo tee /etc/apt/keyrings/influxdata-archive_compat.gpg > /dev/null
202+
echo 'deb [signed-by=/etc/apt/keyrings/influxdata-archive_compat.gpg] https://repos.influxdata.com/debian stable main' \
203203
| sudo tee /etc/apt/sources.list.d/influxdata.list
204204
sudo apt-get update && sudo apt-get install telegraf
205205
```
@@ -329,7 +329,7 @@ Replace the following:
329329
Choose from the following options to install Telegraf binary files for Linux ARM:
330330
331331
- To install on Linux ARMv7(32-bit), see the [downloads page](https://www.influxdata.com/downloads/#telegraf).
332-
- [Download and install on Linux ARMv8 (64-bit)](#download-and-install-on-linux-arm-64)
332+
- [Download and install on Linux ARMv8 (64-bit)](#download-and-install-on-linux-armv8)
333333
334334
### Download and install on Linux ARMv8
335335
@@ -388,7 +388,7 @@ To install using Homebrew, do the following:
388388
3. Choose one of the following methods to start Telegraf and begin collecting and processing metrics:
389389
390390
- [Run Telegraf in your terminal](#run-telegraf-in-your-terminal)
391-
- [Run Telegraf as a service](#run-telegraf-as-a-service)
391+
- [Run Telegraf as a service](#run-telegraf-as-a-background-service)
392392
393393
### Run Telegraf in your terminal
394394
@@ -627,7 +627,7 @@ Use the Telegraf custom builder tool to compile Telegraf with only the plugins y
627627
### Prerequisites
628628
629629
- Follow the instructions to install [Go](https://go.dev/) for your system.
630-
- [Create your Telegraf configuration file](#generate-a-custom-configuration-file) with the plugins you want to use.
630+
- [Create your Telegraf configuration file](#generate-a-configuration-file) with the plugins you want to use.
631631
632632
### Build the custom builder tool
633633

0 commit comments

Comments
 (0)