Skip to content

Commit 09d4956

Browse files
authored
Merge branch 'master' into v3-java-reference-examples
2 parents 99ef6e2 + bf4417a commit 09d4956

File tree

23 files changed

+1526
-56
lines changed

23 files changed

+1526
-56
lines changed
Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
extends: spelling
2+
message: "Did you really mean '%s'?"
3+
level: warning
4+
ignore:
5+
# Ignore the following words. All words are case-insensitive.
6+
# To use case-sensitive matching, use the filters section or vocabulary Terms.
7+
- InfluxDBv2/Terms/query-functions.txt
8+
- InfluxDBv2/Terms/server-config-options.txt
9+
filters:
10+
- '(\[|`)ui-disabled(`|\])'
Lines changed: 76 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,76 @@
1+
2+
3+
# InfluxQL
4+
# is_scalar_math_function
5+
# Source: https://github.com/influxdata/influxdb_iox/blob/4f9c901dcfece5fcc4d17cfecb6ec45a0dccda5a/influxdb_influxql_parser/src/functions.rs
6+
abs
7+
sin
8+
cos
9+
tan
10+
asin
11+
acos
12+
acosh
13+
asinh
14+
atan
15+
atanh
16+
atan2
17+
cbrt
18+
exp
19+
gcd
20+
isnan
21+
iszero
22+
lcm
23+
log
24+
ln
25+
log2
26+
log10
27+
nanvl
28+
sqrt
29+
pow
30+
floor
31+
ceil
32+
round
33+
34+
# InfluxQL operators
35+
bitfield
36+
37+
# is_aggregate_function
38+
# Source: https://github.com/influxdata/influxdb_iox/blob/4f9c901dcfece5fcc4d17cfecb6ec45a0dccda5a/influxdb_influxql_parser/src/functions.rs
39+
approx_distinct
40+
approx_median
41+
approx_percentile_cont
42+
approx_percentile_cont_with_weight
43+
covar
44+
cumulative_sum
45+
derivative
46+
difference
47+
elapsed
48+
moving_average
49+
non_negative_derivative
50+
non_negative_difference
51+
bottom
52+
first
53+
last
54+
max
55+
min
56+
percentile
57+
sample
58+
top
59+
count
60+
integral
61+
mean
62+
median
63+
mode
64+
spread
65+
stddev
66+
sum
67+
holt_winters
68+
holt_winters_with_fit
69+
chande_momentum_oscillator
70+
exponential_moving_average
71+
double_exponential_moving_average
72+
kaufmans_efficiency_ratio
73+
kaufmans_adaptive_moving_average
74+
triple_exponential_moving_average
75+
triple_exponential_derivative
76+
relative_strength_index
Lines changed: 70 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,70 @@
1+
assets-path
2+
bolt-path
3+
e2e-testing
4+
engine-path
5+
feature-flags
6+
flux-log-enabled
7+
hardening-enabled
8+
http-bind-address
9+
http-idle-timeout
10+
http-read-header-timeout
11+
http-read-timeout
12+
http-write-timeout
13+
influxql-max-select-buckets
14+
influxql-max-select-point
15+
influxql-max-select-series
16+
instance-id
17+
log-level
18+
metrics-disabled
19+
nats-max-payload-bytes
20+
nats-port
21+
no-tasks
22+
pprof-disabled
23+
query-concurrency
24+
query-initial-memory-bytes
25+
query-max-memory-bytes
26+
query-memory-bytes
27+
query-queue-size
28+
reporting-disabled
29+
secret-store
30+
session-length
31+
session-renew-disabled
32+
sqlite-path
33+
storage-cache-max-memory-size
34+
storage-cache-snapshot-memory-size
35+
storage-cache-snapshot-write-cold-duration
36+
storage-compact-full-write-cold-duration
37+
storage-compact-throughput-burst
38+
storage-max-concurrent-compactions
39+
storage-max-index-log-file-size
40+
storage-no-validate-field-size
41+
storage-retention-check-interval
42+
storage-series-file-max-concurrent-snapshot-compactions
43+
storage-series-id-set-cache-size
44+
storage-shard-precreator-advance-period
45+
storage-shard-precreator-check-interval
46+
storage-tsm-use-madv-willneed
47+
storage-validate-keys
48+
storage-wal-fsync-delay
49+
storage-wal-max-concurrent-writes
50+
storage-wal-max-write-delay
51+
storage-write-timeout
52+
store
53+
strong-passwords
54+
testing-always-allow-setup
55+
tls-cert
56+
tls-key
57+
tls-min-version
58+
tls-strict-ciphers
59+
tracing-type
60+
ui-disabled
61+
vault-addr
62+
vault-cacert
63+
vault-capath
64+
vault-client-cert
65+
vault-client-key
66+
vault-client-timeout
67+
vault-max-retries
68+
vault-skip-verify
69+
vault-tls-server-name
70+
vault-token

