centralcloud/oncall-engine
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge pull request #4823 from grafana/dev

Browse source 
v1.8.12
This commit is contained in:
Yulya Artyukhina 2024-08-14 16:42:08 +02:00 • committed by GitHub
commit f579294e2d
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
7 changed files with 188 additions and 128 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
engine/apps/metrics_exporter/metrics_collectors.py
View file

@ -232,3 +232,6 @@ class ApplicationMetricsCollector:
recalculate_orgs.append({"organization_id": org_id, "force": force_task})
if recalculate_orgs:
start_calculate_and_cache_metrics.apply_async((recalculate_orgs,))
application_metrics_registry.register(ApplicationMetricsCollector())

2
grafana-plugin/package.json
View file

@ -145,7 +145,7 @@
"@grafana/ui": "^11.1.3",
"@lifeomic/attempt": "^3.0.3",
"array-move": "^4.0.0",
"axios": "^1.6.7",
"axios": "^1.7.4",
"change-case": "^4.1.1",
"circular-dependency-plugin": "^5.2.2",
"classnames": "^2.3.2",

8
grafana-plugin/src/assets/style/utils.css
View file

@ -36,6 +36,10 @@
margin-right: 4px;
}
.u-margin-left-xs {
margin-left: 4px;
}
.u-margin-bottom-none {
margin-bottom: 0;
}
@ -44,6 +48,10 @@
margin-bottom: 12px;
}
.u-margin-bottom-xxs {
margin-bottom: 2px;
}
.u-margin-top-xs {
margin-top: 4px;
}

2
grafana-plugin/src/components/WithConfirm/WithConfirm.tsx
View file

