IntenseWebs/grafana
3
0
Fork 0
mirror of https://github.com/grafana/grafana.git synced 2025-02-25 18:55:37 -06:00
Code Issues Packages Projects Releases Wiki Activity

Alerting: fix alert supported warning when editing data source name (#55886)

Browse Source
This commit is contained in:
Sonia Aguilar 2022-09-28 14:41:54 +02:00 committed by GitHub
parent cf1862ecc4
commit ef641ea9c9
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 12 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
public/app/features/datasources/components/BasicSettings.test.tsx
View File

@ -11,6 +11,7 @@ const setup = () => {
isDefault: false,
onDefaultChange: jest.fn(),
onNameChange: jest.fn(),
alertingSupported: false,
};
return render(<BasicSettings {...props} />);

10
public/app/features/datasources/components/BasicSettings.tsx
View File

@ -3,7 +3,6 @@ import React from 'react';
import { GrafanaTheme2 } from '@grafana/data';
import { selectors } from '@grafana/e2e-selectors';
import { getDataSourceSrv } from '@grafana/runtime';
import { InlineField, InlineSwitch, Input, Badge, useStyles2 } from '@grafana/ui';
export interface Props {
@ -11,16 +10,13 @@ export interface Props {
isDefault: boolean;
onNameChange: (name: string) => void;
onDefaultChange: (value: boolean) => void;
alertingSupported: boolean;
}
export function BasicSettings({ dataSourceName, isDefault, onDefaultChange, onNameChange }: Props) {
const ds = getDataSourceSrv()?.getInstanceSettings(dataSourceName);
const hasAlertingEnabled = Boolean(ds?.meta?.alerting ?? false);
const isAlertManagerDatasource = ds?.type === 'alertmanager';
export function BasicSettings({ dataSourceName, isDefault, onDefaultChange, onNameChange, alertingSupported }: Props) {
return (
<>
{<AlertingEnabled enabled={hasAlertingEnabled || isAlertManagerDatasource} />}
{<AlertingEnabled enabled={alertingSupported} />}
<div className="gf-form-group" aria-label="Datasource settings page basic settings">
<div className="gf-form-inline">
{/* Name */}

9
public/app/features/datasources/components/EditDataSource.tsx
View File

@ -2,6 +2,7 @@ import { AnyAction } from '@reduxjs/toolkit';
import React from 'react';
import { DataSourcePluginMeta, DataSourceSettings as DataSourceSettingsType } from '@grafana/data';
import { getDataSourceSrv } from '@grafana/runtime';
import PageLoader from 'app/core/components/PageLoader/PageLoader';
import { DataSourceSettingsState, useDispatch } from 'app/types';
@ -106,9 +107,14 @@ export function EditDataSourceView({
const { readOnly, hasWriteRights, hasDeleteRights } = dataSourceRights;
const hasDataSource = dataSource.id > 0;
const ds = getDataSourceSrv()?.getInstanceSettings(dataSource.uid);
const hasAlertingEnabled = Boolean(ds?.meta?.alerting ?? false);
const isAlertManagerDatasource = ds?.type === 'alertmanager';
const alertingSupported = hasAlertingEnabled || isAlertManagerDatasource;
const onSubmit = async (e: React.FormEvent<HTMLFormElement>) => {
e.preventDefault();
await onUpdate({ ...dataSource });
onTest();
@ -144,6 +150,7 @@ export function EditDataSourceView({
isDefault={dataSource.isDefault}
onDefaultChange={onDefaultChange}
onNameChange={onNameChange}
alertingSupported={alertingSupported}
/>
{plugin && (