Skip to content

PMM-13073: No configuration error #757

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

Open
doracretu3pillar wants to merge 1 commit into
base: v3
Choose a base branch
from
Open

PMM-13073: No configuration error #757

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
6 changes: 3 additions & 3 deletions public/app/features/alerting/unified/api/alertmanager.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -237,9 +237,9 @@ function getReceiverResultError(receiversResult: TestReceiversResult) {
export async function addAlertManagers(alertManagerConfig: ExternalAlertmanagerConfig): Promise<void> {
await lastValueFrom(
getBackendSrv().fetch({
method: 'POST',
method: 'PUT',
data: alertManagerConfig,
url: '/api/v1/ngalert/admin_config',
url: '/api/v1/provisioning/alert-rules',
showErrorAlert: false,
showSuccessAlert: false,
})
Expand All @@ -263,7 +263,7 @@ export async function fetchExternalAlertmanagerConfig(): Promise<ExternalAlertma
const result = await lastValueFrom(
getBackendSrv().fetch<ExternalAlertmanagerConfig>({
method: 'GET',
url: '/api/v1/ngalert/admin_config',
url: '/api/v1/provisioning/alert-rules',
showErrorAlert: false,
})
);
Expand Down
5 changes: 2 additions & 3 deletions public/app/features/alerting/unified/api/alertmanagerApi.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -96,17 +96,16 @@ export const alertmanagerApi = alertingApi.injectEndpoints({
}),

getExternalAlertmanagerConfig: build.query<ExternalAlertmanagerConfig, void>({
query: () => ({ url: '/api/v1/ngalert/admin_config' }),
query: () => ({ url: '/api/v1/provisioning/alert-rules' }),
providesTags: ['AlertmanagerChoice'],
}),

getExternalAlertmanagers: build.query<ExternalAlertmanagers, void>({
query: () => ({ url: '/api/v1/ngalert/alertmanagers' }),
transformResponse: (response: ExternalAlertmanagersResponse) => response.data,
}),

saveExternalAlertmanagersConfig: build.mutation<{ message: string }, ExternalAlertmanagerConfig>({
query: (config) => ({ url: '/api/v1/ngalert/admin_config', method: 'POST', data: config }),
query: (config) => ({ url: '/api/v1/provisioning/alert-rules', method: 'PUT', data: config }),
invalidatesTags: ['AlertmanagerChoice'],
}),

Expand Down