Skip to content

[Backport main] Save new prometheus metrics to OSD saved objects #433

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
mengweieric merged 1 commit into from
Apr 27, 2023
Merged

[Backport main] Save new prometheus metrics to OSD saved objects #433

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
14 changes: 10 additions & 4 deletions public/components/metrics/top_menu/top_menu.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,9 @@ import { resolutionOptions } from '../../../../common/constants/metrics';
import { MetricType } from '../../../../common/types/metrics';
import { uiSettingsService } from '../../../../common/utils';
import SavedObjects from '../../../services/saved_objects/event_analytics/saved_objects';
import { getSavedObjectsClient } from '../../../services/saved_objects/saved_object_client/client_factory';
import { OSDSavedVisualizationClient } from '../../../services/saved_objects/saved_object_client/osd_saved_objects/saved_visualization';
import { addMultipleVizToPanels, uuidRx } from '../../custom_panels/redux/panel_slice';
import { sortMetricLayout, updateMetricsWithSelections } from '../helpers/utils';
import {
allAvailableMetricsSelector,
Expand All @@ -36,7 +39,6 @@ import {
import { SearchBar } from '../sidebar/search_bar';
import { MetricsExportPanel } from './metrics_export_panel';
import './top_menu.scss';
import { addMultipleVizToPanels, uuidRx } from '../../custom_panels/redux/panel_slice';

interface TopMenuProps {
http: CoreStart['http'];
Expand Down Expand Up @@ -170,9 +172,12 @@ export const TopMenu = ({
);

if (metricLayout.metricType === 'prometheusMetric') {
return await savedObjects.createSavedVisualization(updatedMetric);
return OSDSavedVisualizationClient.getInstance().create(updatedMetric);
} else {
return await savedObjects.updateSavedVisualizationById({
return getSavedObjectsClient({
objectId: metricLayout.id,
objectType: 'savedVisualization',
}).update({
...updatedMetric,
objectId: metricLayout.id,
});
Expand All @@ -182,7 +187,8 @@ export const TopMenu = ({
} catch (e) {
const message = 'Issue in saving metrics';
console.error(message, e);
setToast('Issue in saving metrics', 'danger');
setToast(message, 'danger');
return;
}

setToast('Saved metrics successfully!');
Expand Down