diff --git a/dashboards-observability/common/constants/metrics.ts b/dashboards-observability/common/constants/metrics.ts index 4a2d8e114..dbe64b88b 100644 --- a/dashboards-observability/common/constants/metrics.ts +++ b/dashboards-observability/common/constants/metrics.ts @@ -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' }, ]; diff --git a/dashboards-observability/public/components/metrics/helpers/utils.tsx b/dashboards-observability/public/components/metrics/helpers/utils.tsx index fe10a58c0..dd7524bd3 100644 --- a/dashboards-observability/public/components/metrics/helpers/utils.tsx +++ b/dashboards-observability/public/components/metrics/helpers/utils.tsx @@ -184,7 +184,6 @@ export const createPrometheusMetricById = (metricId: string) => { tokens: [], }, sub_type: 'metric', - units_of_measure: UNITS_OF_MEASURE[1], user_configs: {}, }; }; @@ -209,6 +208,5 @@ export const updateMetricsWithSelections = ( type: 'line', subType: 'metric', userConfigs: JSON.stringify(savedVisualization.user_configs), - unitsOfMeasure: savedVisualization.units_of_measure, }; }; diff --git a/dashboards-observability/public/components/metrics/top_menu/__tests__/__snapshots__/metrics_export_panel.test.tsx.snap b/dashboards-observability/public/components/metrics/top_menu/__tests__/__snapshots__/metrics_export_panel.test.tsx.snap index c13ac42f8..f9101b0ea 100644 --- a/dashboards-observability/public/components/metrics/top_menu/__tests__/__snapshots__/metrics_export_panel.test.tsx.snap +++ b/dashboards-observability/public/components/metrics/top_menu/__tests__/__snapshots__/metrics_export_panel.test.tsx.snap @@ -44,7 +44,7 @@ exports[`Export Metrics Panel Component renders Export Metrics Panel Component 1
diff --git a/dashboards-observability/public/components/metrics/top_menu/metrics_export_panel.tsx b/dashboards-observability/public/components/metrics/top_menu/metrics_export_panel.tsx index 0a4993966..9a26d4630 100644 --- a/dashboards-observability/public/components/metrics/top_menu/metrics_export_panel.tsx +++ b/dashboards-observability/public/components/metrics/top_menu/metrics_export_panel.tsx @@ -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'; @@ -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 ( -
+
- - - - { - 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" - /> - - ); diff --git a/dashboards-observability/test/metrics_contants.ts b/dashboards-observability/test/metrics_contants.ts index 2e8c08da6..7fd210468 100644 --- a/dashboards-observability/test/metrics_contants.ts +++ b/dashboards-observability/test/metrics_contants.ts @@ -53,7 +53,6 @@ export const sampleMetric = { }, user_configs: '{}', sub_type: 'metric', - units_of_measure: 'kilometers (k)', }; export const sampleSortedMetricsLayout = [ @@ -102,7 +101,6 @@ export const sampleVisualizationById = { selected_fields: {}, user_configs: {}, sub_type: 'metric', - units_of_measure: 'kilometers (k)', }; export const sampleAllAvailableMetrics = [ @@ -204,7 +202,6 @@ export const samplePrometheusVisualizationComponent = { tokens: [], }, sub_type: 'metric', - units_of_measure: 'hours (h)', user_configs: {}, }; @@ -261,7 +258,6 @@ export const samplePrometheusSampleUpdateWithSelections = { subType: 'metric', timestamp: '@timestamp', type: 'line', - unitsOfMeasure: 'hours (h)', userConfigs: '{}', }; @@ -312,7 +308,6 @@ export const sampleSavedMetric = { }, }, sub_type: 'metric', - units_of_measure: 'hours (h)', }; export const sampleSavedMetricUpdate = { @@ -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"}}}', };