Skip to content

Commit 591421b

Browse files
committed
Raise default log limit to 1000
1 parent 10de527 commit 591421b

File tree

5 files changed

+10
-6
lines changed

5 files changed

+10
-6
lines changed

src/components/QueryEditor/MetricAggregationsEditor/SettingsEditor/LogsSettingsEditor.tsx

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,24 +5,26 @@ import { Logs, LogsSortDirection, LogsEnd } from "types";
55
import { SettingField } from "./SettingField";
66
import { useDispatch } from "hooks/useStatelessReducer";
77
import { changeMetricSetting } from '../state/actions';
8+
import { metricAggregationConfig } from "../utils";
89

910

1011
// type LogsSortDirection = 'asc' | 'desc'
1112

1213
interface Props { metric: Logs }
1314

1415
export const LogsSettingsEditor = ({metric}: Props)=>{
16+
const config = metricAggregationConfig['logs']
1517
const dispatch = useDispatch();
1618
return (
1719
<div className={css({display:"inline-flex", justifyContent:"start", gap:"4px", height:"100%"})} >
1820
<RadioButtonGroup
1921
className={css({height:"100%"})}
2022
options={Object.values(LogsSortDirection).map((v)=>({label:LogsEnd[v], value:v}))}
21-
value={metric.settings?.sortDirection || 'desc' }
23+
value={metric.settings?.sortDirection || config.defaults.settings?.sortDirection }
2224
onChange={(v)=>{ dispatch(
2325
changeMetricSetting({ metric, settingName: 'sortDirection', newValue: v })
2426
)}}/>
25-
<SettingField label="Limit" metric={metric} settingName="limit" placeholder="100" />
27+
<SettingField label="Limit" metric={metric} settingName="limit" placeholder={config.defaults.settings?.limit} />
2628
</div>
2729
)
2830

src/components/QueryEditor/MetricAggregationsEditor/SettingsEditor/useDescription.ts

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
import { extendedStats } from 'queryDef';
22
import { Logs, LogsEnd, MetricAggregation } from '@/types';
3+
import { metricAggregationConfig } from '../utils';
34

45
const hasValue = (value: string) => (object: { value: string }) => object.value === value;
56

@@ -35,8 +36,9 @@ export const useDescription = (metric: MetricAggregation): string => {
3536
}
3637

3738
case 'logs': {
39+
const config = metricAggregationConfig['logs']
3840
const logsmetric: Logs = metric
39-
const sort = LogsEnd[logsmetric.settings?.sortDirection || "desc"]
41+
const sort = LogsEnd[logsmetric.settings?.sortDirection || config.defaults.settings!.sortDirection!]
4042
const limit = logsmetric.settings?.limit || 100
4143
return `${sort} ${limit}`
4244
}

src/components/QueryEditor/MetricAggregationsEditor/utils.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -243,7 +243,7 @@ export const metricAggregationConfig: MetricsConfiguration = {
243243
hasMeta: false,
244244
defaults: {
245245
settings: {
246-
limit: '100',
246+
limit: '1000',
247247
sortDirection:'desc' as LogsSortDirection
248248
},
249249
},

src/queryDef.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ export function defaultMetricAgg(id = '1'): MetricAggregation {
3232
}
3333

3434
export function defaultLogsAgg(id = '1'): MetricAggregation {
35-
return { type: 'logs', id };
35+
return { type: 'logs', id, ...metricAggregationConfig['logs'].defaults };
3636
}
3737

3838
export function defaultBucketAgg(id = '1'): DateHistogram {

src/types.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -75,7 +75,7 @@ interface MetricConfiguration<T extends MetricAggregationType> {
7575
impliedQueryType: QueryType;
7676
hasSettings: boolean;
7777
hasMeta: boolean;
78-
defaults: Omit<Extract<MetricAggregation|Logs, { type: T }>, 'id' | 'type'>;
78+
defaults: Omit<Extract<Exclude<MetricAggregation,SchemaLogs>|Logs, { type: T }>, 'id' | 'type'>;
7979
}
8080

8181
type BucketConfiguration<T extends BucketAggregationType> = {

0 commit comments

Comments
 (0)