Skip to content

Commit f546567

Browse files
authored
Merge pull request #6148 from influxdata/jts-monolith-gs-restructure
Jts monolith gs restructure
2 parents e3e76b4 + c8e278e commit f546567

File tree

39 files changed

+596
-658
lines changed

39 files changed

+596
-658
lines changed

.gitignore

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ node_modules
1515
!telegraf-build/templates
1616
!telegraf-build/scripts
1717
!telegraf-build/README.md
18-
/cypress/downloads
18+
/cypress/downloads/*
1919
/cypress/screenshots/*
2020
/cypress/videos/*
2121
test-results.xml
@@ -25,4 +25,4 @@ test-results.xml
2525
.idea
2626
**/config.toml
2727
package-lock.json
28-
tmp
28+
tmp

content/influxdb3/clustered/reference/release-notes/clustered.md

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -250,8 +250,8 @@ spec:
250250

251251
#### Release artifacts
252252

253-
- [app-instance-schema.json](/downloads/clustered-release-artifacts/20241022-1346953/app-instance-schema.json)
254-
- [example-customer.yml](/downloads/clustered-release-artifacts/20241022-1346953/example-customer.yml)
253+
- [app-instance-schema.json](/downloads/clustered-release-artifacts/20241024-1354148/app-instance-schema.json)
254+
- [example-customer.yml](/downloads/clustered-release-artifacts/20241024-1354148/example-customer.yml)
255255
- [InfluxDB Clustered README EULA July 2024.txt](/downloads/clustered-release-artifacts/InfluxDB%20Clustered%20README%20EULA%20July%202024.txt)
256256

257257
### Known Bugs
@@ -804,13 +804,13 @@ version of `influxctl` prior to v2.8.0.
804804
```yaml
805805
spec:
806806
package:
807-
image: us-docker.pkg.dev/influxdb2-artifacts/clustered/influxdb:20240325-920726
807+
image: us-docker.pkg.dev/influxdb2-artifacts/clustered/influxdb:20240326-922145
808808
```
809809

810810
#### Release artifacts
811811

812-
- [app-instance-schema.json](/downloads/clustered-release-artifacts/20240325-920726/app-instance-schema.json)
813-
- [example-customer.yml](/downloads/clustered-release-artifacts/20240325-920726/example-customer.yml)
812+
- [app-instance-schema.json](/downloads/clustered-release-artifacts/20240326-922145/app-instance-schema.json)
813+
- [example-customer.yml](/downloads/clustered-release-artifacts/20240326-922145/example-customer.yml)
814814
- [InfluxDB Clustered README EULA July 2024.txt](/downloads/clustered-release-artifacts/InfluxDB%20Clustered%20README%20EULA%20July%202024.txt)
815815

816816
### Highlights

content/influxdb3/core/get-started/processing-engine.md renamed to content/influxdb3/core/get-started/process.md

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,9 @@ menu:
1111
identifier: gs-process-data
1212
parent: Get started
1313
weight: 104
14+
aliases:
15+
- /influxdb3/core/get-started/process-data/
16+
- /influxdb3/core/get-started/processing-engine/
1417
related:
1518
- /influxdb3/core/plugins/
1619
- /influxdb3/core/reference/cli/influxdb3/create/plugin/

content/influxdb3/enterprise/admin/license.md

