[RAC] Rename occurrences of alert_type to rule_type in Infra #120455
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
ersin-erdal
added
release_note:fix
v8.0.0
auto-backport
Kerry350
approved these changes
Dec 6, 2021
| @@ -15,15 +15,15 @@ import { | |||
|
|
|||
| import { ObservabilityRuleTypeModel } from '../../../../observability/public'; | |||
|
|
|||
| import { AlertTypeParams } from '../../../../alerting/common'; | |||
| import { AlertTypeParams as RuleTypeParams } from '../../../../alerting/common'; | |||
There was a problem hiding this comment.
And this is just until things change on the alerting side?
There was a problem hiding this comment.
Ys exactly. We also talked with them, they will use these names too, so we (or they) can just remove " .... as" part once they did the refactoring on their side.
mgiota
reviewed
Dec 6, 2021
x-pack/plugins/infra/public/alerting/log_threshold/log_threshold_rule_type.ts
Show resolved
Hide resolved
mgiota
reviewed
Dec 6, 2021
x-pack/plugins/infra/public/alerting/log_threshold/log_threshold_rule_type.ts
Show resolved
Hide resolved
mgiota
reviewed
Dec 6, 2021
| // eslint-disable-next-line @kbn/eslint/no-restricted-paths | ||
| import { AlertTypeModel } from '../../../../triggers_actions_ui/public/types'; | ||
| import { AlertTypeParams } from '../../../../alerting/common'; | ||
| import { AlertTypeModel } from '../../../../triggers_actions_ui/public'; |
There was a problem hiding this comment.
import { AlertTypeModel as RuleTypeModel } from '../../../../triggers_actions_ui/public';
There was a problem hiding this comment.
I am not sure if we should rename this now? Because we will refactor triggers_actions_ui too, then we can tackle these imports by searching by the usages.
mgiota
reviewed
Dec 6, 2021
.../infra/server/lib/alerting/inventory_metric_threshold/inventory_metric_threshold_executor.ts
Outdated
Show resolved
Hide resolved
mgiota
reviewed
Dec 6, 2021
.../infra/server/lib/alerting/inventory_metric_threshold/inventory_metric_threshold_executor.ts
Outdated
Show resolved
Hide resolved
mgiota
reviewed
Dec 6, 2021
| InventoryMetricThresholdAllowedActionGroups | ||
| >(async ({ services, params }) => { | ||
| const { criteria, filterQuery, sourceId, nodeType, alertOnNoData } = params; | ||
| if (criteria.length === 0) throw new Error('Cannot execute an alert with 0 conditions'); | ||
| const { alertWithLifecycle, savedObjectsClient } = services; | ||
| const alertInstanceFactory: InventoryMetricThresholdAlertInstanceFactory = (id, reason) => |
There was a problem hiding this comment.
The task_runner of the alerting framework exposes an alertInstanceFactory method https://github.com/elastic/kibana/blob/main/x-pack/plugins/alerting/server/task_runner/task_runner.ts#L321
This alertInstanceFactory variable is a local variable in this file, so I don't think we have a problem here. I make the comment just to double check if everything works as expected (I wait for yarn start to complete to double check)
mgiota
reviewed
Dec 6, 2021
x-pack/plugins/infra/server/lib/alerting/log_threshold/log_threshold_executor.ts
Outdated
Show resolved
Hide resolved
mgiota
reviewed
Dec 6, 2021
x-pack/plugins/infra/server/lib/alerting/log_threshold/log_threshold_executor.ts
Show resolved
Hide resolved
mgiota
reviewed
Dec 6, 2021
x-pack/plugins/infra/server/lib/alerting/log_threshold/log_threshold_executor.ts
Show resolved
Hide resolved
mgiota
reviewed
Dec 6, 2021
x-pack/plugins/infra/server/lib/alerting/log_threshold/log_threshold_executor.ts
Outdated
Show resolved
Hide resolved
mgiota
reviewed
Dec 6, 2021
x-pack/plugins/infra/server/lib/alerting/metric_threshold/metric_threshold_executor.ts
Outdated
Show resolved
Hide resolved
💚 Build Succeeded
Metrics [docs]Module Count
Async chunks
Page load bundle
History
To update your PR or re-run it, just comment with: |
|
@ersin-erdal Changes LGTM! I tested locally with Log threshlold and Inventory rule types and everything worked as expected. |
mgiota
approved these changes
Dec 6, 2021
kibanamachine
pushed a commit
to kibanamachine/kibana
that referenced
this pull request
Dec 7, 2021
…#120455) [RAC] Rename occurrences of alert_type to rule_type in Infra
💚 Backport successful
This backport PR will be merged automatically after passing CI. |
kibanamachine
added a commit
that referenced
this pull request
Dec 7, 2021
#120573) [RAC] Rename occurrences of alert_type to rule_type in Infra Co-authored-by: Ersin Erdal <92688503+ersin-erdal@users.noreply.github.com>
jloleysens
added a commit
to jloleysens/kibana
that referenced
this pull request
Dec 7, 2021
…-chromium-before-compiling-pdf * 'main' of github.com:elastic/kibana: (121 commits) FTR should use the new kibana_system user (elastic#120436) [Lens] Temporarily exclude Mosaic/Waffle from the suggestions list (elastic#120488) [Reporting] Fix slow CSV with large max size bytes (elastic#120365) [CTI] Threat Intel Card on Overview page needs to accommodate Fleet TI integrations - (elastic#120459) [Dashboard] Added KibanaThemeProvider. (elastic#120122) add more rule_registry unit tests (elastic#120323) [Lens] update xpack.lens.pie.smallValuesWarningMessage text (elastic#120478) [Fleet] Simplified package policy create API, enriching default values (elastic#119739) mock `elastic-apm-node` in `@kbn/test` jest preset (elastic#120324) [RAC] Rename occurrences of alert_type to rule_type in Infra (elastic#120455) [Security Solutions] Removes tech debt of exporting all from linter rule for timeline plugin (elastic#120437) [Workplace Search] Add API Keys view to replace Access tokens (elastic#120147) [Security Solutions] Removes tech debt of exporting all from linter rule for cases plugin in the server section (elastic#120411) Add support for threat.feed.name (elastic#120250) [Rule Registry] Rewrite APM registry rules for Observability (elastic#117740) [docs] Fix artifact layout formatting (elastic#119386) [Workplace Search] Add a technical preview of connecting GitHub via GitHub apps (elastic#119764) add osquery notes for 7.16 (elastic#120407) chore(NA): splits types from code on @kbn/docs-utils (elastic#120533) [Reporting] Decouple screenshotting plugin from the reporting (elastic#120110) ... # Conflicts: # x-pack/plugins/reporting/server/browsers/chromium/driver_factory/index.test.ts # x-pack/plugins/reporting/server/browsers/chromium/driver_factory/index.ts # x-pack/plugins/reporting/server/lib/screenshots/observable.test.ts # x-pack/plugins/reporting/server/lib/screenshots/observable.ts # x-pack/plugins/reporting/server/test_helpers/create_mock_browserdriverfactory.ts
|
Pinging @elastic/apm-ui (Team:apm) |
TinLe
pushed a commit
to TinLe/kibana
that referenced
this pull request
Dec 22, 2021
…#120455) [RAC] Rename occurrences of alert_type to rule_type in Infra
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Fixes: #120375
According to terminology of Alerting Framework
Renamed
AlertInstance => Alert
AlertTypeParams => RuleTypeParams
AlertTypeState => RuleTypeState
AlertInstanceContext => AlertContext
AlertInstanceState => AlertState
AlertExecutorOptions => RuleExecutorOptions
registerAlertType => registerRuleType
evaluateAlert => evaluateRule
Probably RatioAlertParams, CountAlertParams, isRatioAlert, isRatioAlertParams etc. in alerting types should be renamed too but as this has already become a large PR, i'll tackle them in a different PR.