Skip to content

Commit 210ccf5

Browse files
jstirnamanjstirnaman
authored
Merge branch 'master' into patch-3
2 parents 7fa5725 + 8f43b16 commit 210ccf5

File tree

8 files changed

+52
-45
lines changed

8 files changed

+52
-45
lines changed

‎Dockerfile.pytest

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -3,12 +3,13 @@ FROM golang:latest
33
### Install InfluxDB clients for testing
44
# Install InfluxDB keys to verify client installs.
55
# Follow the install instructions (https://docs.influxdata.com/telegraf/v1/install/?t=curl), except for sudo (which isn't available in Docker).
6-
# influxdata-archive_compat.key GPG fingerprint:
7-
# 9D53 9D90 D332 8DC7 D6C8 D3B9 D8FF 8E1F 7DF8 B07E
8-
ADD https://repos.influxdata.com/influxdata-archive_compat.key ./influxdata-archive_compat.key
9-
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
6+
# influxdata-archive.key GPG fingerprint:
7+
# Primary key fingerprint: 24C9 75CB A61A 024E E1B6 3178 7C3D 5715 9FC2 F927
8+
# Subkey fingerprint: 9D53 9D90 D332 8DC7 D6C8 D3B9 D8FF 8E1F 7DF8 B07E
9+
ADD https://repos.influxdata.com/influxdata-archive.key ./influxdata-archive.key
10+
RUN gpg --no-default-keyring --homedir /nonexistent --show-keys ./influxdata-archive.key | grep -q "24C975CBA61A024EE1B631787C3D57159FC2F927" && cat influxdata-archive.key | gpg --dearmor | tee /etc/apt/trusted.gpg.d/influxdata-archive.gpg > /dev/null
1011

11-
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
12+
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
1213

1314
# Vault is used for testing InfluxDB 2.0 Secrets
1415
# Fetch vault package information from HashiCorp repository
@@ -100,4 +101,4 @@ ENTRYPOINT [ "pytest" ]
100101
# Specify command arguments:
101102
# --env-file to pass environment variables to the test suite.
102103
# the test directory to run the test suite.
103-
CMD [ "--codeblocks", "" ]
104+
CMD [ "--codeblocks", "" ]

‎content/enterprise_influxdb/v1/introduction/installation/data_node_installation.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -193,7 +193,7 @@ For added security, follow these steps to verify the signature of your InfluxDB
193193
1. Download and import InfluxData's public key:
194194

195195
```sh
196-
curl -s https://repos.influxdata.com/influxdata-archive_compat.key | gpg --import
196+
curl -s https://repos.influxdata.com/influxdata-archive.key | gpg --import
197197
```
198198
2. Download the signature file for the release by adding `.asc` to the download URL.
199199
For example:
@@ -224,7 +224,7 @@ wget https://dl.influxdata.com/enterprise/releases/fips/influxdb-data-{{< latest
224224
The output from this command should include the following:
225225

226226
```sh
227-
gpg: Good signature from "InfluxDB Packaging Service <support@influxdb.com>" [unknown]
227+
gpg: Good signature from "InfluxData Package Signing Key <support@influxdata.com>" [unknown]
228228
```
229229
{{% /expand %}}
230230
{{< /expand-wrapper >}}

‎content/enterprise_influxdb/v1/introduction/installation/meta_node_installation.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -200,7 +200,7 @@ For added security, follow these steps to verify the signature of your InfluxDB
200200
1. Download and import InfluxData's public key:
201201

202202
```sh
203-
curl -s https://repos.influxdata.com/influxdata-archive_compat.key | gpg --import
203+
curl -s https://repos.influxdata.com/influxdata-archive.key | gpg --import
204204
```
205205

206206
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
232232
The output from this command should include the following:
233233

234234
```sh
235-
gpg: Good signature from "InfluxDB Packaging Service <support@influxdb.com>" [unknown]
235+
gpg: Good signature from "InfluxData Package Signing Key <support@influxdata.com>" [unknown]
236236
```
237237
{{% /expand %}}
238238
{{< /expand-wrapper >}}

‎content/enterprise_influxdb/v1/introduction/installation/single-server.md

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -111,7 +111,7 @@ InfluxDB Enterprise meta service download with `gpg`.
111111
1. Download and import InfluxData's public key:
112112

113113
```sh
114-
curl -s https://repos.influxdata.com/influxdata-archive_compat.key | gpg --import
114+
curl -s https://repos.influxdata.com/influxdata-archive.key | gpg --import
115115
```
116116

