Skip to content

Commit a730bb4

Browse files
sandersonsanderson
authored
Merge branch 'master' into feat-influxdb3-cli-updates
2 parents 522558b + ec6e28d commit a730bb4

File tree

18 files changed

+465
-46
lines changed

18 files changed

+465
-46
lines changed

‎Dockerfile.pytest

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ FROM golang:latest
77
# Primary key fingerprint: 24C9 75CB A61A 024E E1B6 3178 7C3D 5715 9FC2 F927
88
# Subkey fingerprint: 9D53 9D90 D332 8DC7 D6C8 D3B9 D8FF 8E1F 7DF8 B07E
99
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
10+
RUN gpg --no-default-keyring --homedir $(mktemp -d) --show-keys --with-fingerprint --with-colons ./influxdata-archive.key 2>&1 | grep -q '^fpr:\+24C975CBA61A024EE1B631787C3D57159FC2F927:$' && cat influxdata-archive.key | gpg --dearmor | tee /etc/apt/trusted.gpg.d/influxdata-archive.gpg > /dev/null
1111

1212
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
1313

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -75,7 +75,7 @@ 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-
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
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
7979
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
8080
```
8181
{{% /code-tab-content %}}
@@ -85,8 +85,8 @@ echo 'deb [signed-by=/etc/apt/trusted.gpg.d/influxdata-archive.gpg] https://repo
8585
# influxdata-archive.key GPG fingerprint:
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
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
88+
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
9090
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
9191
```
9292
{{% /code-tab-content %}}

‎content/influxdb/v2/install/_index.md

Lines changed: 14 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -43,14 +43,14 @@ with your OS version:_
4343
For newer releases (for example, Ubuntu 20.04 LTS and newer, Debian Buster
4444
and newer) that support subkey verification:
4545

