Fixed merge issue

YulNaumenko · YulNaumenko · commit b9522bc5a78e · 2020-05-13T17:47:08.000-07:00
diff --git a/x-pack/test/alerting_api_integration/common/fixtures/plugins/alerts/index.ts b/x-pack/test/alerting_api_integration/common/fixtures/plugins/alerts/index.ts
@@ -233,6 +233,7 @@ export default function(kibana: any) {
           { id: 'other', name: 'Other' },
         ],
         defaultActionGroupId: 'default',
+        producer: 'alerting',
         actionVariables: {
           state: [{ name: 'instanceStateValue', description: 'the instance state value' }],
           context: [{ name: 'instanceContextValue', description: 'the instance context value' }],
@@ -291,6 +292,7 @@ export default function(kibana: any) {
           { id: 'default', name: 'Default' },
           { id: 'other', name: 'Other' },
         ],
+        producer: 'alerting',
         defaultActionGroupId: 'default',
         async executor(alertExecutorOptions: AlertExecutorOptions) {
           const { services, state } = alertExecutorOptions;
@@ -319,6 +321,7 @@ export default function(kibana: any) {
             name: 'Default',
           },
         ],
+        producer: 'alerting',
         defaultActionGroupId: 'default',
         async executor({ services, params, state }: AlertExecutorOptions) {
           await services.callCluster('index', {
@@ -345,6 +348,7 @@ export default function(kibana: any) {
             name: 'Default',
           },
         ],
+        producer: 'alerting',
         defaultActionGroupId: 'default',
         async executor({ services, params, state }: AlertExecutorOptions) {
           await services.callCluster('index', {
@@ -369,6 +373,7 @@ export default function(kibana: any) {
             name: 'Default',
           },
         ],
+        producer: 'alerting',
         defaultActionGroupId: 'default',
         validate: {
           params: schema.object({
@@ -452,6 +457,7 @@ export default function(kibana: any) {
             name: 'Default',
           },
         ],
+        producer: 'alerting',
         defaultActionGroupId: 'default',
         validate: {
           params: schema.object({
@@ -464,13 +470,15 @@ export default function(kibana: any) {
         id: 'test.noop',
         name: 'Test: Noop',
         actionGroups: [{ id: 'default', name: 'Default' }],
+        producer: 'alerting',
         defaultActionGroupId: 'default',
         async executor({ services, params, state }: AlertExecutorOptions) {},
       };
       const onlyContextVariablesAlertType: AlertType = {
         id: 'test.onlyContextVariables',
         name: 'Test: Only Context Variables',
         actionGroups: [{ id: 'default', name: 'Default' }],
+        producer: 'alerting',
         defaultActionGroupId: 'default',
         actionVariables: {
           context: [{ name: 'aContextVariable', description: 'this is a context variable' }],
@@ -481,6 +489,7 @@ export default function(kibana: any) {
         id: 'test.onlyStateVariables',
         name: 'Test: Only State Variables',
         actionGroups: [{ id: 'default', name: 'Default' }],
+        producer: 'alerting',
         defaultActionGroupId: 'default',
         actionVariables: {
           state: [{ name: 'aStateVariable', description: 'this is a state variable' }],