117117
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`.
130130
The output from this command should include the following:
131131

132132
```
133-
gpg: Good signature from "InfluxDB Packaging Service <support@influxdb.com>" [unknown]
133+
gpg: Good signature from "InfluxData Package Signing Key <support@influxdata.com>" [unknown]
134134
```
135135
{{% /expand %}}
136136
{{< /expand-wrapper >}}
@@ -356,7 +356,7 @@ InfluxDB Enterprise data service download with `gpg`.
356356
1. Download and import InfluxData's public key:
357357

358358
```sh
359-
curl -s https://repos.influxdata.com/influxdata-archive_compat.key | gpg --import
359+
curl -s https://repos.influxdata.com/influxdata-archive.key | gpg --import
360360
```
361361

362362
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`.
375375
The output from this command should include the following:
376376

377377
```
378-
gpg: Good signature from "InfluxDB Packaging Service <support@influxdb.com>" [unknown]
378+
gpg: Good signature from "InfluxData Package Signing Key <support@influxdata.com>" [unknown]
379379
```
380380
{{% /expand %}}
381381
{{< /expand-wrapper >}}

‎content/influxdb/v1/introduction/install.md

Lines changed: 15 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -71,19 +71,23 @@ For Ubuntu/Debian users, add the InfluxData repository with the following comman
7171
{{% /code-tabs %}}
7272
{{% code-tab-content %}}
7373
```sh
74-
# influxdata-archive_compat.key GPG Fingerprint: 9D539D90D3328DC7D6C8D3B9D8FF8E1F7DF8B07E
75-
wget -q https://repos.influxdata.com/influxdata-archive_compat.key
76-
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
77-
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
74+
# influxdata-archive.key GPG fingerprint:
75+
# Primary key fingerprint: 24C9 75CB A61A 024E E1B6 3178 7C3D 5715 9FC2 F927
76+
# Subkey fingerprint: 9D53 9D90 D332 8DC7 D6C8 D3B9 D8FF 8E1F 7DF8 B07E
77+
wget -q https://repos.influxdata.com/influxdata-archive.key
78+
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
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
7880
```
7981
{{% /code-tab-content %}}
8082

8183
{{% code-tab-content %}}
8284
```sh
83-
# influxdata-archive_compat.key GPG Fingerprint: 9D539D90D3328DC7D6C8D3B9D8FF8E1F7DF8B07E
84-
curl -s https://repos.influxdata.com/influxdata-archive_compat.key > influxdata-archive_compat.key
85-
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
86-
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
85+
# influxdata-archive.key GPG fingerprint:
86+
# Primary key fingerprint: 24C9 75CB A61A 024E E1B6 3178 7C3D 5715 9FC2 F927
87+
# Subkey fingerprint: 9D53 9D90 D332 8DC7 D6C8 D3B9 D8FF 8E1F 7DF8 B07E
88+
wget -q https://repos.influxdata.com/influxdata-archive.key
89+
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
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
8791
```
8892
{{% /code-tab-content %}}
8993
{{< /code-tabs-wrapper >}}
@@ -118,7 +122,7 @@ name = InfluxDB Repository - RHEL \$releasever
118122
baseurl = https://repos.influxdata.com/rhel/\$releasever/\$basearch/stable
119123
enabled = 1
120124
gpgcheck = 1
121-
gpgkey = https://repos.influxdata.com/influxdata-archive_compat.key
125+
gpgkey = https://repos.influxdata.com/influxdata-archive.key
122126
EOF
123127
```
124128

@@ -231,7 +235,7 @@ If `gpg` is not available, see the [GnuPG homepage](https://gnupg.org/download/)
231235
1. Download and import InfluxData's public key:
232236

233237
```
234-
curl -s https://repos.influxdata.com/influxdata-archive_compat.key | gpg --import
238+
curl -s https://repos.influxdata.com/influxdata-archive.key | gpg --import
235239
```
236240
237241
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/)
250254
The output from this command should include the following:
251255
252256
```
253-
gpg: Good signature from "InfluxDB Packaging Service <support@influxdb.com>" [unknown]
257+
gpg: Good signature from "InfluxData Package Signing Key <support@influxdata.com>" [unknown]
254258
```
255259
256260

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

Lines changed: 10 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -172,11 +172,12 @@ To download the Linux `influxctl` package, do one of the following:
172172
{{% code-tab-content %}}
173173

174174
```sh
175-
# influxdata-archive_compat.key GPG fingerprint:
176-
# 9D53 9D90 D332 8DC7 D6C8 D3B9 D8FF 8E1F 7DF8 B07E
177-
wget -q https://repos.influxdata.com/influxdata-archive_compat.key
178-
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
179-
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
175+
# influxdata-archive.key GPG fingerprint:
176+
# Primary key fingerprint: 24C9 75CB A61A 024E E1B6 3178 7C3D 5715 9FC2 F927
177+
# Subkey fingerprint: 9D53 9D90 D332 8DC7 D6C8 D3B9 D8FF 8E1F 7DF8 B07E
178+
wget -q https://repos.influxdata.com/influxdata-archive.key
179+
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
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
180181
181182
sudo apt-get update && sudo apt-get install influxctl
182183
```
@@ -185,15 +186,16 @@ sudo apt-get update && sudo apt-get install influxctl
185186
{{% code-tab-content %}}
186187

187188
```sh
188-
# influxdata-archive_compat.key GPG fingerprint:
189-
# 9D53 9D90 D332 8DC7 D6C8 D3B9 D8FF 8E1F 7DF8 B07E
189+
# influxdata-archive.key GPG fingerprint:
190+
# Primary key fingerprint: 24C9 75CB A61A 024E E1B6 3178 7C3D 5715 9FC2 F927
191+
# Subkey fingerprint: 9D53 9D90 D332 8DC7 D6C8 D3B9 D8FF 8E1F 7DF8 B07E
190192
cat <<EOF | sudo tee /etc/yum.repos.d/influxdata.repo
191193
[influxdata]
192194
name = InfluxData Repository - Stable
193195
baseurl = https://repos.influxdata.com/stable/\$basearch/main
194196
enabled = 1
195197
gpgcheck = 1
196-
gpgkey = https://repos.influxdata.com/influxdata-archive_compat.key
198+
gpgkey = https://repos.influxdata.com/influxdata-archive.key
197199
EOF
198200
199201
sudo yum install influxctl

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

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -162,28 +162,28 @@ To download the Linux `influxctl` package, do one of the following:
162162
{{% code-tab-content %}}
163163

