Skip to content

Commit f135ce6

Browse files
authored
Merge branch 'master' into staging/jts-api-distributed
2 parents 7d65d9d + b97b371 commit f135ce6

File tree

1,507 files changed

+58657
-50880
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

1,507 files changed

+58657
-50880
lines changed

.github/copilot-instructions.md

Lines changed: 18 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -8,30 +8,33 @@ GitHub Copilot should help document InfluxData products by creating clear, accur
88

99
- **Product version data**: `/data/products.yml`
1010
- **Products**:
11-
- InfluxDB OSS 1.x
12-
- Documentation source path: `/content/influxdb/v1`
13-
- Code repository: https://github.com/influxdata/influxdb
14-
- InfluxDB OSS 2.x
15-
- Documentation source path: `/content/influxdb/v2`
16-
- Code repository: https://github.com/influxdata/influxdb
1711
- InfluxDB 3 Core
1812
- Documentation source path: `/content/influxdb3/core`
1913
- Code repositories: https://github.com/influxdata/influxdb, https://github.com/influxdata/influxdb3_core
20-
- InfluxDB Enterprise v1 (1.x)
21-
- Documentation source path: `/content/influxdb/enterprise_influxdb`
22-
- Code repository: https://github.com/influxdata/influxdb
23-
- InfluxDB Cloud v2 (TSM)
24-
- Documentation source path: `/content/influxdb/cloud`
25-
- Code repository: https://github.com/influxdata/idpe
26-
- InfluxDB 3 Cloud Dedicated
14+
- InfluxDB 3 Enterprise
15+
- Documentation source path: `/content/influxdb3/enterprise`
16+
- Code repositories: https://github.com/influxdata/influxdb, https://github.com/influxdata/influxdb3_enterprise
17+
- InfluxDB Cloud Dedicated
2718
- Documentation source path: `/content/influxdb3/cloud-dedicated`
2819
- Code repository: https://github.com/influxdata/influxdb
29-
- InfluxDB 3 Cloud Serverless
20+
- InfluxDB Cloud Serverless
3021
- Documentation source path: `/content/influxdb3/cloud-serverless`
3122
- Code repository: https://github.com/influxdata/idpe
32-
- InfluxDB 3 Clustered
23+
- InfluxDB Cloud v2 (TSM)
24+
- Documentation source path: `/content/influxdb/cloud`
25+
- Code repository: https://github.com/influxdata/idpe
26+
- InfluxDB Clustered
3327
- Documentation source path: `/content/influxdb3/clustered`
3428
- Code repository: https://github.com/influxdata/influxdb
29+
- InfluxDB Enterprise v1 (1.x)
30+
- Documentation source path: `/content/influxdb/enterprise_influxdb`
31+
- Code repository: https://github.com/influxdata/influxdb
32+
- InfluxDB OSS 1.x
33+
- Documentation source path: `/content/influxdb/v1`
34+
- Code repository: https://github.com/influxdata/influxdb
35+
- InfluxDB OSS 2.x
36+
- Documentation source path: `/content/influxdb/v2`
37+
- Code repository: https://github.com/influxdata/influxdb
3538
- Telegraf
3639
- Documentation source path: `/content/telegraf/v1`
3740
- Code repository: https://github.com/influxdata/telegraf

.vscode/settings.json

