Skip to content
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

[Alerting] fix labels and links in PagerDuty action ui and docs #64032

Merged
merged 2 commits into from
May 4, 2020
Merged

[Alerting] fix labels and links in PagerDuty action ui and docs #64032

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
ae2d51c
[Alerting] fix labels and links in PagerDuty action ui and docs
pmuellr Apr 21, 2020
9773711
Merge branch 'master' into alerting/pd-integration-key
elasticmachine May 4, 2020
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
4 changes: 2 additions & 2 deletions docs/user/alerting/action-types/pagerduty.asciidoc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -94,7 +94,7 @@ section of the alert configuration and selecting *Add new*.
* Alternatively, create a connector by navigating to *Management* from the {kib} navbar and selecting
*Alerts and Actions*. Then, select the *Connectors* tab, click the *Create connector* button, and select the PagerDuty option.

. Configure the connector by giving it a name and optionally entering the API URL and Routing Key, or using the defaults.
. Configure the connector by giving it a name and entering the Integration Key, optionally entering a custom API URL.
+
See <<pagerduty-in-pagerduty, In PagerDuty>> for how to obtain the endpoint and key information from PagerDuty and
<<pagerduty-connector-configuration, Connector configuration>> for more details.
Expand Down Expand Up @@ -135,7 +135,7 @@ PagerDuty connectors have the following configuration properties:

Name:: The name of the connector. The name is used to identify a connector in the management UI connector listing, or in the connector list when configuring an action.
API URL:: An optional PagerDuty event URL. Defaults to `https://events.pagerduty.com/v2/enqueue`. If you are using the <<action-settings, `xpack.actions.whitelistedHosts`>> setting, make sure the hostname is whitelisted.
Routing Key:: A 32 character PagerDuty Integration Key for an integration on a service or on a global ruleset.
Integration Key:: A 32 character PagerDuty Integration Key for an integration on a service, also referred to as the routing key.

[float]
[[pagerduty-action-configuration]]
Expand Down
24 changes: 12 additions & 12 deletions ...gins/triggers_actions_ui/public/application/components/builtin_action_types/pagerduty.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -94,7 +94,7 @@ const PagerDutyActionConnectorFields: React.FunctionComponent<ActionConnectorFie
label={i18n.translate(
'xpack.triggersActionsUI.components.builtinActionTypes.pagerDutyAction.apiUrlTextFieldLabel',
{
defaultMessage: 'API URL',
defaultMessage: 'API URL (optional)',
}
)}
>
Expand All @@ -118,7 +118,7 @@ const PagerDutyActionConnectorFields: React.FunctionComponent<ActionConnectorFie
fullWidth
helpText={
<EuiLink
href="https://www.elastic.co/guide/en/elasticsearch/reference/current/actions-pagerduty.html#configuring-pagerduty"
href="https://www.elastic.co/guide/en/kibana/current/pagerduty-action-type.html"
target="_blank"
>
<FormattedMessage
Expand All @@ -132,7 +132,7 @@ const PagerDutyActionConnectorFields: React.FunctionComponent<ActionConnectorFie
label={i18n.translate(
'xpack.triggersActionsUI.components.builtinActionTypes.pagerDutyAction.routingKeyTextFieldLabel',
{
defaultMessage: 'Routing key',
defaultMessage: 'Integration key',
}
)}
>
Expand Down Expand Up @@ -175,20 +175,20 @@ const PagerDutyParamsFields: React.FunctionComponent<ActionParamsProps<PagerDuty
} = actionParams;
const severityOptions = [
{
Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The changes below are a re-ordering of the critical/error/warning/info severities, which changes the order displayed in the UI to match the same ordering I've seen on PD's site.

value: 'info',
value: 'critical',
text: i18n.translate(
'xpack.triggersActionsUI.components.builtinActionTypes.pagerDutyAction.severitySelectInfoOptionLabel',
'xpack.triggersActionsUI.components.builtinActionTypes.pagerDutyAction.severitySelectCriticalOptionLabel',
{
defaultMessage: 'Info',
defaultMessage: 'Critical',
}
),
},
{
value: 'critical',
value: 'error',
text: i18n.translate(
'xpack.triggersActionsUI.components.builtinActionTypes.pagerDutyAction.severitySelectCriticalOptionLabel',
'xpack.triggersActionsUI.components.builtinActionTypes.pagerDutyAction.severitySelectErrorOptionLabel',
{
defaultMessage: 'Critical',
defaultMessage: 'Error',
}
),
},
Expand All @@ -202,11 +202,11 @@ const PagerDutyParamsFields: React.FunctionComponent<ActionParamsProps<PagerDuty
),
},
{
value: 'error',
value: 'info',
text: i18n.translate(
'xpack.triggersActionsUI.components.builtinActionTypes.pagerDutyAction.severitySelectErrorOptionLabel',
'xpack.triggersActionsUI.components.builtinActionTypes.pagerDutyAction.severitySelectInfoOptionLabel',
{
defaultMessage: 'Error',
defaultMessage: 'Info',
}
),
},
Expand Down