Skip to content

Commit 3842bb1

Browse files
authored
fix: enables Sample Data for the metric selector (#4854)
1 parent 104352e commit 3842bb1

File tree

5 files changed

+31
-11
lines changed

5 files changed

+31
-11
lines changed

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -166,7 +166,7 @@
166166
"@docsearch/react": "^3.0.0-alpha.37",
167167
"@influxdata/clockface": "^4.2.1",
168168
"@influxdata/flux-lsp-browser": "0.8.15",
169-
"@influxdata/giraffe": "^2.28.0",
169+
"@influxdata/giraffe": "^2.29.0",
170170
"@influxdata/influxdb-templates": "0.9.0",
171171
"@influxdata/react-custom-scrollbars": "4.3.8",
172172
"abortcontroller-polyfill": "^1.3.0",

src/flows/pipes/MetricSelector/context.tsx

Lines changed: 10 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -239,11 +239,16 @@ export const SchemaProvider: FC = React.memo(({children}) => {
239239

240240
const scope = getPanelQueries(data.id)?.scope ?? {}
241241

242-
const text = `from(bucket: "${data.bucket.name}")
243-
|> range(${range})
244-
|> first()
245-
|> drop(columns: ["_value"])
246-
|> group()`
242+
let source = `from(bucket: "${data.bucket.name}")`
243+
if (data.bucket.type === 'sample') {
244+
source = `import "influxdata/influxdb/sample"
245+
sample.data(set: "${data.bucket.id}")`
246+
}
247+
const text = `${source}
248+
|> range(${range})
249+
|> first()
250+
|> drop(columns: ["_value"])
251+
|> group()`
247252

248253
query(text, scope)
249254
.then((response: FluxResult) => {

src/flows/pipes/MetricSelector/index.ts

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ export default register => {
1111
component: View,
1212
readOnlyComponent: ReadOnly,
1313
button: 'Metric Selector',
14-
featureFlag: 'flow-panel--metric-selector',
14+
// featureFlag: 'flow-panel--metric-selector',
1515
initial: {
1616
field: '',
1717
measurement: '',
@@ -28,7 +28,13 @@ export default register => {
2828
return ''
2929
}
3030

31-
let text = `from(bucket: "${bucket.name}")\n\t|> range(start: v.timeRangeStart, stop: v.timeRangeStop)`
31+
let from = `from(bucket: "${bucket.name}")`
32+
if (bucket.type === 'sample') {
33+
from = `import "influxdata/influxdb/sample"
34+
sample.data(set: "${bucket.id}")`
35+
}
36+
37+
let text = `${from}\n\t|> range(start: v.timeRangeStart, stop: v.timeRangeStop)`
3238
if (measurement) {
3339
text += ` |> filter(fn: (r) => r["_measurement"] == "${measurement}")`
3440
}

src/shared/contexts/buckets.tsx

Lines changed: 11 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,12 @@
11
// Libraries
2-
import React, {FC, createContext, useEffect, useMemo, useRef} from 'react'
2+
import React, {
3+
FC,
4+
createContext,
5+
useEffect,
6+
useMemo,
7+
useRef,
8+
useContext,
9+
} from 'react'
310
import {useDispatch} from 'react-redux'
411
import {createLocalStorageStateHook} from 'use-local-storage-state'
512
import {normalize} from 'normalizr'
@@ -18,6 +25,7 @@ import {
1825
// Types
1926
import {Bucket, BucketEntities, RemoteDataState} from 'src/types'
2027
import {QueryScope} from 'src/types/flows'
28+
import {PipeContext} from 'src/flows/context/pipe'
2129

2230
let MeasurementSchemaCreateRequest = null
2331
if (CLOUD) {
@@ -56,6 +64,7 @@ interface Props {
5664
export const BucketProvider: FC<Props> = ({children, scope}) => {
5765
const cacheKey = `${scope.region};;<${scope.org}>`
5866
const [bucketCache, setBucketCache] = useLocalStorageState()
67+
const {data} = useContext(PipeContext)
5968
const dispatch = useDispatch()
6069
const buckets = bucketCache[cacheKey]?.buckets ?? []
6170
const lastFetch = bucketCache[cacheKey]?.lastFetch ?? 0
@@ -309,6 +318,6 @@ export const BucketProvider: FC<Props> = ({children, scope}) => {
309318
{children}
310319
</BucketContext.Provider>
311320
),
312-
[loading, buckets]
321+
[data.bucket, loading, buckets]
313322
)
314323
}

yarn.lock

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1461,7 +1461,7 @@
14611461
resolved "https://registry.yarnpkg.com/@influxdata/flux-lsp-browser/-/flux-lsp-browser-0.8.15.tgz#5ae511c317ac5fb9f70e86a8195fb95e10b41da2"
14621462
integrity sha512-i0JVjMy+ZSUcvV0ILh+UQ38x2tYUp8nfUcxmNkYcwizG0HLPPmN0Xr7j311uWKj0LpTpQ4IxjRQsOsPNfF2KtA==
14631463

1464-
"@influxdata/giraffe@^2.28.0":
1464+
"@influxdata/giraffe@^2.29.0":
14651465
version "2.29.1"
14661466
resolved "https://registry.yarnpkg.com/@influxdata/giraffe/-/giraffe-2.29.1.tgz#7b85d9cefdb9c149f64051e9d35759858fc179d3"
14671467
integrity sha512-FUg2MM98Ax3SnS6I6X4gEU9wAIeoSK5oAT1TGt/gE5WEHmxZKbBN2b8zik/bTkJNfoCDNn9jwN7E5mO3OjjBRA==

0 commit comments

Comments
 (0)