Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
9 changes: 2 additions & 7 deletions docs/user/alerting/geo-alert-types.asciidoc
Original file line number Diff line number Diff line change
Expand Up @@ -2,13 +2,8 @@
[[geo-alert-types]]
== Geo alert types

experimental[] Two additional stack alerts are available:
<<alert-type-tracking-threshold>> and <<alert-type-tracking-containment>>. To enable,
add the following configuration to your `kibana.yml`:

```yml
xpack.stack_alerts.enableGeoAlerting: true
```
Two additional stack alerts are available:
<<alert-type-tracking-threshold>> and <<alert-type-tracking-containment>>.

As with other stack alerts, you need `all` access to the *Stack Alerts* feature
to be able to create and edit either of the geo alerts.
Expand Down
1 change: 0 additions & 1 deletion x-pack/plugins/stack_alerts/common/config.ts
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,6 @@ import { schema, TypeOf } from '@kbn/config-schema';

export const configSchema = schema.object({
enabled: schema.boolean({ defaultValue: true }),
enableGeoAlerting: schema.boolean({ defaultValue: false }),
});

export type Config = TypeOf<typeof configSchema>;
Original file line number Diff line number Diff line change
Expand Up @@ -19,8 +19,6 @@ project. To edit it, open this file in your editor of choice, add the line descr
the next step to the bottom of the file (or really anywhere) and save. For more details
on different config modifications or on how to make production config modifications,
see [the current docs](https://www.elastic.co/guide/en/kibana/current/settings.html)
- Set the following configuration settings in your `config/kibana.yml`:
`xpack.stack_alerts.enableGeoAlerting: true`

### 2. Run ES/Kibana dev env with ssl enabled
- In two terminals, run the normal commands to launch both elasticsearch and kibana but
Expand Down
4 changes: 1 addition & 3 deletions x-pack/plugins/stack_alerts/public/alert_types/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -18,9 +18,7 @@ export function registerAlertTypes({
alertTypeRegistry: TriggersAndActionsUIPublicPluginSetup['alertTypeRegistry'];
config: Config;
}) {
if (config.enableGeoAlerting) {
alertTypeRegistry.register(getGeoContainmentAlertType());
}
alertTypeRegistry.register(getGeoContainmentAlertType());
alertTypeRegistry.register(getThresholdAlertType());
alertTypeRegistry.register(getEsQueryAlertType());
}
10 changes: 1 addition & 9 deletions x-pack/plugins/stack_alerts/server/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -11,16 +11,8 @@ import { configSchema, Config } from '../common/config';
export { ID as INDEX_THRESHOLD_ID } from './alert_types/index_threshold/alert_type';

export const config: PluginConfigDescriptor<Config> = {
exposeToBrowser: {
enableGeoAlerting: true,
},
exposeToBrowser: {},
schema: configSchema,
deprecations: ({ renameFromRoot }) => [
renameFromRoot(
'xpack.triggers_actions_ui.enableGeoTrackingThresholdAlert',
'xpack.stack_alerts.enableGeoAlerting'
),
],
};

export const plugin = (ctx: PluginInitializerContext) => new AlertingBuiltinsPlugin(ctx);