.ci/vale/styles/config/vocabularies/InfluxDataDocs/accept.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ SQLAlchemy
3838
Splunk
3939
[Ss]uperset
4040
TBs?
41-
UI
41+
\bUI\b
4242
URL
4343
US (East|West|Central|North|South|Northeast|Northwest|Southeast|Southwest)
4444
Unix

Dockerfile.pytest

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@ RUN apt-get update && apt-get upgrade -y && apt-get install -y \
1515
curl \
1616
git \
1717
gpg \
18+
influxdb2 \
1819
influxdb2-cli \
1920
influxctl \
2021
jq \
@@ -41,6 +42,9 @@ ENV PYTHONUNBUFFERED=1
4142

4243
WORKDIR /app
4344

45+
RUN mkdir -p /app/log && chmod +w /app/log
46+
RUN mkdir -p /app/assets && chmod +w /app/assets
47+
4448
# Some Python test dependencies (pytest-dotenv and pytest-codeblocks) aren't
4549
# available as packages in apt-cache, so use pip to download dependencies in a # separate step and use Docker's caching.
4650
# Pytest configuration file.
@@ -62,6 +66,8 @@ RUN echo '#!/bin/bash' > /usr/local/bin/xdg-open \
6266
&& echo 'echo "$1" > /shared/urls.txt' >> /usr/local/bin/xdg-open \
6367
&& chmod +x /usr/local/bin/xdg-open
6468

69+
RUN service influxdb start
70+
6571
# Copy test scripts and make them executable.
6672
COPY --chmod=755 ./test/scripts/parse_yaml.sh /usr/local/bin/parse_yaml
6773

content/flux/v0/prometheus/_index.md

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,9 @@ title: Work with Prometheus
33
description: >
44
Flux provides tools for scraping and processing raw [Prometheus-formatted metrics](https://prometheus.io/docs/concepts/data_model/)
55
from an HTTP-accessible endpoint.
6-
menu: flux_0_x
6+
menu:
7+
flux_v0:
8+
name: Work with Prometheus
79
weight: 8
810
flux/v0/tags: [prometheus]
911
---

content/flux/v0/query-data/_index.md

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,9 @@
22
title: Query data sources
33
description: >
44
Query different data sources with Flux including InfluxDB, SQL databases, CSV, and Prometheus.
5-
menu: flux_0_x
5+
menu:
6+
flux_v0:
7+
name: Query data sources
68
weight: 5
79
---
810

content/flux/v0/write-data/_index.md

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,9 @@
22
title: Write to data sources
33
description: >
44
Write to different data sources with Flux including InfluxDB, SQL databases, CSV, and Prometheus.
5-
menu: flux_0_x
5+
menu:
6+
flux_v0:
7+
name: Write to data sources
68
weight: 5
79
---
810

content/influxdb/cloud-dedicated/reference/client-libraries/v3/python.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -282,16 +282,16 @@ status = None
282282
# Define callbacks for write responses
283283
def success(self, data: str):
284284
status = "Success writing batch: data: {data}"
285-
assert status.startsWith('Success'), f"Expected {status} to be success"
285+
assert status.startswith('Success'), f"Expected {status} to be success"
286286

287287
def error(self, data: str, err: InfluxDBError):
288288
status = f"Error writing batch: config: {self}, data: {data}, error: {err}"
289-
assert status.startsWith('Success'), f"Expected {status} to be success"
289+
assert status.startswith('Success'), f"Expected {status} to be success"
290290

291291

292292
def retry(self, data: str, err: InfluxDBError):
293293
status = f"Retry error writing batch: config: {self}, data: {data}, error: {err}"
294-
assert status.startsWith('Success'), f"Expected {status} to be success"
294+
assert status.startswith('Success'), f"Expected {status} to be success"
295295

296296
# Instantiate WriteOptions for batching
297297
write_options = WriteOptions()

content/influxdb/cloud-serverless/reference/client-libraries/v3/python.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -254,16 +254,16 @@ status = None
254254
# Define callbacks for write responses
255255
def success(self, data: str):
256256
status = "Success writing batch: data: {data}"
257-
assert status.startsWith('Success'), f"Expected {status} to be success"
257+
assert status.startswith('Success'), f"Expected {status} to be success"
258258

259259
def error(self, data: str, err: InfluxDBError):
260260
status = f"Error writing batch: config: {self}, data: {data}, error: {err}"
261-
assert status.startsWith('Success'), f"Expected {status} to be success"
261+
assert status.startswith('Success'), f"Expected {status} to be success"
262262

263263

264264
def retry(self, data: str, err: InfluxDBError):
265265
status = f"Retry error writing batch: config: {self}, data: {data}, error: {err}"
266-
assert status.startsWith('Success'), f"Expected {status} to be success"
266+
assert status.startswith('Success'), f"Expected {status} to be success"
267267

268268
# Instantiate WriteOptions for batching
269269
write_options = WriteOptions()

0 commit comments

Comments
 (0)