@ -17,6 +17,7 @@ export const WithConfirm: React.FC<WithConfirmProps> = ({
children,
disabled,
skip = false,
modalClass,
}) => {
const [showConfirmation, setShowConfirmation] = useState<boolean>(false);
@ -57,6 +58,7 @@ export const WithConfirm: React.FC<WithConfirmProps> = ({
onDismiss={() => {
setShowConfirmation(false);
}}
modalClass={modalClass}
/>
)}
{React.cloneElement(children, {

17
grafana-plugin/src/pages/settings/tabs/ChatOps/tabs/SlackSettings/SlackSettings.module.css
View file

@ -18,7 +18,7 @@
.slack-infoblock {
text-align: center;
width: 725px;
width: 100%;
}
.external-link-style {
@ -33,10 +33,9 @@
.infoblock-text {
margin-left: 48px;
margin-right: 48px;
margin-top: 24px;
}
.infoblock-icon {
.marginTop {
margin-top: 24px;
}
@ -47,10 +46,18 @@
transform: translateY(-50%);
}
.upgradeSlackAlert svg {
display: none;
.upgradeSlackAlertText {
margin-right: 110px;
a {
font-weight: 600;
}
}
.linkToIncidentWrapper {
margin-top: 16px;
}
.confirmUninstallModal input {
min-width: 300px;
}

240
grafana-plugin/src/pages/settings/tabs/ChatOps/tabs/SlackSettings/SlackSettings.tsx
View file

@ -4,13 +4,13 @@ import {
Alert,
HorizontalGroup,
LoadingPlaceholder,
VerticalGroup,
Icon,
Button,
InlineField,
Input,
Legend,
ConfirmModal,
Stack,
} from '@grafana/ui';
import cn from 'classnames/bind';
import { observer } from 'mobx-react';
@ -31,7 +31,7 @@ import { WithStoreProps } from 'state/types';
import { useStore } from 'state/useStore';
import { withMobXProviderContext } from 'state/withStore';
import { UserActions } from 'utils/authorization/authorization';
import { DOCS_SLACK_SETUP, getPluginId } from 'utils/consts';
import { DOCS_ROOT, DOCS_SLACK_SETUP, getPluginId } from 'utils/consts';
import { useConfirmModal } from 'utils/hooks';
import { showApiError } from 'utils/utils';
@ -122,9 +122,74 @@ class _SlackSettings extends Component<SlackProps, SlackState> {
const isUnifiedSlackInstalled = !currentOrganization.slack_team_identity.needs_reinstall;
const uninstallSlackButton = (
<WithPermissionControlTooltip userAction={UserActions.ChatOpsUpdateSettings}>
{isUnifiedSlackInstalled ? (
<WithConfirm
title="Uninstall IRM Slack integration"
modalClass={styles.confirmUninstallModal}
description={
<div>
<Alert severity="error" title="">
Are you sure you want to remove this integration from OnCall and Incident?
</Alert>
<p>
This action will uninstall the IRM Slack integration from OnCall and Incident. The following IRM data
will be permanently deleted:
</p>
<ul style={{ marginLeft: '20px' }}>
<li>OnCall default Slack channel</li>
<li>Slack channels for OnCall escalation policies</li>
<li>Slack channels and user groups for OnCall schedules</li>
<li>Linked Slack profiles for OnCall users</li>
<li>Incident announcement and automatic Slack channel creation</li>
</ul>
<br />
</div>
}
confirmationText="UNINSTALL"
confirmText="Uninstall"
>
<Button variant="destructive" fill="outline" onClick={() => this.removeSlackIntegration()}>
Uninstall
</Button>
</WithConfirm>
) : (
<WithConfirm
title="Remove Slack Integration for all of OnCall"
description={
<Alert severity="error" title="WARNING">
<p>Are you sure to delete this Slack Integration?</p>
<p>Removing the integration will also irreverisbly remove the following data for your OnCall plugin:</p>
<ul style={{ marginLeft: '20px' }}>
<li>default organization Slack channel</li>
<li>default Slack channels for OnCall Integrations</li>
<li>Slack channels & Slack user groups for OnCall Schedules</li>
<li>linked Slack usernames for OnCall Users</li>
</ul>
<br />
<p>
If you would like to instead remove your linked Slack username, please head{' '}
<PluginLink query={{ page: 'users/me' }}>here</PluginLink>.
</p>
</Alert>
}
confirmationText="DELETE"
>
<Button variant="destructive" fill="outline" onClick={() => this.removeSlackIntegration()}>
Uninstall
</Button>
</WithConfirm>
)}
</WithPermissionControlTooltip>
);
return (
<div className={cx('root')}>
<Legend>Slack App settings</Legend>
<Stack>
<Legend>Slack OnCall settings</Legend>
{uninstallSlackButton}
</Stack>
{currentOrganization.slack_team_identity.needs_reinstall && <UpgradeToUnifiedSlackBanner />}
<InlineField label="Slack Workspace" grow disabled>
<Input value={currentOrganization?.slack_team_identity?.cached_name} />
@ -152,62 +217,6 @@ class _SlackSettings extends Component<SlackProps, SlackState> {
severity="info"
title="Tip: Create a separate channel for OnCall Slack App notifications (catch-all). Avoid using #general, etc."
/>
<InlineField>
<WithPermissionControlTooltip userAction={UserActions.ChatOpsUpdateSettings}>
{isUnifiedSlackInstalled ? (
<WithConfirm
title="Remove IRM Slack integration"
description={
<Alert severity="error" title="WARNING">
<p>Are you sure to delete this Slack Integration? It will affect both OnCall & Incident.</p>
<p>Removing the integration will irreverisbly remove the following data for IRM;</p>
<ul style={{ marginLeft: '20px' }}>
<li>OnCall default Slack channel</li>
<li>Slack channels for OnCall escalation policies</li>
<li>Slack channels & Slack user groups for OnCall Schedules</li>
<li>linked Slack usernames for OnCall Users</li>
<li>Incident hooks</li>
</ul>
<br />
</Alert>
}
confirmationText="DELETE"
>
<Button variant="destructive" onClick={() => this.removeSlackIntegration()}>
Disconnect Slack App
</Button>
</WithConfirm>
) : (
<WithConfirm
title="Remove Slack Integration for all of OnCall"
description={
<Alert severity="error" title="WARNING">
<p>Are you sure to delete this Slack Integration?</p>
<p>
Removing the integration will also irreverisbly remove the following data for your OnCall plugin:
</p>
<ul style={{ marginLeft: '20px' }}>
<li>default organization Slack channel</li>
<li>default Slack channels for OnCall Integrations</li>
<li>Slack channels & Slack user groups for OnCall Schedules</li>
<li>linked Slack usernames for OnCall Users</li>
</ul>
<br />
<p>
If you would like to instead remove your linked Slack username, please head{' '}
<PluginLink query={{ page: 'users/me' }}>here</PluginLink>.
</p>
</Alert>
}
confirmationText="DELETE"
>
<Button variant="destructive" onClick={() => this.removeSlackIntegration()}>
Disconnect Slack App
</Button>
</WithConfirm>
)}
</WithPermissionControlTooltip>
</InlineField>
<Legend>Additional settings</Legend>
<InlineField
label="Timeout for acknowledged alerts"
@ -287,56 +296,53 @@ class _SlackSettings extends Component<SlackProps, SlackState> {
const isUnifiedSlackEnabled = store.hasFeature(AppFeature.UnifiedSlack);
return (
<VerticalGroup spacing="lg">
<Text.Title level={2}>Connect Slack workspace</Text.Title>
<Stack gap={4} direction="column">
<Stack justifyContent={'space-between'}>
<Text.Title level={2}>Slack</Text.Title>
{isLiveSettingAvailable ? (
<PluginLink query={{ page: 'live-settings' }}>
<Button variant="primary">Setup ENV Variables</Button>
</PluginLink>
) : (
<Stack grow={0}>
<Button onClick={this.handleOpenSlackInstructions}>Install integration</Button>
{store.hasFeature(AppFeature.LiveSettings) && (
<PluginLink query={{ page: 'live-settings' }}>
<Button variant="secondary">See ENV Variables</Button>
</PluginLink>
)}
</Stack>
)}
</Stack>
<Block bordered withBackground className={cx('slack-infoblock')}>
<VerticalGroup align="center">
<div className={cx('infoblock-icon')}>
<Stack direction="column" alignItems="center" gap={0}>
<div className={cx('marginTop')}>
<SlackNewIcon />
</div>
<Text className={cx('infoblock-text')}>
<Text className={cx(['infoblock-text', 'marginTop'])}>
{isUnifiedSlackEnabled
? 'Connecting Slack App will allow you to manage alert groups and incidents in your team Slack workspace.'
: 'Connecting Slack App will allow you to manage alert groups in your team Slack workspace.'}
</Text>
<Text className={cx('infoblock-text')}>
After a basic workspace connection your team members need to connect their personal Slack accounts in
order to be allowed to manage alert groups.
Once the workspace is connected, team members need to link their Slack accounts to their IRM users to
start using the app.
</Text>
{isLiveSettingAvailable && (
<Text type="secondary" className={cx('infoblock-text')}>
<Text type="secondary" className={cx('infoblock-text', 'marginTop')}>
For bot creating instructions and additional information please read{' '}
<a href={DOCS_SLACK_SETUP} target="_blank" rel="noreferrer">
<Text type="link">our documentation</Text>
</a>
</Text>
)}
<img
style={{ height: '350px', display: 'block', margin: '0 auto' }}
src={`public/plugins/${getPluginId()}/assets/img/slack_instructions.png`}
/>
</VerticalGroup>
</Stack>
</Block>
{isLiveSettingAvailable ? (
<PluginLink query={{ page: 'live-settings' }}>
<Button variant="primary">Setup ENV Variables</Button>
</PluginLink>
) : (
<HorizontalGroup>
<Button onClick={this.handleOpenSlackInstructions}>
<HorizontalGroup spacing="xs" align="center">
<Icon name="external-link-alt" className={cx('external-link-style')} /> Open Slack connection page
</HorizontalGroup>
</Button>
{store.hasFeature(AppFeature.LiveSettings) && (
<PluginLink query={{ page: 'live-settings' }}>
<Button variant="secondary">See ENV Variables</Button>
</PluginLink>
)}
</HorizontalGroup>
)}
</VerticalGroup>
</Stack>
);
};
}
@ -350,48 +356,58 @@ const UpgradeToUnifiedSlackBanner = observer(() => {
return (
<>
<ConfirmModal {...modalProps} />
<Alert
className={styles.upgradeSlackAlert}
severity="success"
title="Upgrade to Grafana IRM unified Slack app"
buttonContent={<div>Upgrade</div>}
>
We've rebranded the OnCall Slack app as the Grafana IRM Slack app, now with incident management features.
<p>Click "Upgrade" to reviewn and approve the new permissions and complete the process.</p>
<p>For more details, check our documentation.</p>
<Alert severity="warning" title="This integration is outdated" buttonContent="Migrate">
<div className={styles.upgradeSlackAlertText}>
The OnCall Slack app is now a Grafana IRM app with new incident management features. Migrate now to access the
enhanced capabilities.{' '}
<a href={`${DOCS_ROOT}`} target="_blank" rel="noreferrer">
{/* TODO: update link to docs */}
Learn more
</a>
</div>
<Button
variant="secondary"
className={styles.upgradeSlackBtn}
variant="secondary"
onClick={() =>
openModal({
confirmText: 'Confirm',
confirmText: 'Migrate',
onConfirm: installSlackIntegration,
confirmButtonVariant: 'primary',
title: `Upgrade to Grafana IRM Slack app`,
title: `Migrate to Grafana IRM Slack integration`,
description: (
<div>
<p>
You will be redirected to Slack to approve additional permissions for the Grafana IRM Slack app.{' '}
You will be redirected to Slack to approve additional permissions for the Grafana IRM Slack app. New
permissions are necessary for incident management features.
</p>
<p>After the migration, you can use OnCall and Incident features in a single app:</p>
<p>
These permissions are necessary for incident management. You can view the detailed list of new
permissions here.[LINK]
<ul style={{ marginLeft: '20px' }}>
<li>The OnCall Slack configuration will remain intact.</li>
<li>
The Incident Slack integration will be upgraded to Grafana IRM Slack. Announcement and Create
Slack Channel hooks will be migrated, active incident can still be managed.
</li>
</ul>
</p>
<p>After the upgrade, you'll be able to manage incidents in Slack using the Grafana IRM Slack app.</p>
<ul style={{ marginLeft: '20px' }}>
<li>Your OnCall Slack configuration will remain unchanged. </li>
<li>
Your Incident Slack integration will be upgraded to use the Grafana IRM Slack app. Please refer to
the documentation for more details.[LINK]
</li>
</ul>
<a
href={`${DOCS_ROOT}`} // TODO: update link to docs
target="_blank"
rel="noreferrer"
className={styles.marginTop}
>
<Text type="link">
<span>Learn more in the docs</span>
<Icon name="external-link-alt" className="u-margin-left-xs u-margin-bottom-xxs" />
</Text>
</a>
</div>
),
confirmVariant: 'secondary',
})
}
>
Upgrade
Migrate
</Button>
</Alert>
</>

44
grafana-plugin/yarn.lock
View file

@ -4780,12 +4780,12 @@ available-typed-arrays@^1.0.7:
dependencies:
possible-typed-array-names "^1.0.0"
axios@^1.6.7:
version "1.6.7"
resolved "https://registry.yarnpkg.com/axios/-/axios-1.6.7.tgz#7b48c2e27c96f9c68a2f8f31e2ab19f59b06b0a7"
integrity sha512-/hDJGff6/c7u0hDkvkGxR/oy6CbCs8ziCsC7SqmhjfozqiJGc8Z11wrv9z9lYfY4K8l+H9TpjcMDX0xOZmx+RA==
axios@^1.7.4:
version "1.7.4"
resolved "https://registry.yarnpkg.com/axios/-/axios-1.7.4.tgz#4c8ded1b43683c8dd362973c393f3ede24052aa2"
integrity sha512-DukmaFRnY6AzAALSH4J2M3k6PkaC+MfaAGdEERRWcC9q3/TWQwLpHR8ZRLKTdQ3aBDL64EdluRDjJqKw+BPZEw==
dependencies:
follow-redirects "^1.15.4"
follow-redirects "^1.15.6"
form-data "^4.0.0"
proxy-from-env "^1.1.0"
@ -7626,7 +7626,7 @@ flatted@^3.1.0:
resolved "https://registry.yarnpkg.com/flatted/-/flatted-3.2.7.tgz#609f39207cb614b89d0765b477cb2d437fbf9787"
integrity sha512-5nqDSxl8nn5BSNxyR3n4I6eDmbolI6WT+QqR547RwxQapgjQBmtktdP+HTBb/a/zLsbzERTONyUB5pefh5TtjQ==
follow-redirects@^1.15.4:
follow-redirects@^1.15.6:
version "1.15.6"
resolved "https://registry.yarnpkg.com/follow-redirects/-/follow-redirects-1.15.6.tgz#7f815c0cda4249c74ff09e95ef97c23b5fd0399b"
integrity sha512-wWN62YITEaOpSK584EZXJafH1AGpO8RVgElfkuXbTOrPX4fIfOyEpW/CsiNd8JdYrAoOvafRTOEnvsO++qCqFA==
@ -13967,7 +13967,16 @@ string-template@~0.2.1:
resolved "https://registry.yarnpkg.com/string-template/-/string-template-0.2.1.tgz#42932e598a352d01fc22ec3367d9d84eec6c9add"
integrity sha512-Yptehjogou2xm4UJbxJ4CxgZx12HBfeystp0y3x7s4Dj32ltVVG1Gg8YhKjHZkHicuKpZX/ffilA8505VbUbpw==
"string-width-cjs@npm:string-width@^4.2.0", string-width@^4.1.0, string-width@^4.2.0, string-width@^4.2.2, string-width@^4.2.3:
"string-width-cjs@npm:string-width@^4.2.0":
version "4.2.3"
resolved "https://registry.yarnpkg.com/string-width/-/string-width-4.2.3.tgz#269c7117d27b05ad2e536830a8ec895ef9c6d010"
integrity sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g==
dependencies:
emoji-regex "^8.0.0"
is-fullwidth-code-point "^3.0.0"
strip-ansi "^6.0.1"
string-width@^4.1.0, string-width@^4.2.0, string-width@^4.2.2, string-width@^4.2.3:
version "4.2.3"
resolved "https://registry.yarnpkg.com/string-width/-/string-width-4.2.3.tgz#269c7117d27b05ad2e536830a8ec895ef9c6d010"
integrity sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g==
@ -14085,7 +14094,7 @@ stringify-object@^3.3.0:
is-obj "^1.0.1"
is-regexp "^1.0.0"
"strip-ansi-cjs@npm:strip-ansi@^6.0.1", strip-ansi@^6.0.0, strip-ansi@^6.0.1:
"strip-ansi-cjs@npm:strip-ansi@^6.0.1":
version "6.0.1"
resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-6.0.1.tgz#9e26c63d30f53443e9489495b2105d37b67a85d9"
integrity sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==
@ -14106,6 +14115,13 @@ strip-ansi@^5.2.0:
dependencies:
ansi-regex "^4.1.0"
strip-ansi@^6.0.0, strip-ansi@^6.0.1:
version "6.0.1"
resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-6.0.1.tgz#9e26c63d30f53443e9489495b2105d37b67a85d9"
integrity sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==
dependencies:
ansi-regex "^5.0.1"
strip-ansi@^7.0.1:
version "7.1.0"
resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-7.1.0.tgz#d5b6568ca689d8561370b0707685d22434faff45"
@ -15461,8 +15477,7 @@ wordwrap@^1.0.0:
resolved "https://registry.yarnpkg.com/wordwrap/-/wordwrap-1.0.0.tgz#27584810891456a4171c8d0226441ade90cbcaeb"
integrity sha512-gvVzJFlPycKc5dZN4yPkP8w7Dc37BtP1yczEneOb4uq34pXZcvrtRTmWV8W+Ume+XCxKgbjM+nevkyFPMybd4Q==
"wrap-ansi-cjs@npm:wrap-ansi@^7.0.0", wrap-ansi@^7.0.0:
name wrap-ansi-cjs
"wrap-ansi-cjs@npm:wrap-ansi@^7.0.0":
version "7.0.0"
resolved "https://registry.yarnpkg.com/wrap-ansi/-/wrap-ansi-7.0.0.tgz#67e145cff510a6a6984bdf1152911d69d2eb9e43"
integrity sha512-YVGIj2kamLSTxw6NsZjoBxfSwsn0ycdesmc4p+Q21c5zPuZ1pl+NfxVdxPtdHvmNVOQ6XSYG4AUtyt/Fi7D16Q==
@ -15480,6 +15495,15 @@ wrap-ansi@^6.2.0:
string-width "^4.1.0"
strip-ansi "^6.0.0"
wrap-ansi@^7.0.0:
version "7.0.0"
resolved "https://registry.yarnpkg.com/wrap-ansi/-/wrap-ansi-7.0.0.tgz#67e145cff510a6a6984bdf1152911d69d2eb9e43"
integrity sha512-YVGIj2kamLSTxw6NsZjoBxfSwsn0ycdesmc4p+Q21c5zPuZ1pl+NfxVdxPtdHvmNVOQ6XSYG4AUtyt/Fi7D16Q==
dependencies:
ansi-styles "^4.0.0"
string-width "^4.1.0"
strip-ansi "^6.0.0"
wrap-ansi@^8.1.0:
version "8.1.0"
resolved "https://registry.yarnpkg.com/wrap-ansi/-/wrap-ansi-8.1.0.tgz#56dc22368ee570face1b49819975d9b9a5ead214"