46-
- Private key file: [`influxdata-archive.key`](https://repos.influxdata.com/influxdata-archive.key)
47-
- Public key: `943666881a1b8d9b849b74caebf02d3465d6beb716510d86a39f6c8e8dac7515`
46+
- GPG key file: [`influxdata-archive.key`](https://repos.influxdata.com/influxdata-archive.key)
47+
- Primary key fingerprint: `24C975CBA61A024EE1B631787C3D57159FC2F927`
4848

4949
For older versions (for example, CentOS/RHEL 7, Ubuntu 18.04 LTS, or Debian
5050
Stretch) that don't support subkeys for verification:
5151

52-
- Private key file: [`influxdata-archive_compat.key`](https://repos.influxdata.com/influxdata-archive_compat.key)
53-
- Public key: `393e8779c89ac8d958f81f942f9ad7fb82a25e133faddaf92e15b16e6ac9ce4c`
52+
- GPG key file: [`influxdata-archive_compat.key`](https://repos.influxdata.com/influxdata-archive_compat.key)
53+
- Signing key fingerprint: `9D539D90D3328DC7D6C8D3B9D8FF8E1F7DF8B07E`
5454

5555
{{% /expand %}}
5656

@@ -136,8 +136,7 @@ binary releases:
136136
{{% code-placeholders "https://repos.influxdata.com/influxdata-archive.key" %}}
137137

138138
```sh
139-
curl --silent --location \
140-
https://repos.influxdata.com/influxdata-archive.key \
139+
curl --silent --location https://repos.influxdata.com/influxdata-archive.key \
141140
| gpg --import - 2>&1 \
142141
| grep 'InfluxData Package Signing Key <[email protected]>'
143142
```
@@ -344,16 +343,16 @@ To install {{% product-name %}} on Linux, do one of the following:
344343
2. Run the command for your OS version to install the InfluxData key,
345344
add the InfluxData repository, and install `influxdb`.
346345

347-
_Before running the command, replace the checksum and key filename with the
346+
_Before running the command, replace the fingerprint and key filename with the
348347
key-pair from the preceding step._
349348

350349
```bash
351350
# Ubuntu and Debian
352351
# Add the InfluxData key to verify downloads and add the repository
353-
curl --silent --location -O \
354-
https://repos.influxdata.com/influxdata-archive.key
355-
echo "943666881a1b8d9b849b74caebf02d3465d6beb716510d86a39f6c8e8dac7515 influxdata-archive.key" \
356-
| sha256sum --check - && cat influxdata-archive.key \
352+
curl --silent --location -O https://repos.influxdata.com/influxdata-archive.key
353+
gpg --show-keys --with-fingerprint --with-colons ./influxdata-archive.key 2>&1 \
354+
| grep -q '^fpr:\+24C975CBA61A024EE1B631787C3D57159FC2F927:$' \
355+
&& cat influxdata-archive.key \
357356
| gpg --dearmor \
358357
| sudo tee /etc/apt/trusted.gpg.d/influxdata-archive.gpg > /dev/null \
359358
&& echo 'deb [signed-by=/etc/apt/trusted.gpg.d/influxdata-archive.gpg] https://repos.influxdata.com/debian stable main' \
@@ -366,10 +365,10 @@ To install {{% product-name %}} on Linux, do one of the following:
366365
```bash
367366
# RedHat and CentOS
368367
# Add the InfluxData key to verify downloads
369-
curl --silent --location -O \
370-
https://repos.influxdata.com/influxdata-archive.key \
371-
&& echo "943666881a1b8d9b849b74caebf02d3465d6beb716510d86a39f6c8e8dac7515 influxdata-archive.key" \
372-
| sha256sum --check - && cat influxdata-archive.key \
368+
curl --silent --location -O https://repos.influxdata.com/influxdata-archive.key
369+
gpg --show-keys --with-fingerprint --with-colons ./influxdata-archive.key 2>&1 \
370+
| grep -q '^fpr:\+24C975CBA61A024EE1B631787C3D57159FC2F927:$' \
371+
&& cat influxdata-archive.key \
373372
| gpg --dearmor \
374373
| tee /etc/pki/rpm-gpg/RPM-GPG-KEY-influxdata > /dev/null
375374

‎content/influxdb3/cloud-dedicated/admin/mcp-server.md

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,18 @@
1+
---
2+
title: Use the InfluxDB 3 MCP server
3+
description: >
4+
Use the **InfluxDB MCP server** to interact with and manage {{% product-name %}}
5+
using natural language with LLM agents to query and analyze data, manage databases
6+
and more.
7+
menu:
8+
influxdb3_cloud_dedicated:
9+
name: Use the InfluxDB MCP server
10+
parent: Administer InfluxDB Cloud
11+
weight: 110
12+
influxdb3/cloud-dedicated/tags: [MCP, LLM, AI]
13+
related:
14+
- https://github.com/influxdata/influxdb3_mcp_server, InfluxDB 3 MCP Server GitHub Repository
15+
source: /shared/influxdb3-admin/mcp-server.md
16+
---
17+
18+
<!-- //SOURCE content/shared/influxdb3-admin/mcp-server.md -->

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -176,7 +176,7 @@ 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-
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
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
180180
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
181181
182182
sudo apt-get update && sudo apt-get install influxctl

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -166,7 +166,7 @@ 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-
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
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
170170
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
171171
```
172172

‎content/influxdb3/core/admin/databases/_index.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ description: >
77
menu:
88
influxdb3_core:
99
parent: Administer InfluxDB
10-
weight: 103
10+
weight: 101
1111
influxdb3/core/tags: [databases]
1212
related:
1313
- /influxdb3/core/write-data/best-practices/schema-design/

‎content/influxdb3/core/admin/mcp-server.md

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,18 @@
1+
---
2+
title: Use the InfluxDB 3 MCP server
3+
description: >
4+
Use the **InfluxDB MCP server** to interact with and manage {{% product-name %}}
5+
using natural language with LLM agents to query and analyze data, manage databases
6+
and more.
7+
menu:
8+
influxdb3_core:
9+
name: Use the InfluxDB MCP server
10+
parent: Administer InfluxDB
11+
weight: 110
12+
influxdb3/core/tags: [MCP, LLM, AI]
13+
related:
14+
- https://github.com/influxdata/influxdb3_mcp_server, InfluxDB 3 MCP Server GitHub Repository
15+
source: /shared/influxdb3-admin/mcp-server.md
16+
---
17+
18+
<!-- //SOURCE content/shared/influxdb3-admin/mcp-server.md -->

‎content/influxdb3/core/admin/tokens/_index.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ description: >
55
menu:
66
influxdb3_core:
77
parent: Administer InfluxDB
8-
weight: 202
8+
weight: 102
99
source: /shared/influxdb3-admin/tokens/_index.md
1010
---
1111

‎content/influxdb3/enterprise/admin/distinct-value-cache/_index.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ description: >
88
menu:
99
influxdb3_enterprise:
1010
parent: Administer InfluxDB
11-
weight: 105
11+
weight: 106
1212
influxdb3/enterprise/tags: [cache]
1313
related:
1414
- /influxdb3/enterprise/reference/sql/functions/cache/#distinct_cache, distinct_cache SQL function

0 commit comments

Comments
 (0)