diff --git a/engine/config_integrations/grafana_alerting.py b/engine/config_integrations/grafana_alerting.py index 5427fc22..bc703dd9 100644 --- a/engine/config_integrations/grafana_alerting.py +++ b/engine/config_integrations/grafana_alerting.py @@ -18,7 +18,7 @@ Alerts from Grafana Alertmanager are automatically routed to this integration.
Click here to open contact point, and here - to open routes for {{dict_item.alertmanager_name}} Alertmanager. + to open Notification policy for {{dict_item.alertmanager_name}} Alertmanager. {% endfor %} {% if not is_finished_alerting_setup %}
Creating contact points and routes for other alertmanagers... diff --git a/grafana-plugin/src/containers/IntegrationContainers/ExpandedIntegrationRouteDisplay/ExpandedIntegrationRouteDisplay.tsx b/grafana-plugin/src/containers/IntegrationContainers/ExpandedIntegrationRouteDisplay/ExpandedIntegrationRouteDisplay.tsx index 98f2566c..716147ef 100644 --- a/grafana-plugin/src/containers/IntegrationContainers/ExpandedIntegrationRouteDisplay/ExpandedIntegrationRouteDisplay.tsx +++ b/grafana-plugin/src/containers/IntegrationContainers/ExpandedIntegrationRouteDisplay/ExpandedIntegrationRouteDisplay.tsx @@ -9,7 +9,6 @@ import { Icon, Tooltip, ConfirmModal, - Select, LoadingPlaceholder, } from '@grafana/ui'; import cn from 'classnames/bind'; @@ -26,13 +25,13 @@ import TooltipBadge from 'components/TooltipBadge/TooltipBadge'; import { WithContextMenu } from 'components/WithContextMenu/WithContextMenu'; import { ChatOpsConnectors } from 'containers/AlertRules/parts'; import EscalationChainSteps from 'containers/EscalationChainSteps/EscalationChainSteps'; +import GSelect from 'containers/GSelect/GSelect'; import styles from 'containers/IntegrationContainers/ExpandedIntegrationRouteDisplay/ExpandedIntegrationRouteDisplay.module.scss'; import TeamName from 'containers/TeamName/TeamName'; import { WithPermissionControlTooltip } from 'containers/WithPermissionControl/WithPermissionControlTooltip'; import { AlertReceiveChannel } from 'models/alert_receive_channel/alert_receive_channel.types'; import { AlertTemplatesDTO } from 'models/alert_templates'; import { ChannelFilter } from 'models/channel_filter/channel_filter.types'; -import { EscalationChain } from 'models/escalation_chain/escalation_chain.types'; import CommonIntegrationHelper from 'pages/integration_2/CommonIntegration2.helper'; import { MONACO_INPUT_HEIGHT_SMALL, MONACO_OPTIONS } from 'pages/integration_2/Integration2.config'; import IntegrationHelper from 'pages/integration_2/Integration2.helper'; @@ -195,20 +194,15 @@ const ExpandedIntegrationRouteDisplay: React.FC - + /> @@ -279,7 +273,7 @@ const ExpandedIntegrationRouteDisplay: React.FC { setResult(data); if (data?.preview === 'True') { setConditionalResult({ isResult: true, value: 'True' }); - } else if (data?.preview === 'False') { + } else if (templateName.includes('route') || templateName.includes('condition')) { setConditionalResult({ isResult: true, value: 'False' }); } else { setConditionalResult({ isResult: false, value: undefined }); @@ -87,7 +87,7 @@ const TemplatePreview = observer((props: TemplatePreviewProps) => { <> {conditionalResult?.isResult ? ( - {conditionalResult.isResult ? ( + {conditionalResult.value === 'True' ? ( {conditionalResult.value} @@ -101,7 +101,7 @@ const TemplatePreview = observer((props: TemplatePreviewProps) => {
@@ -113,7 +113,13 @@ const TemplatePreview = observer((props: TemplatePreviewProps) => { <> {templateName.includes('image') ? (
- + { + const target = e.target as HTMLImageElement; + target.alt = result.preview || 'No image found'; + }} + />
) : (