Skip to content

Commit 2dbe5f7

Browse files
authored
Merge branch 'master' into patch-1
2 parents 0d3a5ea + 7f278b0 commit 2dbe5f7

File tree

135 files changed

+5053
-1747
lines changed

Some content is hidden

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

135 files changed

+5053
-1747
lines changed

.circleci/config.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -31,10 +31,10 @@ jobs:
3131
command: cd api-docs && bash generate-api-docs.sh
3232
- run:
3333
name: Inject Flux stdlib frontmatter
34-
command: node ./flux-build-scripts/inject-flux-stdlib-frontmatter.js
34+
command: node ./flux-build-scripts/inject-flux-stdlib-frontmatter.cjs
3535
- run:
3636
name: Update Flux/InfluxDB versions
37-
command: node ./flux-build-scripts/update-flux-versions.js
37+
command: node ./flux-build-scripts/update-flux-versions.cjs
3838
- save_cache:
3939
key: install-{{ .Environment.CACHE_VERSION }}-{{ checksum ".circleci/config.yml" }}
4040
paths:

.gitignore

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,8 @@ node_modules
1616
!telegraf-build/scripts
1717
!telegraf-build/README.md
1818
/cypress/screenshots/*
19+
/cypress/videos/*
20+
test-results.xml
1921
/influxdb3cli-build-scripts/content
2022
.vscode/*
2123
.idea

.husky/_/serve

Lines changed: 57 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,57 @@
1+
#!/bin/sh
2+
3+
if [ "$LEFTHOOK_VERBOSE" = "1" -o "$LEFTHOOK_VERBOSE" = "true" ]; then
4+
set -x
5+
fi
6+
7+
if [ "$LEFTHOOK" = "0" ]; then
8+
exit 0
9+
fi
10+
11+
call_lefthook()
12+
{
13+
if test -n "$LEFTHOOK_BIN"
14+
then
15+
"$LEFTHOOK_BIN" "$@"
16+
elif lefthook -h >/dev/null 2>&1
17+
then
18+
lefthook "$@"
19+
else
20+
dir="$(git rev-parse --show-toplevel)"
21+
osArch=$(uname | tr '[:upper:]' '[:lower:]')
22+
cpuArch=$(uname -m | sed 's/aarch64/arm64/;s/x86_64/x64/')
23+
if test -f "$dir/node_modules/lefthook-${osArch}-${cpuArch}/bin/lefthook"
24+
then
25+
"$dir/node_modules/lefthook-${osArch}-${cpuArch}/bin/lefthook" "$@"
26+
elif test -f "$dir/node_modules/@evilmartians/lefthook/bin/lefthook-${osArch}-${cpuArch}/lefthook"
27+
then
28+
"$dir/node_modules/@evilmartians/lefthook/bin/lefthook-${osArch}-${cpuArch}/lefthook" "$@"
29+
elif test -f "$dir/node_modules/@evilmartians/lefthook-installer/bin/lefthook"
30+
then
31+
"$dir/node_modules/@evilmartians/lefthook-installer/bin/lefthook" "$@"
32+
elif test -f "$dir/node_modules/lefthook/bin/index.js"
33+
then
34+
"$dir/node_modules/lefthook/bin/index.js" "$@"
35+
36+
elif bundle exec lefthook -h >/dev/null 2>&1
37+
then
38+
bundle exec lefthook "$@"
39+
elif yarn lefthook -h >/dev/null 2>&1
40+
then
41+
yarn lefthook "$@"
42+
elif pnpm lefthook -h >/dev/null 2>&1
43+
then
44+
pnpm lefthook "$@"
45+
elif swift package plugin lefthook >/dev/null 2>&1
46+
then
47+
swift package --disable-sandbox plugin lefthook "$@"
48+
elif command -v mint >/dev/null 2>&1
49+
then
50+
mint run csjones/lefthook-plugin "$@"
51+
else
52+
echo "Can't find lefthook in PATH"
53+
fi
54+
fi
55+
}
56+
57+
call_lefthook run "serve" "$@"

.nvmrc

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
v23.10.0

CONTRIBUTING.md

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -28,8 +28,10 @@ For the linting and tests to run, you need to install Docker and Node.js
2828
dependencies.
2929

3030
\_**Note:**
31-
We strongly recommend running linting and tests, but you can skip them
32-
(and avoid installing dependencies)
31+
The git pre-commit and pre-push hooks are configured to run linting and tests automatically
32+
when you commit or push changes.
33+
We strongly recommend letting them run, but you can skip them
34+
(and avoid installing related dependencies)
3335
by including the `--no-verify` flag with your commit--for example, enter the following command in your terminal:
3436

3537
```sh
@@ -51,7 +53,7 @@ dev dependencies used in pre-commit hooks for linting, syntax-checking, and test
5153
Dev dependencies include:
5254

5355
- [Lefthook](https://github.com/evilmartians/lefthook): configures and
54-
manages pre-commit hooks for linting and testing Markdown content.
56+
manages git pre-commit and pre-push hooks for linting and testing Markdown content.
5557
- [prettier](https://prettier.io/docs/en/): formats code, including Markdown, according to style rules for consistency
5658
- [Cypress]: e2e testing for UI elements and URLs in content
5759

@@ -93,9 +95,11 @@ Make your suggested changes being sure to follow the [style and formatting guide
9395

9496
## Lint and test your changes
9597

98+
`package.json` contains scripts for running tests and linting.
99+
96100
### Automatic pre-commit checks
97101

98-
docs-v2 uses Lefthook to manage Git hooks, such as pre-commit hooks that lint Markdown and test code blocks.
102+
docs-v2 uses Lefthook to manage Git hooks that run during pre-commit and pre-push. The hooks run the scripts defined in `package.json` to lint Markdown and test code blocks.
99103
When you try to commit changes (`git commit`), Git runs
100104
the commands configured in `lefthook.yml` which pass your **staged** files to Vale,
101105
Prettier, Cypress (for UI tests and link-checking), and Pytest (for testing Python and shell code in code blocks).

api-docs/.config.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
plugins:
2-
- './../openapi/plugins/docs-plugin.js'
2+
- './../openapi/plugins/docs-plugin.cjs'
33
extends:
44
- recommended
55
- docs/all

api-docs/influxdb/cloud/.config.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
plugins:
2-
- '../../openapi/plugins/docs-plugin.js'
2+
- '../../openapi/plugins/docs-plugin.cjs'
33
extends:
44
- recommended
55
- docs/all

api-docs/influxdb/v2/.config.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
plugins:
2-
- '../../openapi/plugins/docs-plugin.js'
2+
- '../../openapi/plugins/docs-plugin.cjs'
33
extends:
44
- recommended
55
- docs/all

api-docs/influxdb/v2/v2/ref.yml

Lines changed: 22 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -218,11 +218,11 @@ tags:
218218
|:-----------:|:------------------------ |:--------------------- |
219219
| `200` | Success | |
220220
| `204` | Success. No content | InfluxDB doesn't return data for the request. |
221-
| `400` | Bad request | May indicate one of the following: <ul><li>Line protocol is malformed. The response body contains the first malformed line in the data and indicates what was expected. For partial writes, the number of points written and the number of points rejected are also included. For more information, check the `rejected_points` measurement in your `_monitoring` bucket.</li><li>`Authorization` header is missing or malformed or the API token doesn't have permission for the operation.</li></ul> |
221+
| `400` | Bad request | May indicate one of the following:<ul><li>the request body is malformed</li><li>`Authorization` header is missing or malformed</li><li>the API token doesn't have permission for the operation.</li></ul> |
222222
| `401` | Unauthorized | May indicate one of the following: <ul><li>`Authorization: Token` header is missing or malformed</li><li>API token value is missing from the header</li><li>API token doesn't have permission. For more information about token types and permissions, see [Manage API tokens](/influxdb/v2/security/tokens/)</li></ul> |
223223
| `404` | Not found | Requested resource was not found. `message` in the response body provides details about the requested resource. |
224224
| `413` | Request entity too large | Request payload exceeds the size limit. |
225-
| `422` | Unprocessable entity | Request data is invalid. `code` and `message` in the response body provide details about the problem. |
225+
| `422` | Unprocessable entity | Request data is invalid. The request was well-formed, but couldn't complete due to semantic errors--for example, some or all points in a write request were rejected due to a schema or retention policy violation. The response body provides details about the problem. For more information about rejected points, see how to [Troubleshoot issues writing data](/influxdb/v2/write-data/troubleshoot/)|
226226
| `429` | Too many requests | API token is temporarily over the request quota. The `Retry-After` header describes when to try the request again. |
227227
| `500` | Internal server error | |
228228
| `503` | Service unavailable | Server is temporarily unavailable to process the request. The `Retry-After` header describes when to try the request again. |
@@ -12752,6 +12752,12 @@ paths:
1275212752

1275312753
- Returns this error only if the [Go (golang) `ioutil.ReadAll()`](https://pkg.go.dev/io/ioutil#ReadAll) function raises an error.
1275412754
- Returns `Content-Type: application/json` for this error.
12755+
'422':
12756+
content:
12757+
application/json:
12758+
schema:
12759+
$ref: '#/components/schemas/Error'
12760+
description: The request was well-formed, but some or all the points were rejected due to semantic errors--for example, schema conflicts or retention policy violations. Error message contains details for one or more rejected points.
1275512761
'429':
1275612762
description: |
1275712763
Too many requests.
@@ -13190,6 +13196,14 @@ paths:
1319013196
- Legacy Query
1319113197
/write:
1319213198
post:
13199+
description: |-
13200+
Writes line protocol to the specified bucket.
13201+
13202+
This endpoint provides backward compatibility for InfluxDB 1.x write workloads using tools such as InfluxDB 1.x client libraries, the Telegraf `outputs.influxdb` output plugin, or third-party tools.
13203+
13204+
Use this endpoint to send data in [line protocol](https://docs.influxdata.com/influxdb/v2/reference/syntax/line-protocol/) format to InfluxDB.
13205+
Use query parameters to specify options for writing data.
13206+
1319313207
operationId: PostLegacyWrite
1319413208
parameters:
1319513209
- $ref: '#/components/parameters/TraceSpan'
@@ -13263,6 +13277,12 @@ paths:
1326313277
schema:
1326413278
$ref: '#/components/schemas/LineProtocolLengthError'
1326513279
description: Write has been rejected because the payload is too large. Error message returns max size supported. All data in body was rejected and not written.
13280+
'422':
13281+
content:
13282+
application/json:
13283+
schema:
13284+
$ref: '#/components/schemas/Error'
13285+
description: The request was well-formed, but some or all the points were rejected due to semantic errors--for example, schema conflicts or retention policy violations. Error message contains details for one or more rejected points.
1326613286
'429':
1326713287
description: Token is temporarily over quota. The Retry-After header describes when to try the write again.
1326813288
headers:

api-docs/influxdb3/cloud-dedicated/.config.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
plugins:
2-
- '../../openapi/plugins/docs-plugin.js'
2+
- '../../openapi/plugins/docs-plugin.cjs'
33
extends:
44
- recommended
55
- docs/all

0 commit comments

Comments
 (0)