164164
```sh
165-
# influxdata-archive_compat.key GPG fingerprint:
166-
# 9D53 9D90 D332 8DC7 D6C8 D3B9 D8FF 8E1F 7DF8 B07E
167-
wget -q https://repos.influxdata.com/influxdata-archive_compat.key
168-
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
169-
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
170-
171-
sudo apt-get update && sudo apt-get install influxctl
165+
# influxdata-archive.key GPG fingerprint:
166+
# Primary key fingerprint: 24C9 75CB A61A 024E E1B6 3178 7C3D 5715 9FC2 F927
167+
# Subkey fingerprint: 9D53 9D90 D332 8DC7 D6C8 D3B9 D8FF 8E1F 7DF8 B07E
168+
wget -q https://repos.influxdata.com/influxdata-archive.key
169+
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
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
172171
```
173172

174173
{{% /code-tab-content %}}
175174
{{% code-tab-content %}}
176175

177176
```sh
178-
# influxdata-archive_compat.key GPG fingerprint:
179-
# 9D53 9D90 D332 8DC7 D6C8 D3B9 D8FF 8E1F 7DF8 B07E
177+
# influxdata-archive.key GPG fingerprint:
178+
# Primary key fingerprint: 24C9 75CB A61A 024E E1B6 3178 7C3D 5715 9FC2 F927
179+
# Subkey fingerprint: 9D53 9D90 D332 8DC7 D6C8 D3B9 D8FF 8E1F 7DF8 B07E
180180
cat <<EOF | sudo tee /etc/yum.repos.d/influxdata.repo
181181
[influxdata]
182182
name = InfluxData Repository - Stable
183183
baseurl = https://repos.influxdata.com/stable/\$basearch/main
184184
enabled = 1
185185
gpgcheck = 1
186-
gpgkey = https://repos.influxdata.com/influxdata-archive_compat.key
186+
gpgkey = https://repos.influxdata.com/influxdata-archive.key
187187
EOF
188188
189189
sudo yum install influxctl

‎layouts/shortcodes/telegraf/verify.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ If `gpg` is not available, see the [GnuPG homepage](https://gnupg.org/download/)
1313
1. Download and import InfluxData's public key:
1414

1515
```
16-
curl -sL https://repos.influxdata.com/influxdata-archive_compat.key | gpg --import
16+
curl -sL https://repos.influxdata.com/influxdata-archive.key | gpg --import
1717
```
1818
1919
2. Download the signature file for the release by adding `.asc` to the download URL.
@@ -32,5 +32,5 @@ If `gpg` is not available, see the [GnuPG homepage](https://gnupg.org/download/)
3232
The output from this command should include the following:
3333
3434
```
35-
gpg: Good signature from "InfluxDB Packaging Service <support@influxdb.com>" [unknown]
35+
gpg: Good signature from "InfluxData Package Signing Key <support@influxdata.com>" [unknown]
3636
```

0 commit comments

Comments
 (0)