Lines changed: 18 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
11
{
2-
"commentAnchors.tags.anchors":
3-
{ "SOURCE": {
4-
"scope": "file",
5-
"behavior": "link",
6-
"iconColor": "#FF0000",
7-
"highlightColor": "#FF0000",
8-
"style": "bold"
9-
}},
2+
"commentAnchors.tags.anchors":
3+
{ "SOURCE": {
4+
"scope": "file",
5+
"behavior": "link",
6+
"iconColor": "#FF0000",
7+
"highlightColor": "#FF0000",
8+
"style": "bold"
9+
}},
1010
"commentAnchors.workspace.matchFiles": "**/*.{md,ini,json,yaml,yml}",
1111
"commentAnchors.workspace.enabled": true,
1212
"yaml.schemas": {
@@ -15,10 +15,17 @@
1515
"vale.valeCLI.config": "${workspaceFolder}/.vale.ini",
1616
"vale.valeCLI.minAlertLevel": "warning",
1717
"github.copilot.chat.codeGeneration.useInstructionFiles": true,
18-
"github.copilot.chat.codeGeneration.instructionFiles": [
18+
"github.copilot.chat.codeGeneration.instructions": [
1919
{
20-
"path": "${workspaceFolder}/.github/copilot-instructions.md",
21-
"enabled": true
20+
"file": "${workspaceFolder}/.github/copilot-instructions.md",
2221
}
2322
],
23+
"github.copilot.chat.pullRequestDescriptionGeneration.instructions": [
24+
{
25+
"file": "${workspaceFolder}/.github/copilot-instructions.md",
26+
}
27+
],
28+
"cSpell.words": [
29+
"influxctl"
30+
]
2431
}

CONTRIBUTING.md

Lines changed: 8 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -455,27 +455,22 @@ v2: /influxdb/v2.0/get-started/
455455
Use the `prepend` and `append` frontmatter to add content to the top or bottom of a page.
456456
Each has the following fields:
457457

458-
- **block:** _(Optional)_ block style to wrap content in (note, warn, cloud, or enterprise)
459-
- **content:** _**(Required)**_ markdown content to add.
460-
461458
```yaml
462-
append:
463-
block: note
464-
content: |
465-
#### This is example markdown content
466-
This is just an example note block that gets appended to the article.
459+
append: |
460+
> [!Note]
461+
> #### This is example markdown content
462+
> This is just an example note block that gets appended to the article.
467463
```
468464

469465
Use this frontmatter with [cascade](#cascade) to add the same content to
470466
all children pages as well.
471467

472468
```yaml
473469
cascade:
474-
append:
475-
block: note
476-
content: |
477-
#### This is example markdown content
478-
This is just an example note block that gets appended to the article.
470+
append: |
471+
> [!Note]
472+
> #### This is example markdown content
473+
> This is just an example note block that gets appended to the article.
479474
```
480475

481476
### Cascade

api-docs/influxdb3/core/v3/ref.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ security:
4343
tags:
4444
- name: Authentication
4545
description: |
46-
During the initial Alpha phase, InfluxDB 3 Core does not require authentication.
46+
During the Beta phase, InfluxDB 3 Core does not require authentication.
4747
x-traitTag: true
4848
- name: Compatibility endpoints
4949
description: |

api-docs/influxdb3/enterprise/v3/ref.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ security:
4343
tags:
4444
- name: Authentication
4545
description: |
46-
During the initial Alpha phase, InfluxDB 3 Enterprise does not require authentication.
46+
During the Beta phase, InfluxDB 3 Enterprise does not require authentication.
4747
x-traitTag: true
4848
- name: Compatibility endpoints
4949
description: |

assets/styles/layouts/_homepage.scss

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -120,9 +120,9 @@
120120
}
121121
}
122122

123-
&.beta {
123+
&.new {
124124
.product-info h3::after {
125-
content: "beta";
125+
content: "New";
126126
margin-left: .5rem;
127127
font-size: 1rem;
128128
padding: .25em .5em .25em .4em;

assets/styles/layouts/_notifications.scss

Lines changed: 30 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -99,6 +99,26 @@
9999
pre { background: rgba($r-basalt, .35); }
100100
}
101101

102+
&.ga-announcement {
103+
background-image: url('/svgs/influxdb3-ga-background.svg');
104+
background-size: cover;
105+
a:hover { color: $br-dark-blue; }
106+
code { color: $gr-gypsy; background: rgba($gr-gypsy, .25); }
107+
pre { background: rgba($gr-gypsy, .25); }
108+
109+
h3 {font-size: 1.4rem !important;}
110+
.notification-slug { font-size: 1.15rem;
111+
.btn {
112+
display: inline-block;
113+
background: $g20-white;
114+
color: $br-dark-blue;
115+
padding: .5rem 1rem;
116+
border-radius: $radius * 2;
117+
font-size: 1rem;
118+
}
119+
}
120+
}
121+
102122
//////////// Basic HTML element styles for notification content ////////////
103123

104124
h1,h2,h3,h4,h5,h6 {
@@ -156,6 +176,16 @@
156176
}
157177
.show::before {content: "Show more"}
158178
}
179+
180+
.title-tag {
181+
padding: .15rem .45rem;
182+
text-transform: uppercase;
183+
font-size: .85rem;
184+
border-radius: $radius * 2;
185+
font-family: $code;
186+
background: $br-dark-blue;
187+
}
188+
.title-tag + h3 {margin-top: .75rem;}
159189
}
160190
}
161191

assets/styles/layouts/article/_blocks.scss

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -96,5 +96,4 @@ blockquote {
9696
"blocks/tip",
9797
"blocks/important",
9898
"blocks/warning",
99-
"blocks/caution",
100-
"blocks/beta";
99+
"blocks/caution";

assets/styles/layouts/article/_feedback.scss

Lines changed: 39 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -15,27 +15,48 @@
1515
padding-right: 2rem;
1616

1717
ul {
18-
display: flex;
19-
flex-wrap: wrap;
2018
margin-bottom: 1.25rem;
2119
padding: 0;
2220
list-style: none;
2321

24-
li {display: inline-block}
25-
2622
a {
27-
margin-right: 1.5rem;
2823
color: $article-heading;
24+
font-weight: $medium;
25+
position: relative;
26+
27+
&::after {
28+
content: "\e90a";
29+
font-family: 'icomoon-v4';
30+
font-weight: bold;
31+
font-size: 1.3rem;
32+
display: inline-block;
33+
position: absolute;
34+
@include gradient($grad-burningDusk);
35+
background-clip: text;
36+
-webkit-text-fill-color: transparent;
37+
right: 0;
38+
transform: translateX(.25rem);
39+
opacity: 0;
40+
transition: transform .2s, opacity .2s;
41+
}
2942

3043
&:hover {
31-
color: $article-link;
32-
border-radius: calc($radius * 1.5);
44+
&::after {transform: translateX(1.5rem); opacity: 1;}
45+
}
46+
47+
&.discord:before {
48+
content: url('/svgs/discord.svg');
49+
display: inline-block;
50+
height: 1.1rem;
51+
width: 1.25rem;
52+
vertical-align: top;
53+
margin: 2px .65rem 0 0;
3354
}
3455

3556
&.community:before {
3657
content: "\e900";
3758
color: $article-heading;
38-
margin: 0 .5rem 0 -.25rem;
59+
margin-right: .75rem;
3960
font-size: 1.2rem;
4061
font-family: 'icomoon-v2';
4162
vertical-align: middle;
@@ -46,7 +67,16 @@
4667
height: 1.1rem;
4768
width: 1.1rem;
4869
vertical-align: text-top;
49-
margin-right: .5rem;
70+
margin-right: .8rem;
71+
}
72+
73+
&.reddit:before {
74+
content: url('/svgs/reddit.svg');
75+
display: inline-block;
76+
height: 1.1rem;
77+
width: 1.2rem;
78+
vertical-align: top;
79+
margin: 2px .75rem 0 0;
5080
}
5181
}
5282
}

assets/styles/layouts/article/blocks/_beta.scss

Lines changed: 0 additions & 105 deletions
This file was deleted.

0 commit comments

Comments
 (0)