Skip to content

Remove metrics unit of measures #1261

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
ps48 merged 1 commit into from
Nov 4, 2022
Merged

Remove metrics unit of measures #1261

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion dashboards-observability/common/constants/metrics.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ export const resolutionOptions = [
{ value: 'm', text: 'minutes' },
{ value: 'h', text: 'hours' },
{ value: 'd', text: 'days' },
// { value: 'M', text: 'Months' },
// { value: 'M', text: 'Months' }, // commenting it here as prometheus doesn't have support
// { value: 'q', text: 'quarters' },
{ value: 'y', text: 'years' },
];
Expand Down
2 changes: 0 additions & 2 deletions dashboards-observability/public/components/metrics/helpers/utils.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -184,7 +184,6 @@ export const createPrometheusMetricById = (metricId: string) => {
tokens: [],
},
sub_type: 'metric',
units_of_measure: UNITS_OF_MEASURE[1],
user_configs: {},
};
};
Expand All @@ -209,6 +208,5 @@ export const updateMetricsWithSelections = (
type: 'line',
subType: 'metric',
userConfigs: JSON.stringify(savedVisualization.user_configs),
unitsOfMeasure: savedVisualization.units_of_measure,
};
};
2 changes: 1 addition & 1 deletion ...ic/components/metrics/top_menu/__tests__/__snapshots__/metrics_export_panel.test.tsx.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ exports[`Export Metrics Panel Component renders Export Metrics Panel Component 1
<div
style={
Object {
"minWidth": "25vw",
"minWidth": "15vw",
}
}
>
Expand Down
25 changes: 1 addition & 24 deletions dashboards-observability/public/components/metrics/top_menu/metrics_export_panel.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,9 +14,7 @@ import {
EuiFormRow,
EuiFlexItem,
EuiForm,
EuiSelect,
} from '@elastic/eui';
import { UNITS_OF_MEASURE } from '../../../../common/constants/explorer';
import { createPrometheusMetricById } from '../helpers/utils';
import { MetricType } from '../../../../common/types/metrics';
import { fetchVisualizationById } from '../../custom_panels/helpers/utils';
Expand Down Expand Up @@ -82,14 +80,8 @@ export const MetricsExportPanel = ({
setVisualizationsMetaData(tempVisualizationsMetaData);
};

const onMeasureChange = (index: number, measureOption: any) => {
let tempVisualizationsMetaData = [...visualizationsMetaData];
tempVisualizationsMetaData[index].units_of_measure = measureOption;
setVisualizationsMetaData(tempVisualizationsMetaData);
};

return (
<div style={{ minWidth: '25vw' }}>
<div style={{ minWidth: '15vw' }}>
<EuiFormRow
label="Custom operational dashboards/application"
helpText="Search existing dashboards or applications by name"
Expand Down Expand Up @@ -127,21 +119,6 @@ export const MetricsExportPanel = ({
/>
</EuiFormRow>
</EuiFlexItem>

<EuiFlexItem>
<EuiFormRow label="Units of Measure">
<EuiSelect
id={'selector' + index}
options={UNITS_OF_MEASURE.map((i) => {
return { value: i, text: i };
})}
value={visualizationsMetaData[index].units_of_measure}
onChange={(e) => onMeasureChange(index, e.target.value)}
data-test-subj="metrics__measureSelector"
aria-label="metrics__measureSelector"
/>
</EuiFormRow>
</EuiFlexItem>
</EuiFlexGroup>
</EuiForm>
);
Expand Down
6 changes: 0 additions & 6 deletions dashboards-observability/test/metrics_contants.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,6 @@ export const sampleMetric = {
},
user_configs: '{}',
sub_type: 'metric',
units_of_measure: 'kilometers (k)',
};

export const sampleSortedMetricsLayout = [
Expand Down Expand Up @@ -102,7 +101,6 @@ export const sampleVisualizationById = {
selected_fields: {},
user_configs: {},
sub_type: 'metric',
units_of_measure: 'kilometers (k)',
};

export const sampleAllAvailableMetrics = [
Expand Down Expand Up @@ -204,7 +202,6 @@ export const samplePrometheusVisualizationComponent = {
tokens: [],
},
sub_type: 'metric',
units_of_measure: 'hours (h)',
user_configs: {},
};

Expand Down Expand Up @@ -261,7 +258,6 @@ export const samplePrometheusSampleUpdateWithSelections = {
subType: 'metric',
timestamp: '@timestamp',
type: 'line',
unitsOfMeasure: 'hours (h)',
userConfigs: '{}',
};

Expand Down Expand Up @@ -312,7 +308,6 @@ export const sampleSavedMetric = {
},
},
sub_type: 'metric',
units_of_measure: 'hours (h)',
};

export const sampleSavedMetricUpdate = {
Expand All @@ -325,7 +320,6 @@ export const sampleSavedMetricUpdate = {
subType: 'metric',
timestamp: 'timestamp',
type: 'line',
unitsOfMeasure: 'hours (h)',
userConfigs:
'{"dataConfig":{"series":[{"label":"machine.ram","name":"machine.ram","aggregation":"avg","customLabel":""}],"dimensions":[],"span":{"time_field":[{"name":"timestamp","type":"timestamp","label":"timestamp"}],"unit":[{"text":"Day","value":"d","label":"Day"}],"interval":"1"}}}',
};