Lines changed: 8 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -101,7 +101,7 @@ The license file is a JWT file that contains the license information.
101101
> use one of the methods to [skip the email prompt](#skip-the-email-prompt).
102102
> This ensures that the container can generate the license file after you
103103
> verify your email address.
104-
> See the [Docker Compose example](?t=Docker+compose#activate-a-trial-or-home-license-with-docker).
104+
> See the [Docker Compose example](?t=Docker+compose#start-with-license-email-and-compose).
105105
106106
#### Skip the email prompt
107107

@@ -186,7 +186,7 @@ existing license if it's still valid.
186186
{{% code-tabs %}}
187187
[influxdb3 options](#)
188188
[Environment variables](#)
189-
[Docker compose](#example-activate-trial-or-home-with-compose)
189+
[Docker compose](#start-with-license-email-and-compose)
190190
{{% /code-tabs %}}
191191
{{% code-tab-content %}}
192192
<!------------------------ BEGIN INFLUXDB3 CLI OPTIONS ------------------------>
@@ -215,6 +215,7 @@ influxdb3 serve \
215215
{{% /code-tab-content %}}
216216
{{% code-tab-content %}}
217217
<!------------------------ BEGIN DOCKER COMPOSE ------------------------>
218+
{{% code-placeholders "${EMAIL_ADDRESS}" %}}
218219
```yaml
219220
# compose.yaml
220221
name: data-crunching-stack
@@ -235,7 +236,8 @@ services:
235236
- --object-store=file
236237
- --data-dir=/var/lib/influxdb3
237238
- --plugin-dir=/var/lib/influxdb3/plugins
238-
- --license-email=INFLUXDB3_LICENSE_EMAIL
239+
environment:
240+
- INFLUXDB3_LICENSE_EMAIL=${EMAIL_ADDRESS}
239241
volumes:
240242
- type: bind
241243
source: ~/.influxdb3/data
@@ -244,6 +246,9 @@ services:
244246
source: ~/.influxdb3/plugins
245247
target: /var/lib/influxdb3/plugins
246248
```
249+
{{% /code-placeholders %}}
250+
Replace {{% code-placeholder-key %}}`${EMAIL_ADDRESS}`{{% /code-placeholder-key %}} with your email address
251+
or a variable from your Compose `.env` file.
247252
<!------------------------- END DOCKER COMPOSE ------------------------->
248253
{{% /code-tab-content %}}
249254
{{< /code-tabs-wrapper >}}

content/influxdb3/enterprise/install/multi-server.md renamed to content/influxdb3/enterprise/get-started/multi-server.md

Lines changed: 79 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -7,49 +7,88 @@ description: >
77
menu:
88
influxdb3_enterprise:
99
name: Create a multi-node cluster
10-
parent: Install InfluxDB 3 Enterprise
11-
weight: 101
10+
parent: Get started
11+
identifier: gs-multi-node-cluster
12+
weight: 102
1213
influxdb3/enterprise/tags: [cluster, multi-node, multi-server]
1314
---
1415

15-
{{% product-name %}} supports flexible, multi-node configurations for high
16-
availability, performance, read replicas, and more to meet the specific needs
17-
of your use case.
18-
The {{% product-name %}} server can run in different _modes_ fulfil specific roles
19-
in your multi-node cluster.
20-
With the diskless architecture, all nodes in the cluster share the same common
21-
object store.
16+
Create a multi-node {{% product-name %}} cluster for high availability, performance, and workload isolation.
17+
Configure nodes with specific _modes_ (ingest, query, process, compact) to optimize for your use case.
18+
19+
## Prerequisites
20+
21+
- Shared object store
22+
- Network connectivity between nodes
23+
24+
## Basic multi-node setup
25+
26+
<!-- pytest.mark.skip -->
27+
```bash
28+
## NODE 1 compacts stored data
29+
30+
# Example variables
31+
# node-id: 'host01'
32+
# cluster-id: 'cluster01'
33+
# bucket: 'influxdb-3-enterprise-storage'
34+
35+
influxdb3 serve \
36+
--node-id host01 \
37+
--cluster-id cluster01 \
38+
--mode ingest,query,compact \
39+
--object-store s3 \
40+
--bucket influxdb-3-enterprise-storage \
41+
--http-bind {{< influxdb/host >}} \
42+
--aws-access-key-id <AWS_ACCESS_KEY_ID> \
43+
--aws-secret-access-key <AWS_SECRET_ACCESS_KEY>
44+
```
45+
46+
<!-- pytest.mark.skip -->
47+
```bash
48+
## NODE 2 handles writes and queries
49+
50+
# Example variables
51+
# node-id: 'host02'
52+
# cluster-id: 'cluster01'
53+
# bucket: 'influxdb-3-enterprise-storage'
54+
55+
influxdb3 serve \
56+
--node-id host02 \
57+
--cluster-id cluster01 \
58+
--mode ingest,query \
59+
--object-store s3 \
60+
--bucket influxdb-3-enterprise-storage \
61+
--http-bind localhost:8282 \
62+
--aws-access-key-id AWS_ACCESS_KEY_ID \
63+
--aws-secret-access-key AWS_SECRET_ACCESS_KEY
64+
```
65+
66+
Learn how to set up a multi-node cluster for different use cases, including high availability, read replicas, processing data, and workload isolation.
2267

2368
- [Create an object store](#create-an-object-store)
2469
- [Connect to your object store](#connect-to-your-object-store)
2570
- [Server modes](#server-modes)
26-
- [Server mode examples](#server-mode-examples)
27-
- [Configure a node to only handle write requests](#configure-a-node-to-only-handle-write-requests)
28-
- [Configure a node to only run the Compactor](#configure-a-node-to-only-run-the-compactor)
29-
- [Configure a handle query requests and run the processing engine](#configure-a-handle-query-requests-and-run-the-processing-engine)
30-
- [InfluxDB 3 Enterprise cluster configuration examples](#influxdb-3-enterprise-cluster-configuration-examples)
31-
- [High availability cluster](#high-availability-cluster)
32-
- [High availability with a dedicated Compactor](#high-availability-with-a-dedicated-compactor)
33-
- [High availability with read replicas and a dedicated Compactor](#high-availability-with-read-replicas-and-a-dedicated-compactor)
71+
- [Cluster configuration examples](#cluster-configuration-examples)
3472
- [Writing and querying in multi-node clusters](#writing-and-querying-in-multi-node-clusters)
3573

3674
## Create an object store
3775

38-
To run a mulit-node {{% product-name %}} cluster, nodes must connect to a
39-
common object store. Enterprise supports the following object stores:
76+
With the {{% product-name %}} diskless architecture, all data is stored in a common object store.
77+
In a multi-node cluster, you connect all nodes to the same object store.
78+
79+
Enterprise supports the following object stores:
4080

4181
- AWS S3 (or S3-compatible)
4282
- Azure Blob Storage
4383
- Google Cloud Storage
4484

4585
> [!Note]
46-
> Refer to your object storage provider's documentation for information about
86+
> Refer to your object storage provider's documentation for
4787
> setting up an object store.
4888
4989
## Connect to your object store
5090

51-
Depending on your object storage provider, connect nodes in your cluster to the
52-
object store by including provider-specific options when starting each node.
91+
When starting your {{% product-name %}} node, include provider-specific options for connecting to your object store--for example:
5392

5493
{{< tabs-wrapper >}}
5594
{{% tabs %}}
@@ -73,7 +112,7 @@ with your `influxdb3 serve` command:
73112
{{% code-placeholders "AWS_(BUCKET_NAME|ACCESS_KEY_ID|SECRET_ACCESS_KEY)" %}}
74113
<!-- pytest.mark.skip -->
75114
```bash
76-
influxdb3 server \
115+
influxdb3 serve \
77116
# ...
78117
--object-store s3 \
79118
--bucket AWS_BUCKET_NAME \
@@ -103,7 +142,7 @@ with your `influxdb3 serve` command:
103142
{{% code-placeholders "AZURE_(CONTAINER_NAME|STORAGE_ACCOUNT|STORAGE_ACCESS_KEY)" %}}
104143
<!-- pytest.mark.skip -->
105144
```bash
106-
influxdb3 server \
145+
influxdb3 serve \
107146
# ...
108147
--object-store azure \
109148
--bucket AZURE_CONTAINER_NAME \
@@ -128,7 +167,7 @@ with your `influxdb3 serve` command:
128167
{{% code-placeholders "GOOGLE_(BUCKET_NAME|SERVICE_ACCOUNT)" %}}
129168
<!-- pytest.mark.skip -->
130169
```bash
131-
influxdb3 server \
170+
influxdb3 serve \
132171
# ...
133172
--object-store google \
134173
--bucket GOOGLE_BUCKET_NAME \
@@ -163,31 +202,32 @@ Each node can run in one _or more_ of the following modes:
163202
#### Configure a node to only handle write requests
164203
<!-- pytest.mark.skip -->
165204
```bash
166-
influxdb3 server \
205+
influxdb3 serve \
167206
# ...
168207
--mode ingest
169208
```
170209

171210
#### Configure a node to only run the Compactor
172211
<!-- pytest.mark.skip -->
173212
```bash
174-
influxdb3 server \
213+
influxdb3 serve \
175214
# ...
176215
--mode compact
177216
```
178217

179-
#### Configure a handle query requests and run the processing engine
218+
#### Configure a node to handle queries and run the processing engine
180219
<!-- pytest.mark.skip -->
181220
```bash
182-
influxdb3 server \
221+
influxdb3 serve \
183222
# ...
184223
--mode query,process
185224
```
186225

226+
## Cluster configuration examples
187227

188-
## {{% product-name %}} cluster configuration examples
189-
190-
<!-- Placeholder for links -->
228+
- [High availability cluster](#high-availability-cluster)
229+
- [High availability with a dedicated Compactor](#high-availability-with-a-dedicated-compactor)
230+
- [High availability with read replicas and a dedicated Compactor](#high-availability-with-read-replicas-and-a-dedicated-compactor)
191231

192232
### High availability cluster
193233

@@ -479,3 +519,10 @@ Replace the following placeholders with your values:
479519
- {{% code-placeholder-key %}}`AUTH_TOKEN`{{% /code-placeholder-key %}}: your {{% token-link "database" %}}{{% show-in "enterprise" %}} with permission to query the specified database{{% /show-in %}}
480520
- {{% code-placeholder-key %}}`DATABASE_NAME`{{% /code-placeholder-key %}}: the name of the database to query
481521
- {{% code-placeholder-key %}}`QUERY`{{% /code-placeholder-key %}}: the SQL or InfluxQL query to run against the database
522+
523+
{{% page-nav
524+
prev="/influxdb3/enterprise/get-started/setup/"
525+
prevText="Set up InfluxDB"
526+
next="/influxdb3/enterprise/get-started/write/"
527+
nextText="Write data"
528+
%}}

content/influxdb3/enterprise/get-started/processing-engine.md renamed to content/influxdb3/enterprise/get-started/process.md

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,10 @@ menu:
1010
name: Process data
1111
identifier: gs-process-data
1212
parent: Get started
13-
weight: 104
13+
weight: 105
14+
aliases:
15+
- /influxdb3/enterprise/get-started/process-data/
16+
- /influxdb3/enterprise/get-started/processing-engine/
1417
related:
1518
- /influxdb3/enterprise/plugins/
1619
- /influxdb3/enterprise/reference/cli/influxdb3/create/plugin/

content/influxdb3/enterprise/get-started/query.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ menu:
99
name: Query data
1010
identifier: gs-query-data
1111
parent: Get started
12-
weight: 103
12+
weight: 104
1313
related:
1414
- /influxdb3/enterprise/query-data/
1515
- /influxdb3/enterprise/reference/sql/

content/influxdb3/enterprise/get-started/write.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ menu:
99
name: Write data
1010
identifier: gs-write-data
1111
parent: Get started
12-
weight: 102
12+
weight: 103
1313
related:
1414
- /influxdb3/enterprise/write-data/
1515
- /influxdb3/enterprise/reference/line-protocol/

content/influxdb3/enterprise/reference/cli/influxdb3/create/token/_index.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ description: >
44
The `influxdb3 create token` command creates an admin token or a scoped resource token for authenticating and authorizing actions in an {{% product-name %}} instance.
55
menu:
66
influxdb3_enterprise:
7-
parent: influxdb3
7+
parent: influxdb3 create
88
name: influxdb3 create token
99
weight: 300
1010
source: /shared/influxdb3-cli/create/token/_index.md

content/influxdb3/enterprise/reference/config-options.md

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -320,7 +320,6 @@ The server processes all requests without requiring tokens or authentication.
320320
Optionally disable authz by passing in a comma separated list of resources.
321321
Valid values are `health`, `ping`, and `metrics`.
322322

323-
324323
---
325324

326325
### AWS

0 commit comments

Comments
 (0)