diff --git a/.eslintignore b/.eslintignore
index 1d58aff7c6a82..c7f0b9640f869 100644
--- a/.eslintignore
+++ b/.eslintignore
@@ -44,3 +44,4 @@ snapshots.js
 /packages/kbn-ui-framework/doc_site/build
 /packages/kbn-ui-framework/generator-kui/*/templates/
 /packages/kbn-ui-shared-deps/flot_charts
+/packages/kbn-monaco/src/painless/antlr
diff --git a/docs/development/core/public/kibana-plugin-core-public.doclinksstart.links.md b/docs/development/core/public/kibana-plugin-core-public.doclinksstart.links.md
index 9da31bb16b56b..fde40cca38fa2 100644
--- a/docs/development/core/public/kibana-plugin-core-public.doclinksstart.links.md
+++ b/docs/development/core/public/kibana-plugin-core-public.doclinksstart.links.md
@@ -101,6 +101,12 @@ readonly links: {
             readonly dateMath: string;
         };
         readonly management: Record<string, string>;
+        readonly ml: {
+            readonly guide: string;
+            readonly anomalyDetection: string;
+            readonly anomalyDetectionJobs: string;
+            readonly dataFrameAnalytics: string;
+        };
         readonly visualize: Record<string, string>;
     };
 ```
diff --git a/docs/development/core/public/kibana-plugin-core-public.doclinksstart.md b/docs/development/core/public/kibana-plugin-core-public.doclinksstart.md
index 01504aafe3bae..46437f7ccdc21 100644
--- a/docs/development/core/public/kibana-plugin-core-public.doclinksstart.md
+++ b/docs/development/core/public/kibana-plugin-core-public.doclinksstart.md
@@ -17,5 +17,5 @@ export interface DocLinksStart
 |  --- | --- | --- |
 |  [DOC\_LINK\_VERSION](./kibana-plugin-core-public.doclinksstart.doc_link_version.md) | <code>string</code> |  |
 |  [ELASTIC\_WEBSITE\_URL](./kibana-plugin-core-public.doclinksstart.elastic_website_url.md) | <code>string</code> |  |
-|  [links](./kibana-plugin-core-public.doclinksstart.links.md) | <code>{</code><br/><code>        readonly dashboard: {</code><br/><code>            readonly guide: string;</code><br/><code>            readonly drilldowns: string;</code><br/><code>            readonly drilldownsTriggerPicker: string;</code><br/><code>            readonly urlDrilldownTemplateSyntax: string;</code><br/><code>            readonly urlDrilldownVariables: string;</code><br/><code>        };</code><br/><code>        readonly filebeat: {</code><br/><code>            readonly base: string;</code><br/><code>            readonly installation: string;</code><br/><code>            readonly configuration: string;</code><br/><code>            readonly elasticsearchOutput: string;</code><br/><code>            readonly startup: string;</code><br/><code>            readonly exportedFields: string;</code><br/><code>        };</code><br/><code>        readonly auditbeat: {</code><br/><code>            readonly base: string;</code><br/><code>        };</code><br/><code>        readonly metricbeat: {</code><br/><code>            readonly base: string;</code><br/><code>        };</code><br/><code>        readonly heartbeat: {</code><br/><code>            readonly base: string;</code><br/><code>        };</code><br/><code>        readonly logstash: {</code><br/><code>            readonly base: string;</code><br/><code>        };</code><br/><code>        readonly functionbeat: {</code><br/><code>            readonly base: string;</code><br/><code>        };</code><br/><code>        readonly winlogbeat: {</code><br/><code>            readonly base: string;</code><br/><code>        };</code><br/><code>        readonly aggs: {</code><br/><code>            readonly date_histogram: string;</code><br/><code>            readonly date_range: string;</code><br/><code>            readonly filter: string;</code><br/><code>            readonly filters: string;</code><br/><code>            readonly geohash_grid: string;</code><br/><code>            readonly histogram: string;</code><br/><code>            readonly ip_range: string;</code><br/><code>            readonly range: string;</code><br/><code>            readonly significant_terms: string;</code><br/><code>            readonly terms: string;</code><br/><code>            readonly avg: string;</code><br/><code>            readonly avg_bucket: string;</code><br/><code>            readonly max_bucket: string;</code><br/><code>            readonly min_bucket: string;</code><br/><code>            readonly sum_bucket: string;</code><br/><code>            readonly cardinality: string;</code><br/><code>            readonly count: string;</code><br/><code>            readonly cumulative_sum: string;</code><br/><code>            readonly derivative: string;</code><br/><code>            readonly geo_bounds: string;</code><br/><code>            readonly geo_centroid: string;</code><br/><code>            readonly max: string;</code><br/><code>            readonly median: string;</code><br/><code>            readonly min: string;</code><br/><code>            readonly moving_avg: string;</code><br/><code>            readonly percentile_ranks: string;</code><br/><code>            readonly serial_diff: string;</code><br/><code>            readonly std_dev: string;</code><br/><code>            readonly sum: string;</code><br/><code>            readonly top_hits: string;</code><br/><code>        };</code><br/><code>        readonly scriptedFields: {</code><br/><code>            readonly scriptFields: string;</code><br/><code>            readonly scriptAggs: string;</code><br/><code>            readonly painless: string;</code><br/><code>            readonly painlessApi: string;</code><br/><code>            readonly painlessSyntax: string;</code><br/><code>            readonly luceneExpressions: string;</code><br/><code>        };</code><br/><code>        readonly indexPatterns: {</code><br/><code>            readonly loadingData: string;</code><br/><code>            readonly introduction: string;</code><br/><code>        };</code><br/><code>        readonly addData: string;</code><br/><code>        readonly kibana: string;</code><br/><code>        readonly siem: {</code><br/><code>            readonly guide: string;</code><br/><code>            readonly gettingStarted: string;</code><br/><code>        };</code><br/><code>        readonly query: {</code><br/><code>            readonly eql: string;</code><br/><code>            readonly luceneQuerySyntax: string;</code><br/><code>            readonly queryDsl: string;</code><br/><code>            readonly kueryQuerySyntax: string;</code><br/><code>        };</code><br/><code>        readonly date: {</code><br/><code>            readonly dateMath: string;</code><br/><code>        };</code><br/><code>        readonly management: Record&lt;string, string&gt;;</code><br/><code>        readonly visualize: Record&lt;string, string&gt;;</code><br/><code>    }</code> |  |
+|  [links](./kibana-plugin-core-public.doclinksstart.links.md) | <code>{</code><br/><code>        readonly dashboard: {</code><br/><code>            readonly guide: string;</code><br/><code>            readonly drilldowns: string;</code><br/><code>            readonly drilldownsTriggerPicker: string;</code><br/><code>            readonly urlDrilldownTemplateSyntax: string;</code><br/><code>            readonly urlDrilldownVariables: string;</code><br/><code>        };</code><br/><code>        readonly filebeat: {</code><br/><code>            readonly base: string;</code><br/><code>            readonly installation: string;</code><br/><code>            readonly configuration: string;</code><br/><code>            readonly elasticsearchOutput: string;</code><br/><code>            readonly startup: string;</code><br/><code>            readonly exportedFields: string;</code><br/><code>        };</code><br/><code>        readonly auditbeat: {</code><br/><code>            readonly base: string;</code><br/><code>        };</code><br/><code>        readonly metricbeat: {</code><br/><code>            readonly base: string;</code><br/><code>        };</code><br/><code>        readonly heartbeat: {</code><br/><code>            readonly base: string;</code><br/><code>        };</code><br/><code>        readonly logstash: {</code><br/><code>            readonly base: string;</code><br/><code>        };</code><br/><code>        readonly functionbeat: {</code><br/><code>            readonly base: string;</code><br/><code>        };</code><br/><code>        readonly winlogbeat: {</code><br/><code>            readonly base: string;</code><br/><code>        };</code><br/><code>        readonly aggs: {</code><br/><code>            readonly date_histogram: string;</code><br/><code>            readonly date_range: string;</code><br/><code>            readonly filter: string;</code><br/><code>            readonly filters: string;</code><br/><code>            readonly geohash_grid: string;</code><br/><code>            readonly histogram: string;</code><br/><code>            readonly ip_range: string;</code><br/><code>            readonly range: string;</code><br/><code>            readonly significant_terms: string;</code><br/><code>            readonly terms: string;</code><br/><code>            readonly avg: string;</code><br/><code>            readonly avg_bucket: string;</code><br/><code>            readonly max_bucket: string;</code><br/><code>            readonly min_bucket: string;</code><br/><code>            readonly sum_bucket: string;</code><br/><code>            readonly cardinality: string;</code><br/><code>            readonly count: string;</code><br/><code>            readonly cumulative_sum: string;</code><br/><code>            readonly derivative: string;</code><br/><code>            readonly geo_bounds: string;</code><br/><code>            readonly geo_centroid: string;</code><br/><code>            readonly max: string;</code><br/><code>            readonly median: string;</code><br/><code>            readonly min: string;</code><br/><code>            readonly moving_avg: string;</code><br/><code>            readonly percentile_ranks: string;</code><br/><code>            readonly serial_diff: string;</code><br/><code>            readonly std_dev: string;</code><br/><code>            readonly sum: string;</code><br/><code>            readonly top_hits: string;</code><br/><code>        };</code><br/><code>        readonly scriptedFields: {</code><br/><code>            readonly scriptFields: string;</code><br/><code>            readonly scriptAggs: string;</code><br/><code>            readonly painless: string;</code><br/><code>            readonly painlessApi: string;</code><br/><code>            readonly painlessSyntax: string;</code><br/><code>            readonly luceneExpressions: string;</code><br/><code>        };</code><br/><code>        readonly indexPatterns: {</code><br/><code>            readonly loadingData: string;</code><br/><code>            readonly introduction: string;</code><br/><code>        };</code><br/><code>        readonly addData: string;</code><br/><code>        readonly kibana: string;</code><br/><code>        readonly siem: {</code><br/><code>            readonly guide: string;</code><br/><code>            readonly gettingStarted: string;</code><br/><code>        };</code><br/><code>        readonly query: {</code><br/><code>            readonly eql: string;</code><br/><code>            readonly luceneQuerySyntax: string;</code><br/><code>            readonly queryDsl: string;</code><br/><code>            readonly kueryQuerySyntax: string;</code><br/><code>        };</code><br/><code>        readonly date: {</code><br/><code>            readonly dateMath: string;</code><br/><code>        };</code><br/><code>        readonly management: Record&lt;string, string&gt;;</code><br/><code>        readonly ml: {</code><br/><code>            readonly guide: string;</code><br/><code>            readonly anomalyDetection: string;</code><br/><code>            readonly anomalyDetectionJobs: string;</code><br/><code>            readonly dataFrameAnalytics: string;</code><br/><code>        };</code><br/><code>        readonly visualize: Record&lt;string, string&gt;;</code><br/><code>    }</code> |  |
 
diff --git a/docs/redirects.asciidoc b/docs/redirects.asciidoc
index 7c81b8f9bbd0d..931a783654a91 100644
--- a/docs/redirects.asciidoc
+++ b/docs/redirects.asciidoc
@@ -168,6 +168,11 @@ This content has moved. See <<discover, **Discover**>>.
 
 This content has moved. See <<discover, **Discover**>>.
 
+[role="exclude",id="lens"]
+== Lens
+
+This content has moved. See <<create-panels-with-lens>>.
+
 [role="exclude",id="known-plugins"]
 == Known plugins
 
diff --git a/docs/user/dashboard/dashboard.asciidoc b/docs/user/dashboard/dashboard.asciidoc
index 5fda1af55c7fe..23d80f100b4b4 100644
--- a/docs/user/dashboard/dashboard.asciidoc
+++ b/docs/user/dashboard/dashboard.asciidoc
@@ -185,7 +185,7 @@ image:images/Dashboard_add_new_visualization.png[Example add new visualization t
 {kib} provides you with several editors that help you create panels.
 
 [float]
-[[lens]]
+[[create-panels-with-lens]]
 === Create panels with Lens
 
 *Lens* is the simplest and fastest way to create powerful visualizations of your data. To use *Lens*, you drag and drop as many data fields
diff --git a/docs/user/security/reporting.asciidoc b/docs/user/security/reporting.asciidoc
index 6e7fc0c212f07..e69643ef9712a 100644
--- a/docs/user/security/reporting.asciidoc
+++ b/docs/user/security/reporting.asciidoc
@@ -101,7 +101,7 @@ If you are using an external identity provider, such as
 LDAP or Active Directory, you can either assign
 roles on a per user basis, or assign roles to groups of users. By default, role
 mappings are configured in
-{ref}/mapping-roles.html[`config/shield/role_mapping.yml`].
+{ref}/mapping-roles.html[`config/role_mapping.yml`].
 For example, the following snippet assigns the user named Bill Murray the
 `kibana_admin` and `reporting_user` roles:
 
diff --git a/package.json b/package.json
index 38332fd027c7a..0f55c9b2d259a 100644
--- a/package.json
+++ b/package.json
@@ -157,6 +157,7 @@
     "angular-resource": "1.8.0",
     "angular-sanitize": "^1.8.0",
     "angular-ui-ace": "0.2.3",
+    "antlr4ts": "^0.5.0-alpha.3",
     "apollo-cache-inmemory": "1.6.2",
     "apollo-client": "^2.3.8",
     "apollo-link-http": "^1.5.16",
@@ -348,7 +349,7 @@
     "@babel/traverse": "^7.11.5",
     "@babel/types": "^7.11.0",
     "@cypress/snapshot": "^2.1.7",
-    "@cypress/webpack-preprocessor": "^5.4.10",
+    "@cypress/webpack-preprocessor": "^5.4.11",
     "@elastic/apm-rum": "^5.6.1",
     "@elastic/apm-rum-react": "^1.2.5",
     "@elastic/charts": "24.3.0",
@@ -576,6 +577,7 @@
     "angular-recursion": "^1.0.5",
     "angular-route": "^1.8.0",
     "angular-sortable-view": "^0.0.17",
+    "antlr4ts-cli": "^0.5.0-alpha.3",
     "apidoc": "^0.25.0",
     "apidoc-markdown": "^5.1.8",
     "apollo-link": "^1.2.3",
@@ -608,7 +610,7 @@
     "cpy": "^8.1.1",
     "cronstrue": "^1.51.0",
     "css-loader": "^3.4.2",
-    "cypress": "^5.5.0",
+    "cypress": "^6.0.1",
     "cypress-cucumber-preprocessor": "^2.5.2",
     "cypress-multi-reporters": "^1.4.0",
     "d3": "3.5.17",
diff --git a/packages/kbn-monaco/package.json b/packages/kbn-monaco/package.json
index eef68d3a35e0c..6c2e531a2f1ee 100644
--- a/packages/kbn-monaco/package.json
+++ b/packages/kbn-monaco/package.json
@@ -6,7 +6,8 @@
   "license": "Apache-2.0",
   "scripts": {
     "build": "node ./scripts/build.js",
-    "kbn:bootstrap": "yarn build --dev"
+    "kbn:bootstrap": "yarn build --dev",
+    "build:antlr4ts": "../../node_modules/antlr4ts-cli/antlr4ts ./src/painless/antlr/painless_lexer.g4 ./src/painless/antlr/painless_parser.g4 && node ./scripts/fix_generated_antlr.js"
   },
   "devDependencies": {
     "@kbn/babel-preset": "link:../kbn-babel-preset",
@@ -15,4 +16,4 @@
   "dependencies": {
     "@kbn/i18n": "link:../kbn-i18n"
   }
-}
\ No newline at end of file
+}
diff --git a/packages/kbn-monaco/scripts/fix_generated_antlr.js b/packages/kbn-monaco/scripts/fix_generated_antlr.js
new file mode 100644
index 0000000000000..faa853b93aa02
--- /dev/null
+++ b/packages/kbn-monaco/scripts/fix_generated_antlr.js
@@ -0,0 +1,66 @@
+/*
+ * Licensed to Elasticsearch B.V. under one or more contributor
+ * license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright
+ * ownership. Elasticsearch B.V. licenses this file to you under
+ * the Apache License, Version 2.0 (the "License"); you may
+ * not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *    http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+const { join } = require('path');
+const { readdirSync, readFileSync, writeFileSync, renameSync } = require('fs');
+const ora = require('ora');
+
+const generatedAntlrFolder = join(__dirname, '..', 'src', 'painless', 'antlr');
+
+const generatedAntlrFolderContents = readdirSync(generatedAntlrFolder);
+
+const log = ora('Updating generated antlr grammar').start();
+
+// The generated TS produces some TS linting errors
+// This script adds a //@ts-nocheck comment at the top of each generated file
+// so that the errors can be ignored for now
+generatedAntlrFolderContents
+  .filter((file) => {
+    const fileExtension = file.split('.')[1];
+    return fileExtension.includes('ts');
+  })
+  .forEach((file) => {
+    try {
+      const fileContentRows = readFileSync(join(generatedAntlrFolder, file), 'utf8')
+        .toString()
+        .split('\n');
+
+      fileContentRows.unshift('// @ts-nocheck');
+
+      const filePath = join(generatedAntlrFolder, file);
+      const fileContent = fileContentRows.join('\n');
+
+      writeFileSync(filePath, fileContent, { encoding: 'utf8' });
+    } catch (err) {
+      return log.fail(err.message);
+    }
+  });
+
+// Rename generated parserListener file to snakecase to satisfy file casing check
+// There doesn't appear to be a way to fix this OOTB with antlr4ts-cli
+try {
+  renameSync(
+    join(generatedAntlrFolder, 'painless_parserListener.ts'),
+    join(generatedAntlrFolder, 'painless_parser_listener.ts')
+  );
+} catch (err) {
+  log.warn(`Unable to rename parserListener file to snakecase: ${err.message}`);
+}
+
+log.succeed('Updated generated antlr grammar successfully');
diff --git a/packages/kbn-monaco/scripts/utils/clone_es.js b/packages/kbn-monaco/scripts/utils/clone_es.js
index 511cfd89fbf54..51063b8901731 100644
--- a/packages/kbn-monaco/scripts/utils/clone_es.js
+++ b/packages/kbn-monaco/scripts/utils/clone_es.js
@@ -21,7 +21,7 @@ const { accessSync, mkdirSync } = require('fs');
 const { join } = require('path');
 const simpleGit = require('simple-git');
 
-// Note: The generated whitelists have not yet been merged to master
+// Note: The generated allowlists have not yet been merged to ES
 // so this script may fail until code in this branch has been merged:
 // https://github.com/stu-elastic/elasticsearch/tree/scripting/whitelists
 const esRepo = 'https://github.com/elastic/elasticsearch.git';
diff --git a/packages/kbn-monaco/src/painless/README.md b/packages/kbn-monaco/src/painless/README.md
index 89980a43770ee..6969e4045cba6 100644
--- a/packages/kbn-monaco/src/painless/README.md
+++ b/packages/kbn-monaco/src/painless/README.md
@@ -8,7 +8,7 @@ This folder contains the language definitions for Painless used by the Monaco ed
 
 Initializes the worker proxy service when the Painless language is first needed. It also exports the [suggestion provider](https://microsoft.github.io/monaco-editor/api/interfaces/monaco.languages.completionitemprovider.html) needed for autocompletion.
 
-### ./services
+### ./lib
 This directory exports two services:
 
 1. Worker proxy: Responsible for holding a reference to the Monaco-provided proxy getter.
@@ -32,12 +32,15 @@ Contains the Monarch-specific language tokenization rules for Painless.
 
 ### ./worker
 
-The worker proxy and worker instantiation code used in both the main thread and the worker thread. The logic for providing autocomplete suggestions resides here.
+The worker proxy and worker instantiation code used in both the main thread and the worker thread. The logic for providing autocomplete suggestions and error reporting resides here.
 
 ### ./autocomplete_definitions
 
 This directory is generated by a script and should not be changed manually. Read [Updating autocomplete definitions](#updating-autocomplete-definitions) for more information.
 
+### ./antlr
+This directory contains the Painless lexer and grammar rules, as well as the generated Typescript code. Read [Compiling ANTLR](#compiling-ANTLR) for more information.
+
 ## Example usage
 
 ```
@@ -102,4 +105,20 @@ node scripts/generate_autocomplete --branch <branch_name>
   - `score`
   - `string_script_field_script_field`
 
-To add additional contexts, edit the `supportedContexts` constant in `kbn-monaco/scripts/constants.js`.
\ No newline at end of file
+To add additional contexts, edit the `supportedContexts` constant in `kbn-monaco/scripts/constants.js`.
+
+## Compiling ANTLR
+
+[ANTLR](https://www.antlr.org/) generates lexical and syntax errors out of the box, which we can use to set error markers in monaco. 
+
+Elasticsearch has defined [lexer and parser grammar](https://github.com/elastic/elasticsearch/tree/master/modules/lang-painless/src/main/antlr) for the Painless language. For now, these rules have been largely copied from ES to Kibana and reside in the `antlr` directory with the `.g4` file extension. We then use [antlr4ts](https://github.com/tunnelvisionlabs/antlr4ts) to generate a lexer and a parser in Typescript.
+
+To regenerate the lexer and parser, run the following script:
+
+```
+npm run build:antlr4ts
+```
+
+*Note:* This script should only need to be run if a change has been made to `painless_lexer.g4` or `painless_parser.g4`.
+
+*Note:* There is a manual change made to the `sempred()` method in the generated `painless_lexer.ts`. This needs further investigation, but it appears there is an offset between the rule index and the token value. Without this manual change, ANTLR incorrectly reports an error when using a `/` or regex in a script. There is a comment in the generated code to this effect.
diff --git a/packages/kbn-monaco/src/painless/antlr/painless_lexer.g4 b/packages/kbn-monaco/src/painless/antlr/painless_lexer.g4
new file mode 100644
index 0000000000000..d7cdf31e6d587
--- /dev/null
+++ b/packages/kbn-monaco/src/painless/antlr/painless_lexer.g4
@@ -0,0 +1,122 @@
+/*
+ * Licensed to Elasticsearch B.V. under one or more contributor
+ * license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright
+ * ownership. Elasticsearch B.V. licenses this file to you under
+ * the Apache License, Version 2.0 (the "License"); you may
+ * not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *    http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+lexer grammar painless_lexer;
+
+WS: [ \t\n\r]+ -> skip;
+COMMENT: ( '//' .*? [\n\r] | '/*' .*? '*/' ) -> skip;
+
+LBRACK:    '{';
+RBRACK:    '}';
+LBRACE:    '[';
+RBRACE:    ']';
+LP:        '(';
+RP:        ')';
+// We switch modes after a dot to ensure there are not conflicts
+// between shortcuts and decimal values.  Without the mode switch
+// shortcuts such as id.0.0 will fail because 0.0 will be interpreted
+// as a decimal value instead of two individual list-style shortcuts.
+DOT:       '.'  -> mode(AFTER_DOT);
+NSDOT:     '?.' -> mode(AFTER_DOT);
+COMMA:     ',';
+SEMICOLON: ';';
+IF:        'if';
+IN:        'in';
+ELSE:      'else';
+WHILE:     'while';
+DO:        'do';
+FOR:       'for';
+CONTINUE:  'continue';
+BREAK:     'break';
+RETURN:    'return';
+NEW:       'new';
+TRY:       'try';
+CATCH:     'catch';
+THROW:     'throw';
+THIS:      'this';
+INSTANCEOF: 'instanceof';
+
+BOOLNOT: '!';
+BWNOT:   '~';
+MUL:     '*';
+DIV:     '/' { this.isSlashRegex() == false }?;
+REM:     '%';
+ADD:     '+';
+SUB:     '-';
+LSH:     '<<';
+RSH:     '>>';
+USH:     '>>>';
+LT:      '<';
+LTE:     '<=';
+GT:      '>';
+GTE:     '>=';
+EQ:      '==';
+EQR:     '===';
+NE:      '!=';
+NER:     '!==';
+BWAND:   '&';
+XOR:     '^';
+BWOR:    '|';
+BOOLAND: '&&';
+BOOLOR:  '||';
+COND:    '?';
+COLON:   ':';
+ELVIS:   '?:';
+REF:     '::';
+ARROW:   '->';
+FIND:    '=~';
+MATCH:   '==~';
+INCR:    '++';
+DECR:    '--';
+
+ASSIGN: '=';
+AADD:   '+=';
+ASUB:   '-=';
+AMUL:   '*=';
+ADIV:   '/=';
+AREM:   '%=';
+AAND:   '&=';
+AXOR:   '^=';
+AOR:    '|=';
+ALSH:   '<<=';
+ARSH:   '>>=';
+AUSH:   '>>>=';
+
+OCTAL: '0' [0-7]+ [lL]?;
+HEX: '0' [xX] [0-9a-fA-F]+ [lL]?;
+INTEGER: ( '0' | [1-9] [0-9]* ) [lLfFdD]?;
+DECIMAL: ( '0' | [1-9] [0-9]* ) (DOT [0-9]+)? ( [eE] [+\-]? [0-9]+ )? [fFdD]?;
+
+STRING: ( '"' ( '\\"' | '\\\\' | ~[\\"] )*? '"' ) | ( '\'' ( '\\\'' | '\\\\' | ~[\\'] )*? '\'' );
+REGEX: '/' ( '\\' ~'\n' | ~('/' | '\n') )+? '/' [cilmsUux]* { this.isSlashRegex() }?;
+
+TRUE:  'true';
+FALSE: 'false';
+
+NULL: 'null';
+
+PRIMITIVE: 'boolean' | 'byte' | 'short' | 'char' | 'int' | 'long' | 'float' | 'double';
+DEF: 'def';
+
+ID: [_a-zA-Z] [_a-zA-Z0-9]*;
+
+mode AFTER_DOT;
+
+DOTINTEGER: ( '0' | [1-9] [0-9]* ) -> mode(DEFAULT_MODE);
+DOTID: [_a-zA-Z] [_a-zA-Z0-9]*     -> mode(DEFAULT_MODE);
diff --git a/packages/kbn-monaco/src/painless/antlr/painless_lexer.interp b/packages/kbn-monaco/src/painless/antlr/painless_lexer.interp
new file mode 100644
index 0000000000000..df5a0d5244124
--- /dev/null
+++ b/packages/kbn-monaco/src/painless/antlr/painless_lexer.interp
@@ -0,0 +1,273 @@
+token literal names:
+null
+null
+null
+'{'
+'}'
+'['
+']'
+'('
+')'
+'.'
+'?.'
+','
+';'
+'if'
+'in'
+'else'
+'while'
+'do'
+'for'
+'continue'
+'break'
+'return'
+'new'
+'try'
+'catch'
+'throw'
+'this'
+'instanceof'
+'!'
+'~'
+'*'
+'/'
+'%'
+'+'
+'-'
+'<<'
+'>>'
+'>>>'
+'<'
+'<='
+'>'
+'>='
+'=='
+'==='
+'!='
+'!=='
+'&'
+'^'
+'|'
+'&&'
+'||'
+'?'
+':'
+'?:'
+'::'
+'->'
+'=~'
+'==~'
+'++'
+'--'
+'='
+'+='
+'-='
+'*='
+'/='
+'%='
+'&='
+'^='
+'|='
+'<<='
+'>>='
+'>>>='
+null
+null
+null
+null
+null
+null
+'true'
+'false'
+'null'
+null
+'def'
+null
+null
+null
+
+token symbolic names:
+null
+WS
+COMMENT
+LBRACK
+RBRACK
+LBRACE
+RBRACE
+LP
+RP
+DOT
+NSDOT
+COMMA
+SEMICOLON
+IF
+IN
+ELSE
+WHILE
+DO
+FOR
+CONTINUE
+BREAK
+RETURN
+NEW
+TRY
+CATCH
+THROW
+THIS
+INSTANCEOF
+BOOLNOT
+BWNOT
+MUL
+DIV
+REM
+ADD
+SUB
+LSH
+RSH
+USH
+LT
+LTE
+GT
+GTE
+EQ
+EQR
+NE
+NER
+BWAND
+XOR
+BWOR
+BOOLAND
+BOOLOR
+COND
+COLON
+ELVIS
+REF
+ARROW
+FIND
+MATCH
+INCR
+DECR
+ASSIGN
+AADD
+ASUB
+AMUL
+ADIV
+AREM
+AAND
+AXOR
+AOR
+ALSH
+ARSH
+AUSH
+OCTAL
+HEX
+INTEGER
+DECIMAL
+STRING
+REGEX
+TRUE
+FALSE
+NULL
+PRIMITIVE
+DEF
+ID
+DOTINTEGER
+DOTID
+
+rule names:
+WS
+COMMENT
+LBRACK
+RBRACK
+LBRACE
+RBRACE
+LP
+RP
+DOT
+NSDOT
+COMMA
+SEMICOLON
+IF
+IN
+ELSE
+WHILE
+DO
+FOR
+CONTINUE
+BREAK
+RETURN
+NEW
+TRY
+CATCH
+THROW
+THIS
+INSTANCEOF
+BOOLNOT
+BWNOT
+MUL
+DIV
+REM
+ADD
+SUB
+LSH
+RSH
+USH
+LT
+LTE
+GT
+GTE
+EQ
+EQR
+NE
+NER
+BWAND
+XOR
+BWOR
+BOOLAND
+BOOLOR
+COND
+COLON
+ELVIS
+REF
+ARROW
+FIND
+MATCH
+INCR
+DECR
+ASSIGN
+AADD
+ASUB
+AMUL
+ADIV
+AREM
+AAND
+AXOR
+AOR
+ALSH
+ARSH
+AUSH
+OCTAL
+HEX
+INTEGER
+DECIMAL
+STRING
+REGEX
+TRUE
+FALSE
+NULL
+PRIMITIVE
+DEF
+ID
+DOTINTEGER
+DOTID
+
+channel names:
+DEFAULT_TOKEN_CHANNEL
+HIDDEN
+
+mode names:
+DEFAULT_MODE
+AFTER_DOT
+
+atn:
+[3, 51485, 51898, 1421, 44986, 20307, 1543, 60043, 49729, 2, 87, 634, 8, 1, 8, 1, 4, 2, 9, 2, 4, 3, 9, 3, 4, 4, 9, 4, 4, 5, 9, 5, 4, 6, 9, 6, 4, 7, 9, 7, 4, 8, 9, 8, 4, 9, 9, 9, 4, 10, 9, 10, 4, 11, 9, 11, 4, 12, 9, 12, 4, 13, 9, 13, 4, 14, 9, 14, 4, 15, 9, 15, 4, 16, 9, 16, 4, 17, 9, 17, 4, 18, 9, 18, 4, 19, 9, 19, 4, 20, 9, 20, 4, 21, 9, 21, 4, 22, 9, 22, 4, 23, 9, 23, 4, 24, 9, 24, 4, 25, 9, 25, 4, 26, 9, 26, 4, 27, 9, 27, 4, 28, 9, 28, 4, 29, 9, 29, 4, 30, 9, 30, 4, 31, 9, 31, 4, 32, 9, 32, 4, 33, 9, 33, 4, 34, 9, 34, 4, 35, 9, 35, 4, 36, 9, 36, 4, 37, 9, 37, 4, 38, 9, 38, 4, 39, 9, 39, 4, 40, 9, 40, 4, 41, 9, 41, 4, 42, 9, 42, 4, 43, 9, 43, 4, 44, 9, 44, 4, 45, 9, 45, 4, 46, 9, 46, 4, 47, 9, 47, 4, 48, 9, 48, 4, 49, 9, 49, 4, 50, 9, 50, 4, 51, 9, 51, 4, 52, 9, 52, 4, 53, 9, 53, 4, 54, 9, 54, 4, 55, 9, 55, 4, 56, 9, 56, 4, 57, 9, 57, 4, 58, 9, 58, 4, 59, 9, 59, 4, 60, 9, 60, 4, 61, 9, 61, 4, 62, 9, 62, 4, 63, 9, 63, 4, 64, 9, 64, 4, 65, 9, 65, 4, 66, 9, 66, 4, 67, 9, 67, 4, 68, 9, 68, 4, 69, 9, 69, 4, 70, 9, 70, 4, 71, 9, 71, 4, 72, 9, 72, 4, 73, 9, 73, 4, 74, 9, 74, 4, 75, 9, 75, 4, 76, 9, 76, 4, 77, 9, 77, 4, 78, 9, 78, 4, 79, 9, 79, 4, 80, 9, 80, 4, 81, 9, 81, 4, 82, 9, 82, 4, 83, 9, 83, 4, 84, 9, 84, 4, 85, 9, 85, 4, 86, 9, 86, 3, 2, 6, 2, 176, 10, 2, 13, 2, 14, 2, 177, 3, 2, 3, 2, 3, 3, 3, 3, 3, 3, 3, 3, 7, 3, 186, 10, 3, 12, 3, 14, 3, 189, 11, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 7, 3, 196, 10, 3, 12, 3, 14, 3, 199, 11, 3, 3, 3, 3, 3, 5, 3, 203, 10, 3, 3, 3, 3, 3, 3, 4, 3, 4, 3, 5, 3, 5, 3, 6, 3, 6, 3, 7, 3, 7, 3, 8, 3, 8, 3, 9, 3, 9, 3, 10, 3, 10, 3, 10, 3, 10, 3, 11, 3, 11, 3, 11, 3, 11, 3, 11, 3, 12, 3, 12, 3, 13, 3, 13, 3, 14, 3, 14, 3, 14, 3, 15, 3, 15, 3, 15, 3, 16, 3, 16, 3, 16, 3, 16, 3, 16, 3, 17, 3, 17, 3, 17, 3, 17, 3, 17, 3, 17, 3, 18, 3, 18, 3, 18, 3, 19, 3, 19, 3, 19, 3, 19, 3, 20, 3, 20, 3, 20, 3, 20, 3, 20, 3, 20, 3, 20, 3, 20, 3, 20, 3, 21, 3, 21, 3, 21, 3, 21, 3, 21, 3, 21, 3, 22, 3, 22, 3, 22, 3, 22, 3, 22, 3, 22, 3, 22, 3, 23, 3, 23, 3, 23, 3, 23, 3, 24, 3, 24, 3, 24, 3, 24, 3, 25, 3, 25, 3, 25, 3, 25, 3, 25, 3, 25, 3, 26, 3, 26, 3, 26, 3, 26, 3, 26, 3, 26, 3, 27, 3, 27, 3, 27, 3, 27, 3, 27, 3, 28, 3, 28, 3, 28, 3, 28, 3, 28, 3, 28, 3, 28, 3, 28, 3, 28, 3, 28, 3, 28, 3, 29, 3, 29, 3, 30, 3, 30, 3, 31, 3, 31, 3, 32, 3, 32, 3, 32, 3, 33, 3, 33, 3, 34, 3, 34, 3, 35, 3, 35, 3, 36, 3, 36, 3, 36, 3, 37, 3, 37, 3, 37, 3, 38, 3, 38, 3, 38, 3, 38, 3, 39, 3, 39, 3, 40, 3, 40, 3, 40, 3, 41, 3, 41, 3, 42, 3, 42, 3, 42, 3, 43, 3, 43, 3, 43, 3, 44, 3, 44, 3, 44, 3, 44, 3, 45, 3, 45, 3, 45, 3, 46, 3, 46, 3, 46, 3, 46, 3, 47, 3, 47, 3, 48, 3, 48, 3, 49, 3, 49, 3, 50, 3, 50, 3, 50, 3, 51, 3, 51, 3, 51, 3, 52, 3, 52, 3, 53, 3, 53, 3, 54, 3, 54, 3, 54, 3, 55, 3, 55, 3, 55, 3, 56, 3, 56, 3, 56, 3, 57, 3, 57, 3, 57, 3, 58, 3, 58, 3, 58, 3, 58, 3, 59, 3, 59, 3, 59, 3, 60, 3, 60, 3, 60, 3, 61, 3, 61, 3, 62, 3, 62, 3, 62, 3, 63, 3, 63, 3, 63, 3, 64, 3, 64, 3, 64, 3, 65, 3, 65, 3, 65, 3, 66, 3, 66, 3, 66, 3, 67, 3, 67, 3, 67, 3, 68, 3, 68, 3, 68, 3, 69, 3, 69, 3, 69, 3, 70, 3, 70, 3, 70, 3, 70, 3, 71, 3, 71, 3, 71, 3, 71, 3, 72, 3, 72, 3, 72, 3, 72, 3, 72, 3, 73, 3, 73, 6, 73, 442, 10, 73, 13, 73, 14, 73, 443, 3, 73, 5, 73, 447, 10, 73, 3, 74, 3, 74, 3, 74, 6, 74, 452, 10, 74, 13, 74, 14, 74, 453, 3, 74, 5, 74, 457, 10, 74, 3, 75, 3, 75, 3, 75, 7, 75, 462, 10, 75, 12, 75, 14, 75, 465, 11, 75, 5, 75, 467, 10, 75, 3, 75, 5, 75, 470, 10, 75, 3, 76, 3, 76, 3, 76, 7, 76, 475, 10, 76, 12, 76, 14, 76, 478, 11, 76, 5, 76, 480, 10, 76, 3, 76, 3, 76, 6, 76, 484, 10, 76, 13, 76, 14, 76, 485, 5, 76, 488, 10, 76, 3, 76, 3, 76, 5, 76, 492, 10, 76, 3, 76, 6, 76, 495, 10, 76, 13, 76, 14, 76, 496, 5, 76, 499, 10, 76, 3, 76, 5, 76, 502, 10, 76, 3, 77, 3, 77, 3, 77, 3, 77, 3, 77, 3, 77, 7, 77, 510, 10, 77, 12, 77, 14, 77, 513, 11, 77, 3, 77, 3, 77, 3, 77, 3, 77, 3, 77, 3, 77, 3, 77, 7, 77, 522, 10, 77, 12, 77, 14, 77, 525, 11, 77, 3, 77, 5, 77, 528, 10, 77, 3, 78, 3, 78, 3, 78, 3, 78, 6, 78, 534, 10, 78, 13, 78, 14, 78, 535, 3, 78, 3, 78, 7, 78, 540, 10, 78, 12, 78, 14, 78, 543, 11, 78, 3, 78, 3, 78, 3, 79, 3, 79, 3, 79, 3, 79, 3, 79, 3, 80, 3, 80, 3, 80, 3, 80, 3, 80, 3, 80, 3, 81, 3, 81, 3, 81, 3, 81, 3, 81, 3, 82, 3, 82, 3, 82, 3, 82, 3, 82, 3, 82, 3, 82, 3, 82, 3, 82, 3, 82, 3, 82, 3, 82, 3, 82, 3, 82, 3, 82, 3, 82, 3, 82, 3, 82, 3, 82, 3, 82, 3, 82, 3, 82, 3, 82, 3, 82, 3, 82, 3, 82, 3, 82, 3, 82, 3, 82, 3, 82, 3, 82, 3, 82, 3, 82, 3, 82, 3, 82, 3, 82, 3, 82, 3, 82, 5, 82, 601, 10, 82, 3, 83, 3, 83, 3, 83, 3, 83, 3, 84, 3, 84, 7, 84, 609, 10, 84, 12, 84, 14, 84, 612, 11, 84, 3, 85, 3, 85, 3, 85, 7, 85, 617, 10, 85, 12, 85, 14, 85, 620, 11, 85, 5, 85, 622, 10, 85, 3, 85, 3, 85, 3, 86, 3, 86, 7, 86, 628, 10, 86, 12, 86, 14, 86, 631, 11, 86, 3, 86, 3, 86, 7, 187, 197, 511, 523, 535, 2, 2, 87, 4, 2, 3, 6, 2, 4, 8, 2, 5, 10, 2, 6, 12, 2, 7, 14, 2, 8, 16, 2, 9, 18, 2, 10, 20, 2, 11, 22, 2, 12, 24, 2, 13, 26, 2, 14, 28, 2, 15, 30, 2, 16, 32, 2, 17, 34, 2, 18, 36, 2, 19, 38, 2, 20, 40, 2, 21, 42, 2, 22, 44, 2, 23, 46, 2, 24, 48, 2, 25, 50, 2, 26, 52, 2, 27, 54, 2, 28, 56, 2, 29, 58, 2, 30, 60, 2, 31, 62, 2, 32, 64, 2, 33, 66, 2, 34, 68, 2, 35, 70, 2, 36, 72, 2, 37, 74, 2, 38, 76, 2, 39, 78, 2, 40, 80, 2, 41, 82, 2, 42, 84, 2, 43, 86, 2, 44, 88, 2, 45, 90, 2, 46, 92, 2, 47, 94, 2, 48, 96, 2, 49, 98, 2, 50, 100, 2, 51, 102, 2, 52, 104, 2, 53, 106, 2, 54, 108, 2, 55, 110, 2, 56, 112, 2, 57, 114, 2, 58, 116, 2, 59, 118, 2, 60, 120, 2, 61, 122, 2, 62, 124, 2, 63, 126, 2, 64, 128, 2, 65, 130, 2, 66, 132, 2, 67, 134, 2, 68, 136, 2, 69, 138, 2, 70, 140, 2, 71, 142, 2, 72, 144, 2, 73, 146, 2, 74, 148, 2, 75, 150, 2, 76, 152, 2, 77, 154, 2, 78, 156, 2, 79, 158, 2, 80, 160, 2, 81, 162, 2, 82, 164, 2, 83, 166, 2, 84, 168, 2, 85, 170, 2, 86, 172, 2, 87, 4, 2, 3, 21, 5, 2, 11, 12, 15, 15, 34, 34, 4, 2, 12, 12, 15, 15, 3, 2, 50, 57, 4, 2, 78, 78, 110, 110, 4, 2, 90, 90, 122, 122, 5, 2, 50, 59, 67, 72, 99, 104, 3, 2, 51, 59, 3, 2, 50, 59, 8, 2, 70, 70, 72, 72, 78, 78, 102, 102, 104, 104, 110, 110, 4, 2, 71, 71, 103, 103, 4, 2, 45, 45, 47, 47, 6, 2, 70, 70, 72, 72, 102, 102, 104, 104, 4, 2, 36, 36, 94, 94, 4, 2, 41, 41, 94, 94, 3, 2, 12, 12, 4, 2, 12, 12, 49, 49, 9, 2, 87, 87, 101, 101, 107, 107, 110, 111, 117, 117, 119, 119, 122, 122, 5, 2, 67, 92, 97, 97, 99, 124, 6, 2, 50, 59, 67, 92, 97, 97, 99, 124, 2, 672, 2, 4, 3, 2, 2, 2, 2, 6, 3, 2, 2, 2, 2, 8, 3, 2, 2, 2, 2, 10, 3, 2, 2, 2, 2, 12, 3, 2, 2, 2, 2, 14, 3, 2, 2, 2, 2, 16, 3, 2, 2, 2, 2, 18, 3, 2, 2, 2, 2, 20, 3, 2, 2, 2, 2, 22, 3, 2, 2, 2, 2, 24, 3, 2, 2, 2, 2, 26, 3, 2, 2, 2, 2, 28, 3, 2, 2, 2, 2, 30, 3, 2, 2, 2, 2, 32, 3, 2, 2, 2, 2, 34, 3, 2, 2, 2, 2, 36, 3, 2, 2, 2, 2, 38, 3, 2, 2, 2, 2, 40, 3, 2, 2, 2, 2, 42, 3, 2, 2, 2, 2, 44, 3, 2, 2, 2, 2, 46, 3, 2, 2, 2, 2, 48, 3, 2, 2, 2, 2, 50, 3, 2, 2, 2, 2, 52, 3, 2, 2, 2, 2, 54, 3, 2, 2, 2, 2, 56, 3, 2, 2, 2, 2, 58, 3, 2, 2, 2, 2, 60, 3, 2, 2, 2, 2, 62, 3, 2, 2, 2, 2, 64, 3, 2, 2, 2, 2, 66, 3, 2, 2, 2, 2, 68, 3, 2, 2, 2, 2, 70, 3, 2, 2, 2, 2, 72, 3, 2, 2, 2, 2, 74, 3, 2, 2, 2, 2, 76, 3, 2, 2, 2, 2, 78, 3, 2, 2, 2, 2, 80, 3, 2, 2, 2, 2, 82, 3, 2, 2, 2, 2, 84, 3, 2, 2, 2, 2, 86, 3, 2, 2, 2, 2, 88, 3, 2, 2, 2, 2, 90, 3, 2, 2, 2, 2, 92, 3, 2, 2, 2, 2, 94, 3, 2, 2, 2, 2, 96, 3, 2, 2, 2, 2, 98, 3, 2, 2, 2, 2, 100, 3, 2, 2, 2, 2, 102, 3, 2, 2, 2, 2, 104, 3, 2, 2, 2, 2, 106, 3, 2, 2, 2, 2, 108, 3, 2, 2, 2, 2, 110, 3, 2, 2, 2, 2, 112, 3, 2, 2, 2, 2, 114, 3, 2, 2, 2, 2, 116, 3, 2, 2, 2, 2, 118, 3, 2, 2, 2, 2, 120, 3, 2, 2, 2, 2, 122, 3, 2, 2, 2, 2, 124, 3, 2, 2, 2, 2, 126, 3, 2, 2, 2, 2, 128, 3, 2, 2, 2, 2, 130, 3, 2, 2, 2, 2, 132, 3, 2, 2, 2, 2, 134, 3, 2, 2, 2, 2, 136, 3, 2, 2, 2, 2, 138, 3, 2, 2, 2, 2, 140, 3, 2, 2, 2, 2, 142, 3, 2, 2, 2, 2, 144, 3, 2, 2, 2, 2, 146, 3, 2, 2, 2, 2, 148, 3, 2, 2, 2, 2, 150, 3, 2, 2, 2, 2, 152, 3, 2, 2, 2, 2, 154, 3, 2, 2, 2, 2, 156, 3, 2, 2, 2, 2, 158, 3, 2, 2, 2, 2, 160, 3, 2, 2, 2, 2, 162, 3, 2, 2, 2, 2, 164, 3, 2, 2, 2, 2, 166, 3, 2, 2, 2, 2, 168, 3, 2, 2, 2, 3, 170, 3, 2, 2, 2, 3, 172, 3, 2, 2, 2, 4, 175, 3, 2, 2, 2, 6, 202, 3, 2, 2, 2, 8, 206, 3, 2, 2, 2, 10, 208, 3, 2, 2, 2, 12, 210, 3, 2, 2, 2, 14, 212, 3, 2, 2, 2, 16, 214, 3, 2, 2, 2, 18, 216, 3, 2, 2, 2, 20, 218, 3, 2, 2, 2, 22, 222, 3, 2, 2, 2, 24, 227, 3, 2, 2, 2, 26, 229, 3, 2, 2, 2, 28, 231, 3, 2, 2, 2, 30, 234, 3, 2, 2, 2, 32, 237, 3, 2, 2, 2, 34, 242, 3, 2, 2, 2, 36, 248, 3, 2, 2, 2, 38, 251, 3, 2, 2, 2, 40, 255, 3, 2, 2, 2, 42, 264, 3, 2, 2, 2, 44, 270, 3, 2, 2, 2, 46, 277, 3, 2, 2, 2, 48, 281, 3, 2, 2, 2, 50, 285, 3, 2, 2, 2, 52, 291, 3, 2, 2, 2, 54, 297, 3, 2, 2, 2, 56, 302, 3, 2, 2, 2, 58, 313, 3, 2, 2, 2, 60, 315, 3, 2, 2, 2, 62, 317, 3, 2, 2, 2, 64, 319, 3, 2, 2, 2, 66, 322, 3, 2, 2, 2, 68, 324, 3, 2, 2, 2, 70, 326, 3, 2, 2, 2, 72, 328, 3, 2, 2, 2, 74, 331, 3, 2, 2, 2, 76, 334, 3, 2, 2, 2, 78, 338, 3, 2, 2, 2, 80, 340, 3, 2, 2, 2, 82, 343, 3, 2, 2, 2, 84, 345, 3, 2, 2, 2, 86, 348, 3, 2, 2, 2, 88, 351, 3, 2, 2, 2, 90, 355, 3, 2, 2, 2, 92, 358, 3, 2, 2, 2, 94, 362, 3, 2, 2, 2, 96, 364, 3, 2, 2, 2, 98, 366, 3, 2, 2, 2, 100, 368, 3, 2, 2, 2, 102, 371, 3, 2, 2, 2, 104, 374, 3, 2, 2, 2, 106, 376, 3, 2, 2, 2, 108, 378, 3, 2, 2, 2, 110, 381, 3, 2, 2, 2, 112, 384, 3, 2, 2, 2, 114, 387, 3, 2, 2, 2, 116, 390, 3, 2, 2, 2, 118, 394, 3, 2, 2, 2, 120, 397, 3, 2, 2, 2, 122, 400, 3, 2, 2, 2, 124, 402, 3, 2, 2, 2, 126, 405, 3, 2, 2, 2, 128, 408, 3, 2, 2, 2, 130, 411, 3, 2, 2, 2, 132, 414, 3, 2, 2, 2, 134, 417, 3, 2, 2, 2, 136, 420, 3, 2, 2, 2, 138, 423, 3, 2, 2, 2, 140, 426, 3, 2, 2, 2, 142, 430, 3, 2, 2, 2, 144, 434, 3, 2, 2, 2, 146, 439, 3, 2, 2, 2, 148, 448, 3, 2, 2, 2, 150, 466, 3, 2, 2, 2, 152, 479, 3, 2, 2, 2, 154, 527, 3, 2, 2, 2, 156, 529, 3, 2, 2, 2, 158, 546, 3, 2, 2, 2, 160, 551, 3, 2, 2, 2, 162, 557, 3, 2, 2, 2, 164, 600, 3, 2, 2, 2, 166, 602, 3, 2, 2, 2, 168, 606, 3, 2, 2, 2, 170, 621, 3, 2, 2, 2, 172, 625, 3, 2, 2, 2, 174, 176, 9, 2, 2, 2, 175, 174, 3, 2, 2, 2, 176, 177, 3, 2, 2, 2, 177, 175, 3, 2, 2, 2, 177, 178, 3, 2, 2, 2, 178, 179, 3, 2, 2, 2, 179, 180, 8, 2, 2, 2, 180, 5, 3, 2, 2, 2, 181, 182, 7, 49, 2, 2, 182, 183, 7, 49, 2, 2, 183, 187, 3, 2, 2, 2, 184, 186, 11, 2, 2, 2, 185, 184, 3, 2, 2, 2, 186, 189, 3, 2, 2, 2, 187, 188, 3, 2, 2, 2, 187, 185, 3, 2, 2, 2, 188, 190, 3, 2, 2, 2, 189, 187, 3, 2, 2, 2, 190, 203, 9, 3, 2, 2, 191, 192, 7, 49, 2, 2, 192, 193, 7, 44, 2, 2, 193, 197, 3, 2, 2, 2, 194, 196, 11, 2, 2, 2, 195, 194, 3, 2, 2, 2, 196, 199, 3, 2, 2, 2, 197, 198, 3, 2, 2, 2, 197, 195, 3, 2, 2, 2, 198, 200, 3, 2, 2, 2, 199, 197, 3, 2, 2, 2, 200, 201, 7, 44, 2, 2, 201, 203, 7, 49, 2, 2, 202, 181, 3, 2, 2, 2, 202, 191, 3, 2, 2, 2, 203, 204, 3, 2, 2, 2, 204, 205, 8, 3, 2, 2, 205, 7, 3, 2, 2, 2, 206, 207, 7, 125, 2, 2, 207, 9, 3, 2, 2, 2, 208, 209, 7, 127, 2, 2, 209, 11, 3, 2, 2, 2, 210, 211, 7, 93, 2, 2, 211, 13, 3, 2, 2, 2, 212, 213, 7, 95, 2, 2, 213, 15, 3, 2, 2, 2, 214, 215, 7, 42, 2, 2, 215, 17, 3, 2, 2, 2, 216, 217, 7, 43, 2, 2, 217, 19, 3, 2, 2, 2, 218, 219, 7, 48, 2, 2, 219, 220, 3, 2, 2, 2, 220, 221, 8, 10, 3, 2, 221, 21, 3, 2, 2, 2, 222, 223, 7, 65, 2, 2, 223, 224, 7, 48, 2, 2, 224, 225, 3, 2, 2, 2, 225, 226, 8, 11, 3, 2, 226, 23, 3, 2, 2, 2, 227, 228, 7, 46, 2, 2, 228, 25, 3, 2, 2, 2, 229, 230, 7, 61, 2, 2, 230, 27, 3, 2, 2, 2, 231, 232, 7, 107, 2, 2, 232, 233, 7, 104, 2, 2, 233, 29, 3, 2, 2, 2, 234, 235, 7, 107, 2, 2, 235, 236, 7, 112, 2, 2, 236, 31, 3, 2, 2, 2, 237, 238, 7, 103, 2, 2, 238, 239, 7, 110, 2, 2, 239, 240, 7, 117, 2, 2, 240, 241, 7, 103, 2, 2, 241, 33, 3, 2, 2, 2, 242, 243, 7, 121, 2, 2, 243, 244, 7, 106, 2, 2, 244, 245, 7, 107, 2, 2, 245, 246, 7, 110, 2, 2, 246, 247, 7, 103, 2, 2, 247, 35, 3, 2, 2, 2, 248, 249, 7, 102, 2, 2, 249, 250, 7, 113, 2, 2, 250, 37, 3, 2, 2, 2, 251, 252, 7, 104, 2, 2, 252, 253, 7, 113, 2, 2, 253, 254, 7, 116, 2, 2, 254, 39, 3, 2, 2, 2, 255, 256, 7, 101, 2, 2, 256, 257, 7, 113, 2, 2, 257, 258, 7, 112, 2, 2, 258, 259, 7, 118, 2, 2, 259, 260, 7, 107, 2, 2, 260, 261, 7, 112, 2, 2, 261, 262, 7, 119, 2, 2, 262, 263, 7, 103, 2, 2, 263, 41, 3, 2, 2, 2, 264, 265, 7, 100, 2, 2, 265, 266, 7, 116, 2, 2, 266, 267, 7, 103, 2, 2, 267, 268, 7, 99, 2, 2, 268, 269, 7, 109, 2, 2, 269, 43, 3, 2, 2, 2, 270, 271, 7, 116, 2, 2, 271, 272, 7, 103, 2, 2, 272, 273, 7, 118, 2, 2, 273, 274, 7, 119, 2, 2, 274, 275, 7, 116, 2, 2, 275, 276, 7, 112, 2, 2, 276, 45, 3, 2, 2, 2, 277, 278, 7, 112, 2, 2, 278, 279, 7, 103, 2, 2, 279, 280, 7, 121, 2, 2, 280, 47, 3, 2, 2, 2, 281, 282, 7, 118, 2, 2, 282, 283, 7, 116, 2, 2, 283, 284, 7, 123, 2, 2, 284, 49, 3, 2, 2, 2, 285, 286, 7, 101, 2, 2, 286, 287, 7, 99, 2, 2, 287, 288, 7, 118, 2, 2, 288, 289, 7, 101, 2, 2, 289, 290, 7, 106, 2, 2, 290, 51, 3, 2, 2, 2, 291, 292, 7, 118, 2, 2, 292, 293, 7, 106, 2, 2, 293, 294, 7, 116, 2, 2, 294, 295, 7, 113, 2, 2, 295, 296, 7, 121, 2, 2, 296, 53, 3, 2, 2, 2, 297, 298, 7, 118, 2, 2, 298, 299, 7, 106, 2, 2, 299, 300, 7, 107, 2, 2, 300, 301, 7, 117, 2, 2, 301, 55, 3, 2, 2, 2, 302, 303, 7, 107, 2, 2, 303, 304, 7, 112, 2, 2, 304, 305, 7, 117, 2, 2, 305, 306, 7, 118, 2, 2, 306, 307, 7, 99, 2, 2, 307, 308, 7, 112, 2, 2, 308, 309, 7, 101, 2, 2, 309, 310, 7, 103, 2, 2, 310, 311, 7, 113, 2, 2, 311, 312, 7, 104, 2, 2, 312, 57, 3, 2, 2, 2, 313, 314, 7, 35, 2, 2, 314, 59, 3, 2, 2, 2, 315, 316, 7, 128, 2, 2, 316, 61, 3, 2, 2, 2, 317, 318, 7, 44, 2, 2, 318, 63, 3, 2, 2, 2, 319, 320, 7, 49, 2, 2, 320, 321, 6, 32, 2, 2, 321, 65, 3, 2, 2, 2, 322, 323, 7, 39, 2, 2, 323, 67, 3, 2, 2, 2, 324, 325, 7, 45, 2, 2, 325, 69, 3, 2, 2, 2, 326, 327, 7, 47, 2, 2, 327, 71, 3, 2, 2, 2, 328, 329, 7, 62, 2, 2, 329, 330, 7, 62, 2, 2, 330, 73, 3, 2, 2, 2, 331, 332, 7, 64, 2, 2, 332, 333, 7, 64, 2, 2, 333, 75, 3, 2, 2, 2, 334, 335, 7, 64, 2, 2, 335, 336, 7, 64, 2, 2, 336, 337, 7, 64, 2, 2, 337, 77, 3, 2, 2, 2, 338, 339, 7, 62, 2, 2, 339, 79, 3, 2, 2, 2, 340, 341, 7, 62, 2, 2, 341, 342, 7, 63, 2, 2, 342, 81, 3, 2, 2, 2, 343, 344, 7, 64, 2, 2, 344, 83, 3, 2, 2, 2, 345, 346, 7, 64, 2, 2, 346, 347, 7, 63, 2, 2, 347, 85, 3, 2, 2, 2, 348, 349, 7, 63, 2, 2, 349, 350, 7, 63, 2, 2, 350, 87, 3, 2, 2, 2, 351, 352, 7, 63, 2, 2, 352, 353, 7, 63, 2, 2, 353, 354, 7, 63, 2, 2, 354, 89, 3, 2, 2, 2, 355, 356, 7, 35, 2, 2, 356, 357, 7, 63, 2, 2, 357, 91, 3, 2, 2, 2, 358, 359, 7, 35, 2, 2, 359, 360, 7, 63, 2, 2, 360, 361, 7, 63, 2, 2, 361, 93, 3, 2, 2, 2, 362, 363, 7, 40, 2, 2, 363, 95, 3, 2, 2, 2, 364, 365, 7, 96, 2, 2, 365, 97, 3, 2, 2, 2, 366, 367, 7, 126, 2, 2, 367, 99, 3, 2, 2, 2, 368, 369, 7, 40, 2, 2, 369, 370, 7, 40, 2, 2, 370, 101, 3, 2, 2, 2, 371, 372, 7, 126, 2, 2, 372, 373, 7, 126, 2, 2, 373, 103, 3, 2, 2, 2, 374, 375, 7, 65, 2, 2, 375, 105, 3, 2, 2, 2, 376, 377, 7, 60, 2, 2, 377, 107, 3, 2, 2, 2, 378, 379, 7, 65, 2, 2, 379, 380, 7, 60, 2, 2, 380, 109, 3, 2, 2, 2, 381, 382, 7, 60, 2, 2, 382, 383, 7, 60, 2, 2, 383, 111, 3, 2, 2, 2, 384, 385, 7, 47, 2, 2, 385, 386, 7, 64, 2, 2, 386, 113, 3, 2, 2, 2, 387, 388, 7, 63, 2, 2, 388, 389, 7, 128, 2, 2, 389, 115, 3, 2, 2, 2, 390, 391, 7, 63, 2, 2, 391, 392, 7, 63, 2, 2, 392, 393, 7, 128, 2, 2, 393, 117, 3, 2, 2, 2, 394, 395, 7, 45, 2, 2, 395, 396, 7, 45, 2, 2, 396, 119, 3, 2, 2, 2, 397, 398, 7, 47, 2, 2, 398, 399, 7, 47, 2, 2, 399, 121, 3, 2, 2, 2, 400, 401, 7, 63, 2, 2, 401, 123, 3, 2, 2, 2, 402, 403, 7, 45, 2, 2, 403, 404, 7, 63, 2, 2, 404, 125, 3, 2, 2, 2, 405, 406, 7, 47, 2, 2, 406, 407, 7, 63, 2, 2, 407, 127, 3, 2, 2, 2, 408, 409, 7, 44, 2, 2, 409, 410, 7, 63, 2, 2, 410, 129, 3, 2, 2, 2, 411, 412, 7, 49, 2, 2, 412, 413, 7, 63, 2, 2, 413, 131, 3, 2, 2, 2, 414, 415, 7, 39, 2, 2, 415, 416, 7, 63, 2, 2, 416, 133, 3, 2, 2, 2, 417, 418, 7, 40, 2, 2, 418, 419, 7, 63, 2, 2, 419, 135, 3, 2, 2, 2, 420, 421, 7, 96, 2, 2, 421, 422, 7, 63, 2, 2, 422, 137, 3, 2, 2, 2, 423, 424, 7, 126, 2, 2, 424, 425, 7, 63, 2, 2, 425, 139, 3, 2, 2, 2, 426, 427, 7, 62, 2, 2, 427, 428, 7, 62, 2, 2, 428, 429, 7, 63, 2, 2, 429, 141, 3, 2, 2, 2, 430, 431, 7, 64, 2, 2, 431, 432, 7, 64, 2, 2, 432, 433, 7, 63, 2, 2, 433, 143, 3, 2, 2, 2, 434, 435, 7, 64, 2, 2, 435, 436, 7, 64, 2, 2, 436, 437, 7, 64, 2, 2, 437, 438, 7, 63, 2, 2, 438, 145, 3, 2, 2, 2, 439, 441, 7, 50, 2, 2, 440, 442, 9, 4, 2, 2, 441, 440, 3, 2, 2, 2, 442, 443, 3, 2, 2, 2, 443, 441, 3, 2, 2, 2, 443, 444, 3, 2, 2, 2, 444, 446, 3, 2, 2, 2, 445, 447, 9, 5, 2, 2, 446, 445, 3, 2, 2, 2, 446, 447, 3, 2, 2, 2, 447, 147, 3, 2, 2, 2, 448, 449, 7, 50, 2, 2, 449, 451, 9, 6, 2, 2, 450, 452, 9, 7, 2, 2, 451, 450, 3, 2, 2, 2, 452, 453, 3, 2, 2, 2, 453, 451, 3, 2, 2, 2, 453, 454, 3, 2, 2, 2, 454, 456, 3, 2, 2, 2, 455, 457, 9, 5, 2, 2, 456, 455, 3, 2, 2, 2, 456, 457, 3, 2, 2, 2, 457, 149, 3, 2, 2, 2, 458, 467, 7, 50, 2, 2, 459, 463, 9, 8, 2, 2, 460, 462, 9, 9, 2, 2, 461, 460, 3, 2, 2, 2, 462, 465, 3, 2, 2, 2, 463, 461, 3, 2, 2, 2, 463, 464, 3, 2, 2, 2, 464, 467, 3, 2, 2, 2, 465, 463, 3, 2, 2, 2, 466, 458, 3, 2, 2, 2, 466, 459, 3, 2, 2, 2, 467, 469, 3, 2, 2, 2, 468, 470, 9, 10, 2, 2, 469, 468, 3, 2, 2, 2, 469, 470, 3, 2, 2, 2, 470, 151, 3, 2, 2, 2, 471, 480, 7, 50, 2, 2, 472, 476, 9, 8, 2, 2, 473, 475, 9, 9, 2, 2, 474, 473, 3, 2, 2, 2, 475, 478, 3, 2, 2, 2, 476, 474, 3, 2, 2, 2, 476, 477, 3, 2, 2, 2, 477, 480, 3, 2, 2, 2, 478, 476, 3, 2, 2, 2, 479, 471, 3, 2, 2, 2, 479, 472, 3, 2, 2, 2, 480, 487, 3, 2, 2, 2, 481, 483, 5, 20, 10, 2, 482, 484, 9, 9, 2, 2, 483, 482, 3, 2, 2, 2, 484, 485, 3, 2, 2, 2, 485, 483, 3, 2, 2, 2, 485, 486, 3, 2, 2, 2, 486, 488, 3, 2, 2, 2, 487, 481, 3, 2, 2, 2, 487, 488, 3, 2, 2, 2, 488, 498, 3, 2, 2, 2, 489, 491, 9, 11, 2, 2, 490, 492, 9, 12, 2, 2, 491, 490, 3, 2, 2, 2, 491, 492, 3, 2, 2, 2, 492, 494, 3, 2, 2, 2, 493, 495, 9, 9, 2, 2, 494, 493, 3, 2, 2, 2, 495, 496, 3, 2, 2, 2, 496, 494, 3, 2, 2, 2, 496, 497, 3, 2, 2, 2, 497, 499, 3, 2, 2, 2, 498, 489, 3, 2, 2, 2, 498, 499, 3, 2, 2, 2, 499, 501, 3, 2, 2, 2, 500, 502, 9, 13, 2, 2, 501, 500, 3, 2, 2, 2, 501, 502, 3, 2, 2, 2, 502, 153, 3, 2, 2, 2, 503, 511, 7, 36, 2, 2, 504, 505, 7, 94, 2, 2, 505, 510, 7, 36, 2, 2, 506, 507, 7, 94, 2, 2, 507, 510, 7, 94, 2, 2, 508, 510, 10, 14, 2, 2, 509, 504, 3, 2, 2, 2, 509, 506, 3, 2, 2, 2, 509, 508, 3, 2, 2, 2, 510, 513, 3, 2, 2, 2, 511, 512, 3, 2, 2, 2, 511, 509, 3, 2, 2, 2, 512, 514, 3, 2, 2, 2, 513, 511, 3, 2, 2, 2, 514, 528, 7, 36, 2, 2, 515, 523, 7, 41, 2, 2, 516, 517, 7, 94, 2, 2, 517, 522, 7, 41, 2, 2, 518, 519, 7, 94, 2, 2, 519, 522, 7, 94, 2, 2, 520, 522, 10, 15, 2, 2, 521, 516, 3, 2, 2, 2, 521, 518, 3, 2, 2, 2, 521, 520, 3, 2, 2, 2, 522, 525, 3, 2, 2, 2, 523, 524, 3, 2, 2, 2, 523, 521, 3, 2, 2, 2, 524, 526, 3, 2, 2, 2, 525, 523, 3, 2, 2, 2, 526, 528, 7, 41, 2, 2, 527, 503, 3, 2, 2, 2, 527, 515, 3, 2, 2, 2, 528, 155, 3, 2, 2, 2, 529, 533, 7, 49, 2, 2, 530, 531, 7, 94, 2, 2, 531, 534, 10, 16, 2, 2, 532, 534, 10, 17, 2, 2, 533, 530, 3, 2, 2, 2, 533, 532, 3, 2, 2, 2, 534, 535, 3, 2, 2, 2, 535, 536, 3, 2, 2, 2, 535, 533, 3, 2, 2, 2, 536, 537, 3, 2, 2, 2, 537, 541, 7, 49, 2, 2, 538, 540, 9, 18, 2, 2, 539, 538, 3, 2, 2, 2, 540, 543, 3, 2, 2, 2, 541, 539, 3, 2, 2, 2, 541, 542, 3, 2, 2, 2, 542, 544, 3, 2, 2, 2, 543, 541, 3, 2, 2, 2, 544, 545, 6, 78, 3, 2, 545, 157, 3, 2, 2, 2, 546, 547, 7, 118, 2, 2, 547, 548, 7, 116, 2, 2, 548, 549, 7, 119, 2, 2, 549, 550, 7, 103, 2, 2, 550, 159, 3, 2, 2, 2, 551, 552, 7, 104, 2, 2, 552, 553, 7, 99, 2, 2, 553, 554, 7, 110, 2, 2, 554, 555, 7, 117, 2, 2, 555, 556, 7, 103, 2, 2, 556, 161, 3, 2, 2, 2, 557, 558, 7, 112, 2, 2, 558, 559, 7, 119, 2, 2, 559, 560, 7, 110, 2, 2, 560, 561, 7, 110, 2, 2, 561, 163, 3, 2, 2, 2, 562, 563, 7, 100, 2, 2, 563, 564, 7, 113, 2, 2, 564, 565, 7, 113, 2, 2, 565, 566, 7, 110, 2, 2, 566, 567, 7, 103, 2, 2, 567, 568, 7, 99, 2, 2, 568, 601, 7, 112, 2, 2, 569, 570, 7, 100, 2, 2, 570, 571, 7, 123, 2, 2, 571, 572, 7, 118, 2, 2, 572, 601, 7, 103, 2, 2, 573, 574, 7, 117, 2, 2, 574, 575, 7, 106, 2, 2, 575, 576, 7, 113, 2, 2, 576, 577, 7, 116, 2, 2, 577, 601, 7, 118, 2, 2, 578, 579, 7, 101, 2, 2, 579, 580, 7, 106, 2, 2, 580, 581, 7, 99, 2, 2, 581, 601, 7, 116, 2, 2, 582, 583, 7, 107, 2, 2, 583, 584, 7, 112, 2, 2, 584, 601, 7, 118, 2, 2, 585, 586, 7, 110, 2, 2, 586, 587, 7, 113, 2, 2, 587, 588, 7, 112, 2, 2, 588, 601, 7, 105, 2, 2, 589, 590, 7, 104, 2, 2, 590, 591, 7, 110, 2, 2, 591, 592, 7, 113, 2, 2, 592, 593, 7, 99, 2, 2, 593, 601, 7, 118, 2, 2, 594, 595, 7, 102, 2, 2, 595, 596, 7, 113, 2, 2, 596, 597, 7, 119, 2, 2, 597, 598, 7, 100, 2, 2, 598, 599, 7, 110, 2, 2, 599, 601, 7, 103, 2, 2, 600, 562, 3, 2, 2, 2, 600, 569, 3, 2, 2, 2, 600, 573, 3, 2, 2, 2, 600, 578, 3, 2, 2, 2, 600, 582, 3, 2, 2, 2, 600, 585, 3, 2, 2, 2, 600, 589, 3, 2, 2, 2, 600, 594, 3, 2, 2, 2, 601, 165, 3, 2, 2, 2, 602, 603, 7, 102, 2, 2, 603, 604, 7, 103, 2, 2, 604, 605, 7, 104, 2, 2, 605, 167, 3, 2, 2, 2, 606, 610, 9, 19, 2, 2, 607, 609, 9, 20, 2, 2, 608, 607, 3, 2, 2, 2, 609, 612, 3, 2, 2, 2, 610, 608, 3, 2, 2, 2, 610, 611, 3, 2, 2, 2, 611, 169, 3, 2, 2, 2, 612, 610, 3, 2, 2, 2, 613, 622, 7, 50, 2, 2, 614, 618, 9, 8, 2, 2, 615, 617, 9, 9, 2, 2, 616, 615, 3, 2, 2, 2, 617, 620, 3, 2, 2, 2, 618, 616, 3, 2, 2, 2, 618, 619, 3, 2, 2, 2, 619, 622, 3, 2, 2, 2, 620, 618, 3, 2, 2, 2, 621, 613, 3, 2, 2, 2, 621, 614, 3, 2, 2, 2, 622, 623, 3, 2, 2, 2, 623, 624, 8, 85, 4, 2, 624, 171, 3, 2, 2, 2, 625, 629, 9, 19, 2, 2, 626, 628, 9, 20, 2, 2, 627, 626, 3, 2, 2, 2, 628, 631, 3, 2, 2, 2, 629, 627, 3, 2, 2, 2, 629, 630, 3, 2, 2, 2, 630, 632, 3, 2, 2, 2, 631, 629, 3, 2, 2, 2, 632, 633, 8, 86, 4, 2, 633, 173, 3, 2, 2, 2, 36, 2, 3, 177, 187, 197, 202, 443, 446, 453, 456, 463, 466, 469, 476, 479, 485, 487, 491, 496, 498, 501, 509, 511, 521, 523, 527, 533, 535, 541, 600, 610, 618, 621, 629, 5, 8, 2, 2, 4, 3, 2, 4, 2, 2]
\ No newline at end of file
diff --git a/packages/kbn-monaco/src/painless/antlr/painless_lexer.tokens b/packages/kbn-monaco/src/painless/antlr/painless_lexer.tokens
new file mode 100644
index 0000000000000..ff62343c92ba5
--- /dev/null
+++ b/packages/kbn-monaco/src/painless/antlr/painless_lexer.tokens
@@ -0,0 +1,158 @@
+WS=1
+COMMENT=2
+LBRACK=3
+RBRACK=4
+LBRACE=5
+RBRACE=6
+LP=7
+RP=8
+DOT=9
+NSDOT=10
+COMMA=11
+SEMICOLON=12
+IF=13
+IN=14
+ELSE=15
+WHILE=16
+DO=17
+FOR=18
+CONTINUE=19
+BREAK=20
+RETURN=21
+NEW=22
+TRY=23
+CATCH=24
+THROW=25
+THIS=26
+INSTANCEOF=27
+BOOLNOT=28
+BWNOT=29
+MUL=30
+DIV=31
+REM=32
+ADD=33
+SUB=34
+LSH=35
+RSH=36
+USH=37
+LT=38
+LTE=39
+GT=40
+GTE=41
+EQ=42
+EQR=43
+NE=44
+NER=45
+BWAND=46
+XOR=47
+BWOR=48
+BOOLAND=49
+BOOLOR=50
+COND=51
+COLON=52
+ELVIS=53
+REF=54
+ARROW=55
+FIND=56
+MATCH=57
+INCR=58
+DECR=59
+ASSIGN=60
+AADD=61
+ASUB=62
+AMUL=63
+ADIV=64
+AREM=65
+AAND=66
+AXOR=67
+AOR=68
+ALSH=69
+ARSH=70
+AUSH=71
+OCTAL=72
+HEX=73
+INTEGER=74
+DECIMAL=75
+STRING=76
+REGEX=77
+TRUE=78
+FALSE=79
+NULL=80
+PRIMITIVE=81
+DEF=82
+ID=83
+DOTINTEGER=84
+DOTID=85
+'{'=3
+'}'=4
+'['=5
+']'=6
+'('=7
+')'=8
+'.'=9
+'?.'=10
+','=11
+';'=12
+'if'=13
+'in'=14
+'else'=15
+'while'=16
+'do'=17
+'for'=18
+'continue'=19
+'break'=20
+'return'=21
+'new'=22
+'try'=23
+'catch'=24
+'throw'=25
+'this'=26
+'instanceof'=27
+'!'=28
+'~'=29
+'*'=30
+'/'=31
+'%'=32
+'+'=33
+'-'=34
+'<<'=35
+'>>'=36
+'>>>'=37
+'<'=38
+'<='=39
+'>'=40
+'>='=41
+'=='=42
+'==='=43
+'!='=44
+'!=='=45
+'&'=46
+'^'=47
+'|'=48
+'&&'=49
+'||'=50
+'?'=51
+':'=52
+'?:'=53
+'::'=54
+'->'=55
+'=~'=56
+'==~'=57
+'++'=58
+'--'=59
+'='=60
+'+='=61
+'-='=62
+'*='=63
+'/='=64
+'%='=65
+'&='=66
+'^='=67
+'|='=68
+'<<='=69
+'>>='=70
+'>>>='=71
+'true'=78
+'false'=79
+'null'=80
+'def'=82
diff --git a/packages/kbn-monaco/src/painless/antlr/painless_lexer.ts b/packages/kbn-monaco/src/painless/antlr/painless_lexer.ts
new file mode 100644
index 0000000000000..eb335c73d94b2
--- /dev/null
+++ b/packages/kbn-monaco/src/painless/antlr/painless_lexer.ts
@@ -0,0 +1,538 @@
+// @ts-nocheck
+// Generated from ./src/painless/antlr/painless_lexer.g4 by ANTLR 4.7.3-SNAPSHOT
+
+
+import { ATN } from "antlr4ts/atn/ATN";
+import { ATNDeserializer } from "antlr4ts/atn/ATNDeserializer";
+import { CharStream } from "antlr4ts/CharStream";
+import { Lexer } from "antlr4ts/Lexer";
+import { LexerATNSimulator } from "antlr4ts/atn/LexerATNSimulator";
+import { NotNull } from "antlr4ts/Decorators";
+import { Override } from "antlr4ts/Decorators";
+import { RuleContext } from "antlr4ts/RuleContext";
+import { Vocabulary } from "antlr4ts/Vocabulary";
+import { VocabularyImpl } from "antlr4ts/VocabularyImpl";
+
+import * as Utils from "antlr4ts/misc/Utils";
+
+
+export class painless_lexer extends Lexer {
+	public static readonly WS = 1;
+	public static readonly COMMENT = 2;
+	public static readonly LBRACK = 3;
+	public static readonly RBRACK = 4;
+	public static readonly LBRACE = 5;
+	public static readonly RBRACE = 6;
+	public static readonly LP = 7;
+	public static readonly RP = 8;
+	public static readonly DOT = 9;
+	public static readonly NSDOT = 10;
+	public static readonly COMMA = 11;
+	public static readonly SEMICOLON = 12;
+	public static readonly IF = 13;
+	public static readonly IN = 14;
+	public static readonly ELSE = 15;
+	public static readonly WHILE = 16;
+	public static readonly DO = 17;
+	public static readonly FOR = 18;
+	public static readonly CONTINUE = 19;
+	public static readonly BREAK = 20;
+	public static readonly RETURN = 21;
+	public static readonly NEW = 22;
+	public static readonly TRY = 23;
+	public static readonly CATCH = 24;
+	public static readonly THROW = 25;
+	public static readonly THIS = 26;
+	public static readonly INSTANCEOF = 27;
+	public static readonly BOOLNOT = 28;
+	public static readonly BWNOT = 29;
+	public static readonly MUL = 30;
+	public static readonly DIV = 31;
+	public static readonly REM = 32;
+	public static readonly ADD = 33;
+	public static readonly SUB = 34;
+	public static readonly LSH = 35;
+	public static readonly RSH = 36;
+	public static readonly USH = 37;
+	public static readonly LT = 38;
+	public static readonly LTE = 39;
+	public static readonly GT = 40;
+	public static readonly GTE = 41;
+	public static readonly EQ = 42;
+	public static readonly EQR = 43;
+	public static readonly NE = 44;
+	public static readonly NER = 45;
+	public static readonly BWAND = 46;
+	public static readonly XOR = 47;
+	public static readonly BWOR = 48;
+	public static readonly BOOLAND = 49;
+	public static readonly BOOLOR = 50;
+	public static readonly COND = 51;
+	public static readonly COLON = 52;
+	public static readonly ELVIS = 53;
+	public static readonly REF = 54;
+	public static readonly ARROW = 55;
+	public static readonly FIND = 56;
+	public static readonly MATCH = 57;
+	public static readonly INCR = 58;
+	public static readonly DECR = 59;
+	public static readonly ASSIGN = 60;
+	public static readonly AADD = 61;
+	public static readonly ASUB = 62;
+	public static readonly AMUL = 63;
+	public static readonly ADIV = 64;
+	public static readonly AREM = 65;
+	public static readonly AAND = 66;
+	public static readonly AXOR = 67;
+	public static readonly AOR = 68;
+	public static readonly ALSH = 69;
+	public static readonly ARSH = 70;
+	public static readonly AUSH = 71;
+	public static readonly OCTAL = 72;
+	public static readonly HEX = 73;
+	public static readonly INTEGER = 74;
+	public static readonly DECIMAL = 75;
+	public static readonly STRING = 76;
+	public static readonly REGEX = 77;
+	public static readonly TRUE = 78;
+	public static readonly FALSE = 79;
+	public static readonly NULL = 80;
+	public static readonly PRIMITIVE = 81;
+	public static readonly DEF = 82;
+	public static readonly ID = 83;
+	public static readonly DOTINTEGER = 84;
+	public static readonly DOTID = 85;
+	public static readonly AFTER_DOT = 1;
+
+	// tslint:disable:no-trailing-whitespace
+	public static readonly channelNames: string[] = [
+		"DEFAULT_TOKEN_CHANNEL", "HIDDEN",
+	];
+
+	// tslint:disable:no-trailing-whitespace
+	public static readonly modeNames: string[] = [
+		"DEFAULT_MODE", "AFTER_DOT",
+	];
+
+	public static readonly ruleNames: string[] = [
+		"WS", "COMMENT", "LBRACK", "RBRACK", "LBRACE", "RBRACE", "LP", "RP", "DOT",
+		"NSDOT", "COMMA", "SEMICOLON", "IF", "IN", "ELSE", "WHILE", "DO", "FOR",
+		"CONTINUE", "BREAK", "RETURN", "NEW", "TRY", "CATCH", "THROW", "THIS",
+		"INSTANCEOF", "BOOLNOT", "BWNOT", "MUL", "DIV", "REM", "ADD", "SUB", "LSH",
+		"RSH", "USH", "LT", "LTE", "GT", "GTE", "EQ", "EQR", "NE", "NER", "BWAND",
+		"XOR", "BWOR", "BOOLAND", "BOOLOR", "COND", "COLON", "ELVIS", "REF", "ARROW",
+		"FIND", "MATCH", "INCR", "DECR", "ASSIGN", "AADD", "ASUB", "AMUL", "ADIV",
+		"AREM", "AAND", "AXOR", "AOR", "ALSH", "ARSH", "AUSH", "OCTAL", "HEX",
+		"INTEGER", "DECIMAL", "STRING", "REGEX", "TRUE", "FALSE", "NULL", "PRIMITIVE",
+		"DEF", "ID", "DOTINTEGER", "DOTID",
+	];
+
+	private static readonly _LITERAL_NAMES: Array<string | undefined> = [
+		undefined, undefined, undefined, "'{'", "'}'", "'['", "']'", "'('", "')'",
+		"'.'", "'?.'", "','", "';'", "'if'", "'in'", "'else'", "'while'", "'do'",
+		"'for'", "'continue'", "'break'", "'return'", "'new'", "'try'", "'catch'",
+		"'throw'", "'this'", "'instanceof'", "'!'", "'~'", "'*'", "'/'", "'%'",
+		"'+'", "'-'", "'<<'", "'>>'", "'>>>'", "'<'", "'<='", "'>'", "'>='", "'=='",
+		"'==='", "'!='", "'!=='", "'&'", "'^'", "'|'", "'&&'", "'||'", "'?'",
+		"':'", "'?:'", "'::'", "'->'", "'=~'", "'==~'", "'++'", "'--'", "'='",
+		"'+='", "'-='", "'*='", "'/='", "'%='", "'&='", "'^='", "'|='", "'<<='",
+		"'>>='", "'>>>='", undefined, undefined, undefined, undefined, undefined,
+		undefined, "'true'", "'false'", "'null'", undefined, "'def'",
+	];
+	private static readonly _SYMBOLIC_NAMES: Array<string | undefined> = [
+		undefined, "WS", "COMMENT", "LBRACK", "RBRACK", "LBRACE", "RBRACE", "LP",
+		"RP", "DOT", "NSDOT", "COMMA", "SEMICOLON", "IF", "IN", "ELSE", "WHILE",
+		"DO", "FOR", "CONTINUE", "BREAK", "RETURN", "NEW", "TRY", "CATCH", "THROW",
+		"THIS", "INSTANCEOF", "BOOLNOT", "BWNOT", "MUL", "DIV", "REM", "ADD",
+		"SUB", "LSH", "RSH", "USH", "LT", "LTE", "GT", "GTE", "EQ", "EQR", "NE",
+		"NER", "BWAND", "XOR", "BWOR", "BOOLAND", "BOOLOR", "COND", "COLON", "ELVIS",
+		"REF", "ARROW", "FIND", "MATCH", "INCR", "DECR", "ASSIGN", "AADD", "ASUB",
+		"AMUL", "ADIV", "AREM", "AAND", "AXOR", "AOR", "ALSH", "ARSH", "AUSH",
+		"OCTAL", "HEX", "INTEGER", "DECIMAL", "STRING", "REGEX", "TRUE", "FALSE",
+		"NULL", "PRIMITIVE", "DEF", "ID", "DOTINTEGER", "DOTID",
+	];
+	public static readonly VOCABULARY: Vocabulary = new VocabularyImpl(painless_lexer._LITERAL_NAMES, painless_lexer._SYMBOLIC_NAMES, []);
+
+	// @Override
+	// @NotNull
+	public get vocabulary(): Vocabulary {
+		return painless_lexer.VOCABULARY;
+	}
+	// tslint:enable:no-trailing-whitespace
+
+
+	constructor(input: CharStream) {
+		super(input);
+		this._interp = new LexerATNSimulator(painless_lexer._ATN, this);
+	}
+
+	// @Override
+	public get grammarFileName(): string { return "painless_lexer.g4"; }
+
+	// @Override
+	public get ruleNames(): string[] { return painless_lexer.ruleNames; }
+
+	// @Override
+	public get serializedATN(): string { return painless_lexer._serializedATN; }
+
+	// @Override
+	public get channelNames(): string[] { return painless_lexer.channelNames; }
+
+	// @Override
+	public get modeNames(): string[] { return painless_lexer.modeNames; }
+
+	// @Override
+	public sempred(_localctx: RuleContext, ruleIndex: number, predIndex: number): boolean {
+		switch (ruleIndex) {
+    // DO NOT CHANGE
+    // This is a manual fix to handle slashes appropriately
+		case 31:
+			return this.DIV_sempred(_localctx, predIndex);
+
+    // DO NOT CHANGE
+    // This is a manual fix to handle regexes appropriately
+		case 77:
+			return this.REGEX_sempred(_localctx, predIndex);
+		}
+		return true;
+	}
+	private DIV_sempred(_localctx: RuleContext, predIndex: number): boolean {
+		switch (predIndex) {
+		case 0:
+			return  this.isSlashRegex() == false ;
+		}
+		return true;
+	}
+	private REGEX_sempred(_localctx: RuleContext, predIndex: number): boolean {
+		switch (predIndex) {
+		case 1:
+			return  this.isSlashRegex() ;
+		}
+		return true;
+	}
+
+	private static readonly _serializedATNSegments: number = 2;
+	private static readonly _serializedATNSegment0: string =
+		"\x03\uC91D\uCABA\u058D\uAFBA\u4F53\u0607\uEA8B\uC241\x02W\u027A\b\x01" +
+		"\b\x01\x04\x02\t\x02\x04\x03\t\x03\x04\x04\t\x04\x04\x05\t\x05\x04\x06" +
+		"\t\x06\x04\x07\t\x07\x04\b\t\b\x04\t\t\t\x04\n\t\n\x04\v\t\v\x04\f\t\f" +
+		"\x04\r\t\r\x04\x0E\t\x0E\x04\x0F\t\x0F\x04\x10\t\x10\x04\x11\t\x11\x04" +
+		"\x12\t\x12\x04\x13\t\x13\x04\x14\t\x14\x04\x15\t\x15\x04\x16\t\x16\x04" +
+		"\x17\t\x17\x04\x18\t\x18\x04\x19\t\x19\x04\x1A\t\x1A\x04\x1B\t\x1B\x04" +
+		"\x1C\t\x1C\x04\x1D\t\x1D\x04\x1E\t\x1E\x04\x1F\t\x1F\x04 \t \x04!\t!\x04" +
+		"\"\t\"\x04#\t#\x04$\t$\x04%\t%\x04&\t&\x04\'\t\'\x04(\t(\x04)\t)\x04*" +
+		"\t*\x04+\t+\x04,\t,\x04-\t-\x04.\t.\x04/\t/\x040\t0\x041\t1\x042\t2\x04" +
+		"3\t3\x044\t4\x045\t5\x046\t6\x047\t7\x048\t8\x049\t9\x04:\t:\x04;\t;\x04" +
+		"<\t<\x04=\t=\x04>\t>\x04?\t?\x04@\t@\x04A\tA\x04B\tB\x04C\tC\x04D\tD\x04" +
+		"E\tE\x04F\tF\x04G\tG\x04H\tH\x04I\tI\x04J\tJ\x04K\tK\x04L\tL\x04M\tM\x04" +
+		"N\tN\x04O\tO\x04P\tP\x04Q\tQ\x04R\tR\x04S\tS\x04T\tT\x04U\tU\x04V\tV\x03" +
+		"\x02\x06\x02\xB0\n\x02\r\x02\x0E\x02\xB1\x03\x02\x03\x02\x03\x03\x03\x03" +
+		"\x03\x03\x03\x03\x07\x03\xBA\n\x03\f\x03\x0E\x03\xBD\v\x03\x03\x03\x03" +
+		"\x03\x03\x03\x03\x03\x03\x03\x07\x03\xC4\n\x03\f\x03\x0E\x03\xC7\v\x03" +
+		"\x03\x03\x03\x03\x05\x03\xCB\n\x03\x03\x03\x03\x03\x03\x04\x03\x04\x03" +
+		"\x05\x03\x05\x03\x06\x03\x06\x03\x07\x03\x07\x03\b\x03\b\x03\t\x03\t\x03" +
+		"\n\x03\n\x03\n\x03\n\x03\v\x03\v\x03\v\x03\v\x03\v\x03\f\x03\f\x03\r\x03" +
+		"\r\x03\x0E\x03\x0E\x03\x0E\x03\x0F\x03\x0F\x03\x0F\x03\x10\x03\x10\x03" +
+		"\x10\x03\x10\x03\x10\x03\x11\x03\x11\x03\x11\x03\x11\x03\x11\x03\x11\x03" +
+		"\x12\x03\x12\x03\x12\x03\x13\x03\x13\x03\x13\x03\x13\x03\x14\x03\x14\x03" +
+		"\x14\x03\x14\x03\x14\x03\x14\x03\x14\x03\x14\x03\x14\x03\x15\x03\x15\x03" +
+		"\x15\x03\x15\x03\x15\x03\x15\x03\x16\x03\x16\x03\x16\x03\x16\x03\x16\x03" +
+		"\x16\x03\x16\x03\x17\x03\x17\x03\x17\x03\x17\x03\x18\x03\x18\x03\x18\x03" +
+		"\x18\x03\x19\x03\x19\x03\x19\x03\x19\x03\x19\x03\x19\x03\x1A\x03\x1A\x03" +
+		"\x1A\x03\x1A\x03\x1A\x03\x1A\x03\x1B\x03\x1B\x03\x1B\x03\x1B\x03\x1B\x03" +
+		"\x1C\x03\x1C\x03\x1C\x03\x1C\x03\x1C\x03\x1C\x03\x1C\x03\x1C\x03\x1C\x03" +
+		"\x1C\x03\x1C\x03\x1D\x03\x1D\x03\x1E\x03\x1E\x03\x1F\x03\x1F\x03 \x03" +
+		" \x03 \x03!\x03!\x03\"\x03\"\x03#\x03#\x03$\x03$\x03$\x03%\x03%\x03%\x03" +
+		"&\x03&\x03&\x03&\x03\'\x03\'\x03(\x03(\x03(\x03)\x03)\x03*\x03*\x03*\x03" +
+		"+\x03+\x03+\x03,\x03,\x03,\x03,\x03-\x03-\x03-\x03.\x03.\x03.\x03.\x03" +
+		"/\x03/\x030\x030\x031\x031\x032\x032\x032\x033\x033\x033\x034\x034\x03" +
+		"5\x035\x036\x036\x036\x037\x037\x037\x038\x038\x038\x039\x039\x039\x03" +
+		":\x03:\x03:\x03:\x03;\x03;\x03;\x03<\x03<\x03<\x03=\x03=\x03>\x03>\x03" +
+		">\x03?\x03?\x03?\x03@\x03@\x03@\x03A\x03A\x03A\x03B\x03B\x03B\x03C\x03" +
+		"C\x03C\x03D\x03D\x03D\x03E\x03E\x03E\x03F\x03F\x03F\x03F\x03G\x03G\x03" +
+		"G\x03G\x03H\x03H\x03H\x03H\x03H\x03I\x03I\x06I\u01BA\nI\rI\x0EI\u01BB" +
+		"\x03I\x05I\u01BF\nI\x03J\x03J\x03J\x06J\u01C4\nJ\rJ\x0EJ\u01C5\x03J\x05" +
+		"J\u01C9\nJ\x03K\x03K\x03K\x07K\u01CE\nK\fK\x0EK\u01D1\vK\x05K\u01D3\n" +
+		"K\x03K\x05K\u01D6\nK\x03L\x03L\x03L\x07L\u01DB\nL\fL\x0EL\u01DE\vL\x05" +
+		"L\u01E0\nL\x03L\x03L\x06L\u01E4\nL\rL\x0EL\u01E5\x05L\u01E8\nL\x03L\x03" +
+		"L\x05L\u01EC\nL\x03L\x06L\u01EF\nL\rL\x0EL\u01F0\x05L\u01F3\nL\x03L\x05" +
+		"L\u01F6\nL\x03M\x03M\x03M\x03M\x03M\x03M\x07M\u01FE\nM\fM\x0EM\u0201\v" +
+		"M\x03M\x03M\x03M\x03M\x03M\x03M\x03M\x07M\u020A\nM\fM\x0EM\u020D\vM\x03" +
+		"M\x05M\u0210\nM\x03N\x03N\x03N\x03N\x06N\u0216\nN\rN\x0EN\u0217\x03N\x03" +
+		"N\x07N\u021C\nN\fN\x0EN\u021F\vN\x03N\x03N\x03O\x03O\x03O\x03O\x03O\x03" +
+		"P\x03P\x03P\x03P\x03P\x03P\x03Q\x03Q\x03Q\x03Q\x03Q\x03R\x03R\x03R\x03" +
+		"R\x03R\x03R\x03R\x03R\x03R\x03R\x03R\x03R\x03R\x03R\x03R\x03R\x03R\x03" +
+		"R\x03R\x03R\x03R\x03R\x03R\x03R\x03R\x03R\x03R\x03R\x03R\x03R\x03R\x03" +
+		"R\x03R\x03R\x03R\x03R\x03R\x03R\x05R\u0259\nR\x03S\x03S\x03S\x03S\x03" +
+		"T\x03T\x07T\u0261\nT\fT\x0ET\u0264\vT\x03U\x03U\x03U\x07U\u0269\nU\fU" +
+		"\x0EU\u026C\vU\x05U\u026E\nU\x03U\x03U\x03V\x03V\x07V\u0274\nV\fV\x0E" +
+		"V\u0277\vV\x03V\x03V\x07\xBB\xC5\u01FF\u020B\u0217\x02\x02W\x04\x02\x03" +
+		"\x06\x02\x04\b\x02\x05\n\x02\x06\f\x02\x07\x0E\x02\b\x10\x02\t\x12\x02" +
+		"\n\x14\x02\v\x16\x02\f\x18\x02\r\x1A\x02\x0E\x1C\x02\x0F\x1E\x02\x10 " +
+		"\x02\x11\"\x02\x12$\x02\x13&\x02\x14(\x02\x15*\x02\x16,\x02\x17.\x02\x18" +
+		"0\x02\x192\x02\x1A4\x02\x1B6\x02\x1C8\x02\x1D:\x02\x1E<\x02\x1F>\x02 " +
+		"@\x02!B\x02\"D\x02#F\x02$H\x02%J\x02&L\x02\'N\x02(P\x02)R\x02*T\x02+V" +
+		"\x02,X\x02-Z\x02.\\\x02/^\x020`\x021b\x022d\x023f\x024h\x025j\x026l\x02" +
+		"7n\x028p\x029r\x02:t\x02;v\x02<x\x02=z\x02>|\x02?~\x02@\x80\x02A\x82\x02" +
+		"B\x84\x02C\x86\x02D\x88\x02E\x8A\x02F\x8C\x02G\x8E\x02H\x90\x02I\x92\x02" +
+		"J\x94\x02K\x96\x02L\x98\x02M\x9A\x02N\x9C\x02O\x9E\x02P\xA0\x02Q\xA2\x02" +
+		"R\xA4\x02S\xA6\x02T\xA8\x02U\xAA\x02V\xAC\x02W\x04\x02\x03\x15\x05\x02" +
+		"\v\f\x0F\x0F\"\"\x04\x02\f\f\x0F\x0F\x03\x0229\x04\x02NNnn\x04\x02ZZz" +
+		"z\x05\x022;CHch\x03\x023;\x03\x022;\b\x02FFHHNNffhhnn\x04\x02GGgg\x04" +
+		"\x02--//\x06\x02FFHHffhh\x04\x02$$^^\x04\x02))^^\x03\x02\f\f\x04\x02\f" +
+		"\f11\t\x02WWeekknouuwwzz\x05\x02C\\aac|\x06\x022;C\\aac|\x02\u02A0\x02" +
+		"\x04\x03\x02\x02\x02\x02\x06\x03\x02\x02\x02\x02\b\x03\x02\x02\x02\x02" +
+		"\n\x03\x02\x02\x02\x02\f\x03\x02\x02\x02\x02\x0E\x03\x02\x02\x02\x02\x10" +
+		"\x03\x02\x02\x02\x02\x12\x03\x02\x02\x02\x02\x14\x03\x02\x02\x02\x02\x16" +
+		"\x03\x02\x02\x02\x02\x18\x03\x02\x02\x02\x02\x1A\x03\x02\x02\x02\x02\x1C" +
+		"\x03\x02\x02\x02\x02\x1E\x03\x02\x02\x02\x02 \x03\x02\x02\x02\x02\"\x03" +
+		"\x02\x02\x02\x02$\x03\x02\x02\x02\x02&\x03\x02\x02\x02\x02(\x03\x02\x02" +
+		"\x02\x02*\x03\x02\x02\x02\x02,\x03\x02\x02\x02\x02.\x03\x02\x02\x02\x02" +
+		"0\x03\x02\x02\x02\x022\x03\x02\x02\x02\x024\x03\x02\x02\x02\x026\x03\x02" +
+		"\x02\x02\x028\x03\x02\x02\x02\x02:\x03\x02\x02\x02\x02<\x03\x02\x02\x02" +
+		"\x02>\x03\x02\x02\x02\x02@\x03\x02\x02\x02\x02B\x03\x02\x02\x02\x02D\x03" +
+		"\x02\x02\x02\x02F\x03\x02\x02\x02\x02H\x03\x02\x02\x02\x02J\x03\x02\x02" +
+		"\x02\x02L\x03\x02\x02\x02\x02N\x03\x02\x02\x02\x02P\x03\x02\x02\x02\x02" +
+		"R\x03\x02\x02\x02\x02T\x03\x02\x02\x02\x02V\x03\x02\x02\x02\x02X\x03\x02" +
+		"\x02\x02\x02Z\x03\x02\x02\x02\x02\\\x03\x02\x02\x02\x02^\x03\x02\x02\x02" +
+		"\x02`\x03\x02\x02\x02\x02b\x03\x02\x02\x02\x02d\x03\x02\x02\x02\x02f\x03" +
+		"\x02\x02\x02\x02h\x03\x02\x02\x02\x02j\x03\x02\x02\x02\x02l\x03\x02\x02" +
+		"\x02\x02n\x03\x02\x02\x02\x02p\x03\x02\x02\x02\x02r\x03\x02\x02\x02\x02" +
+		"t\x03\x02\x02\x02\x02v\x03\x02\x02\x02\x02x\x03\x02\x02\x02\x02z\x03\x02" +
+		"\x02\x02\x02|\x03\x02\x02\x02\x02~\x03\x02\x02\x02\x02\x80\x03\x02\x02" +
+		"\x02\x02\x82\x03\x02\x02\x02\x02\x84\x03\x02\x02\x02\x02\x86\x03\x02\x02" +
+		"\x02\x02\x88\x03\x02\x02\x02\x02\x8A\x03\x02\x02\x02\x02\x8C\x03\x02\x02" +
+		"\x02\x02\x8E\x03\x02\x02\x02\x02\x90\x03\x02\x02\x02\x02\x92\x03\x02\x02" +
+		"\x02\x02\x94\x03\x02\x02\x02\x02\x96\x03\x02\x02\x02\x02\x98\x03\x02\x02" +
+		"\x02\x02\x9A\x03\x02\x02\x02\x02\x9C\x03\x02\x02\x02\x02\x9E\x03\x02\x02" +
+		"\x02\x02\xA0\x03\x02\x02\x02\x02\xA2\x03\x02\x02\x02\x02\xA4\x03\x02\x02" +
+		"\x02\x02\xA6\x03\x02\x02\x02\x02\xA8\x03\x02\x02\x02\x03\xAA\x03\x02\x02" +
+		"\x02\x03\xAC\x03\x02\x02\x02\x04\xAF\x03\x02\x02\x02\x06\xCA\x03\x02\x02" +
+		"\x02\b\xCE\x03\x02\x02\x02\n\xD0\x03\x02\x02\x02\f\xD2\x03\x02\x02\x02" +
+		"\x0E\xD4\x03\x02\x02\x02\x10\xD6\x03\x02\x02\x02\x12\xD8\x03\x02\x02\x02" +
+		"\x14\xDA\x03\x02\x02\x02\x16\xDE\x03\x02\x02\x02\x18\xE3\x03\x02\x02\x02" +
+		"\x1A\xE5\x03\x02\x02\x02\x1C\xE7\x03\x02\x02\x02\x1E\xEA\x03\x02\x02\x02" +
+		" \xED\x03\x02\x02\x02\"\xF2\x03\x02\x02\x02$\xF8\x03\x02\x02\x02&\xFB" +
+		"\x03\x02\x02\x02(\xFF\x03\x02\x02\x02*\u0108\x03\x02\x02\x02,\u010E\x03" +
+		"\x02\x02\x02.\u0115\x03\x02\x02\x020\u0119\x03\x02\x02\x022\u011D\x03" +
+		"\x02\x02\x024\u0123\x03\x02\x02\x026\u0129\x03\x02\x02\x028\u012E\x03" +
+		"\x02\x02\x02:\u0139\x03\x02\x02\x02<\u013B\x03\x02\x02\x02>\u013D\x03" +
+		"\x02\x02\x02@\u013F\x03\x02\x02\x02B\u0142\x03\x02\x02\x02D\u0144\x03" +
+		"\x02\x02\x02F\u0146\x03\x02\x02\x02H\u0148\x03\x02\x02\x02J\u014B\x03" +
+		"\x02\x02\x02L\u014E\x03\x02\x02\x02N\u0152\x03\x02\x02\x02P\u0154\x03" +
+		"\x02\x02\x02R\u0157\x03\x02\x02\x02T\u0159\x03\x02\x02\x02V\u015C\x03" +
+		"\x02\x02\x02X\u015F\x03\x02\x02\x02Z\u0163\x03\x02\x02\x02\\\u0166\x03" +
+		"\x02\x02\x02^\u016A\x03\x02\x02\x02`\u016C\x03\x02\x02\x02b\u016E\x03" +
+		"\x02\x02\x02d\u0170\x03\x02\x02\x02f\u0173\x03\x02\x02\x02h\u0176\x03" +
+		"\x02\x02\x02j\u0178\x03\x02\x02\x02l\u017A\x03\x02\x02\x02n\u017D\x03" +
+		"\x02\x02\x02p\u0180\x03\x02\x02\x02r\u0183\x03\x02\x02\x02t\u0186\x03" +
+		"\x02\x02\x02v\u018A\x03\x02\x02\x02x\u018D\x03\x02\x02\x02z\u0190\x03" +
+		"\x02\x02\x02|\u0192\x03\x02\x02\x02~\u0195\x03\x02\x02\x02\x80\u0198\x03" +
+		"\x02\x02\x02\x82\u019B\x03\x02\x02\x02\x84\u019E\x03\x02\x02\x02\x86\u01A1" +
+		"\x03\x02\x02\x02\x88\u01A4\x03\x02\x02\x02\x8A\u01A7\x03\x02\x02\x02\x8C" +
+		"\u01AA\x03\x02\x02\x02\x8E\u01AE\x03\x02\x02\x02\x90\u01B2\x03\x02\x02" +
+		"\x02\x92\u01B7\x03\x02\x02\x02\x94\u01C0\x03\x02\x02\x02\x96\u01D2\x03" +
+		"\x02\x02\x02\x98\u01DF\x03\x02\x02\x02\x9A\u020F\x03\x02\x02\x02\x9C\u0211" +
+		"\x03\x02\x02\x02\x9E\u0222\x03\x02\x02\x02\xA0\u0227\x03\x02\x02\x02\xA2" +
+		"\u022D\x03\x02\x02\x02\xA4\u0258\x03\x02\x02\x02\xA6\u025A\x03\x02\x02" +
+		"\x02\xA8\u025E\x03\x02\x02\x02\xAA\u026D\x03\x02\x02\x02\xAC\u0271\x03" +
+		"\x02\x02\x02\xAE\xB0\t\x02\x02\x02\xAF\xAE\x03\x02\x02\x02\xB0\xB1\x03" +
+		"\x02\x02\x02\xB1\xAF\x03\x02\x02\x02\xB1\xB2\x03\x02\x02\x02\xB2\xB3\x03" +
+		"\x02\x02\x02\xB3\xB4\b\x02\x02\x02\xB4\x05\x03\x02\x02\x02\xB5\xB6\x07" +
+		"1\x02\x02\xB6\xB7\x071\x02\x02\xB7\xBB\x03\x02\x02\x02\xB8\xBA\v\x02\x02" +
+		"\x02\xB9\xB8\x03\x02\x02\x02\xBA\xBD\x03\x02\x02\x02\xBB\xBC\x03\x02\x02" +
+		"\x02\xBB\xB9\x03\x02\x02\x02\xBC\xBE\x03\x02\x02\x02\xBD\xBB\x03\x02\x02" +
+		"\x02\xBE\xCB\t\x03\x02\x02\xBF\xC0\x071\x02\x02\xC0\xC1\x07,\x02\x02\xC1" +
+		"\xC5\x03\x02\x02\x02\xC2\xC4\v\x02\x02\x02\xC3\xC2\x03\x02\x02\x02\xC4" +
+		"\xC7\x03\x02\x02\x02\xC5\xC6\x03\x02\x02\x02\xC5\xC3\x03\x02\x02\x02\xC6" +
+		"\xC8\x03\x02\x02\x02\xC7\xC5\x03\x02\x02\x02\xC8\xC9\x07,\x02\x02\xC9" +
+		"\xCB\x071\x02\x02\xCA\xB5\x03\x02\x02\x02\xCA\xBF\x03\x02\x02\x02\xCB" +
+		"\xCC\x03\x02\x02\x02\xCC\xCD\b\x03\x02\x02\xCD\x07\x03\x02\x02\x02\xCE" +
+		"\xCF\x07}\x02\x02\xCF\t\x03\x02\x02\x02\xD0\xD1\x07\x7F\x02\x02\xD1\v" +
+		"\x03\x02\x02\x02\xD2\xD3\x07]\x02\x02\xD3\r\x03\x02\x02\x02\xD4\xD5\x07" +
+		"_\x02\x02\xD5\x0F\x03\x02\x02\x02\xD6\xD7\x07*\x02\x02\xD7\x11\x03\x02" +
+		"\x02\x02\xD8\xD9\x07+\x02\x02\xD9\x13\x03\x02\x02\x02\xDA\xDB\x070\x02" +
+		"\x02\xDB\xDC\x03\x02\x02\x02\xDC\xDD\b\n\x03\x02\xDD\x15\x03\x02\x02\x02" +
+		"\xDE\xDF\x07A\x02\x02\xDF\xE0\x070\x02\x02\xE0\xE1\x03\x02\x02\x02\xE1" +
+		"\xE2\b\v\x03\x02\xE2\x17\x03\x02\x02\x02\xE3\xE4\x07.\x02\x02\xE4\x19" +
+		"\x03\x02\x02\x02\xE5\xE6\x07=\x02\x02\xE6\x1B\x03\x02\x02\x02\xE7\xE8" +
+		"\x07k\x02\x02\xE8\xE9\x07h\x02\x02\xE9\x1D\x03\x02\x02\x02\xEA\xEB\x07" +
+		"k\x02\x02\xEB\xEC\x07p\x02\x02\xEC\x1F\x03\x02\x02\x02\xED\xEE\x07g\x02" +
+		"\x02\xEE\xEF\x07n\x02\x02\xEF\xF0\x07u\x02\x02\xF0\xF1\x07g\x02\x02\xF1" +
+		"!\x03\x02\x02\x02\xF2\xF3\x07y\x02\x02\xF3\xF4\x07j\x02\x02\xF4\xF5\x07" +
+		"k\x02\x02\xF5\xF6\x07n\x02\x02\xF6\xF7\x07g\x02\x02\xF7#\x03\x02\x02\x02" +
+		"\xF8\xF9\x07f\x02\x02\xF9\xFA\x07q\x02\x02\xFA%\x03\x02\x02\x02\xFB\xFC" +
+		"\x07h\x02\x02\xFC\xFD\x07q\x02\x02\xFD\xFE\x07t\x02\x02\xFE\'\x03\x02" +
+		"\x02\x02\xFF\u0100\x07e\x02\x02\u0100\u0101\x07q\x02\x02\u0101\u0102\x07" +
+		"p\x02\x02\u0102\u0103\x07v\x02\x02\u0103\u0104\x07k\x02\x02\u0104\u0105" +
+		"\x07p\x02\x02\u0105\u0106\x07w\x02\x02\u0106\u0107\x07g\x02\x02\u0107" +
+		")\x03\x02\x02\x02\u0108\u0109\x07d\x02\x02\u0109\u010A\x07t\x02\x02\u010A" +
+		"\u010B\x07g\x02\x02\u010B\u010C\x07c\x02\x02\u010C\u010D\x07m\x02\x02" +
+		"\u010D+\x03\x02\x02\x02\u010E\u010F\x07t\x02\x02\u010F\u0110\x07g\x02" +
+		"\x02\u0110\u0111\x07v\x02\x02\u0111\u0112\x07w\x02\x02\u0112\u0113\x07" +
+		"t\x02\x02\u0113\u0114\x07p\x02\x02\u0114-\x03\x02\x02\x02\u0115\u0116" +
+		"\x07p\x02\x02\u0116\u0117\x07g\x02\x02\u0117\u0118\x07y\x02\x02\u0118" +
+		"/\x03\x02\x02\x02\u0119\u011A\x07v\x02\x02\u011A\u011B\x07t\x02\x02\u011B" +
+		"\u011C\x07{\x02\x02\u011C1\x03\x02\x02\x02\u011D\u011E\x07e\x02\x02\u011E" +
+		"\u011F\x07c\x02\x02\u011F\u0120\x07v\x02\x02\u0120\u0121\x07e\x02\x02" +
+		"\u0121\u0122\x07j\x02\x02\u01223\x03\x02\x02\x02\u0123\u0124\x07v\x02" +
+		"\x02\u0124\u0125\x07j\x02\x02\u0125\u0126\x07t\x02\x02\u0126\u0127\x07" +
+		"q\x02\x02\u0127\u0128\x07y\x02\x02\u01285\x03\x02\x02\x02\u0129\u012A" +
+		"\x07v\x02\x02\u012A\u012B\x07j\x02\x02\u012B\u012C\x07k\x02\x02\u012C" +
+		"\u012D\x07u\x02\x02\u012D7\x03\x02\x02\x02\u012E\u012F\x07k\x02\x02\u012F" +
+		"\u0130\x07p\x02\x02\u0130\u0131\x07u\x02\x02\u0131\u0132\x07v\x02\x02" +
+		"\u0132\u0133\x07c\x02\x02\u0133\u0134\x07p\x02\x02\u0134\u0135\x07e\x02" +
+		"\x02\u0135\u0136\x07g\x02\x02\u0136\u0137\x07q\x02\x02\u0137\u0138\x07" +
+		"h\x02\x02\u01389\x03\x02\x02\x02\u0139\u013A\x07#\x02\x02\u013A;\x03\x02" +
+		"\x02\x02\u013B\u013C\x07\x80\x02\x02\u013C=\x03\x02\x02\x02\u013D\u013E" +
+		"\x07,\x02\x02\u013E?\x03\x02\x02\x02\u013F\u0140\x071\x02\x02\u0140\u0141" +
+		"\x06 \x02\x02\u0141A\x03\x02\x02\x02\u0142\u0143\x07\'\x02\x02\u0143C" +
+		"\x03\x02\x02\x02\u0144\u0145\x07-\x02\x02\u0145E\x03\x02\x02\x02\u0146" +
+		"\u0147\x07/\x02\x02\u0147G\x03\x02\x02\x02\u0148\u0149\x07>\x02\x02\u0149" +
+		"\u014A\x07>\x02\x02\u014AI\x03\x02\x02\x02\u014B\u014C\x07@\x02\x02\u014C" +
+		"\u014D\x07@\x02\x02\u014DK\x03\x02\x02\x02\u014E\u014F\x07@\x02\x02\u014F" +
+		"\u0150\x07@\x02\x02\u0150\u0151\x07@\x02\x02\u0151M\x03\x02\x02\x02\u0152" +
+		"\u0153\x07>\x02\x02\u0153O\x03\x02\x02\x02\u0154\u0155\x07>\x02\x02\u0155" +
+		"\u0156\x07?\x02\x02\u0156Q\x03\x02\x02\x02\u0157\u0158\x07@\x02\x02\u0158" +
+		"S\x03\x02\x02\x02\u0159\u015A\x07@\x02\x02\u015A\u015B\x07?\x02\x02\u015B" +
+		"U\x03\x02\x02\x02\u015C\u015D\x07?\x02\x02\u015D\u015E\x07?\x02\x02\u015E" +
+		"W\x03\x02\x02\x02\u015F\u0160\x07?\x02\x02\u0160\u0161\x07?\x02\x02\u0161" +
+		"\u0162\x07?\x02\x02\u0162Y\x03\x02\x02\x02\u0163\u0164\x07#\x02\x02\u0164" +
+		"\u0165\x07?\x02\x02\u0165[\x03\x02\x02\x02\u0166\u0167\x07#\x02\x02\u0167" +
+		"\u0168\x07?\x02\x02\u0168\u0169\x07?\x02\x02\u0169]\x03\x02\x02\x02\u016A" +
+		"\u016B\x07(\x02\x02\u016B_\x03\x02\x02\x02\u016C\u016D\x07`\x02\x02\u016D" +
+		"a\x03\x02\x02\x02\u016E\u016F\x07~\x02\x02\u016Fc\x03\x02\x02\x02\u0170" +
+		"\u0171\x07(\x02\x02\u0171\u0172\x07(\x02\x02\u0172e\x03\x02\x02\x02\u0173" +
+		"\u0174\x07~\x02\x02\u0174\u0175\x07~\x02\x02\u0175g\x03\x02\x02\x02\u0176" +
+		"\u0177\x07A\x02\x02\u0177i\x03\x02\x02\x02\u0178\u0179\x07<\x02\x02\u0179" +
+		"k\x03\x02\x02\x02\u017A\u017B\x07A\x02\x02\u017B\u017C\x07<\x02\x02\u017C" +
+		"m\x03\x02\x02\x02\u017D\u017E\x07<\x02\x02\u017E\u017F\x07<\x02\x02\u017F" +
+		"o\x03\x02\x02\x02\u0180\u0181\x07/\x02\x02\u0181\u0182\x07@\x02\x02\u0182" +
+		"q\x03\x02\x02\x02\u0183\u0184\x07?\x02\x02\u0184\u0185\x07\x80\x02\x02" +
+		"\u0185s\x03\x02\x02\x02\u0186\u0187\x07?\x02\x02\u0187\u0188\x07?\x02" +
+		"\x02\u0188\u0189\x07\x80\x02\x02\u0189u\x03\x02\x02\x02\u018A\u018B\x07" +
+		"-\x02\x02\u018B\u018C\x07-\x02\x02\u018Cw\x03\x02\x02\x02\u018D\u018E" +
+		"\x07/\x02\x02\u018E\u018F\x07/\x02\x02\u018Fy\x03\x02\x02\x02\u0190\u0191" +
+		"\x07?\x02\x02\u0191{\x03\x02\x02\x02\u0192\u0193\x07-\x02\x02\u0193\u0194" +
+		"\x07?\x02\x02\u0194}\x03\x02\x02\x02\u0195\u0196\x07/\x02\x02\u0196\u0197" +
+		"\x07?\x02\x02\u0197\x7F\x03\x02\x02\x02\u0198\u0199\x07,\x02\x02\u0199" +
+		"\u019A\x07?\x02\x02\u019A\x81\x03\x02\x02\x02\u019B\u019C\x071\x02\x02" +
+		"\u019C\u019D\x07?\x02\x02\u019D\x83\x03\x02\x02\x02\u019E\u019F\x07\'" +
+		"\x02\x02\u019F\u01A0\x07?\x02\x02\u01A0\x85\x03\x02\x02\x02\u01A1\u01A2" +
+		"\x07(\x02\x02\u01A2\u01A3\x07?\x02\x02\u01A3\x87\x03\x02\x02\x02\u01A4" +
+		"\u01A5\x07`\x02\x02\u01A5\u01A6\x07?\x02\x02\u01A6\x89\x03\x02\x02\x02" +
+		"\u01A7\u01A8\x07~\x02\x02\u01A8\u01A9\x07?\x02\x02\u01A9\x8B\x03\x02\x02" +
+		"\x02\u01AA\u01AB\x07>\x02\x02\u01AB\u01AC\x07>\x02\x02\u01AC\u01AD\x07" +
+		"?\x02\x02\u01AD\x8D\x03\x02\x02\x02\u01AE\u01AF\x07@\x02\x02\u01AF\u01B0" +
+		"\x07@\x02\x02\u01B0\u01B1\x07?\x02\x02\u01B1\x8F\x03\x02\x02\x02\u01B2" +
+		"\u01B3\x07@\x02\x02\u01B3\u01B4\x07@\x02\x02\u01B4\u01B5\x07@\x02\x02" +
+		"\u01B5\u01B6\x07?\x02\x02\u01B6\x91\x03\x02\x02\x02\u01B7\u01B9\x072\x02" +
+		"\x02\u01B8\u01BA\t\x04\x02\x02\u01B9\u01B8\x03\x02\x02\x02\u01BA\u01BB" +
+		"\x03\x02\x02\x02\u01BB\u01B9\x03\x02\x02\x02\u01BB\u01BC\x03\x02\x02\x02" +
+		"\u01BC\u01BE\x03\x02\x02\x02\u01BD\u01BF\t\x05\x02\x02\u01BE\u01BD\x03" +
+		"\x02\x02\x02\u01BE\u01BF\x03\x02\x02\x02\u01BF\x93\x03\x02\x02\x02\u01C0" +
+		"\u01C1\x072\x02\x02\u01C1\u01C3\t\x06\x02\x02\u01C2\u01C4\t\x07\x02\x02" +
+		"\u01C3\u01C2\x03\x02\x02\x02\u01C4\u01C5\x03\x02\x02\x02\u01C5\u01C3\x03" +
+		"\x02\x02\x02\u01C5\u01C6\x03\x02\x02\x02\u01C6\u01C8\x03\x02\x02\x02\u01C7" +
+		"\u01C9\t\x05\x02\x02\u01C8\u01C7\x03\x02\x02\x02\u01C8\u01C9\x03\x02\x02" +
+		"\x02\u01C9\x95\x03\x02\x02\x02\u01CA\u01D3\x072\x02\x02\u01CB\u01CF\t" +
+		"\b\x02\x02\u01CC\u01CE\t\t\x02\x02\u01CD\u01CC\x03\x02\x02\x02\u01CE\u01D1" +
+		"\x03\x02\x02\x02\u01CF\u01CD\x03\x02\x02\x02\u01CF\u01D0\x03\x02\x02\x02" +
+		"\u01D0\u01D3\x03\x02\x02\x02\u01D1\u01CF\x03\x02\x02\x02\u01D2\u01CA\x03" +
+		"\x02\x02\x02\u01D2\u01CB\x03\x02\x02\x02\u01D3\u01D5\x03\x02\x02\x02\u01D4" +
+		"\u01D6\t\n\x02\x02\u01D5\u01D4\x03\x02\x02\x02\u01D5\u01D6\x03\x02\x02" +
+		"\x02\u01D6\x97\x03\x02\x02\x02\u01D7\u01E0\x072\x02\x02\u01D8\u01DC\t" +
+		"\b\x02\x02\u01D9\u01DB\t\t\x02\x02\u01DA\u01D9\x03\x02\x02\x02\u01DB\u01DE" +
+		"\x03\x02\x02\x02\u01DC\u01DA\x03\x02\x02\x02\u01DC\u01DD\x03\x02\x02\x02" +
+		"\u01DD\u01E0\x03\x02\x02\x02\u01DE\u01DC\x03\x02\x02\x02\u01DF\u01D7\x03" +
+		"\x02\x02\x02\u01DF\u01D8\x03\x02\x02\x02\u01E0\u01E7\x03\x02\x02\x02\u01E1" +
+		"\u01E3\x05\x14\n\x02\u01E2\u01E4\t\t\x02\x02\u01E3\u01E2\x03\x02\x02\x02" +
+		"\u01E4\u01E5\x03\x02\x02\x02\u01E5\u01E3\x03\x02\x02\x02\u01E5\u01E6\x03" +
+		"\x02\x02\x02\u01E6\u01E8\x03\x02\x02\x02\u01E7\u01E1\x03\x02\x02\x02\u01E7" +
+		"\u01E8\x03\x02\x02\x02\u01E8\u01F2\x03\x02\x02\x02\u01E9\u01EB\t\v\x02" +
+		"\x02\u01EA\u01EC\t\f\x02\x02\u01EB\u01EA\x03\x02\x02\x02\u01EB\u01EC\x03" +
+		"\x02\x02\x02\u01EC\u01EE\x03\x02\x02\x02\u01ED\u01EF\t\t\x02\x02\u01EE" +
+		"\u01ED\x03\x02\x02\x02\u01EF\u01F0\x03\x02\x02\x02\u01F0\u01EE\x03\x02" +
+		"\x02\x02\u01F0\u01F1\x03\x02\x02\x02\u01F1\u01F3\x03\x02\x02\x02\u01F2" +
+		"\u01E9\x03\x02\x02\x02\u01F2\u01F3\x03\x02\x02\x02\u01F3\u01F5\x03\x02" +
+		"\x02\x02\u01F4\u01F6\t\r\x02\x02\u01F5\u01F4\x03\x02\x02\x02\u01F5\u01F6" +
+		"\x03\x02\x02\x02\u01F6\x99\x03\x02\x02\x02\u01F7\u01FF\x07$\x02\x02\u01F8" +
+		"\u01F9\x07^\x02\x02\u01F9\u01FE\x07$\x02\x02\u01FA\u01FB\x07^\x02\x02" +
+		"\u01FB\u01FE\x07^\x02\x02\u01FC\u01FE\n\x0E\x02\x02\u01FD\u01F8\x03\x02" +
+		"\x02\x02\u01FD\u01FA\x03\x02\x02\x02\u01FD\u01FC\x03\x02\x02\x02\u01FE" +
+		"\u0201\x03\x02\x02\x02\u01FF\u0200\x03\x02\x02\x02\u01FF\u01FD\x03\x02" +
+		"\x02\x02\u0200\u0202\x03\x02\x02\x02\u0201\u01FF\x03\x02\x02\x02\u0202" +
+		"\u0210\x07$\x02\x02\u0203\u020B\x07)\x02\x02\u0204\u0205\x07^\x02\x02" +
+		"\u0205\u020A\x07)\x02\x02\u0206\u0207\x07^\x02\x02\u0207\u020A\x07^\x02" +
+		"\x02\u0208\u020A\n\x0F\x02\x02\u0209\u0204\x03\x02\x02\x02\u0209\u0206" +
+		"\x03\x02\x02\x02\u0209\u0208\x03\x02\x02\x02\u020A\u020D\x03\x02\x02\x02" +
+		"\u020B\u020C\x03\x02\x02\x02\u020B\u0209\x03\x02\x02\x02\u020C";
+	private static readonly _serializedATNSegment1: string =
+		"\u020E\x03\x02\x02\x02\u020D\u020B\x03\x02\x02\x02\u020E\u0210\x07)\x02" +
+		"\x02\u020F\u01F7\x03\x02\x02\x02\u020F\u0203\x03\x02\x02\x02\u0210\x9B" +
+		"\x03\x02\x02\x02\u0211\u0215\x071\x02\x02\u0212\u0213\x07^\x02\x02\u0213" +
+		"\u0216\n\x10\x02\x02\u0214\u0216\n\x11\x02\x02\u0215\u0212\x03\x02\x02" +
+		"\x02\u0215\u0214\x03\x02\x02\x02\u0216\u0217\x03\x02\x02\x02\u0217\u0218" +
+		"\x03\x02\x02\x02\u0217\u0215\x03\x02\x02\x02\u0218\u0219\x03\x02\x02\x02" +
+		"\u0219\u021D\x071\x02\x02\u021A\u021C\t\x12\x02\x02\u021B\u021A\x03\x02" +
+		"\x02\x02\u021C\u021F\x03\x02\x02\x02\u021D\u021B\x03\x02\x02\x02\u021D" +
+		"\u021E\x03\x02\x02\x02\u021E\u0220\x03\x02\x02\x02\u021F\u021D\x03\x02" +
+		"\x02\x02\u0220\u0221\x06N\x03\x02\u0221\x9D\x03\x02\x02\x02\u0222\u0223" +
+		"\x07v\x02\x02\u0223\u0224\x07t\x02\x02\u0224\u0225\x07w\x02\x02\u0225" +
+		"\u0226\x07g\x02\x02\u0226\x9F\x03\x02\x02\x02\u0227\u0228\x07h\x02\x02" +
+		"\u0228\u0229\x07c\x02\x02\u0229\u022A\x07n\x02\x02\u022A\u022B\x07u\x02" +
+		"\x02\u022B\u022C\x07g\x02\x02\u022C\xA1\x03\x02\x02\x02\u022D\u022E\x07" +
+		"p\x02\x02\u022E\u022F\x07w\x02\x02\u022F\u0230\x07n\x02\x02\u0230\u0231" +
+		"\x07n\x02\x02\u0231\xA3\x03\x02\x02\x02\u0232\u0233\x07d\x02\x02\u0233" +
+		"\u0234\x07q\x02\x02\u0234\u0235\x07q\x02\x02\u0235\u0236\x07n\x02\x02" +
+		"\u0236\u0237\x07g\x02\x02\u0237\u0238\x07c\x02\x02\u0238\u0259\x07p\x02" +
+		"\x02\u0239\u023A\x07d\x02\x02\u023A\u023B\x07{\x02\x02\u023B\u023C\x07" +
+		"v\x02\x02\u023C\u0259\x07g\x02\x02\u023D\u023E\x07u\x02\x02\u023E\u023F" +
+		"\x07j\x02\x02\u023F\u0240\x07q\x02\x02\u0240\u0241\x07t\x02\x02\u0241" +
+		"\u0259\x07v\x02\x02\u0242\u0243\x07e\x02\x02\u0243\u0244\x07j\x02\x02" +
+		"\u0244\u0245\x07c\x02\x02\u0245\u0259\x07t\x02\x02\u0246\u0247\x07k\x02" +
+		"\x02\u0247\u0248\x07p\x02\x02\u0248\u0259\x07v\x02\x02\u0249\u024A\x07" +
+		"n\x02\x02\u024A\u024B\x07q\x02\x02\u024B\u024C\x07p\x02\x02\u024C\u0259" +
+		"\x07i\x02\x02\u024D\u024E\x07h\x02\x02\u024E\u024F\x07n\x02\x02\u024F" +
+		"\u0250\x07q\x02\x02\u0250\u0251\x07c\x02\x02\u0251\u0259\x07v\x02\x02" +
+		"\u0252\u0253\x07f\x02\x02\u0253\u0254\x07q\x02\x02\u0254\u0255\x07w\x02" +
+		"\x02\u0255\u0256\x07d\x02\x02\u0256\u0257\x07n\x02\x02\u0257\u0259\x07" +
+		"g\x02\x02\u0258\u0232\x03\x02\x02\x02\u0258\u0239\x03\x02\x02\x02\u0258" +
+		"\u023D\x03\x02\x02\x02\u0258\u0242\x03\x02\x02\x02\u0258\u0246\x03\x02" +
+		"\x02\x02\u0258\u0249\x03\x02\x02\x02\u0258\u024D\x03\x02\x02\x02\u0258" +
+		"\u0252\x03\x02\x02\x02\u0259\xA5\x03\x02\x02\x02\u025A\u025B\x07f\x02" +
+		"\x02\u025B\u025C\x07g\x02\x02\u025C\u025D\x07h\x02\x02\u025D\xA7\x03\x02" +
+		"\x02\x02\u025E\u0262\t\x13\x02\x02\u025F\u0261\t\x14\x02\x02\u0260\u025F" +
+		"\x03\x02\x02\x02\u0261\u0264\x03\x02\x02\x02\u0262\u0260\x03\x02\x02\x02" +
+		"\u0262\u0263\x03\x02\x02\x02\u0263\xA9\x03\x02\x02\x02\u0264\u0262\x03" +
+		"\x02\x02\x02\u0265\u026E\x072\x02\x02\u0266\u026A\t\b\x02\x02\u0267\u0269" +
+		"\t\t\x02\x02\u0268\u0267\x03\x02\x02\x02\u0269\u026C\x03\x02\x02\x02\u026A" +
+		"\u0268\x03\x02\x02\x02\u026A\u026B\x03\x02\x02\x02\u026B\u026E\x03\x02" +
+		"\x02\x02\u026C\u026A\x03\x02\x02\x02\u026D\u0265\x03\x02\x02\x02\u026D" +
+		"\u0266\x03\x02\x02\x02\u026E\u026F\x03\x02\x02\x02\u026F\u0270\bU\x04" +
+		"\x02\u0270\xAB\x03\x02\x02\x02\u0271\u0275\t\x13\x02\x02\u0272\u0274\t" +
+		"\x14\x02\x02\u0273\u0272\x03\x02\x02\x02\u0274\u0277\x03\x02\x02\x02\u0275" +
+		"\u0273\x03\x02\x02\x02\u0275\u0276\x03\x02\x02\x02\u0276\u0278\x03\x02" +
+		"\x02\x02\u0277\u0275\x03\x02\x02\x02\u0278\u0279\bV\x04\x02\u0279\xAD" +
+		"\x03\x02\x02\x02$\x02\x03\xB1\xBB\xC5\xCA\u01BB\u01BE\u01C5\u01C8\u01CF" +
+		"\u01D2\u01D5\u01DC\u01DF\u01E5\u01E7\u01EB\u01F0\u01F2\u01F5\u01FD\u01FF" +
+		"\u0209\u020B\u020F\u0215\u0217\u021D\u0258\u0262\u026A\u026D\u0275\x05" +
+		"\b\x02\x02\x04\x03\x02\x04\x02\x02";
+	public static readonly _serializedATN: string = Utils.join(
+		[
+			painless_lexer._serializedATNSegment0,
+			painless_lexer._serializedATNSegment1,
+		],
+		"",
+	);
+	public static __ATN: ATN;
+	public static get _ATN(): ATN {
+		if (!painless_lexer.__ATN) {
+			painless_lexer.__ATN = new ATNDeserializer().deserialize(Utils.toCharArray(painless_lexer._serializedATN));
+		}
+
+		return painless_lexer.__ATN;
+	}
+
+}
+
diff --git a/packages/kbn-monaco/src/painless/antlr/painless_parser.g4 b/packages/kbn-monaco/src/painless/antlr/painless_parser.g4
new file mode 100644
index 0000000000000..58a9285c57a00
--- /dev/null
+++ b/packages/kbn-monaco/src/painless/antlr/painless_parser.g4
@@ -0,0 +1,226 @@
+parser grammar painless_parser;
+
+options { tokenVocab=painless_lexer; }
+
+source
+    : function* statement* EOF
+    ;
+
+function
+    : decltype ID parameters block
+    ;
+
+parameters
+    : LP ( decltype ID ( COMMA decltype ID )* )? RP
+    ;
+
+statement
+    : rstatement
+    | dstatement ( SEMICOLON | EOF )
+    ;
+
+// Note we use a predicate on the if/else case here to prevent the
+// "dangling-else" ambiguity by forcing the 'else' token to be consumed
+// as soon as one is found.  See (https://en.wikipedia.org/wiki/Dangling_else).
+rstatement
+    : IF LP expression RP trailer ( ELSE trailer | { this._input.LA(1) != painless_parser.ELSE }? )                 # if
+    | WHILE LP expression RP ( trailer | empty )                                               # while
+    | FOR LP initializer? SEMICOLON expression? SEMICOLON afterthought? RP ( trailer | empty ) # for
+    | FOR LP decltype ID COLON expression RP trailer                                           # each
+    | FOR LP ID IN expression RP trailer                                                       # ineach
+    | TRY block trap+                                                                          # try
+    ;
+
+dstatement
+    : DO block WHILE LP expression RP # do
+    | declaration                     # decl
+    | CONTINUE                        # continue
+    | BREAK                           # break
+    | RETURN expression?              # return
+    | THROW expression                # throw
+    | expression                      # expr
+    ;
+
+trailer
+    : block
+    | statement
+    ;
+
+block
+    : LBRACK statement* dstatement? RBRACK
+    ;
+
+empty
+    : SEMICOLON
+    ;
+
+initializer
+    : declaration
+    | expression
+    ;
+
+afterthought
+    : expression
+    ;
+
+declaration
+    : decltype declvar (COMMA declvar)*
+    ;
+
+decltype
+    : type (LBRACE RBRACE)*
+    ;
+
+type
+    : DEF
+    | PRIMITIVE
+    | ID (DOT DOTID)*
+    ;
+
+declvar
+    : ID ( ASSIGN expression )?
+    ;
+
+trap
+    : CATCH LP type ID RP block
+    ;
+
+noncondexpression
+    :               unary                                                       # single
+    |               noncondexpression ( MUL | DIV | REM ) noncondexpression     # binary
+    |               noncondexpression ( ADD | SUB ) noncondexpression           # binary
+    |               noncondexpression ( FIND | MATCH ) noncondexpression        # binary
+    |               noncondexpression ( LSH | RSH | USH ) noncondexpression     # binary
+    |               noncondexpression ( LT | LTE | GT | GTE ) noncondexpression # comp
+    |               noncondexpression INSTANCEOF decltype                       # instanceof
+    |               noncondexpression ( EQ | EQR | NE | NER ) noncondexpression # comp
+    |               noncondexpression BWAND noncondexpression                   # binary
+    |               noncondexpression XOR noncondexpression                     # binary
+    |               noncondexpression BWOR noncondexpression                    # binary
+    |               noncondexpression BOOLAND noncondexpression                 # bool
+    |               noncondexpression BOOLOR noncondexpression                  # bool
+    | <assoc=right> noncondexpression ELVIS noncondexpression                   # elvis
+    ;
+
+expression
+    :               noncondexpression                                            # nonconditional
+    | <assoc=right> noncondexpression COND expression COLON expression           # conditional
+    | <assoc=right> noncondexpression ( ASSIGN | AADD | ASUB | AMUL |
+                                        ADIV   | AREM | AAND | AXOR |
+                                        AOR    | ALSH | ARSH | AUSH ) expression # assignment
+    ;
+
+unary
+    : ( INCR | DECR ) chain # pre
+    | ( ADD | SUB ) unary   # addsub
+    | unarynotaddsub        # notaddsub
+    ;
+
+unarynotaddsub
+    : chain                     # read
+    | chain (INCR | DECR )      # post
+    | ( BOOLNOT | BWNOT ) unary # not
+    | castexpression            # cast
+    ;
+
+castexpression
+    : LP primordefcasttype RP unary    # primordefcast
+    | LP refcasttype RP unarynotaddsub # refcast
+    ;
+
+primordefcasttype
+    : DEF
+    | PRIMITIVE
+    ;
+
+refcasttype
+    : DEF (LBRACE RBRACE)+
+    | PRIMITIVE (LBRACE RBRACE)+
+    | ID (DOT DOTID)* (LBRACE RBRACE)*
+    ;
+
+chain
+    : primary postfix* # dynamic
+    | arrayinitializer # newarray
+    ;
+
+primary
+    : LP expression RP                    # precedence
+    | ( OCTAL | HEX | INTEGER | DECIMAL ) # numeric
+    | TRUE                                # true
+    | FALSE                               # false
+    | NULL                                # null
+    | STRING                              # string
+    | REGEX                               # regex
+    | listinitializer                     # listinit
+    | mapinitializer                      # mapinit
+    | ID                                  # variable
+    | ID arguments                        # calllocal
+    | NEW type arguments                  # newobject
+    ;
+
+postfix
+    : callinvoke
+    | fieldaccess
+    | braceaccess
+    ;
+
+postdot
+    : callinvoke
+    | fieldaccess
+    ;
+
+callinvoke
+    : ( DOT | NSDOT ) DOTID arguments
+    ;
+
+fieldaccess
+    : ( DOT | NSDOT ) ( DOTID | DOTINTEGER )
+    ;
+
+braceaccess
+    : LBRACE expression RBRACE
+    ;
+
+arrayinitializer
+    : NEW type ( LBRACE expression RBRACE )+ ( postdot postfix* )?                        # newstandardarray
+    | NEW type LBRACE RBRACE LBRACK ( expression ( COMMA expression )* )? RBRACK postfix* # newinitializedarray
+    ;
+
+listinitializer
+    : LBRACE expression ( COMMA expression)* RBRACE
+    | LBRACE RBRACE
+    ;
+
+mapinitializer
+    : LBRACE maptoken ( COMMA maptoken )* RBRACE
+    | LBRACE COLON RBRACE
+    ;
+
+maptoken
+    : expression COLON expression
+    ;
+
+arguments
+    : ( LP ( argument ( COMMA argument )* )? RP )
+    ;
+
+argument
+    : expression
+    | lambda
+    | funcref
+    ;
+
+lambda
+    : ( lamtype | LP ( lamtype ( COMMA lamtype )* )? RP ) ARROW ( block | expression )
+    ;
+
+lamtype
+    : decltype? ID
+    ;
+
+funcref
+    : decltype REF ID  # classfuncref
+    | decltype REF NEW # constructorfuncref
+    | THIS REF ID      # localfuncref
+    ;
diff --git a/packages/kbn-monaco/src/painless/antlr/painless_parser.interp b/packages/kbn-monaco/src/painless/antlr/painless_parser.interp
new file mode 100644
index 0000000000000..4c0a7a4399e4e
--- /dev/null
+++ b/packages/kbn-monaco/src/painless/antlr/painless_parser.interp
@@ -0,0 +1,220 @@
+token literal names:
+null
+null
+null
+'{'
+'}'
+'['
+']'
+'('
+')'
+'.'
+'?.'
+','
+';'
+'if'
+'in'
+'else'
+'while'
+'do'
+'for'
+'continue'
+'break'
+'return'
+'new'
+'try'
+'catch'
+'throw'
+'this'
+'instanceof'
+'!'
+'~'
+'*'
+'/'
+'%'
+'+'
+'-'
+'<<'
+'>>'
+'>>>'
+'<'
+'<='
+'>'
+'>='
+'=='
+'==='
+'!='
+'!=='
+'&'
+'^'
+'|'
+'&&'
+'||'
+'?'
+':'
+'?:'
+'::'
+'->'
+'=~'
+'==~'
+'++'
+'--'
+'='
+'+='
+'-='
+'*='
+'/='
+'%='
+'&='
+'^='
+'|='
+'<<='
+'>>='
+'>>>='
+null
+null
+null
+null
+null
+null
+'true'
+'false'
+'null'
+null
+'def'
+null
+null
+null
+
+token symbolic names:
+null
+WS
+COMMENT
+LBRACK
+RBRACK
+LBRACE
+RBRACE
+LP
+RP
+DOT
+NSDOT
+COMMA
+SEMICOLON
+IF
+IN
+ELSE
+WHILE
+DO
+FOR
+CONTINUE
+BREAK
+RETURN
+NEW
+TRY
+CATCH
+THROW
+THIS
+INSTANCEOF
+BOOLNOT
+BWNOT
+MUL
+DIV
+REM
+ADD
+SUB
+LSH
+RSH
+USH
+LT
+LTE
+GT
+GTE
+EQ
+EQR
+NE
+NER
+BWAND
+XOR
+BWOR
+BOOLAND
+BOOLOR
+COND
+COLON
+ELVIS
+REF
+ARROW
+FIND
+MATCH
+INCR
+DECR
+ASSIGN
+AADD
+ASUB
+AMUL
+ADIV
+AREM
+AAND
+AXOR
+AOR
+ALSH
+ARSH
+AUSH
+OCTAL
+HEX
+INTEGER
+DECIMAL
+STRING
+REGEX
+TRUE
+FALSE
+NULL
+PRIMITIVE
+DEF
+ID
+DOTINTEGER
+DOTID
+
+rule names:
+source
+function
+parameters
+statement
+rstatement
+dstatement
+trailer
+block
+empty
+initializer
+afterthought
+declaration
+decltype
+type
+declvar
+trap
+noncondexpression
+expression
+unary
+unarynotaddsub
+castexpression
+primordefcasttype
+refcasttype
+chain
+primary
+postfix
+postdot
+callinvoke
+fieldaccess
+braceaccess
+arrayinitializer
+listinitializer
+mapinitializer
+maptoken
+arguments
+argument
+lambda
+lamtype
+funcref
+
+
+atn:
+[3, 51485, 51898, 1421, 44986, 20307, 1543, 60043, 49729, 3, 87, 574, 4, 2, 9, 2, 4, 3, 9, 3, 4, 4, 9, 4, 4, 5, 9, 5, 4, 6, 9, 6, 4, 7, 9, 7, 4, 8, 9, 8, 4, 9, 9, 9, 4, 10, 9, 10, 4, 11, 9, 11, 4, 12, 9, 12, 4, 13, 9, 13, 4, 14, 9, 14, 4, 15, 9, 15, 4, 16, 9, 16, 4, 17, 9, 17, 4, 18, 9, 18, 4, 19, 9, 19, 4, 20, 9, 20, 4, 21, 9, 21, 4, 22, 9, 22, 4, 23, 9, 23, 4, 24, 9, 24, 4, 25, 9, 25, 4, 26, 9, 26, 4, 27, 9, 27, 4, 28, 9, 28, 4, 29, 9, 29, 4, 30, 9, 30, 4, 31, 9, 31, 4, 32, 9, 32, 4, 33, 9, 33, 4, 34, 9, 34, 4, 35, 9, 35, 4, 36, 9, 36, 4, 37, 9, 37, 4, 38, 9, 38, 4, 39, 9, 39, 4, 40, 9, 40, 3, 2, 7, 2, 82, 10, 2, 12, 2, 14, 2, 85, 11, 2, 3, 2, 7, 2, 88, 10, 2, 12, 2, 14, 2, 91, 11, 2, 3, 2, 3, 2, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 4, 3, 4, 3, 4, 3, 4, 3, 4, 3, 4, 3, 4, 7, 4, 107, 10, 4, 12, 4, 14, 4, 110, 11, 4, 5, 4, 112, 10, 4, 3, 4, 3, 4, 3, 5, 3, 5, 3, 5, 3, 5, 5, 5, 120, 10, 5, 3, 6, 3, 6, 3, 6, 3, 6, 3, 6, 3, 6, 3, 6, 3, 6, 5, 6, 130, 10, 6, 3, 6, 3, 6, 3, 6, 3, 6, 3, 6, 3, 6, 5, 6, 138, 10, 6, 3, 6, 3, 6, 3, 6, 5, 6, 143, 10, 6, 3, 6, 3, 6, 5, 6, 147, 10, 6, 3, 6, 3, 6, 5, 6, 151, 10, 6, 3, 6, 3, 6, 3, 6, 5, 6, 156, 10, 6, 3, 6, 3, 6, 3, 6, 3, 6, 3, 6, 3, 6, 3, 6, 3, 6, 3, 6, 3, 6, 3, 6, 3, 6, 3, 6, 3, 6, 3, 6, 3, 6, 3, 6, 3, 6, 3, 6, 3, 6, 6, 6, 178, 10, 6, 13, 6, 14, 6, 179, 5, 6, 182, 10, 6, 3, 7, 3, 7, 3, 7, 3, 7, 3, 7, 3, 7, 3, 7, 3, 7, 3, 7, 3, 7, 3, 7, 3, 7, 5, 7, 196, 10, 7, 3, 7, 3, 7, 3, 7, 5, 7, 201, 10, 7, 3, 8, 3, 8, 5, 8, 205, 10, 8, 3, 9, 3, 9, 7, 9, 209, 10, 9, 12, 9, 14, 9, 212, 11, 9, 3, 9, 5, 9, 215, 10, 9, 3, 9, 3, 9, 3, 10, 3, 10, 3, 11, 3, 11, 5, 11, 223, 10, 11, 3, 12, 3, 12, 3, 13, 3, 13, 3, 13, 3, 13, 7, 13, 231, 10, 13, 12, 13, 14, 13, 234, 11, 13, 3, 14, 3, 14, 3, 14, 7, 14, 239, 10, 14, 12, 14, 14, 14, 242, 11, 14, 3, 15, 3, 15, 3, 15, 3, 15, 3, 15, 7, 15, 249, 10, 15, 12, 15, 14, 15, 252, 11, 15, 5, 15, 254, 10, 15, 3, 16, 3, 16, 3, 16, 5, 16, 259, 10, 16, 3, 17, 3, 17, 3, 17, 3, 17, 3, 17, 3, 17, 3, 17, 3, 18, 3, 18, 3, 18, 3, 18, 3, 18, 3, 18, 3, 18, 3, 18, 3, 18, 3, 18, 3, 18, 3, 18, 3, 18, 3, 18, 3, 18, 3, 18, 3, 18, 3, 18, 3, 18, 3, 18, 3, 18, 3, 18, 3, 18, 3, 18, 3, 18, 3, 18, 3, 18, 3, 18, 3, 18, 3, 18, 3, 18, 3, 18, 3, 18, 3, 18, 3, 18, 3, 18, 3, 18, 3, 18, 3, 18, 3, 18, 3, 18, 3, 18, 7, 18, 310, 10, 18, 12, 18, 14, 18, 313, 11, 18, 3, 19, 3, 19, 3, 19, 3, 19, 3, 19, 3, 19, 3, 19, 3, 19, 3, 19, 3, 19, 3, 19, 5, 19, 326, 10, 19, 3, 20, 3, 20, 3, 20, 3, 20, 3, 20, 5, 20, 333, 10, 20, 3, 21, 3, 21, 3, 21, 3, 21, 3, 21, 3, 21, 3, 21, 5, 21, 342, 10, 21, 3, 22, 3, 22, 3, 22, 3, 22, 3, 22, 3, 22, 3, 22, 3, 22, 3, 22, 3, 22, 5, 22, 354, 10, 22, 3, 23, 3, 23, 3, 24, 3, 24, 3, 24, 6, 24, 361, 10, 24, 13, 24, 14, 24, 362, 3, 24, 3, 24, 3, 24, 6, 24, 368, 10, 24, 13, 24, 14, 24, 369, 3, 24, 3, 24, 3, 24, 7, 24, 375, 10, 24, 12, 24, 14, 24, 378, 11, 24, 3, 24, 3, 24, 7, 24, 382, 10, 24, 12, 24, 14, 24, 385, 11, 24, 5, 24, 387, 10, 24, 3, 25, 3, 25, 7, 25, 391, 10, 25, 12, 25, 14, 25, 394, 11, 25, 3, 25, 5, 25, 397, 10, 25, 3, 26, 3, 26, 3, 26, 3, 26, 3, 26, 3, 26, 3, 26, 3, 26, 3, 26, 3, 26, 3, 26, 3, 26, 3, 26, 3, 26, 3, 26, 3, 26, 3, 26, 3, 26, 3, 26, 5, 26, 418, 10, 26, 3, 27, 3, 27, 3, 27, 5, 27, 423, 10, 27, 3, 28, 3, 28, 5, 28, 427, 10, 28, 3, 29, 3, 29, 3, 29, 3, 29, 3, 30, 3, 30, 3, 30, 3, 31, 3, 31, 3, 31, 3, 31, 3, 32, 3, 32, 3, 32, 3, 32, 3, 32, 3, 32, 6, 32, 446, 10, 32, 13, 32, 14, 32, 447, 3, 32, 3, 32, 7, 32, 452, 10, 32, 12, 32, 14, 32, 455, 11, 32, 5, 32, 457, 10, 32, 3, 32, 3, 32, 3, 32, 3, 32, 3, 32, 3, 32, 3, 32, 3, 32, 7, 32, 467, 10, 32, 12, 32, 14, 32, 470, 11, 32, 5, 32, 472, 10, 32, 3, 32, 3, 32, 7, 32, 476, 10, 32, 12, 32, 14, 32, 479, 11, 32, 5, 32, 481, 10, 32, 3, 33, 3, 33, 3, 33, 3, 33, 7, 33, 487, 10, 33, 12, 33, 14, 33, 490, 11, 33, 3, 33, 3, 33, 3, 33, 3, 33, 5, 33, 496, 10, 33, 3, 34, 3, 34, 3, 34, 3, 34, 7, 34, 502, 10, 34, 12, 34, 14, 34, 505, 11, 34, 3, 34, 3, 34, 3, 34, 3, 34, 3, 34, 5, 34, 512, 10, 34, 3, 35, 3, 35, 3, 35, 3, 35, 3, 36, 3, 36, 3, 36, 3, 36, 7, 36, 522, 10, 36, 12, 36, 14, 36, 525, 11, 36, 5, 36, 527, 10, 36, 3, 36, 3, 36, 3, 37, 3, 37, 3, 37, 5, 37, 534, 10, 37, 3, 38, 3, 38, 3, 38, 3, 38, 3, 38, 7, 38, 541, 10, 38, 12, 38, 14, 38, 544, 11, 38, 5, 38, 546, 10, 38, 3, 38, 5, 38, 549, 10, 38, 3, 38, 3, 38, 3, 38, 5, 38, 554, 10, 38, 3, 39, 5, 39, 557, 10, 39, 3, 39, 3, 39, 3, 40, 3, 40, 3, 40, 3, 40, 3, 40, 3, 40, 3, 40, 3, 40, 3, 40, 3, 40, 3, 40, 5, 40, 572, 10, 40, 3, 40, 2, 2, 3, 34, 41, 2, 2, 4, 2, 6, 2, 8, 2, 10, 2, 12, 2, 14, 2, 16, 2, 18, 2, 20, 2, 22, 2, 24, 2, 26, 2, 28, 2, 30, 2, 32, 2, 34, 2, 36, 2, 38, 2, 40, 2, 42, 2, 44, 2, 46, 2, 48, 2, 50, 2, 52, 2, 54, 2, 56, 2, 58, 2, 60, 2, 62, 2, 64, 2, 66, 2, 68, 2, 70, 2, 72, 2, 74, 2, 76, 2, 78, 2, 2, 16, 3, 3, 14, 14, 3, 2, 32, 34, 3, 2, 35, 36, 3, 2, 58, 59, 3, 2, 37, 39, 3, 2, 40, 43, 3, 2, 44, 47, 3, 2, 62, 73, 3, 2, 60, 61, 3, 2, 30, 31, 3, 2, 83, 84, 3, 2, 74, 77, 3, 2, 11, 12, 3, 2, 86, 87, 2, 633, 2, 83, 3, 2, 2, 2, 4, 94, 3, 2, 2, 2, 6, 99, 3, 2, 2, 2, 8, 119, 3, 2, 2, 2, 10, 181, 3, 2, 2, 2, 12, 200, 3, 2, 2, 2, 14, 204, 3, 2, 2, 2, 16, 206, 3, 2, 2, 2, 18, 218, 3, 2, 2, 2, 20, 222, 3, 2, 2, 2, 22, 224, 3, 2, 2, 2, 24, 226, 3, 2, 2, 2, 26, 235, 3, 2, 2, 2, 28, 253, 3, 2, 2, 2, 30, 255, 3, 2, 2, 2, 32, 260, 3, 2, 2, 2, 34, 267, 3, 2, 2, 2, 36, 325, 3, 2, 2, 2, 38, 332, 3, 2, 2, 2, 40, 341, 3, 2, 2, 2, 42, 353, 3, 2, 2, 2, 44, 355, 3, 2, 2, 2, 46, 386, 3, 2, 2, 2, 48, 396, 3, 2, 2, 2, 50, 417, 3, 2, 2, 2, 52, 422, 3, 2, 2, 2, 54, 426, 3, 2, 2, 2, 56, 428, 3, 2, 2, 2, 58, 432, 3, 2, 2, 2, 60, 435, 3, 2, 2, 2, 62, 480, 3, 2, 2, 2, 64, 495, 3, 2, 2, 2, 66, 511, 3, 2, 2, 2, 68, 513, 3, 2, 2, 2, 70, 517, 3, 2, 2, 2, 72, 533, 3, 2, 2, 2, 74, 548, 3, 2, 2, 2, 76, 556, 3, 2, 2, 2, 78, 571, 3, 2, 2, 2, 80, 82, 5, 4, 3, 2, 81, 80, 3, 2, 2, 2, 82, 85, 3, 2, 2, 2, 83, 81, 3, 2, 2, 2, 83, 84, 3, 2, 2, 2, 84, 89, 3, 2, 2, 2, 85, 83, 3, 2, 2, 2, 86, 88, 5, 8, 5, 2, 87, 86, 3, 2, 2, 2, 88, 91, 3, 2, 2, 2, 89, 87, 3, 2, 2, 2, 89, 90, 3, 2, 2, 2, 90, 92, 3, 2, 2, 2, 91, 89, 3, 2, 2, 2, 92, 93, 7, 2, 2, 3, 93, 3, 3, 2, 2, 2, 94, 95, 5, 26, 14, 2, 95, 96, 7, 85, 2, 2, 96, 97, 5, 6, 4, 2, 97, 98, 5, 16, 9, 2, 98, 5, 3, 2, 2, 2, 99, 111, 7, 9, 2, 2, 100, 101, 5, 26, 14, 2, 101, 108, 7, 85, 2, 2, 102, 103, 7, 13, 2, 2, 103, 104, 5, 26, 14, 2, 104, 105, 7, 85, 2, 2, 105, 107, 3, 2, 2, 2, 106, 102, 3, 2, 2, 2, 107, 110, 3, 2, 2, 2, 108, 106, 3, 2, 2, 2, 108, 109, 3, 2, 2, 2, 109, 112, 3, 2, 2, 2, 110, 108, 3, 2, 2, 2, 111, 100, 3, 2, 2, 2, 111, 112, 3, 2, 2, 2, 112, 113, 3, 2, 2, 2, 113, 114, 7, 10, 2, 2, 114, 7, 3, 2, 2, 2, 115, 120, 5, 10, 6, 2, 116, 117, 5, 12, 7, 2, 117, 118, 9, 2, 2, 2, 118, 120, 3, 2, 2, 2, 119, 115, 3, 2, 2, 2, 119, 116, 3, 2, 2, 2, 120, 9, 3, 2, 2, 2, 121, 122, 7, 15, 2, 2, 122, 123, 7, 9, 2, 2, 123, 124, 5, 36, 19, 2, 124, 125, 7, 10, 2, 2, 125, 129, 5, 14, 8, 2, 126, 127, 7, 17, 2, 2, 127, 130, 5, 14, 8, 2, 128, 130, 6, 6, 2, 2, 129, 126, 3, 2, 2, 2, 129, 128, 3, 2, 2, 2, 130, 182, 3, 2, 2, 2, 131, 132, 7, 18, 2, 2, 132, 133, 7, 9, 2, 2, 133, 134, 5, 36, 19, 2, 134, 137, 7, 10, 2, 2, 135, 138, 5, 14, 8, 2, 136, 138, 5, 18, 10, 2, 137, 135, 3, 2, 2, 2, 137, 136, 3, 2, 2, 2, 138, 182, 3, 2, 2, 2, 139, 140, 7, 20, 2, 2, 140, 142, 7, 9, 2, 2, 141, 143, 5, 20, 11, 2, 142, 141, 3, 2, 2, 2, 142, 143, 3, 2, 2, 2, 143, 144, 3, 2, 2, 2, 144, 146, 7, 14, 2, 2, 145, 147, 5, 36, 19, 2, 146, 145, 3, 2, 2, 2, 146, 147, 3, 2, 2, 2, 147, 148, 3, 2, 2, 2, 148, 150, 7, 14, 2, 2, 149, 151, 5, 22, 12, 2, 150, 149, 3, 2, 2, 2, 150, 151, 3, 2, 2, 2, 151, 152, 3, 2, 2, 2, 152, 155, 7, 10, 2, 2, 153, 156, 5, 14, 8, 2, 154, 156, 5, 18, 10, 2, 155, 153, 3, 2, 2, 2, 155, 154, 3, 2, 2, 2, 156, 182, 3, 2, 2, 2, 157, 158, 7, 20, 2, 2, 158, 159, 7, 9, 2, 2, 159, 160, 5, 26, 14, 2, 160, 161, 7, 85, 2, 2, 161, 162, 7, 54, 2, 2, 162, 163, 5, 36, 19, 2, 163, 164, 7, 10, 2, 2, 164, 165, 5, 14, 8, 2, 165, 182, 3, 2, 2, 2, 166, 167, 7, 20, 2, 2, 167, 168, 7, 9, 2, 2, 168, 169, 7, 85, 2, 2, 169, 170, 7, 16, 2, 2, 170, 171, 5, 36, 19, 2, 171, 172, 7, 10, 2, 2, 172, 173, 5, 14, 8, 2, 173, 182, 3, 2, 2, 2, 174, 175, 7, 25, 2, 2, 175, 177, 5, 16, 9, 2, 176, 178, 5, 32, 17, 2, 177, 176, 3, 2, 2, 2, 178, 179, 3, 2, 2, 2, 179, 177, 3, 2, 2, 2, 179, 180, 3, 2, 2, 2, 180, 182, 3, 2, 2, 2, 181, 121, 3, 2, 2, 2, 181, 131, 3, 2, 2, 2, 181, 139, 3, 2, 2, 2, 181, 157, 3, 2, 2, 2, 181, 166, 3, 2, 2, 2, 181, 174, 3, 2, 2, 2, 182, 11, 3, 2, 2, 2, 183, 184, 7, 19, 2, 2, 184, 185, 5, 16, 9, 2, 185, 186, 7, 18, 2, 2, 186, 187, 7, 9, 2, 2, 187, 188, 5, 36, 19, 2, 188, 189, 7, 10, 2, 2, 189, 201, 3, 2, 2, 2, 190, 201, 5, 24, 13, 2, 191, 201, 7, 21, 2, 2, 192, 201, 7, 22, 2, 2, 193, 195, 7, 23, 2, 2, 194, 196, 5, 36, 19, 2, 195, 194, 3, 2, 2, 2, 195, 196, 3, 2, 2, 2, 196, 201, 3, 2, 2, 2, 197, 198, 7, 27, 2, 2, 198, 201, 5, 36, 19, 2, 199, 201, 5, 36, 19, 2, 200, 183, 3, 2, 2, 2, 200, 190, 3, 2, 2, 2, 200, 191, 3, 2, 2, 2, 200, 192, 3, 2, 2, 2, 200, 193, 3, 2, 2, 2, 200, 197, 3, 2, 2, 2, 200, 199, 3, 2, 2, 2, 201, 13, 3, 2, 2, 2, 202, 205, 5, 16, 9, 2, 203, 205, 5, 8, 5, 2, 204, 202, 3, 2, 2, 2, 204, 203, 3, 2, 2, 2, 205, 15, 3, 2, 2, 2, 206, 210, 7, 5, 2, 2, 207, 209, 5, 8, 5, 2, 208, 207, 3, 2, 2, 2, 209, 212, 3, 2, 2, 2, 210, 208, 3, 2, 2, 2, 210, 211, 3, 2, 2, 2, 211, 214, 3, 2, 2, 2, 212, 210, 3, 2, 2, 2, 213, 215, 5, 12, 7, 2, 214, 213, 3, 2, 2, 2, 214, 215, 3, 2, 2, 2, 215, 216, 3, 2, 2, 2, 216, 217, 7, 6, 2, 2, 217, 17, 3, 2, 2, 2, 218, 219, 7, 14, 2, 2, 219, 19, 3, 2, 2, 2, 220, 223, 5, 24, 13, 2, 221, 223, 5, 36, 19, 2, 222, 220, 3, 2, 2, 2, 222, 221, 3, 2, 2, 2, 223, 21, 3, 2, 2, 2, 224, 225, 5, 36, 19, 2, 225, 23, 3, 2, 2, 2, 226, 227, 5, 26, 14, 2, 227, 232, 5, 30, 16, 2, 228, 229, 7, 13, 2, 2, 229, 231, 5, 30, 16, 2, 230, 228, 3, 2, 2, 2, 231, 234, 3, 2, 2, 2, 232, 230, 3, 2, 2, 2, 232, 233, 3, 2, 2, 2, 233, 25, 3, 2, 2, 2, 234, 232, 3, 2, 2, 2, 235, 240, 5, 28, 15, 2, 236, 237, 7, 7, 2, 2, 237, 239, 7, 8, 2, 2, 238, 236, 3, 2, 2, 2, 239, 242, 3, 2, 2, 2, 240, 238, 3, 2, 2, 2, 240, 241, 3, 2, 2, 2, 241, 27, 3, 2, 2, 2, 242, 240, 3, 2, 2, 2, 243, 254, 7, 84, 2, 2, 244, 254, 7, 83, 2, 2, 245, 250, 7, 85, 2, 2, 246, 247, 7, 11, 2, 2, 247, 249, 7, 87, 2, 2, 248, 246, 3, 2, 2, 2, 249, 252, 3, 2, 2, 2, 250, 248, 3, 2, 2, 2, 250, 251, 3, 2, 2, 2, 251, 254, 3, 2, 2, 2, 252, 250, 3, 2, 2, 2, 253, 243, 3, 2, 2, 2, 253, 244, 3, 2, 2, 2, 253, 245, 3, 2, 2, 2, 254, 29, 3, 2, 2, 2, 255, 258, 7, 85, 2, 2, 256, 257, 7, 62, 2, 2, 257, 259, 5, 36, 19, 2, 258, 256, 3, 2, 2, 2, 258, 259, 3, 2, 2, 2, 259, 31, 3, 2, 2, 2, 260, 261, 7, 26, 2, 2, 261, 262, 7, 9, 2, 2, 262, 263, 5, 28, 15, 2, 263, 264, 7, 85, 2, 2, 264, 265, 7, 10, 2, 2, 265, 266, 5, 16, 9, 2, 266, 33, 3, 2, 2, 2, 267, 268, 8, 18, 1, 2, 268, 269, 5, 38, 20, 2, 269, 311, 3, 2, 2, 2, 270, 271, 12, 15, 2, 2, 271, 272, 9, 3, 2, 2, 272, 310, 5, 34, 18, 16, 273, 274, 12, 14, 2, 2, 274, 275, 9, 4, 2, 2, 275, 310, 5, 34, 18, 15, 276, 277, 12, 13, 2, 2, 277, 278, 9, 5, 2, 2, 278, 310, 5, 34, 18, 14, 279, 280, 12, 12, 2, 2, 280, 281, 9, 6, 2, 2, 281, 310, 5, 34, 18, 13, 282, 283, 12, 11, 2, 2, 283, 284, 9, 7, 2, 2, 284, 310, 5, 34, 18, 12, 285, 286, 12, 9, 2, 2, 286, 287, 9, 8, 2, 2, 287, 310, 5, 34, 18, 10, 288, 289, 12, 8, 2, 2, 289, 290, 7, 48, 2, 2, 290, 310, 5, 34, 18, 9, 291, 292, 12, 7, 2, 2, 292, 293, 7, 49, 2, 2, 293, 310, 5, 34, 18, 8, 294, 295, 12, 6, 2, 2, 295, 296, 7, 50, 2, 2, 296, 310, 5, 34, 18, 7, 297, 298, 12, 5, 2, 2, 298, 299, 7, 51, 2, 2, 299, 310, 5, 34, 18, 6, 300, 301, 12, 4, 2, 2, 301, 302, 7, 52, 2, 2, 302, 310, 5, 34, 18, 5, 303, 304, 12, 3, 2, 2, 304, 305, 7, 55, 2, 2, 305, 310, 5, 34, 18, 3, 306, 307, 12, 10, 2, 2, 307, 308, 7, 29, 2, 2, 308, 310, 5, 26, 14, 2, 309, 270, 3, 2, 2, 2, 309, 273, 3, 2, 2, 2, 309, 276, 3, 2, 2, 2, 309, 279, 3, 2, 2, 2, 309, 282, 3, 2, 2, 2, 309, 285, 3, 2, 2, 2, 309, 288, 3, 2, 2, 2, 309, 291, 3, 2, 2, 2, 309, 294, 3, 2, 2, 2, 309, 297, 3, 2, 2, 2, 309, 300, 3, 2, 2, 2, 309, 303, 3, 2, 2, 2, 309, 306, 3, 2, 2, 2, 310, 313, 3, 2, 2, 2, 311, 309, 3, 2, 2, 2, 311, 312, 3, 2, 2, 2, 312, 35, 3, 2, 2, 2, 313, 311, 3, 2, 2, 2, 314, 326, 5, 34, 18, 2, 315, 316, 5, 34, 18, 2, 316, 317, 7, 53, 2, 2, 317, 318, 5, 36, 19, 2, 318, 319, 7, 54, 2, 2, 319, 320, 5, 36, 19, 2, 320, 326, 3, 2, 2, 2, 321, 322, 5, 34, 18, 2, 322, 323, 9, 9, 2, 2, 323, 324, 5, 36, 19, 2, 324, 326, 3, 2, 2, 2, 325, 314, 3, 2, 2, 2, 325, 315, 3, 2, 2, 2, 325, 321, 3, 2, 2, 2, 326, 37, 3, 2, 2, 2, 327, 328, 9, 10, 2, 2, 328, 333, 5, 48, 25, 2, 329, 330, 9, 4, 2, 2, 330, 333, 5, 38, 20, 2, 331, 333, 5, 40, 21, 2, 332, 327, 3, 2, 2, 2, 332, 329, 3, 2, 2, 2, 332, 331, 3, 2, 2, 2, 333, 39, 3, 2, 2, 2, 334, 342, 5, 48, 25, 2, 335, 336, 5, 48, 25, 2, 336, 337, 9, 10, 2, 2, 337, 342, 3, 2, 2, 2, 338, 339, 9, 11, 2, 2, 339, 342, 5, 38, 20, 2, 340, 342, 5, 42, 22, 2, 341, 334, 3, 2, 2, 2, 341, 335, 3, 2, 2, 2, 341, 338, 3, 2, 2, 2, 341, 340, 3, 2, 2, 2, 342, 41, 3, 2, 2, 2, 343, 344, 7, 9, 2, 2, 344, 345, 5, 44, 23, 2, 345, 346, 7, 10, 2, 2, 346, 347, 5, 38, 20, 2, 347, 354, 3, 2, 2, 2, 348, 349, 7, 9, 2, 2, 349, 350, 5, 46, 24, 2, 350, 351, 7, 10, 2, 2, 351, 352, 5, 40, 21, 2, 352, 354, 3, 2, 2, 2, 353, 343, 3, 2, 2, 2, 353, 348, 3, 2, 2, 2, 354, 43, 3, 2, 2, 2, 355, 356, 9, 12, 2, 2, 356, 45, 3, 2, 2, 2, 357, 360, 7, 84, 2, 2, 358, 359, 7, 7, 2, 2, 359, 361, 7, 8, 2, 2, 360, 358, 3, 2, 2, 2, 361, 362, 3, 2, 2, 2, 362, 360, 3, 2, 2, 2, 362, 363, 3, 2, 2, 2, 363, 387, 3, 2, 2, 2, 364, 367, 7, 83, 2, 2, 365, 366, 7, 7, 2, 2, 366, 368, 7, 8, 2, 2, 367, 365, 3, 2, 2, 2, 368, 369, 3, 2, 2, 2, 369, 367, 3, 2, 2, 2, 369, 370, 3, 2, 2, 2, 370, 387, 3, 2, 2, 2, 371, 376, 7, 85, 2, 2, 372, 373, 7, 11, 2, 2, 373, 375, 7, 87, 2, 2, 374, 372, 3, 2, 2, 2, 375, 378, 3, 2, 2, 2, 376, 374, 3, 2, 2, 2, 376, 377, 3, 2, 2, 2, 377, 383, 3, 2, 2, 2, 378, 376, 3, 2, 2, 2, 379, 380, 7, 7, 2, 2, 380, 382, 7, 8, 2, 2, 381, 379, 3, 2, 2, 2, 382, 385, 3, 2, 2, 2, 383, 381, 3, 2, 2, 2, 383, 384, 3, 2, 2, 2, 384, 387, 3, 2, 2, 2, 385, 383, 3, 2, 2, 2, 386, 357, 3, 2, 2, 2, 386, 364, 3, 2, 2, 2, 386, 371, 3, 2, 2, 2, 387, 47, 3, 2, 2, 2, 388, 392, 5, 50, 26, 2, 389, 391, 5, 52, 27, 2, 390, 389, 3, 2, 2, 2, 391, 394, 3, 2, 2, 2, 392, 390, 3, 2, 2, 2, 392, 393, 3, 2, 2, 2, 393, 397, 3, 2, 2, 2, 394, 392, 3, 2, 2, 2, 395, 397, 5, 62, 32, 2, 396, 388, 3, 2, 2, 2, 396, 395, 3, 2, 2, 2, 397, 49, 3, 2, 2, 2, 398, 399, 7, 9, 2, 2, 399, 400, 5, 36, 19, 2, 400, 401, 7, 10, 2, 2, 401, 418, 3, 2, 2, 2, 402, 418, 9, 13, 2, 2, 403, 418, 7, 80, 2, 2, 404, 418, 7, 81, 2, 2, 405, 418, 7, 82, 2, 2, 406, 418, 7, 78, 2, 2, 407, 418, 7, 79, 2, 2, 408, 418, 5, 64, 33, 2, 409, 418, 5, 66, 34, 2, 410, 418, 7, 85, 2, 2, 411, 412, 7, 85, 2, 2, 412, 418, 5, 70, 36, 2, 413, 414, 7, 24, 2, 2, 414, 415, 5, 28, 15, 2, 415, 416, 5, 70, 36, 2, 416, 418, 3, 2, 2, 2, 417, 398, 3, 2, 2, 2, 417, 402, 3, 2, 2, 2, 417, 403, 3, 2, 2, 2, 417, 404, 3, 2, 2, 2, 417, 405, 3, 2, 2, 2, 417, 406, 3, 2, 2, 2, 417, 407, 3, 2, 2, 2, 417, 408, 3, 2, 2, 2, 417, 409, 3, 2, 2, 2, 417, 410, 3, 2, 2, 2, 417, 411, 3, 2, 2, 2, 417, 413, 3, 2, 2, 2, 418, 51, 3, 2, 2, 2, 419, 423, 5, 56, 29, 2, 420, 423, 5, 58, 30, 2, 421, 423, 5, 60, 31, 2, 422, 419, 3, 2, 2, 2, 422, 420, 3, 2, 2, 2, 422, 421, 3, 2, 2, 2, 423, 53, 3, 2, 2, 2, 424, 427, 5, 56, 29, 2, 425, 427, 5, 58, 30, 2, 426, 424, 3, 2, 2, 2, 426, 425, 3, 2, 2, 2, 427, 55, 3, 2, 2, 2, 428, 429, 9, 14, 2, 2, 429, 430, 7, 87, 2, 2, 430, 431, 5, 70, 36, 2, 431, 57, 3, 2, 2, 2, 432, 433, 9, 14, 2, 2, 433, 434, 9, 15, 2, 2, 434, 59, 3, 2, 2, 2, 435, 436, 7, 7, 2, 2, 436, 437, 5, 36, 19, 2, 437, 438, 7, 8, 2, 2, 438, 61, 3, 2, 2, 2, 439, 440, 7, 24, 2, 2, 440, 445, 5, 28, 15, 2, 441, 442, 7, 7, 2, 2, 442, 443, 5, 36, 19, 2, 443, 444, 7, 8, 2, 2, 444, 446, 3, 2, 2, 2, 445, 441, 3, 2, 2, 2, 446, 447, 3, 2, 2, 2, 447, 445, 3, 2, 2, 2, 447, 448, 3, 2, 2, 2, 448, 456, 3, 2, 2, 2, 449, 453, 5, 54, 28, 2, 450, 452, 5, 52, 27, 2, 451, 450, 3, 2, 2, 2, 452, 455, 3, 2, 2, 2, 453, 451, 3, 2, 2, 2, 453, 454, 3, 2, 2, 2, 454, 457, 3, 2, 2, 2, 455, 453, 3, 2, 2, 2, 456, 449, 3, 2, 2, 2, 456, 457, 3, 2, 2, 2, 457, 481, 3, 2, 2, 2, 458, 459, 7, 24, 2, 2, 459, 460, 5, 28, 15, 2, 460, 461, 7, 7, 2, 2, 461, 462, 7, 8, 2, 2, 462, 471, 7, 5, 2, 2, 463, 468, 5, 36, 19, 2, 464, 465, 7, 13, 2, 2, 465, 467, 5, 36, 19, 2, 466, 464, 3, 2, 2, 2, 467, 470, 3, 2, 2, 2, 468, 466, 3, 2, 2, 2, 468, 469, 3, 2, 2, 2, 469, 472, 3, 2, 2, 2, 470, 468, 3, 2, 2, 2, 471, 463, 3, 2, 2, 2, 471, 472, 3, 2, 2, 2, 472, 473, 3, 2, 2, 2, 473, 477, 7, 6, 2, 2, 474, 476, 5, 52, 27, 2, 475, 474, 3, 2, 2, 2, 476, 479, 3, 2, 2, 2, 477, 475, 3, 2, 2, 2, 477, 478, 3, 2, 2, 2, 478, 481, 3, 2, 2, 2, 479, 477, 3, 2, 2, 2, 480, 439, 3, 2, 2, 2, 480, 458, 3, 2, 2, 2, 481, 63, 3, 2, 2, 2, 482, 483, 7, 7, 2, 2, 483, 488, 5, 36, 19, 2, 484, 485, 7, 13, 2, 2, 485, 487, 5, 36, 19, 2, 486, 484, 3, 2, 2, 2, 487, 490, 3, 2, 2, 2, 488, 486, 3, 2, 2, 2, 488, 489, 3, 2, 2, 2, 489, 491, 3, 2, 2, 2, 490, 488, 3, 2, 2, 2, 491, 492, 7, 8, 2, 2, 492, 496, 3, 2, 2, 2, 493, 494, 7, 7, 2, 2, 494, 496, 7, 8, 2, 2, 495, 482, 3, 2, 2, 2, 495, 493, 3, 2, 2, 2, 496, 65, 3, 2, 2, 2, 497, 498, 7, 7, 2, 2, 498, 503, 5, 68, 35, 2, 499, 500, 7, 13, 2, 2, 500, 502, 5, 68, 35, 2, 501, 499, 3, 2, 2, 2, 502, 505, 3, 2, 2, 2, 503, 501, 3, 2, 2, 2, 503, 504, 3, 2, 2, 2, 504, 506, 3, 2, 2, 2, 505, 503, 3, 2, 2, 2, 506, 507, 7, 8, 2, 2, 507, 512, 3, 2, 2, 2, 508, 509, 7, 7, 2, 2, 509, 510, 7, 54, 2, 2, 510, 512, 7, 8, 2, 2, 511, 497, 3, 2, 2, 2, 511, 508, 3, 2, 2, 2, 512, 67, 3, 2, 2, 2, 513, 514, 5, 36, 19, 2, 514, 515, 7, 54, 2, 2, 515, 516, 5, 36, 19, 2, 516, 69, 3, 2, 2, 2, 517, 526, 7, 9, 2, 2, 518, 523, 5, 72, 37, 2, 519, 520, 7, 13, 2, 2, 520, 522, 5, 72, 37, 2, 521, 519, 3, 2, 2, 2, 522, 525, 3, 2, 2, 2, 523, 521, 3, 2, 2, 2, 523, 524, 3, 2, 2, 2, 524, 527, 3, 2, 2, 2, 525, 523, 3, 2, 2, 2, 526, 518, 3, 2, 2, 2, 526, 527, 3, 2, 2, 2, 527, 528, 3, 2, 2, 2, 528, 529, 7, 10, 2, 2, 529, 71, 3, 2, 2, 2, 530, 534, 5, 36, 19, 2, 531, 534, 5, 74, 38, 2, 532, 534, 5, 78, 40, 2, 533, 530, 3, 2, 2, 2, 533, 531, 3, 2, 2, 2, 533, 532, 3, 2, 2, 2, 534, 73, 3, 2, 2, 2, 535, 549, 5, 76, 39, 2, 536, 545, 7, 9, 2, 2, 537, 542, 5, 76, 39, 2, 538, 539, 7, 13, 2, 2, 539, 541, 5, 76, 39, 2, 540, 538, 3, 2, 2, 2, 541, 544, 3, 2, 2, 2, 542, 540, 3, 2, 2, 2, 542, 543, 3, 2, 2, 2, 543, 546, 3, 2, 2, 2, 544, 542, 3, 2, 2, 2, 545, 537, 3, 2, 2, 2, 545, 546, 3, 2, 2, 2, 546, 547, 3, 2, 2, 2, 547, 549, 7, 10, 2, 2, 548, 535, 3, 2, 2, 2, 548, 536, 3, 2, 2, 2, 549, 550, 3, 2, 2, 2, 550, 553, 7, 57, 2, 2, 551, 554, 5, 16, 9, 2, 552, 554, 5, 36, 19, 2, 553, 551, 3, 2, 2, 2, 553, 552, 3, 2, 2, 2, 554, 75, 3, 2, 2, 2, 555, 557, 5, 26, 14, 2, 556, 555, 3, 2, 2, 2, 556, 557, 3, 2, 2, 2, 557, 558, 3, 2, 2, 2, 558, 559, 7, 85, 2, 2, 559, 77, 3, 2, 2, 2, 560, 561, 5, 26, 14, 2, 561, 562, 7, 56, 2, 2, 562, 563, 7, 85, 2, 2, 563, 572, 3, 2, 2, 2, 564, 565, 5, 26, 14, 2, 565, 566, 7, 56, 2, 2, 566, 567, 7, 24, 2, 2, 567, 572, 3, 2, 2, 2, 568, 569, 7, 28, 2, 2, 569, 570, 7, 56, 2, 2, 570, 572, 7, 85, 2, 2, 571, 560, 3, 2, 2, 2, 571, 564, 3, 2, 2, 2, 571, 568, 3, 2, 2, 2, 572, 79, 3, 2, 2, 2, 62, 83, 89, 108, 111, 119, 129, 137, 142, 146, 150, 155, 179, 181, 195, 200, 204, 210, 214, 222, 232, 240, 250, 253, 258, 309, 311, 325, 332, 341, 353, 362, 369, 376, 383, 386, 392, 396, 417, 422, 426, 447, 453, 456, 468, 471, 477, 480, 488, 495, 503, 511, 523, 526, 533, 542, 545, 548, 553, 556, 571]
\ No newline at end of file
diff --git a/packages/kbn-monaco/src/painless/antlr/painless_parser.tokens b/packages/kbn-monaco/src/painless/antlr/painless_parser.tokens
new file mode 100644
index 0000000000000..ff62343c92ba5
--- /dev/null
+++ b/packages/kbn-monaco/src/painless/antlr/painless_parser.tokens
@@ -0,0 +1,158 @@
+WS=1
+COMMENT=2
+LBRACK=3
+RBRACK=4
+LBRACE=5
+RBRACE=6
+LP=7
+RP=8
+DOT=9
+NSDOT=10
+COMMA=11
+SEMICOLON=12
+IF=13
+IN=14
+ELSE=15
+WHILE=16
+DO=17
+FOR=18
+CONTINUE=19
+BREAK=20
+RETURN=21
+NEW=22
+TRY=23
+CATCH=24
+THROW=25
+THIS=26
+INSTANCEOF=27
+BOOLNOT=28
+BWNOT=29
+MUL=30
+DIV=31
+REM=32
+ADD=33
+SUB=34
+LSH=35
+RSH=36
+USH=37
+LT=38
+LTE=39
+GT=40
+GTE=41
+EQ=42
+EQR=43
+NE=44
+NER=45
+BWAND=46
+XOR=47
+BWOR=48
+BOOLAND=49
+BOOLOR=50
+COND=51
+COLON=52
+ELVIS=53
+REF=54
+ARROW=55
+FIND=56
+MATCH=57
+INCR=58
+DECR=59
+ASSIGN=60
+AADD=61
+ASUB=62
+AMUL=63
+ADIV=64
+AREM=65
+AAND=66
+AXOR=67
+AOR=68
+ALSH=69
+ARSH=70
+AUSH=71
+OCTAL=72
+HEX=73
+INTEGER=74
+DECIMAL=75
+STRING=76
+REGEX=77
+TRUE=78
+FALSE=79
+NULL=80
+PRIMITIVE=81
+DEF=82
+ID=83
+DOTINTEGER=84
+DOTID=85
+'{'=3
+'}'=4
+'['=5
+']'=6
+'('=7
+')'=8
+'.'=9
+'?.'=10
+','=11
+';'=12
+'if'=13
+'in'=14
+'else'=15
+'while'=16
+'do'=17
+'for'=18
+'continue'=19
+'break'=20
+'return'=21
+'new'=22
+'try'=23
+'catch'=24
+'throw'=25
+'this'=26
+'instanceof'=27
+'!'=28
+'~'=29
+'*'=30
+'/'=31
+'%'=32
+'+'=33
+'-'=34
+'<<'=35
+'>>'=36
+'>>>'=37
+'<'=38
+'<='=39
+'>'=40
+'>='=41
+'=='=42
+'==='=43
+'!='=44
+'!=='=45
+'&'=46
+'^'=47
+'|'=48
+'&&'=49
+'||'=50
+'?'=51
+':'=52
+'?:'=53
+'::'=54
+'->'=55
+'=~'=56
+'==~'=57
+'++'=58
+'--'=59
+'='=60
+'+='=61
+'-='=62
+'*='=63
+'/='=64
+'%='=65
+'&='=66
+'^='=67
+'|='=68
+'<<='=69
+'>>='=70
+'>>>='=71
+'true'=78
+'false'=79
+'null'=80
+'def'=82
diff --git a/packages/kbn-monaco/src/painless/antlr/painless_parser.ts b/packages/kbn-monaco/src/painless/antlr/painless_parser.ts
new file mode 100644
index 0000000000000..320e310a0a9a2
--- /dev/null
+++ b/packages/kbn-monaco/src/painless/antlr/painless_parser.ts
@@ -0,0 +1,5832 @@
+// @ts-nocheck
+// Generated from ./src/painless/antlr/painless_parser.g4 by ANTLR 4.7.3-SNAPSHOT
+
+
+import { ATN } from "antlr4ts/atn/ATN";
+import { ATNDeserializer } from "antlr4ts/atn/ATNDeserializer";
+import { FailedPredicateException } from "antlr4ts/FailedPredicateException";
+import { NotNull } from "antlr4ts/Decorators";
+import { NoViableAltException } from "antlr4ts/NoViableAltException";
+import { Override } from "antlr4ts/Decorators";
+import { Parser } from "antlr4ts/Parser";
+import { ParserRuleContext } from "antlr4ts/ParserRuleContext";
+import { ParserATNSimulator } from "antlr4ts/atn/ParserATNSimulator";
+import { ParseTreeListener } from "antlr4ts/tree/ParseTreeListener";
+import { ParseTreeVisitor } from "antlr4ts/tree/ParseTreeVisitor";
+import { RecognitionException } from "antlr4ts/RecognitionException";
+import { RuleContext } from "antlr4ts/RuleContext";
+//import { RuleVersion } from "antlr4ts/RuleVersion";
+import { TerminalNode } from "antlr4ts/tree/TerminalNode";
+import { Token } from "antlr4ts/Token";
+import { TokenStream } from "antlr4ts/TokenStream";
+import { Vocabulary } from "antlr4ts/Vocabulary";
+import { VocabularyImpl } from "antlr4ts/VocabularyImpl";
+
+import * as Utils from "antlr4ts/misc/Utils";
+
+import { painless_parserListener } from "./painless_parserListener";
+
+export class painless_parser extends Parser {
+	public static readonly WS = 1;
+	public static readonly COMMENT = 2;
+	public static readonly LBRACK = 3;
+	public static readonly RBRACK = 4;
+	public static readonly LBRACE = 5;
+	public static readonly RBRACE = 6;
+	public static readonly LP = 7;
+	public static readonly RP = 8;
+	public static readonly DOT = 9;
+	public static readonly NSDOT = 10;
+	public static readonly COMMA = 11;
+	public static readonly SEMICOLON = 12;
+	public static readonly IF = 13;
+	public static readonly IN = 14;
+	public static readonly ELSE = 15;
+	public static readonly WHILE = 16;
+	public static readonly DO = 17;
+	public static readonly FOR = 18;
+	public static readonly CONTINUE = 19;
+	public static readonly BREAK = 20;
+	public static readonly RETURN = 21;
+	public static readonly NEW = 22;
+	public static readonly TRY = 23;
+	public static readonly CATCH = 24;
+	public static readonly THROW = 25;
+	public static readonly THIS = 26;
+	public static readonly INSTANCEOF = 27;
+	public static readonly BOOLNOT = 28;
+	public static readonly BWNOT = 29;
+	public static readonly MUL = 30;
+	public static readonly DIV = 31;
+	public static readonly REM = 32;
+	public static readonly ADD = 33;
+	public static readonly SUB = 34;
+	public static readonly LSH = 35;
+	public static readonly RSH = 36;
+	public static readonly USH = 37;
+	public static readonly LT = 38;
+	public static readonly LTE = 39;
+	public static readonly GT = 40;
+	public static readonly GTE = 41;
+	public static readonly EQ = 42;
+	public static readonly EQR = 43;
+	public static readonly NE = 44;
+	public static readonly NER = 45;
+	public static readonly BWAND = 46;
+	public static readonly XOR = 47;
+	public static readonly BWOR = 48;
+	public static readonly BOOLAND = 49;
+	public static readonly BOOLOR = 50;
+	public static readonly COND = 51;
+	public static readonly COLON = 52;
+	public static readonly ELVIS = 53;
+	public static readonly REF = 54;
+	public static readonly ARROW = 55;
+	public static readonly FIND = 56;
+	public static readonly MATCH = 57;
+	public static readonly INCR = 58;
+	public static readonly DECR = 59;
+	public static readonly ASSIGN = 60;
+	public static readonly AADD = 61;
+	public static readonly ASUB = 62;
+	public static readonly AMUL = 63;
+	public static readonly ADIV = 64;
+	public static readonly AREM = 65;
+	public static readonly AAND = 66;
+	public static readonly AXOR = 67;
+	public static readonly AOR = 68;
+	public static readonly ALSH = 69;
+	public static readonly ARSH = 70;
+	public static readonly AUSH = 71;
+	public static readonly OCTAL = 72;
+	public static readonly HEX = 73;
+	public static readonly INTEGER = 74;
+	public static readonly DECIMAL = 75;
+	public static readonly STRING = 76;
+	public static readonly REGEX = 77;
+	public static readonly TRUE = 78;
+	public static readonly FALSE = 79;
+	public static readonly NULL = 80;
+	public static readonly PRIMITIVE = 81;
+	public static readonly DEF = 82;
+	public static readonly ID = 83;
+	public static readonly DOTINTEGER = 84;
+	public static readonly DOTID = 85;
+	public static readonly RULE_source = 0;
+	public static readonly RULE_function = 1;
+	public static readonly RULE_parameters = 2;
+	public static readonly RULE_statement = 3;
+	public static readonly RULE_rstatement = 4;
+	public static readonly RULE_dstatement = 5;
+	public static readonly RULE_trailer = 6;
+	public static readonly RULE_block = 7;
+	public static readonly RULE_empty = 8;
+	public static readonly RULE_initializer = 9;
+	public static readonly RULE_afterthought = 10;
+	public static readonly RULE_declaration = 11;
+	public static readonly RULE_decltype = 12;
+	public static readonly RULE_type = 13;
+	public static readonly RULE_declvar = 14;
+	public static readonly RULE_trap = 15;
+	public static readonly RULE_noncondexpression = 16;
+	public static readonly RULE_expression = 17;
+	public static readonly RULE_unary = 18;
+	public static readonly RULE_unarynotaddsub = 19;
+	public static readonly RULE_castexpression = 20;
+	public static readonly RULE_primordefcasttype = 21;
+	public static readonly RULE_refcasttype = 22;
+	public static readonly RULE_chain = 23;
+	public static readonly RULE_primary = 24;
+	public static readonly RULE_postfix = 25;
+	public static readonly RULE_postdot = 26;
+	public static readonly RULE_callinvoke = 27;
+	public static readonly RULE_fieldaccess = 28;
+	public static readonly RULE_braceaccess = 29;
+	public static readonly RULE_arrayinitializer = 30;
+	public static readonly RULE_listinitializer = 31;
+	public static readonly RULE_mapinitializer = 32;
+	public static readonly RULE_maptoken = 33;
+	public static readonly RULE_arguments = 34;
+	public static readonly RULE_argument = 35;
+	public static readonly RULE_lambda = 36;
+	public static readonly RULE_lamtype = 37;
+	public static readonly RULE_funcref = 38;
+	// tslint:disable:no-trailing-whitespace
+	public static readonly ruleNames: string[] = [
+		"source", "function", "parameters", "statement", "rstatement", "dstatement", 
+		"trailer", "block", "empty", "initializer", "afterthought", "declaration", 
+		"decltype", "type", "declvar", "trap", "noncondexpression", "expression", 
+		"unary", "unarynotaddsub", "castexpression", "primordefcasttype", "refcasttype", 
+		"chain", "primary", "postfix", "postdot", "callinvoke", "fieldaccess", 
+		"braceaccess", "arrayinitializer", "listinitializer", "mapinitializer", 
+		"maptoken", "arguments", "argument", "lambda", "lamtype", "funcref",
+	];
+
+	private static readonly _LITERAL_NAMES: Array<string | undefined> = [
+		undefined, undefined, undefined, "'{'", "'}'", "'['", "']'", "'('", "')'", 
+		"'.'", "'?.'", "','", "';'", "'if'", "'in'", "'else'", "'while'", "'do'", 
+		"'for'", "'continue'", "'break'", "'return'", "'new'", "'try'", "'catch'", 
+		"'throw'", "'this'", "'instanceof'", "'!'", "'~'", "'*'", "'/'", "'%'", 
+		"'+'", "'-'", "'<<'", "'>>'", "'>>>'", "'<'", "'<='", "'>'", "'>='", "'=='", 
+		"'==='", "'!='", "'!=='", "'&'", "'^'", "'|'", "'&&'", "'||'", "'?'", 
+		"':'", "'?:'", "'::'", "'->'", "'=~'", "'==~'", "'++'", "'--'", "'='", 
+		"'+='", "'-='", "'*='", "'/='", "'%='", "'&='", "'^='", "'|='", "'<<='", 
+		"'>>='", "'>>>='", undefined, undefined, undefined, undefined, undefined, 
+		undefined, "'true'", "'false'", "'null'", undefined, "'def'",
+	];
+	private static readonly _SYMBOLIC_NAMES: Array<string | undefined> = [
+		undefined, "WS", "COMMENT", "LBRACK", "RBRACK", "LBRACE", "RBRACE", "LP", 
+		"RP", "DOT", "NSDOT", "COMMA", "SEMICOLON", "IF", "IN", "ELSE", "WHILE", 
+		"DO", "FOR", "CONTINUE", "BREAK", "RETURN", "NEW", "TRY", "CATCH", "THROW", 
+		"THIS", "INSTANCEOF", "BOOLNOT", "BWNOT", "MUL", "DIV", "REM", "ADD", 
+		"SUB", "LSH", "RSH", "USH", "LT", "LTE", "GT", "GTE", "EQ", "EQR", "NE", 
+		"NER", "BWAND", "XOR", "BWOR", "BOOLAND", "BOOLOR", "COND", "COLON", "ELVIS", 
+		"REF", "ARROW", "FIND", "MATCH", "INCR", "DECR", "ASSIGN", "AADD", "ASUB", 
+		"AMUL", "ADIV", "AREM", "AAND", "AXOR", "AOR", "ALSH", "ARSH", "AUSH", 
+		"OCTAL", "HEX", "INTEGER", "DECIMAL", "STRING", "REGEX", "TRUE", "FALSE", 
+		"NULL", "PRIMITIVE", "DEF", "ID", "DOTINTEGER", "DOTID",
+	];
+	public static readonly VOCABULARY: Vocabulary = new VocabularyImpl(painless_parser._LITERAL_NAMES, painless_parser._SYMBOLIC_NAMES, []);
+
+	// @Override
+	// @NotNull
+	public get vocabulary(): Vocabulary {
+		return painless_parser.VOCABULARY;
+	}
+	// tslint:enable:no-trailing-whitespace
+
+	// @Override
+	public get grammarFileName(): string { return "painless_parser.g4"; }
+
+	// @Override
+	public get ruleNames(): string[] { return painless_parser.ruleNames; }
+
+	// @Override
+	public get serializedATN(): string { return painless_parser._serializedATN; }
+
+	constructor(input: TokenStream) {
+		super(input);
+		this._interp = new ParserATNSimulator(painless_parser._ATN, this);
+	}
+	// @RuleVersion(0)
+	public source(): SourceContext {
+		let _localctx: SourceContext = new SourceContext(this._ctx, this.state);
+		this.enterRule(_localctx, 0, painless_parser.RULE_source);
+		let _la: number;
+		try {
+			let _alt: number;
+			this.enterOuterAlt(_localctx, 1);
+			{
+			this.state = 81;
+			this._errHandler.sync(this);
+			_alt = this.interpreter.adaptivePredict(this._input, 0, this._ctx);
+			while (_alt !== 2 && _alt !== ATN.INVALID_ALT_NUMBER) {
+				if (_alt === 1) {
+					{
+					{
+					this.state = 78;
+					this.function();
+					}
+					}
+				}
+				this.state = 83;
+				this._errHandler.sync(this);
+				_alt = this.interpreter.adaptivePredict(this._input, 0, this._ctx);
+			}
+			this.state = 87;
+			this._errHandler.sync(this);
+			_la = this._input.LA(1);
+			while (((((_la - 5)) & ~0x1F) === 0 && ((1 << (_la - 5)) & ((1 << (painless_parser.LBRACE - 5)) | (1 << (painless_parser.LP - 5)) | (1 << (painless_parser.IF - 5)) | (1 << (painless_parser.WHILE - 5)) | (1 << (painless_parser.DO - 5)) | (1 << (painless_parser.FOR - 5)) | (1 << (painless_parser.CONTINUE - 5)) | (1 << (painless_parser.BREAK - 5)) | (1 << (painless_parser.RETURN - 5)) | (1 << (painless_parser.NEW - 5)) | (1 << (painless_parser.TRY - 5)) | (1 << (painless_parser.THROW - 5)) | (1 << (painless_parser.BOOLNOT - 5)) | (1 << (painless_parser.BWNOT - 5)) | (1 << (painless_parser.ADD - 5)) | (1 << (painless_parser.SUB - 5)))) !== 0) || ((((_la - 58)) & ~0x1F) === 0 && ((1 << (_la - 58)) & ((1 << (painless_parser.INCR - 58)) | (1 << (painless_parser.DECR - 58)) | (1 << (painless_parser.OCTAL - 58)) | (1 << (painless_parser.HEX - 58)) | (1 << (painless_parser.INTEGER - 58)) | (1 << (painless_parser.DECIMAL - 58)) | (1 << (painless_parser.STRING - 58)) | (1 << (painless_parser.REGEX - 58)) | (1 << (painless_parser.TRUE - 58)) | (1 << (painless_parser.FALSE - 58)) | (1 << (painless_parser.NULL - 58)) | (1 << (painless_parser.PRIMITIVE - 58)) | (1 << (painless_parser.DEF - 58)) | (1 << (painless_parser.ID - 58)))) !== 0)) {
+				{
+				{
+				this.state = 84;
+				this.statement();
+				}
+				}
+				this.state = 89;
+				this._errHandler.sync(this);
+				_la = this._input.LA(1);
+			}
+			this.state = 90;
+			this.match(painless_parser.EOF);
+			}
+		}
+		catch (re) {
+			if (re instanceof RecognitionException) {
+				_localctx.exception = re;
+				this._errHandler.reportError(this, re);
+				this._errHandler.recover(this, re);
+			} else {
+				throw re;
+			}
+		}
+		finally {
+			this.exitRule();
+		}
+		return _localctx;
+	}
+	// @RuleVersion(0)
+	public function(): FunctionContext {
+		let _localctx: FunctionContext = new FunctionContext(this._ctx, this.state);
+		this.enterRule(_localctx, 2, painless_parser.RULE_function);
+		try {
+			this.enterOuterAlt(_localctx, 1);
+			{
+			this.state = 92;
+			this.decltype();
+			this.state = 93;
+			this.match(painless_parser.ID);
+			this.state = 94;
+			this.parameters();
+			this.state = 95;
+			this.block();
+			}
+		}
+		catch (re) {
+			if (re instanceof RecognitionException) {
+				_localctx.exception = re;
+				this._errHandler.reportError(this, re);
+				this._errHandler.recover(this, re);
+			} else {
+				throw re;
+			}
+		}
+		finally {
+			this.exitRule();
+		}
+		return _localctx;
+	}
+	// @RuleVersion(0)
+	public parameters(): ParametersContext {
+		let _localctx: ParametersContext = new ParametersContext(this._ctx, this.state);
+		this.enterRule(_localctx, 4, painless_parser.RULE_parameters);
+		let _la: number;
+		try {
+			this.enterOuterAlt(_localctx, 1);
+			{
+			this.state = 97;
+			this.match(painless_parser.LP);
+			this.state = 109;
+			this._errHandler.sync(this);
+			_la = this._input.LA(1);
+			if (((((_la - 81)) & ~0x1F) === 0 && ((1 << (_la - 81)) & ((1 << (painless_parser.PRIMITIVE - 81)) | (1 << (painless_parser.DEF - 81)) | (1 << (painless_parser.ID - 81)))) !== 0)) {
+				{
+				this.state = 98;
+				this.decltype();
+				this.state = 99;
+				this.match(painless_parser.ID);
+				this.state = 106;
+				this._errHandler.sync(this);
+				_la = this._input.LA(1);
+				while (_la === painless_parser.COMMA) {
+					{
+					{
+					this.state = 100;
+					this.match(painless_parser.COMMA);
+					this.state = 101;
+					this.decltype();
+					this.state = 102;
+					this.match(painless_parser.ID);
+					}
+					}
+					this.state = 108;
+					this._errHandler.sync(this);
+					_la = this._input.LA(1);
+				}
+				}
+			}
+
+			this.state = 111;
+			this.match(painless_parser.RP);
+			}
+		}
+		catch (re) {
+			if (re instanceof RecognitionException) {
+				_localctx.exception = re;
+				this._errHandler.reportError(this, re);
+				this._errHandler.recover(this, re);
+			} else {
+				throw re;
+			}
+		}
+		finally {
+			this.exitRule();
+		}
+		return _localctx;
+	}
+	// @RuleVersion(0)
+	public statement(): StatementContext {
+		let _localctx: StatementContext = new StatementContext(this._ctx, this.state);
+		this.enterRule(_localctx, 6, painless_parser.RULE_statement);
+		let _la: number;
+		try {
+			this.state = 117;
+			this._errHandler.sync(this);
+			switch (this._input.LA(1)) {
+			case painless_parser.IF:
+			case painless_parser.WHILE:
+			case painless_parser.FOR:
+			case painless_parser.TRY:
+				this.enterOuterAlt(_localctx, 1);
+				{
+				this.state = 113;
+				this.rstatement();
+				}
+				break;
+			case painless_parser.LBRACE:
+			case painless_parser.LP:
+			case painless_parser.DO:
+			case painless_parser.CONTINUE:
+			case painless_parser.BREAK:
+			case painless_parser.RETURN:
+			case painless_parser.NEW:
+			case painless_parser.THROW:
+			case painless_parser.BOOLNOT:
+			case painless_parser.BWNOT:
+			case painless_parser.ADD:
+			case painless_parser.SUB:
+			case painless_parser.INCR:
+			case painless_parser.DECR:
+			case painless_parser.OCTAL:
+			case painless_parser.HEX:
+			case painless_parser.INTEGER:
+			case painless_parser.DECIMAL:
+			case painless_parser.STRING:
+			case painless_parser.REGEX:
+			case painless_parser.TRUE:
+			case painless_parser.FALSE:
+			case painless_parser.NULL:
+			case painless_parser.PRIMITIVE:
+			case painless_parser.DEF:
+			case painless_parser.ID:
+				this.enterOuterAlt(_localctx, 2);
+				{
+				this.state = 114;
+				this.dstatement();
+				this.state = 115;
+				_la = this._input.LA(1);
+				if (!(_la === painless_parser.EOF || _la === painless_parser.SEMICOLON)) {
+				this._errHandler.recoverInline(this);
+				} else {
+					if (this._input.LA(1) === Token.EOF) {
+						this.matchedEOF = true;
+					}
+
+					this._errHandler.reportMatch(this);
+					this.consume();
+				}
+				}
+				break;
+			default:
+				throw new NoViableAltException(this);
+			}
+		}
+		catch (re) {
+			if (re instanceof RecognitionException) {
+				_localctx.exception = re;
+				this._errHandler.reportError(this, re);
+				this._errHandler.recover(this, re);
+			} else {
+				throw re;
+			}
+		}
+		finally {
+			this.exitRule();
+		}
+		return _localctx;
+	}
+	// @RuleVersion(0)
+	public rstatement(): RstatementContext {
+		let _localctx: RstatementContext = new RstatementContext(this._ctx, this.state);
+		this.enterRule(_localctx, 8, painless_parser.RULE_rstatement);
+		let _la: number;
+		try {
+			let _alt: number;
+			this.state = 179;
+			this._errHandler.sync(this);
+			switch ( this.interpreter.adaptivePredict(this._input, 12, this._ctx) ) {
+			case 1:
+				_localctx = new IfContext(_localctx);
+				this.enterOuterAlt(_localctx, 1);
+				{
+				this.state = 119;
+				this.match(painless_parser.IF);
+				this.state = 120;
+				this.match(painless_parser.LP);
+				this.state = 121;
+				this.expression();
+				this.state = 122;
+				this.match(painless_parser.RP);
+				this.state = 123;
+				this.trailer();
+				this.state = 127;
+				this._errHandler.sync(this);
+				switch ( this.interpreter.adaptivePredict(this._input, 5, this._ctx) ) {
+				case 1:
+					{
+					this.state = 124;
+					this.match(painless_parser.ELSE);
+					this.state = 125;
+					this.trailer();
+					}
+					break;
+
+				case 2:
+					{
+					this.state = 126;
+					if (!( this._input.LA(1) != painless_parser.ELSE )) {
+						throw new FailedPredicateException(this, " this._input.LA(1) != painless_parser.ELSE ");
+					}
+					}
+					break;
+				}
+				}
+				break;
+
+			case 2:
+				_localctx = new WhileContext(_localctx);
+				this.enterOuterAlt(_localctx, 2);
+				{
+				this.state = 129;
+				this.match(painless_parser.WHILE);
+				this.state = 130;
+				this.match(painless_parser.LP);
+				this.state = 131;
+				this.expression();
+				this.state = 132;
+				this.match(painless_parser.RP);
+				this.state = 135;
+				this._errHandler.sync(this);
+				switch (this._input.LA(1)) {
+				case painless_parser.LBRACK:
+				case painless_parser.LBRACE:
+				case painless_parser.LP:
+				case painless_parser.IF:
+				case painless_parser.WHILE:
+				case painless_parser.DO:
+				case painless_parser.FOR:
+				case painless_parser.CONTINUE:
+				case painless_parser.BREAK:
+				case painless_parser.RETURN:
+				case painless_parser.NEW:
+				case painless_parser.TRY:
+				case painless_parser.THROW:
+				case painless_parser.BOOLNOT:
+				case painless_parser.BWNOT:
+				case painless_parser.ADD:
+				case painless_parser.SUB:
+				case painless_parser.INCR:
+				case painless_parser.DECR:
+				case painless_parser.OCTAL:
+				case painless_parser.HEX:
+				case painless_parser.INTEGER:
+				case painless_parser.DECIMAL:
+				case painless_parser.STRING:
+				case painless_parser.REGEX:
+				case painless_parser.TRUE:
+				case painless_parser.FALSE:
+				case painless_parser.NULL:
+				case painless_parser.PRIMITIVE:
+				case painless_parser.DEF:
+				case painless_parser.ID:
+					{
+					this.state = 133;
+					this.trailer();
+					}
+					break;
+				case painless_parser.SEMICOLON:
+					{
+					this.state = 134;
+					this.empty();
+					}
+					break;
+				default:
+					throw new NoViableAltException(this);
+				}
+				}
+				break;
+
+			case 3:
+				_localctx = new ForContext(_localctx);
+				this.enterOuterAlt(_localctx, 3);
+				{
+				this.state = 137;
+				this.match(painless_parser.FOR);
+				this.state = 138;
+				this.match(painless_parser.LP);
+				this.state = 140;
+				this._errHandler.sync(this);
+				_la = this._input.LA(1);
+				if (((((_la - 5)) & ~0x1F) === 0 && ((1 << (_la - 5)) & ((1 << (painless_parser.LBRACE - 5)) | (1 << (painless_parser.LP - 5)) | (1 << (painless_parser.NEW - 5)) | (1 << (painless_parser.BOOLNOT - 5)) | (1 << (painless_parser.BWNOT - 5)) | (1 << (painless_parser.ADD - 5)) | (1 << (painless_parser.SUB - 5)))) !== 0) || ((((_la - 58)) & ~0x1F) === 0 && ((1 << (_la - 58)) & ((1 << (painless_parser.INCR - 58)) | (1 << (painless_parser.DECR - 58)) | (1 << (painless_parser.OCTAL - 58)) | (1 << (painless_parser.HEX - 58)) | (1 << (painless_parser.INTEGER - 58)) | (1 << (painless_parser.DECIMAL - 58)) | (1 << (painless_parser.STRING - 58)) | (1 << (painless_parser.REGEX - 58)) | (1 << (painless_parser.TRUE - 58)) | (1 << (painless_parser.FALSE - 58)) | (1 << (painless_parser.NULL - 58)) | (1 << (painless_parser.PRIMITIVE - 58)) | (1 << (painless_parser.DEF - 58)) | (1 << (painless_parser.ID - 58)))) !== 0)) {
+					{
+					this.state = 139;
+					this.initializer();
+					}
+				}
+
+				this.state = 142;
+				this.match(painless_parser.SEMICOLON);
+				this.state = 144;
+				this._errHandler.sync(this);
+				_la = this._input.LA(1);
+				if (((((_la - 5)) & ~0x1F) === 0 && ((1 << (_la - 5)) & ((1 << (painless_parser.LBRACE - 5)) | (1 << (painless_parser.LP - 5)) | (1 << (painless_parser.NEW - 5)) | (1 << (painless_parser.BOOLNOT - 5)) | (1 << (painless_parser.BWNOT - 5)) | (1 << (painless_parser.ADD - 5)) | (1 << (painless_parser.SUB - 5)))) !== 0) || ((((_la - 58)) & ~0x1F) === 0 && ((1 << (_la - 58)) & ((1 << (painless_parser.INCR - 58)) | (1 << (painless_parser.DECR - 58)) | (1 << (painless_parser.OCTAL - 58)) | (1 << (painless_parser.HEX - 58)) | (1 << (painless_parser.INTEGER - 58)) | (1 << (painless_parser.DECIMAL - 58)) | (1 << (painless_parser.STRING - 58)) | (1 << (painless_parser.REGEX - 58)) | (1 << (painless_parser.TRUE - 58)) | (1 << (painless_parser.FALSE - 58)) | (1 << (painless_parser.NULL - 58)) | (1 << (painless_parser.ID - 58)))) !== 0)) {
+					{
+					this.state = 143;
+					this.expression();
+					}
+				}
+
+				this.state = 146;
+				this.match(painless_parser.SEMICOLON);
+				this.state = 148;
+				this._errHandler.sync(this);
+				_la = this._input.LA(1);
+				if (((((_la - 5)) & ~0x1F) === 0 && ((1 << (_la - 5)) & ((1 << (painless_parser.LBRACE - 5)) | (1 << (painless_parser.LP - 5)) | (1 << (painless_parser.NEW - 5)) | (1 << (painless_parser.BOOLNOT - 5)) | (1 << (painless_parser.BWNOT - 5)) | (1 << (painless_parser.ADD - 5)) | (1 << (painless_parser.SUB - 5)))) !== 0) || ((((_la - 58)) & ~0x1F) === 0 && ((1 << (_la - 58)) & ((1 << (painless_parser.INCR - 58)) | (1 << (painless_parser.DECR - 58)) | (1 << (painless_parser.OCTAL - 58)) | (1 << (painless_parser.HEX - 58)) | (1 << (painless_parser.INTEGER - 58)) | (1 << (painless_parser.DECIMAL - 58)) | (1 << (painless_parser.STRING - 58)) | (1 << (painless_parser.REGEX - 58)) | (1 << (painless_parser.TRUE - 58)) | (1 << (painless_parser.FALSE - 58)) | (1 << (painless_parser.NULL - 58)) | (1 << (painless_parser.ID - 58)))) !== 0)) {
+					{
+					this.state = 147;
+					this.afterthought();
+					}
+				}
+
+				this.state = 150;
+				this.match(painless_parser.RP);
+				this.state = 153;
+				this._errHandler.sync(this);
+				switch (this._input.LA(1)) {
+				case painless_parser.LBRACK:
+				case painless_parser.LBRACE:
+				case painless_parser.LP:
+				case painless_parser.IF:
+				case painless_parser.WHILE:
+				case painless_parser.DO:
+				case painless_parser.FOR:
+				case painless_parser.CONTINUE:
+				case painless_parser.BREAK:
+				case painless_parser.RETURN:
+				case painless_parser.NEW:
+				case painless_parser.TRY:
+				case painless_parser.THROW:
+				case painless_parser.BOOLNOT:
+				case painless_parser.BWNOT:
+				case painless_parser.ADD:
+				case painless_parser.SUB:
+				case painless_parser.INCR:
+				case painless_parser.DECR:
+				case painless_parser.OCTAL:
+				case painless_parser.HEX:
+				case painless_parser.INTEGER:
+				case painless_parser.DECIMAL:
+				case painless_parser.STRING:
+				case painless_parser.REGEX:
+				case painless_parser.TRUE:
+				case painless_parser.FALSE:
+				case painless_parser.NULL:
+				case painless_parser.PRIMITIVE:
+				case painless_parser.DEF:
+				case painless_parser.ID:
+					{
+					this.state = 151;
+					this.trailer();
+					}
+					break;
+				case painless_parser.SEMICOLON:
+					{
+					this.state = 152;
+					this.empty();
+					}
+					break;
+				default:
+					throw new NoViableAltException(this);
+				}
+				}
+				break;
+
+			case 4:
+				_localctx = new EachContext(_localctx);
+				this.enterOuterAlt(_localctx, 4);
+				{
+				this.state = 155;
+				this.match(painless_parser.FOR);
+				this.state = 156;
+				this.match(painless_parser.LP);
+				this.state = 157;
+				this.decltype();
+				this.state = 158;
+				this.match(painless_parser.ID);
+				this.state = 159;
+				this.match(painless_parser.COLON);
+				this.state = 160;
+				this.expression();
+				this.state = 161;
+				this.match(painless_parser.RP);
+				this.state = 162;
+				this.trailer();
+				}
+				break;
+
+			case 5:
+				_localctx = new IneachContext(_localctx);
+				this.enterOuterAlt(_localctx, 5);
+				{
+				this.state = 164;
+				this.match(painless_parser.FOR);
+				this.state = 165;
+				this.match(painless_parser.LP);
+				this.state = 166;
+				this.match(painless_parser.ID);
+				this.state = 167;
+				this.match(painless_parser.IN);
+				this.state = 168;
+				this.expression();
+				this.state = 169;
+				this.match(painless_parser.RP);
+				this.state = 170;
+				this.trailer();
+				}
+				break;
+
+			case 6:
+				_localctx = new TryContext(_localctx);
+				this.enterOuterAlt(_localctx, 6);
+				{
+				this.state = 172;
+				this.match(painless_parser.TRY);
+				this.state = 173;
+				this.block();
+				this.state = 175;
+				this._errHandler.sync(this);
+				_alt = 1;
+				do {
+					switch (_alt) {
+					case 1:
+						{
+						{
+						this.state = 174;
+						this.trap();
+						}
+						}
+						break;
+					default:
+						throw new NoViableAltException(this);
+					}
+					this.state = 177;
+					this._errHandler.sync(this);
+					_alt = this.interpreter.adaptivePredict(this._input, 11, this._ctx);
+				} while (_alt !== 2 && _alt !== ATN.INVALID_ALT_NUMBER);
+				}
+				break;
+			}
+		}
+		catch (re) {
+			if (re instanceof RecognitionException) {
+				_localctx.exception = re;
+				this._errHandler.reportError(this, re);
+				this._errHandler.recover(this, re);
+			} else {
+				throw re;
+			}
+		}
+		finally {
+			this.exitRule();
+		}
+		return _localctx;
+	}
+	// @RuleVersion(0)
+	public dstatement(): DstatementContext {
+		let _localctx: DstatementContext = new DstatementContext(this._ctx, this.state);
+		this.enterRule(_localctx, 10, painless_parser.RULE_dstatement);
+		let _la: number;
+		try {
+			this.state = 198;
+			this._errHandler.sync(this);
+			switch ( this.interpreter.adaptivePredict(this._input, 14, this._ctx) ) {
+			case 1:
+				_localctx = new DoContext(_localctx);
+				this.enterOuterAlt(_localctx, 1);
+				{
+				this.state = 181;
+				this.match(painless_parser.DO);
+				this.state = 182;
+				this.block();
+				this.state = 183;
+				this.match(painless_parser.WHILE);
+				this.state = 184;
+				this.match(painless_parser.LP);
+				this.state = 185;
+				this.expression();
+				this.state = 186;
+				this.match(painless_parser.RP);
+				}
+				break;
+
+			case 2:
+				_localctx = new DeclContext(_localctx);
+				this.enterOuterAlt(_localctx, 2);
+				{
+				this.state = 188;
+				this.declaration();
+				}
+				break;
+
+			case 3:
+				_localctx = new ContinueContext(_localctx);
+				this.enterOuterAlt(_localctx, 3);
+				{
+				this.state = 189;
+				this.match(painless_parser.CONTINUE);
+				}
+				break;
+
+			case 4:
+				_localctx = new BreakContext(_localctx);
+				this.enterOuterAlt(_localctx, 4);
+				{
+				this.state = 190;
+				this.match(painless_parser.BREAK);
+				}
+				break;
+
+			case 5:
+				_localctx = new ReturnContext(_localctx);
+				this.enterOuterAlt(_localctx, 5);
+				{
+				this.state = 191;
+				this.match(painless_parser.RETURN);
+				this.state = 193;
+				this._errHandler.sync(this);
+				_la = this._input.LA(1);
+				if (((((_la - 5)) & ~0x1F) === 0 && ((1 << (_la - 5)) & ((1 << (painless_parser.LBRACE - 5)) | (1 << (painless_parser.LP - 5)) | (1 << (painless_parser.NEW - 5)) | (1 << (painless_parser.BOOLNOT - 5)) | (1 << (painless_parser.BWNOT - 5)) | (1 << (painless_parser.ADD - 5)) | (1 << (painless_parser.SUB - 5)))) !== 0) || ((((_la - 58)) & ~0x1F) === 0 && ((1 << (_la - 58)) & ((1 << (painless_parser.INCR - 58)) | (1 << (painless_parser.DECR - 58)) | (1 << (painless_parser.OCTAL - 58)) | (1 << (painless_parser.HEX - 58)) | (1 << (painless_parser.INTEGER - 58)) | (1 << (painless_parser.DECIMAL - 58)) | (1 << (painless_parser.STRING - 58)) | (1 << (painless_parser.REGEX - 58)) | (1 << (painless_parser.TRUE - 58)) | (1 << (painless_parser.FALSE - 58)) | (1 << (painless_parser.NULL - 58)) | (1 << (painless_parser.ID - 58)))) !== 0)) {
+					{
+					this.state = 192;
+					this.expression();
+					}
+				}
+
+				}
+				break;
+
+			case 6:
+				_localctx = new ThrowContext(_localctx);
+				this.enterOuterAlt(_localctx, 6);
+				{
+				this.state = 195;
+				this.match(painless_parser.THROW);
+				this.state = 196;
+				this.expression();
+				}
+				break;
+
+			case 7:
+				_localctx = new ExprContext(_localctx);
+				this.enterOuterAlt(_localctx, 7);
+				{
+				this.state = 197;
+				this.expression();
+				}
+				break;
+			}
+		}
+		catch (re) {
+			if (re instanceof RecognitionException) {
+				_localctx.exception = re;
+				this._errHandler.reportError(this, re);
+				this._errHandler.recover(this, re);
+			} else {
+				throw re;
+			}
+		}
+		finally {
+			this.exitRule();
+		}
+		return _localctx;
+	}
+	// @RuleVersion(0)
+	public trailer(): TrailerContext {
+		let _localctx: TrailerContext = new TrailerContext(this._ctx, this.state);
+		this.enterRule(_localctx, 12, painless_parser.RULE_trailer);
+		try {
+			this.state = 202;
+			this._errHandler.sync(this);
+			switch (this._input.LA(1)) {
+			case painless_parser.LBRACK:
+				this.enterOuterAlt(_localctx, 1);
+				{
+				this.state = 200;
+				this.block();
+				}
+				break;
+			case painless_parser.LBRACE:
+			case painless_parser.LP:
+			case painless_parser.IF:
+			case painless_parser.WHILE:
+			case painless_parser.DO:
+			case painless_parser.FOR:
+			case painless_parser.CONTINUE:
+			case painless_parser.BREAK:
+			case painless_parser.RETURN:
+			case painless_parser.NEW:
+			case painless_parser.TRY:
+			case painless_parser.THROW:
+			case painless_parser.BOOLNOT:
+			case painless_parser.BWNOT:
+			case painless_parser.ADD:
+			case painless_parser.SUB:
+			case painless_parser.INCR:
+			case painless_parser.DECR:
+			case painless_parser.OCTAL:
+			case painless_parser.HEX:
+			case painless_parser.INTEGER:
+			case painless_parser.DECIMAL:
+			case painless_parser.STRING:
+			case painless_parser.REGEX:
+			case painless_parser.TRUE:
+			case painless_parser.FALSE:
+			case painless_parser.NULL:
+			case painless_parser.PRIMITIVE:
+			case painless_parser.DEF:
+			case painless_parser.ID:
+				this.enterOuterAlt(_localctx, 2);
+				{
+				this.state = 201;
+				this.statement();
+				}
+				break;
+			default:
+				throw new NoViableAltException(this);
+			}
+		}
+		catch (re) {
+			if (re instanceof RecognitionException) {
+				_localctx.exception = re;
+				this._errHandler.reportError(this, re);
+				this._errHandler.recover(this, re);
+			} else {
+				throw re;
+			}
+		}
+		finally {
+			this.exitRule();
+		}
+		return _localctx;
+	}
+	// @RuleVersion(0)
+	public block(): BlockContext {
+		let _localctx: BlockContext = new BlockContext(this._ctx, this.state);
+		this.enterRule(_localctx, 14, painless_parser.RULE_block);
+		let _la: number;
+		try {
+			let _alt: number;
+			this.enterOuterAlt(_localctx, 1);
+			{
+			this.state = 204;
+			this.match(painless_parser.LBRACK);
+			this.state = 208;
+			this._errHandler.sync(this);
+			_alt = this.interpreter.adaptivePredict(this._input, 16, this._ctx);
+			while (_alt !== 2 && _alt !== ATN.INVALID_ALT_NUMBER) {
+				if (_alt === 1) {
+					{
+					{
+					this.state = 205;
+					this.statement();
+					}
+					}
+				}
+				this.state = 210;
+				this._errHandler.sync(this);
+				_alt = this.interpreter.adaptivePredict(this._input, 16, this._ctx);
+			}
+			this.state = 212;
+			this._errHandler.sync(this);
+			_la = this._input.LA(1);
+			if (((((_la - 5)) & ~0x1F) === 0 && ((1 << (_la - 5)) & ((1 << (painless_parser.LBRACE - 5)) | (1 << (painless_parser.LP - 5)) | (1 << (painless_parser.DO - 5)) | (1 << (painless_parser.CONTINUE - 5)) | (1 << (painless_parser.BREAK - 5)) | (1 << (painless_parser.RETURN - 5)) | (1 << (painless_parser.NEW - 5)) | (1 << (painless_parser.THROW - 5)) | (1 << (painless_parser.BOOLNOT - 5)) | (1 << (painless_parser.BWNOT - 5)) | (1 << (painless_parser.ADD - 5)) | (1 << (painless_parser.SUB - 5)))) !== 0) || ((((_la - 58)) & ~0x1F) === 0 && ((1 << (_la - 58)) & ((1 << (painless_parser.INCR - 58)) | (1 << (painless_parser.DECR - 58)) | (1 << (painless_parser.OCTAL - 58)) | (1 << (painless_parser.HEX - 58)) | (1 << (painless_parser.INTEGER - 58)) | (1 << (painless_parser.DECIMAL - 58)) | (1 << (painless_parser.STRING - 58)) | (1 << (painless_parser.REGEX - 58)) | (1 << (painless_parser.TRUE - 58)) | (1 << (painless_parser.FALSE - 58)) | (1 << (painless_parser.NULL - 58)) | (1 << (painless_parser.PRIMITIVE - 58)) | (1 << (painless_parser.DEF - 58)) | (1 << (painless_parser.ID - 58)))) !== 0)) {
+				{
+				this.state = 211;
+				this.dstatement();
+				}
+			}
+
+			this.state = 214;
+			this.match(painless_parser.RBRACK);
+			}
+		}
+		catch (re) {
+			if (re instanceof RecognitionException) {
+				_localctx.exception = re;
+				this._errHandler.reportError(this, re);
+				this._errHandler.recover(this, re);
+			} else {
+				throw re;
+			}
+		}
+		finally {
+			this.exitRule();
+		}
+		return _localctx;
+	}
+	// @RuleVersion(0)
+	public empty(): EmptyContext {
+		let _localctx: EmptyContext = new EmptyContext(this._ctx, this.state);
+		this.enterRule(_localctx, 16, painless_parser.RULE_empty);
+		try {
+			this.enterOuterAlt(_localctx, 1);
+			{
+			this.state = 216;
+			this.match(painless_parser.SEMICOLON);
+			}
+		}
+		catch (re) {
+			if (re instanceof RecognitionException) {
+				_localctx.exception = re;
+				this._errHandler.reportError(this, re);
+				this._errHandler.recover(this, re);
+			} else {
+				throw re;
+			}
+		}
+		finally {
+			this.exitRule();
+		}
+		return _localctx;
+	}
+	// @RuleVersion(0)
+	public initializer(): InitializerContext {
+		let _localctx: InitializerContext = new InitializerContext(this._ctx, this.state);
+		this.enterRule(_localctx, 18, painless_parser.RULE_initializer);
+		try {
+			this.state = 220;
+			this._errHandler.sync(this);
+			switch ( this.interpreter.adaptivePredict(this._input, 18, this._ctx) ) {
+			case 1:
+				this.enterOuterAlt(_localctx, 1);
+				{
+				this.state = 218;
+				this.declaration();
+				}
+				break;
+
+			case 2:
+				this.enterOuterAlt(_localctx, 2);
+				{
+				this.state = 219;
+				this.expression();
+				}
+				break;
+			}
+		}
+		catch (re) {
+			if (re instanceof RecognitionException) {
+				_localctx.exception = re;
+				this._errHandler.reportError(this, re);
+				this._errHandler.recover(this, re);
+			} else {
+				throw re;
+			}
+		}
+		finally {
+			this.exitRule();
+		}
+		return _localctx;
+	}
+	// @RuleVersion(0)
+	public afterthought(): AfterthoughtContext {
+		let _localctx: AfterthoughtContext = new AfterthoughtContext(this._ctx, this.state);
+		this.enterRule(_localctx, 20, painless_parser.RULE_afterthought);
+		try {
+			this.enterOuterAlt(_localctx, 1);
+			{
+			this.state = 222;
+			this.expression();
+			}
+		}
+		catch (re) {
+			if (re instanceof RecognitionException) {
+				_localctx.exception = re;
+				this._errHandler.reportError(this, re);
+				this._errHandler.recover(this, re);
+			} else {
+				throw re;
+			}
+		}
+		finally {
+			this.exitRule();
+		}
+		return _localctx;
+	}
+	// @RuleVersion(0)
+	public declaration(): DeclarationContext {
+		let _localctx: DeclarationContext = new DeclarationContext(this._ctx, this.state);
+		this.enterRule(_localctx, 22, painless_parser.RULE_declaration);
+		let _la: number;
+		try {
+			this.enterOuterAlt(_localctx, 1);
+			{
+			this.state = 224;
+			this.decltype();
+			this.state = 225;
+			this.declvar();
+			this.state = 230;
+			this._errHandler.sync(this);
+			_la = this._input.LA(1);
+			while (_la === painless_parser.COMMA) {
+				{
+				{
+				this.state = 226;
+				this.match(painless_parser.COMMA);
+				this.state = 227;
+				this.declvar();
+				}
+				}
+				this.state = 232;
+				this._errHandler.sync(this);
+				_la = this._input.LA(1);
+			}
+			}
+		}
+		catch (re) {
+			if (re instanceof RecognitionException) {
+				_localctx.exception = re;
+				this._errHandler.reportError(this, re);
+				this._errHandler.recover(this, re);
+			} else {
+				throw re;
+			}
+		}
+		finally {
+			this.exitRule();
+		}
+		return _localctx;
+	}
+	// @RuleVersion(0)
+	public decltype(): DecltypeContext {
+		let _localctx: DecltypeContext = new DecltypeContext(this._ctx, this.state);
+		this.enterRule(_localctx, 24, painless_parser.RULE_decltype);
+		try {
+			let _alt: number;
+			this.enterOuterAlt(_localctx, 1);
+			{
+			this.state = 233;
+			this.type();
+			this.state = 238;
+			this._errHandler.sync(this);
+			_alt = this.interpreter.adaptivePredict(this._input, 20, this._ctx);
+			while (_alt !== 2 && _alt !== ATN.INVALID_ALT_NUMBER) {
+				if (_alt === 1) {
+					{
+					{
+					this.state = 234;
+					this.match(painless_parser.LBRACE);
+					this.state = 235;
+					this.match(painless_parser.RBRACE);
+					}
+					}
+				}
+				this.state = 240;
+				this._errHandler.sync(this);
+				_alt = this.interpreter.adaptivePredict(this._input, 20, this._ctx);
+			}
+			}
+		}
+		catch (re) {
+			if (re instanceof RecognitionException) {
+				_localctx.exception = re;
+				this._errHandler.reportError(this, re);
+				this._errHandler.recover(this, re);
+			} else {
+				throw re;
+			}
+		}
+		finally {
+			this.exitRule();
+		}
+		return _localctx;
+	}
+	// @RuleVersion(0)
+	public type(): TypeContext {
+		let _localctx: TypeContext = new TypeContext(this._ctx, this.state);
+		this.enterRule(_localctx, 26, painless_parser.RULE_type);
+		try {
+			let _alt: number;
+			this.state = 251;
+			this._errHandler.sync(this);
+			switch (this._input.LA(1)) {
+			case painless_parser.DEF:
+				this.enterOuterAlt(_localctx, 1);
+				{
+				this.state = 241;
+				this.match(painless_parser.DEF);
+				}
+				break;
+			case painless_parser.PRIMITIVE:
+				this.enterOuterAlt(_localctx, 2);
+				{
+				this.state = 242;
+				this.match(painless_parser.PRIMITIVE);
+				}
+				break;
+			case painless_parser.ID:
+				this.enterOuterAlt(_localctx, 3);
+				{
+				this.state = 243;
+				this.match(painless_parser.ID);
+				this.state = 248;
+				this._errHandler.sync(this);
+				_alt = this.interpreter.adaptivePredict(this._input, 21, this._ctx);
+				while (_alt !== 2 && _alt !== ATN.INVALID_ALT_NUMBER) {
+					if (_alt === 1) {
+						{
+						{
+						this.state = 244;
+						this.match(painless_parser.DOT);
+						this.state = 245;
+						this.match(painless_parser.DOTID);
+						}
+						}
+					}
+					this.state = 250;
+					this._errHandler.sync(this);
+					_alt = this.interpreter.adaptivePredict(this._input, 21, this._ctx);
+				}
+				}
+				break;
+			default:
+				throw new NoViableAltException(this);
+			}
+		}
+		catch (re) {
+			if (re instanceof RecognitionException) {
+				_localctx.exception = re;
+				this._errHandler.reportError(this, re);
+				this._errHandler.recover(this, re);
+			} else {
+				throw re;
+			}
+		}
+		finally {
+			this.exitRule();
+		}
+		return _localctx;
+	}
+	// @RuleVersion(0)
+	public declvar(): DeclvarContext {
+		let _localctx: DeclvarContext = new DeclvarContext(this._ctx, this.state);
+		this.enterRule(_localctx, 28, painless_parser.RULE_declvar);
+		let _la: number;
+		try {
+			this.enterOuterAlt(_localctx, 1);
+			{
+			this.state = 253;
+			this.match(painless_parser.ID);
+			this.state = 256;
+			this._errHandler.sync(this);
+			_la = this._input.LA(1);
+			if (_la === painless_parser.ASSIGN) {
+				{
+				this.state = 254;
+				this.match(painless_parser.ASSIGN);
+				this.state = 255;
+				this.expression();
+				}
+			}
+
+			}
+		}
+		catch (re) {
+			if (re instanceof RecognitionException) {
+				_localctx.exception = re;
+				this._errHandler.reportError(this, re);
+				this._errHandler.recover(this, re);
+			} else {
+				throw re;
+			}
+		}
+		finally {
+			this.exitRule();
+		}
+		return _localctx;
+	}
+	// @RuleVersion(0)
+	public trap(): TrapContext {
+		let _localctx: TrapContext = new TrapContext(this._ctx, this.state);
+		this.enterRule(_localctx, 30, painless_parser.RULE_trap);
+		try {
+			this.enterOuterAlt(_localctx, 1);
+			{
+			this.state = 258;
+			this.match(painless_parser.CATCH);
+			this.state = 259;
+			this.match(painless_parser.LP);
+			this.state = 260;
+			this.type();
+			this.state = 261;
+			this.match(painless_parser.ID);
+			this.state = 262;
+			this.match(painless_parser.RP);
+			this.state = 263;
+			this.block();
+			}
+		}
+		catch (re) {
+			if (re instanceof RecognitionException) {
+				_localctx.exception = re;
+				this._errHandler.reportError(this, re);
+				this._errHandler.recover(this, re);
+			} else {
+				throw re;
+			}
+		}
+		finally {
+			this.exitRule();
+		}
+		return _localctx;
+	}
+
+	public noncondexpression(): NoncondexpressionContext;
+	public noncondexpression(_p: number): NoncondexpressionContext;
+	// @RuleVersion(0)
+	public noncondexpression(_p?: number): NoncondexpressionContext {
+		if (_p === undefined) {
+			_p = 0;
+		}
+
+		let _parentctx: ParserRuleContext = this._ctx;
+		let _parentState: number = this.state;
+		let _localctx: NoncondexpressionContext = new NoncondexpressionContext(this._ctx, _parentState);
+		let _prevctx: NoncondexpressionContext = _localctx;
+		let _startState: number = 32;
+		this.enterRecursionRule(_localctx, 32, painless_parser.RULE_noncondexpression, _p);
+		let _la: number;
+		try {
+			let _alt: number;
+			this.enterOuterAlt(_localctx, 1);
+			{
+			{
+			_localctx = new SingleContext(_localctx);
+			this._ctx = _localctx;
+			_prevctx = _localctx;
+
+			this.state = 266;
+			this.unary();
+			}
+			this._ctx._stop = this._input.tryLT(-1);
+			this.state = 309;
+			this._errHandler.sync(this);
+			_alt = this.interpreter.adaptivePredict(this._input, 25, this._ctx);
+			while (_alt !== 2 && _alt !== ATN.INVALID_ALT_NUMBER) {
+				if (_alt === 1) {
+					if (this._parseListeners != null) {
+						this.triggerExitRuleEvent();
+					}
+					_prevctx = _localctx;
+					{
+					this.state = 307;
+					this._errHandler.sync(this);
+					switch ( this.interpreter.adaptivePredict(this._input, 24, this._ctx) ) {
+					case 1:
+						{
+						_localctx = new BinaryContext(new NoncondexpressionContext(_parentctx, _parentState));
+						this.pushNewRecursionContext(_localctx, _startState, painless_parser.RULE_noncondexpression);
+						this.state = 268;
+						if (!(this.precpred(this._ctx, 13))) {
+							throw new FailedPredicateException(this, "this.precpred(this._ctx, 13)");
+						}
+						this.state = 269;
+						_la = this._input.LA(1);
+						if (!(((((_la - 30)) & ~0x1F) === 0 && ((1 << (_la - 30)) & ((1 << (painless_parser.MUL - 30)) | (1 << (painless_parser.DIV - 30)) | (1 << (painless_parser.REM - 30)))) !== 0))) {
+						this._errHandler.recoverInline(this);
+						} else {
+							if (this._input.LA(1) === Token.EOF) {
+								this.matchedEOF = true;
+							}
+
+							this._errHandler.reportMatch(this);
+							this.consume();
+						}
+						this.state = 270;
+						this.noncondexpression(14);
+						}
+						break;
+
+					case 2:
+						{
+						_localctx = new BinaryContext(new NoncondexpressionContext(_parentctx, _parentState));
+						this.pushNewRecursionContext(_localctx, _startState, painless_parser.RULE_noncondexpression);
+						this.state = 271;
+						if (!(this.precpred(this._ctx, 12))) {
+							throw new FailedPredicateException(this, "this.precpred(this._ctx, 12)");
+						}
+						this.state = 272;
+						_la = this._input.LA(1);
+						if (!(_la === painless_parser.ADD || _la === painless_parser.SUB)) {
+						this._errHandler.recoverInline(this);
+						} else {
+							if (this._input.LA(1) === Token.EOF) {
+								this.matchedEOF = true;
+							}
+
+							this._errHandler.reportMatch(this);
+							this.consume();
+						}
+						this.state = 273;
+						this.noncondexpression(13);
+						}
+						break;
+
+					case 3:
+						{
+						_localctx = new BinaryContext(new NoncondexpressionContext(_parentctx, _parentState));
+						this.pushNewRecursionContext(_localctx, _startState, painless_parser.RULE_noncondexpression);
+						this.state = 274;
+						if (!(this.precpred(this._ctx, 11))) {
+							throw new FailedPredicateException(this, "this.precpred(this._ctx, 11)");
+						}
+						this.state = 275;
+						_la = this._input.LA(1);
+						if (!(_la === painless_parser.FIND || _la === painless_parser.MATCH)) {
+						this._errHandler.recoverInline(this);
+						} else {
+							if (this._input.LA(1) === Token.EOF) {
+								this.matchedEOF = true;
+							}
+
+							this._errHandler.reportMatch(this);
+							this.consume();
+						}
+						this.state = 276;
+						this.noncondexpression(12);
+						}
+						break;
+
+					case 4:
+						{
+						_localctx = new BinaryContext(new NoncondexpressionContext(_parentctx, _parentState));
+						this.pushNewRecursionContext(_localctx, _startState, painless_parser.RULE_noncondexpression);
+						this.state = 277;
+						if (!(this.precpred(this._ctx, 10))) {
+							throw new FailedPredicateException(this, "this.precpred(this._ctx, 10)");
+						}
+						this.state = 278;
+						_la = this._input.LA(1);
+						if (!(((((_la - 35)) & ~0x1F) === 0 && ((1 << (_la - 35)) & ((1 << (painless_parser.LSH - 35)) | (1 << (painless_parser.RSH - 35)) | (1 << (painless_parser.USH - 35)))) !== 0))) {
+						this._errHandler.recoverInline(this);
+						} else {
+							if (this._input.LA(1) === Token.EOF) {
+								this.matchedEOF = true;
+							}
+
+							this._errHandler.reportMatch(this);
+							this.consume();
+						}
+						this.state = 279;
+						this.noncondexpression(11);
+						}
+						break;
+
+					case 5:
+						{
+						_localctx = new CompContext(new NoncondexpressionContext(_parentctx, _parentState));
+						this.pushNewRecursionContext(_localctx, _startState, painless_parser.RULE_noncondexpression);
+						this.state = 280;
+						if (!(this.precpred(this._ctx, 9))) {
+							throw new FailedPredicateException(this, "this.precpred(this._ctx, 9)");
+						}
+						this.state = 281;
+						_la = this._input.LA(1);
+						if (!(((((_la - 38)) & ~0x1F) === 0 && ((1 << (_la - 38)) & ((1 << (painless_parser.LT - 38)) | (1 << (painless_parser.LTE - 38)) | (1 << (painless_parser.GT - 38)) | (1 << (painless_parser.GTE - 38)))) !== 0))) {
+						this._errHandler.recoverInline(this);
+						} else {
+							if (this._input.LA(1) === Token.EOF) {
+								this.matchedEOF = true;
+							}
+
+							this._errHandler.reportMatch(this);
+							this.consume();
+						}
+						this.state = 282;
+						this.noncondexpression(10);
+						}
+						break;
+
+					case 6:
+						{
+						_localctx = new CompContext(new NoncondexpressionContext(_parentctx, _parentState));
+						this.pushNewRecursionContext(_localctx, _startState, painless_parser.RULE_noncondexpression);
+						this.state = 283;
+						if (!(this.precpred(this._ctx, 7))) {
+							throw new FailedPredicateException(this, "this.precpred(this._ctx, 7)");
+						}
+						this.state = 284;
+						_la = this._input.LA(1);
+						if (!(((((_la - 42)) & ~0x1F) === 0 && ((1 << (_la - 42)) & ((1 << (painless_parser.EQ - 42)) | (1 << (painless_parser.EQR - 42)) | (1 << (painless_parser.NE - 42)) | (1 << (painless_parser.NER - 42)))) !== 0))) {
+						this._errHandler.recoverInline(this);
+						} else {
+							if (this._input.LA(1) === Token.EOF) {
+								this.matchedEOF = true;
+							}
+
+							this._errHandler.reportMatch(this);
+							this.consume();
+						}
+						this.state = 285;
+						this.noncondexpression(8);
+						}
+						break;
+
+					case 7:
+						{
+						_localctx = new BinaryContext(new NoncondexpressionContext(_parentctx, _parentState));
+						this.pushNewRecursionContext(_localctx, _startState, painless_parser.RULE_noncondexpression);
+						this.state = 286;
+						if (!(this.precpred(this._ctx, 6))) {
+							throw new FailedPredicateException(this, "this.precpred(this._ctx, 6)");
+						}
+						this.state = 287;
+						this.match(painless_parser.BWAND);
+						this.state = 288;
+						this.noncondexpression(7);
+						}
+						break;
+
+					case 8:
+						{
+						_localctx = new BinaryContext(new NoncondexpressionContext(_parentctx, _parentState));
+						this.pushNewRecursionContext(_localctx, _startState, painless_parser.RULE_noncondexpression);
+						this.state = 289;
+						if (!(this.precpred(this._ctx, 5))) {
+							throw new FailedPredicateException(this, "this.precpred(this._ctx, 5)");
+						}
+						this.state = 290;
+						this.match(painless_parser.XOR);
+						this.state = 291;
+						this.noncondexpression(6);
+						}
+						break;
+
+					case 9:
+						{
+						_localctx = new BinaryContext(new NoncondexpressionContext(_parentctx, _parentState));
+						this.pushNewRecursionContext(_localctx, _startState, painless_parser.RULE_noncondexpression);
+						this.state = 292;
+						if (!(this.precpred(this._ctx, 4))) {
+							throw new FailedPredicateException(this, "this.precpred(this._ctx, 4)");
+						}
+						this.state = 293;
+						this.match(painless_parser.BWOR);
+						this.state = 294;
+						this.noncondexpression(5);
+						}
+						break;
+
+					case 10:
+						{
+						_localctx = new BoolContext(new NoncondexpressionContext(_parentctx, _parentState));
+						this.pushNewRecursionContext(_localctx, _startState, painless_parser.RULE_noncondexpression);
+						this.state = 295;
+						if (!(this.precpred(this._ctx, 3))) {
+							throw new FailedPredicateException(this, "this.precpred(this._ctx, 3)");
+						}
+						this.state = 296;
+						this.match(painless_parser.BOOLAND);
+						this.state = 297;
+						this.noncondexpression(4);
+						}
+						break;
+
+					case 11:
+						{
+						_localctx = new BoolContext(new NoncondexpressionContext(_parentctx, _parentState));
+						this.pushNewRecursionContext(_localctx, _startState, painless_parser.RULE_noncondexpression);
+						this.state = 298;
+						if (!(this.precpred(this._ctx, 2))) {
+							throw new FailedPredicateException(this, "this.precpred(this._ctx, 2)");
+						}
+						this.state = 299;
+						this.match(painless_parser.BOOLOR);
+						this.state = 300;
+						this.noncondexpression(3);
+						}
+						break;
+
+					case 12:
+						{
+						_localctx = new ElvisContext(new NoncondexpressionContext(_parentctx, _parentState));
+						this.pushNewRecursionContext(_localctx, _startState, painless_parser.RULE_noncondexpression);
+						this.state = 301;
+						if (!(this.precpred(this._ctx, 1))) {
+							throw new FailedPredicateException(this, "this.precpred(this._ctx, 1)");
+						}
+						this.state = 302;
+						this.match(painless_parser.ELVIS);
+						this.state = 303;
+						this.noncondexpression(1);
+						}
+						break;
+
+					case 13:
+						{
+						_localctx = new InstanceofContext(new NoncondexpressionContext(_parentctx, _parentState));
+						this.pushNewRecursionContext(_localctx, _startState, painless_parser.RULE_noncondexpression);
+						this.state = 304;
+						if (!(this.precpred(this._ctx, 8))) {
+							throw new FailedPredicateException(this, "this.precpred(this._ctx, 8)");
+						}
+						this.state = 305;
+						this.match(painless_parser.INSTANCEOF);
+						this.state = 306;
+						this.decltype();
+						}
+						break;
+					}
+					}
+				}
+				this.state = 311;
+				this._errHandler.sync(this);
+				_alt = this.interpreter.adaptivePredict(this._input, 25, this._ctx);
+			}
+			}
+		}
+		catch (re) {
+			if (re instanceof RecognitionException) {
+				_localctx.exception = re;
+				this._errHandler.reportError(this, re);
+				this._errHandler.recover(this, re);
+			} else {
+				throw re;
+			}
+		}
+		finally {
+			this.unrollRecursionContexts(_parentctx);
+		}
+		return _localctx;
+	}
+	// @RuleVersion(0)
+	public expression(): ExpressionContext {
+		let _localctx: ExpressionContext = new ExpressionContext(this._ctx, this.state);
+		this.enterRule(_localctx, 34, painless_parser.RULE_expression);
+		let _la: number;
+		try {
+			this.state = 323;
+			this._errHandler.sync(this);
+			switch ( this.interpreter.adaptivePredict(this._input, 26, this._ctx) ) {
+			case 1:
+				_localctx = new NonconditionalContext(_localctx);
+				this.enterOuterAlt(_localctx, 1);
+				{
+				this.state = 312;
+				this.noncondexpression(0);
+				}
+				break;
+
+			case 2:
+				_localctx = new ConditionalContext(_localctx);
+				this.enterOuterAlt(_localctx, 2);
+				{
+				this.state = 313;
+				this.noncondexpression(0);
+				this.state = 314;
+				this.match(painless_parser.COND);
+				this.state = 315;
+				this.expression();
+				this.state = 316;
+				this.match(painless_parser.COLON);
+				this.state = 317;
+				this.expression();
+				}
+				break;
+
+			case 3:
+				_localctx = new AssignmentContext(_localctx);
+				this.enterOuterAlt(_localctx, 3);
+				{
+				this.state = 319;
+				this.noncondexpression(0);
+				this.state = 320;
+				_la = this._input.LA(1);
+				if (!(((((_la - 60)) & ~0x1F) === 0 && ((1 << (_la - 60)) & ((1 << (painless_parser.ASSIGN - 60)) | (1 << (painless_parser.AADD - 60)) | (1 << (painless_parser.ASUB - 60)) | (1 << (painless_parser.AMUL - 60)) | (1 << (painless_parser.ADIV - 60)) | (1 << (painless_parser.AREM - 60)) | (1 << (painless_parser.AAND - 60)) | (1 << (painless_parser.AXOR - 60)) | (1 << (painless_parser.AOR - 60)) | (1 << (painless_parser.ALSH - 60)) | (1 << (painless_parser.ARSH - 60)) | (1 << (painless_parser.AUSH - 60)))) !== 0))) {
+				this._errHandler.recoverInline(this);
+				} else {
+					if (this._input.LA(1) === Token.EOF) {
+						this.matchedEOF = true;
+					}
+
+					this._errHandler.reportMatch(this);
+					this.consume();
+				}
+				this.state = 321;
+				this.expression();
+				}
+				break;
+			}
+		}
+		catch (re) {
+			if (re instanceof RecognitionException) {
+				_localctx.exception = re;
+				this._errHandler.reportError(this, re);
+				this._errHandler.recover(this, re);
+			} else {
+				throw re;
+			}
+		}
+		finally {
+			this.exitRule();
+		}
+		return _localctx;
+	}
+	// @RuleVersion(0)
+	public unary(): UnaryContext {
+		let _localctx: UnaryContext = new UnaryContext(this._ctx, this.state);
+		this.enterRule(_localctx, 36, painless_parser.RULE_unary);
+		let _la: number;
+		try {
+			this.state = 330;
+			this._errHandler.sync(this);
+			switch (this._input.LA(1)) {
+			case painless_parser.INCR:
+			case painless_parser.DECR:
+				_localctx = new PreContext(_localctx);
+				this.enterOuterAlt(_localctx, 1);
+				{
+				this.state = 325;
+				_la = this._input.LA(1);
+				if (!(_la === painless_parser.INCR || _la === painless_parser.DECR)) {
+				this._errHandler.recoverInline(this);
+				} else {
+					if (this._input.LA(1) === Token.EOF) {
+						this.matchedEOF = true;
+					}
+
+					this._errHandler.reportMatch(this);
+					this.consume();
+				}
+				this.state = 326;
+				this.chain();
+				}
+				break;
+			case painless_parser.ADD:
+			case painless_parser.SUB:
+				_localctx = new AddsubContext(_localctx);
+				this.enterOuterAlt(_localctx, 2);
+				{
+				this.state = 327;
+				_la = this._input.LA(1);
+				if (!(_la === painless_parser.ADD || _la === painless_parser.SUB)) {
+				this._errHandler.recoverInline(this);
+				} else {
+					if (this._input.LA(1) === Token.EOF) {
+						this.matchedEOF = true;
+					}
+
+					this._errHandler.reportMatch(this);
+					this.consume();
+				}
+				this.state = 328;
+				this.unary();
+				}
+				break;
+			case painless_parser.LBRACE:
+			case painless_parser.LP:
+			case painless_parser.NEW:
+			case painless_parser.BOOLNOT:
+			case painless_parser.BWNOT:
+			case painless_parser.OCTAL:
+			case painless_parser.HEX:
+			case painless_parser.INTEGER:
+			case painless_parser.DECIMAL:
+			case painless_parser.STRING:
+			case painless_parser.REGEX:
+			case painless_parser.TRUE:
+			case painless_parser.FALSE:
+			case painless_parser.NULL:
+			case painless_parser.ID:
+				_localctx = new NotaddsubContext(_localctx);
+				this.enterOuterAlt(_localctx, 3);
+				{
+				this.state = 329;
+				this.unarynotaddsub();
+				}
+				break;
+			default:
+				throw new NoViableAltException(this);
+			}
+		}
+		catch (re) {
+			if (re instanceof RecognitionException) {
+				_localctx.exception = re;
+				this._errHandler.reportError(this, re);
+				this._errHandler.recover(this, re);
+			} else {
+				throw re;
+			}
+		}
+		finally {
+			this.exitRule();
+		}
+		return _localctx;
+	}
+	// @RuleVersion(0)
+	public unarynotaddsub(): UnarynotaddsubContext {
+		let _localctx: UnarynotaddsubContext = new UnarynotaddsubContext(this._ctx, this.state);
+		this.enterRule(_localctx, 38, painless_parser.RULE_unarynotaddsub);
+		let _la: number;
+		try {
+			this.state = 339;
+			this._errHandler.sync(this);
+			switch ( this.interpreter.adaptivePredict(this._input, 28, this._ctx) ) {
+			case 1:
+				_localctx = new ReadContext(_localctx);
+				this.enterOuterAlt(_localctx, 1);
+				{
+				this.state = 332;
+				this.chain();
+				}
+				break;
+
+			case 2:
+				_localctx = new PostContext(_localctx);
+				this.enterOuterAlt(_localctx, 2);
+				{
+				this.state = 333;
+				this.chain();
+				this.state = 334;
+				_la = this._input.LA(1);
+				if (!(_la === painless_parser.INCR || _la === painless_parser.DECR)) {
+				this._errHandler.recoverInline(this);
+				} else {
+					if (this._input.LA(1) === Token.EOF) {
+						this.matchedEOF = true;
+					}
+
+					this._errHandler.reportMatch(this);
+					this.consume();
+				}
+				}
+				break;
+
+			case 3:
+				_localctx = new NotContext(_localctx);
+				this.enterOuterAlt(_localctx, 3);
+				{
+				this.state = 336;
+				_la = this._input.LA(1);
+				if (!(_la === painless_parser.BOOLNOT || _la === painless_parser.BWNOT)) {
+				this._errHandler.recoverInline(this);
+				} else {
+					if (this._input.LA(1) === Token.EOF) {
+						this.matchedEOF = true;
+					}
+
+					this._errHandler.reportMatch(this);
+					this.consume();
+				}
+				this.state = 337;
+				this.unary();
+				}
+				break;
+
+			case 4:
+				_localctx = new CastContext(_localctx);
+				this.enterOuterAlt(_localctx, 4);
+				{
+				this.state = 338;
+				this.castexpression();
+				}
+				break;
+			}
+		}
+		catch (re) {
+			if (re instanceof RecognitionException) {
+				_localctx.exception = re;
+				this._errHandler.reportError(this, re);
+				this._errHandler.recover(this, re);
+			} else {
+				throw re;
+			}
+		}
+		finally {
+			this.exitRule();
+		}
+		return _localctx;
+	}
+	// @RuleVersion(0)
+	public castexpression(): CastexpressionContext {
+		let _localctx: CastexpressionContext = new CastexpressionContext(this._ctx, this.state);
+		this.enterRule(_localctx, 40, painless_parser.RULE_castexpression);
+		try {
+			this.state = 351;
+			this._errHandler.sync(this);
+			switch ( this.interpreter.adaptivePredict(this._input, 29, this._ctx) ) {
+			case 1:
+				_localctx = new PrimordefcastContext(_localctx);
+				this.enterOuterAlt(_localctx, 1);
+				{
+				this.state = 341;
+				this.match(painless_parser.LP);
+				this.state = 342;
+				this.primordefcasttype();
+				this.state = 343;
+				this.match(painless_parser.RP);
+				this.state = 344;
+				this.unary();
+				}
+				break;
+
+			case 2:
+				_localctx = new RefcastContext(_localctx);
+				this.enterOuterAlt(_localctx, 2);
+				{
+				this.state = 346;
+				this.match(painless_parser.LP);
+				this.state = 347;
+				this.refcasttype();
+				this.state = 348;
+				this.match(painless_parser.RP);
+				this.state = 349;
+				this.unarynotaddsub();
+				}
+				break;
+			}
+		}
+		catch (re) {
+			if (re instanceof RecognitionException) {
+				_localctx.exception = re;
+				this._errHandler.reportError(this, re);
+				this._errHandler.recover(this, re);
+			} else {
+				throw re;
+			}
+		}
+		finally {
+			this.exitRule();
+		}
+		return _localctx;
+	}
+	// @RuleVersion(0)
+	public primordefcasttype(): PrimordefcasttypeContext {
+		let _localctx: PrimordefcasttypeContext = new PrimordefcasttypeContext(this._ctx, this.state);
+		this.enterRule(_localctx, 42, painless_parser.RULE_primordefcasttype);
+		let _la: number;
+		try {
+			this.enterOuterAlt(_localctx, 1);
+			{
+			this.state = 353;
+			_la = this._input.LA(1);
+			if (!(_la === painless_parser.PRIMITIVE || _la === painless_parser.DEF)) {
+			this._errHandler.recoverInline(this);
+			} else {
+				if (this._input.LA(1) === Token.EOF) {
+					this.matchedEOF = true;
+				}
+
+				this._errHandler.reportMatch(this);
+				this.consume();
+			}
+			}
+		}
+		catch (re) {
+			if (re instanceof RecognitionException) {
+				_localctx.exception = re;
+				this._errHandler.reportError(this, re);
+				this._errHandler.recover(this, re);
+			} else {
+				throw re;
+			}
+		}
+		finally {
+			this.exitRule();
+		}
+		return _localctx;
+	}
+	// @RuleVersion(0)
+	public refcasttype(): RefcasttypeContext {
+		let _localctx: RefcasttypeContext = new RefcasttypeContext(this._ctx, this.state);
+		this.enterRule(_localctx, 44, painless_parser.RULE_refcasttype);
+		let _la: number;
+		try {
+			this.state = 384;
+			this._errHandler.sync(this);
+			switch (this._input.LA(1)) {
+			case painless_parser.DEF:
+				this.enterOuterAlt(_localctx, 1);
+				{
+				this.state = 355;
+				this.match(painless_parser.DEF);
+				this.state = 358;
+				this._errHandler.sync(this);
+				_la = this._input.LA(1);
+				do {
+					{
+					{
+					this.state = 356;
+					this.match(painless_parser.LBRACE);
+					this.state = 357;
+					this.match(painless_parser.RBRACE);
+					}
+					}
+					this.state = 360;
+					this._errHandler.sync(this);
+					_la = this._input.LA(1);
+				} while (_la === painless_parser.LBRACE);
+				}
+				break;
+			case painless_parser.PRIMITIVE:
+				this.enterOuterAlt(_localctx, 2);
+				{
+				this.state = 362;
+				this.match(painless_parser.PRIMITIVE);
+				this.state = 365;
+				this._errHandler.sync(this);
+				_la = this._input.LA(1);
+				do {
+					{
+					{
+					this.state = 363;
+					this.match(painless_parser.LBRACE);
+					this.state = 364;
+					this.match(painless_parser.RBRACE);
+					}
+					}
+					this.state = 367;
+					this._errHandler.sync(this);
+					_la = this._input.LA(1);
+				} while (_la === painless_parser.LBRACE);
+				}
+				break;
+			case painless_parser.ID:
+				this.enterOuterAlt(_localctx, 3);
+				{
+				this.state = 369;
+				this.match(painless_parser.ID);
+				this.state = 374;
+				this._errHandler.sync(this);
+				_la = this._input.LA(1);
+				while (_la === painless_parser.DOT) {
+					{
+					{
+					this.state = 370;
+					this.match(painless_parser.DOT);
+					this.state = 371;
+					this.match(painless_parser.DOTID);
+					}
+					}
+					this.state = 376;
+					this._errHandler.sync(this);
+					_la = this._input.LA(1);
+				}
+				this.state = 381;
+				this._errHandler.sync(this);
+				_la = this._input.LA(1);
+				while (_la === painless_parser.LBRACE) {
+					{
+					{
+					this.state = 377;
+					this.match(painless_parser.LBRACE);
+					this.state = 378;
+					this.match(painless_parser.RBRACE);
+					}
+					}
+					this.state = 383;
+					this._errHandler.sync(this);
+					_la = this._input.LA(1);
+				}
+				}
+				break;
+			default:
+				throw new NoViableAltException(this);
+			}
+		}
+		catch (re) {
+			if (re instanceof RecognitionException) {
+				_localctx.exception = re;
+				this._errHandler.reportError(this, re);
+				this._errHandler.recover(this, re);
+			} else {
+				throw re;
+			}
+		}
+		finally {
+			this.exitRule();
+		}
+		return _localctx;
+	}
+	// @RuleVersion(0)
+	public chain(): ChainContext {
+		let _localctx: ChainContext = new ChainContext(this._ctx, this.state);
+		this.enterRule(_localctx, 46, painless_parser.RULE_chain);
+		try {
+			let _alt: number;
+			this.state = 394;
+			this._errHandler.sync(this);
+			switch ( this.interpreter.adaptivePredict(this._input, 36, this._ctx) ) {
+			case 1:
+				_localctx = new DynamicContext(_localctx);
+				this.enterOuterAlt(_localctx, 1);
+				{
+				this.state = 386;
+				this.primary();
+				this.state = 390;
+				this._errHandler.sync(this);
+				_alt = this.interpreter.adaptivePredict(this._input, 35, this._ctx);
+				while (_alt !== 2 && _alt !== ATN.INVALID_ALT_NUMBER) {
+					if (_alt === 1) {
+						{
+						{
+						this.state = 387;
+						this.postfix();
+						}
+						}
+					}
+					this.state = 392;
+					this._errHandler.sync(this);
+					_alt = this.interpreter.adaptivePredict(this._input, 35, this._ctx);
+				}
+				}
+				break;
+
+			case 2:
+				_localctx = new NewarrayContext(_localctx);
+				this.enterOuterAlt(_localctx, 2);
+				{
+				this.state = 393;
+				this.arrayinitializer();
+				}
+				break;
+			}
+		}
+		catch (re) {
+			if (re instanceof RecognitionException) {
+				_localctx.exception = re;
+				this._errHandler.reportError(this, re);
+				this._errHandler.recover(this, re);
+			} else {
+				throw re;
+			}
+		}
+		finally {
+			this.exitRule();
+		}
+		return _localctx;
+	}
+	// @RuleVersion(0)
+	public primary(): PrimaryContext {
+		let _localctx: PrimaryContext = new PrimaryContext(this._ctx, this.state);
+		this.enterRule(_localctx, 48, painless_parser.RULE_primary);
+		let _la: number;
+		try {
+			this.state = 415;
+			this._errHandler.sync(this);
+			switch ( this.interpreter.adaptivePredict(this._input, 37, this._ctx) ) {
+			case 1:
+				_localctx = new PrecedenceContext(_localctx);
+				this.enterOuterAlt(_localctx, 1);
+				{
+				this.state = 396;
+				this.match(painless_parser.LP);
+				this.state = 397;
+				this.expression();
+				this.state = 398;
+				this.match(painless_parser.RP);
+				}
+				break;
+
+			case 2:
+				_localctx = new NumericContext(_localctx);
+				this.enterOuterAlt(_localctx, 2);
+				{
+				this.state = 400;
+				_la = this._input.LA(1);
+				if (!(((((_la - 72)) & ~0x1F) === 0 && ((1 << (_la - 72)) & ((1 << (painless_parser.OCTAL - 72)) | (1 << (painless_parser.HEX - 72)) | (1 << (painless_parser.INTEGER - 72)) | (1 << (painless_parser.DECIMAL - 72)))) !== 0))) {
+				this._errHandler.recoverInline(this);
+				} else {
+					if (this._input.LA(1) === Token.EOF) {
+						this.matchedEOF = true;
+					}
+
+					this._errHandler.reportMatch(this);
+					this.consume();
+				}
+				}
+				break;
+
+			case 3:
+				_localctx = new TrueContext(_localctx);
+				this.enterOuterAlt(_localctx, 3);
+				{
+				this.state = 401;
+				this.match(painless_parser.TRUE);
+				}
+				break;
+
+			case 4:
+				_localctx = new FalseContext(_localctx);
+				this.enterOuterAlt(_localctx, 4);
+				{
+				this.state = 402;
+				this.match(painless_parser.FALSE);
+				}
+				break;
+
+			case 5:
+				_localctx = new NullContext(_localctx);
+				this.enterOuterAlt(_localctx, 5);
+				{
+				this.state = 403;
+				this.match(painless_parser.NULL);
+				}
+				break;
+
+			case 6:
+				_localctx = new StringContext(_localctx);
+				this.enterOuterAlt(_localctx, 6);
+				{
+				this.state = 404;
+				this.match(painless_parser.STRING);
+				}
+				break;
+
+			case 7:
+				_localctx = new RegexContext(_localctx);
+				this.enterOuterAlt(_localctx, 7);
+				{
+				this.state = 405;
+				this.match(painless_parser.REGEX);
+				}
+				break;
+
+			case 8:
+				_localctx = new ListinitContext(_localctx);
+				this.enterOuterAlt(_localctx, 8);
+				{
+				this.state = 406;
+				this.listinitializer();
+				}
+				break;
+
+			case 9:
+				_localctx = new MapinitContext(_localctx);
+				this.enterOuterAlt(_localctx, 9);
+				{
+				this.state = 407;
+				this.mapinitializer();
+				}
+				break;
+
+			case 10:
+				_localctx = new VariableContext(_localctx);
+				this.enterOuterAlt(_localctx, 10);
+				{
+				this.state = 408;
+				this.match(painless_parser.ID);
+				}
+				break;
+
+			case 11:
+				_localctx = new CalllocalContext(_localctx);
+				this.enterOuterAlt(_localctx, 11);
+				{
+				this.state = 409;
+				this.match(painless_parser.ID);
+				this.state = 410;
+				this.arguments();
+				}
+				break;
+
+			case 12:
+				_localctx = new NewobjectContext(_localctx);
+				this.enterOuterAlt(_localctx, 12);
+				{
+				this.state = 411;
+				this.match(painless_parser.NEW);
+				this.state = 412;
+				this.type();
+				this.state = 413;
+				this.arguments();
+				}
+				break;
+			}
+		}
+		catch (re) {
+			if (re instanceof RecognitionException) {
+				_localctx.exception = re;
+				this._errHandler.reportError(this, re);
+				this._errHandler.recover(this, re);
+			} else {
+				throw re;
+			}
+		}
+		finally {
+			this.exitRule();
+		}
+		return _localctx;
+	}
+	// @RuleVersion(0)
+	public postfix(): PostfixContext {
+		let _localctx: PostfixContext = new PostfixContext(this._ctx, this.state);
+		this.enterRule(_localctx, 50, painless_parser.RULE_postfix);
+		try {
+			this.state = 420;
+			this._errHandler.sync(this);
+			switch ( this.interpreter.adaptivePredict(this._input, 38, this._ctx) ) {
+			case 1:
+				this.enterOuterAlt(_localctx, 1);
+				{
+				this.state = 417;
+				this.callinvoke();
+				}
+				break;
+
+			case 2:
+				this.enterOuterAlt(_localctx, 2);
+				{
+				this.state = 418;
+				this.fieldaccess();
+				}
+				break;
+
+			case 3:
+				this.enterOuterAlt(_localctx, 3);
+				{
+				this.state = 419;
+				this.braceaccess();
+				}
+				break;
+			}
+		}
+		catch (re) {
+			if (re instanceof RecognitionException) {
+				_localctx.exception = re;
+				this._errHandler.reportError(this, re);
+				this._errHandler.recover(this, re);
+			} else {
+				throw re;
+			}
+		}
+		finally {
+			this.exitRule();
+		}
+		return _localctx;
+	}
+	// @RuleVersion(0)
+	public postdot(): PostdotContext {
+		let _localctx: PostdotContext = new PostdotContext(this._ctx, this.state);
+		this.enterRule(_localctx, 52, painless_parser.RULE_postdot);
+		try {
+			this.state = 424;
+			this._errHandler.sync(this);
+			switch ( this.interpreter.adaptivePredict(this._input, 39, this._ctx) ) {
+			case 1:
+				this.enterOuterAlt(_localctx, 1);
+				{
+				this.state = 422;
+				this.callinvoke();
+				}
+				break;
+
+			case 2:
+				this.enterOuterAlt(_localctx, 2);
+				{
+				this.state = 423;
+				this.fieldaccess();
+				}
+				break;
+			}
+		}
+		catch (re) {
+			if (re instanceof RecognitionException) {
+				_localctx.exception = re;
+				this._errHandler.reportError(this, re);
+				this._errHandler.recover(this, re);
+			} else {
+				throw re;
+			}
+		}
+		finally {
+			this.exitRule();
+		}
+		return _localctx;
+	}
+	// @RuleVersion(0)
+	public callinvoke(): CallinvokeContext {
+		let _localctx: CallinvokeContext = new CallinvokeContext(this._ctx, this.state);
+		this.enterRule(_localctx, 54, painless_parser.RULE_callinvoke);
+		let _la: number;
+		try {
+			this.enterOuterAlt(_localctx, 1);
+			{
+			this.state = 426;
+			_la = this._input.LA(1);
+			if (!(_la === painless_parser.DOT || _la === painless_parser.NSDOT)) {
+			this._errHandler.recoverInline(this);
+			} else {
+				if (this._input.LA(1) === Token.EOF) {
+					this.matchedEOF = true;
+				}
+
+				this._errHandler.reportMatch(this);
+				this.consume();
+			}
+			this.state = 427;
+			this.match(painless_parser.DOTID);
+			this.state = 428;
+			this.arguments();
+			}
+		}
+		catch (re) {
+			if (re instanceof RecognitionException) {
+				_localctx.exception = re;
+				this._errHandler.reportError(this, re);
+				this._errHandler.recover(this, re);
+			} else {
+				throw re;
+			}
+		}
+		finally {
+			this.exitRule();
+		}
+		return _localctx;
+	}
+	// @RuleVersion(0)
+	public fieldaccess(): FieldaccessContext {
+		let _localctx: FieldaccessContext = new FieldaccessContext(this._ctx, this.state);
+		this.enterRule(_localctx, 56, painless_parser.RULE_fieldaccess);
+		let _la: number;
+		try {
+			this.enterOuterAlt(_localctx, 1);
+			{
+			this.state = 430;
+			_la = this._input.LA(1);
+			if (!(_la === painless_parser.DOT || _la === painless_parser.NSDOT)) {
+			this._errHandler.recoverInline(this);
+			} else {
+				if (this._input.LA(1) === Token.EOF) {
+					this.matchedEOF = true;
+				}
+
+				this._errHandler.reportMatch(this);
+				this.consume();
+			}
+			this.state = 431;
+			_la = this._input.LA(1);
+			if (!(_la === painless_parser.DOTINTEGER || _la === painless_parser.DOTID)) {
+			this._errHandler.recoverInline(this);
+			} else {
+				if (this._input.LA(1) === Token.EOF) {
+					this.matchedEOF = true;
+				}
+
+				this._errHandler.reportMatch(this);
+				this.consume();
+			}
+			}
+		}
+		catch (re) {
+			if (re instanceof RecognitionException) {
+				_localctx.exception = re;
+				this._errHandler.reportError(this, re);
+				this._errHandler.recover(this, re);
+			} else {
+				throw re;
+			}
+		}
+		finally {
+			this.exitRule();
+		}
+		return _localctx;
+	}
+	// @RuleVersion(0)
+	public braceaccess(): BraceaccessContext {
+		let _localctx: BraceaccessContext = new BraceaccessContext(this._ctx, this.state);
+		this.enterRule(_localctx, 58, painless_parser.RULE_braceaccess);
+		try {
+			this.enterOuterAlt(_localctx, 1);
+			{
+			this.state = 433;
+			this.match(painless_parser.LBRACE);
+			this.state = 434;
+			this.expression();
+			this.state = 435;
+			this.match(painless_parser.RBRACE);
+			}
+		}
+		catch (re) {
+			if (re instanceof RecognitionException) {
+				_localctx.exception = re;
+				this._errHandler.reportError(this, re);
+				this._errHandler.recover(this, re);
+			} else {
+				throw re;
+			}
+		}
+		finally {
+			this.exitRule();
+		}
+		return _localctx;
+	}
+	// @RuleVersion(0)
+	public arrayinitializer(): ArrayinitializerContext {
+		let _localctx: ArrayinitializerContext = new ArrayinitializerContext(this._ctx, this.state);
+		this.enterRule(_localctx, 60, painless_parser.RULE_arrayinitializer);
+		let _la: number;
+		try {
+			let _alt: number;
+			this.state = 478;
+			this._errHandler.sync(this);
+			switch ( this.interpreter.adaptivePredict(this._input, 46, this._ctx) ) {
+			case 1:
+				_localctx = new NewstandardarrayContext(_localctx);
+				this.enterOuterAlt(_localctx, 1);
+				{
+				this.state = 437;
+				this.match(painless_parser.NEW);
+				this.state = 438;
+				this.type();
+				this.state = 443;
+				this._errHandler.sync(this);
+				_alt = 1;
+				do {
+					switch (_alt) {
+					case 1:
+						{
+						{
+						this.state = 439;
+						this.match(painless_parser.LBRACE);
+						this.state = 440;
+						this.expression();
+						this.state = 441;
+						this.match(painless_parser.RBRACE);
+						}
+						}
+						break;
+					default:
+						throw new NoViableAltException(this);
+					}
+					this.state = 445;
+					this._errHandler.sync(this);
+					_alt = this.interpreter.adaptivePredict(this._input, 40, this._ctx);
+				} while (_alt !== 2 && _alt !== ATN.INVALID_ALT_NUMBER);
+				this.state = 454;
+				this._errHandler.sync(this);
+				switch ( this.interpreter.adaptivePredict(this._input, 42, this._ctx) ) {
+				case 1:
+					{
+					this.state = 447;
+					this.postdot();
+					this.state = 451;
+					this._errHandler.sync(this);
+					_alt = this.interpreter.adaptivePredict(this._input, 41, this._ctx);
+					while (_alt !== 2 && _alt !== ATN.INVALID_ALT_NUMBER) {
+						if (_alt === 1) {
+							{
+							{
+							this.state = 448;
+							this.postfix();
+							}
+							}
+						}
+						this.state = 453;
+						this._errHandler.sync(this);
+						_alt = this.interpreter.adaptivePredict(this._input, 41, this._ctx);
+					}
+					}
+					break;
+				}
+				}
+				break;
+
+			case 2:
+				_localctx = new NewinitializedarrayContext(_localctx);
+				this.enterOuterAlt(_localctx, 2);
+				{
+				this.state = 456;
+				this.match(painless_parser.NEW);
+				this.state = 457;
+				this.type();
+				this.state = 458;
+				this.match(painless_parser.LBRACE);
+				this.state = 459;
+				this.match(painless_parser.RBRACE);
+				this.state = 460;
+				this.match(painless_parser.LBRACK);
+				this.state = 469;
+				this._errHandler.sync(this);
+				_la = this._input.LA(1);
+				if (((((_la - 5)) & ~0x1F) === 0 && ((1 << (_la - 5)) & ((1 << (painless_parser.LBRACE - 5)) | (1 << (painless_parser.LP - 5)) | (1 << (painless_parser.NEW - 5)) | (1 << (painless_parser.BOOLNOT - 5)) | (1 << (painless_parser.BWNOT - 5)) | (1 << (painless_parser.ADD - 5)) | (1 << (painless_parser.SUB - 5)))) !== 0) || ((((_la - 58)) & ~0x1F) === 0 && ((1 << (_la - 58)) & ((1 << (painless_parser.INCR - 58)) | (1 << (painless_parser.DECR - 58)) | (1 << (painless_parser.OCTAL - 58)) | (1 << (painless_parser.HEX - 58)) | (1 << (painless_parser.INTEGER - 58)) | (1 << (painless_parser.DECIMAL - 58)) | (1 << (painless_parser.STRING - 58)) | (1 << (painless_parser.REGEX - 58)) | (1 << (painless_parser.TRUE - 58)) | (1 << (painless_parser.FALSE - 58)) | (1 << (painless_parser.NULL - 58)) | (1 << (painless_parser.ID - 58)))) !== 0)) {
+					{
+					this.state = 461;
+					this.expression();
+					this.state = 466;
+					this._errHandler.sync(this);
+					_la = this._input.LA(1);
+					while (_la === painless_parser.COMMA) {
+						{
+						{
+						this.state = 462;
+						this.match(painless_parser.COMMA);
+						this.state = 463;
+						this.expression();
+						}
+						}
+						this.state = 468;
+						this._errHandler.sync(this);
+						_la = this._input.LA(1);
+					}
+					}
+				}
+
+				this.state = 471;
+				this.match(painless_parser.RBRACK);
+				this.state = 475;
+				this._errHandler.sync(this);
+				_alt = this.interpreter.adaptivePredict(this._input, 45, this._ctx);
+				while (_alt !== 2 && _alt !== ATN.INVALID_ALT_NUMBER) {
+					if (_alt === 1) {
+						{
+						{
+						this.state = 472;
+						this.postfix();
+						}
+						}
+					}
+					this.state = 477;
+					this._errHandler.sync(this);
+					_alt = this.interpreter.adaptivePredict(this._input, 45, this._ctx);
+				}
+				}
+				break;
+			}
+		}
+		catch (re) {
+			if (re instanceof RecognitionException) {
+				_localctx.exception = re;
+				this._errHandler.reportError(this, re);
+				this._errHandler.recover(this, re);
+			} else {
+				throw re;
+			}
+		}
+		finally {
+			this.exitRule();
+		}
+		return _localctx;
+	}
+	// @RuleVersion(0)
+	public listinitializer(): ListinitializerContext {
+		let _localctx: ListinitializerContext = new ListinitializerContext(this._ctx, this.state);
+		this.enterRule(_localctx, 62, painless_parser.RULE_listinitializer);
+		let _la: number;
+		try {
+			this.state = 493;
+			this._errHandler.sync(this);
+			switch ( this.interpreter.adaptivePredict(this._input, 48, this._ctx) ) {
+			case 1:
+				this.enterOuterAlt(_localctx, 1);
+				{
+				this.state = 480;
+				this.match(painless_parser.LBRACE);
+				this.state = 481;
+				this.expression();
+				this.state = 486;
+				this._errHandler.sync(this);
+				_la = this._input.LA(1);
+				while (_la === painless_parser.COMMA) {
+					{
+					{
+					this.state = 482;
+					this.match(painless_parser.COMMA);
+					this.state = 483;
+					this.expression();
+					}
+					}
+					this.state = 488;
+					this._errHandler.sync(this);
+					_la = this._input.LA(1);
+				}
+				this.state = 489;
+				this.match(painless_parser.RBRACE);
+				}
+				break;
+
+			case 2:
+				this.enterOuterAlt(_localctx, 2);
+				{
+				this.state = 491;
+				this.match(painless_parser.LBRACE);
+				this.state = 492;
+				this.match(painless_parser.RBRACE);
+				}
+				break;
+			}
+		}
+		catch (re) {
+			if (re instanceof RecognitionException) {
+				_localctx.exception = re;
+				this._errHandler.reportError(this, re);
+				this._errHandler.recover(this, re);
+			} else {
+				throw re;
+			}
+		}
+		finally {
+			this.exitRule();
+		}
+		return _localctx;
+	}
+	// @RuleVersion(0)
+	public mapinitializer(): MapinitializerContext {
+		let _localctx: MapinitializerContext = new MapinitializerContext(this._ctx, this.state);
+		this.enterRule(_localctx, 64, painless_parser.RULE_mapinitializer);
+		let _la: number;
+		try {
+			this.state = 509;
+			this._errHandler.sync(this);
+			switch ( this.interpreter.adaptivePredict(this._input, 50, this._ctx) ) {
+			case 1:
+				this.enterOuterAlt(_localctx, 1);
+				{
+				this.state = 495;
+				this.match(painless_parser.LBRACE);
+				this.state = 496;
+				this.maptoken();
+				this.state = 501;
+				this._errHandler.sync(this);
+				_la = this._input.LA(1);
+				while (_la === painless_parser.COMMA) {
+					{
+					{
+					this.state = 497;
+					this.match(painless_parser.COMMA);
+					this.state = 498;
+					this.maptoken();
+					}
+					}
+					this.state = 503;
+					this._errHandler.sync(this);
+					_la = this._input.LA(1);
+				}
+				this.state = 504;
+				this.match(painless_parser.RBRACE);
+				}
+				break;
+
+			case 2:
+				this.enterOuterAlt(_localctx, 2);
+				{
+				this.state = 506;
+				this.match(painless_parser.LBRACE);
+				this.state = 507;
+				this.match(painless_parser.COLON);
+				this.state = 508;
+				this.match(painless_parser.RBRACE);
+				}
+				break;
+			}
+		}
+		catch (re) {
+			if (re instanceof RecognitionException) {
+				_localctx.exception = re;
+				this._errHandler.reportError(this, re);
+				this._errHandler.recover(this, re);
+			} else {
+				throw re;
+			}
+		}
+		finally {
+			this.exitRule();
+		}
+		return _localctx;
+	}
+	// @RuleVersion(0)
+	public maptoken(): MaptokenContext {
+		let _localctx: MaptokenContext = new MaptokenContext(this._ctx, this.state);
+		this.enterRule(_localctx, 66, painless_parser.RULE_maptoken);
+		try {
+			this.enterOuterAlt(_localctx, 1);
+			{
+			this.state = 511;
+			this.expression();
+			this.state = 512;
+			this.match(painless_parser.COLON);
+			this.state = 513;
+			this.expression();
+			}
+		}
+		catch (re) {
+			if (re instanceof RecognitionException) {
+				_localctx.exception = re;
+				this._errHandler.reportError(this, re);
+				this._errHandler.recover(this, re);
+			} else {
+				throw re;
+			}
+		}
+		finally {
+			this.exitRule();
+		}
+		return _localctx;
+	}
+	// @RuleVersion(0)
+	public arguments(): ArgumentsContext {
+		let _localctx: ArgumentsContext = new ArgumentsContext(this._ctx, this.state);
+		this.enterRule(_localctx, 68, painless_parser.RULE_arguments);
+		let _la: number;
+		try {
+			this.enterOuterAlt(_localctx, 1);
+			{
+			{
+			this.state = 515;
+			this.match(painless_parser.LP);
+			this.state = 524;
+			this._errHandler.sync(this);
+			_la = this._input.LA(1);
+			if (((((_la - 5)) & ~0x1F) === 0 && ((1 << (_la - 5)) & ((1 << (painless_parser.LBRACE - 5)) | (1 << (painless_parser.LP - 5)) | (1 << (painless_parser.NEW - 5)) | (1 << (painless_parser.THIS - 5)) | (1 << (painless_parser.BOOLNOT - 5)) | (1 << (painless_parser.BWNOT - 5)) | (1 << (painless_parser.ADD - 5)) | (1 << (painless_parser.SUB - 5)))) !== 0) || ((((_la - 58)) & ~0x1F) === 0 && ((1 << (_la - 58)) & ((1 << (painless_parser.INCR - 58)) | (1 << (painless_parser.DECR - 58)) | (1 << (painless_parser.OCTAL - 58)) | (1 << (painless_parser.HEX - 58)) | (1 << (painless_parser.INTEGER - 58)) | (1 << (painless_parser.DECIMAL - 58)) | (1 << (painless_parser.STRING - 58)) | (1 << (painless_parser.REGEX - 58)) | (1 << (painless_parser.TRUE - 58)) | (1 << (painless_parser.FALSE - 58)) | (1 << (painless_parser.NULL - 58)) | (1 << (painless_parser.PRIMITIVE - 58)) | (1 << (painless_parser.DEF - 58)) | (1 << (painless_parser.ID - 58)))) !== 0)) {
+				{
+				this.state = 516;
+				this.argument();
+				this.state = 521;
+				this._errHandler.sync(this);
+				_la = this._input.LA(1);
+				while (_la === painless_parser.COMMA) {
+					{
+					{
+					this.state = 517;
+					this.match(painless_parser.COMMA);
+					this.state = 518;
+					this.argument();
+					}
+					}
+					this.state = 523;
+					this._errHandler.sync(this);
+					_la = this._input.LA(1);
+				}
+				}
+			}
+
+			this.state = 526;
+			this.match(painless_parser.RP);
+			}
+			}
+		}
+		catch (re) {
+			if (re instanceof RecognitionException) {
+				_localctx.exception = re;
+				this._errHandler.reportError(this, re);
+				this._errHandler.recover(this, re);
+			} else {
+				throw re;
+			}
+		}
+		finally {
+			this.exitRule();
+		}
+		return _localctx;
+	}
+	// @RuleVersion(0)
+	public argument(): ArgumentContext {
+		let _localctx: ArgumentContext = new ArgumentContext(this._ctx, this.state);
+		this.enterRule(_localctx, 70, painless_parser.RULE_argument);
+		try {
+			this.state = 531;
+			this._errHandler.sync(this);
+			switch ( this.interpreter.adaptivePredict(this._input, 53, this._ctx) ) {
+			case 1:
+				this.enterOuterAlt(_localctx, 1);
+				{
+				this.state = 528;
+				this.expression();
+				}
+				break;
+
+			case 2:
+				this.enterOuterAlt(_localctx, 2);
+				{
+				this.state = 529;
+				this.lambda();
+				}
+				break;
+
+			case 3:
+				this.enterOuterAlt(_localctx, 3);
+				{
+				this.state = 530;
+				this.funcref();
+				}
+				break;
+			}
+		}
+		catch (re) {
+			if (re instanceof RecognitionException) {
+				_localctx.exception = re;
+				this._errHandler.reportError(this, re);
+				this._errHandler.recover(this, re);
+			} else {
+				throw re;
+			}
+		}
+		finally {
+			this.exitRule();
+		}
+		return _localctx;
+	}
+	// @RuleVersion(0)
+	public lambda(): LambdaContext {
+		let _localctx: LambdaContext = new LambdaContext(this._ctx, this.state);
+		this.enterRule(_localctx, 72, painless_parser.RULE_lambda);
+		let _la: number;
+		try {
+			this.enterOuterAlt(_localctx, 1);
+			{
+			this.state = 546;
+			this._errHandler.sync(this);
+			switch (this._input.LA(1)) {
+			case painless_parser.PRIMITIVE:
+			case painless_parser.DEF:
+			case painless_parser.ID:
+				{
+				this.state = 533;
+				this.lamtype();
+				}
+				break;
+			case painless_parser.LP:
+				{
+				this.state = 534;
+				this.match(painless_parser.LP);
+				this.state = 543;
+				this._errHandler.sync(this);
+				_la = this._input.LA(1);
+				if (((((_la - 81)) & ~0x1F) === 0 && ((1 << (_la - 81)) & ((1 << (painless_parser.PRIMITIVE - 81)) | (1 << (painless_parser.DEF - 81)) | (1 << (painless_parser.ID - 81)))) !== 0)) {
+					{
+					this.state = 535;
+					this.lamtype();
+					this.state = 540;
+					this._errHandler.sync(this);
+					_la = this._input.LA(1);
+					while (_la === painless_parser.COMMA) {
+						{
+						{
+						this.state = 536;
+						this.match(painless_parser.COMMA);
+						this.state = 537;
+						this.lamtype();
+						}
+						}
+						this.state = 542;
+						this._errHandler.sync(this);
+						_la = this._input.LA(1);
+					}
+					}
+				}
+
+				this.state = 545;
+				this.match(painless_parser.RP);
+				}
+				break;
+			default:
+				throw new NoViableAltException(this);
+			}
+			this.state = 548;
+			this.match(painless_parser.ARROW);
+			this.state = 551;
+			this._errHandler.sync(this);
+			switch (this._input.LA(1)) {
+			case painless_parser.LBRACK:
+				{
+				this.state = 549;
+				this.block();
+				}
+				break;
+			case painless_parser.LBRACE:
+			case painless_parser.LP:
+			case painless_parser.NEW:
+			case painless_parser.BOOLNOT:
+			case painless_parser.BWNOT:
+			case painless_parser.ADD:
+			case painless_parser.SUB:
+			case painless_parser.INCR:
+			case painless_parser.DECR:
+			case painless_parser.OCTAL:
+			case painless_parser.HEX:
+			case painless_parser.INTEGER:
+			case painless_parser.DECIMAL:
+			case painless_parser.STRING:
+			case painless_parser.REGEX:
+			case painless_parser.TRUE:
+			case painless_parser.FALSE:
+			case painless_parser.NULL:
+			case painless_parser.ID:
+				{
+				this.state = 550;
+				this.expression();
+				}
+				break;
+			default:
+				throw new NoViableAltException(this);
+			}
+			}
+		}
+		catch (re) {
+			if (re instanceof RecognitionException) {
+				_localctx.exception = re;
+				this._errHandler.reportError(this, re);
+				this._errHandler.recover(this, re);
+			} else {
+				throw re;
+			}
+		}
+		finally {
+			this.exitRule();
+		}
+		return _localctx;
+	}
+	// @RuleVersion(0)
+	public lamtype(): LamtypeContext {
+		let _localctx: LamtypeContext = new LamtypeContext(this._ctx, this.state);
+		this.enterRule(_localctx, 74, painless_parser.RULE_lamtype);
+		try {
+			this.enterOuterAlt(_localctx, 1);
+			{
+			this.state = 554;
+			this._errHandler.sync(this);
+			switch ( this.interpreter.adaptivePredict(this._input, 58, this._ctx) ) {
+			case 1:
+				{
+				this.state = 553;
+				this.decltype();
+				}
+				break;
+			}
+			this.state = 556;
+			this.match(painless_parser.ID);
+			}
+		}
+		catch (re) {
+			if (re instanceof RecognitionException) {
+				_localctx.exception = re;
+				this._errHandler.reportError(this, re);
+				this._errHandler.recover(this, re);
+			} else {
+				throw re;
+			}
+		}
+		finally {
+			this.exitRule();
+		}
+		return _localctx;
+	}
+	// @RuleVersion(0)
+	public funcref(): FuncrefContext {
+		let _localctx: FuncrefContext = new FuncrefContext(this._ctx, this.state);
+		this.enterRule(_localctx, 76, painless_parser.RULE_funcref);
+		try {
+			this.state = 569;
+			this._errHandler.sync(this);
+			switch ( this.interpreter.adaptivePredict(this._input, 59, this._ctx) ) {
+			case 1:
+				_localctx = new ClassfuncrefContext(_localctx);
+				this.enterOuterAlt(_localctx, 1);
+				{
+				this.state = 558;
+				this.decltype();
+				this.state = 559;
+				this.match(painless_parser.REF);
+				this.state = 560;
+				this.match(painless_parser.ID);
+				}
+				break;
+
+			case 2:
+				_localctx = new ConstructorfuncrefContext(_localctx);
+				this.enterOuterAlt(_localctx, 2);
+				{
+				this.state = 562;
+				this.decltype();
+				this.state = 563;
+				this.match(painless_parser.REF);
+				this.state = 564;
+				this.match(painless_parser.NEW);
+				}
+				break;
+
+			case 3:
+				_localctx = new LocalfuncrefContext(_localctx);
+				this.enterOuterAlt(_localctx, 3);
+				{
+				this.state = 566;
+				this.match(painless_parser.THIS);
+				this.state = 567;
+				this.match(painless_parser.REF);
+				this.state = 568;
+				this.match(painless_parser.ID);
+				}
+				break;
+			}
+		}
+		catch (re) {
+			if (re instanceof RecognitionException) {
+				_localctx.exception = re;
+				this._errHandler.reportError(this, re);
+				this._errHandler.recover(this, re);
+			} else {
+				throw re;
+			}
+		}
+		finally {
+			this.exitRule();
+		}
+		return _localctx;
+	}
+
+	public sempred(_localctx: RuleContext, ruleIndex: number, predIndex: number): boolean {
+		switch (ruleIndex) {
+		case 4:
+			return this.rstatement_sempred(_localctx as RstatementContext, predIndex);
+
+		case 16:
+			return this.noncondexpression_sempred(_localctx as NoncondexpressionContext, predIndex);
+		}
+		return true;
+	}
+	private rstatement_sempred(_localctx: RstatementContext, predIndex: number): boolean {
+		switch (predIndex) {
+		case 0:
+			return  this._input.LA(1) != painless_parser.ELSE ;
+		}
+		return true;
+	}
+	private noncondexpression_sempred(_localctx: NoncondexpressionContext, predIndex: number): boolean {
+		switch (predIndex) {
+		case 1:
+			return this.precpred(this._ctx, 13);
+
+		case 2:
+			return this.precpred(this._ctx, 12);
+
+		case 3:
+			return this.precpred(this._ctx, 11);
+
+		case 4:
+			return this.precpred(this._ctx, 10);
+
+		case 5:
+			return this.precpred(this._ctx, 9);
+
+		case 6:
+			return this.precpred(this._ctx, 7);
+
+		case 7:
+			return this.precpred(this._ctx, 6);
+
+		case 8:
+			return this.precpred(this._ctx, 5);
+
+		case 9:
+			return this.precpred(this._ctx, 4);
+
+		case 10:
+			return this.precpred(this._ctx, 3);
+
+		case 11:
+			return this.precpred(this._ctx, 2);
+
+		case 12:
+			return this.precpred(this._ctx, 1);
+
+		case 13:
+			return this.precpred(this._ctx, 8);
+		}
+		return true;
+	}
+
+	private static readonly _serializedATNSegments: number = 2;
+	private static readonly _serializedATNSegment0: string =
+		"\x03\uC91D\uCABA\u058D\uAFBA\u4F53\u0607\uEA8B\uC241\x03W\u023E\x04\x02" +
+		"\t\x02\x04\x03\t\x03\x04\x04\t\x04\x04\x05\t\x05\x04\x06\t\x06\x04\x07" +
+		"\t\x07\x04\b\t\b\x04\t\t\t\x04\n\t\n\x04\v\t\v\x04\f\t\f\x04\r\t\r\x04" +
+		"\x0E\t\x0E\x04\x0F\t\x0F\x04\x10\t\x10\x04\x11\t\x11\x04\x12\t\x12\x04" +
+		"\x13\t\x13\x04\x14\t\x14\x04\x15\t\x15\x04\x16\t\x16\x04\x17\t\x17\x04" +
+		"\x18\t\x18\x04\x19\t\x19\x04\x1A\t\x1A\x04\x1B\t\x1B\x04\x1C\t\x1C\x04" +
+		"\x1D\t\x1D\x04\x1E\t\x1E\x04\x1F\t\x1F\x04 \t \x04!\t!\x04\"\t\"\x04#" +
+		"\t#\x04$\t$\x04%\t%\x04&\t&\x04\'\t\'\x04(\t(\x03\x02\x07\x02R\n\x02\f" +
+		"\x02\x0E\x02U\v\x02\x03\x02\x07\x02X\n\x02\f\x02\x0E\x02[\v\x02\x03\x02" +
+		"\x03\x02\x03\x03\x03\x03\x03\x03\x03\x03\x03\x03\x03\x04\x03\x04\x03\x04" +
+		"\x03\x04\x03\x04\x03\x04\x03\x04\x07\x04k\n\x04\f\x04\x0E\x04n\v\x04\x05" +
+		"\x04p\n\x04\x03\x04\x03\x04\x03\x05\x03\x05\x03\x05\x03\x05\x05\x05x\n" +
+		"\x05\x03\x06\x03\x06\x03\x06\x03\x06\x03\x06\x03\x06\x03\x06\x03\x06\x05" +
+		"\x06\x82\n\x06\x03\x06\x03\x06\x03\x06\x03\x06\x03\x06\x03\x06\x05\x06" +
+		"\x8A\n\x06\x03\x06\x03\x06\x03\x06\x05\x06\x8F\n\x06\x03\x06\x03\x06\x05" +
+		"\x06\x93\n\x06\x03\x06\x03\x06\x05\x06\x97\n\x06\x03\x06\x03\x06\x03\x06" +
+		"\x05\x06\x9C\n\x06\x03\x06\x03\x06\x03\x06\x03\x06\x03\x06\x03\x06\x03" +
+		"\x06\x03\x06\x03\x06\x03\x06\x03\x06\x03\x06\x03\x06\x03\x06\x03\x06\x03" +
+		"\x06\x03\x06\x03\x06\x03\x06\x03\x06\x06\x06\xB2\n\x06\r\x06\x0E\x06\xB3" +
+		"\x05\x06\xB6\n\x06\x03\x07\x03\x07\x03\x07\x03\x07\x03\x07\x03\x07\x03" +
+		"\x07\x03\x07\x03\x07\x03\x07\x03\x07\x03\x07\x05\x07\xC4\n\x07\x03\x07" +
+		"\x03\x07\x03\x07\x05\x07\xC9\n\x07\x03\b\x03\b\x05\b\xCD\n\b\x03\t\x03" +
+		"\t\x07\t\xD1\n\t\f\t\x0E\t\xD4\v\t\x03\t\x05\t\xD7\n\t\x03\t\x03\t\x03" +
+		"\n\x03\n\x03\v\x03\v\x05\v\xDF\n\v\x03\f\x03\f\x03\r\x03\r\x03\r\x03\r" +
+		"\x07\r\xE7\n\r\f\r\x0E\r\xEA\v\r\x03\x0E\x03\x0E\x03\x0E\x07\x0E\xEF\n" +
+		"\x0E\f\x0E\x0E\x0E\xF2\v\x0E\x03\x0F\x03\x0F\x03\x0F\x03\x0F\x03\x0F\x07" +
+		"\x0F\xF9\n\x0F\f\x0F\x0E\x0F\xFC\v\x0F\x05\x0F\xFE\n\x0F\x03\x10\x03\x10" +
+		"\x03\x10\x05\x10\u0103\n\x10\x03\x11\x03\x11\x03\x11\x03\x11\x03\x11\x03" +
+		"\x11\x03\x11\x03\x12\x03\x12\x03\x12\x03\x12\x03\x12\x03\x12\x03\x12\x03" +
+		"\x12\x03\x12\x03\x12\x03\x12\x03\x12\x03\x12\x03\x12\x03\x12\x03\x12\x03" +
+		"\x12\x03\x12\x03\x12\x03\x12\x03\x12\x03\x12\x03\x12\x03\x12\x03\x12\x03" +
+		"\x12\x03\x12\x03\x12\x03\x12\x03\x12\x03\x12\x03\x12\x03\x12\x03\x12\x03" +
+		"\x12\x03\x12\x03\x12\x03\x12\x03\x12\x03\x12\x03\x12\x03\x12\x07\x12\u0136" +
+		"\n\x12\f\x12\x0E\x12\u0139\v\x12\x03\x13\x03\x13\x03\x13\x03\x13\x03\x13" +
+		"\x03\x13\x03\x13\x03\x13\x03\x13\x03\x13\x03\x13\x05\x13\u0146\n\x13\x03" +
+		"\x14\x03\x14\x03\x14\x03\x14\x03\x14\x05\x14\u014D\n\x14\x03\x15\x03\x15" +
+		"\x03\x15\x03\x15\x03\x15\x03\x15\x03\x15\x05\x15\u0156\n\x15\x03\x16\x03" +
+		"\x16\x03\x16\x03\x16\x03\x16\x03\x16\x03\x16\x03\x16\x03\x16\x03\x16\x05" +
+		"\x16\u0162\n\x16\x03\x17\x03\x17\x03\x18\x03\x18\x03\x18\x06\x18\u0169" +
+		"\n\x18\r\x18\x0E\x18\u016A\x03\x18\x03\x18\x03\x18\x06\x18\u0170\n\x18" +
+		"\r\x18\x0E\x18\u0171\x03\x18\x03\x18\x03\x18\x07\x18\u0177\n\x18\f\x18" +
+		"\x0E\x18\u017A\v\x18\x03\x18\x03\x18\x07\x18\u017E\n\x18\f\x18\x0E\x18" +
+		"\u0181\v\x18\x05\x18\u0183\n\x18\x03\x19\x03\x19\x07\x19\u0187\n\x19\f" +
+		"\x19\x0E\x19\u018A\v\x19\x03\x19\x05\x19\u018D\n\x19\x03\x1A\x03\x1A\x03" +
+		"\x1A\x03\x1A\x03\x1A\x03\x1A\x03\x1A\x03\x1A\x03\x1A\x03\x1A\x03\x1A\x03" +
+		"\x1A\x03\x1A\x03\x1A\x03\x1A\x03\x1A\x03\x1A\x03\x1A\x03\x1A\x05\x1A\u01A2" +
+		"\n\x1A\x03\x1B\x03\x1B\x03\x1B\x05\x1B\u01A7\n\x1B\x03\x1C\x03\x1C\x05" +
+		"\x1C\u01AB\n\x1C\x03\x1D\x03\x1D\x03\x1D\x03\x1D\x03\x1E\x03\x1E\x03\x1E" +
+		"\x03\x1F\x03\x1F\x03\x1F\x03\x1F\x03 \x03 \x03 \x03 \x03 \x03 \x06 \u01BE" +
+		"\n \r \x0E \u01BF\x03 \x03 \x07 \u01C4\n \f \x0E \u01C7\v \x05 \u01C9" +
+		"\n \x03 \x03 \x03 \x03 \x03 \x03 \x03 \x03 \x07 \u01D3\n \f \x0E \u01D6" +
+		"\v \x05 \u01D8\n \x03 \x03 \x07 \u01DC\n \f \x0E \u01DF\v \x05 \u01E1" +
+		"\n \x03!\x03!\x03!\x03!\x07!\u01E7\n!\f!\x0E!\u01EA\v!\x03!\x03!\x03!" +
+		"\x03!\x05!\u01F0\n!\x03\"\x03\"\x03\"\x03\"\x07\"\u01F6\n\"\f\"\x0E\"" +
+		"\u01F9\v\"\x03\"\x03\"\x03\"\x03\"\x03\"\x05\"\u0200\n\"\x03#\x03#\x03" +
+		"#\x03#\x03$\x03$\x03$\x03$\x07$\u020A\n$\f$\x0E$\u020D\v$\x05$\u020F\n" +
+		"$\x03$\x03$\x03%\x03%\x03%\x05%\u0216\n%\x03&\x03&\x03&\x03&\x03&\x07" +
+		"&\u021D\n&\f&\x0E&\u0220\v&\x05&\u0222\n&\x03&\x05&\u0225\n&\x03&\x03" +
+		"&\x03&\x05&\u022A\n&\x03\'\x05\'\u022D\n\'\x03\'\x03\'\x03(\x03(\x03(" +
+		"\x03(\x03(\x03(\x03(\x03(\x03(\x03(\x03(\x05(\u023C\n(\x03(\x02\x02\x03" +
+		"\")\x02\x02\x04\x02\x06\x02\b\x02\n\x02\f\x02\x0E\x02\x10\x02\x12\x02" +
+		"\x14\x02\x16\x02\x18\x02\x1A\x02\x1C\x02\x1E\x02 \x02\"\x02$\x02&\x02" +
+		"(\x02*\x02,\x02.\x020\x022\x024\x026\x028\x02:\x02<\x02>\x02@\x02B\x02" +
+		"D\x02F\x02H\x02J\x02L\x02N\x02\x02\x10\x03\x03\x0E\x0E\x03\x02 \"\x03" +
+		"\x02#$\x03\x02:;\x03\x02%\'\x03\x02(+\x03\x02,/\x03\x02>I\x03\x02<=\x03" +
+		"\x02\x1E\x1F\x03\x02ST\x03\x02JM\x03\x02\v\f\x03\x02VW\x02\u0279\x02S" +
+		"\x03\x02\x02\x02\x04^\x03\x02\x02\x02\x06c\x03\x02\x02\x02\bw\x03\x02" +
+		"\x02\x02\n\xB5\x03\x02\x02\x02\f\xC8\x03\x02\x02\x02\x0E\xCC\x03\x02\x02" +
+		"\x02\x10\xCE\x03\x02\x02\x02\x12\xDA\x03\x02\x02\x02\x14\xDE\x03\x02\x02" +
+		"\x02\x16\xE0\x03\x02\x02\x02\x18\xE2\x03\x02\x02\x02\x1A\xEB\x03\x02\x02" +
+		"\x02\x1C\xFD\x03\x02\x02\x02\x1E\xFF\x03\x02\x02\x02 \u0104\x03\x02\x02" +
+		"\x02\"\u010B\x03\x02\x02\x02$\u0145\x03\x02\x02\x02&\u014C\x03\x02\x02" +
+		"\x02(\u0155\x03\x02\x02\x02*\u0161\x03\x02\x02\x02,\u0163\x03\x02\x02" +
+		"\x02.\u0182\x03\x02\x02\x020\u018C\x03\x02\x02\x022\u01A1\x03\x02\x02" +
+		"\x024\u01A6\x03\x02\x02\x026\u01AA\x03\x02\x02\x028\u01AC\x03\x02\x02" +
+		"\x02:\u01B0\x03\x02\x02\x02<\u01B3\x03\x02\x02\x02>\u01E0\x03\x02\x02" +
+		"\x02@\u01EF\x03\x02\x02\x02B\u01FF\x03\x02\x02\x02D\u0201\x03\x02\x02" +
+		"\x02F\u0205\x03\x02\x02\x02H\u0215\x03\x02\x02\x02J\u0224\x03\x02\x02" +
+		"\x02L\u022C\x03\x02\x02\x02N\u023B\x03\x02\x02\x02PR\x05\x04\x03\x02Q" +
+		"P\x03\x02\x02\x02RU\x03\x02\x02\x02SQ\x03\x02\x02\x02ST\x03\x02\x02\x02" +
+		"TY\x03\x02\x02\x02US\x03\x02\x02\x02VX\x05\b\x05\x02WV\x03\x02\x02\x02" +
+		"X[\x03\x02\x02\x02YW\x03\x02\x02\x02YZ\x03\x02\x02\x02Z\\\x03\x02\x02" +
+		"\x02[Y\x03\x02\x02\x02\\]\x07\x02\x02\x03]\x03\x03\x02\x02\x02^_\x05\x1A" +
+		"\x0E\x02_`\x07U\x02\x02`a\x05\x06\x04\x02ab\x05\x10\t\x02b\x05\x03\x02" +
+		"\x02\x02co\x07\t\x02\x02de\x05\x1A\x0E\x02el\x07U\x02\x02fg\x07\r\x02" +
+		"\x02gh\x05\x1A\x0E\x02hi\x07U\x02\x02ik\x03\x02\x02\x02jf\x03\x02\x02" +
+		"\x02kn\x03\x02\x02\x02lj\x03\x02\x02\x02lm\x03\x02\x02\x02mp\x03\x02\x02" +
+		"\x02nl\x03\x02\x02\x02od\x03\x02\x02\x02op\x03\x02\x02\x02pq\x03\x02\x02" +
+		"\x02qr\x07\n\x02\x02r\x07\x03\x02\x02\x02sx\x05\n\x06\x02tu\x05\f\x07" +
+		"\x02uv\t\x02\x02\x02vx\x03\x02\x02\x02ws\x03\x02\x02\x02wt\x03\x02\x02" +
+		"\x02x\t\x03\x02\x02\x02yz\x07\x0F\x02\x02z{\x07\t\x02\x02{|\x05$\x13\x02" +
+		"|}\x07\n\x02\x02}\x81\x05\x0E\b\x02~\x7F\x07\x11\x02\x02\x7F\x82\x05\x0E" +
+		"\b\x02\x80\x82\x06\x06\x02\x02\x81~\x03\x02\x02\x02\x81\x80\x03\x02\x02" +
+		"\x02\x82\xB6\x03\x02\x02\x02\x83\x84\x07\x12\x02\x02\x84\x85\x07\t\x02" +
+		"\x02\x85\x86\x05$\x13\x02\x86\x89\x07\n\x02\x02\x87\x8A\x05\x0E\b\x02" +
+		"\x88\x8A\x05\x12\n\x02\x89\x87\x03\x02\x02\x02\x89\x88\x03\x02\x02\x02" +
+		"\x8A\xB6\x03\x02\x02\x02\x8B\x8C\x07\x14\x02\x02\x8C\x8E\x07\t\x02\x02" +
+		"\x8D\x8F\x05\x14\v\x02\x8E\x8D\x03\x02\x02\x02\x8E\x8F\x03\x02\x02\x02" +
+		"\x8F\x90\x03\x02\x02\x02\x90\x92\x07\x0E\x02\x02\x91\x93\x05$\x13\x02" +
+		"\x92\x91\x03\x02\x02\x02\x92\x93\x03\x02\x02\x02\x93\x94\x03\x02\x02\x02" +
+		"\x94\x96\x07\x0E\x02\x02\x95\x97\x05\x16\f\x02\x96\x95\x03\x02\x02\x02" +
+		"\x96\x97\x03\x02\x02\x02\x97\x98\x03\x02\x02\x02\x98\x9B\x07\n\x02\x02" +
+		"\x99\x9C\x05\x0E\b\x02\x9A\x9C\x05\x12\n\x02\x9B\x99\x03\x02\x02\x02\x9B" +
+		"\x9A\x03\x02\x02\x02\x9C\xB6\x03\x02\x02\x02\x9D\x9E\x07\x14\x02\x02\x9E" +
+		"\x9F\x07\t\x02\x02\x9F\xA0\x05\x1A\x0E\x02\xA0\xA1\x07U\x02\x02\xA1\xA2" +
+		"\x076\x02\x02\xA2\xA3\x05$\x13\x02\xA3\xA4\x07\n\x02\x02\xA4\xA5\x05\x0E" +
+		"\b\x02\xA5\xB6\x03\x02\x02\x02\xA6\xA7\x07\x14\x02\x02\xA7\xA8\x07\t\x02" +
+		"\x02\xA8\xA9\x07U\x02\x02\xA9\xAA\x07\x10\x02\x02\xAA\xAB\x05$\x13\x02" +
+		"\xAB\xAC\x07\n\x02\x02\xAC\xAD\x05\x0E\b\x02\xAD\xB6\x03\x02\x02\x02\xAE" +
+		"\xAF\x07\x19\x02\x02\xAF\xB1\x05\x10\t\x02\xB0\xB2\x05 \x11\x02\xB1\xB0" +
+		"\x03\x02\x02\x02\xB2\xB3\x03\x02\x02\x02\xB3\xB1\x03\x02\x02\x02\xB3\xB4" +
+		"\x03\x02\x02\x02\xB4\xB6\x03\x02\x02\x02\xB5y\x03\x02\x02\x02\xB5\x83" +
+		"\x03\x02\x02\x02\xB5\x8B\x03\x02\x02\x02\xB5\x9D\x03\x02\x02\x02\xB5\xA6" +
+		"\x03\x02\x02\x02\xB5\xAE\x03\x02\x02\x02\xB6\v\x03\x02\x02\x02\xB7\xB8" +
+		"\x07\x13\x02\x02\xB8\xB9\x05\x10\t\x02\xB9\xBA\x07\x12\x02\x02\xBA\xBB" +
+		"\x07\t\x02\x02\xBB\xBC\x05$\x13\x02\xBC\xBD\x07\n\x02\x02\xBD\xC9\x03" +
+		"\x02\x02\x02\xBE\xC9\x05\x18\r\x02\xBF\xC9\x07\x15\x02\x02\xC0\xC9\x07" +
+		"\x16\x02\x02\xC1\xC3\x07\x17\x02\x02\xC2\xC4\x05$\x13\x02\xC3\xC2\x03" +
+		"\x02\x02\x02\xC3\xC4\x03\x02\x02\x02\xC4\xC9\x03\x02\x02\x02\xC5\xC6\x07" +
+		"\x1B\x02\x02\xC6\xC9\x05$\x13\x02\xC7\xC9\x05$\x13\x02\xC8\xB7\x03\x02" +
+		"\x02\x02\xC8\xBE\x03\x02\x02\x02\xC8\xBF\x03\x02\x02\x02\xC8\xC0\x03\x02" +
+		"\x02\x02\xC8\xC1\x03\x02\x02\x02\xC8\xC5\x03\x02\x02\x02\xC8\xC7\x03\x02" +
+		"\x02\x02\xC9\r\x03\x02\x02\x02\xCA\xCD\x05\x10\t\x02\xCB\xCD\x05\b\x05" +
+		"\x02\xCC\xCA\x03\x02\x02\x02\xCC\xCB\x03\x02\x02\x02\xCD\x0F\x03\x02\x02" +
+		"\x02\xCE\xD2\x07\x05\x02\x02\xCF\xD1\x05\b\x05\x02\xD0\xCF\x03\x02\x02" +
+		"\x02\xD1\xD4\x03\x02\x02\x02\xD2\xD0\x03\x02\x02\x02\xD2\xD3\x03\x02\x02" +
+		"\x02\xD3\xD6\x03\x02\x02\x02\xD4\xD2\x03\x02\x02\x02\xD5\xD7\x05\f\x07" +
+		"\x02\xD6\xD5\x03\x02\x02\x02\xD6\xD7\x03\x02\x02\x02\xD7\xD8\x03\x02\x02" +
+		"\x02\xD8\xD9\x07\x06\x02\x02\xD9\x11\x03\x02\x02\x02\xDA\xDB\x07\x0E\x02" +
+		"\x02\xDB\x13\x03\x02\x02\x02\xDC\xDF\x05\x18\r\x02\xDD\xDF\x05$\x13\x02" +
+		"\xDE\xDC\x03\x02\x02\x02\xDE\xDD\x03\x02\x02\x02\xDF\x15\x03\x02\x02\x02" +
+		"\xE0\xE1\x05$\x13\x02\xE1\x17\x03\x02\x02\x02\xE2\xE3\x05\x1A\x0E\x02" +
+		"\xE3\xE8\x05\x1E\x10\x02\xE4\xE5\x07\r\x02\x02\xE5\xE7\x05\x1E\x10\x02" +
+		"\xE6\xE4\x03\x02\x02\x02\xE7\xEA\x03\x02\x02\x02\xE8\xE6\x03\x02\x02\x02" +
+		"\xE8\xE9\x03\x02\x02\x02\xE9\x19\x03\x02\x02\x02\xEA\xE8\x03\x02\x02\x02" +
+		"\xEB\xF0\x05\x1C\x0F\x02\xEC\xED\x07\x07\x02\x02\xED\xEF\x07\b\x02\x02" +
+		"\xEE\xEC\x03\x02\x02\x02\xEF\xF2\x03\x02\x02\x02\xF0\xEE\x03\x02\x02\x02" +
+		"\xF0\xF1\x03\x02\x02\x02\xF1\x1B\x03\x02\x02\x02\xF2\xF0\x03\x02\x02\x02" +
+		"\xF3\xFE\x07T\x02\x02\xF4\xFE\x07S\x02\x02\xF5\xFA\x07U\x02\x02\xF6\xF7" +
+		"\x07\v\x02\x02\xF7\xF9\x07W\x02\x02\xF8\xF6\x03\x02\x02\x02\xF9\xFC\x03" +
+		"\x02\x02\x02\xFA\xF8\x03\x02\x02\x02\xFA\xFB\x03\x02\x02\x02\xFB\xFE\x03" +
+		"\x02\x02\x02\xFC\xFA\x03\x02\x02\x02\xFD\xF3\x03\x02\x02\x02\xFD\xF4\x03" +
+		"\x02\x02\x02\xFD\xF5\x03\x02\x02\x02\xFE\x1D\x03\x02\x02\x02\xFF\u0102" +
+		"\x07U\x02\x02\u0100\u0101\x07>\x02\x02\u0101\u0103\x05$\x13\x02\u0102" +
+		"\u0100\x03\x02\x02\x02\u0102\u0103\x03\x02\x02\x02\u0103\x1F\x03\x02\x02" +
+		"\x02\u0104\u0105\x07\x1A\x02\x02\u0105\u0106\x07\t\x02\x02\u0106\u0107" +
+		"\x05\x1C\x0F\x02\u0107\u0108\x07U\x02\x02\u0108\u0109\x07\n\x02\x02\u0109" +
+		"\u010A\x05\x10\t\x02\u010A!\x03\x02\x02\x02\u010B\u010C\b\x12\x01\x02" +
+		"\u010C\u010D\x05&\x14\x02\u010D\u0137\x03\x02\x02\x02\u010E\u010F\f\x0F" +
+		"\x02\x02\u010F\u0110\t\x03\x02\x02\u0110\u0136\x05\"\x12\x10\u0111\u0112" +
+		"\f\x0E\x02\x02\u0112\u0113\t\x04\x02\x02\u0113\u0136\x05\"\x12\x0F\u0114" +
+		"\u0115\f\r\x02\x02\u0115\u0116\t\x05\x02\x02\u0116\u0136\x05\"\x12\x0E" +
+		"\u0117\u0118\f\f\x02\x02\u0118\u0119\t\x06\x02\x02\u0119\u0136\x05\"\x12" +
+		"\r\u011A\u011B\f\v\x02\x02\u011B\u011C\t\x07\x02\x02\u011C\u0136\x05\"" +
+		"\x12\f\u011D\u011E\f\t\x02\x02\u011E\u011F\t\b\x02\x02\u011F\u0136\x05" +
+		"\"\x12\n\u0120\u0121\f\b\x02\x02\u0121\u0122\x070\x02\x02\u0122\u0136" +
+		"\x05\"\x12\t\u0123\u0124\f\x07\x02\x02\u0124\u0125\x071\x02\x02\u0125" +
+		"\u0136\x05\"\x12\b\u0126\u0127\f\x06\x02\x02\u0127\u0128\x072\x02\x02" +
+		"\u0128\u0136\x05\"\x12\x07\u0129\u012A\f\x05\x02\x02\u012A\u012B\x073" +
+		"\x02\x02\u012B\u0136\x05\"\x12\x06\u012C\u012D\f\x04\x02\x02\u012D\u012E" +
+		"\x074\x02\x02\u012E\u0136\x05\"\x12\x05\u012F\u0130\f\x03\x02\x02\u0130" +
+		"\u0131\x077\x02\x02\u0131\u0136\x05\"\x12\x03\u0132\u0133\f\n\x02\x02" +
+		"\u0133\u0134\x07\x1D\x02\x02\u0134\u0136\x05\x1A\x0E\x02\u0135\u010E\x03" +
+		"\x02\x02\x02\u0135\u0111\x03\x02\x02\x02\u0135\u0114\x03\x02\x02\x02\u0135" +
+		"\u0117\x03\x02\x02\x02\u0135\u011A\x03\x02\x02\x02\u0135\u011D\x03\x02" +
+		"\x02\x02\u0135\u0120\x03\x02\x02\x02\u0135\u0123\x03\x02\x02\x02\u0135" +
+		"\u0126\x03\x02\x02\x02\u0135\u0129\x03\x02\x02\x02\u0135\u012C\x03\x02" +
+		"\x02\x02\u0135\u012F\x03\x02\x02\x02\u0135\u0132\x03\x02\x02\x02\u0136" +
+		"\u0139\x03\x02\x02\x02\u0137\u0135\x03\x02\x02\x02\u0137\u0138\x03\x02" +
+		"\x02\x02\u0138#\x03\x02\x02\x02\u0139\u0137\x03\x02\x02\x02\u013A\u0146" +
+		"\x05\"\x12\x02\u013B\u013C\x05\"\x12\x02\u013C\u013D\x075\x02\x02\u013D" +
+		"\u013E\x05$\x13\x02\u013E\u013F\x076\x02\x02\u013F\u0140\x05$\x13\x02" +
+		"\u0140\u0146\x03\x02\x02\x02\u0141\u0142\x05\"\x12\x02\u0142\u0143\t\t" +
+		"\x02\x02\u0143\u0144\x05$\x13\x02\u0144\u0146\x03\x02\x02\x02\u0145\u013A" +
+		"\x03\x02\x02\x02\u0145\u013B\x03\x02\x02\x02\u0145\u0141\x03\x02\x02\x02" +
+		"\u0146%\x03\x02\x02\x02\u0147\u0148\t\n\x02\x02\u0148\u014D\x050\x19\x02" +
+		"\u0149\u014A\t\x04\x02\x02\u014A\u014D\x05&\x14\x02\u014B\u014D\x05(\x15" +
+		"\x02\u014C\u0147\x03\x02\x02\x02\u014C\u0149\x03\x02\x02\x02\u014C\u014B" +
+		"\x03\x02\x02\x02\u014D\'\x03\x02\x02\x02\u014E\u0156\x050\x19\x02\u014F" +
+		"\u0150\x050\x19\x02\u0150\u0151\t\n\x02\x02\u0151\u0156\x03\x02\x02\x02" +
+		"\u0152\u0153\t\v\x02\x02\u0153\u0156\x05&\x14\x02\u0154\u0156\x05*\x16" +
+		"\x02\u0155\u014E\x03\x02\x02\x02\u0155\u014F\x03\x02\x02\x02\u0155\u0152" +
+		"\x03\x02\x02\x02\u0155\u0154\x03\x02\x02\x02\u0156)\x03\x02\x02\x02\u0157" +
+		"\u0158\x07\t\x02\x02\u0158\u0159\x05,\x17\x02\u0159\u015A\x07\n\x02\x02" +
+		"\u015A\u015B\x05&\x14\x02\u015B\u0162\x03\x02\x02\x02\u015C\u015D\x07" +
+		"\t\x02\x02\u015D\u015E\x05.\x18\x02\u015E\u015F\x07\n\x02\x02\u015F\u0160" +
+		"\x05(\x15\x02\u0160\u0162\x03\x02\x02\x02\u0161\u0157\x03\x02\x02\x02" +
+		"\u0161\u015C\x03\x02\x02\x02\u0162+\x03\x02\x02\x02\u0163\u0164\t\f\x02" +
+		"\x02\u0164-\x03\x02\x02\x02\u0165\u0168\x07T\x02\x02\u0166\u0167\x07\x07" +
+		"\x02\x02\u0167\u0169\x07\b\x02\x02\u0168\u0166\x03\x02\x02\x02\u0169\u016A" +
+		"\x03\x02\x02\x02\u016A\u0168\x03\x02\x02\x02\u016A\u016B\x03\x02\x02\x02" +
+		"\u016B\u0183\x03\x02\x02\x02\u016C\u016F\x07S\x02\x02\u016D\u016E\x07" +
+		"\x07\x02\x02\u016E\u0170\x07\b\x02\x02\u016F\u016D\x03\x02\x02\x02\u0170" +
+		"\u0171\x03\x02\x02\x02\u0171\u016F\x03\x02\x02\x02\u0171\u0172\x03\x02" +
+		"\x02\x02\u0172\u0183\x03\x02\x02\x02\u0173\u0178\x07U\x02\x02\u0174\u0175" +
+		"\x07\v\x02\x02\u0175\u0177\x07W\x02\x02\u0176\u0174\x03\x02\x02\x02\u0177" +
+		"\u017A\x03\x02\x02\x02\u0178\u0176\x03\x02\x02\x02\u0178\u0179\x03\x02" +
+		"\x02\x02\u0179\u017F\x03\x02\x02\x02\u017A\u0178\x03\x02\x02\x02\u017B" +
+		"\u017C\x07\x07\x02\x02\u017C\u017E\x07\b\x02\x02\u017D\u017B\x03\x02\x02" +
+		"\x02\u017E\u0181\x03\x02\x02\x02\u017F\u017D\x03\x02\x02\x02\u017F\u0180" +
+		"\x03\x02\x02\x02\u0180\u0183\x03\x02\x02\x02\u0181\u017F\x03\x02\x02\x02" +
+		"\u0182\u0165\x03\x02\x02\x02\u0182\u016C\x03\x02\x02\x02\u0182\u0173\x03" +
+		"\x02\x02\x02\u0183/\x03\x02\x02\x02\u0184\u0188\x052\x1A\x02\u0185\u0187" +
+		"\x054\x1B\x02\u0186\u0185\x03\x02\x02\x02\u0187\u018A\x03\x02\x02\x02" +
+		"\u0188\u0186\x03\x02\x02\x02\u0188\u0189\x03\x02\x02\x02\u0189\u018D\x03" +
+		"\x02\x02\x02\u018A\u0188\x03\x02\x02\x02\u018B\u018D\x05> \x02\u018C\u0184" +
+		"\x03\x02\x02\x02\u018C\u018B\x03\x02\x02\x02\u018D1\x03\x02\x02\x02\u018E" +
+		"\u018F\x07\t\x02\x02\u018F\u0190\x05$\x13\x02\u0190\u0191\x07\n\x02\x02" +
+		"\u0191\u01A2\x03\x02\x02\x02\u0192\u01A2\t\r\x02\x02\u0193\u01A2\x07P" +
+		"\x02\x02\u0194\u01A2\x07Q\x02\x02\u0195\u01A2\x07R\x02\x02\u0196\u01A2" +
+		"\x07N\x02\x02\u0197\u01A2\x07O\x02\x02\u0198\u01A2\x05@!\x02\u0199\u01A2" +
+		"\x05B\"\x02\u019A\u01A2\x07U\x02\x02\u019B\u019C\x07U\x02\x02\u019C\u01A2" +
+		"\x05F$\x02\u019D\u019E\x07\x18\x02\x02\u019E\u019F\x05\x1C\x0F\x02\u019F" +
+		"\u01A0\x05F$\x02\u01A0\u01A2\x03\x02\x02\x02\u01A1\u018E\x03\x02\x02\x02" +
+		"\u01A1\u0192\x03\x02\x02\x02\u01A1\u0193\x03\x02\x02\x02\u01A1\u0194\x03" +
+		"\x02\x02\x02\u01A1\u0195\x03\x02\x02\x02\u01A1\u0196\x03\x02\x02\x02\u01A1" +
+		"\u0197\x03\x02\x02\x02\u01A1\u0198\x03\x02\x02\x02\u01A1\u0199\x03\x02" +
+		"\x02\x02\u01A1\u019A\x03\x02\x02\x02\u01A1\u019B\x03\x02\x02\x02\u01A1" +
+		"\u019D\x03\x02\x02\x02\u01A23\x03\x02\x02\x02\u01A3\u01A7\x058\x1D\x02" +
+		"\u01A4\u01A7\x05:\x1E\x02\u01A5\u01A7\x05<\x1F\x02\u01A6\u01A3\x03\x02" +
+		"\x02\x02\u01A6\u01A4\x03\x02\x02\x02\u01A6\u01A5\x03\x02\x02\x02\u01A7" +
+		"5\x03\x02\x02\x02\u01A8\u01AB\x058\x1D\x02\u01A9\u01AB\x05:\x1E\x02\u01AA" +
+		"\u01A8\x03\x02\x02\x02\u01AA\u01A9\x03\x02\x02\x02\u01AB7\x03\x02\x02" +
+		"\x02\u01AC\u01AD\t\x0E\x02\x02\u01AD\u01AE\x07W\x02\x02\u01AE\u01AF\x05" +
+		"F$\x02\u01AF9\x03\x02\x02\x02\u01B0\u01B1\t\x0E\x02\x02\u01B1\u01B2\t" +
+		"\x0F\x02\x02\u01B2;\x03\x02\x02\x02\u01B3\u01B4\x07\x07\x02\x02\u01B4" +
+		"\u01B5\x05$\x13\x02\u01B5\u01B6\x07\b\x02\x02\u01B6=\x03\x02\x02\x02\u01B7" +
+		"\u01B8\x07\x18\x02\x02\u01B8\u01BD\x05\x1C\x0F\x02\u01B9\u01BA\x07\x07" +
+		"\x02\x02\u01BA\u01BB\x05$\x13\x02\u01BB\u01BC\x07\b\x02\x02\u01BC\u01BE" +
+		"\x03\x02\x02\x02\u01BD\u01B9\x03\x02\x02\x02\u01BE\u01BF\x03\x02\x02\x02" +
+		"\u01BF\u01BD\x03\x02\x02\x02\u01BF\u01C0\x03\x02\x02\x02\u01C0\u01C8\x03" +
+		"\x02\x02\x02\u01C1\u01C5\x056\x1C\x02\u01C2\u01C4\x054\x1B\x02\u01C3\u01C2" +
+		"\x03\x02\x02\x02\u01C4\u01C7\x03\x02\x02\x02\u01C5\u01C3\x03\x02\x02\x02" +
+		"\u01C5\u01C6\x03\x02\x02\x02\u01C6\u01C9\x03\x02\x02\x02\u01C7\u01C5\x03" +
+		"\x02\x02\x02\u01C8\u01C1\x03\x02\x02\x02\u01C8\u01C9\x03\x02\x02\x02\u01C9" +
+		"\u01E1\x03\x02\x02\x02\u01CA\u01CB\x07\x18\x02\x02\u01CB\u01CC\x05\x1C" +
+		"\x0F\x02\u01CC\u01CD\x07\x07\x02\x02\u01CD\u01CE\x07\b\x02\x02\u01CE\u01D7" +
+		"\x07\x05\x02\x02\u01CF\u01D4\x05$\x13\x02\u01D0\u01D1\x07\r\x02\x02\u01D1" +
+		"\u01D3\x05$\x13\x02\u01D2\u01D0\x03\x02\x02\x02\u01D3\u01D6\x03\x02\x02" +
+		"\x02\u01D4\u01D2\x03\x02\x02\x02\u01D4\u01D5\x03\x02\x02\x02\u01D5\u01D8" +
+		"\x03\x02\x02\x02\u01D6\u01D4\x03\x02\x02\x02\u01D7\u01CF\x03\x02\x02\x02" +
+		"\u01D7\u01D8\x03\x02\x02\x02\u01D8\u01D9\x03\x02\x02\x02\u01D9\u01DD\x07" +
+		"\x06\x02\x02\u01DA\u01DC\x054\x1B\x02\u01DB\u01DA\x03\x02\x02\x02\u01DC" +
+		"\u01DF\x03\x02\x02\x02\u01DD\u01DB\x03\x02\x02\x02\u01DD\u01DE\x03\x02" +
+		"\x02\x02\u01DE\u01E1\x03\x02\x02\x02\u01DF\u01DD\x03\x02\x02\x02\u01E0" +
+		"\u01B7\x03\x02\x02\x02\u01E0\u01CA\x03\x02\x02\x02\u01E1?\x03\x02\x02" +
+		"\x02\u01E2\u01E3\x07\x07\x02\x02\u01E3\u01E8\x05$\x13\x02\u01E4\u01E5" +
+		"\x07\r\x02\x02\u01E5\u01E7\x05$\x13\x02\u01E6\u01E4\x03\x02\x02\x02\u01E7" +
+		"\u01EA\x03\x02\x02\x02\u01E8\u01E6\x03\x02\x02\x02\u01E8\u01E9\x03\x02" +
+		"\x02\x02\u01E9\u01EB\x03\x02\x02\x02\u01EA\u01E8\x03\x02\x02\x02\u01EB" +
+		"\u01EC\x07\b\x02\x02\u01EC\u01F0\x03\x02\x02\x02\u01ED\u01EE\x07\x07\x02" +
+		"\x02\u01EE\u01F0\x07\b\x02\x02\u01EF\u01E2\x03\x02\x02\x02\u01EF\u01ED" +
+		"\x03\x02\x02\x02\u01F0A\x03\x02\x02\x02\u01F1\u01F2\x07\x07\x02\x02\u01F2" +
+		"\u01F7\x05D#\x02\u01F3\u01F4\x07\r\x02\x02\u01F4\u01F6\x05D#\x02\u01F5" +
+		"\u01F3\x03\x02\x02\x02\u01F6\u01F9\x03\x02\x02\x02\u01F7\u01F5\x03\x02" +
+		"\x02\x02\u01F7\u01F8\x03\x02\x02\x02\u01F8\u01FA\x03\x02\x02\x02\u01F9" +
+		"\u01F7\x03\x02\x02\x02\u01FA\u01FB\x07\b\x02\x02\u01FB\u0200\x03\x02\x02" +
+		"\x02\u01FC\u01FD\x07\x07\x02\x02\u01FD\u01FE\x076\x02\x02\u01FE\u0200" +
+		"\x07\b\x02\x02\u01FF\u01F1\x03\x02\x02\x02\u01FF\u01FC\x03\x02\x02\x02" +
+		"\u0200C\x03\x02\x02\x02\u0201\u0202\x05$\x13\x02\u0202\u0203\x076\x02" +
+		"\x02\u0203\u0204\x05$\x13\x02\u0204E\x03\x02\x02\x02\u0205\u020E\x07\t" +
+		"\x02\x02\u0206\u020B\x05H%\x02\u0207\u0208\x07\r\x02\x02\u0208\u020A\x05" +
+		"H%\x02\u0209\u0207\x03\x02\x02\x02\u020A\u020D\x03\x02\x02\x02\u020B\u0209" +
+		"\x03\x02\x02\x02\u020B\u020C\x03\x02\x02\x02\u020C\u020F\x03\x02\x02\x02" +
+		"\u020D\u020B\x03\x02\x02\x02\u020E\u0206\x03\x02\x02\x02\u020E\u020F\x03" +
+		"\x02\x02\x02\u020F\u0210\x03\x02\x02\x02\u0210\u0211\x07\n\x02\x02\u0211" +
+		"G\x03\x02\x02\x02\u0212\u0216\x05$\x13\x02\u0213\u0216\x05J&\x02\u0214" +
+		"\u0216\x05N(\x02\u0215\u0212\x03\x02\x02\x02\u0215\u0213\x03\x02\x02\x02" +
+		"\u0215\u0214\x03\x02\x02\x02\u0216I\x03\x02\x02\x02\u0217\u0225\x05L\'" +
+		"\x02\u0218\u0221\x07\t\x02\x02\u0219\u021E\x05L\'\x02\u021A\u021B\x07" +
+		"\r\x02\x02\u021B\u021D\x05L\'\x02\u021C\u021A\x03\x02\x02\x02\u021D\u0220" +
+		"\x03\x02\x02\x02\u021E\u021C\x03\x02\x02\x02\u021E\u021F\x03\x02\x02\x02" +
+		"\u021F\u0222\x03\x02\x02\x02\u0220\u021E\x03\x02\x02\x02\u0221\u0219\x03" +
+		"\x02\x02\x02\u0221\u0222\x03\x02\x02\x02\u0222\u0223\x03\x02\x02\x02\u0223" +
+		"\u0225\x07\n\x02\x02\u0224\u0217\x03\x02\x02\x02\u0224\u0218\x03\x02\x02" +
+		"\x02\u0225\u0226";
+	private static readonly _serializedATNSegment1: string =
+		"\x03\x02\x02\x02\u0226\u0229\x079\x02\x02\u0227\u022A\x05\x10\t\x02\u0228" +
+		"\u022A\x05$\x13\x02\u0229\u0227\x03\x02\x02\x02\u0229\u0228\x03\x02\x02" +
+		"\x02\u022AK\x03\x02\x02\x02\u022B\u022D\x05\x1A\x0E\x02\u022C\u022B\x03" +
+		"\x02\x02\x02\u022C\u022D\x03\x02\x02\x02\u022D\u022E\x03\x02\x02\x02\u022E" +
+		"\u022F\x07U\x02\x02\u022FM\x03\x02\x02\x02\u0230\u0231\x05\x1A\x0E\x02" +
+		"\u0231\u0232\x078\x02\x02\u0232\u0233\x07U\x02\x02\u0233\u023C\x03\x02" +
+		"\x02\x02\u0234\u0235\x05\x1A\x0E\x02\u0235\u0236\x078\x02\x02\u0236\u0237" +
+		"\x07\x18\x02\x02\u0237\u023C\x03\x02\x02\x02\u0238\u0239\x07\x1C\x02\x02" +
+		"\u0239\u023A\x078\x02\x02\u023A\u023C\x07U\x02\x02\u023B\u0230\x03\x02" +
+		"\x02\x02\u023B\u0234\x03\x02\x02\x02\u023B\u0238\x03\x02\x02\x02\u023C" +
+		"O\x03\x02\x02\x02>SYlow\x81\x89\x8E\x92\x96\x9B\xB3\xB5\xC3\xC8\xCC\xD2" +
+		"\xD6\xDE\xE8\xF0\xFA\xFD\u0102\u0135\u0137\u0145\u014C\u0155\u0161\u016A" +
+		"\u0171\u0178\u017F\u0182\u0188\u018C\u01A1\u01A6\u01AA\u01BF\u01C5\u01C8" +
+		"\u01D4\u01D7\u01DD\u01E0\u01E8\u01EF\u01F7\u01FF\u020B\u020E\u0215\u021E" +
+		"\u0221\u0224\u0229\u022C\u023B";
+	public static readonly _serializedATN: string = Utils.join(
+		[
+			painless_parser._serializedATNSegment0,
+			painless_parser._serializedATNSegment1,
+		],
+		"",
+	);
+	public static __ATN: ATN;
+	public static get _ATN(): ATN {
+		if (!painless_parser.__ATN) {
+			painless_parser.__ATN = new ATNDeserializer().deserialize(Utils.toCharArray(painless_parser._serializedATN));
+		}
+
+		return painless_parser.__ATN;
+	}
+
+}
+
+export class SourceContext extends ParserRuleContext {
+	public EOF(): TerminalNode { return this.getToken(painless_parser.EOF, 0); }
+	public function(): FunctionContext[];
+	public function(i: number): FunctionContext;
+	public function(i?: number): FunctionContext | FunctionContext[] {
+		if (i === undefined) {
+			return this.getRuleContexts(FunctionContext);
+		} else {
+			return this.getRuleContext(i, FunctionContext);
+		}
+	}
+	public statement(): StatementContext[];
+	public statement(i: number): StatementContext;
+	public statement(i?: number): StatementContext | StatementContext[] {
+		if (i === undefined) {
+			return this.getRuleContexts(StatementContext);
+		} else {
+			return this.getRuleContext(i, StatementContext);
+		}
+	}
+	constructor(parent: ParserRuleContext | undefined, invokingState: number) {
+		super(parent, invokingState);
+	}
+	// @Override
+	public get ruleIndex(): number { return painless_parser.RULE_source; }
+	// @Override
+	public enterRule(listener: painless_parserListener): void {
+		if (listener.enterSource) {
+			listener.enterSource(this);
+		}
+	}
+	// @Override
+	public exitRule(listener: painless_parserListener): void {
+		if (listener.exitSource) {
+			listener.exitSource(this);
+		}
+	}
+}
+
+
+export class FunctionContext extends ParserRuleContext {
+	public decltype(): DecltypeContext {
+		return this.getRuleContext(0, DecltypeContext);
+	}
+	public ID(): TerminalNode { return this.getToken(painless_parser.ID, 0); }
+	public parameters(): ParametersContext {
+		return this.getRuleContext(0, ParametersContext);
+	}
+	public block(): BlockContext {
+		return this.getRuleContext(0, BlockContext);
+	}
+	constructor(parent: ParserRuleContext | undefined, invokingState: number) {
+		super(parent, invokingState);
+	}
+	// @Override
+	public get ruleIndex(): number { return painless_parser.RULE_function; }
+	// @Override
+	public enterRule(listener: painless_parserListener): void {
+		if (listener.enterFunction) {
+			listener.enterFunction(this);
+		}
+	}
+	// @Override
+	public exitRule(listener: painless_parserListener): void {
+		if (listener.exitFunction) {
+			listener.exitFunction(this);
+		}
+	}
+}
+
+
+export class ParametersContext extends ParserRuleContext {
+	public LP(): TerminalNode { return this.getToken(painless_parser.LP, 0); }
+	public RP(): TerminalNode { return this.getToken(painless_parser.RP, 0); }
+	public decltype(): DecltypeContext[];
+	public decltype(i: number): DecltypeContext;
+	public decltype(i?: number): DecltypeContext | DecltypeContext[] {
+		if (i === undefined) {
+			return this.getRuleContexts(DecltypeContext);
+		} else {
+			return this.getRuleContext(i, DecltypeContext);
+		}
+	}
+	public ID(): TerminalNode[];
+	public ID(i: number): TerminalNode;
+	public ID(i?: number): TerminalNode | TerminalNode[] {
+		if (i === undefined) {
+			return this.getTokens(painless_parser.ID);
+		} else {
+			return this.getToken(painless_parser.ID, i);
+		}
+	}
+	public COMMA(): TerminalNode[];
+	public COMMA(i: number): TerminalNode;
+	public COMMA(i?: number): TerminalNode | TerminalNode[] {
+		if (i === undefined) {
+			return this.getTokens(painless_parser.COMMA);
+		} else {
+			return this.getToken(painless_parser.COMMA, i);
+		}
+	}
+	constructor(parent: ParserRuleContext | undefined, invokingState: number) {
+		super(parent, invokingState);
+	}
+	// @Override
+	public get ruleIndex(): number { return painless_parser.RULE_parameters; }
+	// @Override
+	public enterRule(listener: painless_parserListener): void {
+		if (listener.enterParameters) {
+			listener.enterParameters(this);
+		}
+	}
+	// @Override
+	public exitRule(listener: painless_parserListener): void {
+		if (listener.exitParameters) {
+			listener.exitParameters(this);
+		}
+	}
+}
+
+
+export class StatementContext extends ParserRuleContext {
+	public rstatement(): RstatementContext | undefined {
+		return this.tryGetRuleContext(0, RstatementContext);
+	}
+	public dstatement(): DstatementContext | undefined {
+		return this.tryGetRuleContext(0, DstatementContext);
+	}
+	public SEMICOLON(): TerminalNode | undefined { return this.tryGetToken(painless_parser.SEMICOLON, 0); }
+	public EOF(): TerminalNode | undefined { return this.tryGetToken(painless_parser.EOF, 0); }
+	constructor(parent: ParserRuleContext | undefined, invokingState: number) {
+		super(parent, invokingState);
+	}
+	// @Override
+	public get ruleIndex(): number { return painless_parser.RULE_statement; }
+	// @Override
+	public enterRule(listener: painless_parserListener): void {
+		if (listener.enterStatement) {
+			listener.enterStatement(this);
+		}
+	}
+	// @Override
+	public exitRule(listener: painless_parserListener): void {
+		if (listener.exitStatement) {
+			listener.exitStatement(this);
+		}
+	}
+}
+
+
+export class RstatementContext extends ParserRuleContext {
+	constructor(parent: ParserRuleContext | undefined, invokingState: number) {
+		super(parent, invokingState);
+	}
+	// @Override
+	public get ruleIndex(): number { return painless_parser.RULE_rstatement; }
+	public copyFrom(ctx: RstatementContext): void {
+		super.copyFrom(ctx);
+	}
+}
+export class IfContext extends RstatementContext {
+	public IF(): TerminalNode { return this.getToken(painless_parser.IF, 0); }
+	public LP(): TerminalNode { return this.getToken(painless_parser.LP, 0); }
+	public expression(): ExpressionContext {
+		return this.getRuleContext(0, ExpressionContext);
+	}
+	public RP(): TerminalNode { return this.getToken(painless_parser.RP, 0); }
+	public trailer(): TrailerContext[];
+	public trailer(i: number): TrailerContext;
+	public trailer(i?: number): TrailerContext | TrailerContext[] {
+		if (i === undefined) {
+			return this.getRuleContexts(TrailerContext);
+		} else {
+			return this.getRuleContext(i, TrailerContext);
+		}
+	}
+	public ELSE(): TerminalNode | undefined { return this.tryGetToken(painless_parser.ELSE, 0); }
+	constructor(ctx: RstatementContext) {
+		super(ctx.parent, ctx.invokingState);
+		this.copyFrom(ctx);
+	}
+	// @Override
+	public enterRule(listener: painless_parserListener): void {
+		if (listener.enterIf) {
+			listener.enterIf(this);
+		}
+	}
+	// @Override
+	public exitRule(listener: painless_parserListener): void {
+		if (listener.exitIf) {
+			listener.exitIf(this);
+		}
+	}
+}
+export class WhileContext extends RstatementContext {
+	public WHILE(): TerminalNode { return this.getToken(painless_parser.WHILE, 0); }
+	public LP(): TerminalNode { return this.getToken(painless_parser.LP, 0); }
+	public expression(): ExpressionContext {
+		return this.getRuleContext(0, ExpressionContext);
+	}
+	public RP(): TerminalNode { return this.getToken(painless_parser.RP, 0); }
+	public trailer(): TrailerContext | undefined {
+		return this.tryGetRuleContext(0, TrailerContext);
+	}
+	public empty(): EmptyContext | undefined {
+		return this.tryGetRuleContext(0, EmptyContext);
+	}
+	constructor(ctx: RstatementContext) {
+		super(ctx.parent, ctx.invokingState);
+		this.copyFrom(ctx);
+	}
+	// @Override
+	public enterRule(listener: painless_parserListener): void {
+		if (listener.enterWhile) {
+			listener.enterWhile(this);
+		}
+	}
+	// @Override
+	public exitRule(listener: painless_parserListener): void {
+		if (listener.exitWhile) {
+			listener.exitWhile(this);
+		}
+	}
+}
+export class ForContext extends RstatementContext {
+	public FOR(): TerminalNode { return this.getToken(painless_parser.FOR, 0); }
+	public LP(): TerminalNode { return this.getToken(painless_parser.LP, 0); }
+	public SEMICOLON(): TerminalNode[];
+	public SEMICOLON(i: number): TerminalNode;
+	public SEMICOLON(i?: number): TerminalNode | TerminalNode[] {
+		if (i === undefined) {
+			return this.getTokens(painless_parser.SEMICOLON);
+		} else {
+			return this.getToken(painless_parser.SEMICOLON, i);
+		}
+	}
+	public RP(): TerminalNode { return this.getToken(painless_parser.RP, 0); }
+	public trailer(): TrailerContext | undefined {
+		return this.tryGetRuleContext(0, TrailerContext);
+	}
+	public empty(): EmptyContext | undefined {
+		return this.tryGetRuleContext(0, EmptyContext);
+	}
+	public initializer(): InitializerContext | undefined {
+		return this.tryGetRuleContext(0, InitializerContext);
+	}
+	public expression(): ExpressionContext | undefined {
+		return this.tryGetRuleContext(0, ExpressionContext);
+	}
+	public afterthought(): AfterthoughtContext | undefined {
+		return this.tryGetRuleContext(0, AfterthoughtContext);
+	}
+	constructor(ctx: RstatementContext) {
+		super(ctx.parent, ctx.invokingState);
+		this.copyFrom(ctx);
+	}
+	// @Override
+	public enterRule(listener: painless_parserListener): void {
+		if (listener.enterFor) {
+			listener.enterFor(this);
+		}
+	}
+	// @Override
+	public exitRule(listener: painless_parserListener): void {
+		if (listener.exitFor) {
+			listener.exitFor(this);
+		}
+	}
+}
+export class EachContext extends RstatementContext {
+	public FOR(): TerminalNode { return this.getToken(painless_parser.FOR, 0); }
+	public LP(): TerminalNode { return this.getToken(painless_parser.LP, 0); }
+	public decltype(): DecltypeContext {
+		return this.getRuleContext(0, DecltypeContext);
+	}
+	public ID(): TerminalNode { return this.getToken(painless_parser.ID, 0); }
+	public COLON(): TerminalNode { return this.getToken(painless_parser.COLON, 0); }
+	public expression(): ExpressionContext {
+		return this.getRuleContext(0, ExpressionContext);
+	}
+	public RP(): TerminalNode { return this.getToken(painless_parser.RP, 0); }
+	public trailer(): TrailerContext {
+		return this.getRuleContext(0, TrailerContext);
+	}
+	constructor(ctx: RstatementContext) {
+		super(ctx.parent, ctx.invokingState);
+		this.copyFrom(ctx);
+	}
+	// @Override
+	public enterRule(listener: painless_parserListener): void {
+		if (listener.enterEach) {
+			listener.enterEach(this);
+		}
+	}
+	// @Override
+	public exitRule(listener: painless_parserListener): void {
+		if (listener.exitEach) {
+			listener.exitEach(this);
+		}
+	}
+}
+export class IneachContext extends RstatementContext {
+	public FOR(): TerminalNode { return this.getToken(painless_parser.FOR, 0); }
+	public LP(): TerminalNode { return this.getToken(painless_parser.LP, 0); }
+	public ID(): TerminalNode { return this.getToken(painless_parser.ID, 0); }
+	public IN(): TerminalNode { return this.getToken(painless_parser.IN, 0); }
+	public expression(): ExpressionContext {
+		return this.getRuleContext(0, ExpressionContext);
+	}
+	public RP(): TerminalNode { return this.getToken(painless_parser.RP, 0); }
+	public trailer(): TrailerContext {
+		return this.getRuleContext(0, TrailerContext);
+	}
+	constructor(ctx: RstatementContext) {
+		super(ctx.parent, ctx.invokingState);
+		this.copyFrom(ctx);
+	}
+	// @Override
+	public enterRule(listener: painless_parserListener): void {
+		if (listener.enterIneach) {
+			listener.enterIneach(this);
+		}
+	}
+	// @Override
+	public exitRule(listener: painless_parserListener): void {
+		if (listener.exitIneach) {
+			listener.exitIneach(this);
+		}
+	}
+}
+export class TryContext extends RstatementContext {
+	public TRY(): TerminalNode { return this.getToken(painless_parser.TRY, 0); }
+	public block(): BlockContext {
+		return this.getRuleContext(0, BlockContext);
+	}
+	public trap(): TrapContext[];
+	public trap(i: number): TrapContext;
+	public trap(i?: number): TrapContext | TrapContext[] {
+		if (i === undefined) {
+			return this.getRuleContexts(TrapContext);
+		} else {
+			return this.getRuleContext(i, TrapContext);
+		}
+	}
+	constructor(ctx: RstatementContext) {
+		super(ctx.parent, ctx.invokingState);
+		this.copyFrom(ctx);
+	}
+	// @Override
+	public enterRule(listener: painless_parserListener): void {
+		if (listener.enterTry) {
+			listener.enterTry(this);
+		}
+	}
+	// @Override
+	public exitRule(listener: painless_parserListener): void {
+		if (listener.exitTry) {
+			listener.exitTry(this);
+		}
+	}
+}
+
+
+export class DstatementContext extends ParserRuleContext {
+	constructor(parent: ParserRuleContext | undefined, invokingState: number) {
+		super(parent, invokingState);
+	}
+	// @Override
+	public get ruleIndex(): number { return painless_parser.RULE_dstatement; }
+	public copyFrom(ctx: DstatementContext): void {
+		super.copyFrom(ctx);
+	}
+}
+export class DoContext extends DstatementContext {
+	public DO(): TerminalNode { return this.getToken(painless_parser.DO, 0); }
+	public block(): BlockContext {
+		return this.getRuleContext(0, BlockContext);
+	}
+	public WHILE(): TerminalNode { return this.getToken(painless_parser.WHILE, 0); }
+	public LP(): TerminalNode { return this.getToken(painless_parser.LP, 0); }
+	public expression(): ExpressionContext {
+		return this.getRuleContext(0, ExpressionContext);
+	}
+	public RP(): TerminalNode { return this.getToken(painless_parser.RP, 0); }
+	constructor(ctx: DstatementContext) {
+		super(ctx.parent, ctx.invokingState);
+		this.copyFrom(ctx);
+	}
+	// @Override
+	public enterRule(listener: painless_parserListener): void {
+		if (listener.enterDo) {
+			listener.enterDo(this);
+		}
+	}
+	// @Override
+	public exitRule(listener: painless_parserListener): void {
+		if (listener.exitDo) {
+			listener.exitDo(this);
+		}
+	}
+}
+export class DeclContext extends DstatementContext {
+	public declaration(): DeclarationContext {
+		return this.getRuleContext(0, DeclarationContext);
+	}
+	constructor(ctx: DstatementContext) {
+		super(ctx.parent, ctx.invokingState);
+		this.copyFrom(ctx);
+	}
+	// @Override
+	public enterRule(listener: painless_parserListener): void {
+		if (listener.enterDecl) {
+			listener.enterDecl(this);
+		}
+	}
+	// @Override
+	public exitRule(listener: painless_parserListener): void {
+		if (listener.exitDecl) {
+			listener.exitDecl(this);
+		}
+	}
+}
+export class ContinueContext extends DstatementContext {
+	public CONTINUE(): TerminalNode { return this.getToken(painless_parser.CONTINUE, 0); }
+	constructor(ctx: DstatementContext) {
+		super(ctx.parent, ctx.invokingState);
+		this.copyFrom(ctx);
+	}
+	// @Override
+	public enterRule(listener: painless_parserListener): void {
+		if (listener.enterContinue) {
+			listener.enterContinue(this);
+		}
+	}
+	// @Override
+	public exitRule(listener: painless_parserListener): void {
+		if (listener.exitContinue) {
+			listener.exitContinue(this);
+		}
+	}
+}
+export class BreakContext extends DstatementContext {
+	public BREAK(): TerminalNode { return this.getToken(painless_parser.BREAK, 0); }
+	constructor(ctx: DstatementContext) {
+		super(ctx.parent, ctx.invokingState);
+		this.copyFrom(ctx);
+	}
+	// @Override
+	public enterRule(listener: painless_parserListener): void {
+		if (listener.enterBreak) {
+			listener.enterBreak(this);
+		}
+	}
+	// @Override
+	public exitRule(listener: painless_parserListener): void {
+		if (listener.exitBreak) {
+			listener.exitBreak(this);
+		}
+	}
+}
+export class ReturnContext extends DstatementContext {
+	public RETURN(): TerminalNode { return this.getToken(painless_parser.RETURN, 0); }
+	public expression(): ExpressionContext | undefined {
+		return this.tryGetRuleContext(0, ExpressionContext);
+	}
+	constructor(ctx: DstatementContext) {
+		super(ctx.parent, ctx.invokingState);
+		this.copyFrom(ctx);
+	}
+	// @Override
+	public enterRule(listener: painless_parserListener): void {
+		if (listener.enterReturn) {
+			listener.enterReturn(this);
+		}
+	}
+	// @Override
+	public exitRule(listener: painless_parserListener): void {
+		if (listener.exitReturn) {
+			listener.exitReturn(this);
+		}
+	}
+}
+export class ThrowContext extends DstatementContext {
+	public THROW(): TerminalNode { return this.getToken(painless_parser.THROW, 0); }
+	public expression(): ExpressionContext {
+		return this.getRuleContext(0, ExpressionContext);
+	}
+	constructor(ctx: DstatementContext) {
+		super(ctx.parent, ctx.invokingState);
+		this.copyFrom(ctx);
+	}
+	// @Override
+	public enterRule(listener: painless_parserListener): void {
+		if (listener.enterThrow) {
+			listener.enterThrow(this);
+		}
+	}
+	// @Override
+	public exitRule(listener: painless_parserListener): void {
+		if (listener.exitThrow) {
+			listener.exitThrow(this);
+		}
+	}
+}
+export class ExprContext extends DstatementContext {
+	public expression(): ExpressionContext {
+		return this.getRuleContext(0, ExpressionContext);
+	}
+	constructor(ctx: DstatementContext) {
+		super(ctx.parent, ctx.invokingState);
+		this.copyFrom(ctx);
+	}
+	// @Override
+	public enterRule(listener: painless_parserListener): void {
+		if (listener.enterExpr) {
+			listener.enterExpr(this);
+		}
+	}
+	// @Override
+	public exitRule(listener: painless_parserListener): void {
+		if (listener.exitExpr) {
+			listener.exitExpr(this);
+		}
+	}
+}
+
+
+export class TrailerContext extends ParserRuleContext {
+	public block(): BlockContext | undefined {
+		return this.tryGetRuleContext(0, BlockContext);
+	}
+	public statement(): StatementContext | undefined {
+		return this.tryGetRuleContext(0, StatementContext);
+	}
+	constructor(parent: ParserRuleContext | undefined, invokingState: number) {
+		super(parent, invokingState);
+	}
+	// @Override
+	public get ruleIndex(): number { return painless_parser.RULE_trailer; }
+	// @Override
+	public enterRule(listener: painless_parserListener): void {
+		if (listener.enterTrailer) {
+			listener.enterTrailer(this);
+		}
+	}
+	// @Override
+	public exitRule(listener: painless_parserListener): void {
+		if (listener.exitTrailer) {
+			listener.exitTrailer(this);
+		}
+	}
+}
+
+
+export class BlockContext extends ParserRuleContext {
+	public LBRACK(): TerminalNode { return this.getToken(painless_parser.LBRACK, 0); }
+	public RBRACK(): TerminalNode { return this.getToken(painless_parser.RBRACK, 0); }
+	public statement(): StatementContext[];
+	public statement(i: number): StatementContext;
+	public statement(i?: number): StatementContext | StatementContext[] {
+		if (i === undefined) {
+			return this.getRuleContexts(StatementContext);
+		} else {
+			return this.getRuleContext(i, StatementContext);
+		}
+	}
+	public dstatement(): DstatementContext | undefined {
+		return this.tryGetRuleContext(0, DstatementContext);
+	}
+	constructor(parent: ParserRuleContext | undefined, invokingState: number) {
+		super(parent, invokingState);
+	}
+	// @Override
+	public get ruleIndex(): number { return painless_parser.RULE_block; }
+	// @Override
+	public enterRule(listener: painless_parserListener): void {
+		if (listener.enterBlock) {
+			listener.enterBlock(this);
+		}
+	}
+	// @Override
+	public exitRule(listener: painless_parserListener): void {
+		if (listener.exitBlock) {
+			listener.exitBlock(this);
+		}
+	}
+}
+
+
+export class EmptyContext extends ParserRuleContext {
+	public SEMICOLON(): TerminalNode { return this.getToken(painless_parser.SEMICOLON, 0); }
+	constructor(parent: ParserRuleContext | undefined, invokingState: number) {
+		super(parent, invokingState);
+	}
+	// @Override
+	public get ruleIndex(): number { return painless_parser.RULE_empty; }
+	// @Override
+	public enterRule(listener: painless_parserListener): void {
+		if (listener.enterEmpty) {
+			listener.enterEmpty(this);
+		}
+	}
+	// @Override
+	public exitRule(listener: painless_parserListener): void {
+		if (listener.exitEmpty) {
+			listener.exitEmpty(this);
+		}
+	}
+}
+
+
+export class InitializerContext extends ParserRuleContext {
+	public declaration(): DeclarationContext | undefined {
+		return this.tryGetRuleContext(0, DeclarationContext);
+	}
+	public expression(): ExpressionContext | undefined {
+		return this.tryGetRuleContext(0, ExpressionContext);
+	}
+	constructor(parent: ParserRuleContext | undefined, invokingState: number) {
+		super(parent, invokingState);
+	}
+	// @Override
+	public get ruleIndex(): number { return painless_parser.RULE_initializer; }
+	// @Override
+	public enterRule(listener: painless_parserListener): void {
+		if (listener.enterInitializer) {
+			listener.enterInitializer(this);
+		}
+	}
+	// @Override
+	public exitRule(listener: painless_parserListener): void {
+		if (listener.exitInitializer) {
+			listener.exitInitializer(this);
+		}
+	}
+}
+
+
+export class AfterthoughtContext extends ParserRuleContext {
+	public expression(): ExpressionContext {
+		return this.getRuleContext(0, ExpressionContext);
+	}
+	constructor(parent: ParserRuleContext | undefined, invokingState: number) {
+		super(parent, invokingState);
+	}
+	// @Override
+	public get ruleIndex(): number { return painless_parser.RULE_afterthought; }
+	// @Override
+	public enterRule(listener: painless_parserListener): void {
+		if (listener.enterAfterthought) {
+			listener.enterAfterthought(this);
+		}
+	}
+	// @Override
+	public exitRule(listener: painless_parserListener): void {
+		if (listener.exitAfterthought) {
+			listener.exitAfterthought(this);
+		}
+	}
+}
+
+
+export class DeclarationContext extends ParserRuleContext {
+	public decltype(): DecltypeContext {
+		return this.getRuleContext(0, DecltypeContext);
+	}
+	public declvar(): DeclvarContext[];
+	public declvar(i: number): DeclvarContext;
+	public declvar(i?: number): DeclvarContext | DeclvarContext[] {
+		if (i === undefined) {
+			return this.getRuleContexts(DeclvarContext);
+		} else {
+			return this.getRuleContext(i, DeclvarContext);
+		}
+	}
+	public COMMA(): TerminalNode[];
+	public COMMA(i: number): TerminalNode;
+	public COMMA(i?: number): TerminalNode | TerminalNode[] {
+		if (i === undefined) {
+			return this.getTokens(painless_parser.COMMA);
+		} else {
+			return this.getToken(painless_parser.COMMA, i);
+		}
+	}
+	constructor(parent: ParserRuleContext | undefined, invokingState: number) {
+		super(parent, invokingState);
+	}
+	// @Override
+	public get ruleIndex(): number { return painless_parser.RULE_declaration; }
+	// @Override
+	public enterRule(listener: painless_parserListener): void {
+		if (listener.enterDeclaration) {
+			listener.enterDeclaration(this);
+		}
+	}
+	// @Override
+	public exitRule(listener: painless_parserListener): void {
+		if (listener.exitDeclaration) {
+			listener.exitDeclaration(this);
+		}
+	}
+}
+
+
+export class DecltypeContext extends ParserRuleContext {
+	public type(): TypeContext {
+		return this.getRuleContext(0, TypeContext);
+	}
+	public LBRACE(): TerminalNode[];
+	public LBRACE(i: number): TerminalNode;
+	public LBRACE(i?: number): TerminalNode | TerminalNode[] {
+		if (i === undefined) {
+			return this.getTokens(painless_parser.LBRACE);
+		} else {
+			return this.getToken(painless_parser.LBRACE, i);
+		}
+	}
+	public RBRACE(): TerminalNode[];
+	public RBRACE(i: number): TerminalNode;
+	public RBRACE(i?: number): TerminalNode | TerminalNode[] {
+		if (i === undefined) {
+			return this.getTokens(painless_parser.RBRACE);
+		} else {
+			return this.getToken(painless_parser.RBRACE, i);
+		}
+	}
+	constructor(parent: ParserRuleContext | undefined, invokingState: number) {
+		super(parent, invokingState);
+	}
+	// @Override
+	public get ruleIndex(): number { return painless_parser.RULE_decltype; }
+	// @Override
+	public enterRule(listener: painless_parserListener): void {
+		if (listener.enterDecltype) {
+			listener.enterDecltype(this);
+		}
+	}
+	// @Override
+	public exitRule(listener: painless_parserListener): void {
+		if (listener.exitDecltype) {
+			listener.exitDecltype(this);
+		}
+	}
+}
+
+
+export class TypeContext extends ParserRuleContext {
+	public DEF(): TerminalNode | undefined { return this.tryGetToken(painless_parser.DEF, 0); }
+	public PRIMITIVE(): TerminalNode | undefined { return this.tryGetToken(painless_parser.PRIMITIVE, 0); }
+	public ID(): TerminalNode | undefined { return this.tryGetToken(painless_parser.ID, 0); }
+	public DOT(): TerminalNode[];
+	public DOT(i: number): TerminalNode;
+	public DOT(i?: number): TerminalNode | TerminalNode[] {
+		if (i === undefined) {
+			return this.getTokens(painless_parser.DOT);
+		} else {
+			return this.getToken(painless_parser.DOT, i);
+		}
+	}
+	public DOTID(): TerminalNode[];
+	public DOTID(i: number): TerminalNode;
+	public DOTID(i?: number): TerminalNode | TerminalNode[] {
+		if (i === undefined) {
+			return this.getTokens(painless_parser.DOTID);
+		} else {
+			return this.getToken(painless_parser.DOTID, i);
+		}
+	}
+	constructor(parent: ParserRuleContext | undefined, invokingState: number) {
+		super(parent, invokingState);
+	}
+	// @Override
+	public get ruleIndex(): number { return painless_parser.RULE_type; }
+	// @Override
+	public enterRule(listener: painless_parserListener): void {
+		if (listener.enterType) {
+			listener.enterType(this);
+		}
+	}
+	// @Override
+	public exitRule(listener: painless_parserListener): void {
+		if (listener.exitType) {
+			listener.exitType(this);
+		}
+	}
+}
+
+
+export class DeclvarContext extends ParserRuleContext {
+	public ID(): TerminalNode { return this.getToken(painless_parser.ID, 0); }
+	public ASSIGN(): TerminalNode | undefined { return this.tryGetToken(painless_parser.ASSIGN, 0); }
+	public expression(): ExpressionContext | undefined {
+		return this.tryGetRuleContext(0, ExpressionContext);
+	}
+	constructor(parent: ParserRuleContext | undefined, invokingState: number) {
+		super(parent, invokingState);
+	}
+	// @Override
+	public get ruleIndex(): number { return painless_parser.RULE_declvar; }
+	// @Override
+	public enterRule(listener: painless_parserListener): void {
+		if (listener.enterDeclvar) {
+			listener.enterDeclvar(this);
+		}
+	}
+	// @Override
+	public exitRule(listener: painless_parserListener): void {
+		if (listener.exitDeclvar) {
+			listener.exitDeclvar(this);
+		}
+	}
+}
+
+
+export class TrapContext extends ParserRuleContext {
+	public CATCH(): TerminalNode { return this.getToken(painless_parser.CATCH, 0); }
+	public LP(): TerminalNode { return this.getToken(painless_parser.LP, 0); }
+	public type(): TypeContext {
+		return this.getRuleContext(0, TypeContext);
+	}
+	public ID(): TerminalNode { return this.getToken(painless_parser.ID, 0); }
+	public RP(): TerminalNode { return this.getToken(painless_parser.RP, 0); }
+	public block(): BlockContext {
+		return this.getRuleContext(0, BlockContext);
+	}
+	constructor(parent: ParserRuleContext | undefined, invokingState: number) {
+		super(parent, invokingState);
+	}
+	// @Override
+	public get ruleIndex(): number { return painless_parser.RULE_trap; }
+	// @Override
+	public enterRule(listener: painless_parserListener): void {
+		if (listener.enterTrap) {
+			listener.enterTrap(this);
+		}
+	}
+	// @Override
+	public exitRule(listener: painless_parserListener): void {
+		if (listener.exitTrap) {
+			listener.exitTrap(this);
+		}
+	}
+}
+
+
+export class NoncondexpressionContext extends ParserRuleContext {
+	constructor(parent: ParserRuleContext | undefined, invokingState: number) {
+		super(parent, invokingState);
+	}
+	// @Override
+	public get ruleIndex(): number { return painless_parser.RULE_noncondexpression; }
+	public copyFrom(ctx: NoncondexpressionContext): void {
+		super.copyFrom(ctx);
+	}
+}
+export class SingleContext extends NoncondexpressionContext {
+	public unary(): UnaryContext {
+		return this.getRuleContext(0, UnaryContext);
+	}
+	constructor(ctx: NoncondexpressionContext) {
+		super(ctx.parent, ctx.invokingState);
+		this.copyFrom(ctx);
+	}
+	// @Override
+	public enterRule(listener: painless_parserListener): void {
+		if (listener.enterSingle) {
+			listener.enterSingle(this);
+		}
+	}
+	// @Override
+	public exitRule(listener: painless_parserListener): void {
+		if (listener.exitSingle) {
+			listener.exitSingle(this);
+		}
+	}
+}
+export class BinaryContext extends NoncondexpressionContext {
+	public noncondexpression(): NoncondexpressionContext[];
+	public noncondexpression(i: number): NoncondexpressionContext;
+	public noncondexpression(i?: number): NoncondexpressionContext | NoncondexpressionContext[] {
+		if (i === undefined) {
+			return this.getRuleContexts(NoncondexpressionContext);
+		} else {
+			return this.getRuleContext(i, NoncondexpressionContext);
+		}
+	}
+	public MUL(): TerminalNode | undefined { return this.tryGetToken(painless_parser.MUL, 0); }
+	public DIV(): TerminalNode | undefined { return this.tryGetToken(painless_parser.DIV, 0); }
+	public REM(): TerminalNode | undefined { return this.tryGetToken(painless_parser.REM, 0); }
+	public ADD(): TerminalNode | undefined { return this.tryGetToken(painless_parser.ADD, 0); }
+	public SUB(): TerminalNode | undefined { return this.tryGetToken(painless_parser.SUB, 0); }
+	public FIND(): TerminalNode | undefined { return this.tryGetToken(painless_parser.FIND, 0); }
+	public MATCH(): TerminalNode | undefined { return this.tryGetToken(painless_parser.MATCH, 0); }
+	public LSH(): TerminalNode | undefined { return this.tryGetToken(painless_parser.LSH, 0); }
+	public RSH(): TerminalNode | undefined { return this.tryGetToken(painless_parser.RSH, 0); }
+	public USH(): TerminalNode | undefined { return this.tryGetToken(painless_parser.USH, 0); }
+	public BWAND(): TerminalNode | undefined { return this.tryGetToken(painless_parser.BWAND, 0); }
+	public XOR(): TerminalNode | undefined { return this.tryGetToken(painless_parser.XOR, 0); }
+	public BWOR(): TerminalNode | undefined { return this.tryGetToken(painless_parser.BWOR, 0); }
+	constructor(ctx: NoncondexpressionContext) {
+		super(ctx.parent, ctx.invokingState);
+		this.copyFrom(ctx);
+	}
+	// @Override
+	public enterRule(listener: painless_parserListener): void {
+		if (listener.enterBinary) {
+			listener.enterBinary(this);
+		}
+	}
+	// @Override
+	public exitRule(listener: painless_parserListener): void {
+		if (listener.exitBinary) {
+			listener.exitBinary(this);
+		}
+	}
+}
+export class CompContext extends NoncondexpressionContext {
+	public noncondexpression(): NoncondexpressionContext[];
+	public noncondexpression(i: number): NoncondexpressionContext;
+	public noncondexpression(i?: number): NoncondexpressionContext | NoncondexpressionContext[] {
+		if (i === undefined) {
+			return this.getRuleContexts(NoncondexpressionContext);
+		} else {
+			return this.getRuleContext(i, NoncondexpressionContext);
+		}
+	}
+	public LT(): TerminalNode | undefined { return this.tryGetToken(painless_parser.LT, 0); }
+	public LTE(): TerminalNode | undefined { return this.tryGetToken(painless_parser.LTE, 0); }
+	public GT(): TerminalNode | undefined { return this.tryGetToken(painless_parser.GT, 0); }
+	public GTE(): TerminalNode | undefined { return this.tryGetToken(painless_parser.GTE, 0); }
+	public EQ(): TerminalNode | undefined { return this.tryGetToken(painless_parser.EQ, 0); }
+	public EQR(): TerminalNode | undefined { return this.tryGetToken(painless_parser.EQR, 0); }
+	public NE(): TerminalNode | undefined { return this.tryGetToken(painless_parser.NE, 0); }
+	public NER(): TerminalNode | undefined { return this.tryGetToken(painless_parser.NER, 0); }
+	constructor(ctx: NoncondexpressionContext) {
+		super(ctx.parent, ctx.invokingState);
+		this.copyFrom(ctx);
+	}
+	// @Override
+	public enterRule(listener: painless_parserListener): void {
+		if (listener.enterComp) {
+			listener.enterComp(this);
+		}
+	}
+	// @Override
+	public exitRule(listener: painless_parserListener): void {
+		if (listener.exitComp) {
+			listener.exitComp(this);
+		}
+	}
+}
+export class InstanceofContext extends NoncondexpressionContext {
+	public noncondexpression(): NoncondexpressionContext {
+		return this.getRuleContext(0, NoncondexpressionContext);
+	}
+	public INSTANCEOF(): TerminalNode { return this.getToken(painless_parser.INSTANCEOF, 0); }
+	public decltype(): DecltypeContext {
+		return this.getRuleContext(0, DecltypeContext);
+	}
+	constructor(ctx: NoncondexpressionContext) {
+		super(ctx.parent, ctx.invokingState);
+		this.copyFrom(ctx);
+	}
+	// @Override
+	public enterRule(listener: painless_parserListener): void {
+		if (listener.enterInstanceof) {
+			listener.enterInstanceof(this);
+		}
+	}
+	// @Override
+	public exitRule(listener: painless_parserListener): void {
+		if (listener.exitInstanceof) {
+			listener.exitInstanceof(this);
+		}
+	}
+}
+export class BoolContext extends NoncondexpressionContext {
+	public noncondexpression(): NoncondexpressionContext[];
+	public noncondexpression(i: number): NoncondexpressionContext;
+	public noncondexpression(i?: number): NoncondexpressionContext | NoncondexpressionContext[] {
+		if (i === undefined) {
+			return this.getRuleContexts(NoncondexpressionContext);
+		} else {
+			return this.getRuleContext(i, NoncondexpressionContext);
+		}
+	}
+	public BOOLAND(): TerminalNode | undefined { return this.tryGetToken(painless_parser.BOOLAND, 0); }
+	public BOOLOR(): TerminalNode | undefined { return this.tryGetToken(painless_parser.BOOLOR, 0); }
+	constructor(ctx: NoncondexpressionContext) {
+		super(ctx.parent, ctx.invokingState);
+		this.copyFrom(ctx);
+	}
+	// @Override
+	public enterRule(listener: painless_parserListener): void {
+		if (listener.enterBool) {
+			listener.enterBool(this);
+		}
+	}
+	// @Override
+	public exitRule(listener: painless_parserListener): void {
+		if (listener.exitBool) {
+			listener.exitBool(this);
+		}
+	}
+}
+export class ElvisContext extends NoncondexpressionContext {
+	public noncondexpression(): NoncondexpressionContext[];
+	public noncondexpression(i: number): NoncondexpressionContext;
+	public noncondexpression(i?: number): NoncondexpressionContext | NoncondexpressionContext[] {
+		if (i === undefined) {
+			return this.getRuleContexts(NoncondexpressionContext);
+		} else {
+			return this.getRuleContext(i, NoncondexpressionContext);
+		}
+	}
+	public ELVIS(): TerminalNode { return this.getToken(painless_parser.ELVIS, 0); }
+	constructor(ctx: NoncondexpressionContext) {
+		super(ctx.parent, ctx.invokingState);
+		this.copyFrom(ctx);
+	}
+	// @Override
+	public enterRule(listener: painless_parserListener): void {
+		if (listener.enterElvis) {
+			listener.enterElvis(this);
+		}
+	}
+	// @Override
+	public exitRule(listener: painless_parserListener): void {
+		if (listener.exitElvis) {
+			listener.exitElvis(this);
+		}
+	}
+}
+
+
+export class ExpressionContext extends ParserRuleContext {
+	constructor(parent: ParserRuleContext | undefined, invokingState: number) {
+		super(parent, invokingState);
+	}
+	// @Override
+	public get ruleIndex(): number { return painless_parser.RULE_expression; }
+	public copyFrom(ctx: ExpressionContext): void {
+		super.copyFrom(ctx);
+	}
+}
+export class NonconditionalContext extends ExpressionContext {
+	public noncondexpression(): NoncondexpressionContext {
+		return this.getRuleContext(0, NoncondexpressionContext);
+	}
+	constructor(ctx: ExpressionContext) {
+		super(ctx.parent, ctx.invokingState);
+		this.copyFrom(ctx);
+	}
+	// @Override
+	public enterRule(listener: painless_parserListener): void {
+		if (listener.enterNonconditional) {
+			listener.enterNonconditional(this);
+		}
+	}
+	// @Override
+	public exitRule(listener: painless_parserListener): void {
+		if (listener.exitNonconditional) {
+			listener.exitNonconditional(this);
+		}
+	}
+}
+export class ConditionalContext extends ExpressionContext {
+	public noncondexpression(): NoncondexpressionContext {
+		return this.getRuleContext(0, NoncondexpressionContext);
+	}
+	public COND(): TerminalNode { return this.getToken(painless_parser.COND, 0); }
+	public expression(): ExpressionContext[];
+	public expression(i: number): ExpressionContext;
+	public expression(i?: number): ExpressionContext | ExpressionContext[] {
+		if (i === undefined) {
+			return this.getRuleContexts(ExpressionContext);
+		} else {
+			return this.getRuleContext(i, ExpressionContext);
+		}
+	}
+	public COLON(): TerminalNode { return this.getToken(painless_parser.COLON, 0); }
+	constructor(ctx: ExpressionContext) {
+		super(ctx.parent, ctx.invokingState);
+		this.copyFrom(ctx);
+	}
+	// @Override
+	public enterRule(listener: painless_parserListener): void {
+		if (listener.enterConditional) {
+			listener.enterConditional(this);
+		}
+	}
+	// @Override
+	public exitRule(listener: painless_parserListener): void {
+		if (listener.exitConditional) {
+			listener.exitConditional(this);
+		}
+	}
+}
+export class AssignmentContext extends ExpressionContext {
+	public noncondexpression(): NoncondexpressionContext {
+		return this.getRuleContext(0, NoncondexpressionContext);
+	}
+	public expression(): ExpressionContext {
+		return this.getRuleContext(0, ExpressionContext);
+	}
+	public ASSIGN(): TerminalNode | undefined { return this.tryGetToken(painless_parser.ASSIGN, 0); }
+	public AADD(): TerminalNode | undefined { return this.tryGetToken(painless_parser.AADD, 0); }
+	public ASUB(): TerminalNode | undefined { return this.tryGetToken(painless_parser.ASUB, 0); }
+	public AMUL(): TerminalNode | undefined { return this.tryGetToken(painless_parser.AMUL, 0); }
+	public ADIV(): TerminalNode | undefined { return this.tryGetToken(painless_parser.ADIV, 0); }
+	public AREM(): TerminalNode | undefined { return this.tryGetToken(painless_parser.AREM, 0); }
+	public AAND(): TerminalNode | undefined { return this.tryGetToken(painless_parser.AAND, 0); }
+	public AXOR(): TerminalNode | undefined { return this.tryGetToken(painless_parser.AXOR, 0); }
+	public AOR(): TerminalNode | undefined { return this.tryGetToken(painless_parser.AOR, 0); }
+	public ALSH(): TerminalNode | undefined { return this.tryGetToken(painless_parser.ALSH, 0); }
+	public ARSH(): TerminalNode | undefined { return this.tryGetToken(painless_parser.ARSH, 0); }
+	public AUSH(): TerminalNode | undefined { return this.tryGetToken(painless_parser.AUSH, 0); }
+	constructor(ctx: ExpressionContext) {
+		super(ctx.parent, ctx.invokingState);
+		this.copyFrom(ctx);
+	}
+	// @Override
+	public enterRule(listener: painless_parserListener): void {
+		if (listener.enterAssignment) {
+			listener.enterAssignment(this);
+		}
+	}
+	// @Override
+	public exitRule(listener: painless_parserListener): void {
+		if (listener.exitAssignment) {
+			listener.exitAssignment(this);
+		}
+	}
+}
+
+
+export class UnaryContext extends ParserRuleContext {
+	constructor(parent: ParserRuleContext | undefined, invokingState: number) {
+		super(parent, invokingState);
+	}
+	// @Override
+	public get ruleIndex(): number { return painless_parser.RULE_unary; }
+	public copyFrom(ctx: UnaryContext): void {
+		super.copyFrom(ctx);
+	}
+}
+export class PreContext extends UnaryContext {
+	public chain(): ChainContext {
+		return this.getRuleContext(0, ChainContext);
+	}
+	public INCR(): TerminalNode | undefined { return this.tryGetToken(painless_parser.INCR, 0); }
+	public DECR(): TerminalNode | undefined { return this.tryGetToken(painless_parser.DECR, 0); }
+	constructor(ctx: UnaryContext) {
+		super(ctx.parent, ctx.invokingState);
+		this.copyFrom(ctx);
+	}
+	// @Override
+	public enterRule(listener: painless_parserListener): void {
+		if (listener.enterPre) {
+			listener.enterPre(this);
+		}
+	}
+	// @Override
+	public exitRule(listener: painless_parserListener): void {
+		if (listener.exitPre) {
+			listener.exitPre(this);
+		}
+	}
+}
+export class AddsubContext extends UnaryContext {
+	public unary(): UnaryContext {
+		return this.getRuleContext(0, UnaryContext);
+	}
+	public ADD(): TerminalNode | undefined { return this.tryGetToken(painless_parser.ADD, 0); }
+	public SUB(): TerminalNode | undefined { return this.tryGetToken(painless_parser.SUB, 0); }
+	constructor(ctx: UnaryContext) {
+		super(ctx.parent, ctx.invokingState);
+		this.copyFrom(ctx);
+	}
+	// @Override
+	public enterRule(listener: painless_parserListener): void {
+		if (listener.enterAddsub) {
+			listener.enterAddsub(this);
+		}
+	}
+	// @Override
+	public exitRule(listener: painless_parserListener): void {
+		if (listener.exitAddsub) {
+			listener.exitAddsub(this);
+		}
+	}
+}
+export class NotaddsubContext extends UnaryContext {
+	public unarynotaddsub(): UnarynotaddsubContext {
+		return this.getRuleContext(0, UnarynotaddsubContext);
+	}
+	constructor(ctx: UnaryContext) {
+		super(ctx.parent, ctx.invokingState);
+		this.copyFrom(ctx);
+	}
+	// @Override
+	public enterRule(listener: painless_parserListener): void {
+		if (listener.enterNotaddsub) {
+			listener.enterNotaddsub(this);
+		}
+	}
+	// @Override
+	public exitRule(listener: painless_parserListener): void {
+		if (listener.exitNotaddsub) {
+			listener.exitNotaddsub(this);
+		}
+	}
+}
+
+
+export class UnarynotaddsubContext extends ParserRuleContext {
+	constructor(parent: ParserRuleContext | undefined, invokingState: number) {
+		super(parent, invokingState);
+	}
+	// @Override
+	public get ruleIndex(): number { return painless_parser.RULE_unarynotaddsub; }
+	public copyFrom(ctx: UnarynotaddsubContext): void {
+		super.copyFrom(ctx);
+	}
+}
+export class ReadContext extends UnarynotaddsubContext {
+	public chain(): ChainContext {
+		return this.getRuleContext(0, ChainContext);
+	}
+	constructor(ctx: UnarynotaddsubContext) {
+		super(ctx.parent, ctx.invokingState);
+		this.copyFrom(ctx);
+	}
+	// @Override
+	public enterRule(listener: painless_parserListener): void {
+		if (listener.enterRead) {
+			listener.enterRead(this);
+		}
+	}
+	// @Override
+	public exitRule(listener: painless_parserListener): void {
+		if (listener.exitRead) {
+			listener.exitRead(this);
+		}
+	}
+}
+export class PostContext extends UnarynotaddsubContext {
+	public chain(): ChainContext {
+		return this.getRuleContext(0, ChainContext);
+	}
+	public INCR(): TerminalNode | undefined { return this.tryGetToken(painless_parser.INCR, 0); }
+	public DECR(): TerminalNode | undefined { return this.tryGetToken(painless_parser.DECR, 0); }
+	constructor(ctx: UnarynotaddsubContext) {
+		super(ctx.parent, ctx.invokingState);
+		this.copyFrom(ctx);
+	}
+	// @Override
+	public enterRule(listener: painless_parserListener): void {
+		if (listener.enterPost) {
+			listener.enterPost(this);
+		}
+	}
+	// @Override
+	public exitRule(listener: painless_parserListener): void {
+		if (listener.exitPost) {
+			listener.exitPost(this);
+		}
+	}
+}
+export class NotContext extends UnarynotaddsubContext {
+	public unary(): UnaryContext {
+		return this.getRuleContext(0, UnaryContext);
+	}
+	public BOOLNOT(): TerminalNode | undefined { return this.tryGetToken(painless_parser.BOOLNOT, 0); }
+	public BWNOT(): TerminalNode | undefined { return this.tryGetToken(painless_parser.BWNOT, 0); }
+	constructor(ctx: UnarynotaddsubContext) {
+		super(ctx.parent, ctx.invokingState);
+		this.copyFrom(ctx);
+	}
+	// @Override
+	public enterRule(listener: painless_parserListener): void {
+		if (listener.enterNot) {
+			listener.enterNot(this);
+		}
+	}
+	// @Override
+	public exitRule(listener: painless_parserListener): void {
+		if (listener.exitNot) {
+			listener.exitNot(this);
+		}
+	}
+}
+export class CastContext extends UnarynotaddsubContext {
+	public castexpression(): CastexpressionContext {
+		return this.getRuleContext(0, CastexpressionContext);
+	}
+	constructor(ctx: UnarynotaddsubContext) {
+		super(ctx.parent, ctx.invokingState);
+		this.copyFrom(ctx);
+	}
+	// @Override
+	public enterRule(listener: painless_parserListener): void {
+		if (listener.enterCast) {
+			listener.enterCast(this);
+		}
+	}
+	// @Override
+	public exitRule(listener: painless_parserListener): void {
+		if (listener.exitCast) {
+			listener.exitCast(this);
+		}
+	}
+}
+
+
+export class CastexpressionContext extends ParserRuleContext {
+	constructor(parent: ParserRuleContext | undefined, invokingState: number) {
+		super(parent, invokingState);
+	}
+	// @Override
+	public get ruleIndex(): number { return painless_parser.RULE_castexpression; }
+	public copyFrom(ctx: CastexpressionContext): void {
+		super.copyFrom(ctx);
+	}
+}
+export class PrimordefcastContext extends CastexpressionContext {
+	public LP(): TerminalNode { return this.getToken(painless_parser.LP, 0); }
+	public primordefcasttype(): PrimordefcasttypeContext {
+		return this.getRuleContext(0, PrimordefcasttypeContext);
+	}
+	public RP(): TerminalNode { return this.getToken(painless_parser.RP, 0); }
+	public unary(): UnaryContext {
+		return this.getRuleContext(0, UnaryContext);
+	}
+	constructor(ctx: CastexpressionContext) {
+		super(ctx.parent, ctx.invokingState);
+		this.copyFrom(ctx);
+	}
+	// @Override
+	public enterRule(listener: painless_parserListener): void {
+		if (listener.enterPrimordefcast) {
+			listener.enterPrimordefcast(this);
+		}
+	}
+	// @Override
+	public exitRule(listener: painless_parserListener): void {
+		if (listener.exitPrimordefcast) {
+			listener.exitPrimordefcast(this);
+		}
+	}
+}
+export class RefcastContext extends CastexpressionContext {
+	public LP(): TerminalNode { return this.getToken(painless_parser.LP, 0); }
+	public refcasttype(): RefcasttypeContext {
+		return this.getRuleContext(0, RefcasttypeContext);
+	}
+	public RP(): TerminalNode { return this.getToken(painless_parser.RP, 0); }
+	public unarynotaddsub(): UnarynotaddsubContext {
+		return this.getRuleContext(0, UnarynotaddsubContext);
+	}
+	constructor(ctx: CastexpressionContext) {
+		super(ctx.parent, ctx.invokingState);
+		this.copyFrom(ctx);
+	}
+	// @Override
+	public enterRule(listener: painless_parserListener): void {
+		if (listener.enterRefcast) {
+			listener.enterRefcast(this);
+		}
+	}
+	// @Override
+	public exitRule(listener: painless_parserListener): void {
+		if (listener.exitRefcast) {
+			listener.exitRefcast(this);
+		}
+	}
+}
+
+
+export class PrimordefcasttypeContext extends ParserRuleContext {
+	public DEF(): TerminalNode | undefined { return this.tryGetToken(painless_parser.DEF, 0); }
+	public PRIMITIVE(): TerminalNode | undefined { return this.tryGetToken(painless_parser.PRIMITIVE, 0); }
+	constructor(parent: ParserRuleContext | undefined, invokingState: number) {
+		super(parent, invokingState);
+	}
+	// @Override
+	public get ruleIndex(): number { return painless_parser.RULE_primordefcasttype; }
+	// @Override
+	public enterRule(listener: painless_parserListener): void {
+		if (listener.enterPrimordefcasttype) {
+			listener.enterPrimordefcasttype(this);
+		}
+	}
+	// @Override
+	public exitRule(listener: painless_parserListener): void {
+		if (listener.exitPrimordefcasttype) {
+			listener.exitPrimordefcasttype(this);
+		}
+	}
+}
+
+
+export class RefcasttypeContext extends ParserRuleContext {
+	public DEF(): TerminalNode | undefined { return this.tryGetToken(painless_parser.DEF, 0); }
+	public LBRACE(): TerminalNode[];
+	public LBRACE(i: number): TerminalNode;
+	public LBRACE(i?: number): TerminalNode | TerminalNode[] {
+		if (i === undefined) {
+			return this.getTokens(painless_parser.LBRACE);
+		} else {
+			return this.getToken(painless_parser.LBRACE, i);
+		}
+	}
+	public RBRACE(): TerminalNode[];
+	public RBRACE(i: number): TerminalNode;
+	public RBRACE(i?: number): TerminalNode | TerminalNode[] {
+		if (i === undefined) {
+			return this.getTokens(painless_parser.RBRACE);
+		} else {
+			return this.getToken(painless_parser.RBRACE, i);
+		}
+	}
+	public PRIMITIVE(): TerminalNode | undefined { return this.tryGetToken(painless_parser.PRIMITIVE, 0); }
+	public ID(): TerminalNode | undefined { return this.tryGetToken(painless_parser.ID, 0); }
+	public DOT(): TerminalNode[];
+	public DOT(i: number): TerminalNode;
+	public DOT(i?: number): TerminalNode | TerminalNode[] {
+		if (i === undefined) {
+			return this.getTokens(painless_parser.DOT);
+		} else {
+			return this.getToken(painless_parser.DOT, i);
+		}
+	}
+	public DOTID(): TerminalNode[];
+	public DOTID(i: number): TerminalNode;
+	public DOTID(i?: number): TerminalNode | TerminalNode[] {
+		if (i === undefined) {
+			return this.getTokens(painless_parser.DOTID);
+		} else {
+			return this.getToken(painless_parser.DOTID, i);
+		}
+	}
+	constructor(parent: ParserRuleContext | undefined, invokingState: number) {
+		super(parent, invokingState);
+	}
+	// @Override
+	public get ruleIndex(): number { return painless_parser.RULE_refcasttype; }
+	// @Override
+	public enterRule(listener: painless_parserListener): void {
+		if (listener.enterRefcasttype) {
+			listener.enterRefcasttype(this);
+		}
+	}
+	// @Override
+	public exitRule(listener: painless_parserListener): void {
+		if (listener.exitRefcasttype) {
+			listener.exitRefcasttype(this);
+		}
+	}
+}
+
+
+export class ChainContext extends ParserRuleContext {
+	constructor(parent: ParserRuleContext | undefined, invokingState: number) {
+		super(parent, invokingState);
+	}
+	// @Override
+	public get ruleIndex(): number { return painless_parser.RULE_chain; }
+	public copyFrom(ctx: ChainContext): void {
+		super.copyFrom(ctx);
+	}
+}
+export class DynamicContext extends ChainContext {
+	public primary(): PrimaryContext {
+		return this.getRuleContext(0, PrimaryContext);
+	}
+	public postfix(): PostfixContext[];
+	public postfix(i: number): PostfixContext;
+	public postfix(i?: number): PostfixContext | PostfixContext[] {
+		if (i === undefined) {
+			return this.getRuleContexts(PostfixContext);
+		} else {
+			return this.getRuleContext(i, PostfixContext);
+		}
+	}
+	constructor(ctx: ChainContext) {
+		super(ctx.parent, ctx.invokingState);
+		this.copyFrom(ctx);
+	}
+	// @Override
+	public enterRule(listener: painless_parserListener): void {
+		if (listener.enterDynamic) {
+			listener.enterDynamic(this);
+		}
+	}
+	// @Override
+	public exitRule(listener: painless_parserListener): void {
+		if (listener.exitDynamic) {
+			listener.exitDynamic(this);
+		}
+	}
+}
+export class NewarrayContext extends ChainContext {
+	public arrayinitializer(): ArrayinitializerContext {
+		return this.getRuleContext(0, ArrayinitializerContext);
+	}
+	constructor(ctx: ChainContext) {
+		super(ctx.parent, ctx.invokingState);
+		this.copyFrom(ctx);
+	}
+	// @Override
+	public enterRule(listener: painless_parserListener): void {
+		if (listener.enterNewarray) {
+			listener.enterNewarray(this);
+		}
+	}
+	// @Override
+	public exitRule(listener: painless_parserListener): void {
+		if (listener.exitNewarray) {
+			listener.exitNewarray(this);
+		}
+	}
+}
+
+
+export class PrimaryContext extends ParserRuleContext {
+	constructor(parent: ParserRuleContext | undefined, invokingState: number) {
+		super(parent, invokingState);
+	}
+	// @Override
+	public get ruleIndex(): number { return painless_parser.RULE_primary; }
+	public copyFrom(ctx: PrimaryContext): void {
+		super.copyFrom(ctx);
+	}
+}
+export class PrecedenceContext extends PrimaryContext {
+	public LP(): TerminalNode { return this.getToken(painless_parser.LP, 0); }
+	public expression(): ExpressionContext {
+		return this.getRuleContext(0, ExpressionContext);
+	}
+	public RP(): TerminalNode { return this.getToken(painless_parser.RP, 0); }
+	constructor(ctx: PrimaryContext) {
+		super(ctx.parent, ctx.invokingState);
+		this.copyFrom(ctx);
+	}
+	// @Override
+	public enterRule(listener: painless_parserListener): void {
+		if (listener.enterPrecedence) {
+			listener.enterPrecedence(this);
+		}
+	}
+	// @Override
+	public exitRule(listener: painless_parserListener): void {
+		if (listener.exitPrecedence) {
+			listener.exitPrecedence(this);
+		}
+	}
+}
+export class NumericContext extends PrimaryContext {
+	public OCTAL(): TerminalNode | undefined { return this.tryGetToken(painless_parser.OCTAL, 0); }
+	public HEX(): TerminalNode | undefined { return this.tryGetToken(painless_parser.HEX, 0); }
+	public INTEGER(): TerminalNode | undefined { return this.tryGetToken(painless_parser.INTEGER, 0); }
+	public DECIMAL(): TerminalNode | undefined { return this.tryGetToken(painless_parser.DECIMAL, 0); }
+	constructor(ctx: PrimaryContext) {
+		super(ctx.parent, ctx.invokingState);
+		this.copyFrom(ctx);
+	}
+	// @Override
+	public enterRule(listener: painless_parserListener): void {
+		if (listener.enterNumeric) {
+			listener.enterNumeric(this);
+		}
+	}
+	// @Override
+	public exitRule(listener: painless_parserListener): void {
+		if (listener.exitNumeric) {
+			listener.exitNumeric(this);
+		}
+	}
+}
+export class TrueContext extends PrimaryContext {
+	public TRUE(): TerminalNode { return this.getToken(painless_parser.TRUE, 0); }
+	constructor(ctx: PrimaryContext) {
+		super(ctx.parent, ctx.invokingState);
+		this.copyFrom(ctx);
+	}
+	// @Override
+	public enterRule(listener: painless_parserListener): void {
+		if (listener.enterTrue) {
+			listener.enterTrue(this);
+		}
+	}
+	// @Override
+	public exitRule(listener: painless_parserListener): void {
+		if (listener.exitTrue) {
+			listener.exitTrue(this);
+		}
+	}
+}
+export class FalseContext extends PrimaryContext {
+	public FALSE(): TerminalNode { return this.getToken(painless_parser.FALSE, 0); }
+	constructor(ctx: PrimaryContext) {
+		super(ctx.parent, ctx.invokingState);
+		this.copyFrom(ctx);
+	}
+	// @Override
+	public enterRule(listener: painless_parserListener): void {
+		if (listener.enterFalse) {
+			listener.enterFalse(this);
+		}
+	}
+	// @Override
+	public exitRule(listener: painless_parserListener): void {
+		if (listener.exitFalse) {
+			listener.exitFalse(this);
+		}
+	}
+}
+export class NullContext extends PrimaryContext {
+	public NULL(): TerminalNode { return this.getToken(painless_parser.NULL, 0); }
+	constructor(ctx: PrimaryContext) {
+		super(ctx.parent, ctx.invokingState);
+		this.copyFrom(ctx);
+	}
+	// @Override
+	public enterRule(listener: painless_parserListener): void {
+		if (listener.enterNull) {
+			listener.enterNull(this);
+		}
+	}
+	// @Override
+	public exitRule(listener: painless_parserListener): void {
+		if (listener.exitNull) {
+			listener.exitNull(this);
+		}
+	}
+}
+export class StringContext extends PrimaryContext {
+	public STRING(): TerminalNode { return this.getToken(painless_parser.STRING, 0); }
+	constructor(ctx: PrimaryContext) {
+		super(ctx.parent, ctx.invokingState);
+		this.copyFrom(ctx);
+	}
+	// @Override
+	public enterRule(listener: painless_parserListener): void {
+		if (listener.enterString) {
+			listener.enterString(this);
+		}
+	}
+	// @Override
+	public exitRule(listener: painless_parserListener): void {
+		if (listener.exitString) {
+			listener.exitString(this);
+		}
+	}
+}
+export class RegexContext extends PrimaryContext {
+	public REGEX(): TerminalNode { return this.getToken(painless_parser.REGEX, 0); }
+	constructor(ctx: PrimaryContext) {
+		super(ctx.parent, ctx.invokingState);
+		this.copyFrom(ctx);
+	}
+	// @Override
+	public enterRule(listener: painless_parserListener): void {
+		if (listener.enterRegex) {
+			listener.enterRegex(this);
+		}
+	}
+	// @Override
+	public exitRule(listener: painless_parserListener): void {
+		if (listener.exitRegex) {
+			listener.exitRegex(this);
+		}
+	}
+}
+export class ListinitContext extends PrimaryContext {
+	public listinitializer(): ListinitializerContext {
+		return this.getRuleContext(0, ListinitializerContext);
+	}
+	constructor(ctx: PrimaryContext) {
+		super(ctx.parent, ctx.invokingState);
+		this.copyFrom(ctx);
+	}
+	// @Override
+	public enterRule(listener: painless_parserListener): void {
+		if (listener.enterListinit) {
+			listener.enterListinit(this);
+		}
+	}
+	// @Override
+	public exitRule(listener: painless_parserListener): void {
+		if (listener.exitListinit) {
+			listener.exitListinit(this);
+		}
+	}
+}
+export class MapinitContext extends PrimaryContext {
+	public mapinitializer(): MapinitializerContext {
+		return this.getRuleContext(0, MapinitializerContext);
+	}
+	constructor(ctx: PrimaryContext) {
+		super(ctx.parent, ctx.invokingState);
+		this.copyFrom(ctx);
+	}
+	// @Override
+	public enterRule(listener: painless_parserListener): void {
+		if (listener.enterMapinit) {
+			listener.enterMapinit(this);
+		}
+	}
+	// @Override
+	public exitRule(listener: painless_parserListener): void {
+		if (listener.exitMapinit) {
+			listener.exitMapinit(this);
+		}
+	}
+}
+export class VariableContext extends PrimaryContext {
+	public ID(): TerminalNode { return this.getToken(painless_parser.ID, 0); }
+	constructor(ctx: PrimaryContext) {
+		super(ctx.parent, ctx.invokingState);
+		this.copyFrom(ctx);
+	}
+	// @Override
+	public enterRule(listener: painless_parserListener): void {
+		if (listener.enterVariable) {
+			listener.enterVariable(this);
+		}
+	}
+	// @Override
+	public exitRule(listener: painless_parserListener): void {
+		if (listener.exitVariable) {
+			listener.exitVariable(this);
+		}
+	}
+}
+export class CalllocalContext extends PrimaryContext {
+	public ID(): TerminalNode { return this.getToken(painless_parser.ID, 0); }
+	public arguments(): ArgumentsContext {
+		return this.getRuleContext(0, ArgumentsContext);
+	}
+	constructor(ctx: PrimaryContext) {
+		super(ctx.parent, ctx.invokingState);
+		this.copyFrom(ctx);
+	}
+	// @Override
+	public enterRule(listener: painless_parserListener): void {
+		if (listener.enterCalllocal) {
+			listener.enterCalllocal(this);
+		}
+	}
+	// @Override
+	public exitRule(listener: painless_parserListener): void {
+		if (listener.exitCalllocal) {
+			listener.exitCalllocal(this);
+		}
+	}
+}
+export class NewobjectContext extends PrimaryContext {
+	public NEW(): TerminalNode { return this.getToken(painless_parser.NEW, 0); }
+	public type(): TypeContext {
+		return this.getRuleContext(0, TypeContext);
+	}
+	public arguments(): ArgumentsContext {
+		return this.getRuleContext(0, ArgumentsContext);
+	}
+	constructor(ctx: PrimaryContext) {
+		super(ctx.parent, ctx.invokingState);
+		this.copyFrom(ctx);
+	}
+	// @Override
+	public enterRule(listener: painless_parserListener): void {
+		if (listener.enterNewobject) {
+			listener.enterNewobject(this);
+		}
+	}
+	// @Override
+	public exitRule(listener: painless_parserListener): void {
+		if (listener.exitNewobject) {
+			listener.exitNewobject(this);
+		}
+	}
+}
+
+
+export class PostfixContext extends ParserRuleContext {
+	public callinvoke(): CallinvokeContext | undefined {
+		return this.tryGetRuleContext(0, CallinvokeContext);
+	}
+	public fieldaccess(): FieldaccessContext | undefined {
+		return this.tryGetRuleContext(0, FieldaccessContext);
+	}
+	public braceaccess(): BraceaccessContext | undefined {
+		return this.tryGetRuleContext(0, BraceaccessContext);
+	}
+	constructor(parent: ParserRuleContext | undefined, invokingState: number) {
+		super(parent, invokingState);
+	}
+	// @Override
+	public get ruleIndex(): number { return painless_parser.RULE_postfix; }
+	// @Override
+	public enterRule(listener: painless_parserListener): void {
+		if (listener.enterPostfix) {
+			listener.enterPostfix(this);
+		}
+	}
+	// @Override
+	public exitRule(listener: painless_parserListener): void {
+		if (listener.exitPostfix) {
+			listener.exitPostfix(this);
+		}
+	}
+}
+
+
+export class PostdotContext extends ParserRuleContext {
+	public callinvoke(): CallinvokeContext | undefined {
+		return this.tryGetRuleContext(0, CallinvokeContext);
+	}
+	public fieldaccess(): FieldaccessContext | undefined {
+		return this.tryGetRuleContext(0, FieldaccessContext);
+	}
+	constructor(parent: ParserRuleContext | undefined, invokingState: number) {
+		super(parent, invokingState);
+	}
+	// @Override
+	public get ruleIndex(): number { return painless_parser.RULE_postdot; }
+	// @Override
+	public enterRule(listener: painless_parserListener): void {
+		if (listener.enterPostdot) {
+			listener.enterPostdot(this);
+		}
+	}
+	// @Override
+	public exitRule(listener: painless_parserListener): void {
+		if (listener.exitPostdot) {
+			listener.exitPostdot(this);
+		}
+	}
+}
+
+
+export class CallinvokeContext extends ParserRuleContext {
+	public DOTID(): TerminalNode { return this.getToken(painless_parser.DOTID, 0); }
+	public arguments(): ArgumentsContext {
+		return this.getRuleContext(0, ArgumentsContext);
+	}
+	public DOT(): TerminalNode | undefined { return this.tryGetToken(painless_parser.DOT, 0); }
+	public NSDOT(): TerminalNode | undefined { return this.tryGetToken(painless_parser.NSDOT, 0); }
+	constructor(parent: ParserRuleContext | undefined, invokingState: number) {
+		super(parent, invokingState);
+	}
+	// @Override
+	public get ruleIndex(): number { return painless_parser.RULE_callinvoke; }
+	// @Override
+	public enterRule(listener: painless_parserListener): void {
+		if (listener.enterCallinvoke) {
+			listener.enterCallinvoke(this);
+		}
+	}
+	// @Override
+	public exitRule(listener: painless_parserListener): void {
+		if (listener.exitCallinvoke) {
+			listener.exitCallinvoke(this);
+		}
+	}
+}
+
+
+export class FieldaccessContext extends ParserRuleContext {
+	public DOT(): TerminalNode | undefined { return this.tryGetToken(painless_parser.DOT, 0); }
+	public NSDOT(): TerminalNode | undefined { return this.tryGetToken(painless_parser.NSDOT, 0); }
+	public DOTID(): TerminalNode | undefined { return this.tryGetToken(painless_parser.DOTID, 0); }
+	public DOTINTEGER(): TerminalNode | undefined { return this.tryGetToken(painless_parser.DOTINTEGER, 0); }
+	constructor(parent: ParserRuleContext | undefined, invokingState: number) {
+		super(parent, invokingState);
+	}
+	// @Override
+	public get ruleIndex(): number { return painless_parser.RULE_fieldaccess; }
+	// @Override
+	public enterRule(listener: painless_parserListener): void {
+		if (listener.enterFieldaccess) {
+			listener.enterFieldaccess(this);
+		}
+	}
+	// @Override
+	public exitRule(listener: painless_parserListener): void {
+		if (listener.exitFieldaccess) {
+			listener.exitFieldaccess(this);
+		}
+	}
+}
+
+
+export class BraceaccessContext extends ParserRuleContext {
+	public LBRACE(): TerminalNode { return this.getToken(painless_parser.LBRACE, 0); }
+	public expression(): ExpressionContext {
+		return this.getRuleContext(0, ExpressionContext);
+	}
+	public RBRACE(): TerminalNode { return this.getToken(painless_parser.RBRACE, 0); }
+	constructor(parent: ParserRuleContext | undefined, invokingState: number) {
+		super(parent, invokingState);
+	}
+	// @Override
+	public get ruleIndex(): number { return painless_parser.RULE_braceaccess; }
+	// @Override
+	public enterRule(listener: painless_parserListener): void {
+		if (listener.enterBraceaccess) {
+			listener.enterBraceaccess(this);
+		}
+	}
+	// @Override
+	public exitRule(listener: painless_parserListener): void {
+		if (listener.exitBraceaccess) {
+			listener.exitBraceaccess(this);
+		}
+	}
+}
+
+
+export class ArrayinitializerContext extends ParserRuleContext {
+	constructor(parent: ParserRuleContext | undefined, invokingState: number) {
+		super(parent, invokingState);
+	}
+	// @Override
+	public get ruleIndex(): number { return painless_parser.RULE_arrayinitializer; }
+	public copyFrom(ctx: ArrayinitializerContext): void {
+		super.copyFrom(ctx);
+	}
+}
+export class NewstandardarrayContext extends ArrayinitializerContext {
+	public NEW(): TerminalNode { return this.getToken(painless_parser.NEW, 0); }
+	public type(): TypeContext {
+		return this.getRuleContext(0, TypeContext);
+	}
+	public LBRACE(): TerminalNode[];
+	public LBRACE(i: number): TerminalNode;
+	public LBRACE(i?: number): TerminalNode | TerminalNode[] {
+		if (i === undefined) {
+			return this.getTokens(painless_parser.LBRACE);
+		} else {
+			return this.getToken(painless_parser.LBRACE, i);
+		}
+	}
+	public expression(): ExpressionContext[];
+	public expression(i: number): ExpressionContext;
+	public expression(i?: number): ExpressionContext | ExpressionContext[] {
+		if (i === undefined) {
+			return this.getRuleContexts(ExpressionContext);
+		} else {
+			return this.getRuleContext(i, ExpressionContext);
+		}
+	}
+	public RBRACE(): TerminalNode[];
+	public RBRACE(i: number): TerminalNode;
+	public RBRACE(i?: number): TerminalNode | TerminalNode[] {
+		if (i === undefined) {
+			return this.getTokens(painless_parser.RBRACE);
+		} else {
+			return this.getToken(painless_parser.RBRACE, i);
+		}
+	}
+	public postdot(): PostdotContext | undefined {
+		return this.tryGetRuleContext(0, PostdotContext);
+	}
+	public postfix(): PostfixContext[];
+	public postfix(i: number): PostfixContext;
+	public postfix(i?: number): PostfixContext | PostfixContext[] {
+		if (i === undefined) {
+			return this.getRuleContexts(PostfixContext);
+		} else {
+			return this.getRuleContext(i, PostfixContext);
+		}
+	}
+	constructor(ctx: ArrayinitializerContext) {
+		super(ctx.parent, ctx.invokingState);
+		this.copyFrom(ctx);
+	}
+	// @Override
+	public enterRule(listener: painless_parserListener): void {
+		if (listener.enterNewstandardarray) {
+			listener.enterNewstandardarray(this);
+		}
+	}
+	// @Override
+	public exitRule(listener: painless_parserListener): void {
+		if (listener.exitNewstandardarray) {
+			listener.exitNewstandardarray(this);
+		}
+	}
+}
+export class NewinitializedarrayContext extends ArrayinitializerContext {
+	public NEW(): TerminalNode { return this.getToken(painless_parser.NEW, 0); }
+	public type(): TypeContext {
+		return this.getRuleContext(0, TypeContext);
+	}
+	public LBRACE(): TerminalNode { return this.getToken(painless_parser.LBRACE, 0); }
+	public RBRACE(): TerminalNode { return this.getToken(painless_parser.RBRACE, 0); }
+	public LBRACK(): TerminalNode { return this.getToken(painless_parser.LBRACK, 0); }
+	public RBRACK(): TerminalNode { return this.getToken(painless_parser.RBRACK, 0); }
+	public expression(): ExpressionContext[];
+	public expression(i: number): ExpressionContext;
+	public expression(i?: number): ExpressionContext | ExpressionContext[] {
+		if (i === undefined) {
+			return this.getRuleContexts(ExpressionContext);
+		} else {
+			return this.getRuleContext(i, ExpressionContext);
+		}
+	}
+	public postfix(): PostfixContext[];
+	public postfix(i: number): PostfixContext;
+	public postfix(i?: number): PostfixContext | PostfixContext[] {
+		if (i === undefined) {
+			return this.getRuleContexts(PostfixContext);
+		} else {
+			return this.getRuleContext(i, PostfixContext);
+		}
+	}
+	public COMMA(): TerminalNode[];
+	public COMMA(i: number): TerminalNode;
+	public COMMA(i?: number): TerminalNode | TerminalNode[] {
+		if (i === undefined) {
+			return this.getTokens(painless_parser.COMMA);
+		} else {
+			return this.getToken(painless_parser.COMMA, i);
+		}
+	}
+	constructor(ctx: ArrayinitializerContext) {
+		super(ctx.parent, ctx.invokingState);
+		this.copyFrom(ctx);
+	}
+	// @Override
+	public enterRule(listener: painless_parserListener): void {
+		if (listener.enterNewinitializedarray) {
+			listener.enterNewinitializedarray(this);
+		}
+	}
+	// @Override
+	public exitRule(listener: painless_parserListener): void {
+		if (listener.exitNewinitializedarray) {
+			listener.exitNewinitializedarray(this);
+		}
+	}
+}
+
+
+export class ListinitializerContext extends ParserRuleContext {
+	public LBRACE(): TerminalNode { return this.getToken(painless_parser.LBRACE, 0); }
+	public expression(): ExpressionContext[];
+	public expression(i: number): ExpressionContext;
+	public expression(i?: number): ExpressionContext | ExpressionContext[] {
+		if (i === undefined) {
+			return this.getRuleContexts(ExpressionContext);
+		} else {
+			return this.getRuleContext(i, ExpressionContext);
+		}
+	}
+	public RBRACE(): TerminalNode { return this.getToken(painless_parser.RBRACE, 0); }
+	public COMMA(): TerminalNode[];
+	public COMMA(i: number): TerminalNode;
+	public COMMA(i?: number): TerminalNode | TerminalNode[] {
+		if (i === undefined) {
+			return this.getTokens(painless_parser.COMMA);
+		} else {
+			return this.getToken(painless_parser.COMMA, i);
+		}
+	}
+	constructor(parent: ParserRuleContext | undefined, invokingState: number) {
+		super(parent, invokingState);
+	}
+	// @Override
+	public get ruleIndex(): number { return painless_parser.RULE_listinitializer; }
+	// @Override
+	public enterRule(listener: painless_parserListener): void {
+		if (listener.enterListinitializer) {
+			listener.enterListinitializer(this);
+		}
+	}
+	// @Override
+	public exitRule(listener: painless_parserListener): void {
+		if (listener.exitListinitializer) {
+			listener.exitListinitializer(this);
+		}
+	}
+}
+
+
+export class MapinitializerContext extends ParserRuleContext {
+	public LBRACE(): TerminalNode { return this.getToken(painless_parser.LBRACE, 0); }
+	public maptoken(): MaptokenContext[];
+	public maptoken(i: number): MaptokenContext;
+	public maptoken(i?: number): MaptokenContext | MaptokenContext[] {
+		if (i === undefined) {
+			return this.getRuleContexts(MaptokenContext);
+		} else {
+			return this.getRuleContext(i, MaptokenContext);
+		}
+	}
+	public RBRACE(): TerminalNode { return this.getToken(painless_parser.RBRACE, 0); }
+	public COMMA(): TerminalNode[];
+	public COMMA(i: number): TerminalNode;
+	public COMMA(i?: number): TerminalNode | TerminalNode[] {
+		if (i === undefined) {
+			return this.getTokens(painless_parser.COMMA);
+		} else {
+			return this.getToken(painless_parser.COMMA, i);
+		}
+	}
+	public COLON(): TerminalNode | undefined { return this.tryGetToken(painless_parser.COLON, 0); }
+	constructor(parent: ParserRuleContext | undefined, invokingState: number) {
+		super(parent, invokingState);
+	}
+	// @Override
+	public get ruleIndex(): number { return painless_parser.RULE_mapinitializer; }
+	// @Override
+	public enterRule(listener: painless_parserListener): void {
+		if (listener.enterMapinitializer) {
+			listener.enterMapinitializer(this);
+		}
+	}
+	// @Override
+	public exitRule(listener: painless_parserListener): void {
+		if (listener.exitMapinitializer) {
+			listener.exitMapinitializer(this);
+		}
+	}
+}
+
+
+export class MaptokenContext extends ParserRuleContext {
+	public expression(): ExpressionContext[];
+	public expression(i: number): ExpressionContext;
+	public expression(i?: number): ExpressionContext | ExpressionContext[] {
+		if (i === undefined) {
+			return this.getRuleContexts(ExpressionContext);
+		} else {
+			return this.getRuleContext(i, ExpressionContext);
+		}
+	}
+	public COLON(): TerminalNode { return this.getToken(painless_parser.COLON, 0); }
+	constructor(parent: ParserRuleContext | undefined, invokingState: number) {
+		super(parent, invokingState);
+	}
+	// @Override
+	public get ruleIndex(): number { return painless_parser.RULE_maptoken; }
+	// @Override
+	public enterRule(listener: painless_parserListener): void {
+		if (listener.enterMaptoken) {
+			listener.enterMaptoken(this);
+		}
+	}
+	// @Override
+	public exitRule(listener: painless_parserListener): void {
+		if (listener.exitMaptoken) {
+			listener.exitMaptoken(this);
+		}
+	}
+}
+
+
+export class ArgumentsContext extends ParserRuleContext {
+	public LP(): TerminalNode | undefined { return this.tryGetToken(painless_parser.LP, 0); }
+	public RP(): TerminalNode | undefined { return this.tryGetToken(painless_parser.RP, 0); }
+	public argument(): ArgumentContext[];
+	public argument(i: number): ArgumentContext;
+	public argument(i?: number): ArgumentContext | ArgumentContext[] {
+		if (i === undefined) {
+			return this.getRuleContexts(ArgumentContext);
+		} else {
+			return this.getRuleContext(i, ArgumentContext);
+		}
+	}
+	public COMMA(): TerminalNode[];
+	public COMMA(i: number): TerminalNode;
+	public COMMA(i?: number): TerminalNode | TerminalNode[] {
+		if (i === undefined) {
+			return this.getTokens(painless_parser.COMMA);
+		} else {
+			return this.getToken(painless_parser.COMMA, i);
+		}
+	}
+	constructor(parent: ParserRuleContext | undefined, invokingState: number) {
+		super(parent, invokingState);
+	}
+	// @Override
+	public get ruleIndex(): number { return painless_parser.RULE_arguments; }
+	// @Override
+	public enterRule(listener: painless_parserListener): void {
+		if (listener.enterArguments) {
+			listener.enterArguments(this);
+		}
+	}
+	// @Override
+	public exitRule(listener: painless_parserListener): void {
+		if (listener.exitArguments) {
+			listener.exitArguments(this);
+		}
+	}
+}
+
+
+export class ArgumentContext extends ParserRuleContext {
+	public expression(): ExpressionContext | undefined {
+		return this.tryGetRuleContext(0, ExpressionContext);
+	}
+	public lambda(): LambdaContext | undefined {
+		return this.tryGetRuleContext(0, LambdaContext);
+	}
+	public funcref(): FuncrefContext | undefined {
+		return this.tryGetRuleContext(0, FuncrefContext);
+	}
+	constructor(parent: ParserRuleContext | undefined, invokingState: number) {
+		super(parent, invokingState);
+	}
+	// @Override
+	public get ruleIndex(): number { return painless_parser.RULE_argument; }
+	// @Override
+	public enterRule(listener: painless_parserListener): void {
+		if (listener.enterArgument) {
+			listener.enterArgument(this);
+		}
+	}
+	// @Override
+	public exitRule(listener: painless_parserListener): void {
+		if (listener.exitArgument) {
+			listener.exitArgument(this);
+		}
+	}
+}
+
+
+export class LambdaContext extends ParserRuleContext {
+	public ARROW(): TerminalNode { return this.getToken(painless_parser.ARROW, 0); }
+	public lamtype(): LamtypeContext[];
+	public lamtype(i: number): LamtypeContext;
+	public lamtype(i?: number): LamtypeContext | LamtypeContext[] {
+		if (i === undefined) {
+			return this.getRuleContexts(LamtypeContext);
+		} else {
+			return this.getRuleContext(i, LamtypeContext);
+		}
+	}
+	public LP(): TerminalNode | undefined { return this.tryGetToken(painless_parser.LP, 0); }
+	public RP(): TerminalNode | undefined { return this.tryGetToken(painless_parser.RP, 0); }
+	public block(): BlockContext | undefined {
+		return this.tryGetRuleContext(0, BlockContext);
+	}
+	public expression(): ExpressionContext | undefined {
+		return this.tryGetRuleContext(0, ExpressionContext);
+	}
+	public COMMA(): TerminalNode[];
+	public COMMA(i: number): TerminalNode;
+	public COMMA(i?: number): TerminalNode | TerminalNode[] {
+		if (i === undefined) {
+			return this.getTokens(painless_parser.COMMA);
+		} else {
+			return this.getToken(painless_parser.COMMA, i);
+		}
+	}
+	constructor(parent: ParserRuleContext | undefined, invokingState: number) {
+		super(parent, invokingState);
+	}
+	// @Override
+	public get ruleIndex(): number { return painless_parser.RULE_lambda; }
+	// @Override
+	public enterRule(listener: painless_parserListener): void {
+		if (listener.enterLambda) {
+			listener.enterLambda(this);
+		}
+	}
+	// @Override
+	public exitRule(listener: painless_parserListener): void {
+		if (listener.exitLambda) {
+			listener.exitLambda(this);
+		}
+	}
+}
+
+
+export class LamtypeContext extends ParserRuleContext {
+	public ID(): TerminalNode { return this.getToken(painless_parser.ID, 0); }
+	public decltype(): DecltypeContext | undefined {
+		return this.tryGetRuleContext(0, DecltypeContext);
+	}
+	constructor(parent: ParserRuleContext | undefined, invokingState: number) {
+		super(parent, invokingState);
+	}
+	// @Override
+	public get ruleIndex(): number { return painless_parser.RULE_lamtype; }
+	// @Override
+	public enterRule(listener: painless_parserListener): void {
+		if (listener.enterLamtype) {
+			listener.enterLamtype(this);
+		}
+	}
+	// @Override
+	public exitRule(listener: painless_parserListener): void {
+		if (listener.exitLamtype) {
+			listener.exitLamtype(this);
+		}
+	}
+}
+
+
+export class FuncrefContext extends ParserRuleContext {
+	constructor(parent: ParserRuleContext | undefined, invokingState: number) {
+		super(parent, invokingState);
+	}
+	// @Override
+	public get ruleIndex(): number { return painless_parser.RULE_funcref; }
+	public copyFrom(ctx: FuncrefContext): void {
+		super.copyFrom(ctx);
+	}
+}
+export class ClassfuncrefContext extends FuncrefContext {
+	public decltype(): DecltypeContext {
+		return this.getRuleContext(0, DecltypeContext);
+	}
+	public REF(): TerminalNode { return this.getToken(painless_parser.REF, 0); }
+	public ID(): TerminalNode { return this.getToken(painless_parser.ID, 0); }
+	constructor(ctx: FuncrefContext) {
+		super(ctx.parent, ctx.invokingState);
+		this.copyFrom(ctx);
+	}
+	// @Override
+	public enterRule(listener: painless_parserListener): void {
+		if (listener.enterClassfuncref) {
+			listener.enterClassfuncref(this);
+		}
+	}
+	// @Override
+	public exitRule(listener: painless_parserListener): void {
+		if (listener.exitClassfuncref) {
+			listener.exitClassfuncref(this);
+		}
+	}
+}
+export class ConstructorfuncrefContext extends FuncrefContext {
+	public decltype(): DecltypeContext {
+		return this.getRuleContext(0, DecltypeContext);
+	}
+	public REF(): TerminalNode { return this.getToken(painless_parser.REF, 0); }
+	public NEW(): TerminalNode { return this.getToken(painless_parser.NEW, 0); }
+	constructor(ctx: FuncrefContext) {
+		super(ctx.parent, ctx.invokingState);
+		this.copyFrom(ctx);
+	}
+	// @Override
+	public enterRule(listener: painless_parserListener): void {
+		if (listener.enterConstructorfuncref) {
+			listener.enterConstructorfuncref(this);
+		}
+	}
+	// @Override
+	public exitRule(listener: painless_parserListener): void {
+		if (listener.exitConstructorfuncref) {
+			listener.exitConstructorfuncref(this);
+		}
+	}
+}
+export class LocalfuncrefContext extends FuncrefContext {
+	public THIS(): TerminalNode { return this.getToken(painless_parser.THIS, 0); }
+	public REF(): TerminalNode { return this.getToken(painless_parser.REF, 0); }
+	public ID(): TerminalNode { return this.getToken(painless_parser.ID, 0); }
+	constructor(ctx: FuncrefContext) {
+		super(ctx.parent, ctx.invokingState);
+		this.copyFrom(ctx);
+	}
+	// @Override
+	public enterRule(listener: painless_parserListener): void {
+		if (listener.enterLocalfuncref) {
+			listener.enterLocalfuncref(this);
+		}
+	}
+	// @Override
+	public exitRule(listener: painless_parserListener): void {
+		if (listener.exitLocalfuncref) {
+			listener.exitLocalfuncref(this);
+		}
+	}
+}
+
+
diff --git a/packages/kbn-monaco/src/painless/antlr/painless_parser_listener.ts b/packages/kbn-monaco/src/painless/antlr/painless_parser_listener.ts
new file mode 100644
index 0000000000000..bc2637d1f75d0
--- /dev/null
+++ b/packages/kbn-monaco/src/painless/antlr/painless_parser_listener.ts
@@ -0,0 +1,1182 @@
+// @ts-nocheck
+// Generated from ./src/painless/antlr/painless_parser.g4 by ANTLR 4.7.3-SNAPSHOT
+
+
+import { ParseTreeListener } from "antlr4ts/tree/ParseTreeListener";
+
+import { NewstandardarrayContext } from "./painless_parser";
+import { NewinitializedarrayContext } from "./painless_parser";
+import { PrimordefcastContext } from "./painless_parser";
+import { RefcastContext } from "./painless_parser";
+import { PreContext } from "./painless_parser";
+import { AddsubContext } from "./painless_parser";
+import { NotaddsubContext } from "./painless_parser";
+import { ClassfuncrefContext } from "./painless_parser";
+import { ConstructorfuncrefContext } from "./painless_parser";
+import { LocalfuncrefContext } from "./painless_parser";
+import { IfContext } from "./painless_parser";
+import { WhileContext } from "./painless_parser";
+import { ForContext } from "./painless_parser";
+import { EachContext } from "./painless_parser";
+import { IneachContext } from "./painless_parser";
+import { TryContext } from "./painless_parser";
+import { ReadContext } from "./painless_parser";
+import { PostContext } from "./painless_parser";
+import { NotContext } from "./painless_parser";
+import { CastContext } from "./painless_parser";
+import { DynamicContext } from "./painless_parser";
+import { NewarrayContext } from "./painless_parser";
+import { NonconditionalContext } from "./painless_parser";
+import { ConditionalContext } from "./painless_parser";
+import { AssignmentContext } from "./painless_parser";
+import { DoContext } from "./painless_parser";
+import { DeclContext } from "./painless_parser";
+import { ContinueContext } from "./painless_parser";
+import { BreakContext } from "./painless_parser";
+import { ReturnContext } from "./painless_parser";
+import { ThrowContext } from "./painless_parser";
+import { ExprContext } from "./painless_parser";
+import { SingleContext } from "./painless_parser";
+import { BinaryContext } from "./painless_parser";
+import { CompContext } from "./painless_parser";
+import { InstanceofContext } from "./painless_parser";
+import { BoolContext } from "./painless_parser";
+import { ElvisContext } from "./painless_parser";
+import { PrecedenceContext } from "./painless_parser";
+import { NumericContext } from "./painless_parser";
+import { TrueContext } from "./painless_parser";
+import { FalseContext } from "./painless_parser";
+import { NullContext } from "./painless_parser";
+import { StringContext } from "./painless_parser";
+import { RegexContext } from "./painless_parser";
+import { ListinitContext } from "./painless_parser";
+import { MapinitContext } from "./painless_parser";
+import { VariableContext } from "./painless_parser";
+import { CalllocalContext } from "./painless_parser";
+import { NewobjectContext } from "./painless_parser";
+import { SourceContext } from "./painless_parser";
+import { FunctionContext } from "./painless_parser";
+import { ParametersContext } from "./painless_parser";
+import { StatementContext } from "./painless_parser";
+import { RstatementContext } from "./painless_parser";
+import { DstatementContext } from "./painless_parser";
+import { TrailerContext } from "./painless_parser";
+import { BlockContext } from "./painless_parser";
+import { EmptyContext } from "./painless_parser";
+import { InitializerContext } from "./painless_parser";
+import { AfterthoughtContext } from "./painless_parser";
+import { DeclarationContext } from "./painless_parser";
+import { DecltypeContext } from "./painless_parser";
+import { TypeContext } from "./painless_parser";
+import { DeclvarContext } from "./painless_parser";
+import { TrapContext } from "./painless_parser";
+import { NoncondexpressionContext } from "./painless_parser";
+import { ExpressionContext } from "./painless_parser";
+import { UnaryContext } from "./painless_parser";
+import { UnarynotaddsubContext } from "./painless_parser";
+import { CastexpressionContext } from "./painless_parser";
+import { PrimordefcasttypeContext } from "./painless_parser";
+import { RefcasttypeContext } from "./painless_parser";
+import { ChainContext } from "./painless_parser";
+import { PrimaryContext } from "./painless_parser";
+import { PostfixContext } from "./painless_parser";
+import { PostdotContext } from "./painless_parser";
+import { CallinvokeContext } from "./painless_parser";
+import { FieldaccessContext } from "./painless_parser";
+import { BraceaccessContext } from "./painless_parser";
+import { ArrayinitializerContext } from "./painless_parser";
+import { ListinitializerContext } from "./painless_parser";
+import { MapinitializerContext } from "./painless_parser";
+import { MaptokenContext } from "./painless_parser";
+import { ArgumentsContext } from "./painless_parser";
+import { ArgumentContext } from "./painless_parser";
+import { LambdaContext } from "./painless_parser";
+import { LamtypeContext } from "./painless_parser";
+import { FuncrefContext } from "./painless_parser";
+
+
+/**
+ * This interface defines a complete listener for a parse tree produced by
+ * `painless_parser`.
+ */
+export interface painless_parserListener extends ParseTreeListener {
+	/**
+	 * Enter a parse tree produced by the `newstandardarray`
+	 * labeled alternative in `painless_parser.arrayinitializer`.
+	 * @param ctx the parse tree
+	 */
+	enterNewstandardarray?: (ctx: NewstandardarrayContext) => void;
+	/**
+	 * Exit a parse tree produced by the `newstandardarray`
+	 * labeled alternative in `painless_parser.arrayinitializer`.
+	 * @param ctx the parse tree
+	 */
+	exitNewstandardarray?: (ctx: NewstandardarrayContext) => void;
+
+	/**
+	 * Enter a parse tree produced by the `newinitializedarray`
+	 * labeled alternative in `painless_parser.arrayinitializer`.
+	 * @param ctx the parse tree
+	 */
+	enterNewinitializedarray?: (ctx: NewinitializedarrayContext) => void;
+	/**
+	 * Exit a parse tree produced by the `newinitializedarray`
+	 * labeled alternative in `painless_parser.arrayinitializer`.
+	 * @param ctx the parse tree
+	 */
+	exitNewinitializedarray?: (ctx: NewinitializedarrayContext) => void;
+
+	/**
+	 * Enter a parse tree produced by the `primordefcast`
+	 * labeled alternative in `painless_parser.castexpression`.
+	 * @param ctx the parse tree
+	 */
+	enterPrimordefcast?: (ctx: PrimordefcastContext) => void;
+	/**
+	 * Exit a parse tree produced by the `primordefcast`
+	 * labeled alternative in `painless_parser.castexpression`.
+	 * @param ctx the parse tree
+	 */
+	exitPrimordefcast?: (ctx: PrimordefcastContext) => void;
+
+	/**
+	 * Enter a parse tree produced by the `refcast`
+	 * labeled alternative in `painless_parser.castexpression`.
+	 * @param ctx the parse tree
+	 */
+	enterRefcast?: (ctx: RefcastContext) => void;
+	/**
+	 * Exit a parse tree produced by the `refcast`
+	 * labeled alternative in `painless_parser.castexpression`.
+	 * @param ctx the parse tree
+	 */
+	exitRefcast?: (ctx: RefcastContext) => void;
+
+	/**
+	 * Enter a parse tree produced by the `pre`
+	 * labeled alternative in `painless_parser.unary`.
+	 * @param ctx the parse tree
+	 */
+	enterPre?: (ctx: PreContext) => void;
+	/**
+	 * Exit a parse tree produced by the `pre`
+	 * labeled alternative in `painless_parser.unary`.
+	 * @param ctx the parse tree
+	 */
+	exitPre?: (ctx: PreContext) => void;
+
+	/**
+	 * Enter a parse tree produced by the `addsub`
+	 * labeled alternative in `painless_parser.unary`.
+	 * @param ctx the parse tree
+	 */
+	enterAddsub?: (ctx: AddsubContext) => void;
+	/**
+	 * Exit a parse tree produced by the `addsub`
+	 * labeled alternative in `painless_parser.unary`.
+	 * @param ctx the parse tree
+	 */
+	exitAddsub?: (ctx: AddsubContext) => void;
+
+	/**
+	 * Enter a parse tree produced by the `notaddsub`
+	 * labeled alternative in `painless_parser.unary`.
+	 * @param ctx the parse tree
+	 */
+	enterNotaddsub?: (ctx: NotaddsubContext) => void;
+	/**
+	 * Exit a parse tree produced by the `notaddsub`
+	 * labeled alternative in `painless_parser.unary`.
+	 * @param ctx the parse tree
+	 */
+	exitNotaddsub?: (ctx: NotaddsubContext) => void;
+
+	/**
+	 * Enter a parse tree produced by the `classfuncref`
+	 * labeled alternative in `painless_parser.funcref`.
+	 * @param ctx the parse tree
+	 */
+	enterClassfuncref?: (ctx: ClassfuncrefContext) => void;
+	/**
+	 * Exit a parse tree produced by the `classfuncref`
+	 * labeled alternative in `painless_parser.funcref`.
+	 * @param ctx the parse tree
+	 */
+	exitClassfuncref?: (ctx: ClassfuncrefContext) => void;
+
+	/**
+	 * Enter a parse tree produced by the `constructorfuncref`
+	 * labeled alternative in `painless_parser.funcref`.
+	 * @param ctx the parse tree
+	 */
+	enterConstructorfuncref?: (ctx: ConstructorfuncrefContext) => void;
+	/**
+	 * Exit a parse tree produced by the `constructorfuncref`
+	 * labeled alternative in `painless_parser.funcref`.
+	 * @param ctx the parse tree
+	 */
+	exitConstructorfuncref?: (ctx: ConstructorfuncrefContext) => void;
+
+	/**
+	 * Enter a parse tree produced by the `localfuncref`
+	 * labeled alternative in `painless_parser.funcref`.
+	 * @param ctx the parse tree
+	 */
+	enterLocalfuncref?: (ctx: LocalfuncrefContext) => void;
+	/**
+	 * Exit a parse tree produced by the `localfuncref`
+	 * labeled alternative in `painless_parser.funcref`.
+	 * @param ctx the parse tree
+	 */
+	exitLocalfuncref?: (ctx: LocalfuncrefContext) => void;
+
+	/**
+	 * Enter a parse tree produced by the `if`
+	 * labeled alternative in `painless_parser.rstatement`.
+	 * @param ctx the parse tree
+	 */
+	enterIf?: (ctx: IfContext) => void;
+	/**
+	 * Exit a parse tree produced by the `if`
+	 * labeled alternative in `painless_parser.rstatement`.
+	 * @param ctx the parse tree
+	 */
+	exitIf?: (ctx: IfContext) => void;
+
+	/**
+	 * Enter a parse tree produced by the `while`
+	 * labeled alternative in `painless_parser.rstatement`.
+	 * @param ctx the parse tree
+	 */
+	enterWhile?: (ctx: WhileContext) => void;
+	/**
+	 * Exit a parse tree produced by the `while`
+	 * labeled alternative in `painless_parser.rstatement`.
+	 * @param ctx the parse tree
+	 */
+	exitWhile?: (ctx: WhileContext) => void;
+
+	/**
+	 * Enter a parse tree produced by the `for`
+	 * labeled alternative in `painless_parser.rstatement`.
+	 * @param ctx the parse tree
+	 */
+	enterFor?: (ctx: ForContext) => void;
+	/**
+	 * Exit a parse tree produced by the `for`
+	 * labeled alternative in `painless_parser.rstatement`.
+	 * @param ctx the parse tree
+	 */
+	exitFor?: (ctx: ForContext) => void;
+
+	/**
+	 * Enter a parse tree produced by the `each`
+	 * labeled alternative in `painless_parser.rstatement`.
+	 * @param ctx the parse tree
+	 */
+	enterEach?: (ctx: EachContext) => void;
+	/**
+	 * Exit a parse tree produced by the `each`
+	 * labeled alternative in `painless_parser.rstatement`.
+	 * @param ctx the parse tree
+	 */
+	exitEach?: (ctx: EachContext) => void;
+
+	/**
+	 * Enter a parse tree produced by the `ineach`
+	 * labeled alternative in `painless_parser.rstatement`.
+	 * @param ctx the parse tree
+	 */
+	enterIneach?: (ctx: IneachContext) => void;
+	/**
+	 * Exit a parse tree produced by the `ineach`
+	 * labeled alternative in `painless_parser.rstatement`.
+	 * @param ctx the parse tree
+	 */
+	exitIneach?: (ctx: IneachContext) => void;
+
+	/**
+	 * Enter a parse tree produced by the `try`
+	 * labeled alternative in `painless_parser.rstatement`.
+	 * @param ctx the parse tree
+	 */
+	enterTry?: (ctx: TryContext) => void;
+	/**
+	 * Exit a parse tree produced by the `try`
+	 * labeled alternative in `painless_parser.rstatement`.
+	 * @param ctx the parse tree
+	 */
+	exitTry?: (ctx: TryContext) => void;
+
+	/**
+	 * Enter a parse tree produced by the `read`
+	 * labeled alternative in `painless_parser.unarynotaddsub`.
+	 * @param ctx the parse tree
+	 */
+	enterRead?: (ctx: ReadContext) => void;
+	/**
+	 * Exit a parse tree produced by the `read`
+	 * labeled alternative in `painless_parser.unarynotaddsub`.
+	 * @param ctx the parse tree
+	 */
+	exitRead?: (ctx: ReadContext) => void;
+
+	/**
+	 * Enter a parse tree produced by the `post`
+	 * labeled alternative in `painless_parser.unarynotaddsub`.
+	 * @param ctx the parse tree
+	 */
+	enterPost?: (ctx: PostContext) => void;
+	/**
+	 * Exit a parse tree produced by the `post`
+	 * labeled alternative in `painless_parser.unarynotaddsub`.
+	 * @param ctx the parse tree
+	 */
+	exitPost?: (ctx: PostContext) => void;
+
+	/**
+	 * Enter a parse tree produced by the `not`
+	 * labeled alternative in `painless_parser.unarynotaddsub`.
+	 * @param ctx the parse tree
+	 */
+	enterNot?: (ctx: NotContext) => void;
+	/**
+	 * Exit a parse tree produced by the `not`
+	 * labeled alternative in `painless_parser.unarynotaddsub`.
+	 * @param ctx the parse tree
+	 */
+	exitNot?: (ctx: NotContext) => void;
+
+	/**
+	 * Enter a parse tree produced by the `cast`
+	 * labeled alternative in `painless_parser.unarynotaddsub`.
+	 * @param ctx the parse tree
+	 */
+	enterCast?: (ctx: CastContext) => void;
+	/**
+	 * Exit a parse tree produced by the `cast`
+	 * labeled alternative in `painless_parser.unarynotaddsub`.
+	 * @param ctx the parse tree
+	 */
+	exitCast?: (ctx: CastContext) => void;
+
+	/**
+	 * Enter a parse tree produced by the `dynamic`
+	 * labeled alternative in `painless_parser.chain`.
+	 * @param ctx the parse tree
+	 */
+	enterDynamic?: (ctx: DynamicContext) => void;
+	/**
+	 * Exit a parse tree produced by the `dynamic`
+	 * labeled alternative in `painless_parser.chain`.
+	 * @param ctx the parse tree
+	 */
+	exitDynamic?: (ctx: DynamicContext) => void;
+
+	/**
+	 * Enter a parse tree produced by the `newarray`
+	 * labeled alternative in `painless_parser.chain`.
+	 * @param ctx the parse tree
+	 */
+	enterNewarray?: (ctx: NewarrayContext) => void;
+	/**
+	 * Exit a parse tree produced by the `newarray`
+	 * labeled alternative in `painless_parser.chain`.
+	 * @param ctx the parse tree
+	 */
+	exitNewarray?: (ctx: NewarrayContext) => void;
+
+	/**
+	 * Enter a parse tree produced by the `nonconditional`
+	 * labeled alternative in `painless_parser.expression`.
+	 * @param ctx the parse tree
+	 */
+	enterNonconditional?: (ctx: NonconditionalContext) => void;
+	/**
+	 * Exit a parse tree produced by the `nonconditional`
+	 * labeled alternative in `painless_parser.expression`.
+	 * @param ctx the parse tree
+	 */
+	exitNonconditional?: (ctx: NonconditionalContext) => void;
+
+	/**
+	 * Enter a parse tree produced by the `conditional`
+	 * labeled alternative in `painless_parser.expression`.
+	 * @param ctx the parse tree
+	 */
+	enterConditional?: (ctx: ConditionalContext) => void;
+	/**
+	 * Exit a parse tree produced by the `conditional`
+	 * labeled alternative in `painless_parser.expression`.
+	 * @param ctx the parse tree
+	 */
+	exitConditional?: (ctx: ConditionalContext) => void;
+
+	/**
+	 * Enter a parse tree produced by the `assignment`
+	 * labeled alternative in `painless_parser.expression`.
+	 * @param ctx the parse tree
+	 */
+	enterAssignment?: (ctx: AssignmentContext) => void;
+	/**
+	 * Exit a parse tree produced by the `assignment`
+	 * labeled alternative in `painless_parser.expression`.
+	 * @param ctx the parse tree
+	 */
+	exitAssignment?: (ctx: AssignmentContext) => void;
+
+	/**
+	 * Enter a parse tree produced by the `do`
+	 * labeled alternative in `painless_parser.dstatement`.
+	 * @param ctx the parse tree
+	 */
+	enterDo?: (ctx: DoContext) => void;
+	/**
+	 * Exit a parse tree produced by the `do`
+	 * labeled alternative in `painless_parser.dstatement`.
+	 * @param ctx the parse tree
+	 */
+	exitDo?: (ctx: DoContext) => void;
+
+	/**
+	 * Enter a parse tree produced by the `decl`
+	 * labeled alternative in `painless_parser.dstatement`.
+	 * @param ctx the parse tree
+	 */
+	enterDecl?: (ctx: DeclContext) => void;
+	/**
+	 * Exit a parse tree produced by the `decl`
+	 * labeled alternative in `painless_parser.dstatement`.
+	 * @param ctx the parse tree
+	 */
+	exitDecl?: (ctx: DeclContext) => void;
+
+	/**
+	 * Enter a parse tree produced by the `continue`
+	 * labeled alternative in `painless_parser.dstatement`.
+	 * @param ctx the parse tree
+	 */
+	enterContinue?: (ctx: ContinueContext) => void;
+	/**
+	 * Exit a parse tree produced by the `continue`
+	 * labeled alternative in `painless_parser.dstatement`.
+	 * @param ctx the parse tree
+	 */
+	exitContinue?: (ctx: ContinueContext) => void;
+
+	/**
+	 * Enter a parse tree produced by the `break`
+	 * labeled alternative in `painless_parser.dstatement`.
+	 * @param ctx the parse tree
+	 */
+	enterBreak?: (ctx: BreakContext) => void;
+	/**
+	 * Exit a parse tree produced by the `break`
+	 * labeled alternative in `painless_parser.dstatement`.
+	 * @param ctx the parse tree
+	 */
+	exitBreak?: (ctx: BreakContext) => void;
+
+	/**
+	 * Enter a parse tree produced by the `return`
+	 * labeled alternative in `painless_parser.dstatement`.
+	 * @param ctx the parse tree
+	 */
+	enterReturn?: (ctx: ReturnContext) => void;
+	/**
+	 * Exit a parse tree produced by the `return`
+	 * labeled alternative in `painless_parser.dstatement`.
+	 * @param ctx the parse tree
+	 */
+	exitReturn?: (ctx: ReturnContext) => void;
+
+	/**
+	 * Enter a parse tree produced by the `throw`
+	 * labeled alternative in `painless_parser.dstatement`.
+	 * @param ctx the parse tree
+	 */
+	enterThrow?: (ctx: ThrowContext) => void;
+	/**
+	 * Exit a parse tree produced by the `throw`
+	 * labeled alternative in `painless_parser.dstatement`.
+	 * @param ctx the parse tree
+	 */
+	exitThrow?: (ctx: ThrowContext) => void;
+
+	/**
+	 * Enter a parse tree produced by the `expr`
+	 * labeled alternative in `painless_parser.dstatement`.
+	 * @param ctx the parse tree
+	 */
+	enterExpr?: (ctx: ExprContext) => void;
+	/**
+	 * Exit a parse tree produced by the `expr`
+	 * labeled alternative in `painless_parser.dstatement`.
+	 * @param ctx the parse tree
+	 */
+	exitExpr?: (ctx: ExprContext) => void;
+
+	/**
+	 * Enter a parse tree produced by the `single`
+	 * labeled alternative in `painless_parser.noncondexpression`.
+	 * @param ctx the parse tree
+	 */
+	enterSingle?: (ctx: SingleContext) => void;
+	/**
+	 * Exit a parse tree produced by the `single`
+	 * labeled alternative in `painless_parser.noncondexpression`.
+	 * @param ctx the parse tree
+	 */
+	exitSingle?: (ctx: SingleContext) => void;
+
+	/**
+	 * Enter a parse tree produced by the `binary`
+	 * labeled alternative in `painless_parser.noncondexpression`.
+	 * @param ctx the parse tree
+	 */
+	enterBinary?: (ctx: BinaryContext) => void;
+	/**
+	 * Exit a parse tree produced by the `binary`
+	 * labeled alternative in `painless_parser.noncondexpression`.
+	 * @param ctx the parse tree
+	 */
+	exitBinary?: (ctx: BinaryContext) => void;
+
+	/**
+	 * Enter a parse tree produced by the `comp`
+	 * labeled alternative in `painless_parser.noncondexpression`.
+	 * @param ctx the parse tree
+	 */
+	enterComp?: (ctx: CompContext) => void;
+	/**
+	 * Exit a parse tree produced by the `comp`
+	 * labeled alternative in `painless_parser.noncondexpression`.
+	 * @param ctx the parse tree
+	 */
+	exitComp?: (ctx: CompContext) => void;
+
+	/**
+	 * Enter a parse tree produced by the `instanceof`
+	 * labeled alternative in `painless_parser.noncondexpression`.
+	 * @param ctx the parse tree
+	 */
+	enterInstanceof?: (ctx: InstanceofContext) => void;
+	/**
+	 * Exit a parse tree produced by the `instanceof`
+	 * labeled alternative in `painless_parser.noncondexpression`.
+	 * @param ctx the parse tree
+	 */
+	exitInstanceof?: (ctx: InstanceofContext) => void;
+
+	/**
+	 * Enter a parse tree produced by the `bool`
+	 * labeled alternative in `painless_parser.noncondexpression`.
+	 * @param ctx the parse tree
+	 */
+	enterBool?: (ctx: BoolContext) => void;
+	/**
+	 * Exit a parse tree produced by the `bool`
+	 * labeled alternative in `painless_parser.noncondexpression`.
+	 * @param ctx the parse tree
+	 */
+	exitBool?: (ctx: BoolContext) => void;
+
+	/**
+	 * Enter a parse tree produced by the `elvis`
+	 * labeled alternative in `painless_parser.noncondexpression`.
+	 * @param ctx the parse tree
+	 */
+	enterElvis?: (ctx: ElvisContext) => void;
+	/**
+	 * Exit a parse tree produced by the `elvis`
+	 * labeled alternative in `painless_parser.noncondexpression`.
+	 * @param ctx the parse tree
+	 */
+	exitElvis?: (ctx: ElvisContext) => void;
+
+	/**
+	 * Enter a parse tree produced by the `precedence`
+	 * labeled alternative in `painless_parser.primary`.
+	 * @param ctx the parse tree
+	 */
+	enterPrecedence?: (ctx: PrecedenceContext) => void;
+	/**
+	 * Exit a parse tree produced by the `precedence`
+	 * labeled alternative in `painless_parser.primary`.
+	 * @param ctx the parse tree
+	 */
+	exitPrecedence?: (ctx: PrecedenceContext) => void;
+
+	/**
+	 * Enter a parse tree produced by the `numeric`
+	 * labeled alternative in `painless_parser.primary`.
+	 * @param ctx the parse tree
+	 */
+	enterNumeric?: (ctx: NumericContext) => void;
+	/**
+	 * Exit a parse tree produced by the `numeric`
+	 * labeled alternative in `painless_parser.primary`.
+	 * @param ctx the parse tree
+	 */
+	exitNumeric?: (ctx: NumericContext) => void;
+
+	/**
+	 * Enter a parse tree produced by the `true`
+	 * labeled alternative in `painless_parser.primary`.
+	 * @param ctx the parse tree
+	 */
+	enterTrue?: (ctx: TrueContext) => void;
+	/**
+	 * Exit a parse tree produced by the `true`
+	 * labeled alternative in `painless_parser.primary`.
+	 * @param ctx the parse tree
+	 */
+	exitTrue?: (ctx: TrueContext) => void;
+
+	/**
+	 * Enter a parse tree produced by the `false`
+	 * labeled alternative in `painless_parser.primary`.
+	 * @param ctx the parse tree
+	 */
+	enterFalse?: (ctx: FalseContext) => void;
+	/**
+	 * Exit a parse tree produced by the `false`
+	 * labeled alternative in `painless_parser.primary`.
+	 * @param ctx the parse tree
+	 */
+	exitFalse?: (ctx: FalseContext) => void;
+
+	/**
+	 * Enter a parse tree produced by the `null`
+	 * labeled alternative in `painless_parser.primary`.
+	 * @param ctx the parse tree
+	 */
+	enterNull?: (ctx: NullContext) => void;
+	/**
+	 * Exit a parse tree produced by the `null`
+	 * labeled alternative in `painless_parser.primary`.
+	 * @param ctx the parse tree
+	 */
+	exitNull?: (ctx: NullContext) => void;
+
+	/**
+	 * Enter a parse tree produced by the `string`
+	 * labeled alternative in `painless_parser.primary`.
+	 * @param ctx the parse tree
+	 */
+	enterString?: (ctx: StringContext) => void;
+	/**
+	 * Exit a parse tree produced by the `string`
+	 * labeled alternative in `painless_parser.primary`.
+	 * @param ctx the parse tree
+	 */
+	exitString?: (ctx: StringContext) => void;
+
+	/**
+	 * Enter a parse tree produced by the `regex`
+	 * labeled alternative in `painless_parser.primary`.
+	 * @param ctx the parse tree
+	 */
+	enterRegex?: (ctx: RegexContext) => void;
+	/**
+	 * Exit a parse tree produced by the `regex`
+	 * labeled alternative in `painless_parser.primary`.
+	 * @param ctx the parse tree
+	 */
+	exitRegex?: (ctx: RegexContext) => void;
+
+	/**
+	 * Enter a parse tree produced by the `listinit`
+	 * labeled alternative in `painless_parser.primary`.
+	 * @param ctx the parse tree
+	 */
+	enterListinit?: (ctx: ListinitContext) => void;
+	/**
+	 * Exit a parse tree produced by the `listinit`
+	 * labeled alternative in `painless_parser.primary`.
+	 * @param ctx the parse tree
+	 */
+	exitListinit?: (ctx: ListinitContext) => void;
+
+	/**
+	 * Enter a parse tree produced by the `mapinit`
+	 * labeled alternative in `painless_parser.primary`.
+	 * @param ctx the parse tree
+	 */
+	enterMapinit?: (ctx: MapinitContext) => void;
+	/**
+	 * Exit a parse tree produced by the `mapinit`
+	 * labeled alternative in `painless_parser.primary`.
+	 * @param ctx the parse tree
+	 */
+	exitMapinit?: (ctx: MapinitContext) => void;
+
+	/**
+	 * Enter a parse tree produced by the `variable`
+	 * labeled alternative in `painless_parser.primary`.
+	 * @param ctx the parse tree
+	 */
+	enterVariable?: (ctx: VariableContext) => void;
+	/**
+	 * Exit a parse tree produced by the `variable`
+	 * labeled alternative in `painless_parser.primary`.
+	 * @param ctx the parse tree
+	 */
+	exitVariable?: (ctx: VariableContext) => void;
+
+	/**
+	 * Enter a parse tree produced by the `calllocal`
+	 * labeled alternative in `painless_parser.primary`.
+	 * @param ctx the parse tree
+	 */
+	enterCalllocal?: (ctx: CalllocalContext) => void;
+	/**
+	 * Exit a parse tree produced by the `calllocal`
+	 * labeled alternative in `painless_parser.primary`.
+	 * @param ctx the parse tree
+	 */
+	exitCalllocal?: (ctx: CalllocalContext) => void;
+
+	/**
+	 * Enter a parse tree produced by the `newobject`
+	 * labeled alternative in `painless_parser.primary`.
+	 * @param ctx the parse tree
+	 */
+	enterNewobject?: (ctx: NewobjectContext) => void;
+	/**
+	 * Exit a parse tree produced by the `newobject`
+	 * labeled alternative in `painless_parser.primary`.
+	 * @param ctx the parse tree
+	 */
+	exitNewobject?: (ctx: NewobjectContext) => void;
+
+	/**
+	 * Enter a parse tree produced by `painless_parser.source`.
+	 * @param ctx the parse tree
+	 */
+	enterSource?: (ctx: SourceContext) => void;
+	/**
+	 * Exit a parse tree produced by `painless_parser.source`.
+	 * @param ctx the parse tree
+	 */
+	exitSource?: (ctx: SourceContext) => void;
+
+	/**
+	 * Enter a parse tree produced by `painless_parser.function`.
+	 * @param ctx the parse tree
+	 */
+	enterFunction?: (ctx: FunctionContext) => void;
+	/**
+	 * Exit a parse tree produced by `painless_parser.function`.
+	 * @param ctx the parse tree
+	 */
+	exitFunction?: (ctx: FunctionContext) => void;
+
+	/**
+	 * Enter a parse tree produced by `painless_parser.parameters`.
+	 * @param ctx the parse tree
+	 */
+	enterParameters?: (ctx: ParametersContext) => void;
+	/**
+	 * Exit a parse tree produced by `painless_parser.parameters`.
+	 * @param ctx the parse tree
+	 */
+	exitParameters?: (ctx: ParametersContext) => void;
+
+	/**
+	 * Enter a parse tree produced by `painless_parser.statement`.
+	 * @param ctx the parse tree
+	 */
+	enterStatement?: (ctx: StatementContext) => void;
+	/**
+	 * Exit a parse tree produced by `painless_parser.statement`.
+	 * @param ctx the parse tree
+	 */
+	exitStatement?: (ctx: StatementContext) => void;
+
+	/**
+	 * Enter a parse tree produced by `painless_parser.rstatement`.
+	 * @param ctx the parse tree
+	 */
+	enterRstatement?: (ctx: RstatementContext) => void;
+	/**
+	 * Exit a parse tree produced by `painless_parser.rstatement`.
+	 * @param ctx the parse tree
+	 */
+	exitRstatement?: (ctx: RstatementContext) => void;
+
+	/**
+	 * Enter a parse tree produced by `painless_parser.dstatement`.
+	 * @param ctx the parse tree
+	 */
+	enterDstatement?: (ctx: DstatementContext) => void;
+	/**
+	 * Exit a parse tree produced by `painless_parser.dstatement`.
+	 * @param ctx the parse tree
+	 */
+	exitDstatement?: (ctx: DstatementContext) => void;
+
+	/**
+	 * Enter a parse tree produced by `painless_parser.trailer`.
+	 * @param ctx the parse tree
+	 */
+	enterTrailer?: (ctx: TrailerContext) => void;
+	/**
+	 * Exit a parse tree produced by `painless_parser.trailer`.
+	 * @param ctx the parse tree
+	 */
+	exitTrailer?: (ctx: TrailerContext) => void;
+
+	/**
+	 * Enter a parse tree produced by `painless_parser.block`.
+	 * @param ctx the parse tree
+	 */
+	enterBlock?: (ctx: BlockContext) => void;
+	/**
+	 * Exit a parse tree produced by `painless_parser.block`.
+	 * @param ctx the parse tree
+	 */
+	exitBlock?: (ctx: BlockContext) => void;
+
+	/**
+	 * Enter a parse tree produced by `painless_parser.empty`.
+	 * @param ctx the parse tree
+	 */
+	enterEmpty?: (ctx: EmptyContext) => void;
+	/**
+	 * Exit a parse tree produced by `painless_parser.empty`.
+	 * @param ctx the parse tree
+	 */
+	exitEmpty?: (ctx: EmptyContext) => void;
+
+	/**
+	 * Enter a parse tree produced by `painless_parser.initializer`.
+	 * @param ctx the parse tree
+	 */
+	enterInitializer?: (ctx: InitializerContext) => void;
+	/**
+	 * Exit a parse tree produced by `painless_parser.initializer`.
+	 * @param ctx the parse tree
+	 */
+	exitInitializer?: (ctx: InitializerContext) => void;
+
+	/**
+	 * Enter a parse tree produced by `painless_parser.afterthought`.
+	 * @param ctx the parse tree
+	 */
+	enterAfterthought?: (ctx: AfterthoughtContext) => void;
+	/**
+	 * Exit a parse tree produced by `painless_parser.afterthought`.
+	 * @param ctx the parse tree
+	 */
+	exitAfterthought?: (ctx: AfterthoughtContext) => void;
+
+	/**
+	 * Enter a parse tree produced by `painless_parser.declaration`.
+	 * @param ctx the parse tree
+	 */
+	enterDeclaration?: (ctx: DeclarationContext) => void;
+	/**
+	 * Exit a parse tree produced by `painless_parser.declaration`.
+	 * @param ctx the parse tree
+	 */
+	exitDeclaration?: (ctx: DeclarationContext) => void;
+
+	/**
+	 * Enter a parse tree produced by `painless_parser.decltype`.
+	 * @param ctx the parse tree
+	 */
+	enterDecltype?: (ctx: DecltypeContext) => void;
+	/**
+	 * Exit a parse tree produced by `painless_parser.decltype`.
+	 * @param ctx the parse tree
+	 */
+	exitDecltype?: (ctx: DecltypeContext) => void;
+
+	/**
+	 * Enter a parse tree produced by `painless_parser.type`.
+	 * @param ctx the parse tree
+	 */
+	enterType?: (ctx: TypeContext) => void;
+	/**
+	 * Exit a parse tree produced by `painless_parser.type`.
+	 * @param ctx the parse tree
+	 */
+	exitType?: (ctx: TypeContext) => void;
+
+	/**
+	 * Enter a parse tree produced by `painless_parser.declvar`.
+	 * @param ctx the parse tree
+	 */
+	enterDeclvar?: (ctx: DeclvarContext) => void;
+	/**
+	 * Exit a parse tree produced by `painless_parser.declvar`.
+	 * @param ctx the parse tree
+	 */
+	exitDeclvar?: (ctx: DeclvarContext) => void;
+
+	/**
+	 * Enter a parse tree produced by `painless_parser.trap`.
+	 * @param ctx the parse tree
+	 */
+	enterTrap?: (ctx: TrapContext) => void;
+	/**
+	 * Exit a parse tree produced by `painless_parser.trap`.
+	 * @param ctx the parse tree
+	 */
+	exitTrap?: (ctx: TrapContext) => void;
+
+	/**
+	 * Enter a parse tree produced by `painless_parser.noncondexpression`.
+	 * @param ctx the parse tree
+	 */
+	enterNoncondexpression?: (ctx: NoncondexpressionContext) => void;
+	/**
+	 * Exit a parse tree produced by `painless_parser.noncondexpression`.
+	 * @param ctx the parse tree
+	 */
+	exitNoncondexpression?: (ctx: NoncondexpressionContext) => void;
+
+	/**
+	 * Enter a parse tree produced by `painless_parser.expression`.
+	 * @param ctx the parse tree
+	 */
+	enterExpression?: (ctx: ExpressionContext) => void;
+	/**
+	 * Exit a parse tree produced by `painless_parser.expression`.
+	 * @param ctx the parse tree
+	 */
+	exitExpression?: (ctx: ExpressionContext) => void;
+
+	/**
+	 * Enter a parse tree produced by `painless_parser.unary`.
+	 * @param ctx the parse tree
+	 */
+	enterUnary?: (ctx: UnaryContext) => void;
+	/**
+	 * Exit a parse tree produced by `painless_parser.unary`.
+	 * @param ctx the parse tree
+	 */
+	exitUnary?: (ctx: UnaryContext) => void;
+
+	/**
+	 * Enter a parse tree produced by `painless_parser.unarynotaddsub`.
+	 * @param ctx the parse tree
+	 */
+	enterUnarynotaddsub?: (ctx: UnarynotaddsubContext) => void;
+	/**
+	 * Exit a parse tree produced by `painless_parser.unarynotaddsub`.
+	 * @param ctx the parse tree
+	 */
+	exitUnarynotaddsub?: (ctx: UnarynotaddsubContext) => void;
+
+	/**
+	 * Enter a parse tree produced by `painless_parser.castexpression`.
+	 * @param ctx the parse tree
+	 */
+	enterCastexpression?: (ctx: CastexpressionContext) => void;
+	/**
+	 * Exit a parse tree produced by `painless_parser.castexpression`.
+	 * @param ctx the parse tree
+	 */
+	exitCastexpression?: (ctx: CastexpressionContext) => void;
+
+	/**
+	 * Enter a parse tree produced by `painless_parser.primordefcasttype`.
+	 * @param ctx the parse tree
+	 */
+	enterPrimordefcasttype?: (ctx: PrimordefcasttypeContext) => void;
+	/**
+	 * Exit a parse tree produced by `painless_parser.primordefcasttype`.
+	 * @param ctx the parse tree
+	 */
+	exitPrimordefcasttype?: (ctx: PrimordefcasttypeContext) => void;
+
+	/**
+	 * Enter a parse tree produced by `painless_parser.refcasttype`.
+	 * @param ctx the parse tree
+	 */
+	enterRefcasttype?: (ctx: RefcasttypeContext) => void;
+	/**
+	 * Exit a parse tree produced by `painless_parser.refcasttype`.
+	 * @param ctx the parse tree
+	 */
+	exitRefcasttype?: (ctx: RefcasttypeContext) => void;
+
+	/**
+	 * Enter a parse tree produced by `painless_parser.chain`.
+	 * @param ctx the parse tree
+	 */
+	enterChain?: (ctx: ChainContext) => void;
+	/**
+	 * Exit a parse tree produced by `painless_parser.chain`.
+	 * @param ctx the parse tree
+	 */
+	exitChain?: (ctx: ChainContext) => void;
+
+	/**
+	 * Enter a parse tree produced by `painless_parser.primary`.
+	 * @param ctx the parse tree
+	 */
+	enterPrimary?: (ctx: PrimaryContext) => void;
+	/**
+	 * Exit a parse tree produced by `painless_parser.primary`.
+	 * @param ctx the parse tree
+	 */
+	exitPrimary?: (ctx: PrimaryContext) => void;
+
+	/**
+	 * Enter a parse tree produced by `painless_parser.postfix`.
+	 * @param ctx the parse tree
+	 */
+	enterPostfix?: (ctx: PostfixContext) => void;
+	/**
+	 * Exit a parse tree produced by `painless_parser.postfix`.
+	 * @param ctx the parse tree
+	 */
+	exitPostfix?: (ctx: PostfixContext) => void;
+
+	/**
+	 * Enter a parse tree produced by `painless_parser.postdot`.
+	 * @param ctx the parse tree
+	 */
+	enterPostdot?: (ctx: PostdotContext) => void;
+	/**
+	 * Exit a parse tree produced by `painless_parser.postdot`.
+	 * @param ctx the parse tree
+	 */
+	exitPostdot?: (ctx: PostdotContext) => void;
+
+	/**
+	 * Enter a parse tree produced by `painless_parser.callinvoke`.
+	 * @param ctx the parse tree
+	 */
+	enterCallinvoke?: (ctx: CallinvokeContext) => void;
+	/**
+	 * Exit a parse tree produced by `painless_parser.callinvoke`.
+	 * @param ctx the parse tree
+	 */
+	exitCallinvoke?: (ctx: CallinvokeContext) => void;
+
+	/**
+	 * Enter a parse tree produced by `painless_parser.fieldaccess`.
+	 * @param ctx the parse tree
+	 */
+	enterFieldaccess?: (ctx: FieldaccessContext) => void;
+	/**
+	 * Exit a parse tree produced by `painless_parser.fieldaccess`.
+	 * @param ctx the parse tree
+	 */
+	exitFieldaccess?: (ctx: FieldaccessContext) => void;
+
+	/**
+	 * Enter a parse tree produced by `painless_parser.braceaccess`.
+	 * @param ctx the parse tree
+	 */
+	enterBraceaccess?: (ctx: BraceaccessContext) => void;
+	/**
+	 * Exit a parse tree produced by `painless_parser.braceaccess`.
+	 * @param ctx the parse tree
+	 */
+	exitBraceaccess?: (ctx: BraceaccessContext) => void;
+
+	/**
+	 * Enter a parse tree produced by `painless_parser.arrayinitializer`.
+	 * @param ctx the parse tree
+	 */
+	enterArrayinitializer?: (ctx: ArrayinitializerContext) => void;
+	/**
+	 * Exit a parse tree produced by `painless_parser.arrayinitializer`.
+	 * @param ctx the parse tree
+	 */
+	exitArrayinitializer?: (ctx: ArrayinitializerContext) => void;
+
+	/**
+	 * Enter a parse tree produced by `painless_parser.listinitializer`.
+	 * @param ctx the parse tree
+	 */
+	enterListinitializer?: (ctx: ListinitializerContext) => void;
+	/**
+	 * Exit a parse tree produced by `painless_parser.listinitializer`.
+	 * @param ctx the parse tree
+	 */
+	exitListinitializer?: (ctx: ListinitializerContext) => void;
+
+	/**
+	 * Enter a parse tree produced by `painless_parser.mapinitializer`.
+	 * @param ctx the parse tree
+	 */
+	enterMapinitializer?: (ctx: MapinitializerContext) => void;
+	/**
+	 * Exit a parse tree produced by `painless_parser.mapinitializer`.
+	 * @param ctx the parse tree
+	 */
+	exitMapinitializer?: (ctx: MapinitializerContext) => void;
+
+	/**
+	 * Enter a parse tree produced by `painless_parser.maptoken`.
+	 * @param ctx the parse tree
+	 */
+	enterMaptoken?: (ctx: MaptokenContext) => void;
+	/**
+	 * Exit a parse tree produced by `painless_parser.maptoken`.
+	 * @param ctx the parse tree
+	 */
+	exitMaptoken?: (ctx: MaptokenContext) => void;
+
+	/**
+	 * Enter a parse tree produced by `painless_parser.arguments`.
+	 * @param ctx the parse tree
+	 */
+	enterArguments?: (ctx: ArgumentsContext) => void;
+	/**
+	 * Exit a parse tree produced by `painless_parser.arguments`.
+	 * @param ctx the parse tree
+	 */
+	exitArguments?: (ctx: ArgumentsContext) => void;
+
+	/**
+	 * Enter a parse tree produced by `painless_parser.argument`.
+	 * @param ctx the parse tree
+	 */
+	enterArgument?: (ctx: ArgumentContext) => void;
+	/**
+	 * Exit a parse tree produced by `painless_parser.argument`.
+	 * @param ctx the parse tree
+	 */
+	exitArgument?: (ctx: ArgumentContext) => void;
+
+	/**
+	 * Enter a parse tree produced by `painless_parser.lambda`.
+	 * @param ctx the parse tree
+	 */
+	enterLambda?: (ctx: LambdaContext) => void;
+	/**
+	 * Exit a parse tree produced by `painless_parser.lambda`.
+	 * @param ctx the parse tree
+	 */
+	exitLambda?: (ctx: LambdaContext) => void;
+
+	/**
+	 * Enter a parse tree produced by `painless_parser.lamtype`.
+	 * @param ctx the parse tree
+	 */
+	enterLamtype?: (ctx: LamtypeContext) => void;
+	/**
+	 * Exit a parse tree produced by `painless_parser.lamtype`.
+	 * @param ctx the parse tree
+	 */
+	exitLamtype?: (ctx: LamtypeContext) => void;
+
+	/**
+	 * Enter a parse tree produced by `painless_parser.funcref`.
+	 * @param ctx the parse tree
+	 */
+	enterFuncref?: (ctx: FuncrefContext) => void;
+	/**
+	 * Exit a parse tree produced by `painless_parser.funcref`.
+	 * @param ctx the parse tree
+	 */
+	exitFuncref?: (ctx: FuncrefContext) => void;
+}
+
diff --git a/packages/kbn-monaco/src/painless/completion_adapter.ts b/packages/kbn-monaco/src/painless/completion_adapter.ts
index b07018e71b61d..1eb91c6c386b9 100644
--- a/packages/kbn-monaco/src/painless/completion_adapter.ts
+++ b/packages/kbn-monaco/src/painless/completion_adapter.ts
@@ -18,7 +18,7 @@
  */
 
 import { monaco } from '../monaco_imports';
-import { EditorStateService } from './services';
+import { EditorStateService } from './lib';
 import { PainlessCompletionResult, PainlessCompletionKind } from './types';
 import { PainlessWorker } from './worker';
 
diff --git a/packages/kbn-monaco/src/painless/diagnostics_adapter.ts b/packages/kbn-monaco/src/painless/diagnostics_adapter.ts
new file mode 100644
index 0000000000000..95c4ec19cea1f
--- /dev/null
+++ b/packages/kbn-monaco/src/painless/diagnostics_adapter.ts
@@ -0,0 +1,56 @@
+/*
+ * Licensed to Elasticsearch B.V. under one or more contributor
+ * license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright
+ * ownership. Elasticsearch B.V. licenses this file to you under
+ * the Apache License, Version 2.0 (the "License"); you may
+ * not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *    http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+import { monaco } from '../monaco_imports';
+import { ID } from './constants';
+import { WorkerAccessor } from './language';
+import { PainlessError } from './worker';
+
+const toDiagnostics = (error: PainlessError): monaco.editor.IMarkerData => {
+  return {
+    ...error,
+    severity: monaco.MarkerSeverity.Error,
+  };
+};
+
+export class DiagnosticsAdapter {
+  constructor(private worker: WorkerAccessor) {
+    const onModelAdd = (model: monaco.editor.IModel): void => {
+      let handle: any;
+      model.onDidChangeContent(() => {
+        // Every time a new change is made, wait 500ms before validating
+        clearTimeout(handle);
+        handle = setTimeout(() => this.validate(model.uri), 500);
+      });
+
+      this.validate(model.uri);
+    };
+    monaco.editor.onDidCreateModel(onModelAdd);
+    monaco.editor.getModels().forEach(onModelAdd);
+  }
+
+  private async validate(resource: monaco.Uri): Promise<void> {
+    const worker = await this.worker(resource);
+    const errorMarkers = await worker.getSyntaxErrors();
+
+    const model = monaco.editor.getModel(resource);
+
+    // Set the error markers and underline them with "Error" severity
+    monaco.editor.setModelMarkers(model!, ID, errorMarkers.map(toDiagnostics));
+  }
+}
diff --git a/packages/kbn-monaco/src/painless/index.ts b/packages/kbn-monaco/src/painless/index.ts
index 4693fa2418b66..10c82d2ae6695 100644
--- a/packages/kbn-monaco/src/painless/index.ts
+++ b/packages/kbn-monaco/src/painless/index.ts
@@ -18,9 +18,9 @@
  */
 
 import { ID } from './constants';
-import { lexerRules } from './lexer_rules';
+import { lexerRules, languageConfiguration } from './lexer_rules';
 import { getSuggestionProvider } from './language';
 
-export const PainlessLang = { ID, getSuggestionProvider, lexerRules };
+export const PainlessLang = { ID, getSuggestionProvider, lexerRules, languageConfiguration };
 
 export { PainlessContext, PainlessAutocompleteField } from './types';
diff --git a/packages/kbn-monaco/src/painless/language.ts b/packages/kbn-monaco/src/painless/language.ts
index b38dac2c7baf7..01212f80b00dc 100644
--- a/packages/kbn-monaco/src/painless/language.ts
+++ b/packages/kbn-monaco/src/painless/language.ts
@@ -19,25 +19,22 @@
 
 import { monaco } from '../monaco_imports';
 
-import { WorkerProxyService, EditorStateService } from './services';
+import { WorkerProxyService, EditorStateService } from './lib';
 import { ID } from './constants';
 import { PainlessContext, PainlessAutocompleteField } from './types';
 import { PainlessWorker } from './worker';
 import { PainlessCompletionAdapter } from './completion_adapter';
+import { DiagnosticsAdapter } from './diagnostics_adapter';
 
 const workerProxyService = new WorkerProxyService();
 const editorStateService = new EditorStateService();
 
-type WorkerAccessor = (...uris: monaco.Uri[]) => Promise<PainlessWorker>;
+export type WorkerAccessor = (...uris: monaco.Uri[]) => Promise<PainlessWorker>;
 
 const worker: WorkerAccessor = (...uris: monaco.Uri[]): Promise<PainlessWorker> => {
   return workerProxyService.getWorker(uris);
 };
 
-monaco.languages.onLanguage(ID, async () => {
-  workerProxyService.setup();
-});
-
 export const getSuggestionProvider = (
   context: PainlessContext,
   fields?: PainlessAutocompleteField[]
@@ -46,3 +43,9 @@ export const getSuggestionProvider = (
 
   return new PainlessCompletionAdapter(worker, editorStateService);
 };
+
+monaco.languages.onLanguage(ID, async () => {
+  workerProxyService.setup();
+
+  new DiagnosticsAdapter(worker);
+});
diff --git a/packages/kbn-monaco/src/painless/lexer_rules/index.ts b/packages/kbn-monaco/src/painless/lexer_rules/index.ts
index 7cf9064c6aa51..718231b4fe0cd 100644
--- a/packages/kbn-monaco/src/painless/lexer_rules/index.ts
+++ b/packages/kbn-monaco/src/painless/lexer_rules/index.ts
@@ -17,4 +17,4 @@
  * under the License.
  */
 
-export { lexerRules } from './painless';
+export { lexerRules, languageConfiguration } from './painless';
diff --git a/packages/kbn-monaco/src/painless/lexer_rules/painless.ts b/packages/kbn-monaco/src/painless/lexer_rules/painless.ts
index 2f4383911c9ad..580c6f9499569 100644
--- a/packages/kbn-monaco/src/painless/lexer_rules/painless.ts
+++ b/packages/kbn-monaco/src/painless/lexer_rules/painless.ts
@@ -180,3 +180,17 @@ export const lexerRules = {
     ],
   },
 } as Language;
+
+export const languageConfiguration: monaco.languages.LanguageConfiguration = {
+  brackets: [
+    ['{', '}'],
+    ['[', ']'],
+    ['(', ')'],
+  ],
+  autoClosingPairs: [
+    { open: '{', close: '}' },
+    { open: '[', close: ']' },
+    { open: '(', close: ')' },
+    { open: '"', close: '"' },
+  ],
+};
diff --git a/packages/kbn-monaco/src/painless/services/editor_state.ts b/packages/kbn-monaco/src/painless/lib/editor_state.ts
similarity index 100%
rename from packages/kbn-monaco/src/painless/services/editor_state.ts
rename to packages/kbn-monaco/src/painless/lib/editor_state.ts
diff --git a/packages/kbn-monaco/src/painless/services/index.ts b/packages/kbn-monaco/src/painless/lib/index.ts
similarity index 100%
rename from packages/kbn-monaco/src/painless/services/index.ts
rename to packages/kbn-monaco/src/painless/lib/index.ts
diff --git a/packages/kbn-monaco/src/painless/services/worker_proxy.ts b/packages/kbn-monaco/src/painless/lib/worker_proxy.ts
similarity index 100%
rename from packages/kbn-monaco/src/painless/services/worker_proxy.ts
rename to packages/kbn-monaco/src/painless/lib/worker_proxy.ts
diff --git a/packages/kbn-monaco/src/painless/worker/index.ts b/packages/kbn-monaco/src/painless/worker/index.ts
index 2f55271ab9958..3250a41759e09 100644
--- a/packages/kbn-monaco/src/painless/worker/index.ts
+++ b/packages/kbn-monaco/src/painless/worker/index.ts
@@ -18,3 +18,5 @@
  */
 
 export { PainlessWorker } from './painless_worker';
+
+export { PainlessError } from './lib';
diff --git a/packages/kbn-monaco/src/painless/worker/lib/autocomplete.test.ts b/packages/kbn-monaco/src/painless/worker/lib/autocomplete.test.ts
index 8cc5d21d9d7e0..4a975596affba 100644
--- a/packages/kbn-monaco/src/painless/worker/lib/autocomplete.test.ts
+++ b/packages/kbn-monaco/src/painless/worker/lib/autocomplete.test.ts
@@ -18,7 +18,6 @@
  */
 
 import { PainlessCompletionItem } from '../../types';
-import { lexerRules } from '../../lexer_rules';
 
 import {
   getStaticSuggestions,
@@ -26,17 +25,11 @@ import {
   getClassMemberSuggestions,
   getPrimitives,
   getConstructorSuggestions,
+  getKeywords,
   Suggestion,
 } from './autocomplete';
 
-const keywords: PainlessCompletionItem[] = lexerRules.keywords.map((keyword) => {
-  return {
-    label: keyword,
-    kind: 'keyword',
-    documentation: 'Keyword: char',
-    insertText: keyword,
-  };
-});
+const keywords: PainlessCompletionItem[] = getKeywords();
 
 const testSuggestions: Suggestion[] = [
   {
@@ -101,7 +94,7 @@ const testSuggestions: Suggestion[] = [
 describe('Autocomplete lib', () => {
   describe('Static suggestions', () => {
     test('returns static suggestions', () => {
-      expect(getStaticSuggestions(testSuggestions, false)).toEqual({
+      expect(getStaticSuggestions({ suggestions: testSuggestions })).toEqual({
         isIncomplete: false,
         suggestions: [
           {
@@ -134,12 +127,26 @@ describe('Autocomplete lib', () => {
     });
 
     test('returns doc keyword when fields exist', () => {
-      const autocompletion = getStaticSuggestions(testSuggestions, true);
+      const autocompletion = getStaticSuggestions({
+        suggestions: testSuggestions,
+        hasFields: true,
+      });
       const docSuggestion = autocompletion.suggestions.find(
         (suggestion) => suggestion.label === 'doc'
       );
       expect(Boolean(docSuggestion)).toBe(true);
     });
+
+    test('returns emit keyword for runtime fields', () => {
+      const autocompletion = getStaticSuggestions({
+        suggestions: testSuggestions,
+        isRuntimeContext: true,
+      });
+      const emitSuggestion = autocompletion.suggestions.find(
+        (suggestion) => suggestion.label === 'emit'
+      );
+      expect(Boolean(emitSuggestion)).toBe(true);
+    });
   });
 
   describe('getPrimitives()', () => {
diff --git a/packages/kbn-monaco/src/painless/worker/lib/autocomplete.ts b/packages/kbn-monaco/src/painless/worker/lib/autocomplete.ts
index e8e795e99b259..9bdaa298fb1c9 100644
--- a/packages/kbn-monaco/src/painless/worker/lib/autocomplete.ts
+++ b/packages/kbn-monaco/src/painless/worker/lib/autocomplete.ts
@@ -53,14 +53,42 @@ export interface Suggestion extends PainlessCompletionItem {
   constructorDefinition?: PainlessCompletionItem;
 }
 
-const keywords: PainlessCompletionItem[] = lexerRules.keywords.map((keyword) => {
-  return {
-    label: keyword,
-    kind: 'keyword',
-    documentation: 'Keyword: char',
-    insertText: keyword,
-  };
-});
+export const getKeywords = (): PainlessCompletionItem[] => {
+  const lexerKeywords: PainlessCompletionItem[] = lexerRules.keywords.map((keyword) => {
+    return {
+      label: keyword,
+      kind: 'keyword',
+      documentation: `Keyword: ${keyword}`,
+      insertText: keyword,
+    };
+  });
+
+  const allKeywords: PainlessCompletionItem[] = [
+    ...lexerKeywords,
+    {
+      label: 'params',
+      kind: 'keyword',
+      documentation: i18n.translate(
+        'monaco.painlessLanguage.autocomplete.paramsKeywordDescription',
+        {
+          defaultMessage: 'Access variables passed into the script.',
+        }
+      ),
+      insertText: 'params',
+    },
+  ];
+
+  return allKeywords;
+};
+
+const runtimeContexts: PainlessContext[] = [
+  'boolean_script_field_script_field',
+  'date_script_field',
+  'double_script_field_script_field',
+  'ip_script_field_script_field',
+  'long_script_field_script_field',
+  'string_script_field_script_field',
+];
 
 const mapContextToData: { [key: string]: { suggestions: any[] } } = {
   painless_test: painlessTestContext,
@@ -75,16 +103,23 @@ const mapContextToData: { [key: string]: { suggestions: any[] } } = {
   string_script_field_script_field: stringScriptFieldScriptFieldContext,
 };
 
-export const getStaticSuggestions = (
-  suggestions: Suggestion[],
-  hasFields: boolean
-): PainlessCompletionResult => {
+export const getStaticSuggestions = ({
+  suggestions,
+  hasFields,
+  isRuntimeContext,
+}: {
+  suggestions: Suggestion[];
+  hasFields?: boolean;
+  isRuntimeContext?: boolean;
+}): PainlessCompletionResult => {
   const classSuggestions: PainlessCompletionItem[] = suggestions.map((suggestion) => {
     const { properties, constructorDefinition, ...rootSuggestion } = suggestion;
     return rootSuggestion;
   });
 
-  const keywordSuggestions: PainlessCompletionItem[] = hasFields
+  const keywords = getKeywords();
+
+  let keywordSuggestions: PainlessCompletionItem[] = hasFields
     ? [
         ...keywords,
         {
@@ -102,6 +137,23 @@ export const getStaticSuggestions = (
       ]
     : keywords;
 
+  keywordSuggestions = isRuntimeContext
+    ? [
+        ...keywordSuggestions,
+        {
+          label: 'emit',
+          kind: 'keyword',
+          documentation: i18n.translate(
+            'monaco.painlessLanguage.autocomplete.emitKeywordDescription',
+            {
+              defaultMessage: 'Emit value without returning.',
+            }
+          ),
+          insertText: 'emit',
+        },
+      ]
+    : keywordSuggestions;
+
   return {
     isIncomplete: false,
     suggestions: [...classSuggestions, ...keywordSuggestions],
@@ -176,6 +228,12 @@ export const getAutocompleteSuggestions = (
   // What the user is currently typing
   const activeTyping = words[words.length - 1];
   const primitives = getPrimitives(suggestions);
+  // This logic may end up needing to be more robust as we integrate autocomplete into more editors
+  // For now, we're assuming there is a list of painless contexts that are only applicable in runtime fields
+  const isRuntimeContext = runtimeContexts.includes(painlessContext);
+  // "text" field types are not available in doc values and should be removed for autocompletion
+  const filteredFields = fields?.filter((field) => field.type !== 'text');
+  const hasFields = Boolean(filteredFields?.length);
 
   let autocompleteSuggestions: PainlessCompletionResult = {
     isIncomplete: false,
@@ -184,13 +242,13 @@ export const getAutocompleteSuggestions = (
 
   if (isConstructorInstance(words)) {
     autocompleteSuggestions = getConstructorSuggestions(suggestions);
-  } else if (fields && isDeclaringField(activeTyping)) {
-    autocompleteSuggestions = getFieldSuggestions(fields);
+  } else if (filteredFields && isDeclaringField(activeTyping)) {
+    autocompleteSuggestions = getFieldSuggestions(filteredFields);
   } else if (isAccessingProperty(activeTyping)) {
     const className = activeTyping.substring(0, activeTyping.length - 1).split('.')[0];
     autocompleteSuggestions = getClassMemberSuggestions(suggestions, className);
   } else if (showStaticSuggestions(activeTyping, words, primitives)) {
-    autocompleteSuggestions = getStaticSuggestions(suggestions, Boolean(fields?.length));
+    autocompleteSuggestions = getStaticSuggestions({ suggestions, hasFields, isRuntimeContext });
   }
   return autocompleteSuggestions;
 };
diff --git a/packages/kbn-monaco/src/painless/worker/lib/autocomplete_utils.test.ts b/packages/kbn-monaco/src/painless/worker/lib/autocomplete_utils.test.ts
index d9420719f6923..802fd0073963a 100644
--- a/packages/kbn-monaco/src/painless/worker/lib/autocomplete_utils.test.ts
+++ b/packages/kbn-monaco/src/painless/worker/lib/autocomplete_utils.test.ts
@@ -23,6 +23,8 @@ import {
   hasDeclaredType,
   isAccessingProperty,
   showStaticSuggestions,
+  isDefiningString,
+  isDefiningBoolean,
 } from './autocomplete_utils';
 
 const primitives = ['boolean', 'int', 'char', 'float', 'double'];
@@ -62,6 +64,24 @@ describe('Utils', () => {
     });
   });
 
+  describe('isDefiningBoolean()', () => {
+    test('returns true or false depending if an array contains a boolean type and "=" token at a specific index', () => {
+      expect(isDefiningBoolean(['boolean', 'myBoolean', '=', 't'])).toEqual(true);
+      expect(isDefiningBoolean(['double', 'myBoolean', '=', 't'])).toEqual(false);
+      expect(isDefiningBoolean(['boolean', '='])).toEqual(false);
+    });
+  });
+
+  describe('isDefiningString()', () => {
+    test('returns true or false depending if active typing contains a single or double quotation mark', () => {
+      expect(isDefiningString(`'mystring'`)).toEqual(true);
+      expect(isDefiningString(`"mystring"`)).toEqual(true);
+      expect(isDefiningString(`'`)).toEqual(true);
+      expect(isDefiningString(`"`)).toEqual(true);
+      expect(isDefiningString('mystring')).toEqual(false);
+    });
+  });
+
   describe('showStaticSuggestions()', () => {
     test('returns true or false depending if a type is declared or the string contains a "."', () => {
       expect(showStaticSuggestions('a', ['a'], primitives)).toEqual(true);
diff --git a/packages/kbn-monaco/src/painless/worker/lib/autocomplete_utils.ts b/packages/kbn-monaco/src/painless/worker/lib/autocomplete_utils.ts
index 7c53d2f8167bd..97a05daf37842 100644
--- a/packages/kbn-monaco/src/painless/worker/lib/autocomplete_utils.ts
+++ b/packages/kbn-monaco/src/painless/worker/lib/autocomplete_utils.ts
@@ -36,11 +36,39 @@ export const isAccessingProperty = (activeTyping: string): boolean => {
 /**
  * If the preceding word is a primitive type, e.g., "boolean",
  * we assume the user is declaring a variable and will skip autocomplete
+ *
+ * Note: this isn't entirely exhaustive. For example, "def myVar =" is not included in context
+ * It's also acceptable to use a class as a type, e.g., "String myVar ="
  */
 export const hasDeclaredType = (activeLineWords: string[], primitives: string[]): boolean => {
   return activeLineWords.length === 2 && primitives.includes(activeLineWords[0]);
 };
 
+/**
+ * If the active line words contains the "boolean" type and "=" token,
+ * we assume the user is defining a boolean value and skip autocomplete
+ */
+export const isDefiningBoolean = (activeLineWords: string[]): boolean => {
+  if (activeLineWords.length === 4) {
+    const maybePrimitiveType = activeLineWords[0];
+    const maybeEqualToken = activeLineWords[2];
+    return maybePrimitiveType === 'boolean' && maybeEqualToken === '=';
+  }
+  return false;
+};
+
+/**
+ * If the active typing contains a start or end quotation mark,
+ * we assume the user is defining a string and skip autocomplete
+ */
+export const isDefiningString = (activeTyping: string): boolean => {
+  const quoteTokens = [`'`, `"`];
+  const activeTypingParts = activeTyping.split('');
+  const startCharacter = activeTypingParts[0];
+  const endCharacter = activeTypingParts[activeTypingParts.length - 1];
+  return quoteTokens.includes(startCharacter) || quoteTokens.includes(endCharacter);
+};
+
 /**
  * Check if the preceding word contains the "new" keyword
  */
@@ -62,8 +90,10 @@ export const isDeclaringField = (activeTyping: string): boolean => {
 /**
  * Static suggestions serve as a catch-all most of the time
  * However, there are a few situations where we do not want to show them and instead default to the built-in monaco (abc) autocomplete
- * 1. If the preceding word is a type, e.g., "boolean", we assume the user is declaring a variable name
+ * 1. If the preceding word is a primitive type, e.g., "boolean", we assume the user is declaring a variable name
  * 2. If the string contains a "dot" character, we assume the user is attempting to access a property that we do not have information for
+ * 3. If the user is defining a variable with a boolean type, e.g., "boolean myBoolean ="
+ * 4. If the user is defining a string
  */
 export const showStaticSuggestions = (
   activeTyping: string,
@@ -72,5 +102,10 @@ export const showStaticSuggestions = (
 ): boolean => {
   const activeTypingParts = activeTyping.split('.');
 
-  return hasDeclaredType(activeLineWords, primitives) === false && activeTypingParts.length === 1;
+  return (
+    hasDeclaredType(activeLineWords, primitives) === false &&
+    isDefiningBoolean(activeLineWords) === false &&
+    isDefiningString(activeTyping) === false &&
+    activeTypingParts.length === 1
+  );
 };
diff --git a/packages/kbn-monaco/src/painless/worker/lib/error_listener.ts b/packages/kbn-monaco/src/painless/worker/lib/error_listener.ts
new file mode 100644
index 0000000000000..96a19b4547ee0
--- /dev/null
+++ b/packages/kbn-monaco/src/painless/worker/lib/error_listener.ts
@@ -0,0 +1,59 @@
+/*
+ * Licensed to Elasticsearch B.V. under one or more contributor
+ * license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright
+ * ownership. Elasticsearch B.V. licenses this file to you under
+ * the Apache License, Version 2.0 (the "License"); you may
+ * not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *    http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+import { ANTLRErrorListener, RecognitionException, Recognizer } from 'antlr4ts';
+
+export interface PainlessError {
+  startLineNumber: number;
+  startColumn: number;
+  endLineNumber: number;
+  endColumn: number;
+  message: string;
+}
+
+export class PainlessErrorListener implements ANTLRErrorListener<any> {
+  private errors: PainlessError[] = [];
+
+  syntaxError(
+    recognizer: Recognizer<any, any>,
+    offendingSymbol: any,
+    line: number,
+    column: number,
+    message: string,
+    e: RecognitionException | undefined
+  ): void {
+    let endColumn = column + 1;
+
+    if (offendingSymbol?._text) {
+      endColumn = column + offendingSymbol._text.length;
+    }
+
+    this.errors.push({
+      startLineNumber: line,
+      endLineNumber: line,
+      startColumn: column,
+      endColumn,
+      message,
+    });
+  }
+
+  getErrors(): PainlessError[] {
+    return this.errors;
+  }
+}
diff --git a/packages/kbn-monaco/src/painless/worker/lib/index.ts b/packages/kbn-monaco/src/painless/worker/lib/index.ts
index b2d4fc1f4faf4..1a89cbecb67b5 100644
--- a/packages/kbn-monaco/src/painless/worker/lib/index.ts
+++ b/packages/kbn-monaco/src/painless/worker/lib/index.ts
@@ -18,3 +18,7 @@
  */
 
 export { getAutocompleteSuggestions } from './autocomplete';
+
+export { PainlessError } from './error_listener';
+
+export { parseAndGetSyntaxErrors } from './parser';
diff --git a/packages/kbn-monaco/src/painless/worker/lib/lexer.ts b/packages/kbn-monaco/src/painless/worker/lib/lexer.ts
new file mode 100644
index 0000000000000..343e3b3b06864
--- /dev/null
+++ b/packages/kbn-monaco/src/painless/worker/lib/lexer.ts
@@ -0,0 +1,56 @@
+/*
+ * Licensed to Elasticsearch B.V. under one or more contributor
+ * license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright
+ * ownership. Elasticsearch B.V. licenses this file to you under
+ * the Apache License, Version 2.0 (the "License"); you may
+ * not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *    http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+import { CharStream } from 'antlr4ts';
+import { painless_lexer as PainlessLexer } from '../../antlr/painless_lexer';
+
+/*
+ * This extends the PainlessLexer class in order to handle backslashes appropriately
+ * It is being invoked in painless_lexer.g4
+ * Based on the Java implementation: https://github.com/elastic/elasticsearch/blob/feab123ba400b150f3dcd04dd27cf57474b70d5a/modules/lang-painless/src/main/java/org/elasticsearch/painless/antlr/EnhancedPainlessLexer.java#L73
+ */
+export class PainlessLexerEnhanced extends PainlessLexer {
+  constructor(input: CharStream) {
+    super(input);
+  }
+
+  isSlashRegex(): boolean {
+    const lastToken = super.nextToken();
+
+    if (lastToken == null) {
+      return true;
+    }
+
+    // @ts-ignore
+    switch (lastToken._type) {
+      case PainlessLexer.RBRACE:
+      case PainlessLexer.RP:
+      case PainlessLexer.OCTAL:
+      case PainlessLexer.HEX:
+      case PainlessLexer.INTEGER:
+      case PainlessLexer.DECIMAL:
+      case PainlessLexer.ID:
+      case PainlessLexer.DOTINTEGER:
+      case PainlessLexer.DOTID:
+        return false;
+      default:
+        return true;
+    }
+  }
+}
diff --git a/packages/kbn-monaco/src/painless/worker/lib/parser.ts b/packages/kbn-monaco/src/painless/worker/lib/parser.ts
new file mode 100644
index 0000000000000..7cf5b730a81e6
--- /dev/null
+++ b/packages/kbn-monaco/src/painless/worker/lib/parser.ts
@@ -0,0 +1,54 @@
+/*
+ * Licensed to Elasticsearch B.V. under one or more contributor
+ * license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright
+ * ownership. Elasticsearch B.V. licenses this file to you under
+ * the Apache License, Version 2.0 (the "License"); you may
+ * not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *    http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+import { CommonTokenStream, CharStreams } from 'antlr4ts';
+import { painless_parser as PainlessParser, SourceContext } from '../../antlr/painless_parser';
+import { PainlessError, PainlessErrorListener } from './error_listener';
+import { PainlessLexerEnhanced } from './lexer';
+
+const parse = (
+  code: string
+): {
+  source: SourceContext;
+  errors: PainlessError[];
+} => {
+  const inputStream = CharStreams.fromString(code);
+  const lexer = new PainlessLexerEnhanced(inputStream);
+  const painlessLangErrorListener = new PainlessErrorListener();
+  const tokenStream = new CommonTokenStream(lexer);
+  const parser = new PainlessParser(tokenStream);
+
+  lexer.removeErrorListeners();
+  parser.removeErrorListeners();
+
+  lexer.addErrorListener(painlessLangErrorListener);
+  parser.addErrorListener(painlessLangErrorListener);
+
+  const errors: PainlessError[] = painlessLangErrorListener.getErrors();
+
+  return {
+    source: parser.source(),
+    errors,
+  };
+};
+
+export const parseAndGetSyntaxErrors = (code: string): PainlessError[] => {
+  const { errors } = parse(code);
+  return errors;
+};
diff --git a/packages/kbn-monaco/src/painless/worker/painless.worker.ts b/packages/kbn-monaco/src/painless/worker/painless.worker.ts
index de40fda360d76..b220cb86a8425 100644
--- a/packages/kbn-monaco/src/painless/worker/painless.worker.ts
+++ b/packages/kbn-monaco/src/painless/worker/painless.worker.ts
@@ -23,10 +23,11 @@
 import 'regenerator-runtime/runtime';
 // @ts-ignore
 import * as worker from 'monaco-editor/esm/vs/editor/editor.worker';
+import { monaco } from '../../monaco_imports';
 import { PainlessWorker } from './painless_worker';
 
 self.onmessage = () => {
-  worker.initialize((ctx: any, createData: any) => {
-    return new PainlessWorker();
+  worker.initialize((ctx: monaco.worker.IWorkerContext, createData: any) => {
+    return new PainlessWorker(ctx);
   });
 };
diff --git a/packages/kbn-monaco/src/painless/worker/painless_worker.ts b/packages/kbn-monaco/src/painless/worker/painless_worker.ts
index 9c39659519163..ce4ba024a4caa 100644
--- a/packages/kbn-monaco/src/painless/worker/painless_worker.ts
+++ b/packages/kbn-monaco/src/painless/worker/painless_worker.ts
@@ -17,11 +17,27 @@
  * under the License.
  */
 
+import { monaco } from '../../monaco_imports';
 import { PainlessCompletionResult, PainlessContext, PainlessAutocompleteField } from '../types';
 
-import { getAutocompleteSuggestions } from './lib';
-
+import { getAutocompleteSuggestions, parseAndGetSyntaxErrors } from './lib';
 export class PainlessWorker {
+  private _ctx: monaco.worker.IWorkerContext;
+
+  constructor(ctx: monaco.worker.IWorkerContext) {
+    this._ctx = ctx;
+  }
+
+  private getTextDocument(): string {
+    const model = this._ctx.getMirrorModels()[0];
+    return model.getValue();
+  }
+
+  public async getSyntaxErrors() {
+    const code = this.getTextDocument();
+    return parseAndGetSyntaxErrors(code);
+  }
+
   public provideAutocompleteSuggestions(
     currentLineChars: string,
     context: PainlessContext,
diff --git a/packages/kbn-monaco/src/register_globals.ts b/packages/kbn-monaco/src/register_globals.ts
index 630467dd81711..db97b69c013af 100644
--- a/packages/kbn-monaco/src/register_globals.ts
+++ b/packages/kbn-monaco/src/register_globals.ts
@@ -36,6 +36,7 @@ monaco.languages.setMonarchTokensProvider(XJsonLang.ID, XJsonLang.lexerRules);
 monaco.languages.setLanguageConfiguration(XJsonLang.ID, XJsonLang.languageConfiguration);
 monaco.languages.register({ id: PainlessLang.ID });
 monaco.languages.setMonarchTokensProvider(PainlessLang.ID, PainlessLang.lexerRules);
+monaco.languages.setLanguageConfiguration(PainlessLang.ID, PainlessLang.languageConfiguration);
 monaco.languages.register({ id: EsqlLang.ID });
 monaco.languages.setMonarchTokensProvider(EsqlLang.ID, EsqlLang.lexerRules);
 
diff --git a/src/core/public/doc_links/doc_links_service.ts b/src/core/public/doc_links/doc_links_service.ts
index 15df6b34e22ff..3afd4a5cb98e8 100644
--- a/src/core/public/doc_links/doc_links_service.ts
+++ b/src/core/public/doc_links/doc_links_service.ts
@@ -133,6 +133,12 @@ export class DocLinksService {
           dashboardSettings: `${ELASTIC_WEBSITE_URL}guide/en/kibana/${DOC_LINK_VERSION}/advanced-options.html#kibana-dashboard-settings`,
           visualizationSettings: `${ELASTIC_WEBSITE_URL}guide/en/kibana/${DOC_LINK_VERSION}/advanced-options.html#kibana-visualization-settings`,
         },
+        ml: {
+          guide: `${ELASTIC_WEBSITE_URL}guide/en/machine-learning/${DOC_LINK_VERSION}/index.html`,
+          anomalyDetection: `${ELASTIC_WEBSITE_URL}guide/en/machine-learning/${DOC_LINK_VERSION}/xpack-ml.html`,
+          anomalyDetectionJobs: `${ELASTIC_WEBSITE_URL}guide/en/machine-learning/${DOC_LINK_VERSION}/ml-jobs.html`,
+          dataFrameAnalytics: `${ELASTIC_WEBSITE_URL}guide/en/machine-learning/${DOC_LINK_VERSION}/ml-dfanalytics.html`,
+        },
         visualize: {
           guide: `${ELASTIC_WEBSITE_URL}guide/en/kibana/${DOC_LINK_VERSION}/visualize.html`,
           timelionDeprecation: `${ELASTIC_WEBSITE_URL}guide/en/kibana/${DOC_LINK_VERSION}/dashboard.html#timelion-deprecation`,
@@ -242,6 +248,12 @@ export interface DocLinksStart {
       readonly dateMath: string;
     };
     readonly management: Record<string, string>;
+    readonly ml: {
+      readonly guide: string;
+      readonly anomalyDetection: string;
+      readonly anomalyDetectionJobs: string;
+      readonly dataFrameAnalytics: string;
+    };
     readonly visualize: Record<string, string>;
   };
 }
diff --git a/src/core/public/public.api.md b/src/core/public/public.api.md
index 51fc65441b3b5..3c4608773b783 100644
--- a/src/core/public/public.api.md
+++ b/src/core/public/public.api.md
@@ -568,6 +568,12 @@ export interface DocLinksStart {
             readonly dateMath: string;
         };
         readonly management: Record<string, string>;
+        readonly ml: {
+            readonly guide: string;
+            readonly anomalyDetection: string;
+            readonly anomalyDetectionJobs: string;
+            readonly dataFrameAnalytics: string;
+        };
         readonly visualize: Record<string, string>;
     };
 }
diff --git a/src/core/server/elasticsearch/client/errors.ts b/src/core/server/elasticsearch/client/errors.ts
index 31a27170e1155..ffbb21f530f2c 100644
--- a/src/core/server/elasticsearch/client/errors.ts
+++ b/src/core/server/elasticsearch/client/errors.ts
@@ -23,10 +23,10 @@ export type UnauthorizedError = ResponseError & {
   statusCode: 401;
 };
 
-export function isResponseError(error: any): error is ResponseError {
-  return Boolean(error.body && error.statusCode && error.headers);
+export function isResponseError(error: unknown): error is ResponseError {
+  return error instanceof ResponseError;
 }
 
-export function isUnauthorizedError(error: any): error is UnauthorizedError {
+export function isUnauthorizedError(error: unknown): error is UnauthorizedError {
   return isResponseError(error) && error.statusCode === 401;
 }
diff --git a/src/dev/build/tasks/bin/scripts/kibana-keystore.bat b/src/dev/build/tasks/bin/scripts/kibana-keystore.bat
index 2214769efc410..c40145e7d6817 100755
--- a/src/dev/build/tasks/bin/scripts/kibana-keystore.bat
+++ b/src/dev/build/tasks/bin/scripts/kibana-keystore.bat
@@ -14,11 +14,11 @@ If Not Exist "%NODE%" (
 
 set CONFIG_DIR=%KBN_PATH_CONF%
 If [%KBN_PATH_CONF%] == [] (
-  set CONFIG_DIR=%DIR%\config
+  set "CONFIG_DIR=%DIR%\config"
 )
 
 IF EXIST "%CONFIG_DIR%\node.options" (
-  for /F "eol=# tokens=*" %%i in (%CONFIG_DIR%\node.options) do (
+  for /F "usebackq eol=# tokens=*" %%i in ("%CONFIG_DIR%\node.options") do (
     If [!NODE_OPTIONS!] == [] (
       set "NODE_OPTIONS=%%i"
     )	Else (
diff --git a/src/dev/build/tasks/bin/scripts/kibana-plugin.bat b/src/dev/build/tasks/bin/scripts/kibana-plugin.bat
index 0a6d135565e50..d1282f8cf32ac 100755
--- a/src/dev/build/tasks/bin/scripts/kibana-plugin.bat
+++ b/src/dev/build/tasks/bin/scripts/kibana-plugin.bat
@@ -15,11 +15,11 @@ If Not Exist "%NODE%" (
 
 set CONFIG_DIR=%KBN_PATH_CONF%
 If [%KBN_PATH_CONF%] == [] (
-  set CONFIG_DIR=%DIR%\config
+  set "CONFIG_DIR=%DIR%\config"
 )
 
 IF EXIST "%CONFIG_DIR%\node.options" (
-  for /F "eol=# tokens=*" %%i in (%CONFIG_DIR%\node.options) do (
+  for /F "usebackq eol=# tokens=*" %%i in ("%CONFIG_DIR%\node.options") do (
     If [!NODE_OPTIONS!] == [] (
       set "NODE_OPTIONS=%%i"
     )	Else (
diff --git a/src/dev/build/tasks/bin/scripts/kibana.bat b/src/dev/build/tasks/bin/scripts/kibana.bat
index 19bf8157ed7c8..4fc62804ca9a1 100755
--- a/src/dev/build/tasks/bin/scripts/kibana.bat
+++ b/src/dev/build/tasks/bin/scripts/kibana.bat
@@ -16,11 +16,11 @@ If Not Exist "%NODE%" (
 
 set CONFIG_DIR=%KBN_PATH_CONF%
 If [%KBN_PATH_CONF%] == [] (
-  set CONFIG_DIR=%DIR%\config
+  set "CONFIG_DIR=%DIR%\config"
 )
 
 IF EXIST "%CONFIG_DIR%\node.options" (
-  for /F "eol=# tokens=*" %%i in (%CONFIG_DIR%\node.options) do (
+  for /F "usebackq eol=# tokens=*" %%i in ("%CONFIG_DIR%\node.options") do (
     If [!NODE_OPTIONS!] == [] (
       set "NODE_OPTIONS=%%i"
     )	Else (
diff --git a/src/plugins/vis_type_timeseries/public/application/components/vis_types/timeseries/vis.test.js b/src/plugins/vis_type_timeseries/public/application/components/vis_types/timeseries/vis.test.js
new file mode 100644
index 0000000000000..d1c90aaa06fd2
--- /dev/null
+++ b/src/plugins/vis_type_timeseries/public/application/components/vis_types/timeseries/vis.test.js
@@ -0,0 +1,121 @@
+/*
+ * Licensed to Elasticsearch B.V. under one or more contributor
+ * license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright
+ * ownership. Elasticsearch B.V. licenses this file to you under
+ * the Apache License, Version 2.0 (the "License"); you may
+ * not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *    http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+import React from 'react';
+import { shallow } from 'enzyme';
+import { TimeSeries } from '../../../visualizations/views/timeseries';
+import TimeseriesVisualization from './vis';
+import { setFieldFormats } from '../../../../services';
+import { UI_SETTINGS } from '../../../../../../data/public';
+import { getFieldFormatsRegistry } from '../../../../../../data/public/test_utils';
+
+describe('TimeseriesVisualization', () => {
+  describe('TimeSeries Y-Axis formatted value', () => {
+    const config = {
+      [UI_SETTINGS.FORMAT_PERCENT_DEFAULT_PATTERN]: '0.[00]%',
+      [UI_SETTINGS.FORMAT_BYTES_DEFAULT_PATTERN]: '0.0b',
+    };
+    const id = 'default';
+    const value = 500;
+
+    setFieldFormats(
+      getFieldFormatsRegistry({
+        uiSettings: { get: jest.fn() },
+      })
+    );
+
+    const setupTimeSeriesPropsWithFormatters = (...formatters) => {
+      const series = formatters.map((formatter) => ({
+        id,
+        formatter,
+        data: [],
+      }));
+
+      const timeSeriesVisualization = shallow(
+        <TimeseriesVisualization
+          getConfig={(key) => config[key]}
+          model={{
+            id,
+            series,
+          }}
+          visData={{
+            [id]: {
+              id,
+              series,
+            },
+          }}
+        />
+      );
+
+      return timeSeriesVisualization.find(TimeSeries).props();
+    };
+
+    test('should be byte for single byte series', () => {
+      const timeSeriesProps = setupTimeSeriesPropsWithFormatters('byte');
+
+      const yAxisFormattedValue = timeSeriesProps.yAxis[0].tickFormatter(value);
+
+      expect(yAxisFormattedValue).toBe('500B');
+    });
+
+    test('should have custom format for single series', () => {
+      const timeSeriesProps = setupTimeSeriesPropsWithFormatters('0.00bitd');
+
+      const yAxisFormattedValue = timeSeriesProps.yAxis[0].tickFormatter(value);
+
+      expect(yAxisFormattedValue).toBe('500.00bit');
+    });
+
+    test('should be the same number for byte and percent series', () => {
+      const timeSeriesProps = setupTimeSeriesPropsWithFormatters('byte', 'percent');
+
+      const yAxisFormattedValue = timeSeriesProps.yAxis[0].tickFormatter(value);
+
+      expect(yAxisFormattedValue).toBe(value);
+    });
+
+    test('should be the same stringified number for byte and percent series', () => {
+      const timeSeriesProps = setupTimeSeriesPropsWithFormatters('byte', 'percent');
+
+      const yAxisFormattedValue = timeSeriesProps.yAxis[0].tickFormatter(value.toString());
+
+      expect(yAxisFormattedValue).toBe('500');
+    });
+
+    test('should be byte for two byte formatted series', () => {
+      const timeSeriesProps = setupTimeSeriesPropsWithFormatters('byte', 'byte');
+
+      const yAxisFormattedValue = timeSeriesProps.yAxis[0].tickFormatter(value);
+      const firstSeriesFormattedValue = timeSeriesProps.series[0].tickFormat(value);
+
+      expect(firstSeriesFormattedValue).toBe('500B');
+      expect(yAxisFormattedValue).toBe(firstSeriesFormattedValue);
+    });
+
+    test('should be percent for three percent formatted series', () => {
+      const timeSeriesProps = setupTimeSeriesPropsWithFormatters('percent', 'percent', 'percent');
+
+      const yAxisFormattedValue = timeSeriesProps.yAxis[0].tickFormatter(value);
+      const firstSeriesFormattedValue = timeSeriesProps.series[0].tickFormat(value);
+
+      expect(firstSeriesFormattedValue).toBe('50000%');
+      expect(yAxisFormattedValue).toBe(firstSeriesFormattedValue);
+    });
+  });
+});
diff --git a/x-pack/plugins/alerts/README.md b/x-pack/plugins/alerts/README.md
index 0a112c6ae761a..519c50e3f27c0 100644
--- a/x-pack/plugins/alerts/README.md
+++ b/x-pack/plugins/alerts/README.md
@@ -661,16 +661,16 @@ Below is an example of an alert that takes advantage of templating:
 ```
 {
   ...
-  id: "123",
-  name: "cpu alert",
-  actions: [
+  "id": "123",
+  "name": "cpu alert",
+  "actions": [
     {
       "group": "default",
       "id": "3c5b2bd4-5424-4e4b-8cf5-c0a58c762cc5",
       "params": {
         "from": "example@elastic.co",
         "to": ["destination@elastic.co"],
-        "subject": "A notification about {{context.server}}"
+        "subject": "A notification about {{context.server}}",
         "body": "The server {{context.server}} has a CPU usage of {{state.cpuUsage}}%. This message for {{alertInstanceId}} was created by the alert {{alertId}} {{alertName}}."
       }
     }
diff --git a/x-pack/plugins/index_lifecycle_management/__jest__/client_integration/edit_policy/edit_policy.helpers.tsx b/x-pack/plugins/index_lifecycle_management/__jest__/client_integration/edit_policy/edit_policy.helpers.tsx
index 6bb51602df21f..c10b8b7005c7e 100644
--- a/x-pack/plugins/index_lifecycle_management/__jest__/client_integration/edit_policy/edit_policy.helpers.tsx
+++ b/x-pack/plugins/index_lifecycle_management/__jest__/client_integration/edit_policy/edit_policy.helpers.tsx
@@ -200,11 +200,14 @@ export const setup = async (arg?: { appServicesContext: Partial<AppServicesConte
   const createSearchableSnapshotActions = (phase: Phases) => {
     const fieldSelector = `searchableSnapshotField-${phase}`;
     const licenseCalloutSelector = `${fieldSelector}.searchableSnapshotDisabledDueToLicense`;
+    const rolloverCalloutSelector = `${fieldSelector}.searchableSnapshotFieldsNoRolloverCallout`;
     const toggleSelector = `${fieldSelector}.searchableSnapshotToggle`;
 
     const toggleSearchableSnapshot = createFormToggleAction(toggleSelector);
     return {
-      searchableSnapshotDisabled: () => exists(licenseCalloutSelector),
+      searchableSnapshotDisabledDueToRollover: () => exists(rolloverCalloutSelector),
+      searchableSnapshotDisabled: () =>
+        exists(licenseCalloutSelector) && find(licenseCalloutSelector).props().disabled === true,
       searchableSnapshotsExists: () => exists(fieldSelector),
       findSearchableSnapshotToggle: () => find(toggleSelector),
       searchableSnapshotDisabledDueToLicense: () =>
diff --git a/x-pack/plugins/index_lifecycle_management/__jest__/client_integration/edit_policy/edit_policy.test.ts b/x-pack/plugins/index_lifecycle_management/__jest__/client_integration/edit_policy/edit_policy.test.ts
index 12a061f0980dd..15270991319a2 100644
--- a/x-pack/plugins/index_lifecycle_management/__jest__/client_integration/edit_policy/edit_policy.test.ts
+++ b/x-pack/plugins/index_lifecycle_management/__jest__/client_integration/edit_policy/edit_policy.test.ts
@@ -745,4 +745,34 @@ describe('<EditPolicy />', () => {
       });
     });
   });
+  describe('without rollover', () => {
+    beforeEach(async () => {
+      httpRequestsMockHelpers.setLoadPolicies([getDefaultHotPhasePolicy('my_policy')]);
+      httpRequestsMockHelpers.setListNodes({
+        isUsingDeprecatedDataRoleConfig: false,
+        nodesByAttributes: { test: ['123'] },
+        nodesByRoles: { data: ['123'] },
+      });
+      httpRequestsMockHelpers.setListSnapshotRepos({ repositories: ['found-snapshots'] });
+
+      await act(async () => {
+        testBed = await setup({
+          appServicesContext: {
+            license: licensingMock.createLicense({ license: { type: 'basic' } }),
+          },
+        });
+      });
+
+      const { component } = testBed;
+      component.update();
+    });
+    test('hiding and disabling searchable snapshot field', async () => {
+      const { actions } = testBed;
+      await actions.hot.toggleRollover(false);
+      await actions.cold.enable(true);
+
+      expect(actions.hot.searchableSnapshotsExists()).toBeFalsy();
+      expect(actions.cold.searchableSnapshotDisabledDueToLicense()).toBeTruthy();
+    });
+  });
 });
diff --git a/x-pack/plugins/index_lifecycle_management/public/application/sections/edit_policy/components/phases/cold_phase/cold_phase.tsx b/x-pack/plugins/index_lifecycle_management/public/application/sections/edit_policy/components/phases/cold_phase/cold_phase.tsx
index addad5e572b70..5eeb336ad1108 100644
--- a/x-pack/plugins/index_lifecycle_management/public/application/sections/edit_policy/components/phases/cold_phase/cold_phase.tsx
+++ b/x-pack/plugins/index_lifecycle_management/public/application/sections/edit_policy/components/phases/cold_phase/cold_phase.tsx
@@ -141,9 +141,8 @@ export const ColdPhase: FunctionComponent = () => {
                         'xpack.indexLifecycleMgmt.editPolicy.coldPhase.numberOfReplicas.switchLabel',
                         { defaultMessage: 'Set replicas' }
                       ),
-                      initialValue: Boolean(
-                        policy.phases.cold?.actions?.allocate?.number_of_replicas
-                      ),
+                      initialValue:
+                        policy.phases.cold?.actions?.allocate?.number_of_replicas != null,
                     }}
                     fullWidth
                   >
diff --git a/x-pack/plugins/index_lifecycle_management/public/application/sections/edit_policy/components/phases/hot_phase/hot_phase.tsx b/x-pack/plugins/index_lifecycle_management/public/application/sections/edit_policy/components/phases/hot_phase/hot_phase.tsx
index 3ca592af85a2a..e86bbd9e747bc 100644
--- a/x-pack/plugins/index_lifecycle_management/public/application/sections/edit_policy/components/phases/hot_phase/hot_phase.tsx
+++ b/x-pack/plugins/index_lifecycle_management/public/application/sections/edit_policy/components/phases/hot_phase/hot_phase.tsx
@@ -234,9 +234,11 @@ export const HotPhase: FunctionComponent = () => {
             </>
           )}
         </ToggleFieldWithDescribedFormRow>
-        {license.canUseSearchableSnapshot() && <SearchableSnapshotField phase="hot" />}
-        {isRolloverEnabled && !isUsingSearchableSnapshotInHotPhase && (
-          <ForcemergeField phase="hot" />
+        {isRolloverEnabled && (
+          <>
+            {license.canUseSearchableSnapshot() && <SearchableSnapshotField phase="hot" />}
+            {!isUsingSearchableSnapshotInHotPhase && <ForcemergeField phase="hot" />}
+          </>
         )}
         <SetPriorityInputField phase={hotProperty} />
       </EuiAccordion>
diff --git a/x-pack/plugins/index_lifecycle_management/public/application/sections/edit_policy/components/phases/shared_fields/forcemerge_field.tsx b/x-pack/plugins/index_lifecycle_management/public/application/sections/edit_policy/components/phases/shared_fields/forcemerge_field.tsx
index dd5cc1fbc8c87..69121cc2d1252 100644
--- a/x-pack/plugins/index_lifecycle_management/public/application/sections/edit_policy/components/phases/shared_fields/forcemerge_field.tsx
+++ b/x-pack/plugins/index_lifecycle_management/public/application/sections/edit_policy/components/phases/shared_fields/forcemerge_field.tsx
@@ -24,7 +24,7 @@ export const ForcemergeField: React.FunctionComponent<Props> = ({ phase }) => {
   const { policy } = useEditPolicyContext();
 
   const initialToggleValue = useMemo<boolean>(() => {
-    return Boolean(policy.phases[phase]?.actions?.forcemerge);
+    return policy.phases[phase]?.actions?.forcemerge != null;
   }, [policy, phase]);
 
   return (
diff --git a/x-pack/plugins/index_lifecycle_management/public/application/sections/edit_policy/components/phases/shared_fields/searchable_snapshot_field/searchable_snapshot_field.tsx b/x-pack/plugins/index_lifecycle_management/public/application/sections/edit_policy/components/phases/shared_fields/searchable_snapshot_field/searchable_snapshot_field.tsx
index 38eb743075411..2a55cee0794c5 100644
--- a/x-pack/plugins/index_lifecycle_management/public/application/sections/edit_policy/components/phases/shared_fields/searchable_snapshot_field/searchable_snapshot_field.tsx
+++ b/x-pack/plugins/index_lifecycle_management/public/application/sections/edit_policy/components/phases/shared_fields/searchable_snapshot_field/searchable_snapshot_field.tsx
@@ -29,7 +29,9 @@ import { useConfigurationIssues } from '../../../../form';
 
 import { i18nTexts } from '../../../../i18n_texts';
 
-import { FieldLoadingError, DescribedFormRow, LearnMoreLink } from '../../../index';
+import { useRolloverPath } from '../../../../constants';
+
+import { FieldLoadingError, DescribedFormRow, LearnMoreLink } from '../../../';
 
 import { SearchableSnapshotDataProvider } from './searchable_snapshot_data_provider';
 
@@ -53,12 +55,19 @@ export const SearchableSnapshotField: FunctionComponent<Props> = ({ phase }) =>
   } = useKibana();
   const { getUrlForApp, policy, license } = useEditPolicyContext();
   const { isUsingSearchableSnapshotInHotPhase } = useConfigurationIssues();
+
   const searchableSnapshotPath = `phases.${phase}.actions.searchable_snapshot.snapshot_repository`;
 
+  const [formData] = useFormData({ watch: [searchableSnapshotPath, useRolloverPath] });
+  const isRolloverEnabled = get(formData, useRolloverPath);
+  const searchableSnapshotRepo = get(formData, searchableSnapshotPath);
+
   const isDisabledDueToLicense = !license.canUseSearchableSnapshot();
   const isDisabledInColdDueToHotPhase = phase === 'cold' && isUsingSearchableSnapshotInHotPhase;
+  const isDisabledInColdDueToRollover = phase === 'cold' && !isRolloverEnabled;
 
-  const isDisabled = isDisabledDueToLicense || isDisabledInColdDueToHotPhase;
+  const isDisabled =
+    isDisabledDueToLicense || isDisabledInColdDueToHotPhase || isDisabledInColdDueToRollover;
 
   const [isFieldToggleChecked, setIsFieldToggleChecked] = useState(() =>
     Boolean(policy.phases[phase]?.actions?.searchable_snapshot?.snapshot_repository)
@@ -70,9 +79,6 @@ export const SearchableSnapshotField: FunctionComponent<Props> = ({ phase }) =>
     }
   }, [isDisabled]);
 
-  const [formData] = useFormData({ watch: searchableSnapshotPath });
-  const searchableSnapshotRepo = get(formData, searchableSnapshotPath);
-
   const renderField = () => (
     <SearchableSnapshotDataProvider>
       {({ error, isLoading, resendRequest, data }) => {
@@ -280,7 +286,21 @@ export const SearchableSnapshotField: FunctionComponent<Props> = ({ phase }) =>
             'xpack.indexLifecycleMgmt.editPolicy.searchableSnapshotDisabledCalloutBody',
             {
               defaultMessage:
-                'Cannot perform searchable snapshot in cold when it is configured in hot phase.',
+                'Cannot create a searchable snapshot in cold when it is configured in hot phase.',
+            }
+          )}
+        />
+      );
+    } else if (isDisabledInColdDueToRollover) {
+      infoCallout = (
+        <EuiCallOut
+          size="s"
+          data-test-subj="searchableSnapshotFieldsNoRolloverCallout"
+          title={i18n.translate(
+            'xpack.indexLifecycleMgmt.editPolicy.searchableSnapshotNoRolloverCalloutBody',
+            {
+              defaultMessage:
+                'Cannot create a searchable snapshot when rollover is disabled in the hot phase.',
             }
           )}
         />
diff --git a/x-pack/plugins/index_lifecycle_management/public/application/sections/edit_policy/components/phases/warm_phase/warm_phase.tsx b/x-pack/plugins/index_lifecycle_management/public/application/sections/edit_policy/components/phases/warm_phase/warm_phase.tsx
index 9ccfcd58f4d85..b573bc6a80632 100644
--- a/x-pack/plugins/index_lifecycle_management/public/application/sections/edit_policy/components/phases/warm_phase/warm_phase.tsx
+++ b/x-pack/plugins/index_lifecycle_management/public/application/sections/edit_policy/components/phases/warm_phase/warm_phase.tsx
@@ -162,7 +162,7 @@ export const WarmPhase: FunctionComponent = () => {
                   'xpack.indexLifecycleMgmt.editPolicy.warmPhase.numberOfReplicas.switchLabel',
                   { defaultMessage: 'Set replicas' }
                 ),
-                initialValue: Boolean(policy.phases.warm?.actions?.allocate?.number_of_replicas),
+                initialValue: policy.phases.warm?.actions?.allocate?.number_of_replicas != null,
               }}
               fullWidth
             >
@@ -203,7 +203,7 @@ export const WarmPhase: FunctionComponent = () => {
                   'data-test-subj': 'shrinkSwitch',
                   label: i18nTexts.shrinkLabel,
                   'aria-label': i18nTexts.shrinkLabel,
-                  initialValue: Boolean(policy.phases.warm?.actions?.shrink),
+                  initialValue: policy.phases.warm?.actions?.shrink != null,
                 }}
                 fullWidth
               >
diff --git a/x-pack/plugins/index_lifecycle_management/public/application/sections/edit_policy/form/deserializer_and_serializer.test.ts b/x-pack/plugins/index_lifecycle_management/public/application/sections/edit_policy/form/deserializer_and_serializer.test.ts
index bafe6c15d9dca..20f8423ec24fc 100644
--- a/x-pack/plugins/index_lifecycle_management/public/application/sections/edit_policy/form/deserializer_and_serializer.test.ts
+++ b/x-pack/plugins/index_lifecycle_management/public/application/sections/edit_policy/form/deserializer_and_serializer.test.ts
@@ -56,11 +56,17 @@ const originalPolicy: SerializedPolicy = {
         shrink: { number_of_shards: 12 },
         allocate: {
           number_of_replicas: 3,
+          include: {
+            some: 'value',
+          },
+          exclude: {
+            some: 'value',
+          },
         },
         set_priority: {
           priority: 10,
         },
-        migrate: { enabled: false },
+        migrate: { enabled: true },
       },
     },
     cold: {
@@ -133,7 +139,8 @@ describe('deserializer and serializer', () => {
 
     const copyOfThisTestPolicy = cloneDeep(thisTestPolicy);
 
-    expect(serializer(deserializer(thisTestPolicy))).toEqual(thisTestPolicy);
+    const _formInternal = deserializer(thisTestPolicy);
+    expect(serializer(_formInternal)).toEqual(thisTestPolicy);
 
     // Assert that the policy we passed in is unaltered after deserialization and serialization
     expect(thisTestPolicy).not.toBe(copyOfThisTestPolicy);
@@ -247,4 +254,40 @@ describe('deserializer and serializer', () => {
       },
     });
   });
+
+  it('sets all known allocate options correctly', () => {
+    formInternal.phases.warm!.actions.allocate!.number_of_replicas = 0;
+    formInternal._meta.warm.dataTierAllocationType = 'node_attrs';
+    formInternal._meta.warm.allocationNodeAttribute = 'some:value';
+
+    expect(serializer(formInternal).phases.warm!.actions.allocate).toEqual({
+      number_of_replicas: 0,
+      require: {
+        some: 'value',
+      },
+      include: {
+        some: 'value',
+      },
+      exclude: {
+        some: 'value',
+      },
+    });
+  });
+
+  it('sets allocate and migrate actions when defined together', () => {
+    formInternal.phases.warm!.actions.allocate!.number_of_replicas = 0;
+    formInternal._meta.warm.dataTierAllocationType = 'none';
+    // This should not be set...
+    formInternal._meta.warm.allocationNodeAttribute = 'some:value';
+
+    const result = serializer(formInternal);
+
+    expect(result.phases.warm!.actions.allocate).toEqual({
+      number_of_replicas: 0,
+    });
+
+    expect(result.phases.warm!.actions.migrate).toEqual({
+      enabled: false,
+    });
+  });
 });
diff --git a/x-pack/plugins/index_lifecycle_management/public/application/sections/edit_policy/form/schema.ts b/x-pack/plugins/index_lifecycle_management/public/application/sections/edit_policy/form/schema.ts
index cedf1cdb4d9fe..fa9def6864be0 100644
--- a/x-pack/plugins/index_lifecycle_management/public/application/sections/edit_policy/form/schema.ts
+++ b/x-pack/plugins/index_lifecycle_management/public/application/sections/edit_policy/form/schema.ts
@@ -202,7 +202,7 @@ export const schema: FormSchema<FormInternal> = {
             }),
             validations: [
               {
-                validator: ifExistsNumberGreaterThanZero,
+                validator: ifExistsNumberNonNegative,
               },
             ],
             serializer: serializers.stringToNumber,
@@ -273,7 +273,7 @@ export const schema: FormSchema<FormInternal> = {
             }),
             validations: [
               {
-                validator: ifExistsNumberGreaterThanZero,
+                validator: ifExistsNumberNonNegative,
               },
             ],
             serializer: serializers.stringToNumber,
diff --git a/x-pack/plugins/index_lifecycle_management/public/application/sections/edit_policy/form/serializer/serialize_migrate_and_allocate_actions.ts b/x-pack/plugins/index_lifecycle_management/public/application/sections/edit_policy/form/serializer/serialize_migrate_and_allocate_actions.ts
index d18a63d34c101..24cfec46393fc 100644
--- a/x-pack/plugins/index_lifecycle_management/public/application/sections/edit_policy/form/serializer/serialize_migrate_and_allocate_actions.ts
+++ b/x-pack/plugins/index_lifecycle_management/public/application/sections/edit_policy/form/serializer/serialize_migrate_and_allocate_actions.ts
@@ -11,18 +11,33 @@ import { SerializedActionWithAllocation } from '../../../../../../common/types';
 import { DataAllocationMetaFields } from '../../types';
 
 export const serializeMigrateAndAllocateActions = (
+  /**
+   * Form metadata about what tier allocation strategy to use and custom node
+   * allocation information.
+   */
   { dataTierAllocationType, allocationNodeAttribute }: DataAllocationMetaFields,
-  newActions: SerializedActionWithAllocation = {},
-  originalActions: SerializedActionWithAllocation = {}
+  /**
+   * The new configuration merged with old configuration to ensure we don't lose
+   * any fields.
+   */
+  mergedActions: SerializedActionWithAllocation = {},
+  /**
+   * The actions from the policy for a given phase when it was loaded.
+   */
+  originalActions: SerializedActionWithAllocation = {},
+  /**
+   * The number of replicas value to set in the allocate action.
+   */
+  numberOfReplicas?: number
 ): SerializedActionWithAllocation => {
-  const { allocate, migrate, ...otherActions } = newActions;
+  const { allocate, migrate, ...otherActions } = mergedActions;
 
   // First copy over all non-allocate and migrate actions.
   const actions: SerializedActionWithAllocation = { ...otherActions };
 
-  // The UI only knows about include, exclude and require, so copy over all other values.
+  // The UI only knows about include, exclude, require and number_of_replicas so copy over all other values.
   if (allocate) {
-    const { include, exclude, require, ...otherSettings } = allocate;
+    const { include, exclude, require, number_of_replicas: __, ...otherSettings } = allocate;
     if (!isEmpty(otherSettings)) {
       actions.allocate = { ...otherSettings };
     }
@@ -69,5 +84,13 @@ export const serializeMigrateAndAllocateActions = (
       break;
     default:
   }
+
+  if (numberOfReplicas != null) {
+    actions.allocate = {
+      ...actions.allocate,
+      number_of_replicas: numberOfReplicas,
+    };
+  }
+
   return actions;
 };
diff --git a/x-pack/plugins/index_lifecycle_management/public/application/sections/edit_policy/form/serializer/serializer.ts b/x-pack/plugins/index_lifecycle_management/public/application/sections/edit_policy/form/serializer/serializer.ts
index 2071d1be523b6..211c7d263e47e 100644
--- a/x-pack/plugins/index_lifecycle_management/public/application/sections/edit_policy/form/serializer/serializer.ts
+++ b/x-pack/plugins/index_lifecycle_management/public/application/sections/edit_policy/form/serializer/serializer.ts
@@ -95,7 +95,8 @@ export const createSerializer = (originalPolicy?: SerializedPolicy) => (
       warmPhase.actions = serializeMigrateAndAllocateActions(
         _meta.warm,
         warmPhase.actions,
-        originalPolicy?.phases.warm?.actions
+        originalPolicy?.phases.warm?.actions,
+        updatedPolicy.phases.warm?.actions?.allocate?.number_of_replicas
       );
 
       if (!updatedPolicy.phases.warm?.actions?.forcemerge) {
@@ -129,7 +130,8 @@ export const createSerializer = (originalPolicy?: SerializedPolicy) => (
       coldPhase.actions = serializeMigrateAndAllocateActions(
         _meta.cold,
         coldPhase.actions,
-        originalPolicy?.phases.cold?.actions
+        originalPolicy?.phases.cold?.actions,
+        updatedPolicy.phases.cold?.actions?.allocate?.number_of_replicas
       );
 
       if (_meta.cold.freezeEnabled) {
diff --git a/x-pack/plugins/lens/public/editor_frame_service/editor_frame/config_panel/layer_panel.test.tsx b/x-pack/plugins/lens/public/editor_frame_service/editor_frame/config_panel/layer_panel.test.tsx
index 0f16786263125..bdf6f9aa41643 100644
--- a/x-pack/plugins/lens/public/editor_frame_service/editor_frame/config_panel/layer_panel.test.tsx
+++ b/x-pack/plugins/lens/public/editor_frame_service/editor_frame/config_panel/layer_panel.test.tsx
@@ -274,6 +274,69 @@ describe('LayerPanel', () => {
       expect(component.find('EuiFlyoutHeader').exists()).toBe(true);
     });
 
+    it('should not update the visualization if the datasource is incomplete', () => {
+      (generateId as jest.Mock).mockReturnValueOnce(`newid`);
+      const updateAll = jest.fn();
+      const updateDatasource = jest.fn();
+
+      mockVisualization.getConfiguration.mockReturnValue({
+        groups: [
+          {
+            groupLabel: 'A',
+            groupId: 'a',
+            accessors: [],
+            filterOperations: () => true,
+            supportsMoreColumns: true,
+            dataTestSubj: 'lnsGroup',
+          },
+        ],
+      });
+
+      const component = mountWithIntl(
+        <LayerPanel
+          {...getDefaultProps()}
+          updateDatasource={updateDatasource}
+          updateAll={updateAll}
+        />
+      );
+
+      act(() => {
+        component.find('[data-test-subj="lns-empty-dimension"]').first().simulate('click');
+      });
+      component.update();
+
+      expect(mockDatasource.renderDimensionEditor).toHaveBeenCalledWith(
+        expect.any(Element),
+        expect.objectContaining({ columnId: 'newid' })
+      );
+      const stateFn =
+        mockDatasource.renderDimensionEditor.mock.calls[
+          mockDatasource.renderDimensionEditor.mock.calls.length - 1
+        ][1].setState;
+
+      act(() => {
+        stateFn({
+          indexPatternId: '1',
+          columns: {},
+          columnOrder: [],
+          incompleteColumns: { newId: { operationType: 'count' } },
+        });
+      });
+      expect(updateAll).not.toHaveBeenCalled();
+
+      act(() => {
+        stateFn(
+          {
+            indexPatternId: '1',
+            columns: {},
+            columnOrder: [],
+          },
+          true
+        );
+      });
+      expect(updateAll).toHaveBeenCalled();
+    });
+
     it('should close the DimensionContainer when the active visualization changes', () => {
       /**
        * The ID generation system for new dimensions has been messy before, so
diff --git a/x-pack/plugins/lens/public/editor_frame_service/editor_frame/config_panel/layer_panel.tsx b/x-pack/plugins/lens/public/editor_frame_service/editor_frame/config_panel/layer_panel.tsx
index 329dfc32fb3b6..5a068e711ff5e 100644
--- a/x-pack/plugins/lens/public/editor_frame_service/editor_frame/config_panel/layer_panel.tsx
+++ b/x-pack/plugins/lens/public/editor_frame_service/editor_frame/config_panel/layer_panel.tsx
@@ -503,17 +503,21 @@ export function LayerPanel(
                     columnId: activeId,
                     filterOperations: activeGroup.filterOperations,
                     dimensionGroups: groups,
-                    setState: (newState: unknown) => {
-                      props.updateAll(
-                        datasourceId,
-                        newState,
-                        activeVisualization.setDimension({
-                          layerId,
-                          groupId: activeGroup.groupId,
-                          columnId: activeId,
-                          prevState: props.visualizationState,
-                        })
-                      );
+                    setState: (newState: unknown, shouldUpdateVisualization?: boolean) => {
+                      if (shouldUpdateVisualization) {
+                        props.updateAll(
+                          datasourceId,
+                          newState,
+                          activeVisualization.setDimension({
+                            layerId,
+                            groupId: activeGroup.groupId,
+                            columnId: activeId,
+                            prevState: props.visualizationState,
+                          })
+                        );
+                      } else {
+                        props.updateDatasource(datasourceId, newState);
+                      }
                       setActiveDimension({
                         ...activeDimension,
                         isNew: false,
diff --git a/x-pack/plugins/lens/public/indexpattern_datasource/dimension_panel/dimension_editor.tsx b/x-pack/plugins/lens/public/indexpattern_datasource/dimension_panel/dimension_editor.tsx
index 576825e9c960a..df3b769acf850 100644
--- a/x-pack/plugins/lens/public/indexpattern_datasource/dimension_panel/dimension_editor.tsx
+++ b/x-pack/plugins/lens/public/indexpattern_datasource/dimension_panel/dimension_editor.tsx
@@ -110,6 +110,10 @@ export function DimensionEditor(props: DimensionEditorProps) {
   } = props;
   const { fieldByOperation, operationWithoutField } = operationSupportMatrix;
 
+  const setStateWrapper = (layer: IndexPatternLayer) => {
+    setState(mergeLayer({ state, layerId, newLayer: layer }), Boolean(layer.columns[columnId]));
+  };
+
   const selectedOperationDefinition =
     selectedColumn && operationDefinitionMap[selectedColumn.operationType];
 
@@ -194,13 +198,7 @@ export function DimensionEditor(props: DimensionEditorProps) {
             if (selectedColumn?.operationType === operationType) {
               // Clear invalid state because we are reseting to a valid column
               if (incompleteInfo) {
-                setState(
-                  mergeLayer({
-                    state,
-                    layerId,
-                    newLayer: resetIncomplete(state.layers[layerId], columnId),
-                  })
-                );
+                setStateWrapper(resetIncomplete(state.layers[layerId], columnId));
               }
               return;
             }
@@ -210,38 +208,30 @@ export function DimensionEditor(props: DimensionEditorProps) {
               columnId,
               op: operationType,
             });
-            setState(mergeLayer({ state, layerId, newLayer }));
+            setStateWrapper(newLayer);
             trackUiEvent(`indexpattern_dimension_operation_${operationType}`);
             return;
           } else if (!selectedColumn || !compatibleWithCurrentField) {
             const possibleFields = fieldByOperation[operationType] || new Set();
 
             if (possibleFields.size === 1) {
-              setState(
-                mergeLayer({
-                  state,
-                  layerId,
-                  newLayer: insertOrReplaceColumn({
-                    layer: props.state.layers[props.layerId],
-                    indexPattern: currentIndexPattern,
-                    columnId,
-                    op: operationType,
-                    field: currentIndexPattern.getFieldByName(possibleFields.values().next().value),
-                  }),
+              setStateWrapper(
+                insertOrReplaceColumn({
+                  layer: props.state.layers[props.layerId],
+                  indexPattern: currentIndexPattern,
+                  columnId,
+                  op: operationType,
+                  field: currentIndexPattern.getFieldByName(possibleFields.values().next().value),
                 })
               );
             } else {
-              setState(
-                mergeLayer({
-                  state,
-                  layerId,
-                  newLayer: insertOrReplaceColumn({
-                    layer: props.state.layers[props.layerId],
-                    indexPattern: currentIndexPattern,
-                    columnId,
-                    op: operationType,
-                    field: undefined,
-                  }),
+              setStateWrapper(
+                insertOrReplaceColumn({
+                  layer: props.state.layers[props.layerId],
+                  indexPattern: currentIndexPattern,
+                  columnId,
+                  op: operationType,
+                  field: undefined,
                 })
               );
             }
@@ -251,13 +241,7 @@ export function DimensionEditor(props: DimensionEditorProps) {
 
           if (selectedColumn.operationType === operationType) {
             if (incompleteInfo) {
-              setState(
-                mergeLayer({
-                  state,
-                  layerId,
-                  newLayer: resetIncomplete(state.layers[layerId], columnId),
-                })
-              );
+              setStateWrapper(resetIncomplete(state.layers[layerId], columnId));
             }
             return;
           }
@@ -271,7 +255,7 @@ export function DimensionEditor(props: DimensionEditorProps) {
               ? currentIndexPattern.getFieldByName(selectedColumn.sourceField)
               : undefined,
           });
-          setState(mergeLayer({ state, layerId, newLayer }));
+          setStateWrapper(newLayer);
         },
       };
     }
@@ -333,26 +317,16 @@ export function DimensionEditor(props: DimensionEditorProps) {
               }
               incompleteOperation={incompleteOperation}
               onDeleteColumn={() => {
-                setState(
-                  mergeLayer({
-                    state,
-                    layerId,
-                    newLayer: deleteColumn({ layer: state.layers[layerId], columnId }),
-                  })
-                );
+                setStateWrapper(deleteColumn({ layer: state.layers[layerId], columnId }));
               }}
               onChoose={(choice) => {
-                setState(
-                  mergeLayer({
-                    state,
-                    layerId,
-                    newLayer: insertOrReplaceColumn({
-                      layer: state.layers[layerId],
-                      columnId,
-                      indexPattern: currentIndexPattern,
-                      op: choice.operationType,
-                      field: currentIndexPattern.getFieldByName(choice.field),
-                    }),
+                setStateWrapper(
+                  insertOrReplaceColumn({
+                    layer: state.layers[layerId],
+                    columnId,
+                    indexPattern: currentIndexPattern,
+                    op: choice.operationType,
+                    field: currentIndexPattern.getFieldByName(choice.field),
                   })
                 );
               }}
@@ -365,9 +339,7 @@ export function DimensionEditor(props: DimensionEditorProps) {
             selectedColumn={selectedColumn}
             columnId={columnId}
             layer={state.layers[layerId]}
-            updateLayer={(newLayer: IndexPatternLayer) =>
-              setState(mergeLayer({ layerId, state, newLayer }))
-            }
+            updateLayer={setStateWrapper}
           />
         )}
 
diff --git a/x-pack/plugins/lens/public/indexpattern_datasource/dimension_panel/dimension_panel.test.tsx b/x-pack/plugins/lens/public/indexpattern_datasource/dimension_panel/dimension_panel.test.tsx
index 450918f1d13f2..6bfeafd41c6b4 100644
--- a/x-pack/plugins/lens/public/indexpattern_datasource/dimension_panel/dimension_panel.test.tsx
+++ b/x-pack/plugins/lens/public/indexpattern_datasource/dimension_panel/dimension_panel.test.tsx
@@ -367,23 +367,26 @@ describe('IndexPatternDimensionEditorPanel', () => {
       comboBox.prop('onChange')!([option]);
     });
 
-    expect(setState).toHaveBeenCalledWith({
-      ...initialState,
-      layers: {
-        first: {
-          ...state.layers.first,
-          columns: {
-            ...state.layers.first.columns,
-            col1: expect.objectContaining({
-              operationType: 'max',
-              sourceField: 'memory',
-              params: { format: { id: 'bytes' } },
-              // Other parts of this don't matter for this test
-            }),
+    expect(setState).toHaveBeenCalledWith(
+      {
+        ...initialState,
+        layers: {
+          first: {
+            ...state.layers.first,
+            columns: {
+              ...state.layers.first.columns,
+              col1: expect.objectContaining({
+                operationType: 'max',
+                sourceField: 'memory',
+                params: { format: { id: 'bytes' } },
+                // Other parts of this don't matter for this test
+              }),
+            },
           },
         },
       },
-    });
+      true
+    );
   });
 
   it('should switch operations when selecting a field that requires another operation', () => {
@@ -398,22 +401,25 @@ describe('IndexPatternDimensionEditorPanel', () => {
       comboBox.prop('onChange')!([option]);
     });
 
-    expect(setState).toHaveBeenCalledWith({
-      ...state,
-      layers: {
-        first: {
-          ...state.layers.first,
-          columns: {
-            ...state.layers.first.columns,
-            col1: expect.objectContaining({
-              operationType: 'terms',
-              sourceField: 'source',
-              // Other parts of this don't matter for this test
-            }),
+    expect(setState).toHaveBeenCalledWith(
+      {
+        ...state,
+        layers: {
+          first: {
+            ...state.layers.first,
+            columns: {
+              ...state.layers.first.columns,
+              col1: expect.objectContaining({
+                operationType: 'terms',
+                sourceField: 'source',
+                // Other parts of this don't matter for this test
+              }),
+            },
           },
         },
       },
-    });
+      true
+    );
   });
 
   it('should keep the field when switching to another operation compatible for this field', () => {
@@ -428,23 +434,26 @@ describe('IndexPatternDimensionEditorPanel', () => {
       wrapper.find('button[data-test-subj="lns-indexPatternDimension-min"]').simulate('click');
     });
 
-    expect(setState).toHaveBeenCalledWith({
-      ...state,
-      layers: {
-        first: {
-          ...state.layers.first,
-          columns: {
-            ...state.layers.first.columns,
-            col1: expect.objectContaining({
-              operationType: 'min',
-              sourceField: 'bytes',
-              params: { format: { id: 'bytes' } },
-              // Other parts of this don't matter for this test
-            }),
+    expect(setState).toHaveBeenCalledWith(
+      {
+        ...state,
+        layers: {
+          first: {
+            ...state.layers.first,
+            columns: {
+              ...state.layers.first.columns,
+              col1: expect.objectContaining({
+                operationType: 'min',
+                sourceField: 'bytes',
+                params: { format: { id: 'bytes' } },
+                // Other parts of this don't matter for this test
+              }),
+            },
           },
         },
       },
-    });
+      true
+    );
   });
 
   it('should not set the state if selecting the currently active operation', () => {
@@ -498,20 +507,23 @@ describe('IndexPatternDimensionEditorPanel', () => {
       wrapper.find('button[data-test-subj="lns-indexPatternDimension-min"]').simulate('click');
     });
 
-    expect(setState).toHaveBeenCalledWith({
-      ...state,
-      layers: {
-        first: {
-          ...state.layers.first,
-          columns: {
-            ...state.layers.first.columns,
-            col1: expect.objectContaining({
-              label: 'Minimum of bytes',
-            }),
+    expect(setState).toHaveBeenCalledWith(
+      {
+        ...state,
+        layers: {
+          first: {
+            ...state.layers.first,
+            columns: {
+              ...state.layers.first.columns,
+              col1: expect.objectContaining({
+                label: 'Minimum of bytes',
+              }),
+            },
           },
         },
       },
-    });
+      true
+    );
   });
 
   it('should keep the label on operation change if it is custom', () => {
@@ -532,21 +544,24 @@ describe('IndexPatternDimensionEditorPanel', () => {
       wrapper.find('button[data-test-subj="lns-indexPatternDimension-min"]').simulate('click');
     });
 
-    expect(setState).toHaveBeenCalledWith({
-      ...state,
-      layers: {
-        first: {
-          ...state.layers.first,
-          columns: {
-            ...state.layers.first.columns,
-            col1: expect.objectContaining({
-              label: 'Custom label',
-              customLabel: true,
-            }),
+    expect(setState).toHaveBeenCalledWith(
+      {
+        ...state,
+        layers: {
+          first: {
+            ...state.layers.first,
+            columns: {
+              ...state.layers.first.columns,
+              col1: expect.objectContaining({
+                label: 'Custom label',
+                customLabel: true,
+              }),
+            },
           },
         },
       },
-    });
+      true
+    );
   });
 
   describe('transient invalid state', () => {
@@ -559,20 +574,23 @@ describe('IndexPatternDimensionEditorPanel', () => {
           .simulate('click');
       });
 
-      expect(setState).toHaveBeenCalledWith({
-        ...state,
-        layers: {
-          first: {
-            ...state.layers.first,
-            columns: {
-              ...state.layers.first.columns,
-            },
-            incompleteColumns: {
-              col1: { operationType: 'terms' },
+      expect(setState).toHaveBeenCalledWith(
+        {
+          ...state,
+          layers: {
+            first: {
+              ...state.layers.first,
+              columns: {
+                ...state.layers.first.columns,
+              },
+              incompleteColumns: {
+                col1: { operationType: 'terms' },
+              },
             },
           },
         },
-      });
+        true
+      );
     });
 
     it('should show error message in invalid state', () => {
@@ -681,17 +699,20 @@ describe('IndexPatternDimensionEditorPanel', () => {
       wrapper = mount(<IndexPatternDimensionEditorComponent {...defaultProps} columnId={'col2'} />);
 
       wrapper.find('button[data-test-subj="lns-indexPatternDimension-avg"]').simulate('click');
-      expect(setState).toHaveBeenCalledWith({
-        ...state,
-        layers: {
-          first: {
-            ...state.layers.first,
-            incompleteColumns: {
-              col2: { operationType: 'avg' },
+      expect(setState).toHaveBeenCalledWith(
+        {
+          ...state,
+          layers: {
+            first: {
+              ...state.layers.first,
+              incompleteColumns: {
+                col2: { operationType: 'avg' },
+              },
             },
           },
         },
-      });
+        false
+      );
 
       const comboBox = wrapper
         .find(EuiComboBox)
@@ -703,23 +724,26 @@ describe('IndexPatternDimensionEditorPanel', () => {
         comboBox.prop('onChange')!([options![1].options![2]]);
       });
 
-      expect(setState).toHaveBeenLastCalledWith({
-        ...state,
-        layers: {
-          first: {
-            ...state.layers.first,
-            columns: {
-              ...state.layers.first.columns,
-              col2: expect.objectContaining({
-                sourceField: 'source',
-                operationType: 'terms',
-                // Other parts of this don't matter for this test
-              }),
+      expect(setState).toHaveBeenLastCalledWith(
+        {
+          ...state,
+          layers: {
+            first: {
+              ...state.layers.first,
+              columns: {
+                ...state.layers.first.columns,
+                col2: expect.objectContaining({
+                  sourceField: 'source',
+                  operationType: 'terms',
+                  // Other parts of this don't matter for this test
+                }),
+              },
+              columnOrder: ['col2', 'col1'],
             },
-            columnOrder: ['col2', 'col1'],
           },
         },
-      });
+        true
+      );
     });
 
     it('should select the Records field when count is selected', () => {
@@ -800,21 +824,24 @@ describe('IndexPatternDimensionEditorPanel', () => {
         comboBox.prop('onChange')!([option]);
       });
 
-      expect(setState).toHaveBeenLastCalledWith({
-        ...state,
-        layers: {
-          first: {
-            ...state.layers.first,
-            columns: {
-              ...state.layers.first.columns,
-              col1: expect.objectContaining({
-                sourceField: 'source',
-                operationType: 'terms',
-              }),
+      expect(setState).toHaveBeenLastCalledWith(
+        {
+          ...state,
+          layers: {
+            first: {
+              ...state.layers.first,
+              columns: {
+                ...state.layers.first.columns,
+                col1: expect.objectContaining({
+                  sourceField: 'source',
+                  operationType: 'terms',
+                }),
+              },
             },
           },
         },
-      });
+        true
+      );
     });
   });
 
@@ -887,21 +914,24 @@ describe('IndexPatternDimensionEditorPanel', () => {
         .dive()
         .find('[data-test-subj="indexPattern-time-scaling-enable"]')
         .prop('onClick')!({} as MouseEvent);
-      expect(props.setState).toHaveBeenCalledWith({
-        ...props.state,
-        layers: {
-          first: {
-            ...props.state.layers.first,
-            columns: {
-              ...props.state.layers.first.columns,
-              col2: expect.objectContaining({
-                timeScale: 's',
-                label: 'Count of records per second',
-              }),
+      expect(props.setState).toHaveBeenCalledWith(
+        {
+          ...props.state,
+          layers: {
+            first: {
+              ...props.state.layers.first,
+              columns: {
+                ...props.state.layers.first.columns,
+                col2: expect.objectContaining({
+                  timeScale: 's',
+                  label: 'Count of records per second',
+                }),
+              },
             },
           },
         },
-      });
+        true
+      );
     });
 
     it('should carry over time scaling to other operation if possible', () => {
@@ -915,21 +945,24 @@ describe('IndexPatternDimensionEditorPanel', () => {
       wrapper
         .find('button[data-test-subj="lns-indexPatternDimension-count incompatible"]')
         .simulate('click');
-      expect(props.setState).toHaveBeenCalledWith({
-        ...props.state,
-        layers: {
-          first: {
-            ...props.state.layers.first,
-            columns: {
-              ...props.state.layers.first.columns,
-              col2: expect.objectContaining({
-                timeScale: 'h',
-                label: 'Count of records per hour',
-              }),
+      expect(props.setState).toHaveBeenCalledWith(
+        {
+          ...props.state,
+          layers: {
+            first: {
+              ...props.state.layers.first,
+              columns: {
+                ...props.state.layers.first.columns,
+                col2: expect.objectContaining({
+                  timeScale: 'h',
+                  label: 'Count of records per hour',
+                }),
+              },
             },
           },
         },
-      });
+        true
+      );
     });
 
     it('should not carry over time scaling if the other operation does not support it', () => {
@@ -941,21 +974,24 @@ describe('IndexPatternDimensionEditorPanel', () => {
       });
       wrapper = mount(<IndexPatternDimensionEditorComponent {...props} />);
       wrapper.find('button[data-test-subj="lns-indexPatternDimension-avg"]').simulate('click');
-      expect(props.setState).toHaveBeenCalledWith({
-        ...props.state,
-        layers: {
-          first: {
-            ...props.state.layers.first,
-            columns: {
-              ...props.state.layers.first.columns,
-              col2: expect.objectContaining({
-                timeScale: undefined,
-                label: 'Average of bytes',
-              }),
+      expect(props.setState).toHaveBeenCalledWith(
+        {
+          ...props.state,
+          layers: {
+            first: {
+              ...props.state.layers.first,
+              columns: {
+                ...props.state.layers.first.columns,
+                col2: expect.objectContaining({
+                  timeScale: undefined,
+                  label: 'Average of bytes',
+                }),
+              },
             },
           },
         },
-      });
+        true
+      );
     });
 
     it('should allow to change time scaling', () => {
@@ -967,21 +1003,24 @@ describe('IndexPatternDimensionEditorPanel', () => {
         .prop('onChange')!(({
         target: { value: 'h' },
       } as unknown) as ChangeEvent<HTMLSelectElement>);
-      expect(props.setState).toHaveBeenCalledWith({
-        ...props.state,
-        layers: {
-          first: {
-            ...props.state.layers.first,
-            columns: {
-              ...props.state.layers.first.columns,
-              col2: expect.objectContaining({
-                timeScale: 'h',
-                label: 'Count of records per hour',
-              }),
+      expect(props.setState).toHaveBeenCalledWith(
+        {
+          ...props.state,
+          layers: {
+            first: {
+              ...props.state.layers.first,
+              columns: {
+                ...props.state.layers.first.columns,
+                col2: expect.objectContaining({
+                  timeScale: 'h',
+                  label: 'Count of records per hour',
+                }),
+              },
             },
           },
         },
-      });
+        true
+      );
     });
 
     it('should not adjust label if it is custom', () => {
@@ -993,21 +1032,24 @@ describe('IndexPatternDimensionEditorPanel', () => {
         .prop('onChange')!(({
         target: { value: 'h' },
       } as unknown) as ChangeEvent<HTMLSelectElement>);
-      expect(props.setState).toHaveBeenCalledWith({
-        ...props.state,
-        layers: {
-          first: {
-            ...props.state.layers.first,
-            columns: {
-              ...props.state.layers.first.columns,
-              col2: expect.objectContaining({
-                timeScale: 'h',
-                label: 'My label',
-              }),
+      expect(props.setState).toHaveBeenCalledWith(
+        {
+          ...props.state,
+          layers: {
+            first: {
+              ...props.state.layers.first,
+              columns: {
+                ...props.state.layers.first.columns,
+                col2: expect.objectContaining({
+                  timeScale: 'h',
+                  label: 'My label',
+                }),
+              },
             },
           },
         },
-      });
+        true
+      );
     });
 
     it('should allow to remove time scaling', () => {
@@ -1020,21 +1062,24 @@ describe('IndexPatternDimensionEditorPanel', () => {
         // eslint-disable-next-line @typescript-eslint/no-explicit-any
         {} as any
       );
-      expect(props.setState).toHaveBeenCalledWith({
-        ...props.state,
-        layers: {
-          first: {
-            ...props.state.layers.first,
-            columns: {
-              ...props.state.layers.first.columns,
-              col2: expect.objectContaining({
-                timeScale: undefined,
-                label: 'Count of records',
-              }),
+      expect(props.setState).toHaveBeenCalledWith(
+        {
+          ...props.state,
+          layers: {
+            first: {
+              ...props.state.layers.first,
+              columns: {
+                ...props.state.layers.first.columns,
+                col2: expect.objectContaining({
+                  timeScale: undefined,
+                  label: 'Count of records',
+                }),
+              },
             },
           },
         },
-      });
+        true
+      );
     });
   });
 
@@ -1072,19 +1117,22 @@ describe('IndexPatternDimensionEditorPanel', () => {
 
     wrapper.find('button[data-test-subj="lns-indexPatternDimension-avg"]').simulate('click');
 
-    expect(setState).toHaveBeenCalledWith({
-      ...state,
-      layers: {
-        first: {
-          ...state.layers.first,
-          incompleteColumns: {
-            col2: {
-              operationType: 'avg',
+    expect(setState).toHaveBeenCalledWith(
+      {
+        ...state,
+        layers: {
+          first: {
+            ...state.layers.first,
+            incompleteColumns: {
+              col2: {
+                operationType: 'avg',
+              },
             },
           },
         },
       },
-    });
+      false
+    );
 
     const comboBox = wrapper
       .find(EuiComboBox)
@@ -1095,23 +1143,26 @@ describe('IndexPatternDimensionEditorPanel', () => {
       comboBox.prop('onChange')!([options![1].options![0]]);
     });
 
-    expect(setState).toHaveBeenCalledWith({
-      ...state,
-      layers: {
-        first: {
-          ...state.layers.first,
-          columns: {
-            ...state.layers.first.columns,
-            col2: expect.objectContaining({
-              sourceField: 'bytes',
-              operationType: 'avg',
-              // Other parts of this don't matter for this test
-            }),
+    expect(setState).toHaveBeenCalledWith(
+      {
+        ...state,
+        layers: {
+          first: {
+            ...state.layers.first,
+            columns: {
+              ...state.layers.first.columns,
+              col2: expect.objectContaining({
+                sourceField: 'bytes',
+                operationType: 'avg',
+                // Other parts of this don't matter for this test
+              }),
+            },
+            columnOrder: ['col1', 'col2'],
           },
-          columnOrder: ['col1', 'col2'],
         },
       },
-    });
+      true
+    );
   });
 
   it('should select operation directly if only one field is possible', () => {
@@ -1135,23 +1186,26 @@ describe('IndexPatternDimensionEditorPanel', () => {
 
     wrapper.find('button[data-test-subj="lns-indexPatternDimension-avg"]').simulate('click');
 
-    expect(setState).toHaveBeenCalledWith({
-      ...initialState,
-      layers: {
-        first: {
-          ...initialState.layers.first,
-          columns: {
-            ...initialState.layers.first.columns,
-            col2: expect.objectContaining({
-              sourceField: 'bytes',
-              operationType: 'avg',
-              // Other parts of this don't matter for this test
-            }),
+    expect(setState).toHaveBeenCalledWith(
+      {
+        ...initialState,
+        layers: {
+          first: {
+            ...initialState.layers.first,
+            columns: {
+              ...initialState.layers.first.columns,
+              col2: expect.objectContaining({
+                sourceField: 'bytes',
+                operationType: 'avg',
+                // Other parts of this don't matter for this test
+              }),
+            },
+            columnOrder: ['col1', 'col2'],
           },
-          columnOrder: ['col1', 'col2'],
         },
       },
-    });
+      true
+    );
   });
 
   it('should select operation directly if only document is possible', () => {
@@ -1159,22 +1213,25 @@ describe('IndexPatternDimensionEditorPanel', () => {
 
     wrapper.find('button[data-test-subj="lns-indexPatternDimension-count"]').simulate('click');
 
-    expect(setState).toHaveBeenCalledWith({
-      ...state,
-      layers: {
-        first: {
-          ...state.layers.first,
-          columns: {
-            ...state.layers.first.columns,
-            col2: expect.objectContaining({
-              operationType: 'count',
-              // Other parts of this don't matter for this test
-            }),
+    expect(setState).toHaveBeenCalledWith(
+      {
+        ...state,
+        layers: {
+          first: {
+            ...state.layers.first,
+            columns: {
+              ...state.layers.first.columns,
+              col2: expect.objectContaining({
+                operationType: 'count',
+                // Other parts of this don't matter for this test
+              }),
+            },
+            columnOrder: ['col1', 'col2'],
           },
-          columnOrder: ['col1', 'col2'],
         },
       },
-    });
+      true
+    );
   });
 
   it('should indicate compatible fields when selecting the operation first', () => {
@@ -1284,23 +1341,26 @@ describe('IndexPatternDimensionEditorPanel', () => {
       comboBox.prop('onChange')!([option]);
     });
 
-    expect(setState).toHaveBeenCalledWith({
-      ...state,
-      layers: {
-        first: {
-          ...state.layers.first,
-          columns: {
-            ...state.layers.first.columns,
-            col2: expect.objectContaining({
-              operationType: 'range',
-              sourceField: 'bytes',
-              // Other parts of this don't matter for this test
-            }),
+    expect(setState).toHaveBeenCalledWith(
+      {
+        ...state,
+        layers: {
+          first: {
+            ...state.layers.first,
+            columns: {
+              ...state.layers.first.columns,
+              col2: expect.objectContaining({
+                operationType: 'range',
+                sourceField: 'bytes',
+                // Other parts of this don't matter for this test
+              }),
+            },
+            columnOrder: ['col1', 'col2'],
           },
-          columnOrder: ['col1', 'col2'],
         },
       },
-    });
+      true
+    );
   });
 
   it('should use helper function when changing the function', () => {
@@ -1336,17 +1396,20 @@ describe('IndexPatternDimensionEditorPanel', () => {
         .prop('onChange')!([]);
     });
 
-    expect(setState).toHaveBeenCalledWith({
-      ...state,
-      layers: {
-        first: {
-          indexPatternId: '1',
-          columns: {},
-          columnOrder: [],
-          incompleteColumns: {},
+    expect(setState).toHaveBeenCalledWith(
+      {
+        ...state,
+        layers: {
+          first: {
+            indexPatternId: '1',
+            columns: {},
+            columnOrder: [],
+            incompleteColumns: {},
+          },
         },
       },
-    });
+      false
+    );
   });
 
   it('allows custom format', () => {
diff --git a/x-pack/plugins/lens/public/indexpattern_datasource/dimension_panel/dimension_panel.tsx b/x-pack/plugins/lens/public/indexpattern_datasource/dimension_panel/dimension_panel.tsx
index 20134699d2067..a6c924998f9de 100644
--- a/x-pack/plugins/lens/public/indexpattern_datasource/dimension_panel/dimension_panel.tsx
+++ b/x-pack/plugins/lens/public/indexpattern_datasource/dimension_panel/dimension_panel.tsx
@@ -53,7 +53,7 @@ export const IndexPatternDimensionTriggerComponent = function IndexPatternDimens
     [layer, columnId, currentIndexPattern]
   );
 
-  const selectedColumn: IndexPatternColumn | null = layer.columns[props.columnId] || null;
+  const selectedColumn: IndexPatternColumn | null = layer.columns[props.columnId] ?? null;
 
   if (!selectedColumn) {
     return null;
diff --git a/x-pack/plugins/lens/public/indexpattern_datasource/operations/definitions/index.ts b/x-pack/plugins/lens/public/indexpattern_datasource/operations/definitions/index.ts
index 460c7c5492879..1bc542376d774 100644
--- a/x-pack/plugins/lens/public/indexpattern_datasource/operations/definitions/index.ts
+++ b/x-pack/plugins/lens/public/indexpattern_datasource/operations/definitions/index.ts
@@ -35,7 +35,7 @@ import {
 } from './calculations';
 import { countOperation, CountIndexPatternColumn } from './count';
 import { lastValueOperation, LastValueIndexPatternColumn } from './last_value';
-import { StateSetter, OperationMetadata } from '../../../types';
+import { OperationMetadata } from '../../../types';
 import type { BaseIndexPatternColumn, ReferenceBasedIndexPatternColumn } from './column_types';
 import {
   IndexPatternPrivateState,
@@ -116,7 +116,7 @@ export {
 export interface ParamEditorProps<C> {
   currentColumn: C;
   state: IndexPatternPrivateState;
-  setState: StateSetter<IndexPatternPrivateState>;
+  setState: (newState: IndexPatternPrivateState) => void;
   columnId: string;
   layerId: string;
   uiSettings: IUiSettingsClient;
diff --git a/x-pack/plugins/lens/public/indexpattern_datasource/utils.ts b/x-pack/plugins/lens/public/indexpattern_datasource/utils.ts
index 5f4865ca0ac32..702930d02a90e 100644
--- a/x-pack/plugins/lens/public/indexpattern_datasource/utils.ts
+++ b/x-pack/plugins/lens/public/indexpattern_datasource/utils.ts
@@ -72,7 +72,8 @@ export function isColumnInvalid(
   columnId: string,
   indexPattern: IndexPattern
 ) {
-  const column = layer.columns[columnId];
+  const column: IndexPatternColumn | undefined = layer.columns[columnId];
+  if (!column) return;
 
   const operationDefinition = column.operationType && operationDefinitionMap[column.operationType];
   return !!(
diff --git a/x-pack/plugins/lens/public/types.ts b/x-pack/plugins/lens/public/types.ts
index e06430a3a9dfa..f523392784a89 100644
--- a/x-pack/plugins/lens/public/types.ts
+++ b/x-pack/plugins/lens/public/types.ts
@@ -240,7 +240,8 @@ export type DatasourceDimensionProps<T> = SharedDimensionProps & {
 
 // The only way a visualization has to restrict the query building
 export type DatasourceDimensionEditorProps<T = unknown> = DatasourceDimensionProps<T> & {
-  setState: StateSetter<T>;
+  // Not a StateSetter because we have this unique use case of determining valid columns
+  setState: (newState: Parameters<StateSetter<T>>[0], publishToVisualization?: boolean) => void;
   core: Pick<CoreSetup, 'http' | 'notifications' | 'uiSettings'>;
   dateRange: DateRange;
   dimensionGroups: VisualizationDimensionGroupConfig[];
diff --git a/x-pack/plugins/maps/common/constants.ts b/x-pack/plugins/maps/common/constants.ts
index 4ee99eb51f44c..d587b330ac22d 100644
--- a/x-pack/plugins/maps/common/constants.ts
+++ b/x-pack/plugins/maps/common/constants.ts
@@ -270,6 +270,12 @@ export enum MB_LOOKUP_FUNCTION {
   FEATURE_STATE = 'feature-state',
 }
 
+export enum DATA_MAPPING_FUNCTION {
+  INTERPOLATE = 'INTERPOLATE',
+  PERCENTILES = 'PERCENTILES',
+}
+export const DEFAULT_PERCENTILES = [50, 75, 90, 95, 99];
+
 export type RawValue = string | number | boolean | undefined | null;
 
 export type FieldFormatter = (value: RawValue) => string | number;
diff --git a/x-pack/plugins/maps/common/descriptor_types/style_property_descriptor_types.ts b/x-pack/plugins/maps/common/descriptor_types/style_property_descriptor_types.ts
index 9ab965c3eb8fe..48681fd3d005c 100644
--- a/x-pack/plugins/maps/common/descriptor_types/style_property_descriptor_types.ts
+++ b/x-pack/plugins/maps/common/descriptor_types/style_property_descriptor_types.ts
@@ -11,6 +11,7 @@ import {
   LABEL_BORDER_SIZES,
   SYMBOLIZE_AS_TYPES,
   VECTOR_STYLES,
+  DATA_MAPPING_FUNCTION,
   STYLE_TYPE,
 } from '../constants';
 
@@ -36,6 +37,7 @@ export type LabelBorderSizeStylePropertyDescriptor = {
 export type FieldMetaOptions = {
   isEnabled: boolean;
   sigma?: number;
+  percentiles?: number[];
 };
 
 export type StylePropertyField = {
@@ -63,6 +65,7 @@ export type ColorDynamicOptions = {
   color?: string; // TODO move color category ramps to constants and make ENUM type
   customColorRamp?: OrdinalColorStop[];
   useCustomColorRamp?: boolean;
+  dataMappingFunction?: DATA_MAPPING_FUNCTION;
 
   // category color properties
   colorCategory?: string; // TODO move color category palettes to constants and make ENUM type
@@ -200,6 +203,11 @@ export type RangeFieldMeta = {
   isMaxOutsideStdRange?: boolean;
 };
 
+export type PercentilesFieldMeta = Array<{
+  percentile: string;
+  value: number;
+}>;
+
 export type Category = {
   key: string;
   count: number;
diff --git a/x-pack/plugins/maps/common/i18n_getters.ts b/x-pack/plugins/maps/common/i18n_getters.ts
index a128038e321fc..02b1d1adcffc1 100644
--- a/x-pack/plugins/maps/common/i18n_getters.ts
+++ b/x-pack/plugins/maps/common/i18n_getters.ts
@@ -9,6 +9,14 @@ import { i18n } from '@kbn/i18n';
 import { $Values } from '@kbn/utility-types';
 import { ES_SPATIAL_RELATIONS } from './constants';
 
+export const UPTO = i18n.translate('xpack.maps.upto', {
+  defaultMessage: 'up to',
+});
+
+export const GREAT_THAN = i18n.translate('xpack.maps.greatThan', {
+  defaultMessage: 'greater than',
+});
+
 export function getAppTitle() {
   return i18n.translate('xpack.maps.appTitle', {
     defaultMessage: 'Maps',
diff --git a/x-pack/plugins/maps/public/classes/fields/agg/agg_field.ts b/x-pack/plugins/maps/public/classes/fields/agg/agg_field.ts
index 31595327a64b8..ccccaa0fa5805 100644
--- a/x-pack/plugins/maps/public/classes/fields/agg/agg_field.ts
+++ b/x-pack/plugins/maps/public/classes/fields/agg/agg_field.ts
@@ -68,8 +68,14 @@ export class AggField extends CountAggField {
     return this._getAggType() === AGG_TYPE.TERMS ? TERMS_AGG_SHARD_SIZE : 0;
   }
 
-  async getOrdinalFieldMetaRequest(): Promise<unknown> {
-    return this._esDocField ? await this._esDocField.getOrdinalFieldMetaRequest() : null;
+  async getExtendedStatsFieldMetaRequest(): Promise<unknown | null> {
+    return this._esDocField ? await this._esDocField.getExtendedStatsFieldMetaRequest() : null;
+  }
+
+  async getPercentilesFieldMetaRequest(percentiles: number[]): Promise<unknown | null> {
+    return this._esDocField
+      ? await this._esDocField.getPercentilesFieldMetaRequest(percentiles)
+      : null;
   }
 
   async getCategoricalFieldMetaRequest(size: number): Promise<unknown> {
diff --git a/x-pack/plugins/maps/public/classes/fields/agg/count_agg_field.ts b/x-pack/plugins/maps/public/classes/fields/agg/count_agg_field.ts
index ff6dbbce6f095..a5ee819fb21a0 100644
--- a/x-pack/plugins/maps/public/classes/fields/agg/count_agg_field.ts
+++ b/x-pack/plugins/maps/public/classes/fields/agg/count_agg_field.ts
@@ -82,7 +82,11 @@ export class CountAggField implements IESAggField {
     return false;
   }
 
-  async getOrdinalFieldMetaRequest(): Promise<unknown> {
+  async getExtendedStatsFieldMetaRequest(): Promise<unknown | null> {
+    return null;
+  }
+
+  async getPercentilesFieldMetaRequest(percentiles: number[]): Promise<unknown | null> {
     return null;
   }
 
diff --git a/x-pack/plugins/maps/public/classes/fields/agg/top_term_percentage_field.ts b/x-pack/plugins/maps/public/classes/fields/agg/top_term_percentage_field.ts
index cc8e3b4675308..6c2e25a95f162 100644
--- a/x-pack/plugins/maps/public/classes/fields/agg/top_term_percentage_field.ts
+++ b/x-pack/plugins/maps/public/classes/fields/agg/top_term_percentage_field.ts
@@ -68,7 +68,11 @@ export class TopTermPercentageField implements IESAggField {
     return false;
   }
 
-  async getOrdinalFieldMetaRequest(): Promise<unknown> {
+  async getExtendedStatsFieldMetaRequest(): Promise<unknown | null> {
+    return null;
+  }
+
+  async getPercentilesFieldMetaRequest(percentiles: number[]): Promise<unknown | null> {
     return null;
   }
 
diff --git a/x-pack/plugins/maps/public/classes/fields/es_doc_field.ts b/x-pack/plugins/maps/public/classes/fields/es_doc_field.ts
index 543dbf6d87039..783205aad8f7b 100644
--- a/x-pack/plugins/maps/public/classes/fields/es_doc_field.ts
+++ b/x-pack/plugins/maps/public/classes/fields/es_doc_field.ts
@@ -68,7 +68,7 @@ export class ESDocField extends AbstractField implements IField {
     return this._canReadFromGeoJson;
   }
 
-  async getOrdinalFieldMetaRequest(): Promise<unknown> {
+  async getExtendedStatsFieldMetaRequest(): Promise<unknown | null> {
     const indexPatternField = await this._getIndexPatternField();
 
     if (
@@ -80,18 +80,43 @@ export class ESDocField extends AbstractField implements IField {
 
     // TODO remove local typing once Kibana has figured out a core place for Elasticsearch aggregation request types
     // https://github.com/elastic/kibana/issues/60102
-    const extendedStats: { script?: unknown; field?: string } = {};
+    const metricAggConfig: { script?: unknown; field?: string } = {};
     if (indexPatternField.scripted) {
-      extendedStats.script = {
+      metricAggConfig.script = {
         source: indexPatternField.script,
         lang: indexPatternField.lang,
       };
     } else {
-      extendedStats.field = this.getName();
+      metricAggConfig.field = this.getName();
     }
     return {
-      [this.getName()]: {
-        extended_stats: extendedStats,
+      [`${this.getName()}_range`]: {
+        extended_stats: metricAggConfig,
+      },
+    };
+  }
+
+  async getPercentilesFieldMetaRequest(percentiles: number[]): Promise<unknown | null> {
+    const indexPatternField = await this._getIndexPatternField();
+
+    if (!indexPatternField || indexPatternField.type !== 'number') {
+      return null;
+    }
+
+    const metricAggConfig: { script?: unknown; field?: string; percents: number[] } = {
+      percents: [0, ...percentiles],
+    };
+    if (indexPatternField.scripted) {
+      metricAggConfig.script = {
+        source: indexPatternField.script,
+        lang: indexPatternField.lang,
+      };
+    } else {
+      metricAggConfig.field = this.getName();
+    }
+    return {
+      [`${this.getName()}_percentiles`]: {
+        percentiles: metricAggConfig,
       },
     };
   }
@@ -116,7 +141,7 @@ export class ESDocField extends AbstractField implements IField {
       topTerms.field = this.getName();
     }
     return {
-      [this.getName()]: {
+      [`${this.getName()}_terms`]: {
         terms: topTerms,
       },
     };
diff --git a/x-pack/plugins/maps/public/classes/fields/field.ts b/x-pack/plugins/maps/public/classes/fields/field.ts
index 9cb7debd320a1..07ed16bfabf93 100644
--- a/x-pack/plugins/maps/public/classes/fields/field.ts
+++ b/x-pack/plugins/maps/public/classes/fields/field.ts
@@ -18,7 +18,8 @@ export interface IField {
   getSource(): IVectorSource;
   getOrigin(): FIELD_ORIGIN;
   isValid(): boolean;
-  getOrdinalFieldMetaRequest(): Promise<unknown>;
+  getExtendedStatsFieldMetaRequest(): Promise<unknown | null>;
+  getPercentilesFieldMetaRequest(percentiles: number[]): Promise<unknown | null>;
   getCategoricalFieldMetaRequest(size: number): Promise<unknown>;
 
   // Whether Maps-app can automatically determine the domain of the field-values
@@ -85,7 +86,11 @@ export class AbstractField implements IField {
     return false;
   }
 
-  async getOrdinalFieldMetaRequest(): Promise<unknown> {
+  async getExtendedStatsFieldMetaRequest(): Promise<unknown> {
+    return null;
+  }
+
+  async getPercentilesFieldMetaRequest(percentiles: number[]): Promise<unknown | null> {
     return null;
   }
 
diff --git a/x-pack/plugins/maps/public/classes/layers/vector_layer/vector_layer.tsx b/x-pack/plugins/maps/public/classes/layers/vector_layer/vector_layer.tsx
index e4ae0aed15729..7ea5ad25a99b4 100644
--- a/x-pack/plugins/maps/public/classes/layers/vector_layer/vector_layer.tsx
+++ b/x-pack/plugins/maps/public/classes/layers/vector_layer/vector_layer.tsx
@@ -602,7 +602,7 @@ export class VectorLayer extends AbstractLayer {
     }
 
     const dynamicStyleFields = dynamicStyleProps.map((dynamicStyleProp) => {
-      return `${dynamicStyleProp.getFieldName()}${dynamicStyleProp.getNumberOfCategories()}`;
+      return `${dynamicStyleProp.getFieldName()}${dynamicStyleProp.getStyleMetaHash()}`;
     });
 
     const nextMeta = {
diff --git a/x-pack/plugins/maps/public/classes/styles/color_palettes.test.ts b/x-pack/plugins/maps/public/classes/styles/color_palettes.test.ts
index b964ecf6d6b63..baec479e246f7 100644
--- a/x-pack/plugins/maps/public/classes/styles/color_palettes.test.ts
+++ b/x-pack/plugins/maps/public/classes/styles/color_palettes.test.ts
@@ -6,6 +6,7 @@
 import {
   getColorRampCenterColor,
   getOrdinalMbColorRampStops,
+  getPercentilesMbColorRampStops,
   getColorPalette,
 } from './color_palettes';
 
@@ -56,3 +57,27 @@ describe('getOrdinalMbColorRampStops', () => {
     expect(getOrdinalMbColorRampStops('Blues', 23, 23)).toEqual([23, '#6092c0']);
   });
 });
+
+describe('getPercentilesMbColorRampStops', () => {
+  it('Should create color stops for custom range', () => {
+    const percentiles = [
+      { percentile: '50.0', value: 5567.83 },
+      { percentile: '75.0', value: 8069 },
+      { percentile: '90.0', value: 9581.13 },
+      { percentile: '95.0', value: 11145.5 },
+      { percentile: '99.0', value: 16958.18 },
+    ];
+    expect(getPercentilesMbColorRampStops('Blues', percentiles)).toEqual([
+      5567.83,
+      '#e0e8f2',
+      8069,
+      '#c2d2e6',
+      9581.13,
+      '#a2bcd9',
+      11145.5,
+      '#82a7cd',
+      16958.18,
+      '#6092c0',
+    ]);
+  });
+});
diff --git a/x-pack/plugins/maps/public/classes/styles/color_palettes.ts b/x-pack/plugins/maps/public/classes/styles/color_palettes.ts
index 51aadd98c1177..e164ed66476a7 100644
--- a/x-pack/plugins/maps/public/classes/styles/color_palettes.ts
+++ b/x-pack/plugins/maps/public/classes/styles/color_palettes.ts
@@ -6,6 +6,8 @@
 
 import tinycolor from 'tinycolor2';
 import {
+  // @ts-ignore
+  colorPalette as colorPaletteGenerator,
   // @ts-ignore
   euiPaletteForStatus,
   // @ts-ignore
@@ -24,6 +26,7 @@ import {
   euiPaletteColorBlind,
 } from '@elastic/eui/lib/services';
 import { EuiColorPalettePickerPaletteProps } from '@elastic/eui';
+import { PercentilesFieldMeta } from '../../../common/descriptor_types';
 
 export const DEFAULT_HEATMAP_COLOR_RAMP_NAME = 'theclassic';
 
@@ -35,84 +38,118 @@ export const DEFAULT_LINE_COLORS: string[] = [
   '#FFF',
 ];
 
-const COLOR_PALETTES: EuiColorPalettePickerPaletteProps[] = [
+const ROYAL_BLUE = 'rgb(65, 105, 225)';
+const CYAN = 'rgb(0, 256, 256)';
+const LIME = 'rgb(0, 256, 0)';
+const YELLOW = 'rgb(256, 256, 0)';
+const RED = 'rgb(256, 0, 0)';
+const HEATMAP_PALETTE = [ROYAL_BLUE, CYAN, LIME, YELLOW, RED];
+
+type COLOR_PALETTE = EuiColorPalettePickerPaletteProps & {
+  getPalette: (steps: number) => string[];
+};
+
+function getColorBlindPalette(steps: number) {
+  const rotations = Math.ceil(steps / 10);
+  const palette = euiPaletteColorBlind({ rotations });
+  return palette.slice(0, steps - 1);
+}
+
+const COLOR_PALETTES: COLOR_PALETTE[] = [
   {
     value: 'Blues',
+    getPalette: (steps: number) => {
+      return euiPaletteCool(steps);
+    },
     palette: euiPaletteCool(8),
     type: 'gradient',
   },
   {
     value: 'Greens',
+    getPalette: (steps: number) => {
+      return euiPalettePositive(steps);
+    },
     palette: euiPalettePositive(8),
     type: 'gradient',
   },
   {
     value: 'Greys',
+    getPalette: (steps: number) => {
+      return euiPaletteGray(steps);
+    },
     palette: euiPaletteGray(8),
     type: 'gradient',
   },
   {
     value: 'Reds',
+    getPalette: (steps: number) => {
+      return euiPaletteNegative(steps);
+    },
     palette: euiPaletteNegative(8),
     type: 'gradient',
   },
   {
     value: 'Yellow to Red',
+    getPalette: (steps: number) => {
+      return euiPaletteWarm(steps);
+    },
     palette: euiPaletteWarm(8),
     type: 'gradient',
   },
   {
     value: 'Green to Red',
+    getPalette: (steps: number) => {
+      return euiPaletteForStatus(steps);
+    },
     palette: euiPaletteForStatus(8),
     type: 'gradient',
   },
   {
     value: 'Blue to Red',
+    getPalette: (steps: number) => {
+      return euiPaletteForTemperature(steps);
+    },
     palette: euiPaletteForTemperature(8),
     type: 'gradient',
   },
   {
     value: DEFAULT_HEATMAP_COLOR_RAMP_NAME,
-    palette: [
-      'rgb(65, 105, 225)', // royalblue
-      'rgb(0, 256, 256)', // cyan
-      'rgb(0, 256, 0)', // lime
-      'rgb(256, 256, 0)', // yellow
-      'rgb(256, 0, 0)', // red
-    ],
+    getPalette: (steps: number) => {
+      return colorPaletteGenerator(HEATMAP_PALETTE, steps, true, true);
+    },
+    palette: HEATMAP_PALETTE,
     type: 'gradient',
   },
   {
     value: 'palette_0',
+    getPalette: getColorBlindPalette,
     palette: euiPaletteColorBlind(),
     type: 'fixed',
   },
   {
     value: 'palette_20',
+    getPalette: getColorBlindPalette,
     palette: euiPaletteColorBlind({ rotations: 2 }),
     type: 'fixed',
   },
   {
     value: 'palette_30',
+    getPalette: getColorBlindPalette,
     palette: euiPaletteColorBlind({ rotations: 3 }),
     type: 'fixed',
   },
 ];
 
-export const NUMERICAL_COLOR_PALETTES = COLOR_PALETTES.filter(
-  (palette: EuiColorPalettePickerPaletteProps) => {
-    return palette.type === 'gradient';
-  }
-);
+export const NUMERICAL_COLOR_PALETTES = COLOR_PALETTES.filter((palette: COLOR_PALETTE) => {
+  return palette.type === 'gradient';
+});
 
-export const CATEGORICAL_COLOR_PALETTES = COLOR_PALETTES.filter(
-  (palette: EuiColorPalettePickerPaletteProps) => {
-    return palette.type === 'fixed';
-  }
-);
+export const CATEGORICAL_COLOR_PALETTES = COLOR_PALETTES.filter((palette: COLOR_PALETTE) => {
+  return palette.type === 'fixed';
+});
 
 export function getColorPalette(colorPaletteId: string): string[] {
-  const colorPalette = COLOR_PALETTES.find(({ value }: EuiColorPalettePickerPaletteProps) => {
+  const colorPalette = COLOR_PALETTES.find(({ value }: COLOR_PALETTE) => {
     return value === colorPaletteId;
   });
   return colorPalette ? (colorPalette.palette as string[]) : [];
@@ -161,6 +198,29 @@ export function getOrdinalMbColorRampStops(
   );
 }
 
+// Returns an array of color stops
+// [ stop_input_1: number, stop_output_1: color, stop_input_n: number, stop_output_n: color ]
+export function getPercentilesMbColorRampStops(
+  colorPaletteId: string | null,
+  percentiles: PercentilesFieldMeta
+): Array<number | string> | null {
+  if (!colorPaletteId) {
+    return null;
+  }
+
+  const paletteObject = NUMERICAL_COLOR_PALETTES.find(({ value }: COLOR_PALETTE) => {
+    return value === colorPaletteId;
+  });
+
+  return paletteObject
+    ? paletteObject
+        .getPalette(percentiles.length)
+        .reduce((accu: Array<number | string>, stopColor: string, idx: number) => {
+          return [...accu, percentiles[idx].value, stopColor];
+        }, [])
+    : null;
+}
+
 export function getLinearGradient(colorStrings: string[]): string {
   const intervals = colorStrings.length;
   let linearGradient = `linear-gradient(to right, ${colorStrings[0]} 0%,`;
diff --git a/x-pack/plugins/maps/public/classes/styles/heatmap/components/__snapshots__/heatmap_style_editor.test.tsx.snap b/x-pack/plugins/maps/public/classes/styles/heatmap/components/__snapshots__/heatmap_style_editor.test.tsx.snap
index 7c42b78fdc552..f1ef56a2ef273 100644
--- a/x-pack/plugins/maps/public/classes/styles/heatmap/components/__snapshots__/heatmap_style_editor.test.tsx.snap
+++ b/x-pack/plugins/maps/public/classes/styles/heatmap/components/__snapshots__/heatmap_style_editor.test.tsx.snap
@@ -16,6 +16,7 @@ exports[`HeatmapStyleEditor is rendered 1`] = `
     palettes={
       Array [
         Object {
+          "getPalette": [Function],
           "palette": Array [
             "#ecf1f7",
             "#d9e3ef",
@@ -30,6 +31,7 @@ exports[`HeatmapStyleEditor is rendered 1`] = `
           "value": "Blues",
         },
         Object {
+          "getPalette": [Function],
           "palette": Array [
             "#e6f1ee",
             "#cce4de",
@@ -44,6 +46,7 @@ exports[`HeatmapStyleEditor is rendered 1`] = `
           "value": "Greens",
         },
         Object {
+          "getPalette": [Function],
           "palette": Array [
             "#e0e4eb",
             "#c2c9d5",
@@ -58,6 +61,7 @@ exports[`HeatmapStyleEditor is rendered 1`] = `
           "value": "Greys",
         },
         Object {
+          "getPalette": [Function],
           "palette": Array [
             "#fdeae5",
             "#f9d5cc",
@@ -72,6 +76,7 @@ exports[`HeatmapStyleEditor is rendered 1`] = `
           "value": "Reds",
         },
         Object {
+          "getPalette": [Function],
           "palette": Array [
             "#f9eac5",
             "#f6d9af",
@@ -86,6 +91,7 @@ exports[`HeatmapStyleEditor is rendered 1`] = `
           "value": "Yellow to Red",
         },
         Object {
+          "getPalette": [Function],
           "palette": Array [
             "#209280",
             "#3aa38d",
@@ -100,6 +106,7 @@ exports[`HeatmapStyleEditor is rendered 1`] = `
           "value": "Green to Red",
         },
         Object {
+          "getPalette": [Function],
           "palette": Array [
             "#6092c0",
             "#84a9cd",
@@ -114,6 +121,7 @@ exports[`HeatmapStyleEditor is rendered 1`] = `
           "value": "Blue to Red",
         },
         Object {
+          "getPalette": [Function],
           "palette": Array [
             "rgb(65, 105, 225)",
             "rgb(0, 256, 256)",
diff --git a/x-pack/plugins/maps/public/classes/styles/vector/components/data_mapping/categorical_data_mapping_popover.tsx b/x-pack/plugins/maps/public/classes/styles/vector/components/data_mapping/categorical_data_mapping_popover.tsx
new file mode 100644
index 0000000000000..c09922e1489d0
--- /dev/null
+++ b/x-pack/plugins/maps/public/classes/styles/vector/components/data_mapping/categorical_data_mapping_popover.tsx
@@ -0,0 +1,68 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License;
+ * you may not use this file except in compliance with the Elastic License.
+ */
+
+import React from 'react';
+import { EuiFormRow, EuiIcon, EuiSwitch, EuiSwitchEvent, EuiText, EuiToolTip } from '@elastic/eui';
+import { i18n } from '@kbn/i18n';
+import { FormattedMessage } from '@kbn/i18n/react';
+import { DataMappingPopover } from './data_mapping_popover';
+import { FieldMetaOptions } from '../../../../../../common/descriptor_types';
+
+interface Props<DynamicOptions> {
+  fieldMetaOptions: FieldMetaOptions;
+  onChange: (updatedOptions: DynamicOptions) => void;
+  switchDisabled: boolean;
+}
+
+export function CategoricalDataMappingPopover<DynamicOptions>(props: Props<DynamicOptions>) {
+  const onIsEnabledChange = (event: EuiSwitchEvent) => {
+    // @ts-expect-error
+    props.onChange({
+      fieldMetaOptions: {
+        ...props.fieldMetaOptions,
+        isEnabled: event.target.checked,
+      },
+    });
+  };
+
+  return (
+    <DataMappingPopover>
+      <EuiFormRow display="columnCompressedSwitch">
+        <>
+          <EuiSwitch
+            label={i18n.translate('xpack.maps.styles.fieldMetaOptions.isEnabled.categoricalLabel', {
+              defaultMessage: 'Get categories from data set',
+            })}
+            checked={props.fieldMetaOptions.isEnabled}
+            onChange={onIsEnabledChange}
+            compressed
+            disabled={props.switchDisabled}
+          />{' '}
+          <EuiToolTip
+            content={
+              <EuiText>
+                <p>
+                  <FormattedMessage
+                    id="xpack.maps.styles.categoricalDataMapping.isEnabled.server"
+                    defaultMessage="Calculate categories from the entire data set. Styling is consistent when users pan, zoom, and filter."
+                  />
+                </p>
+                <p>
+                  <FormattedMessage
+                    id="xpack.maps.styles.categoricalDataMapping.isEnabled.local"
+                    defaultMessage="When disabled, calculate categories from local data and recalculate categories when the data changes. Styling may be inconsistent when users pan, zoom, and filter."
+                  />
+                </p>
+              </EuiText>
+            }
+          >
+            <EuiIcon type="questionInCircle" color="subdued" />
+          </EuiToolTip>
+        </>
+      </EuiFormRow>
+    </DataMappingPopover>
+  );
+}
diff --git a/x-pack/plugins/maps/public/classes/styles/vector/components/field_meta/field_meta_popover.tsx b/x-pack/plugins/maps/public/classes/styles/vector/components/data_mapping/data_mapping_popover.tsx
similarity index 68%
rename from x-pack/plugins/maps/public/classes/styles/vector/components/field_meta/field_meta_popover.tsx
rename to x-pack/plugins/maps/public/classes/styles/vector/components/data_mapping/data_mapping_popover.tsx
index dfd98937135e1..2ebec5a5104a7 100644
--- a/x-pack/plugins/maps/public/classes/styles/vector/components/field_meta/field_meta_popover.tsx
+++ b/x-pack/plugins/maps/public/classes/styles/vector/components/data_mapping/data_mapping_popover.tsx
@@ -6,8 +6,8 @@
 /* eslint-disable @typescript-eslint/consistent-type-definitions */
 
 import React, { Component, ReactElement } from 'react';
-import { EuiButtonIcon, EuiPopover } from '@elastic/eui';
-import { i18n } from '@kbn/i18n';
+import { EuiButtonEmpty, EuiPopover } from '@elastic/eui';
+import { FormattedMessage } from '@kbn/i18n/react';
 
 type Props = {
   children: ReactElement<any>;
@@ -17,7 +17,7 @@ type State = {
   isPopoverOpen: boolean;
 };
 
-export class FieldMetaPopover extends Component<Props, State> {
+export class DataMappingPopover extends Component<Props, State> {
   state = {
     isPopoverOpen: false,
   };
@@ -36,21 +36,24 @@ export class FieldMetaPopover extends Component<Props, State> {
 
   _renderButton() {
     return (
-      <EuiButtonIcon
+      <EuiButtonEmpty
         onClick={this._togglePopover}
-        size="s"
-        iconType="gear"
-        aria-label={i18n.translate('xpack.maps.styles.fieldMetaOptions.popoverToggle', {
-          defaultMessage: 'Field meta options popover toggle',
-        })}
-      />
+        size="xs"
+        iconType="controlsHorizontal"
+        iconSide="left"
+      >
+        <FormattedMessage
+          id="xpack.maps.styles.fieldMetaOptions.popoverToggle"
+          defaultMessage="Data mapping"
+        />
+      </EuiButtonEmpty>
     );
   }
 
   render() {
     return (
       <EuiPopover
-        id="fieldMetaOptionsPopover"
+        id="dataMappingPopover"
         anchorPosition="leftCenter"
         button={this._renderButton()}
         isOpen={this.state.isPopoverOpen}
diff --git a/x-pack/plugins/maps/public/classes/styles/vector/components/data_mapping/index.ts b/x-pack/plugins/maps/public/classes/styles/vector/components/data_mapping/index.ts
new file mode 100644
index 0000000000000..82d0e9b70ae32
--- /dev/null
+++ b/x-pack/plugins/maps/public/classes/styles/vector/components/data_mapping/index.ts
@@ -0,0 +1,8 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License;
+ * you may not use this file except in compliance with the Elastic License.
+ */
+
+export { CategoricalDataMappingPopover } from './categorical_data_mapping_popover';
+export { OrdinalDataMappingPopover } from './ordinal_data_mapping_popover';
diff --git a/x-pack/plugins/maps/public/classes/styles/vector/components/data_mapping/ordinal_data_mapping_popover.tsx b/x-pack/plugins/maps/public/classes/styles/vector/components/data_mapping/ordinal_data_mapping_popover.tsx
new file mode 100644
index 0000000000000..dc028aa30c2c8
--- /dev/null
+++ b/x-pack/plugins/maps/public/classes/styles/vector/components/data_mapping/ordinal_data_mapping_popover.tsx
@@ -0,0 +1,259 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License;
+ * you may not use this file except in compliance with the Elastic License.
+ */
+
+import _ from 'lodash';
+import React, { ChangeEvent, Fragment, MouseEvent } from 'react';
+import {
+  EuiFormRow,
+  EuiHorizontalRule,
+  EuiIcon,
+  EuiRange,
+  EuiSuperSelect,
+  EuiSwitch,
+  EuiSwitchEvent,
+  EuiText,
+  EuiToolTip,
+} from '@elastic/eui';
+import { i18n } from '@kbn/i18n';
+import { FormattedMessage } from '@kbn/i18n/react';
+import { DEFAULT_SIGMA } from '../../vector_style_defaults';
+import { DataMappingPopover } from './data_mapping_popover';
+import { FieldMetaOptions } from '../../../../../../common/descriptor_types';
+import {
+  DEFAULT_PERCENTILES,
+  DATA_MAPPING_FUNCTION,
+  VECTOR_STYLES,
+} from '../../../../../../common/constants';
+import { PercentilesForm } from './percentiles_form';
+
+const interpolateTitle = i18n.translate('xpack.maps.styles.ordinalDataMapping.interpolateTitle', {
+  defaultMessage: `Interpolate between min and max`,
+});
+
+const percentilesTitle = i18n.translate('xpack.maps.styles.ordinalDataMapping.percentilesTitle', {
+  defaultMessage: `Use percentiles`,
+});
+
+const DATA_MAPPING_OPTIONS = [
+  {
+    value: DATA_MAPPING_FUNCTION.INTERPOLATE,
+    inputDisplay: interpolateTitle,
+    dropdownDisplay: (
+      <Fragment>
+        <strong>{interpolateTitle}</strong>
+        <EuiText size="s" color="subdued">
+          <p className="euiTextColor--subdued">
+            <FormattedMessage
+              id="xpack.maps.styles.ordinalDataMapping.interpolateDescription"
+              defaultMessage="Interpolate values from the data domain to the style on a linear scale"
+            />
+          </p>
+        </EuiText>
+      </Fragment>
+    ),
+  },
+  {
+    value: DATA_MAPPING_FUNCTION.PERCENTILES,
+    inputDisplay: percentilesTitle,
+    dropdownDisplay: (
+      <Fragment>
+        <strong>{percentilesTitle}</strong>
+        <EuiText size="s" color="subdued">
+          <p className="euiTextColor--subdued">
+            <FormattedMessage
+              id="xpack.maps.styles.ordinalDataMapping.percentilesDescription"
+              defaultMessage="Divide style into bands that map to values"
+            />
+          </p>
+        </EuiText>
+      </Fragment>
+    ),
+  },
+];
+
+interface Props<DynamicOptions> {
+  fieldMetaOptions: FieldMetaOptions;
+  styleName: VECTOR_STYLES;
+  onChange: (updatedOptions: DynamicOptions) => void;
+  switchDisabled: boolean;
+  dataMappingFunction: DATA_MAPPING_FUNCTION;
+  supportedDataMappingFunctions: DATA_MAPPING_FUNCTION[];
+}
+
+export function OrdinalDataMappingPopover<DynamicOptions>(props: Props<DynamicOptions>) {
+  function onIsEnabledChange(event: EuiSwitchEvent) {
+    // @ts-expect-error
+    props.onChange({
+      fieldMetaOptions: {
+        ...props.fieldMetaOptions,
+        isEnabled: event.target.checked,
+      },
+    });
+  }
+
+  function onSigmaChange(event: ChangeEvent<HTMLInputElement> | MouseEvent<HTMLButtonElement>) {
+    // @ts-expect-error
+    props.onChange({
+      fieldMetaOptions: {
+        ...props.fieldMetaOptions,
+        sigma: parseInt(event.currentTarget.value, 10),
+      },
+    });
+  }
+
+  function onDataMappingFunctionChange(value: DATA_MAPPING_FUNCTION) {
+    const updatedOptions =
+      value === DATA_MAPPING_FUNCTION.PERCENTILES
+        ? {
+            dataMappingFunction: value,
+            fieldMetaOptions: {
+              ...props.fieldMetaOptions,
+              isEnabled: true,
+              percentiles: props.fieldMetaOptions.percentiles
+                ? props.fieldMetaOptions.percentiles
+                : DEFAULT_PERCENTILES,
+            },
+          }
+        : {
+            dataMappingFunction: value,
+          };
+    // @ts-expect-error
+    props.onChange(updatedOptions);
+  }
+
+  function renderEasingForm() {
+    const sigmaInput = props.fieldMetaOptions.isEnabled ? (
+      <EuiFormRow
+        label={
+          <EuiToolTip
+            anchorClassName="eui-alignMiddle"
+            content={i18n.translate('xpack.maps.styles.ordinalDataMapping.sigmaTooltipContent', {
+              defaultMessage: `To de-emphasize outliers, set sigma to a smaller value. Smaller sigmas move the min and max closer to the median.`,
+            })}
+          >
+            <span>
+              {i18n.translate('xpack.maps.styles.ordinalDataMapping.sigmaLabel', {
+                defaultMessage: 'Sigma',
+              })}{' '}
+              <EuiIcon type="questionInCircle" color="subdued" />
+            </span>
+          </EuiToolTip>
+        }
+        display="columnCompressed"
+      >
+        <EuiRange
+          min={1}
+          max={5}
+          step={0.25}
+          value={_.get(props.fieldMetaOptions, 'sigma', DEFAULT_SIGMA)}
+          onChange={onSigmaChange}
+          showTicks
+          tickInterval={1}
+          compressed
+        />
+      </EuiFormRow>
+    ) : null;
+
+    return (
+      <Fragment>
+        <EuiFormRow display="columnCompressedSwitch">
+          <>
+            <EuiSwitch
+              label={i18n.translate('xpack.maps.styles.ordinalDataMapping.isEnabledSwitchLabel', {
+                defaultMessage: 'Get min and max from data set',
+              })}
+              checked={props.fieldMetaOptions.isEnabled}
+              onChange={onIsEnabledChange}
+              compressed
+              disabled={props.switchDisabled}
+            />{' '}
+            <EuiToolTip
+              content={
+                <EuiText>
+                  <p>
+                    <FormattedMessage
+                      id="xpack.maps.styles.ordinalDataMapping.isEnabled.server"
+                      defaultMessage="Calculate min and max from the entire data set. Styling is consistent when users pan, zoom, and filter. To minimize outliers, min and max are clamped to the standard deviation (sigma) from the medium."
+                    />
+                  </p>
+                  <p>
+                    <FormattedMessage
+                      id="xpack.maps.styles.ordinalDataMapping.isEnabled.local"
+                      defaultMessage="When disabled, calculate min and max from local data and recalculate min and max when the data changes. Styling may be inconsistent when users pan, zoom, and filter."
+                    />
+                  </p>
+                </EuiText>
+              }
+            >
+              <EuiIcon type="questionInCircle" color="subdued" />
+            </EuiToolTip>
+          </>
+        </EuiFormRow>
+
+        {sigmaInput}
+      </Fragment>
+    );
+  }
+
+  function renderPercentilesForm() {
+    function onPercentilesChange(percentiles: number[]) {
+      // @ts-expect-error
+      props.onChange({
+        fieldMetaOptions: {
+          ...props.fieldMetaOptions,
+          percentiles: _.uniq(percentiles.sort()),
+        },
+      });
+    }
+
+    return (
+      <PercentilesForm
+        initialPercentiles={
+          props.fieldMetaOptions.percentiles
+            ? props.fieldMetaOptions.percentiles
+            : DEFAULT_PERCENTILES
+        }
+        onChange={onPercentilesChange}
+      />
+    );
+  }
+
+  const dataMappingOptions = DATA_MAPPING_OPTIONS.filter((option) => {
+    return props.supportedDataMappingFunctions.includes(option.value);
+  });
+
+  return (
+    <DataMappingPopover>
+      <Fragment>
+        <EuiFormRow
+          label={i18n.translate('xpack.maps.styles.ordinalDataMapping.dataMappingLabel', {
+            defaultMessage: 'Fitting',
+          })}
+          helpText={i18n.translate(
+            'xpack.maps.styles.ordinalDataMapping.dataMappingTooltipContent',
+            {
+              defaultMessage: `Fit values from the data domain to the style`,
+            }
+          )}
+        >
+          <EuiSuperSelect
+            options={dataMappingOptions}
+            valueOfSelected={props.dataMappingFunction}
+            onChange={onDataMappingFunctionChange}
+            itemLayoutAlign="top"
+            hasDividers
+          />
+        </EuiFormRow>
+
+        <EuiHorizontalRule />
+
+        {props.dataMappingFunction === DATA_MAPPING_FUNCTION.PERCENTILES
+          ? renderPercentilesForm()
+          : renderEasingForm()}
+      </Fragment>
+    </DataMappingPopover>
+  );
+}
diff --git a/x-pack/plugins/maps/public/classes/styles/vector/components/data_mapping/percentiles_form.tsx b/x-pack/plugins/maps/public/classes/styles/vector/components/data_mapping/percentiles_form.tsx
new file mode 100644
index 0000000000000..f36e8cb91a286
--- /dev/null
+++ b/x-pack/plugins/maps/public/classes/styles/vector/components/data_mapping/percentiles_form.tsx
@@ -0,0 +1,126 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License;
+ * you may not use this file except in compliance with the Elastic License.
+ */
+
+import _ from 'lodash';
+import React, { ChangeEvent, Component } from 'react';
+import { EuiFieldNumber, EuiFormRow } from '@elastic/eui';
+import { i18n } from '@kbn/i18n';
+import { RowActionButtons } from '../row_action_buttons';
+
+interface Props {
+  initialPercentiles: number[];
+  onChange: (percentiles: number[]) => void;
+}
+
+interface State {
+  percentiles: Array<number | string>;
+}
+
+function isInvalidPercentile(percentile: unknown) {
+  if (typeof percentile !== 'number') {
+    return true;
+  }
+
+  return percentile <= 0 || percentile >= 100;
+}
+
+export class PercentilesForm extends Component<Props, State> {
+  constructor(props: Props) {
+    super(props);
+    this.state = {
+      percentiles: props.initialPercentiles,
+    };
+  }
+
+  _onSubmit = () => {
+    const hasInvalidPercentile = this.state.percentiles.some(isInvalidPercentile);
+    if (!hasInvalidPercentile) {
+      this.props.onChange(this.state.percentiles as number[]);
+    }
+  };
+
+  render() {
+    const rows = this.state.percentiles.map((percentile: number | string, index: number) => {
+      const onAdd = () => {
+        let newPercentile: number | string = '';
+        if (typeof percentile === 'number') {
+          let delta = 1;
+          if (index === this.state.percentiles.length - 1) {
+            // Adding row to end of list.
+            if (index !== 0) {
+              const prevPercentile = this.state.percentiles[index - 1];
+              if (typeof prevPercentile === 'number') {
+                delta = percentile - prevPercentile;
+              }
+            }
+          } else {
+            // Adding row in middle of list.
+            const nextPercentile = this.state.percentiles[index + 1];
+            if (typeof nextPercentile === 'number') {
+              delta = (nextPercentile - percentile) / 2;
+            }
+          }
+          newPercentile = percentile + delta;
+          if (newPercentile >= 100) {
+            newPercentile = 99;
+          }
+        }
+
+        const percentiles = [
+          ...this.state.percentiles.slice(0, index + 1),
+          newPercentile,
+          ...this.state.percentiles.slice(index + 1),
+        ];
+        this.setState({ percentiles }, this._onSubmit);
+      };
+
+      const onRemove = () => {
+        const percentiles =
+          this.state.percentiles.length === 1
+            ? this.state.percentiles
+            : [
+                ...this.state.percentiles.slice(0, index),
+                ...this.state.percentiles.slice(index + 1),
+              ];
+        this.setState({ percentiles }, this._onSubmit);
+      };
+
+      const onPercentileChange = (event: ChangeEvent<HTMLInputElement>) => {
+        const sanitizedValue = parseFloat(event.target.value);
+        const percentiles = [...this.state.percentiles];
+        percentiles[index] = isNaN(sanitizedValue) ? '' : sanitizedValue;
+        this.setState({ percentiles }, this._onSubmit);
+      };
+
+      const isInvalid = isInvalidPercentile(percentile);
+      const error = isInvalid
+        ? i18n.translate('xpack.maps.styles.invalidPercentileMsg', {
+            defaultMessage: `Percentile must be a number between 0 and 100, exclusive`,
+          })
+        : null;
+
+      return (
+        <EuiFormRow key={index} display="rowCompressed" isInvalid={isInvalid} error={error}>
+          <EuiFieldNumber
+            isInvalid={isInvalid}
+            value={percentile}
+            onChange={onPercentileChange}
+            append={
+              <RowActionButtons
+                onAdd={onAdd}
+                onRemove={onRemove}
+                showDeleteButton={this.state.percentiles.length > 1}
+              />
+            }
+            compressed
+          />
+        </EuiFormRow>
+      );
+    });
+
+    return <div>{rows}</div>;
+  }
+}
diff --git a/x-pack/plugins/maps/public/classes/styles/vector/components/field_meta/categorical_field_meta_popover.tsx b/x-pack/plugins/maps/public/classes/styles/vector/components/field_meta/categorical_field_meta_popover.tsx
deleted file mode 100644
index 2a544b94d760a..0000000000000
--- a/x-pack/plugins/maps/public/classes/styles/vector/components/field_meta/categorical_field_meta_popover.tsx
+++ /dev/null
@@ -1,43 +0,0 @@
-/*
- * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
- * or more contributor license agreements. Licensed under the Elastic License;
- * you may not use this file except in compliance with the Elastic License.
- */
-/* eslint-disable @typescript-eslint/consistent-type-definitions */
-
-import React from 'react';
-import { EuiFormRow, EuiSwitch, EuiSwitchEvent } from '@elastic/eui';
-import { i18n } from '@kbn/i18n';
-import { FieldMetaPopover } from './field_meta_popover';
-import { FieldMetaOptions } from '../../../../../../common/descriptor_types';
-
-type Props = {
-  fieldMetaOptions: FieldMetaOptions;
-  onChange: (fieldMetaOptions: FieldMetaOptions) => void;
-  switchDisabled: boolean;
-};
-
-export function CategoricalFieldMetaPopover(props: Props) {
-  const onIsEnabledChange = (event: EuiSwitchEvent) => {
-    props.onChange({
-      ...props.fieldMetaOptions,
-      isEnabled: event.target.checked,
-    });
-  };
-
-  return (
-    <FieldMetaPopover>
-      <EuiFormRow display="columnCompressedSwitch">
-        <EuiSwitch
-          label={i18n.translate('xpack.maps.styles.fieldMetaOptions.isEnabled.categoricalLabel', {
-            defaultMessage: 'Get categories from indices',
-          })}
-          checked={props.fieldMetaOptions.isEnabled}
-          onChange={onIsEnabledChange}
-          compressed
-          disabled={props.switchDisabled}
-        />
-      </EuiFormRow>
-    </FieldMetaPopover>
-  );
-}
diff --git a/x-pack/plugins/maps/public/classes/styles/vector/components/field_meta/ordinal_field_meta_popover.tsx b/x-pack/plugins/maps/public/classes/styles/vector/components/field_meta/ordinal_field_meta_popover.tsx
deleted file mode 100644
index 09be9d72af970..0000000000000
--- a/x-pack/plugins/maps/public/classes/styles/vector/components/field_meta/ordinal_field_meta_popover.tsx
+++ /dev/null
@@ -1,95 +0,0 @@
-/*
- * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
- * or more contributor license agreements. Licensed under the Elastic License;
- * you may not use this file except in compliance with the Elastic License.
- */
-/* eslint-disable @typescript-eslint/consistent-type-definitions */
-
-import _ from 'lodash';
-import React, { ChangeEvent, Fragment, MouseEvent } from 'react';
-import { EuiFormRow, EuiRange, EuiSwitch, EuiSwitchEvent } from '@elastic/eui';
-import { i18n } from '@kbn/i18n';
-import { DEFAULT_SIGMA } from '../../vector_style_defaults';
-import { FieldMetaPopover } from './field_meta_popover';
-import { FieldMetaOptions } from '../../../../../../common/descriptor_types';
-import { VECTOR_STYLES } from '../../../../../../common/constants';
-
-function getIsEnableToggleLabel(styleName: string) {
-  switch (styleName) {
-    case VECTOR_STYLES.FILL_COLOR:
-    case VECTOR_STYLES.LINE_COLOR:
-      return i18n.translate('xpack.maps.styles.fieldMetaOptions.isEnabled.colorLabel', {
-        defaultMessage: 'Calculate color ramp range from indices',
-      });
-    case VECTOR_STYLES.LINE_WIDTH:
-      return i18n.translate('xpack.maps.styles.fieldMetaOptions.isEnabled.widthLabel', {
-        defaultMessage: 'Calculate border width range from indices',
-      });
-    case VECTOR_STYLES.ICON_SIZE:
-      return i18n.translate('xpack.maps.styles.fieldMetaOptions.isEnabled.sizeLabel', {
-        defaultMessage: 'Calculate symbol size range from indices',
-      });
-    default:
-      return i18n.translate('xpack.maps.styles.fieldMetaOptions.isEnabled.defaultLabel', {
-        defaultMessage: 'Calculate symbolization range from indices',
-      });
-  }
-}
-
-type Props = {
-  fieldMetaOptions: FieldMetaOptions;
-  styleName: VECTOR_STYLES;
-  onChange: (fieldMetaOptions: FieldMetaOptions) => void;
-  switchDisabled: boolean;
-};
-
-export function OrdinalFieldMetaPopover(props: Props) {
-  const onIsEnabledChange = (event: EuiSwitchEvent) => {
-    props.onChange({
-      ...props.fieldMetaOptions,
-      isEnabled: event.target.checked,
-    });
-  };
-
-  const onSigmaChange = (event: ChangeEvent<HTMLInputElement> | MouseEvent<HTMLButtonElement>) => {
-    props.onChange({
-      ...props.fieldMetaOptions,
-      sigma: parseInt(event.currentTarget.value, 10),
-    });
-  };
-
-  return (
-    <FieldMetaPopover>
-      <Fragment>
-        <EuiFormRow display="columnCompressedSwitch">
-          <EuiSwitch
-            label={getIsEnableToggleLabel(props.styleName)}
-            checked={props.fieldMetaOptions.isEnabled}
-            onChange={onIsEnabledChange}
-            compressed
-            disabled={props.switchDisabled}
-          />
-        </EuiFormRow>
-
-        <EuiFormRow
-          label={i18n.translate('xpack.maps.styles.fieldMetaOptions.sigmaLabel', {
-            defaultMessage: 'Sigma',
-          })}
-          display="columnCompressed"
-        >
-          <EuiRange
-            min={1}
-            max={5}
-            step={0.25}
-            value={_.get(props.fieldMetaOptions, 'sigma', DEFAULT_SIGMA)}
-            onChange={onSigmaChange}
-            disabled={!props.fieldMetaOptions.isEnabled}
-            showTicks
-            tickInterval={1}
-            compressed
-          />
-        </EuiFormRow>
-      </Fragment>
-    </FieldMetaPopover>
-  );
-}
diff --git a/x-pack/plugins/maps/public/classes/styles/vector/components/legend/breaked_legend.tsx b/x-pack/plugins/maps/public/classes/styles/vector/components/legend/breaked_legend.tsx
index 8eca89e31cf7a..97b8887b2844b 100644
--- a/x-pack/plugins/maps/public/classes/styles/vector/components/legend/breaked_legend.tsx
+++ b/x-pack/plugins/maps/public/classes/styles/vector/components/legend/breaked_legend.tsx
@@ -12,7 +12,7 @@ import { IDynamicStyleProperty } from '../../properties/dynamic_style_property';
 
 const EMPTY_VALUE = '';
 
-interface Break {
+export interface Break {
   color: string;
   label: ReactElement<any> | string | number;
   symbolId?: string;
diff --git a/x-pack/plugins/maps/public/classes/styles/vector/components/row_action_buttons.tsx b/x-pack/plugins/maps/public/classes/styles/vector/components/row_action_buttons.tsx
new file mode 100644
index 0000000000000..f9aa083c8fc2d
--- /dev/null
+++ b/x-pack/plugins/maps/public/classes/styles/vector/components/row_action_buttons.tsx
@@ -0,0 +1,49 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License;
+ * you may not use this file except in compliance with the Elastic License.
+ */
+
+import _ from 'lodash';
+import React from 'react';
+import { i18n } from '@kbn/i18n';
+import { EuiButtonIcon } from '@elastic/eui';
+
+const ADD_BUTTON_TITLE = i18n.translate('xpack.maps.addBtnTitle', {
+  defaultMessage: 'Add',
+});
+
+const DELETE_BUTTON_TITLE = i18n.translate('xpack.maps.deleteBtnTitle', {
+  defaultMessage: 'Delete',
+});
+
+export const RowActionButtons = ({
+  onAdd,
+  onRemove,
+  showDeleteButton,
+}: {
+  onAdd: () => void;
+  onRemove: () => void;
+  showDeleteButton: boolean;
+}) => {
+  return (
+    <div>
+      {showDeleteButton ? (
+        <EuiButtonIcon
+          iconType="trash"
+          color="danger"
+          aria-label={DELETE_BUTTON_TITLE}
+          title={DELETE_BUTTON_TITLE}
+          onClick={onRemove}
+        />
+      ) : null}
+      <EuiButtonIcon
+        iconType="plusInCircle"
+        color="primary"
+        aria-label={ADD_BUTTON_TITLE}
+        title={ADD_BUTTON_TITLE}
+        onClick={onAdd}
+      />
+    </div>
+  );
+};
diff --git a/x-pack/plugins/maps/public/classes/styles/vector/components/style_prop_editor.tsx b/x-pack/plugins/maps/public/classes/styles/vector/components/style_prop_editor.tsx
index f3363a9443cfd..9b66a8c2c9b43 100644
--- a/x-pack/plugins/maps/public/classes/styles/vector/components/style_prop_editor.tsx
+++ b/x-pack/plugins/maps/public/classes/styles/vector/components/style_prop_editor.tsx
@@ -16,7 +16,6 @@ import {
 import { i18n } from '@kbn/i18n';
 import { getVectorStyleLabel, getDisabledByMessage } from './get_vector_style_label';
 import { STYLE_TYPE, VECTOR_STYLES } from '../../../../../common/constants';
-import { FieldMetaOptions } from '../../../../../common/descriptor_types';
 import { IStyleProperty } from '../properties/style_property';
 import { StyleField } from '../style_fields_helper';
 
@@ -59,10 +58,10 @@ export class StylePropEditor<StaticOptions, DynamicOptions> extends Component<
     }
   };
 
-  _onFieldMetaOptionsChange = (fieldMetaOptions: FieldMetaOptions) => {
+  _onDataMappingChange = (updatedObjects: Partial<DynamicOptions>) => {
     const options = {
       ...(this.props.styleProperty.getOptions() as DynamicOptions),
-      fieldMetaOptions,
+      ...updatedObjects,
     };
     this.props.onDynamicStyleChange(this.props.styleProperty.getStyleName(), options);
   };
@@ -101,10 +100,6 @@ export class StylePropEditor<StaticOptions, DynamicOptions> extends Component<
   }
 
   render() {
-    const fieldMetaOptionsPopover = this.props.styleProperty.renderFieldMetaPopover(
-      this._onFieldMetaOptionsChange
-    );
-
     const staticDynamicSelect = this.renderStaticDynamicSelect();
 
     const stylePropertyForm =
@@ -127,7 +122,9 @@ export class StylePropEditor<StaticOptions, DynamicOptions> extends Component<
           {React.cloneElement(this.props.children, {
             staticDynamicSelect,
           })}
-          {fieldMetaOptionsPopover}
+          {(this.props.styleProperty as IStyleProperty<DynamicOptions>).renderDataMappingPopover(
+            this._onDataMappingChange
+          )}
         </Fragment>
       );
 
diff --git a/x-pack/plugins/maps/public/classes/styles/vector/properties/__snapshots__/dynamic_color_property.test.tsx.snap b/x-pack/plugins/maps/public/classes/styles/vector/properties/__snapshots__/dynamic_color_property.test.tsx.snap
index 34d2d7fb0cbbf..7607510a10b3e 100644
--- a/x-pack/plugins/maps/public/classes/styles/vector/properties/__snapshots__/dynamic_color_property.test.tsx.snap
+++ b/x-pack/plugins/maps/public/classes/styles/vector/properties/__snapshots__/dynamic_color_property.test.tsx.snap
@@ -1,8 +1,48 @@
 // Jest Snapshot v1, https://goo.gl/fbAQLP
 
-exports[`categorical Should render categorical legend with breaks from custom 1`] = `""`;
+exports[`renderDataMappingPopover Should disable toggle when field is not backed by geojson source 1`] = `
+<OrdinalDataMappingPopover
+  dataMappingFunction="INTERPOLATE"
+  fieldMetaOptions={
+    Object {
+      "isEnabled": true,
+    }
+  }
+  onChange={[Function]}
+  styleName="lineColor"
+  supportedDataMappingFunctions={
+    Array [
+      "INTERPOLATE",
+      "PERCENTILES",
+    ]
+  }
+  switchDisabled={true}
+/>
+`;
+
+exports[`renderDataMappingPopover Should enable toggle when field is backed by geojson-source 1`] = `
+<OrdinalDataMappingPopover
+  dataMappingFunction="INTERPOLATE"
+  fieldMetaOptions={
+    Object {
+      "isEnabled": true,
+    }
+  }
+  onChange={[Function]}
+  styleName="lineColor"
+  supportedDataMappingFunctions={
+    Array [
+      "INTERPOLATE",
+      "PERCENTILES",
+    ]
+  }
+  switchDisabled={false}
+/>
+`;
+
+exports[`renderLegendDetailRow categorical Should render categorical legend with breaks from custom 1`] = `""`;
 
-exports[`categorical Should render categorical legend with breaks from default 1`] = `
+exports[`renderLegendDetailRow categorical Should render categorical legend with breaks from default 1`] = `
 <div>
   <EuiFlexGroup
     gutterSize="xs"
@@ -82,7 +122,7 @@ exports[`categorical Should render categorical legend with breaks from default 1
 </div>
 `;
 
-exports[`ordinal Should render custom ordinal legend with breaks 1`] = `
+exports[`renderLegendDetailRow ordinal Should render custom ordinal legend with breaks 1`] = `
 <div>
   <EuiFlexGroup
     gutterSize="xs"
@@ -145,7 +185,7 @@ exports[`ordinal Should render custom ordinal legend with breaks 1`] = `
 </div>
 `;
 
-exports[`ordinal Should render only single band of last color when delta is 0 1`] = `
+exports[`renderLegendDetailRow ordinal Should render interpolate bands 1`] = `
 <div>
   <EuiFlexGroup
     gutterSize="xs"
@@ -184,12 +224,89 @@ exports[`ordinal Should render only single band of last color when delta is 0 1`
   >
     <EuiFlexItem
       key="0"
+    >
+      <Category
+        color="#ecf1f7"
+        isLinesOnly={false}
+        isPointsOnly={true}
+        label="0_format"
+        styleName="lineColor"
+      />
+    </EuiFlexItem>
+    <EuiFlexItem
+      key="1"
+    >
+      <Category
+        color="#d9e3ef"
+        isLinesOnly={false}
+        isPointsOnly={true}
+        label="13_format"
+        styleName="lineColor"
+      />
+    </EuiFlexItem>
+    <EuiFlexItem
+      key="2"
+    >
+      <Category
+        color="#c5d5e7"
+        isLinesOnly={false}
+        isPointsOnly={true}
+        label="25_format"
+        styleName="lineColor"
+      />
+    </EuiFlexItem>
+    <EuiFlexItem
+      key="3"
+    >
+      <Category
+        color="#b2c7df"
+        isLinesOnly={false}
+        isPointsOnly={true}
+        label="38_format"
+        styleName="lineColor"
+      />
+    </EuiFlexItem>
+    <EuiFlexItem
+      key="4"
+    >
+      <Category
+        color="#9eb9d8"
+        isLinesOnly={false}
+        isPointsOnly={true}
+        label="50_format"
+        styleName="lineColor"
+      />
+    </EuiFlexItem>
+    <EuiFlexItem
+      key="5"
+    >
+      <Category
+        color="#8bacd0"
+        isLinesOnly={false}
+        isPointsOnly={true}
+        label="63_format"
+        styleName="lineColor"
+      />
+    </EuiFlexItem>
+    <EuiFlexItem
+      key="6"
+    >
+      <Category
+        color="#769fc8"
+        isLinesOnly={false}
+        isPointsOnly={true}
+        label="75_format"
+        styleName="lineColor"
+      />
+    </EuiFlexItem>
+    <EuiFlexItem
+      key="7"
     >
       <Category
         color="#6092c0"
         isLinesOnly={false}
         isPointsOnly={true}
-        label="100_format"
+        label="88_format"
         styleName="lineColor"
       />
     </EuiFlexItem>
@@ -197,7 +314,7 @@ exports[`ordinal Should render only single band of last color when delta is 0 1`
 </div>
 `;
 
-exports[`ordinal Should render ordinal legend as bands 1`] = `
+exports[`renderLegendDetailRow ordinal Should render percentile bands 1`] = `
 <div>
   <EuiFlexGroup
     gutterSize="xs"
@@ -238,10 +355,10 @@ exports[`ordinal Should render ordinal legend as bands 1`] = `
       key="0"
     >
       <Category
-        color="#ecf1f7"
+        color="#e5ecf4"
         isLinesOnly={false}
         isPointsOnly={true}
-        label="0_format"
+        label="up to 50th: 5572_format"
         styleName="lineColor"
       />
     </EuiFlexItem>
@@ -249,10 +366,10 @@ exports[`ordinal Should render ordinal legend as bands 1`] = `
       key="1"
     >
       <Category
-        color="#d9e3ef"
+        color="#ccd9ea"
         isLinesOnly={false}
         isPointsOnly={true}
-        label="13_format"
+        label="50th: 5572_format up to 75th: 8079_format"
         styleName="lineColor"
       />
     </EuiFlexItem>
@@ -260,10 +377,10 @@ exports[`ordinal Should render ordinal legend as bands 1`] = `
       key="2"
     >
       <Category
-        color="#c5d5e7"
+        color="#b2c7df"
         isLinesOnly={false}
         isPointsOnly={true}
-        label="25_format"
+        label="75th: 8079_format up to 90th: 9607_format"
         styleName="lineColor"
       />
     </EuiFlexItem>
@@ -271,10 +388,10 @@ exports[`ordinal Should render ordinal legend as bands 1`] = `
       key="3"
     >
       <Category
-        color="#b2c7df"
+        color="#98b5d5"
         isLinesOnly={false}
         isPointsOnly={true}
-        label="38_format"
+        label="90th: 9607_format up to 95th: 10439_format"
         styleName="lineColor"
       />
     </EuiFlexItem>
@@ -282,10 +399,10 @@ exports[`ordinal Should render ordinal legend as bands 1`] = `
       key="4"
     >
       <Category
-        color="#9eb9d8"
+        color="#7da3ca"
         isLinesOnly={false}
         isPointsOnly={true}
-        label="50_format"
+        label="95th: 10439_format up to 99th: 16857_format"
         styleName="lineColor"
       />
     </EuiFlexItem>
@@ -293,61 +410,65 @@ exports[`ordinal Should render ordinal legend as bands 1`] = `
       key="5"
     >
       <Category
-        color="#8bacd0"
+        color="#6092c0"
         isLinesOnly={false}
         isPointsOnly={true}
-        label="63_format"
+        label="greater than 99th: 16857_format"
         styleName="lineColor"
       />
     </EuiFlexItem>
+  </EuiFlexGroup>
+</div>
+`;
+
+exports[`renderLegendDetailRow ordinal Should render single band when interpolate range is 0 1`] = `
+<div>
+  <EuiFlexGroup
+    gutterSize="xs"
+    justifyContent="spaceBetween"
+  >
     <EuiFlexItem
-      key="6"
+      grow={false}
     >
-      <Category
-        color="#769fc8"
-        isLinesOnly={false}
-        isPointsOnly={true}
-        label="75_format"
-        styleName="lineColor"
-      />
+      <EuiToolTip
+        content="foobar_label"
+        delay="regular"
+        position="top"
+        title="Border color"
+      >
+        <EuiText
+          className="eui-textTruncate"
+          size="xs"
+          style={
+            Object {
+              "maxWidth": "180px",
+            }
+          }
+        >
+          <small>
+            <strong>
+              foobar_label
+            </strong>
+          </small>
+        </EuiText>
+      </EuiToolTip>
     </EuiFlexItem>
+  </EuiFlexGroup>
+  <EuiFlexGroup
+    direction="column"
+    gutterSize="none"
+  >
     <EuiFlexItem
-      key="7"
+      key="0"
     >
       <Category
         color="#6092c0"
         isLinesOnly={false}
         isPointsOnly={true}
-        label="88_format"
+        label="100_format"
         styleName="lineColor"
       />
     </EuiFlexItem>
   </EuiFlexGroup>
 </div>
 `;
-
-exports[`renderFieldMetaPopover Should disable toggle when field is not backed by geojson source 1`] = `
-<OrdinalFieldMetaPopover
-  fieldMetaOptions={
-    Object {
-      "isEnabled": true,
-    }
-  }
-  onChange={[Function]}
-  styleName="lineColor"
-  switchDisabled={true}
-/>
-`;
-
-exports[`renderFieldMetaPopover Should enable toggle when field is backed by geojson-source 1`] = `
-<OrdinalFieldMetaPopover
-  fieldMetaOptions={
-    Object {
-      "isEnabled": true,
-    }
-  }
-  onChange={[Function]}
-  styleName="lineColor"
-  switchDisabled={false}
-/>
-`;
diff --git a/x-pack/plugins/maps/public/classes/styles/vector/properties/dynamic_color_property.test.tsx b/x-pack/plugins/maps/public/classes/styles/vector/properties/dynamic_color_property.test.tsx
index c9188a0a19b0d..f120773086b8d 100644
--- a/x-pack/plugins/maps/public/classes/styles/vector/properties/dynamic_color_property.test.tsx
+++ b/x-pack/plugins/maps/public/classes/styles/vector/properties/dynamic_color_property.test.tsx
@@ -15,7 +15,12 @@ import { shallow } from 'enzyme';
 import { Feature, Point } from 'geojson';
 
 import { DynamicColorProperty } from './dynamic_color_property';
-import { COLOR_MAP_TYPE, RawValue, VECTOR_STYLES } from '../../../../../common/constants';
+import {
+  COLOR_MAP_TYPE,
+  RawValue,
+  DATA_MAPPING_FUNCTION,
+  VECTOR_STYLES,
+} from '../../../../../common/constants';
 import { mockField, MockLayer, MockStyle } from './__tests__/test_util';
 import { ColorDynamicOptions } from '../../../../../common/descriptor_types';
 import { IVectorLayer } from '../../../layers/vector_layer/vector_layer';
@@ -40,125 +45,164 @@ const defaultLegendParams = {
 
 const fieldMetaOptions = { isEnabled: true };
 
-describe('ordinal', () => {
-  test('Should render ordinal legend as bands', async () => {
-    const colorStyle = makeProperty({
-      color: 'Blues',
-      type: undefined,
-      fieldMetaOptions,
-    });
+describe('renderLegendDetailRow', () => {
+  describe('ordinal', () => {
+    test('Should render interpolate bands', async () => {
+      const colorStyle = makeProperty({
+        color: 'Blues',
+        type: undefined,
+        fieldMetaOptions,
+      });
 
-    const legendRow = colorStyle.renderLegendDetailRow(defaultLegendParams);
+      const legendRow = colorStyle.renderLegendDetailRow(defaultLegendParams);
 
-    const component = shallow(legendRow);
+      const component = shallow(legendRow);
 
-    // Ensure all promises resolve
-    await new Promise((resolve) => process.nextTick(resolve));
-    // Ensure the state changes are reflected
-    component.update();
+      // Ensure all promises resolve
+      await new Promise((resolve) => process.nextTick(resolve));
+      // Ensure the state changes are reflected
+      component.update();
 
-    expect(component).toMatchSnapshot();
-  });
+      expect(component).toMatchSnapshot();
+    });
 
-  test('Should render only single band of last color when delta is 0', async () => {
-    const colorStyle = makeProperty(
-      {
+    test('Should render single band when interpolate range is 0', async () => {
+      const colorStyle = makeProperty({
         color: 'Blues',
         type: undefined,
         fieldMetaOptions,
-      },
-      new MockStyle({ min: 100, max: 100 })
-    );
+      });
+      colorStyle.getRangeFieldMeta = () => {
+        return {
+          min: 100,
+          max: 100,
+          delta: 0,
+        };
+      };
 
-    const legendRow = colorStyle.renderLegendDetailRow(defaultLegendParams);
+      const legendRow = colorStyle.renderLegendDetailRow(defaultLegendParams);
 
-    const component = shallow(legendRow);
+      const component = shallow(legendRow);
 
-    // Ensure all promises resolve
-    await new Promise((resolve) => process.nextTick(resolve));
-    // Ensure the state changes are reflected
-    component.update();
+      // Ensure all promises resolve
+      await new Promise((resolve) => process.nextTick(resolve));
+      // Ensure the state changes are reflected
+      component.update();
 
-    expect(component).toMatchSnapshot();
-  });
+      expect(component).toMatchSnapshot();
+    });
 
-  test('Should render custom ordinal legend with breaks', async () => {
-    const colorStyle = makeProperty({
-      type: COLOR_MAP_TYPE.ORDINAL,
-      useCustomColorRamp: true,
-      customColorRamp: [
-        {
-          stop: 0,
-          color: '#FF0000',
-        },
-        {
-          stop: 10,
-          color: '#00FF00',
+    test('Should render percentile bands', async () => {
+      const colorStyle = makeProperty({
+        color: 'Blues',
+        type: undefined,
+        dataMappingFunction: DATA_MAPPING_FUNCTION.PERCENTILES,
+        fieldMetaOptions: {
+          isEnabled: true,
+          percentiles: [50, 75, 90, 95, 99],
         },
-      ],
-      fieldMetaOptions,
+      });
+      colorStyle.getPercentilesFieldMeta = () => {
+        return [
+          { percentile: '0.0', value: 0 },
+          { percentile: '50.0', value: 5571.815277777777 },
+          { percentile: '75.0', value: 8078.703125 },
+          { percentile: '90.0', value: 9607.2 },
+          { percentile: '95.0', value: 10439.083333333334 },
+          { percentile: '99.0', value: 16856.5 },
+        ];
+      };
+
+      const legendRow = colorStyle.renderLegendDetailRow(defaultLegendParams);
+
+      const component = shallow(legendRow);
+
+      // Ensure all promises resolve
+      await new Promise((resolve) => process.nextTick(resolve));
+      // Ensure the state changes are reflected
+      component.update();
+
+      expect(component).toMatchSnapshot();
     });
 
-    const legendRow = colorStyle.renderLegendDetailRow(defaultLegendParams);
+    test('Should render custom ordinal legend with breaks', async () => {
+      const colorStyle = makeProperty({
+        type: COLOR_MAP_TYPE.ORDINAL,
+        useCustomColorRamp: true,
+        customColorRamp: [
+          {
+            stop: 0,
+            color: '#FF0000',
+          },
+          {
+            stop: 10,
+            color: '#00FF00',
+          },
+        ],
+        fieldMetaOptions,
+      });
 
-    const component = shallow(legendRow);
+      const legendRow = colorStyle.renderLegendDetailRow(defaultLegendParams);
 
-    // Ensure all promises resolve
-    await new Promise((resolve) => process.nextTick(resolve));
-    // Ensure the state changes are reflected
-    component.update();
+      const component = shallow(legendRow);
 
-    expect(component).toMatchSnapshot();
-  });
-});
+      // Ensure all promises resolve
+      await new Promise((resolve) => process.nextTick(resolve));
+      // Ensure the state changes are reflected
+      component.update();
 
-describe('categorical', () => {
-  test('Should render categorical legend with breaks from default', async () => {
-    const colorStyle = makeProperty({
-      type: COLOR_MAP_TYPE.CATEGORICAL,
-      useCustomColorPalette: false,
-      colorCategory: 'palette_0',
-      fieldMetaOptions,
+      expect(component).toMatchSnapshot();
     });
+  });
 
-    const legendRow = colorStyle.renderLegendDetailRow(defaultLegendParams);
+  describe('categorical', () => {
+    test('Should render categorical legend with breaks from default', async () => {
+      const colorStyle = makeProperty({
+        type: COLOR_MAP_TYPE.CATEGORICAL,
+        useCustomColorPalette: false,
+        colorCategory: 'palette_0',
+        fieldMetaOptions,
+      });
 
-    const component = shallow(legendRow);
+      const legendRow = colorStyle.renderLegendDetailRow(defaultLegendParams);
 
-    // Ensure all promises resolve
-    await new Promise((resolve) => process.nextTick(resolve));
-    // Ensure the state changes are reflected
-    component.update();
+      const component = shallow(legendRow);
 
-    expect(component).toMatchSnapshot();
-  });
+      // Ensure all promises resolve
+      await new Promise((resolve) => process.nextTick(resolve));
+      // Ensure the state changes are reflected
+      component.update();
 
-  test('Should render categorical legend with breaks from custom', async () => {
-    const colorStyle = makeProperty({
-      type: COLOR_MAP_TYPE.CATEGORICAL,
-      useCustomColorPalette: true,
-      customColorPalette: [
-        {
-          stop: null, // should include the default stop
-          color: '#FFFF00',
-        },
-        {
-          stop: 'US_STOP',
-          color: '#FF0000',
-        },
-        {
-          stop: 'CN_STOP',
-          color: '#00FF00',
-        },
-      ],
-      fieldMetaOptions,
+      expect(component).toMatchSnapshot();
     });
 
-    const legendRow = colorStyle.renderLegendDetailRow(defaultLegendParams);
+    test('Should render categorical legend with breaks from custom', async () => {
+      const colorStyle = makeProperty({
+        type: COLOR_MAP_TYPE.CATEGORICAL,
+        useCustomColorPalette: true,
+        customColorPalette: [
+          {
+            stop: null, // should include the default stop
+            color: '#FFFF00',
+          },
+          {
+            stop: 'US_STOP',
+            color: '#FF0000',
+          },
+          {
+            stop: 'CN_STOP',
+            color: '#00FF00',
+          },
+        ],
+        fieldMetaOptions,
+      });
+
+      const legendRow = colorStyle.renderLegendDetailRow(defaultLegendParams);
 
-    const component = shallow(legendRow);
+      const component = shallow(legendRow);
 
-    expect(component).toMatchSnapshot();
+      expect(component).toMatchSnapshot();
+    });
   });
 });
 
@@ -204,7 +248,7 @@ test('Should pluck the categorical style-meta from fieldmeta', async () => {
   });
 
   const meta = colorStyle._pluckCategoricalStyleMetaFromFieldMetaData({
-    foobar: {
+    foobar_terms: {
       buckets: [
         {
           key: 'CN',
@@ -578,7 +622,7 @@ test('Should read out ordinal type correctly', async () => {
   expect(ordinalColorStyle2.isCategorical()).toEqual(false);
 });
 
-describe('renderFieldMetaPopover', () => {
+describe('renderDataMappingPopover', () => {
   test('Should enable toggle when field is backed by geojson-source', () => {
     const colorStyle = makeProperty(
       {
@@ -590,7 +634,7 @@ describe('renderFieldMetaPopover', () => {
       mockField
     );
 
-    const legendRow = colorStyle.renderFieldMetaPopover(() => {});
+    const legendRow = colorStyle.renderDataMappingPopover(() => {});
     expect(legendRow).toMatchSnapshot();
   });
 
@@ -609,7 +653,7 @@ describe('renderFieldMetaPopover', () => {
       nonGeoJsonField
     );
 
-    const legendRow = colorStyle.renderFieldMetaPopover(() => {});
+    const legendRow = colorStyle.renderDataMappingPopover(() => {});
     expect(legendRow).toMatchSnapshot();
   });
 });
diff --git a/x-pack/plugins/maps/public/classes/styles/vector/properties/dynamic_color_property.tsx b/x-pack/plugins/maps/public/classes/styles/vector/properties/dynamic_color_property.tsx
index faecf51d4ced5..289bb6be3179d 100644
--- a/x-pack/plugins/maps/public/classes/styles/vector/properties/dynamic_color_property.tsx
+++ b/x-pack/plugins/maps/public/classes/styles/vector/properties/dynamic_color_property.tsx
@@ -5,24 +5,55 @@
  */
 
 import { Map as MbMap } from 'mapbox-gl';
+import { i18n } from '@kbn/i18n';
 import React from 'react';
 import { EuiTextColor } from '@elastic/eui';
 import { DynamicStyleProperty } from './dynamic_style_property';
 import { makeMbClampedNumberExpression, dynamicRound } from '../style_util';
-import { getOrdinalMbColorRampStops, getColorPalette } from '../../color_palettes';
-import { COLOR_MAP_TYPE } from '../../../../../common/constants';
+import {
+  getOrdinalMbColorRampStops,
+  getPercentilesMbColorRampStops,
+  getColorPalette,
+} from '../../color_palettes';
+import { COLOR_MAP_TYPE, DATA_MAPPING_FUNCTION } from '../../../../../common/constants';
+import { GREAT_THAN, UPTO } from '../../../../../common/i18n_getters';
 import {
   isCategoricalStopsInvalid,
   getOtherCategoryLabel,
   // @ts-expect-error
 } from '../components/color/color_stops_utils';
-import { BreakedLegend } from '../components/legend/breaked_legend';
+import { Break, BreakedLegend } from '../components/legend/breaked_legend';
 import { ColorDynamicOptions, OrdinalColorStop } from '../../../../../common/descriptor_types';
 import { LegendProps } from './style_property';
 
 const EMPTY_STOPS = { stops: [], defaultColor: null };
 const RGBA_0000 = 'rgba(0,0,0,0)';
 
+function getOrdinalSuffix(value: number) {
+  const lastDigit = value % 10;
+  if (lastDigit === 1 && value !== 11) {
+    return i18n.translate('xpack.maps.styles.firstOrdinalSuffix', {
+      defaultMessage: 'st',
+    });
+  }
+
+  if (lastDigit === 2 && value !== 12) {
+    return i18n.translate('xpack.maps.styles.secondOrdinalSuffix', {
+      defaultMessage: 'nd',
+    });
+  }
+
+  if (lastDigit === 3 && value !== 13) {
+    return i18n.translate('xpack.maps.styles.thirdOrdinalSuffix', {
+      defaultMessage: 'rd',
+    });
+  }
+
+  return i18n.translate('xpack.maps.styles.ordinalSuffix', {
+    defaultMessage: 'th',
+  });
+}
+
 export class DynamicColorProperty extends DynamicStyleProperty<ColorDynamicOptions> {
   syncCircleColorWithMb(mbLayerId: string, mbMap: MbMap, alpha: number) {
     const color = this._getMbColor();
@@ -99,6 +130,10 @@ export class DynamicColorProperty extends DynamicStyleProperty<ColorDynamicOptio
     return colors ? colors.length : 0;
   }
 
+  _getSupportedDataMappingFunctions(): DATA_MAPPING_FUNCTION[] {
+    return [DATA_MAPPING_FUNCTION.INTERPOLATE, DATA_MAPPING_FUNCTION.PERCENTILES];
+  }
+
   _getMbColor() {
     if (!this.getFieldName()) {
       return null;
@@ -131,37 +166,60 @@ export class DynamicColorProperty extends DynamicStyleProperty<ColorDynamicOptio
         RGBA_0000, // MB will assign the base value to any features that is below the first stop value
         ...colorStops,
       ];
-    } else {
-      const rangeFieldMeta = this.getRangeFieldMeta();
-      if (!rangeFieldMeta) {
+    }
+
+    if (this.getDataMappingFunction() === DATA_MAPPING_FUNCTION.PERCENTILES) {
+      const percentilesFieldMeta = this.getPercentilesFieldMeta();
+      if (!percentilesFieldMeta || !percentilesFieldMeta.length) {
         return null;
       }
 
-      const colorStops = getOrdinalMbColorRampStops(
+      const colorStops = getPercentilesMbColorRampStops(
         this._options.color ? this._options.color : null,
-        rangeFieldMeta.min,
-        rangeFieldMeta.max
+        percentilesFieldMeta
       );
       if (!colorStops) {
         return null;
       }
 
-      const lessThanFirstStopValue = rangeFieldMeta.min - 1;
+      const lessThanFirstStopValue = percentilesFieldMeta[0].value - 1;
       return [
-        'interpolate',
-        ['linear'],
-        makeMbClampedNumberExpression({
-          minValue: rangeFieldMeta.min,
-          maxValue: rangeFieldMeta.max,
-          lookupFunction: this.getMbLookupFunction(),
-          fallback: lessThanFirstStopValue,
-          fieldName: targetName,
-        }),
-        lessThanFirstStopValue,
+        'step',
+        ['coalesce', [this.getMbLookupFunction(), targetName], lessThanFirstStopValue],
         RGBA_0000,
         ...colorStops,
       ];
     }
+
+    const rangeFieldMeta = this.getRangeFieldMeta();
+    if (!rangeFieldMeta) {
+      return null;
+    }
+
+    const colorStops = getOrdinalMbColorRampStops(
+      this._options.color ? this._options.color : null,
+      rangeFieldMeta.min,
+      rangeFieldMeta.max
+    );
+    if (!colorStops) {
+      return null;
+    }
+
+    const lessThanFirstStopValue = rangeFieldMeta.min - 1;
+    return [
+      'interpolate',
+      ['linear'],
+      makeMbClampedNumberExpression({
+        minValue: rangeFieldMeta.min,
+        maxValue: rangeFieldMeta.max,
+        lookupFunction: this.getMbLookupFunction(),
+        fallback: lessThanFirstStopValue,
+        fieldName: targetName,
+      }),
+      lessThanFirstStopValue,
+      RGBA_0000,
+      ...colorStops,
+    ];
   }
 
   _getColorPaletteStops() {
@@ -242,9 +300,65 @@ export class DynamicColorProperty extends DynamicStyleProperty<ColorDynamicOptio
     return ['match', ['to-string', ['get', this.getFieldName()]], ...mbStops];
   }
 
-  _getColorRampStops() {
+  _getOrdinalBreaks(symbolId?: string): Break[] {
     if (this._options.useCustomColorRamp && this._options.customColorRamp) {
-      return this._options.customColorRamp;
+      return this._options.customColorRamp.map((ordinalColorStop) => {
+        return {
+          color: ordinalColorStop.color,
+          symbolId,
+          label: this.formatField(ordinalColorStop.stop),
+        };
+      });
+    }
+
+    if (this.getDataMappingFunction() === DATA_MAPPING_FUNCTION.PERCENTILES) {
+      const percentilesFieldMeta = this.getPercentilesFieldMeta();
+      if (!percentilesFieldMeta) {
+        return [];
+      }
+      const colorStops = getPercentilesMbColorRampStops(
+        this._options.color ? this._options.color : null,
+        percentilesFieldMeta
+      );
+      if (!colorStops || colorStops.length <= 2) {
+        return [];
+      }
+
+      const breaks = [];
+      const lastStopIndex = colorStops.length - 2;
+      for (let i = 0; i < colorStops.length; i += 2) {
+        const hasNext = i < lastStopIndex;
+        const stopValue = colorStops[i];
+        const formattedStopValue = this.formatField(dynamicRound(stopValue));
+        const color = colorStops[i + 1] as string;
+        const percentile = parseFloat(percentilesFieldMeta[i / 2].percentile);
+        const percentileLabel = `${percentile}${getOrdinalSuffix(percentile)}`;
+
+        let label = '';
+        if (!hasNext) {
+          label = `${GREAT_THAN} ${percentileLabel}: ${formattedStopValue}`;
+        } else {
+          const nextStopValue = colorStops[i + 2];
+          const formattedNextStopValue = this.formatField(dynamicRound(nextStopValue));
+          const nextPercentile = parseFloat(percentilesFieldMeta[i / 2 + 1].percentile);
+          const nextPercentileLabel = `${nextPercentile}${getOrdinalSuffix(nextPercentile)}`;
+
+          if (i === 0) {
+            label = `${UPTO} ${nextPercentileLabel}: ${formattedNextStopValue}`;
+          } else {
+            const begin = `${percentileLabel}: ${formattedStopValue}`;
+            const end = `${nextPercentileLabel}: ${formattedNextStopValue}`;
+            label = `${begin} ${UPTO} ${end}`;
+          }
+        }
+
+        breaks.push({
+          color,
+          label,
+          symbolId,
+        });
+      }
+      return breaks;
     }
 
     if (!this._options.color) {
@@ -263,7 +377,8 @@ export class DynamicColorProperty extends DynamicStyleProperty<ColorDynamicOptio
       return [
         {
           color: colors[colors.length - 1],
-          stop: dynamicRound(rangeFieldMeta.max),
+          label: this.formatField(dynamicRound(rangeFieldMeta.max)),
+          symbolId,
         },
       ];
     }
@@ -272,27 +387,15 @@ export class DynamicColorProperty extends DynamicStyleProperty<ColorDynamicOptio
       const rawStopValue = rangeFieldMeta.min + rangeFieldMeta.delta * (index / colors.length);
       return {
         color,
-        stop: dynamicRound(rawStopValue),
+        label: this.formatField(dynamicRound(rawStopValue)),
+        symbolId,
       };
     });
   }
 
-  _getColorStops() {
-    if (this.isOrdinal()) {
-      return {
-        stops: this._getColorRampStops(),
-        defaultColor: null,
-      };
-    } else if (this.isCategorical()) {
-      return this._getColorPaletteStops();
-    } else {
-      return EMPTY_STOPS;
-    }
-  }
-
-  renderLegendDetailRow({ isPointsOnly, isLinesOnly, symbolId }: LegendProps) {
-    const { stops, defaultColor } = this._getColorStops();
-    const breaks = [];
+  _getCategoricalBreaks(symbolId?: string): Break[] {
+    const breaks: Break[] = [];
+    const { stops, defaultColor } = this._getColorPaletteStops();
     stops.forEach(({ stop, color }: { stop: string | number | null; color: string }) => {
       if (stop !== null) {
         breaks.push({
@@ -309,7 +412,16 @@ export class DynamicColorProperty extends DynamicStyleProperty<ColorDynamicOptio
         symbolId,
       });
     }
+    return breaks;
+  }
 
+  renderLegendDetailRow({ isPointsOnly, isLinesOnly, symbolId }: LegendProps) {
+    let breaks: Break[] = [];
+    if (this.isOrdinal()) {
+      breaks = this._getOrdinalBreaks(symbolId);
+    } else if (this.isCategorical()) {
+      breaks = this._getCategoricalBreaks(symbolId);
+    }
     return (
       <BreakedLegend
         style={this}
diff --git a/x-pack/plugins/maps/public/classes/styles/vector/properties/dynamic_orientation_property.ts b/x-pack/plugins/maps/public/classes/styles/vector/properties/dynamic_orientation_property.ts
index 192fa1f4db6e0..e751fac737b1b 100644
--- a/x-pack/plugins/maps/public/classes/styles/vector/properties/dynamic_orientation_property.ts
+++ b/x-pack/plugins/maps/public/classes/styles/vector/properties/dynamic_orientation_property.ts
@@ -23,6 +23,10 @@ export class DynamicOrientationProperty extends DynamicStyleProperty<Orientation
     }
   }
 
+  supportsFieldMeta() {
+    return false;
+  }
+
   supportsMbFeatureState(): boolean {
     return false;
   }
diff --git a/x-pack/plugins/maps/public/classes/styles/vector/properties/dynamic_style_property.tsx b/x-pack/plugins/maps/public/classes/styles/vector/properties/dynamic_style_property.tsx
index c2cd46f26f990..2f2ddd7d539cf 100644
--- a/x-pack/plugins/maps/public/classes/styles/vector/properties/dynamic_style_property.tsx
+++ b/x-pack/plugins/maps/public/classes/styles/vector/properties/dynamic_style_property.tsx
@@ -11,16 +11,20 @@ import { FeatureIdentifier, Map as MbMap } from 'mapbox-gl';
 import { AbstractStyleProperty, IStyleProperty } from './style_property';
 import { DEFAULT_SIGMA } from '../vector_style_defaults';
 import {
+  DEFAULT_PERCENTILES,
   FIELD_ORIGIN,
   MB_LOOKUP_FUNCTION,
   SOURCE_META_DATA_REQUEST_ID,
+  DATA_MAPPING_FUNCTION,
   STYLE_TYPE,
   VECTOR_STYLES,
   RawValue,
   FieldFormatter,
 } from '../../../../../common/constants';
-import { OrdinalFieldMetaPopover } from '../components/field_meta/ordinal_field_meta_popover';
-import { CategoricalFieldMetaPopover } from '../components/field_meta/categorical_field_meta_popover';
+import {
+  CategoricalDataMappingPopover,
+  OrdinalDataMappingPopover,
+} from '../components/data_mapping';
 import {
   CategoryFieldMeta,
   FieldMetaOptions,
@@ -40,11 +44,14 @@ export interface IDynamicStyleProperty<T> extends IStyleProperty<T> {
   getFieldOrigin(): FIELD_ORIGIN | null;
   getRangeFieldMeta(): RangeFieldMeta | null;
   getCategoryFieldMeta(): CategoryFieldMeta | null;
-  getNumberOfCategories(): number;
+  /*
+   * Returns hash that signals style meta needs to be re-fetched when value changes
+   */
+  getStyleMetaHash(): string;
   isFieldMetaEnabled(): boolean;
   isOrdinal(): boolean;
   supportsFieldMeta(): boolean;
-  getFieldMetaRequest(): Promise<unknown>;
+  getFieldMetaRequest(): Promise<unknown | null>;
   pluckOrdinalStyleMetaFromFeatures(features: Feature[]): RangeFieldMeta | null;
   pluckCategoricalStyleMetaFromFeatures(features: Feature[]): CategoryFieldMeta | null;
   getValueSuggestions(query: string): Promise<string[]>;
@@ -119,6 +126,35 @@ export class DynamicStyleProperty<T>
     return rangeFieldMeta ? rangeFieldMeta : rangeFieldMetaFromLocalFeatures;
   }
 
+  getPercentilesFieldMeta() {
+    if (!this._field) {
+      return null;
+    }
+
+    const dataRequestId = this._getStyleMetaDataRequestId(this.getFieldName());
+    if (!dataRequestId) {
+      return null;
+    }
+
+    const styleMetaDataRequest = this._layer.getDataRequest(dataRequestId);
+    if (!styleMetaDataRequest || !styleMetaDataRequest.hasData()) {
+      return null;
+    }
+
+    const styleMetaData = styleMetaDataRequest.getData() as StyleMetaData;
+    const percentiles = styleMetaData[`${this._field.getRootName()}_percentiles`] as
+      | undefined
+      | { values?: { [key: string]: number } };
+    return percentiles !== undefined && percentiles.values !== undefined
+      ? Object.keys(percentiles.values).map((key) => {
+          return {
+            percentile: key,
+            value: percentiles.values![key],
+          };
+        })
+      : null;
+  }
+
   getCategoryFieldMeta() {
     const style = this._layer.getStyle() as IVectorStyle;
     const styleMeta = style.getStyleMeta();
@@ -168,6 +204,24 @@ export class DynamicStyleProperty<T>
     return 0;
   }
 
+  getStyleMetaHash(): string {
+    const fieldMetaOptions = this.getFieldMetaOptions();
+    const parts: string[] = [fieldMetaOptions.isEnabled.toString()];
+    if (this.isOrdinal()) {
+      const dataMappingFunction = this.getDataMappingFunction();
+      parts.push(dataMappingFunction);
+      if (
+        dataMappingFunction === DATA_MAPPING_FUNCTION.PERCENTILES &&
+        fieldMetaOptions.percentiles
+      ) {
+        parts.push(fieldMetaOptions.percentiles.join(''));
+      }
+    } else if (this.isCategorical()) {
+      parts.push(this.getNumberOfCategories().toString());
+    }
+    return parts.join('');
+  }
+
   isComplete() {
     return !!this._field;
   }
@@ -191,13 +245,21 @@ export class DynamicStyleProperty<T>
     }
 
     if (this.isOrdinal()) {
-      return this._field.getOrdinalFieldMetaRequest();
-    } else if (this.isCategorical()) {
+      return this.getDataMappingFunction() === DATA_MAPPING_FUNCTION.INTERPOLATE
+        ? this._field.getExtendedStatsFieldMetaRequest()
+        : this._field.getPercentilesFieldMetaRequest(
+            this.getFieldMetaOptions().percentiles !== undefined
+              ? this.getFieldMetaOptions().percentiles
+              : DEFAULT_PERCENTILES
+          );
+    }
+
+    if (this.isCategorical()) {
       const numberOfCategories = this.getNumberOfCategories();
       return this._field.getCategoricalFieldMetaRequest(numberOfCategories);
-    } else {
-      return null;
     }
+
+    return null;
   }
 
   supportsMbFeatureState() {
@@ -214,6 +276,12 @@ export class DynamicStyleProperty<T>
     return _.get(this.getOptions(), 'fieldMetaOptions', { isEnabled: true });
   }
 
+  getDataMappingFunction() {
+    return 'dataMappingFunction' in this._options
+      ? (this._options as T & { dataMappingFunction: DATA_MAPPING_FUNCTION }).dataMappingFunction
+      : DATA_MAPPING_FUNCTION.INTERPOLATE;
+  }
+
   pluckOrdinalStyleMetaFromFeatures(features: Feature[]) {
     if (!this.isOrdinal()) {
       return null;
@@ -279,7 +347,7 @@ export class DynamicStyleProperty<T>
       return null;
     }
 
-    const stats = styleMetaData[this._field.getRootName()];
+    const stats = styleMetaData[`${this._field.getRootName()}_range`];
     if (!stats || !('avg' in stats)) {
       return null;
     }
@@ -303,7 +371,7 @@ export class DynamicStyleProperty<T>
       return null;
     }
 
-    const fieldMeta = styleMetaData[this._field.getRootName()];
+    const fieldMeta = styleMetaData[`${this._field.getRootName()}_terms`];
     if (!fieldMeta || !('buckets' in fieldMeta)) {
       return null;
     }
@@ -328,7 +396,11 @@ export class DynamicStyleProperty<T>
     }
   }
 
-  renderFieldMetaPopover(onFieldMetaOptionsChange: (fieldMetaOptions: FieldMetaOptions) => void) {
+  _getSupportedDataMappingFunctions(): DATA_MAPPING_FUNCTION[] {
+    return [DATA_MAPPING_FUNCTION.INTERPOLATE];
+  }
+
+  renderDataMappingPopover(onChange: (updatedOptions: Partial<T>) => void) {
     if (!this.supportsFieldMeta()) {
       return null;
     }
@@ -336,17 +408,19 @@ export class DynamicStyleProperty<T>
     const switchDisabled = !!this._field && !this._field.canReadFromGeoJson();
 
     return this.isCategorical() ? (
-      <CategoricalFieldMetaPopover
+      <CategoricalDataMappingPopover<T>
         fieldMetaOptions={this.getFieldMetaOptions()}
-        onChange={onFieldMetaOptionsChange}
+        onChange={onChange}
         switchDisabled={switchDisabled}
       />
     ) : (
-      <OrdinalFieldMetaPopover
+      <OrdinalDataMappingPopover<T>
         fieldMetaOptions={this.getFieldMetaOptions()}
         styleName={this.getStyleName()}
-        onChange={onFieldMetaOptionsChange}
+        onChange={onChange}
         switchDisabled={switchDisabled}
+        dataMappingFunction={this.getDataMappingFunction()}
+        supportedDataMappingFunctions={this._getSupportedDataMappingFunctions()}
       />
     );
   }
diff --git a/x-pack/plugins/maps/public/classes/styles/vector/properties/style_property.ts b/x-pack/plugins/maps/public/classes/styles/vector/properties/style_property.ts
index 20e0bb5465561..d97ae152f3aed 100644
--- a/x-pack/plugins/maps/public/classes/styles/vector/properties/style_property.ts
+++ b/x-pack/plugins/maps/public/classes/styles/vector/properties/style_property.ts
@@ -8,7 +8,6 @@
 import { ReactElement } from 'react';
 // @ts-ignore
 import { getVectorStyleLabel } from '../components/get_vector_style_label';
-import { FieldMetaOptions } from '../../../../../common/descriptor_types';
 import { RawValue, VECTOR_STYLES } from '../../../../../common/constants';
 
 export type LegendProps = {
@@ -24,8 +23,8 @@ export interface IStyleProperty<T> {
   getStyleName(): VECTOR_STYLES;
   getOptions(): T;
   renderLegendDetailRow(legendProps: LegendProps): ReactElement<any> | null;
-  renderFieldMetaPopover(
-    onFieldMetaOptionsChange: (fieldMetaOptions: FieldMetaOptions) => void
+  renderDataMappingPopover(
+    onChange: (updatedOptions: Partial<T>) => void
   ): ReactElement<any> | null;
   getDisplayStyleName(): string;
 }
@@ -75,8 +74,8 @@ export class AbstractStyleProperty<T> implements IStyleProperty<T> {
     return null;
   }
 
-  renderFieldMetaPopover(
-    onFieldMetaOptionsChange: (fieldMetaOptions: FieldMetaOptions) => void
+  renderDataMappingPopover(
+    onChange: (updatedOptions: Partial<T>) => void
   ): ReactElement<any> | null {
     return null;
   }
diff --git a/x-pack/plugins/ml/public/application/jobs/jobs_list/components/create_watch_flyout/email.html b/x-pack/plugins/ml/public/application/jobs/jobs_list/components/create_watch_flyout/email.html
index 7c70999759681..5ce7d9f81f367 100644
--- a/x-pack/plugins/ml/public/application/jobs/jobs_list/components/create_watch_flyout/email.html
+++ b/x-pack/plugins/ml/public/application/jobs/jobs_list/components/create_watch_flyout/email.html
@@ -22,7 +22,7 @@
     <br />
     <br />
 
-    <a href="<%= serverAddress %>#/explorer/?_g=(ml:(jobIds:!('{{ctx.payload.aggregations.bucket_results.top_bucket_hits.hits.hits.0._source.job_id}}')),refreshInterval:(display:Off,pause:!f,value:0),time:(from:'{{ctx.payload.aggregations.bucket_results.top_bucket_hits.hits.hits.0.fields.start.0}}',mode:absolute,to:'{{ctx.payload.aggregations.bucket_results.top_bucket_hits.hits.hits.0.fields.end.0}}'))&_a=(filters:!(),mlAnomaliesTable:(intervalValue:auto,thresholdValue:0),mlExplorerSwimlane:(selectedLane:Overall,selectedTime:{{ctx.payload.aggregations.bucket_results.top_bucket_hits.hits.hits.0.fields.timestamp_epoch.0}},selectedType:overall),query:(query_string:(analyze_wildcard:!t,query:'*')))">
+    <a href="<%= serverAddress %>#/explorer/?_g=(ml:(jobIds:!('{{ctx.payload.aggregations.bucket_results.top_bucket_hits.hits.hits.0._source.job_id}}')),time:(from:'{{ctx.payload.aggregations.bucket_results.top_bucket_hits.hits.hits.0.fields.start.0}}',mode:absolute,to:'{{ctx.payload.aggregations.bucket_results.top_bucket_hits.hits.hits.0.fields.end.0}}'))&_a=(filters:!(),mlAnomaliesTable:(intervalValue:auto,thresholdValue:0),mlExplorerSwimlane:(selectedLane:Overall,selectedTime:{{ctx.payload.aggregations.bucket_results.top_bucket_hits.hits.hits.0.fields.timestamp_epoch.0}},selectedType:overall),query:(query_string:(analyze_wildcard:!t,query:'*')))">
       <%= openInAnomalyExplorerLinkText %>
     </a>
     <br />
diff --git a/x-pack/plugins/monitoring/common/types/alerts.ts b/x-pack/plugins/monitoring/common/types/alerts.ts
index f7a27a1b1a2b0..0daa947b1c82a 100644
--- a/x-pack/plugins/monitoring/common/types/alerts.ts
+++ b/x-pack/plugins/monitoring/common/types/alerts.ts
@@ -4,22 +4,12 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 
-import { Alert } from '../../../alerts/common';
+import { Alert, SanitizedAlert } from '../../../alerts/common';
 import { AlertParamType, AlertMessageTokenType, AlertSeverity } from '../enums';
 
-export interface CommonBaseAlert {
-  type: string;
-  label: string;
-  paramDetails: CommonAlertParamDetails;
-  rawAlert: Alert;
-  isLegacy: boolean;
-}
-
 export interface CommonAlertStatus {
-  exists: boolean;
-  enabled: boolean;
   states: CommonAlertState[];
-  alert: CommonBaseAlert;
+  rawAlert: Alert | SanitizedAlert;
 }
 
 export interface CommonAlertState {
@@ -32,14 +22,6 @@ export interface CommonAlertFilter {
   nodeUuid?: string;
 }
 
-export interface CommonAlertNodeUuidFilter extends CommonAlertFilter {
-  nodeUuid: string;
-}
-
-export interface CommonAlertStackProductFilter extends CommonAlertFilter {
-  stackProduct: string;
-}
-
 export interface CommonAlertParamDetail {
   label: string;
   type?: AlertParamType;
@@ -50,7 +32,9 @@ export interface CommonAlertParamDetails {
 }
 
 export interface CommonAlertParams {
-  [name: string]: string | number;
+  duration: string;
+  threshold?: number;
+  limit?: string;
 }
 
 export interface ThreadPoolRejectionsAlertParams {
@@ -65,7 +49,11 @@ export interface AlertEnableAction {
 
 export interface AlertInstanceState {
   alertStates: Array<
-    AlertState | AlertCpuUsageState | AlertDiskUsageState | AlertThreadPoolRejectionsState
+    | AlertState
+    | AlertCpuUsageState
+    | AlertDiskUsageState
+    | AlertThreadPoolRejectionsState
+    | AlertNodeState
   >;
   [x: string]: unknown;
 }
@@ -74,11 +62,13 @@ export interface AlertState {
   cluster: AlertCluster;
   ccs?: string;
   ui: AlertUiState;
+  [key: string]: unknown;
 }
 
 export interface AlertNodeState extends AlertState {
   nodeId: string;
   nodeName?: string;
+  [key: string]: unknown;
 }
 
 export interface AlertCpuUsageState extends AlertNodeState {
@@ -89,13 +79,6 @@ export interface AlertDiskUsageState extends AlertNodeState {
   diskUsage: number;
 }
 
-export interface AlertMissingDataState extends AlertState {
-  stackProduct: string;
-  stackProductUuid: string;
-  stackProductName: string;
-  gapDuration: number;
-}
-
 export interface AlertMemoryUsageState extends AlertNodeState {
   memoryUsage: number;
 }
@@ -109,9 +92,9 @@ export interface AlertThreadPoolRejectionsState extends AlertState {
 
 export interface AlertUiState {
   isFiring: boolean;
+  resolvedMS?: number;
   severity: AlertSeverity;
   message: AlertMessage | null;
-  resolvedMS: number;
   lastCheckedMS: number;
   triggeredMS: number;
 }
@@ -177,17 +160,13 @@ export interface AlertMemoryUsageNodeStats extends AlertNodeStats {
   memoryUsage: number;
 }
 
-export interface AlertMissingData {
-  stackProduct: string;
-  stackProductUuid: string;
-  stackProductName: string;
-  clusterUuid: string;
+export interface AlertMissingData extends AlertNodeStats {
   gapDuration: number;
-  ccs?: string;
 }
 
 export interface AlertData {
-  instanceKey: string;
+  nodeName?: string;
+  nodeId?: string;
   clusterUuid: string;
   ccs?: string;
   shouldFire?: boolean;
diff --git a/x-pack/plugins/monitoring/public/alerts/badge.tsx b/x-pack/plugins/monitoring/public/alerts/badge.tsx
index 5087fe7b70c06..b9e39e43ff73d 100644
--- a/x-pack/plugins/monitoring/public/alerts/badge.tsx
+++ b/x-pack/plugins/monitoring/public/alerts/badge.tsx
@@ -18,7 +18,7 @@ import { CommonAlertStatus, CommonAlertState } from '../../common/types/alerts';
 import { AlertSeverity } from '../../common/enums';
 // @ts-ignore
 import { formatDateTimeLocal } from '../../common/formatting';
-import { AlertMessage, AlertState } from '../../common/types/alerts';
+import { AlertState } from '../../common/types/alerts';
 import { AlertPanel } from './panel';
 import { Legacy } from '../legacy_shims';
 import { isInSetupMode } from '../lib/setup_mode';
@@ -40,13 +40,12 @@ interface AlertInPanel {
 interface Props {
   alerts: { [alertTypeId: string]: CommonAlertStatus };
   stateFilter: (state: AlertState) => boolean;
-  nextStepsFilter: (nextStep: AlertMessage) => boolean;
 }
 export const AlertsBadge: React.FC<Props> = (props: Props) => {
-  const { stateFilter = () => true, nextStepsFilter = () => true } = props;
+  const { stateFilter = () => true } = props;
   const [showPopover, setShowPopover] = React.useState<AlertSeverity | boolean | null>(null);
   const inSetupMode = isInSetupMode(React.useContext(SetupModeContext));
-  const alerts = Object.values(props.alerts).filter(Boolean);
+  const alerts = Object.values(props.alerts).filter((alertItem) => Boolean(alertItem?.rawAlert));
 
   if (alerts.length === 0) {
     return null;
@@ -70,9 +69,9 @@ export const AlertsBadge: React.FC<Props> = (props: Props) => {
         title: i18n.translate('xpack.monitoring.alerts.badge.panelTitle', {
           defaultMessage: 'Alerts',
         }),
-        items: alerts.map(({ alert }, index) => {
+        items: alerts.map(({ rawAlert }, index) => {
           return {
-            name: <EuiText>{alert.label}</EuiText>,
+            name: <EuiText>{rawAlert.name}</EuiText>,
             panel: index + 1,
           };
         }),
@@ -80,9 +79,9 @@ export const AlertsBadge: React.FC<Props> = (props: Props) => {
       ...alerts.map((alertStatus, index) => {
         return {
           id: index + 1,
-          title: alertStatus.alert.label,
+          title: alertStatus.rawAlert.name,
           width: 400,
-          content: <AlertPanel alert={alertStatus} nextStepsFilter={nextStepsFilter} />,
+          content: <AlertPanel alert={alertStatus} />,
         };
       }),
     ];
@@ -147,7 +146,7 @@ export const AlertsBadge: React.FC<Props> = (props: Props) => {
                   <EuiText size="s">
                     <h4>{getDateFromState(alertState)}</h4>
                   </EuiText>
-                  <EuiText>{alert.alert.label}</EuiText>
+                  <EuiText>{alert.rawAlert.name}</EuiText>
                 </Fragment>
               ),
               panel: index + 1,
@@ -159,13 +158,7 @@ export const AlertsBadge: React.FC<Props> = (props: Props) => {
             id: index + 1,
             title: getDateFromState(alertStatus.alertState),
             width: 400,
-            content: (
-              <AlertPanel
-                alert={alertStatus.alert}
-                alertState={alertStatus.alertState}
-                nextStepsFilter={nextStepsFilter}
-              />
-            ),
+            content: <AlertPanel alert={alertStatus.alert} alertState={alertStatus.alertState} />,
           };
         }),
       ];
diff --git a/x-pack/plugins/monitoring/public/alerts/callout.tsx b/x-pack/plugins/monitoring/public/alerts/callout.tsx
index 769d4dc7b256d..2f670ac221bf2 100644
--- a/x-pack/plugins/monitoring/public/alerts/callout.tsx
+++ b/x-pack/plugins/monitoring/public/alerts/callout.tsx
@@ -32,10 +32,9 @@ const TYPES = [
 interface Props {
   alerts: { [alertTypeId: string]: CommonAlertStatus };
   stateFilter: (state: AlertState) => boolean;
-  nextStepsFilter: (nextStep: AlertMessage) => boolean;
 }
 export const AlertsCallout: React.FC<Props> = (props: Props) => {
-  const { alerts, stateFilter = () => true, nextStepsFilter = () => true } = props;
+  const { alerts, stateFilter = () => true } = props;
 
   const callouts = TYPES.map((type) => {
     const list = [];
@@ -57,11 +56,11 @@ export const AlertsCallout: React.FC<Props> = (props: Props) => {
                 const nextStepsUi =
                   state.ui.message.nextSteps && state.ui.message.nextSteps.length ? (
                     <ul>
-                      {state.ui.message.nextSteps
-                        .filter(nextStepsFilter)
-                        .map((step: AlertMessage, nextStepIndex: number) => (
+                      {state.ui.message.nextSteps.map(
+                        (step: AlertMessage, nextStepIndex: number) => (
                           <li key={nextStepIndex}>{replaceTokens(step)}</li>
-                        ))}
+                        )
+                      )}
                     </ul>
                   ) : null;
 
diff --git a/x-pack/plugins/monitoring/public/alerts/filter_alert_states.ts b/x-pack/plugins/monitoring/public/alerts/filter_alert_states.ts
deleted file mode 100644
index e13ea7de0e226..0000000000000
--- a/x-pack/plugins/monitoring/public/alerts/filter_alert_states.ts
+++ /dev/null
@@ -1,23 +0,0 @@
-/*
- * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
- * or more contributor license agreements. Licensed under the Elastic License;
- * you may not use this file except in compliance with the Elastic License.
- */
-
-import { CommonAlertState, CommonAlertStatus } from '../../common/types/alerts';
-
-export function filterAlertStates(
-  alerts: { [type: string]: CommonAlertStatus },
-  filter: (type: string, state: CommonAlertState) => boolean
-) {
-  return Object.keys(alerts).reduce(
-    (accum: { [type: string]: CommonAlertStatus }, type: string) => {
-      accum[type] = {
-        ...alerts[type],
-        states: alerts[type].states.filter((state) => filter(type, state)),
-      };
-      return accum;
-    },
-    {}
-  );
-}
diff --git a/x-pack/plugins/monitoring/public/alerts/panel.tsx b/x-pack/plugins/monitoring/public/alerts/panel.tsx
index fd09a3f9a6275..b480e46215108 100644
--- a/x-pack/plugins/monitoring/public/alerts/panel.tsx
+++ b/x-pack/plugins/monitoring/public/alerts/panel.tsx
@@ -28,17 +28,16 @@ import { SetupModeContext } from '../components/setup_mode/setup_mode_context';
 interface Props {
   alert: CommonAlertStatus;
   alertState?: CommonAlertState;
-  nextStepsFilter: (nextStep: AlertMessage) => boolean;
 }
 export const AlertPanel: React.FC<Props> = (props: Props) => {
   const {
-    alert: { alert },
+    alert: { rawAlert },
     alertState,
-    nextStepsFilter = () => true,
   } = props;
+
   const [showFlyout, setShowFlyout] = React.useState(false);
-  const [isEnabled, setIsEnabled] = React.useState(alert.rawAlert.enabled);
-  const [isMuted, setIsMuted] = React.useState(alert.rawAlert.muteAll);
+  const [isEnabled, setIsEnabled] = React.useState(rawAlert?.enabled);
+  const [isMuted, setIsMuted] = React.useState(rawAlert?.muteAll);
   const [isSaving, setIsSaving] = React.useState(false);
   const inSetupMode = isInSetupMode(React.useContext(SetupModeContext));
 
@@ -46,7 +45,7 @@ export const AlertPanel: React.FC<Props> = (props: Props) => {
     () =>
       showFlyout &&
       Legacy.shims.triggersActionsUi.getEditAlertFlyout({
-        initialAlert: alert.rawAlert,
+        initialAlert: rawAlert,
         onClose: () => {
           setShowFlyout(false);
           showBottomBar();
@@ -56,14 +55,14 @@ export const AlertPanel: React.FC<Props> = (props: Props) => {
     [showFlyout]
   );
 
-  if (!alert.rawAlert) {
+  if (!rawAlert) {
     return null;
   }
 
   async function disableAlert() {
     setIsSaving(true);
     try {
-      await Legacy.shims.http.post(`${BASE_ALERT_API_PATH}/alert/${alert.rawAlert.id}/_disable`);
+      await Legacy.shims.http.post(`${BASE_ALERT_API_PATH}/alert/${rawAlert.id}/_disable`);
     } catch (err) {
       Legacy.shims.toastNotifications.addDanger({
         title: i18n.translate('xpack.monitoring.alerts.panel.disableAlert.errorTitle', {
@@ -77,7 +76,7 @@ export const AlertPanel: React.FC<Props> = (props: Props) => {
   async function enableAlert() {
     setIsSaving(true);
     try {
-      await Legacy.shims.http.post(`${BASE_ALERT_API_PATH}/alert/${alert.rawAlert.id}/_enable`);
+      await Legacy.shims.http.post(`${BASE_ALERT_API_PATH}/alert/${rawAlert.id}/_enable`);
     } catch (err) {
       Legacy.shims.toastNotifications.addDanger({
         title: i18n.translate('xpack.monitoring.alerts.panel.enableAlert.errorTitle', {
@@ -91,7 +90,7 @@ export const AlertPanel: React.FC<Props> = (props: Props) => {
   async function muteAlert() {
     setIsSaving(true);
     try {
-      await Legacy.shims.http.post(`${BASE_ALERT_API_PATH}/alert/${alert.rawAlert.id}/_mute_all`);
+      await Legacy.shims.http.post(`${BASE_ALERT_API_PATH}/alert/${rawAlert.id}/_mute_all`);
     } catch (err) {
       Legacy.shims.toastNotifications.addDanger({
         title: i18n.translate('xpack.monitoring.alerts.panel.muteAlert.errorTitle', {
@@ -105,7 +104,7 @@ export const AlertPanel: React.FC<Props> = (props: Props) => {
   async function unmuteAlert() {
     setIsSaving(true);
     try {
-      await Legacy.shims.http.post(`${BASE_ALERT_API_PATH}/alert/${alert.rawAlert.id}/_unmute_all`);
+      await Legacy.shims.http.post(`${BASE_ALERT_API_PATH}/alert/${rawAlert.id}/_unmute_all`);
     } catch (err) {
       Legacy.shims.toastNotifications.addDanger({
         title: i18n.translate('xpack.monitoring.alerts.panel.ummuteAlert.errorTitle', {
@@ -189,11 +188,9 @@ export const AlertPanel: React.FC<Props> = (props: Props) => {
   const nextStepsUi =
     alertState.state.ui.message.nextSteps && alertState.state.ui.message.nextSteps.length ? (
       <EuiListGroup>
-        {alertState.state.ui.message.nextSteps
-          .filter(nextStepsFilter)
-          .map((step: AlertMessage, index: number) => (
-            <EuiListGroupItem size="s" key={index} label={replaceTokens(step)} />
-          ))}
+        {alertState.state.ui.message.nextSteps.map((step: AlertMessage, index: number) => (
+          <EuiListGroupItem size="s" key={index} label={replaceTokens(step)} />
+        ))}
       </EuiListGroup>
     ) : null;
 
diff --git a/x-pack/plugins/monitoring/public/alerts/status.tsx b/x-pack/plugins/monitoring/public/alerts/status.tsx
index 53918807a4272..4d51069efb972 100644
--- a/x-pack/plugins/monitoring/public/alerts/status.tsx
+++ b/x-pack/plugins/monitoring/public/alerts/status.tsx
@@ -7,7 +7,7 @@ import React from 'react';
 import { EuiToolTip, EuiHealth } from '@elastic/eui';
 import { FormattedMessage } from '@kbn/i18n/react';
 import { i18n } from '@kbn/i18n';
-import { CommonAlertStatus, AlertMessage, AlertState } from '../../common/types/alerts';
+import { CommonAlertStatus, AlertState } from '../../common/types/alerts';
 import { AlertSeverity } from '../../common/enums';
 import { AlertsBadge } from './badge';
 import { isInSetupMode } from '../lib/setup_mode';
@@ -18,16 +18,9 @@ interface Props {
   showBadge: boolean;
   showOnlyCount: boolean;
   stateFilter: (state: AlertState) => boolean;
-  nextStepsFilter: (nextStep: AlertMessage) => boolean;
 }
 export const AlertsStatus: React.FC<Props> = (props: Props) => {
-  const {
-    alerts,
-    showBadge = false,
-    showOnlyCount = false,
-    stateFilter = () => true,
-    nextStepsFilter = () => true,
-  } = props;
+  const { alerts, showBadge = false, showOnlyCount = false, stateFilter = () => true } = props;
   const inSetupMode = isInSetupMode(React.useContext(SetupModeContext));
 
   if (!alerts) {
@@ -78,9 +71,7 @@ export const AlertsStatus: React.FC<Props> = (props: Props) => {
   }
 
   if (showBadge || inSetupMode) {
-    return (
-      <AlertsBadge alerts={alerts} stateFilter={stateFilter} nextStepsFilter={nextStepsFilter} />
-    );
+    return <AlertsBadge alerts={alerts} stateFilter={stateFilter} />;
   }
 
   const severity = atLeastOneDanger ? AlertSeverity.Danger : AlertSeverity.Warning;
diff --git a/x-pack/plugins/monitoring/public/alerts/thread_pool_rejections_alert/index.tsx b/x-pack/plugins/monitoring/public/alerts/thread_pool_rejections_alert/index.tsx
index 0347cc43f2b44..bd0e7f89bf535 100644
--- a/x-pack/plugins/monitoring/public/alerts/thread_pool_rejections_alert/index.tsx
+++ b/x-pack/plugins/monitoring/public/alerts/thread_pool_rejections_alert/index.tsx
@@ -23,11 +23,11 @@ interface ThreadPoolRejectionAlertDetails {
 }
 
 export function createThreadPoolRejectionsAlertType(
-  alertType: string,
+  alertId: string,
   threadPoolAlertDetails: ThreadPoolRejectionAlertDetails
 ): AlertTypeModel {
   return {
-    id: alertType,
+    id: alertId,
     name: threadPoolAlertDetails.label,
     description: threadPoolAlertDetails.description,
     iconClass: 'bell',
diff --git a/x-pack/plugins/monitoring/public/components/apm/instance/instance.js b/x-pack/plugins/monitoring/public/components/apm/instance/instance.js
index 8934bbc41f5f6..eec24e741ac41 100644
--- a/x-pack/plugins/monitoring/public/components/apm/instance/instance.js
+++ b/x-pack/plugins/monitoring/public/components/apm/instance/instance.js
@@ -18,9 +18,8 @@ import {
 } from '@elastic/eui';
 import { Status } from './status';
 import { FormattedMessage } from '@kbn/i18n/react';
-import { AlertsCallout } from '../../../alerts/callout';
 
-export function ApmServerInstance({ summary, metrics, alerts, ...props }) {
+export function ApmServerInstance({ summary, metrics, ...props }) {
   const seriesToShow = [
     metrics.apm_requests,
     metrics.apm_responses_valid,
@@ -59,18 +58,9 @@ export function ApmServerInstance({ summary, metrics, alerts, ...props }) {
           </h1>
         </EuiScreenReaderOnly>
         <EuiPanel>
-          <Status stats={summary} alerts={alerts} />
+          <Status stats={summary} />
         </EuiPanel>
         <EuiSpacer size="m" />
-        <AlertsCallout
-          alerts={alerts}
-          nextStepsFilter={(nextStep) => {
-            if (nextStep.text.includes('APM servers')) {
-              return false;
-            }
-            return true;
-          }}
-        />
         <EuiPageContent>
           <EuiFlexGroup wrap>{charts}</EuiFlexGroup>
         </EuiPageContent>
diff --git a/x-pack/plugins/monitoring/public/components/apm/instances/instances.js b/x-pack/plugins/monitoring/public/components/apm/instances/instances.js
index 4932fb9068fcc..7d9db99cc30fb 100644
--- a/x-pack/plugins/monitoring/public/components/apm/instances/instances.js
+++ b/x-pack/plugins/monitoring/public/components/apm/instances/instances.js
@@ -28,7 +28,6 @@ import { SetupModeBadge } from '../../setup_mode/badge';
 import { FormattedMessage } from '@kbn/i18n/react';
 import { isSetupModeFeatureEnabled } from '../../../lib/setup_mode';
 import { SetupModeFeature } from '../../../../common/enums';
-import { AlertsStatus } from '../../../alerts/status';
 
 function getColumns(alerts, setupMode) {
   return [
@@ -72,29 +71,6 @@ function getColumns(alerts, setupMode) {
         );
       },
     },
-    {
-      name: i18n.translate('xpack.monitoring.beats.instances.alertsColumnTitle', {
-        defaultMessage: 'Alerts',
-      }),
-      field: 'alerts',
-      width: '175px',
-      sortable: true,
-      render: (_field, beat) => {
-        return (
-          <AlertsStatus
-            showBadge={true}
-            alerts={alerts}
-            stateFilter={(state) => state.stackProductUuid === beat.uuid}
-            nextStepsFilter={(nextStep) => {
-              if (nextStep.text.includes('APM servers')) {
-                return false;
-              }
-              return true;
-            }}
-          />
-        );
-      },
-    },
     {
       name: i18n.translate('xpack.monitoring.apm.instances.outputEnabledTitle', {
         defaultMessage: 'Output Enabled',
diff --git a/x-pack/plugins/monitoring/public/components/beats/beat/beat.js b/x-pack/plugins/monitoring/public/components/beats/beat/beat.js
index 470cdf588ca3d..cbdc305e5ed75 100644
--- a/x-pack/plugins/monitoring/public/components/beats/beat/beat.js
+++ b/x-pack/plugins/monitoring/public/components/beats/beat/beat.js
@@ -20,9 +20,8 @@ import {
 import { i18n } from '@kbn/i18n';
 import { SummaryStatus } from '../../summary_status';
 import { FormattedMessage } from '@kbn/i18n/react';
-import { AlertsCallout } from '../../../alerts/callout';
 
-export function Beat({ summary, metrics, alerts, ...props }) {
+export function Beat({ summary, metrics, ...props }) {
   const metricsToShow = [
     metrics.beat_event_rates,
     metrics.beat_fail_rates,
@@ -135,26 +134,12 @@ export function Beat({ summary, metrics, alerts, ...props }) {
     <EuiPage>
       <EuiPageBody>
         <EuiPanel>
-          <SummaryStatus
-            metrics={summarytStatsTop}
-            alerts={alerts}
-            data-test-subj="beatSummaryStatus01"
-          />
+          <SummaryStatus metrics={summarytStatsTop} data-test-subj="beatSummaryStatus01" />
         </EuiPanel>
         <EuiSpacer size="m" />
         <EuiPanel>
           <SummaryStatus metrics={summarytStatsBot} data-test-subj="beatSummaryStatus02" />
         </EuiPanel>
-        <EuiSpacer size="m" />
-        <AlertsCallout
-          alerts={alerts}
-          nextStepsFilter={(nextStep) => {
-            if (nextStep.text.includes('Beat instances')) {
-              return false;
-            }
-            return true;
-          }}
-        />
         <EuiPageContent>
           <EuiScreenReaderOnly>
             <h1>
diff --git a/x-pack/plugins/monitoring/public/components/beats/listing/listing.js b/x-pack/plugins/monitoring/public/components/beats/listing/listing.js
index dc65cd38aac53..60a35e00a4c63 100644
--- a/x-pack/plugins/monitoring/public/components/beats/listing/listing.js
+++ b/x-pack/plugins/monitoring/public/components/beats/listing/listing.js
@@ -26,12 +26,10 @@ import { SetupModeBadge } from '../../setup_mode/badge';
 import { FormattedMessage } from '@kbn/i18n/react';
 import { isSetupModeFeatureEnabled } from '../../../lib/setup_mode';
 import { SetupModeFeature } from '../../../../common/enums';
-import { AlertsStatus } from '../../../alerts/status';
 
 export class Listing extends PureComponent {
   getColumns() {
     const setupMode = this.props.setupMode;
-    const alerts = this.props.alerts;
 
     return [
       {
@@ -74,29 +72,6 @@ export class Listing extends PureComponent {
           );
         },
       },
-      {
-        name: i18n.translate('xpack.monitoring.beats.instances.alertsColumnTitle', {
-          defaultMessage: 'Alerts',
-        }),
-        field: 'alerts',
-        width: '175px',
-        sortable: true,
-        render: (_field, beat) => {
-          return (
-            <AlertsStatus
-              showBadge={true}
-              alerts={alerts}
-              stateFilter={(state) => state.stackProductUuid === beat.uuid}
-              nextStepsFilter={(nextStep) => {
-                if (nextStep.text.includes('Beat instances')) {
-                  return false;
-                }
-                return true;
-              }}
-            />
-          );
-        },
-      },
       {
         name: i18n.translate('xpack.monitoring.beats.instances.typeTitle', {
           defaultMessage: 'Type',
@@ -147,7 +122,7 @@ export class Listing extends PureComponent {
   }
 
   render() {
-    const { stats, data, sorting, pagination, onTableChange, setupMode, alerts } = this.props;
+    const { stats, data, sorting, pagination, onTableChange, setupMode } = this.props;
 
     let setupModeCallOut = null;
     if (isSetupModeFeatureEnabled(SetupModeFeature.MetricbeatMigration)) {
@@ -180,7 +155,7 @@ export class Listing extends PureComponent {
             </h1>
           </EuiScreenReaderOnly>
           <EuiPanel>
-            <Stats stats={stats} alerts={alerts} />
+            <Stats stats={stats} />
           </EuiPanel>
           <EuiSpacer size="m" />
           <EuiPageContent>
diff --git a/x-pack/plugins/monitoring/public/components/cluster/overview/apm_panel.js b/x-pack/plugins/monitoring/public/components/cluster/overview/apm_panel.js
index 97ef3ada2948c..e6d6b31a0b7fc 100644
--- a/x-pack/plugins/monitoring/public/components/cluster/overview/apm_panel.js
+++ b/x-pack/plugins/monitoring/public/components/cluster/overview/apm_panel.js
@@ -24,24 +24,14 @@ import {
   EuiFlexGroup,
 } from '@elastic/eui';
 import { formatTimestampToDuration } from '../../../../common';
-import {
-  CALCULATE_DURATION_SINCE,
-  APM_SYSTEM_ID,
-  ALERT_MISSING_MONITORING_DATA,
-} from '../../../../common/constants';
+import { CALCULATE_DURATION_SINCE, APM_SYSTEM_ID } from '../../../../common/constants';
 import { SetupModeTooltip } from '../../setup_mode/tooltip';
 import { getSafeForExternalLink } from '../../../lib/get_safe_for_external_link';
 import { isSetupModeFeatureEnabled } from '../../../lib/setup_mode';
 import { SetupModeFeature } from '../../../../common/enums';
-import { shouldShowAlertBadge } from '../../../alerts/lib/should_show_alert_badge';
-import { AlertsBadge } from '../../../alerts/badge';
-import { SetupModeContext } from '../../setup_mode/setup_mode_context';
-
-const SERVERS_PANEL_ALERTS = [ALERT_MISSING_MONITORING_DATA];
 
 export function ApmPanel(props) {
-  const { setupMode, alerts } = props;
-  const setupModeContext = React.useContext(SetupModeContext);
+  const { setupMode } = props;
   const apmsTotal = get(props, 'apms.total') || 0;
   // Do not show if we are not in setup mode
   if (apmsTotal === 0 && !setupMode.enabled) {
@@ -60,16 +50,6 @@ export function ApmPanel(props) {
     />
   ) : null;
 
-  let apmServersAlertStatus = null;
-  if (shouldShowAlertBadge(alerts, SERVERS_PANEL_ALERTS, setupModeContext)) {
-    const alertsList = SERVERS_PANEL_ALERTS.map((alertType) => alerts[alertType]);
-    apmServersAlertStatus = (
-      <EuiFlexItem grow={false}>
-        <AlertsBadge alerts={alertsList} />
-      </EuiFlexItem>
-    );
-  }
-
   return (
     <ClusterItemContainer
       {...props}
@@ -163,7 +143,6 @@ export function ApmPanel(props) {
               <EuiFlexItem grow={false}>
                 <EuiFlexGroup gutterSize="s" alignItems="center">
                   {setupModeMetricbeatMigrationTooltip}
-                  {apmServersAlertStatus}
                 </EuiFlexGroup>
               </EuiFlexItem>
             </EuiFlexGroup>
diff --git a/x-pack/plugins/monitoring/public/components/cluster/overview/beats_panel.js b/x-pack/plugins/monitoring/public/components/cluster/overview/beats_panel.js
index ab648097f151a..b4811840f6627 100644
--- a/x-pack/plugins/monitoring/public/components/cluster/overview/beats_panel.js
+++ b/x-pack/plugins/monitoring/public/components/cluster/overview/beats_panel.js
@@ -23,19 +23,13 @@ import { ClusterItemContainer, DisabledIfNoDataAndInSetupModeLink } from './help
 import { FormattedMessage } from '@kbn/i18n/react';
 import { i18n } from '@kbn/i18n';
 import { SetupModeTooltip } from '../../setup_mode/tooltip';
-import { ALERT_MISSING_MONITORING_DATA, BEATS_SYSTEM_ID } from '../../../../common/constants';
+import { BEATS_SYSTEM_ID } from '../../../../common/constants';
 import { getSafeForExternalLink } from '../../../lib/get_safe_for_external_link';
 import { isSetupModeFeatureEnabled } from '../../../lib/setup_mode';
 import { SetupModeFeature } from '../../../../common/enums';
-import { shouldShowAlertBadge } from '../../../alerts/lib/should_show_alert_badge';
-import { AlertsBadge } from '../../../alerts/badge';
-import { SetupModeContext } from '../../setup_mode/setup_mode_context';
-
-const BEATS_PANEL_ALERTS = [ALERT_MISSING_MONITORING_DATA];
 
 export function BeatsPanel(props) {
-  const { setupMode, alerts } = props;
-  const setupModeContext = React.useContext(SetupModeContext);
+  const { setupMode } = props;
   const beatsTotal = get(props, 'beats.total') || 0;
   // Do not show if we are not in setup mode
   if (beatsTotal === 0 && !setupMode.enabled) {
@@ -53,16 +47,6 @@ export function BeatsPanel(props) {
     />
   ) : null;
 
-  let beatsAlertsStatus = null;
-  if (shouldShowAlertBadge(alerts, BEATS_PANEL_ALERTS, setupModeContext)) {
-    const alertsList = BEATS_PANEL_ALERTS.map((alertType) => alerts[alertType]);
-    beatsAlertsStatus = (
-      <EuiFlexItem grow={false}>
-        <AlertsBadge alerts={alertsList} />
-      </EuiFlexItem>
-    );
-  }
-
   const beatTypes = props.beats.types.map((beat, index) => {
     return [
       <EuiDescriptionListTitle
@@ -164,7 +148,6 @@ export function BeatsPanel(props) {
               <EuiFlexItem grow={false}>
                 <EuiFlexGroup gutterSize="s" alignItems="center">
                   {setupModeMetricbeatMigrationTooltip}
-                  {beatsAlertsStatus}
                 </EuiFlexGroup>
               </EuiFlexItem>
             </EuiFlexGroup>
diff --git a/x-pack/plugins/monitoring/public/components/cluster/overview/index.js b/x-pack/plugins/monitoring/public/components/cluster/overview/index.js
index aebd1cee5f0be..c298326818ab5 100644
--- a/x-pack/plugins/monitoring/public/components/cluster/overview/index.js
+++ b/x-pack/plugins/monitoring/public/components/cluster/overview/index.js
@@ -12,16 +12,7 @@ import { BeatsPanel } from './beats_panel';
 import { EuiPage, EuiPageBody, EuiScreenReaderOnly } from '@elastic/eui';
 import { ApmPanel } from './apm_panel';
 import { FormattedMessage } from '@kbn/i18n/react';
-import {
-  STANDALONE_CLUSTER_CLUSTER_UUID,
-  ALERT_MISSING_MONITORING_DATA,
-  ELASTICSEARCH_SYSTEM_ID,
-  KIBANA_SYSTEM_ID,
-  LOGSTASH_SYSTEM_ID,
-  BEATS_SYSTEM_ID,
-  APM_SYSTEM_ID,
-} from '../../../../common/constants';
-import { filterAlertStates } from '../../../alerts/filter_alert_states';
+import { STANDALONE_CLUSTER_CLUSTER_UUID } from '../../../../common/constants';
 
 export function Overview(props) {
   const isFromStandaloneCluster = props.cluster.cluster_uuid === STANDALONE_CLUSTER_CLUSTER_UUID;
@@ -46,22 +37,12 @@ export function Overview(props) {
               license={props.cluster.license}
               setupMode={props.setupMode}
               showLicenseExpiration={props.showLicenseExpiration}
-              alerts={filterAlertStates(props.alerts, (type, { state }) => {
-                if (type === ALERT_MISSING_MONITORING_DATA) {
-                  return state.stackProduct === ELASTICSEARCH_SYSTEM_ID;
-                }
-                return true;
-              })}
+              alerts={props.alerts}
             />
             <KibanaPanel
               {...props.cluster.kibana}
               setupMode={props.setupMode}
-              alerts={filterAlertStates(props.alerts, (type, { state }) => {
-                if (type === ALERT_MISSING_MONITORING_DATA) {
-                  return state.stackProduct === KIBANA_SYSTEM_ID;
-                }
-                return true;
-              })}
+              alerts={props.alerts}
             />
           </Fragment>
         ) : null}
@@ -69,35 +50,12 @@ export function Overview(props) {
         <LogstashPanel
           {...props.cluster.logstash}
           setupMode={props.setupMode}
-          alerts={filterAlertStates(props.alerts, (type, { state }) => {
-            if (type === ALERT_MISSING_MONITORING_DATA) {
-              return state.stackProduct === LOGSTASH_SYSTEM_ID;
-            }
-            return true;
-          })}
+          alerts={props.alerts}
         />
 
-        <BeatsPanel
-          {...props.cluster.beats}
-          setupMode={props.setupMode}
-          alerts={filterAlertStates(props.alerts, (type, { state }) => {
-            if (type === ALERT_MISSING_MONITORING_DATA) {
-              return state.stackProduct === BEATS_SYSTEM_ID;
-            }
-            return true;
-          })}
-        />
+        <BeatsPanel {...props.cluster.beats} setupMode={props.setupMode} alerts={props.alerts} />
 
-        <ApmPanel
-          {...props.cluster.apm}
-          setupMode={props.setupMode}
-          alerts={filterAlertStates(props.alerts, (type, { state }) => {
-            if (type === ALERT_MISSING_MONITORING_DATA) {
-              return state.stackProduct === APM_SYSTEM_ID;
-            }
-            return true;
-          })}
-        />
+        <ApmPanel {...props.cluster.apm} setupMode={props.setupMode} alerts={props.alerts} />
       </EuiPageBody>
     </EuiPage>
   );
diff --git a/x-pack/plugins/monitoring/public/components/cluster/overview/kibana_panel.js b/x-pack/plugins/monitoring/public/components/cluster/overview/kibana_panel.js
index a5079f2eaa5f6..258bb65820c3e 100644
--- a/x-pack/plugins/monitoring/public/components/cluster/overview/kibana_panel.js
+++ b/x-pack/plugins/monitoring/public/components/cluster/overview/kibana_panel.js
@@ -28,11 +28,7 @@ import {
 import { FormattedMessage } from '@kbn/i18n/react';
 import { i18n } from '@kbn/i18n';
 import { SetupModeTooltip } from '../../setup_mode/tooltip';
-import {
-  KIBANA_SYSTEM_ID,
-  ALERT_KIBANA_VERSION_MISMATCH,
-  ALERT_MISSING_MONITORING_DATA,
-} from '../../../../common/constants';
+import { KIBANA_SYSTEM_ID, ALERT_KIBANA_VERSION_MISMATCH } from '../../../../common/constants';
 import { getSafeForExternalLink } from '../../../lib/get_safe_for_external_link';
 import { AlertsBadge } from '../../../alerts/badge';
 import { shouldShowAlertBadge } from '../../../alerts/lib/should_show_alert_badge';
@@ -40,7 +36,7 @@ import { isSetupModeFeatureEnabled } from '../../../lib/setup_mode';
 import { SetupModeFeature } from '../../../../common/enums';
 import { SetupModeContext } from '../../setup_mode/setup_mode_context';
 
-const INSTANCES_PANEL_ALERTS = [ALERT_KIBANA_VERSION_MISMATCH, ALERT_MISSING_MONITORING_DATA];
+const INSTANCES_PANEL_ALERTS = [ALERT_KIBANA_VERSION_MISMATCH];
 
 export function KibanaPanel(props) {
   const setupMode = props.setupMode;
diff --git a/x-pack/plugins/monitoring/public/components/cluster/overview/logstash_panel.js b/x-pack/plugins/monitoring/public/components/cluster/overview/logstash_panel.js
index 3bf3fa94c310e..1d3863fb953e2 100644
--- a/x-pack/plugins/monitoring/public/components/cluster/overview/logstash_panel.js
+++ b/x-pack/plugins/monitoring/public/components/cluster/overview/logstash_panel.js
@@ -15,7 +15,6 @@ import {
   LOGSTASH,
   LOGSTASH_SYSTEM_ID,
   ALERT_LOGSTASH_VERSION_MISMATCH,
-  ALERT_MISSING_MONITORING_DATA,
 } from '../../../../common/constants';
 
 import {
@@ -42,7 +41,7 @@ import { isSetupModeFeatureEnabled } from '../../../lib/setup_mode';
 import { SetupModeFeature } from '../../../../common/enums';
 import { SetupModeContext } from '../../setup_mode/setup_mode_context';
 
-const NODES_PANEL_ALERTS = [ALERT_LOGSTASH_VERSION_MISMATCH, ALERT_MISSING_MONITORING_DATA];
+const NODES_PANEL_ALERTS = [ALERT_LOGSTASH_VERSION_MISMATCH];
 
 export function LogstashPanel(props) {
   const { setupMode } = props;
diff --git a/x-pack/plugins/monitoring/public/components/elasticsearch/node/advanced.js b/x-pack/plugins/monitoring/public/components/elasticsearch/node/advanced.js
index 67df745e619d4..6b72f95a1dbfc 100644
--- a/x-pack/plugins/monitoring/public/components/elasticsearch/node/advanced.js
+++ b/x-pack/plugins/monitoring/public/components/elasticsearch/node/advanced.js
@@ -54,22 +54,11 @@ export const AdvancedNode = ({ nodeSummary, metrics, alerts, nodeId, ...props })
           <NodeDetailStatus
             stats={nodeSummary}
             alerts={alerts}
-            alertsStateFilter={(state) =>
-              state.nodeId === nodeId || state.stackProductUuid === nodeId
-            }
+            alertsStateFilter={(state) => state.nodeId === nodeId}
           />
         </EuiPanel>
         <EuiSpacer size="m" />
-        <AlertsCallout
-          alerts={alerts}
-          stateFilter={(state) => state.nodeId === nodeId || state.stackProductUuid === nodeId}
-          nextStepsFilter={(nextStep) => {
-            if (nextStep.text.includes('Elasticsearch nodes')) {
-              return false;
-            }
-            return true;
-          }}
-        />
+        <AlertsCallout alerts={alerts} stateFilter={(state) => state.nodeId === nodeId} />
         <EuiPageContent>
           <EuiFlexGrid columns={2} gutterSize="s">
             {metricsToShow.map((metric, index) => (
diff --git a/x-pack/plugins/monitoring/public/components/elasticsearch/node/node.js b/x-pack/plugins/monitoring/public/components/elasticsearch/node/node.js
index 47e30b71e03d0..ac1a5212a8d26 100644
--- a/x-pack/plugins/monitoring/public/components/elasticsearch/node/node.js
+++ b/x-pack/plugins/monitoring/public/components/elasticsearch/node/node.js
@@ -73,22 +73,11 @@ export const Node = ({
           <NodeDetailStatus
             stats={nodeSummary}
             alerts={alerts}
-            alertsStateFilter={(state) =>
-              state.nodeId === nodeId || state.stackProductUuid === nodeId
-            }
+            alertsStateFilter={(state) => state.nodeId === nodeId}
           />
         </EuiPanel>
         <EuiSpacer size="m" />
-        <AlertsCallout
-          alerts={alerts}
-          stateFilter={(state) => state.nodeId === nodeId || state.stackProductUuid === nodeId}
-          nextStepsFilter={(nextStep) => {
-            if (nextStep.text.includes('Elasticsearch nodes')) {
-              return false;
-            }
-            return true;
-          }}
-        />
+        <AlertsCallout alerts={alerts} stateFilter={(state) => state.nodeId === nodeId} />
         <EuiPageContent>
           <EuiFlexGrid columns={2} gutterSize="s">
             {metricsToShow.map((metric, index) => (
diff --git a/x-pack/plugins/monitoring/public/components/elasticsearch/nodes/nodes.js b/x-pack/plugins/monitoring/public/components/elasticsearch/nodes/nodes.js
index 61188487e2f99..84e7e5f8b1547 100644
--- a/x-pack/plugins/monitoring/public/components/elasticsearch/nodes/nodes.js
+++ b/x-pack/plugins/monitoring/public/components/elasticsearch/nodes/nodes.js
@@ -137,15 +137,7 @@ const getColumns = (showCgroupMetricsElasticsearch, setupMode, clusterUuid, aler
         <AlertsStatus
           showBadge={true}
           alerts={alerts}
-          stateFilter={(state) =>
-            state.nodeId === node.resolver || state.stackProductUuid === node.resolver
-          }
-          nextStepsFilter={(nextStep) => {
-            if (nextStep.text.includes('Elasticsearch nodes')) {
-              return false;
-            }
-            return true;
-          }}
+          stateFilter={(state) => state.nodeId === node.resolver}
         />
       );
     },
diff --git a/x-pack/plugins/monitoring/public/components/kibana/instances/instances.js b/x-pack/plugins/monitoring/public/components/kibana/instances/instances.js
index 8095337dd3796..cde7952aa1839 100644
--- a/x-pack/plugins/monitoring/public/components/kibana/instances/instances.js
+++ b/x-pack/plugins/monitoring/public/components/kibana/instances/instances.js
@@ -90,20 +90,7 @@ const getColumns = (setupMode, alerts) => {
       field: 'isOnline',
       width: '175px',
       sortable: true,
-      render: () => {
-        return (
-          <AlertsStatus
-            showBadge={true}
-            alerts={alerts}
-            nextStepsFilter={(nextStep) => {
-              if (nextStep.text.includes('Kibana instances')) {
-                return false;
-              }
-              return true;
-            }}
-          />
-        );
-      },
+      render: () => <AlertsStatus showBadge={true} alerts={alerts} />,
     },
     {
       name: i18n.translate('xpack.monitoring.kibana.listing.statusColumnTitle', {
diff --git a/x-pack/plugins/monitoring/public/components/logstash/listing/listing.js b/x-pack/plugins/monitoring/public/components/logstash/listing/listing.js
index a5db433bbfe0a..063cc1c001bb3 100644
--- a/x-pack/plugins/monitoring/public/components/logstash/listing/listing.js
+++ b/x-pack/plugins/monitoring/public/components/logstash/listing/listing.js
@@ -83,20 +83,7 @@ export class Listing extends PureComponent {
         field: 'isOnline',
         width: '175px',
         sortable: true,
-        render: () => {
-          return (
-            <AlertsStatus
-              showBadge={true}
-              alerts={alerts}
-              nextStepsFilter={(nextStep) => {
-                if (nextStep.text.includes('Logstash nodes')) {
-                  return false;
-                }
-                return true;
-              }}
-            />
-          );
-        },
+        render: () => <AlertsStatus showBadge={true} alerts={alerts} />,
       },
       {
         name: i18n.translate('xpack.monitoring.logstash.nodes.cpuUsageTitle', {
diff --git a/x-pack/plugins/monitoring/public/views/apm/instance/index.js b/x-pack/plugins/monitoring/public/views/apm/instance/index.js
index 396d4651e0c5e..752128782194e 100644
--- a/x-pack/plugins/monitoring/public/views/apm/instance/index.js
+++ b/x-pack/plugins/monitoring/public/views/apm/instance/index.js
@@ -18,11 +18,7 @@ import { routeInitProvider } from '../../../lib/route_init';
 import template from './index.html';
 import { MonitoringViewBaseController } from '../../base_controller';
 import { ApmServerInstance } from '../../../components/apm/instance';
-import {
-  CODE_PATH_APM,
-  ALERT_MISSING_MONITORING_DATA,
-  APM_SYSTEM_ID,
-} from '../../../../common/constants';
+import { CODE_PATH_APM } from '../../../../common/constants';
 
 uiRoutes.when('/apm/instances/:uuid', {
   template,
@@ -54,17 +50,6 @@ uiRoutes.when('/apm/instances/:uuid', {
         reactNodeId: 'apmInstanceReact',
         $scope,
         $injector,
-        alerts: {
-          shouldFetch: true,
-          options: {
-            alertTypeIds: [ALERT_MISSING_MONITORING_DATA],
-            filters: [
-              {
-                stackProduct: APM_SYSTEM_ID,
-              },
-            ],
-          },
-        },
       });
 
       $scope.$watch(
@@ -84,7 +69,6 @@ uiRoutes.when('/apm/instances/:uuid', {
               summary={data.apmSummary || {}}
               metrics={data.metrics || {}}
               onBrush={this.onBrush}
-              alerts={this.alerts}
               zoomInfo={this.zoomInfo}
             />
           );
diff --git a/x-pack/plugins/monitoring/public/views/apm/instances/index.js b/x-pack/plugins/monitoring/public/views/apm/instances/index.js
index a66e939b18480..0a42b8d78b72c 100644
--- a/x-pack/plugins/monitoring/public/views/apm/instances/index.js
+++ b/x-pack/plugins/monitoring/public/views/apm/instances/index.js
@@ -14,11 +14,7 @@ import { ApmServerInstances } from '../../../components/apm/instances';
 import { MonitoringViewBaseEuiTableController } from '../..';
 import { SetupModeRenderer } from '../../../components/renderers';
 import { SetupModeContext } from '../../../components/setup_mode/setup_mode_context';
-import {
-  APM_SYSTEM_ID,
-  CODE_PATH_APM,
-  ALERT_MISSING_MONITORING_DATA,
-} from '../../../../common/constants';
+import { APM_SYSTEM_ID, CODE_PATH_APM } from '../../../../common/constants';
 
 uiRoutes.when('/apm/instances', {
   template,
@@ -52,17 +48,6 @@ uiRoutes.when('/apm/instances', {
         reactNodeId: 'apmInstancesReact',
         $scope,
         $injector,
-        alerts: {
-          shouldFetch: true,
-          options: {
-            alertTypeIds: [ALERT_MISSING_MONITORING_DATA],
-            filters: [
-              {
-                stackProduct: APM_SYSTEM_ID,
-              },
-            ],
-          },
-        },
       });
 
       this.scope = $scope;
@@ -83,7 +68,6 @@ uiRoutes.when('/apm/instances', {
                   {flyoutComponent}
                   <ApmServerInstances
                     setupMode={setupMode}
-                    alerts={this.alerts}
                     apms={{
                       pagination,
                       sorting,
diff --git a/x-pack/plugins/monitoring/public/views/apm/overview/index.js b/x-pack/plugins/monitoring/public/views/apm/overview/index.js
index 12821ec432c24..544fae39ee79d 100644
--- a/x-pack/plugins/monitoring/public/views/apm/overview/index.js
+++ b/x-pack/plugins/monitoring/public/views/apm/overview/index.js
@@ -12,11 +12,7 @@ import { routeInitProvider } from '../../../lib/route_init';
 import template from './index.html';
 import { MonitoringViewBaseController } from '../../base_controller';
 import { ApmOverview } from '../../../components/apm/overview';
-import {
-  CODE_PATH_APM,
-  ALERT_MISSING_MONITORING_DATA,
-  APM_SYSTEM_ID,
-} from '../../../../common/constants';
+import { CODE_PATH_APM } from '../../../../common/constants';
 
 uiRoutes.when('/apm', {
   template,
@@ -46,29 +42,13 @@ uiRoutes.when('/apm', {
         reactNodeId: 'apmOverviewReact',
         $scope,
         $injector,
-        alerts: {
-          shouldFetch: true,
-          options: {
-            alertTypeIds: [ALERT_MISSING_MONITORING_DATA],
-            filters: [
-              {
-                stackProduct: APM_SYSTEM_ID,
-              },
-            ],
-          },
-        },
       });
 
       $scope.$watch(
         () => this.data,
         (data) => {
           this.renderReact(
-            <ApmOverview
-              alerts={this.alerts}
-              {...data}
-              onBrush={this.onBrush}
-              zoomInfo={this.zoomInfo}
-            />
+            <ApmOverview {...data} onBrush={this.onBrush} zoomInfo={this.zoomInfo} />
           );
         }
       );
diff --git a/x-pack/plugins/monitoring/public/views/beats/beat/index.js b/x-pack/plugins/monitoring/public/views/beats/beat/index.js
index 3e9e4e4b0373d..6cffae2479128 100644
--- a/x-pack/plugins/monitoring/public/views/beats/beat/index.js
+++ b/x-pack/plugins/monitoring/public/views/beats/beat/index.js
@@ -11,11 +11,7 @@ import { routeInitProvider } from '../../../lib/route_init';
 import { MonitoringViewBaseController } from '../../';
 import { getPageData } from './get_page_data';
 import template from './index.html';
-import {
-  CODE_PATH_BEATS,
-  ALERT_MISSING_MONITORING_DATA,
-  BEATS_SYSTEM_ID,
-} from '../../../../common/constants';
+import { CODE_PATH_BEATS } from '../../../../common/constants';
 import { Beat } from '../../../components/beats/beat';
 
 uiRoutes.when('/beats/beat/:beatUuid', {
@@ -56,17 +52,6 @@ uiRoutes.when('/beats/beat/:beatUuid', {
         $scope,
         $injector,
         reactNodeId: 'monitoringBeatsInstanceApp',
-        alerts: {
-          shouldFetch: true,
-          options: {
-            alertTypeIds: [ALERT_MISSING_MONITORING_DATA],
-            filters: [
-              {
-                stackProduct: BEATS_SYSTEM_ID,
-              },
-            ],
-          },
-        },
       });
 
       this.data = pageData;
@@ -75,7 +60,6 @@ uiRoutes.when('/beats/beat/:beatUuid', {
         (data) => {
           this.renderReact(
             <Beat
-              alerts={this.alerts}
               summary={data.summary}
               metrics={data.metrics}
               onBrush={$scope.onBrush}
diff --git a/x-pack/plugins/monitoring/public/views/beats/listing/index.js b/x-pack/plugins/monitoring/public/views/beats/listing/index.js
index 61656189aa47b..3fedaa8161b52 100644
--- a/x-pack/plugins/monitoring/public/views/beats/listing/index.js
+++ b/x-pack/plugins/monitoring/public/views/beats/listing/index.js
@@ -15,11 +15,7 @@ import React from 'react';
 import { Listing } from '../../../components/beats/listing/listing';
 import { SetupModeRenderer } from '../../../components/renderers';
 import { SetupModeContext } from '../../../components/setup_mode/setup_mode_context';
-import {
-  CODE_PATH_BEATS,
-  BEATS_SYSTEM_ID,
-  ALERT_MISSING_MONITORING_DATA,
-} from '../../../../common/constants';
+import { CODE_PATH_BEATS, BEATS_SYSTEM_ID } from '../../../../common/constants';
 
 uiRoutes.when('/beats/beats', {
   template,
@@ -51,17 +47,6 @@ uiRoutes.when('/beats/beats', {
         reactNodeId: 'monitoringBeatsInstancesApp',
         $scope,
         $injector,
-        alerts: {
-          shouldFetch: true,
-          options: {
-            alertTypeIds: [ALERT_MISSING_MONITORING_DATA],
-            filters: [
-              {
-                stackProduct: BEATS_SYSTEM_ID,
-              },
-            ],
-          },
-        },
       });
 
       this.data = $route.current.locals.pageData;
@@ -87,7 +72,6 @@ uiRoutes.when('/beats/beats', {
               <Listing
                 stats={this.data.stats}
                 data={this.data.listing}
-                alerts={this.alerts}
                 setupMode={setupMode}
                 sorting={this.sorting || sorting}
                 pagination={this.pagination || pagination}
diff --git a/x-pack/plugins/monitoring/public/views/beats/overview/index.js b/x-pack/plugins/monitoring/public/views/beats/overview/index.js
index ef80d7e77fe6e..6ecdc2bfadb7d 100644
--- a/x-pack/plugins/monitoring/public/views/beats/overview/index.js
+++ b/x-pack/plugins/monitoring/public/views/beats/overview/index.js
@@ -11,11 +11,7 @@ import { routeInitProvider } from '../../../lib/route_init';
 import { MonitoringViewBaseController } from '../../';
 import { getPageData } from './get_page_data';
 import template from './index.html';
-import {
-  CODE_PATH_BEATS,
-  ALERT_MISSING_MONITORING_DATA,
-  BEATS_SYSTEM_ID,
-} from '../../../../common/constants';
+import { CODE_PATH_BEATS } from '../../../../common/constants';
 import { BeatsOverview } from '../../../components/beats/overview';
 
 uiRoutes.when('/beats', {
@@ -48,17 +44,6 @@ uiRoutes.when('/beats', {
         $scope,
         $injector,
         reactNodeId: 'monitoringBeatsOverviewApp',
-        alerts: {
-          shouldFetch: true,
-          options: {
-            alertTypeIds: [ALERT_MISSING_MONITORING_DATA],
-            filters: [
-              {
-                stackProduct: BEATS_SYSTEM_ID,
-              },
-            ],
-          },
-        },
       });
 
       this.data = $route.current.locals.pageData;
@@ -66,12 +51,7 @@ uiRoutes.when('/beats', {
         () => this.data,
         (data) => {
           this.renderReact(
-            <BeatsOverview
-              {...data}
-              alerts={this.alerts}
-              onBrush={$scope.onBrush}
-              zoomInfo={$scope.zoomInfo}
-            />
+            <BeatsOverview {...data} onBrush={$scope.onBrush} zoomInfo={$scope.zoomInfo} />
           );
         }
       );
diff --git a/x-pack/plugins/monitoring/public/views/kibana/instance/index.js b/x-pack/plugins/monitoring/public/views/kibana/instance/index.js
index 29852501d1667..20a1a51719415 100644
--- a/x-pack/plugins/monitoring/public/views/kibana/instance/index.js
+++ b/x-pack/plugins/monitoring/public/views/kibana/instance/index.js
@@ -27,12 +27,7 @@ import {
 import { MonitoringTimeseriesContainer } from '../../../components/chart';
 import { DetailStatus } from '../../../components/kibana/detail_status';
 import { MonitoringViewBaseController } from '../../base_controller';
-import {
-  CODE_PATH_KIBANA,
-  ALERT_KIBANA_VERSION_MISMATCH,
-  ALERT_MISSING_MONITORING_DATA,
-  KIBANA_SYSTEM_ID,
-} from '../../../../common/constants';
+import { CODE_PATH_KIBANA, ALERT_KIBANA_VERSION_MISMATCH } from '../../../../common/constants';
 import { AlertsCallout } from '../../../alerts/callout';
 
 function getPageData($injector) {
@@ -81,12 +76,7 @@ uiRoutes.when('/kibana/instances/:uuid', {
         alerts: {
           shouldFetch: true,
           options: {
-            alertTypeIds: [ALERT_KIBANA_VERSION_MISMATCH, ALERT_MISSING_MONITORING_DATA],
-            filters: [
-              {
-                stackProduct: KIBANA_SYSTEM_ID,
-              },
-            ],
+            alertTypeIds: [ALERT_KIBANA_VERSION_MISMATCH],
           },
         },
       });
@@ -114,15 +104,7 @@ uiRoutes.when('/kibana/instances/:uuid', {
                   <DetailStatus stats={data.kibanaSummary} />
                 </EuiPanel>
                 <EuiSpacer size="m" />
-                <AlertsCallout
-                  alerts={this.alerts}
-                  nextStepsFilter={(nextStep) => {
-                    if (nextStep.text.includes('Kibana instances')) {
-                      return false;
-                    }
-                    return true;
-                  }}
-                />
+                <AlertsCallout alerts={this.alerts} />
                 <EuiPageContent>
                   <EuiFlexGrid columns={2} gutterSize="s">
                     <EuiFlexItem grow={true}>
diff --git a/x-pack/plugins/monitoring/public/views/kibana/instances/index.js b/x-pack/plugins/monitoring/public/views/kibana/instances/index.js
index 97841ec490fa8..8a14801c8bd65 100644
--- a/x-pack/plugins/monitoring/public/views/kibana/instances/index.js
+++ b/x-pack/plugins/monitoring/public/views/kibana/instances/index.js
@@ -18,7 +18,6 @@ import {
   KIBANA_SYSTEM_ID,
   CODE_PATH_KIBANA,
   ALERT_KIBANA_VERSION_MISMATCH,
-  ALERT_MISSING_MONITORING_DATA,
 } from '../../../../common/constants';
 
 uiRoutes.when('/kibana/instances', {
@@ -48,12 +47,7 @@ uiRoutes.when('/kibana/instances', {
         alerts: {
           shouldFetch: true,
           options: {
-            alertTypeIds: [ALERT_KIBANA_VERSION_MISMATCH, ALERT_MISSING_MONITORING_DATA],
-            filters: [
-              {
-                stackProduct: KIBANA_SYSTEM_ID,
-              },
-            ],
+            alertTypeIds: [ALERT_KIBANA_VERSION_MISMATCH],
           },
         },
       });
diff --git a/x-pack/plugins/monitoring/public/views/logstash/node/advanced/index.js b/x-pack/plugins/monitoring/public/views/logstash/node/advanced/index.js
index 591db66b2698c..466246f7793ec 100644
--- a/x-pack/plugins/monitoring/public/views/logstash/node/advanced/index.js
+++ b/x-pack/plugins/monitoring/public/views/logstash/node/advanced/index.js
@@ -29,8 +29,6 @@ import { MonitoringTimeseriesContainer } from '../../../../components/chart';
 import {
   CODE_PATH_LOGSTASH,
   ALERT_LOGSTASH_VERSION_MISMATCH,
-  ALERT_MISSING_MONITORING_DATA,
-  LOGSTASH_SYSTEM_ID,
 } from '../../../../../common/constants';
 import { AlertsCallout } from '../../../../alerts/callout';
 
@@ -78,12 +76,7 @@ uiRoutes.when('/logstash/node/:uuid/advanced', {
         alerts: {
           shouldFetch: true,
           options: {
-            alertTypeIds: [ALERT_LOGSTASH_VERSION_MISMATCH, ALERT_MISSING_MONITORING_DATA],
-            filters: [
-              {
-                stackProduct: LOGSTASH_SYSTEM_ID,
-              },
-            ],
+            alertTypeIds: [ALERT_LOGSTASH_VERSION_MISMATCH],
           },
         },
         telemetryPageViewTitle: 'logstash_node_advanced',
@@ -129,15 +122,7 @@ uiRoutes.when('/logstash/node/:uuid/advanced', {
                   <DetailStatus stats={data.nodeSummary} />
                 </EuiPanel>
                 <EuiSpacer size="m" />
-                <AlertsCallout
-                  alerts={this.alerts}
-                  nextStepsFilter={(nextStep) => {
-                    if (nextStep.text.includes('Logstash nodes')) {
-                      return false;
-                    }
-                    return true;
-                  }}
-                />
+                <AlertsCallout alerts={this.alerts} />
                 <EuiPageContent>
                   <EuiFlexGrid columns={2} gutterSize="s">
                     {metricsToShow.map((metric, index) => (
diff --git a/x-pack/plugins/monitoring/public/views/logstash/node/index.js b/x-pack/plugins/monitoring/public/views/logstash/node/index.js
index cccae6913052a..e2dee77133c72 100644
--- a/x-pack/plugins/monitoring/public/views/logstash/node/index.js
+++ b/x-pack/plugins/monitoring/public/views/logstash/node/index.js
@@ -26,12 +26,7 @@ import {
 } from '@elastic/eui';
 import { MonitoringTimeseriesContainer } from '../../../components/chart';
 import { MonitoringViewBaseController } from '../../base_controller';
-import {
-  CODE_PATH_LOGSTASH,
-  ALERT_LOGSTASH_VERSION_MISMATCH,
-  ALERT_MISSING_MONITORING_DATA,
-  LOGSTASH_SYSTEM_ID,
-} from '../../../../common/constants';
+import { CODE_PATH_LOGSTASH, ALERT_LOGSTASH_VERSION_MISMATCH } from '../../../../common/constants';
 import { AlertsCallout } from '../../../alerts/callout';
 
 function getPageData($injector) {
@@ -78,12 +73,7 @@ uiRoutes.when('/logstash/node/:uuid', {
         alerts: {
           shouldFetch: true,
           options: {
-            alertTypeIds: [ALERT_LOGSTASH_VERSION_MISMATCH, ALERT_MISSING_MONITORING_DATA],
-            filters: [
-              {
-                stackProduct: LOGSTASH_SYSTEM_ID,
-              },
-            ],
+            alertTypeIds: [ALERT_LOGSTASH_VERSION_MISMATCH],
           },
         },
         telemetryPageViewTitle: 'logstash_node',
@@ -130,15 +120,7 @@ uiRoutes.when('/logstash/node/:uuid', {
                   <DetailStatus stats={data.nodeSummary} />
                 </EuiPanel>
                 <EuiSpacer size="m" />
-                <AlertsCallout
-                  alerts={this.alerts}
-                  nextStepsFilter={(nextStep) => {
-                    if (nextStep.text.includes('Logstash nodes')) {
-                      return false;
-                    }
-                    return true;
-                  }}
-                />
+                <AlertsCallout alerts={this.alerts} />
                 <EuiPageContent>
                   <EuiFlexGrid columns={2} gutterSize="s">
                     {metricsToShow.map((metric, index) => (
diff --git a/x-pack/plugins/monitoring/public/views/logstash/nodes/index.js b/x-pack/plugins/monitoring/public/views/logstash/nodes/index.js
index 467462fffd48e..3f3270923a389 100644
--- a/x-pack/plugins/monitoring/public/views/logstash/nodes/index.js
+++ b/x-pack/plugins/monitoring/public/views/logstash/nodes/index.js
@@ -17,7 +17,6 @@ import {
   CODE_PATH_LOGSTASH,
   LOGSTASH_SYSTEM_ID,
   ALERT_LOGSTASH_VERSION_MISMATCH,
-  ALERT_MISSING_MONITORING_DATA,
 } from '../../../../common/constants';
 
 uiRoutes.when('/logstash/nodes', {
@@ -47,12 +46,7 @@ uiRoutes.when('/logstash/nodes', {
         alerts: {
           shouldFetch: true,
           options: {
-            alertTypeIds: [ALERT_LOGSTASH_VERSION_MISMATCH, ALERT_MISSING_MONITORING_DATA],
-            filters: [
-              {
-                stackProduct: LOGSTASH_SYSTEM_ID,
-              },
-            ],
+            alertTypeIds: [ALERT_LOGSTASH_VERSION_MISMATCH],
           },
         },
       });
diff --git a/x-pack/plugins/monitoring/server/alerts/alert_helpers.ts b/x-pack/plugins/monitoring/server/alerts/alert_helpers.ts
index 984746e59f06b..d7a984955814b 100644
--- a/x-pack/plugins/monitoring/server/alerts/alert_helpers.ts
+++ b/x-pack/plugins/monitoring/server/alerts/alert_helpers.ts
@@ -9,10 +9,9 @@ import { AlertMessageDocLinkToken } from '../../common/types/alerts';
 import { AlertMessageTokenType } from '../../common/enums';
 
 export class AlertingDefaults {
+  public static readonly THROTTLE: string = '1d';
+  public static readonly SCHEDULE_INTERVAL: string = '1m';
   public static readonly ALERT_STATE = {
-    resolved: i18n.translate('xpack.monitoring.alerts.state.resolved', {
-      defaultMessage: 'resolved',
-    }),
     firing: i18n.translate('xpack.monitoring.alerts.state.firing', {
       defaultMessage: 'firing',
     }),
diff --git a/x-pack/plugins/monitoring/server/alerts/alerts_factory.test.ts b/x-pack/plugins/monitoring/server/alerts/alerts_factory.test.ts
index cc0423051f2aa..b5f325f820bac 100644
--- a/x-pack/plugins/monitoring/server/alerts/alerts_factory.test.ts
+++ b/x-pack/plugins/monitoring/server/alerts/alerts_factory.test.ts
@@ -6,6 +6,14 @@
 import { AlertsFactory } from './alerts_factory';
 import { ALERT_CPU_USAGE } from '../../common/constants';
 
+jest.mock('../static_globals', () => ({
+  Globals: {
+    app: {
+      getLogger: () => ({ debug: jest.fn() }),
+    },
+  },
+}));
+
 describe('AlertsFactory', () => {
   const alertsClient = {
     find: jest.fn(),
@@ -16,31 +24,19 @@ describe('AlertsFactory', () => {
   });
 
   it('should get by type', async () => {
-    const id = '1abc';
     alertsClient.find = jest.fn().mockImplementation(() => {
       return {
         total: 1,
         data: [
           {
-            id,
+            id: ALERT_CPU_USAGE,
           },
         ],
       };
     });
     const alert = await AlertsFactory.getByType(ALERT_CPU_USAGE, alertsClient as any);
     expect(alert).not.toBeNull();
-    expect(alert?.type).toBe(ALERT_CPU_USAGE);
-  });
-
-  it('should handle no alert found', async () => {
-    alertsClient.find = jest.fn().mockImplementation(() => {
-      return {
-        total: 0,
-      };
-    });
-    const alert = await AlertsFactory.getByType(ALERT_CPU_USAGE, alertsClient as any);
-    expect(alert).not.toBeNull();
-    expect(alert?.type).toBe(ALERT_CPU_USAGE);
+    expect(alert?.getId()).toBe(ALERT_CPU_USAGE);
   });
 
   it('should pass in the correct filters', async () => {
@@ -54,10 +50,4 @@ describe('AlertsFactory', () => {
     await AlertsFactory.getByType(ALERT_CPU_USAGE, alertsClient as any);
     expect(filter).toBe(`alert.attributes.alertTypeId:${ALERT_CPU_USAGE}`);
   });
-
-  it('should handle no alerts client', async () => {
-    const alert = await AlertsFactory.getByType(ALERT_CPU_USAGE, undefined);
-    expect(alert).not.toBeNull();
-    expect(alert?.type).toBe(ALERT_CPU_USAGE);
-  });
 });
diff --git a/x-pack/plugins/monitoring/server/alerts/alerts_factory.ts b/x-pack/plugins/monitoring/server/alerts/alerts_factory.ts
index efd3d7d5e3b30..b43a56562a2aa 100644
--- a/x-pack/plugins/monitoring/server/alerts/alerts_factory.ts
+++ b/x-pack/plugins/monitoring/server/alerts/alerts_factory.ts
@@ -34,6 +34,7 @@ import {
   ALERT_ELASTICSEARCH_VERSION_MISMATCH,
 } from '../../common/constants';
 import { AlertsClient } from '../../../alerts/server';
+import { Alert } from '../../../alerts/common';
 
 const BY_TYPE = {
   [ALERT_CLUSTER_HEALTH]: ClusterHealthAlert,
@@ -54,27 +55,24 @@ export class AlertsFactory {
   public static async getByType(
     type: string,
     alertsClient: AlertsClient | undefined
-  ): Promise<BaseAlert | null> {
+  ): Promise<BaseAlert | undefined> {
     const alertCls = BY_TYPE[type];
-    if (!alertCls) {
-      return null;
+    if (!alertCls || !alertsClient) {
+      return;
     }
-    if (alertsClient) {
-      const alertClientAlerts = await alertsClient.find({
-        options: {
-          filter: `alert.attributes.alertTypeId:${type}`,
-        },
-      });
+    const alertClientAlerts = await alertsClient.find({
+      options: {
+        filter: `alert.attributes.alertTypeId:${type}`,
+      },
+    });
 
-      if (alertClientAlerts.total === 0) {
-        return new alertCls();
-      }
-
-      const rawAlert = alertClientAlerts.data[0];
-      return new alertCls(rawAlert as BaseAlert['rawAlert']);
+    if (!alertClientAlerts.total || !alertClientAlerts.data?.length) {
+      return;
+      // return new alertCls() as BaseAlert;
     }
 
-    return new alertCls();
+    const [rawAlert] = alertClientAlerts.data as [Alert];
+    return new alertCls(rawAlert) as BaseAlert;
   }
 
   public static getAll() {
diff --git a/x-pack/plugins/monitoring/server/alerts/base_alert.test.ts b/x-pack/plugins/monitoring/server/alerts/base_alert.test.ts
index c256cce362ff8..d23d6c8b32f14 100644
--- a/x-pack/plugins/monitoring/server/alerts/base_alert.test.ts
+++ b/x-pack/plugins/monitoring/server/alerts/base_alert.test.ts
@@ -5,18 +5,15 @@
  */
 import { BaseAlert } from './base_alert';
 
-describe('BaseAlert', () => {
-  describe('serialize', () => {
-    it('should serialize with a raw alert provided', () => {
-      const alert = new BaseAlert({} as any);
-      expect(alert.serialize()).not.toBeNull();
-    });
-    it('should not serialize without a raw alert provided', () => {
-      const alert = new BaseAlert();
-      expect(alert.serialize()).toBeNull();
-    });
-  });
+jest.mock('../static_globals', () => ({
+  Globals: {
+    app: {
+      getLogger: () => ({ debug: jest.fn() }),
+    },
+  },
+}));
 
+describe('BaseAlert', () => {
   describe('create', () => {
     it('should create an alert if it does not exist', async () => {
       const alert = new BaseAlert();
@@ -54,11 +51,14 @@ describe('BaseAlert', () => {
               },
             },
           ],
-          alertTypeId: undefined,
+          alertTypeId: '',
           consumer: 'monitoring',
           enabled: true,
-          name: undefined,
-          params: {},
+          name: '',
+          params: {
+            duration: '1h',
+            threshold: 85,
+          },
           schedule: {
             interval: '1m',
           },
diff --git a/x-pack/plugins/monitoring/server/alerts/base_alert.ts b/x-pack/plugins/monitoring/server/alerts/base_alert.ts
index 4c1a4d8df2ab5..b345689bdc504 100644
--- a/x-pack/plugins/monitoring/server/alerts/base_alert.ts
+++ b/x-pack/plugins/monitoring/server/alerts/base_alert.ts
@@ -4,13 +4,7 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 
-import {
-  UiSettingsServiceStart,
-  ILegacyCustomClusterClient,
-  Logger,
-  IUiSettingsClient,
-  LegacyCallAPIOptions,
-} from 'kibana/server';
+import { Logger, LegacyCallAPIOptions } from 'kibana/server';
 import { i18n } from '@kbn/i18n';
 import {
   AlertType,
@@ -19,10 +13,11 @@ import {
   AlertsClient,
   AlertServices,
 } from '../../../alerts/server';
-import { Alert, RawAlertInstance } from '../../../alerts/common';
+import { Alert, RawAlertInstance, SanitizedAlert } from '../../../alerts/common';
 import { ActionsClient } from '../../../actions/server';
 import {
   AlertState,
+  AlertNodeState,
   AlertCluster,
   AlertMessage,
   AlertData,
@@ -30,80 +25,78 @@ import {
   AlertEnableAction,
   CommonAlertFilter,
   CommonAlertParams,
-  CommonBaseAlert,
+  LegacyAlert,
 } from '../../common/types/alerts';
 import { fetchAvailableCcs } from '../lib/alerts/fetch_available_ccs';
 import { fetchClusters } from '../lib/alerts/fetch_clusters';
 import { getCcsIndexPattern } from '../lib/alerts/get_ccs_index_pattern';
-import { INDEX_PATTERN_ELASTICSEARCH } from '../../common/constants';
-import { MonitoringConfig } from '../config';
+import { INDEX_PATTERN_ELASTICSEARCH, INDEX_ALERTS } from '../../common/constants';
 import { AlertSeverity } from '../../common/enums';
 import { MonitoringLicenseService } from '../types';
 import { mbSafeQuery } from '../lib/mb_safe_query';
 import { appendMetricbeatIndex } from '../lib/alerts/append_mb_index';
+import { parseDuration } from '../../../alerts/common/parse_duration';
+import { Globals } from '../static_globals';
+import { fetchLegacyAlerts } from '../lib/alerts/fetch_legacy_alerts';
+import { mapLegacySeverity } from '../lib/alerts/map_legacy_severity';
+
+interface LegacyOptions {
+  watchName: string;
+  changeDataValues?: Partial<AlertData>;
+}
 
-export class BaseAlert {
-  public type!: string;
-  public label!: string;
-  public description!: string;
-  public defaultThrottle: string = '1d';
-  public defaultInterval: string = '1m';
-  public rawAlert: Alert | undefined;
-  public isLegacy: boolean = false;
-
-  protected getUiSettingsService!: () => Promise<UiSettingsServiceStart>;
-  protected monitoringCluster!: ILegacyCustomClusterClient;
-  protected getLogger!: (...scopes: string[]) => Logger;
-  protected config!: MonitoringConfig;
-  protected kibanaUrl!: string;
-  protected isCloud: boolean = false;
-  protected defaultParams: CommonAlertParams | {} = {};
-  public get paramDetails() {
-    return {};
-  }
-  protected actionVariables: Array<{ name: string; description: string }> = [];
-  protected alertType!: AlertType;
-
-  constructor(rawAlert: Alert | undefined = undefined) {
-    if (rawAlert) {
-      this.rawAlert = rawAlert;
-    }
-  }
-
-  public serialize(): CommonBaseAlert | null {
-    if (!this.rawAlert) {
-      return null;
+type ExecutedState =
+  | {
+      lastChecked: number;
+      lastExecutedAction: number;
+      [key: string]: unknown;
     }
+  | Record<string, any>;
+
+interface AlertOptions {
+  id: string;
+  name: string;
+  throttle?: string | null;
+  interval?: string;
+  legacy?: LegacyOptions;
+  defaultParams?: CommonAlertParams;
+  actionVariables: Array<{ name: string; description: string }>;
+  fetchClustersRange?: number;
+  accessorKey?: string;
+}
 
-    return {
-      type: this.type,
-      label: this.label,
-      rawAlert: this.rawAlert,
-      paramDetails: this.paramDetails,
-      isLegacy: this.isLegacy,
-    };
-  }
+type CallCluster = (
+  endpoint: string,
+  clientParams?: Record<string, unknown> | undefined,
+  options?: LegacyCallAPIOptions | undefined
+) => Promise<any>;
+
+const defaultAlertOptions = (): AlertOptions => {
+  return {
+    id: '',
+    name: '',
+    throttle: '1d',
+    interval: '1m',
+    defaultParams: { threshold: 85, duration: '1h' },
+    actionVariables: [],
+  };
+};
+export class BaseAlert {
+  protected scopedLogger: Logger;
 
-  public initializeAlertType(
-    getUiSettingsService: () => Promise<UiSettingsServiceStart>,
-    monitoringCluster: ILegacyCustomClusterClient,
-    getLogger: (...scopes: string[]) => Logger,
-    config: MonitoringConfig,
-    kibanaUrl: string,
-    isCloud: boolean
+  constructor(
+    public rawAlert?: SanitizedAlert,
+    public alertOptions: AlertOptions = defaultAlertOptions()
   ) {
-    this.getUiSettingsService = getUiSettingsService;
-    this.monitoringCluster = monitoringCluster;
-    this.config = config;
-    this.kibanaUrl = kibanaUrl;
-    this.getLogger = getLogger;
-    this.isCloud = isCloud;
+    this.alertOptions = { ...defaultAlertOptions(), ...this.alertOptions };
+    this.scopedLogger = Globals.app.getLogger(alertOptions.id!);
   }
 
   public getAlertType(): AlertType {
+    const { id, name, actionVariables } = this.alertOptions;
     return {
-      id: this.type,
-      name: this.label,
+      id,
+      name,
       actionGroups: [
         {
           id: 'default',
@@ -113,16 +106,17 @@ export class BaseAlert {
         },
       ],
       defaultActionGroupId: 'default',
-      executor: (options: AlertExecutorOptions): Promise<any> => this.execute(options),
+      executor: (options: AlertExecutorOptions & { state: ExecutedState }): Promise<any> =>
+        this.execute(options),
       producer: 'monitoring',
       actionVariables: {
-        context: this.actionVariables,
+        context: actionVariables,
       },
     };
   }
 
   public isEnabled(licenseService: MonitoringLicenseService) {
-    if (this.isLegacy) {
+    if (this.alertOptions.legacy) {
       const watcherFeature = licenseService.getWatcherFeature();
       if (!watcherFeature.isAvailable || !watcherFeature.isEnabled) {
         return false;
@@ -132,7 +126,7 @@ export class BaseAlert {
   }
 
   public getId() {
-    return this.rawAlert ? this.rawAlert.id : null;
+    return this.rawAlert?.id;
   }
 
   public async createIfDoesNotExist(
@@ -142,7 +136,7 @@ export class BaseAlert {
   ): Promise<Alert> {
     const existingAlertData = await alertsClient.find({
       options: {
-        search: this.type,
+        search: this.alertOptions.id,
       },
     });
 
@@ -161,23 +155,29 @@ export class BaseAlert {
         group: 'default',
         id: actionData.id,
         params: {
-          // This is just a server log right now, but will get more robut over time
-          message: this.getDefaultActionMessage(true),
+          message: '{{context.internalShortMessage}}',
           ...actionData.config,
         },
       });
     }
 
+    const {
+      defaultParams: params = {},
+      name,
+      id: alertTypeId,
+      throttle = '1d',
+      interval = '1m',
+    } = this.alertOptions;
     return await alertsClient.create({
       data: {
         enabled: true,
         tags: [],
-        params: this.defaultParams,
+        params,
         consumer: 'monitoring',
-        name: this.label,
-        alertTypeId: this.type,
-        throttle: this.defaultThrottle,
-        schedule: { interval: this.defaultInterval },
+        name,
+        alertTypeId,
+        throttle,
+        schedule: { interval },
         actions: alertActions,
       },
     });
@@ -203,11 +203,7 @@ export class BaseAlert {
           accum[instanceId] = alertInstance;
           if (alertInstance.state) {
             accum[instanceId].state = {
-              alertStates: (alertInstance.state as AlertInstanceState).alertStates.filter(
-                (alertState: AlertState) => {
-                  return this.filterAlertState(alertState, filters);
-                }
-              ),
+              alertStates: (alertInstance.state as AlertInstanceState).alertStates,
             };
           }
         }
@@ -217,140 +213,194 @@ export class BaseAlert {
     );
   }
 
-  protected filterAlertInstance(alertInstance: RawAlertInstance, filters: CommonAlertFilter[]) {
-    return true;
-  }
-
-  protected filterAlertState(alertState: AlertState, filters: CommonAlertFilter[]) {
-    return true;
+  protected filterAlertInstance(
+    alertInstance: RawAlertInstance,
+    filters: CommonAlertFilter[],
+    filterOnNodes: boolean = false
+  ) {
+    if (!filterOnNodes) {
+      return true;
+    }
+    const alertInstanceStates = alertInstance.state?.alertStates as AlertNodeState[];
+    const nodeFilter = filters?.find((filter) => filter.nodeUuid);
+    if (!filters || !filters.length || !alertInstanceStates?.length || !nodeFilter?.nodeUuid) {
+      return true;
+    }
+    const nodeAlerts = alertInstanceStates.filter(({ nodeId }) => nodeId === nodeFilter.nodeUuid);
+    return Boolean(nodeAlerts.length);
   }
 
-  protected async execute({ services, params, state }: AlertExecutorOptions): Promise<any> {
-    const logger = this.getLogger(this.type);
-    logger.debug(
+  protected async execute({
+    services,
+    params,
+    state,
+  }: AlertExecutorOptions & { state: ExecutedState }): Promise<any> {
+    this.scopedLogger.debug(
       `Executing alert with params: ${JSON.stringify(params)} and state: ${JSON.stringify(state)}`
     );
 
-    const _callCluster = this.monitoringCluster
-      ? this.monitoringCluster.callAsInternalUser
-      : services.callCluster;
+    const useCallCluster =
+      Globals.app.monitoringCluster?.callAsInternalUser || services.callCluster;
     const callCluster = async (
       endpoint: string,
       clientParams?: Record<string, unknown>,
       options?: LegacyCallAPIOptions
     ) => {
-      return await mbSafeQuery(async () => _callCluster(endpoint, clientParams, options));
+      return await mbSafeQuery(async () => useCallCluster(endpoint, clientParams, options));
     };
-    const availableCcs = this.config.ui.ccs.enabled ? await fetchAvailableCcs(callCluster) : [];
-    const clusters = await this.fetchClusters(callCluster, availableCcs, params);
-    const uiSettings = (await this.getUiSettingsService()).asScopedToClient(
-      services.savedObjectsClient
+    const availableCcs = Globals.app.config.ui.ccs.enabled
+      ? await fetchAvailableCcs(callCluster)
+      : [];
+    const clusters = await this.fetchClusters(
+      callCluster,
+      params as CommonAlertParams,
+      availableCcs
     );
-
-    const data = await this.fetchData(params, callCluster, clusters, uiSettings, availableCcs);
-    return await this.processData(data, clusters, services, logger, state);
+    if (this.alertOptions.legacy) {
+      const data = await this.fetchLegacyData(callCluster, clusters, availableCcs);
+      return await this.processLegacyData(data, clusters, services, state);
+    }
+    const data = await this.fetchData(params, callCluster, clusters, availableCcs);
+    return await this.processData(data, clusters, services, state);
   }
 
   protected async fetchClusters(
-    callCluster: any,
-    availableCcs: string[] | undefined = undefined,
-    params: CommonAlertParams
+    callCluster: CallCluster,
+    params: CommonAlertParams,
+    ccs?: string[]
   ) {
-    let ccs;
-    if (!availableCcs) {
-      ccs = this.config.ui.ccs.enabled ? await fetchAvailableCcs(callCluster) : undefined;
-    } else {
-      ccs = availableCcs;
-    }
-    // Support CCS use cases by querying to find available remote clusters
-    // and then adding those to the index pattern we are searching against
-    let esIndexPattern = appendMetricbeatIndex(this.config, INDEX_PATTERN_ELASTICSEARCH);
-    if (ccs) {
+    let esIndexPattern = appendMetricbeatIndex(Globals.app.config, INDEX_PATTERN_ELASTICSEARCH);
+    if (ccs?.length) {
       esIndexPattern = getCcsIndexPattern(esIndexPattern, ccs);
     }
-    return await fetchClusters(callCluster, esIndexPattern);
+    if (!params.limit) {
+      return await fetchClusters(callCluster, esIndexPattern);
+    }
+    const limit = parseDuration(params.limit);
+    const rangeFilter = this.alertOptions.fetchClustersRange
+      ? {
+          timestamp: {
+            format: 'epoch_millis',
+            gte: limit - this.alertOptions.fetchClustersRange,
+          },
+        }
+      : undefined;
+    return await fetchClusters(callCluster, esIndexPattern, rangeFilter);
   }
 
   protected async fetchData(
     params: CommonAlertParams | unknown,
-    callCluster: any,
+    callCluster: CallCluster,
     clusters: AlertCluster[],
-    uiSettings: IUiSettingsClient,
     availableCcs: string[]
   ): Promise<Array<AlertData & unknown>> {
-    // Child should implement
     throw new Error('Child classes must implement `fetchData`');
   }
 
+  protected async fetchLegacyData(
+    callCluster: CallCluster,
+    clusters: AlertCluster[],
+    availableCcs: string[]
+  ): Promise<AlertData[]> {
+    let alertIndexPattern = INDEX_ALERTS;
+    if (availableCcs) {
+      alertIndexPattern = getCcsIndexPattern(alertIndexPattern, availableCcs);
+    }
+    const legacyAlerts = await fetchLegacyAlerts(
+      callCluster,
+      clusters,
+      alertIndexPattern,
+      this.alertOptions.legacy!.watchName,
+      Globals.app.config.ui.max_bucket_size
+    );
+
+    return legacyAlerts.map((legacyAlert) => {
+      return {
+        clusterUuid: legacyAlert.metadata.cluster_uuid,
+        shouldFire: !legacyAlert.resolved_timestamp,
+        severity: mapLegacySeverity(legacyAlert.metadata.severity),
+        meta: legacyAlert,
+        ...this.alertOptions.legacy!.changeDataValues,
+      };
+    });
+  }
+
   protected async processData(
-    data: Array<AlertData & unknown>,
+    data: AlertData[],
     clusters: AlertCluster[],
     services: AlertServices,
-    logger: Logger,
-    instanceState: unknown
-  ): Promise<void | Record<string, any>> {
-    for (const item of data) {
-      const cluster = clusters.find((c: AlertCluster) => c.clusterUuid === item.clusterUuid);
-      if (!cluster) {
-        logger.warn(`Unable to find cluster for clusterUuid='${item.clusterUuid}'`);
+    state: ExecutedState
+  ) {
+    const currentUTC = +new Date();
+    for (const cluster of clusters) {
+      const nodes = data.filter((node) => node.clusterUuid === cluster.clusterUuid);
+      if (!nodes.length) {
         continue;
       }
 
-      const instance = services.alertInstanceFactory(`${this.type}:${item.instanceKey}`);
-      const state = (instance.getState() as unknown) as AlertInstanceState;
-      const alertInstanceState: AlertInstanceState = { alertStates: state?.alertStates || [] };
-      let alertState: AlertState;
-      const indexInState = this.findIndexInInstanceState(alertInstanceState, cluster);
-      if (indexInState > -1) {
-        alertState = state.alertStates[indexInState];
-      } else {
-        alertState = this.getDefaultAlertState(cluster, item);
-      }
-
-      let shouldExecuteActions = false;
-      if (item.shouldFire) {
-        logger.debug(`${this.type} is firing`);
-        alertState.ui.triggeredMS = +new Date();
-        alertState.ui.isFiring = true;
-        alertState.ui.message = this.getUiMessage(alertState, item);
-        alertState.ui.severity = item.severity;
-        alertState.ui.resolvedMS = 0;
-        shouldExecuteActions = true;
-      } else if (!item.shouldFire && alertState.ui.isFiring) {
-        logger.debug(`${this.type} is not firing anymore`);
-        alertState.ui.isFiring = false;
-        alertState.ui.resolvedMS = +new Date();
-        alertState.ui.message = this.getUiMessage(alertState, item);
-        shouldExecuteActions = true;
-      }
-
-      if (indexInState === -1) {
-        alertInstanceState.alertStates.push(alertState);
-      } else {
-        alertInstanceState.alertStates = [
-          ...alertInstanceState.alertStates.slice(0, indexInState),
-          alertState,
-          ...alertInstanceState.alertStates.slice(indexInState + 1),
-        ];
+      const firingNodeUuids = nodes
+        .filter((node) => node.shouldFire)
+        .map((node) => node.meta.nodeId)
+        .join(',');
+      const instanceId = `${this.alertOptions.id}:${cluster.clusterUuid}:${firingNodeUuids}`;
+      const instance = services.alertInstanceFactory(instanceId);
+      const newAlertStates: AlertNodeState[] = [];
+      const key = this.alertOptions.accessorKey;
+      for (const node of nodes) {
+        if (!node.shouldFire) {
+          continue;
+        }
+        const stat = node.meta as AlertNodeState;
+        const nodeState = this.getDefaultAlertState(cluster, node) as AlertNodeState;
+        if (key) {
+          nodeState[key] = stat[key];
+        }
+        nodeState.nodeId = stat.nodeId || node.nodeId!;
+        nodeState.nodeName = stat.nodeName || node.nodeName || nodeState.nodeId;
+        nodeState.ui.triggeredMS = currentUTC;
+        nodeState.ui.isFiring = true;
+        nodeState.ui.severity = node.severity;
+        nodeState.ui.message = this.getUiMessage(nodeState, node);
+        newAlertStates.push(nodeState);
       }
 
+      const alertInstanceState = { alertStates: newAlertStates };
       instance.replaceState(alertInstanceState);
-      if (shouldExecuteActions) {
-        this.executeActions(instance, alertInstanceState, item, cluster);
+      if (newAlertStates.length) {
+        this.executeActions(instance, alertInstanceState, null, cluster);
+        state.lastExecutedAction = currentUTC;
       }
     }
-  }
 
-  public getDefaultActionMessage(forDefaultServerLog: boolean): string {
-    return forDefaultServerLog
-      ? '{{context.internalShortMessage}}'
-      : '{{context.internalFullMessage}}';
+    state.lastChecked = currentUTC;
+    return state;
   }
 
-  protected findIndexInInstanceState(stateInstance: AlertInstanceState, cluster: AlertCluster) {
-    return stateInstance.alertStates.findIndex(
-      (alertState) => alertState.cluster.clusterUuid === cluster.clusterUuid
-    );
+  protected async processLegacyData(
+    data: AlertData[],
+    clusters: AlertCluster[],
+    services: AlertServices,
+    state: ExecutedState
+  ) {
+    const currentUTC = +new Date();
+    for (const item of data) {
+      const instanceId = `${this.alertOptions.id}:${item.clusterUuid}`;
+      const instance = services.alertInstanceFactory(instanceId);
+      if (!item.shouldFire) {
+        instance.replaceState({ alertStates: [] });
+        continue;
+      }
+      const cluster = clusters.find((c: AlertCluster) => c.clusterUuid === item.clusterUuid);
+      const alertState: AlertState = this.getDefaultAlertState(cluster!, item);
+      alertState.ui.triggeredMS = currentUTC;
+      alertState.ui.isFiring = true;
+      alertState.ui.severity = item.severity;
+      alertState.ui.message = this.getUiMessage(alertState, item);
+      instance.replaceState({ alertStates: [alertState] });
+      this.executeActions(instance, alertState, item, cluster);
+    }
+    state.lastChecked = currentUTC;
+    return state;
   }
 
   protected getDefaultAlertState(cluster: AlertCluster, item: AlertData): AlertState {
@@ -361,13 +411,16 @@ export class BaseAlert {
         isFiring: false,
         message: null,
         severity: AlertSeverity.Success,
-        resolvedMS: 0,
         triggeredMS: 0,
         lastCheckedMS: 0,
       },
     };
   }
 
+  protected getVersions(legacyAlert: LegacyAlert) {
+    return `[${legacyAlert.message.match(/(?<=Versions: \[).+?(?=\])/)}]`;
+  }
+
   protected getUiMessage(
     alertState: AlertState | unknown,
     item: AlertData | unknown
@@ -377,7 +430,7 @@ export class BaseAlert {
 
   protected executeActions(
     instance: AlertInstance,
-    instanceState: AlertInstanceState | unknown,
+    instanceState: AlertInstanceState | AlertState | unknown,
     item: AlertData | unknown,
     cluster?: AlertCluster | unknown
   ) {
@@ -389,6 +442,6 @@ export class BaseAlert {
     if (ccs) {
       globalState.push(`ccs:${ccs}`);
     }
-    return `${this.kibanaUrl}/app/monitoring#/${link}?_g=(${globalState.toString()})`;
+    return `${Globals.app.url}/app/monitoring#/${link}?_g=(${globalState.toString()})`;
   }
 }
diff --git a/x-pack/plugins/monitoring/server/alerts/cluster_health_alert.test.ts b/x-pack/plugins/monitoring/server/alerts/cluster_health_alert.test.ts
index 22b6c6607016f..a4e9f56109698 100644
--- a/x-pack/plugins/monitoring/server/alerts/cluster_health_alert.test.ts
+++ b/x-pack/plugins/monitoring/server/alerts/cluster_health_alert.test.ts
@@ -10,6 +10,20 @@ import { fetchClusters } from '../lib/alerts/fetch_clusters';
 
 const RealDate = Date;
 
+jest.mock('../static_globals', () => ({
+  Globals: {
+    app: {
+      getLogger: () => ({ debug: jest.fn() }),
+      config: {
+        ui: {
+          ccs: { enabled: true },
+          metricbeat: { index: 'metricbeat-*' },
+        },
+      },
+    },
+  },
+}));
+
 jest.mock('../lib/alerts/fetch_legacy_alerts', () => ({
   fetchLegacyAlerts: jest.fn(),
 }));
@@ -20,11 +34,10 @@ jest.mock('../lib/alerts/fetch_clusters', () => ({
 describe('ClusterHealthAlert', () => {
   it('should have defaults', () => {
     const alert = new ClusterHealthAlert();
-    expect(alert.type).toBe(ALERT_CLUSTER_HEALTH);
-    expect(alert.label).toBe('Cluster health');
-    expect(alert.defaultThrottle).toBe('1d');
-    // @ts-ignore
-    expect(alert.actionVariables).toStrictEqual([
+    expect(alert.alertOptions.id).toBe(ALERT_CLUSTER_HEALTH);
+    expect(alert.alertOptions.name).toBe('Cluster health');
+    expect(alert.alertOptions.throttle).toBe('1d');
+    expect(alert.alertOptions.actionVariables).toStrictEqual([
       { name: 'clusterHealth', description: 'The health of the cluster.' },
       {
         name: 'internalShortMessage',
@@ -58,21 +71,6 @@ describe('ClusterHealthAlert', () => {
         cluster_uuid: clusterUuid,
       },
     };
-    const getUiSettingsService = () => ({
-      asScopedToClient: jest.fn(),
-    });
-    const getLogger = () => ({
-      debug: jest.fn(),
-    });
-    const monitoringCluster = null;
-    const config = {
-      ui: {
-        ccs: { enabled: true },
-        container: { elasticsearch: { enabled: false } },
-        metricbeat: { index: 'metricbeat-*' },
-      },
-    };
-    const kibanaUrl = 'http://localhost:5601';
 
     const replaceState = jest.fn();
     const scheduleActions = jest.fn();
@@ -111,19 +109,10 @@ describe('ClusterHealthAlert', () => {
 
     it('should fire actions', async () => {
       const alert = new ClusterHealthAlert();
-      alert.initializeAlertType(
-        getUiSettingsService as any,
-        monitoringCluster as any,
-        getLogger as any,
-        config as any,
-        kibanaUrl,
-        false
-      );
       const type = alert.getAlertType();
       await type.executor({
         ...executorOptions,
-        // @ts-ignore
-        params: alert.defaultParams,
+        params: {},
       } as any);
       expect(replaceState).toHaveBeenCalledWith({
         alertStates: [
@@ -149,7 +138,6 @@ describe('ClusterHealthAlert', () => {
                 ],
               },
               severity: 'danger',
-              resolvedMS: 0,
               triggeredMS: 1,
               lastCheckedMS: 0,
             },
@@ -174,94 +162,13 @@ describe('ClusterHealthAlert', () => {
         return [];
       });
       const alert = new ClusterHealthAlert();
-      alert.initializeAlertType(
-        getUiSettingsService as any,
-        monitoringCluster as any,
-        getLogger as any,
-        config as any,
-        kibanaUrl,
-        false
-      );
       const type = alert.getAlertType();
       await type.executor({
         ...executorOptions,
-        // @ts-ignore
-        params: alert.defaultParams,
+        params: {},
       } as any);
       expect(replaceState).not.toHaveBeenCalledWith({});
       expect(scheduleActions).not.toHaveBeenCalled();
     });
-
-    it('should resolve with a resolved message', async () => {
-      (fetchLegacyAlerts as jest.Mock).mockImplementation(() => {
-        return [
-          {
-            ...legacyAlert,
-            resolved_timestamp: 1,
-          },
-        ];
-      });
-      (getState as jest.Mock).mockImplementation(() => {
-        return {
-          alertStates: [
-            {
-              cluster: {
-                clusterUuid,
-                clusterName,
-              },
-              ccs: undefined,
-              ui: {
-                isFiring: true,
-                message: null,
-                severity: 'danger',
-                resolvedMS: 0,
-                triggeredMS: 1,
-                lastCheckedMS: 0,
-              },
-            },
-          ],
-        };
-      });
-      const alert = new ClusterHealthAlert();
-      alert.initializeAlertType(
-        getUiSettingsService as any,
-        monitoringCluster as any,
-        getLogger as any,
-        config as any,
-        kibanaUrl,
-        false
-      );
-      const type = alert.getAlertType();
-      await type.executor({
-        ...executorOptions,
-        // @ts-ignore
-        params: alert.defaultParams,
-      } as any);
-      expect(replaceState).toHaveBeenCalledWith({
-        alertStates: [
-          {
-            cluster: { clusterUuid, clusterName },
-            ccs: undefined,
-            ui: {
-              isFiring: false,
-              message: {
-                text: 'Elasticsearch cluster health is green.',
-              },
-              severity: 'danger',
-              resolvedMS: 1,
-              triggeredMS: 1,
-              lastCheckedMS: 0,
-            },
-          },
-        ],
-      });
-      expect(scheduleActions).toHaveBeenCalledWith('default', {
-        internalFullMessage: 'Cluster health alert is resolved for testCluster.',
-        internalShortMessage: 'Cluster health alert is resolved for testCluster.',
-        clusterName,
-        clusterHealth: 'yellow',
-        state: 'resolved',
-      });
-    });
   });
 });
diff --git a/x-pack/plugins/monitoring/server/alerts/cluster_health_alert.ts b/x-pack/plugins/monitoring/server/alerts/cluster_health_alert.ts
index 8166b1b7f6079..3b375654548d8 100644
--- a/x-pack/plugins/monitoring/server/alerts/cluster_health_alert.ts
+++ b/x-pack/plugins/monitoring/server/alerts/cluster_health_alert.ts
@@ -3,7 +3,7 @@
  * or more contributor license agreements. Licensed under the Elastic License;
  * you may not use this file except in compliance with the Elastic License.
  */
-import { IUiSettingsClient } from 'kibana/server';
+
 import { i18n } from '@kbn/i18n';
 import { BaseAlert } from './base_alert';
 import {
@@ -12,17 +12,13 @@ import {
   AlertState,
   AlertMessage,
   AlertMessageLinkToken,
-  AlertInstanceState,
   LegacyAlert,
-  CommonAlertParams,
 } from '../../common/types/alerts';
 import { AlertInstance } from '../../../alerts/server';
-import { INDEX_ALERTS, ALERT_CLUSTER_HEALTH, LEGACY_ALERT_DETAILS } from '../../common/constants';
-import { getCcsIndexPattern } from '../lib/alerts/get_ccs_index_pattern';
+import { ALERT_CLUSTER_HEALTH, LEGACY_ALERT_DETAILS } from '../../common/constants';
 import { AlertMessageTokenType, AlertClusterHealthType } from '../../common/enums';
-import { fetchLegacyAlerts } from '../lib/alerts/fetch_legacy_alerts';
-import { mapLegacySeverity } from '../lib/alerts/map_legacy_severity';
 import { AlertingDefaults } from './alert_helpers';
+import { SanitizedAlert } from '../../../alerts/common';
 
 const RED_STATUS_MESSAGE = i18n.translate('xpack.monitoring.alerts.clusterHealth.redMessage', {
   defaultMessage: 'Allocate missing primary and replica shards',
@@ -35,76 +31,38 @@ const YELLOW_STATUS_MESSAGE = i18n.translate(
   }
 );
 
-const WATCH_NAME = 'elasticsearch_cluster_status';
-
 export class ClusterHealthAlert extends BaseAlert {
-  public type = ALERT_CLUSTER_HEALTH;
-  public label = LEGACY_ALERT_DETAILS[ALERT_CLUSTER_HEALTH].label;
-  public description = LEGACY_ALERT_DETAILS[ALERT_CLUSTER_HEALTH].description;
-  public isLegacy = true;
-
-  protected actionVariables = [
-    {
-      name: 'clusterHealth',
-      description: i18n.translate(
-        'xpack.monitoring.alerts.clusterHealth.actionVariables.clusterHealth',
+  constructor(public rawAlert?: SanitizedAlert) {
+    super(rawAlert, {
+      id: ALERT_CLUSTER_HEALTH,
+      name: LEGACY_ALERT_DETAILS[ALERT_CLUSTER_HEALTH].label,
+      legacy: {
+        watchName: 'elasticsearch_cluster_status',
+      },
+      actionVariables: [
         {
-          defaultMessage: 'The health of the cluster.',
-        }
-      ),
-    },
-    ...Object.values(AlertingDefaults.ALERT_TYPE.context),
-  ];
-
-  protected async fetchData(
-    params: CommonAlertParams,
-    callCluster: any,
-    clusters: AlertCluster[],
-    uiSettings: IUiSettingsClient,
-    availableCcs: string[]
-  ): Promise<AlertData[]> {
-    let alertIndexPattern = INDEX_ALERTS;
-    if (availableCcs) {
-      alertIndexPattern = getCcsIndexPattern(alertIndexPattern, availableCcs);
-    }
-    const legacyAlerts = await fetchLegacyAlerts(
-      callCluster,
-      clusters,
-      alertIndexPattern,
-      WATCH_NAME,
-      this.config.ui.max_bucket_size
-    );
-    return legacyAlerts.reduce((accum: AlertData[], legacyAlert) => {
-      accum.push({
-        instanceKey: `${legacyAlert.metadata.cluster_uuid}`,
-        clusterUuid: legacyAlert.metadata.cluster_uuid,
-        shouldFire: !legacyAlert.resolved_timestamp,
-        severity: mapLegacySeverity(legacyAlert.metadata.severity),
-        meta: legacyAlert,
-      });
-      return accum;
-    }, []);
+          name: 'clusterHealth',
+          description: i18n.translate(
+            'xpack.monitoring.alerts.clusterHealth.actionVariables.clusterHealth',
+            {
+              defaultMessage: 'The health of the cluster.',
+            }
+          ),
+        },
+        ...Object.values(AlertingDefaults.ALERT_TYPE.context),
+      ],
+    });
   }
 
   private getHealth(legacyAlert: LegacyAlert) {
-    const prefixStr = 'Elasticsearch cluster status is ';
-    return legacyAlert.prefix.slice(
-      legacyAlert.prefix.indexOf(prefixStr) + prefixStr.length,
-      legacyAlert.prefix.length - 1
-    ) as AlertClusterHealthType;
+    return legacyAlert.prefix
+      .replace('Elasticsearch cluster status is ', '')
+      .slice(0, -1) as AlertClusterHealthType;
   }
 
   protected getUiMessage(alertState: AlertState, item: AlertData): AlertMessage {
     const legacyAlert = item.meta as LegacyAlert;
     const health = this.getHealth(legacyAlert);
-    if (!alertState.ui.isFiring) {
-      return {
-        text: i18n.translate('xpack.monitoring.alerts.clusterHealth.ui.resolvedMessage', {
-          defaultMessage: `Elasticsearch cluster health is green.`,
-        }),
-      };
-    }
-
     return {
       text: i18n.translate('xpack.monitoring.alerts.clusterHealth.ui.firingMessage', {
         defaultMessage: `Elasticsearch cluster health is {health}.`,
@@ -136,41 +94,13 @@ export class ClusterHealthAlert extends BaseAlert {
 
   protected async executeActions(
     instance: AlertInstance,
-    instanceState: AlertInstanceState,
+    alertState: AlertState,
     item: AlertData,
     cluster: AlertCluster
   ) {
-    if (instanceState.alertStates.length === 0) {
-      return;
-    }
-    const alertState = instanceState.alertStates[0];
     const legacyAlert = item.meta as LegacyAlert;
     const health = this.getHealth(legacyAlert);
-    if (!alertState.ui.isFiring) {
-      instance.scheduleActions('default', {
-        internalShortMessage: i18n.translate(
-          'xpack.monitoring.alerts.clusterHealth.resolved.internalShortMessage',
-          {
-            defaultMessage: `Cluster health alert is resolved for {clusterName}.`,
-            values: {
-              clusterName: cluster.clusterName,
-            },
-          }
-        ),
-        internalFullMessage: i18n.translate(
-          'xpack.monitoring.alerts.clusterHealth.resolved.internalFullMessage',
-          {
-            defaultMessage: `Cluster health alert is resolved for {clusterName}.`,
-            values: {
-              clusterName: cluster.clusterName,
-            },
-          }
-        ),
-        state: AlertingDefaults.ALERT_STATE.resolved,
-        clusterHealth: health,
-        clusterName: cluster.clusterName,
-      });
-    } else {
+    if (alertState.ui.isFiring) {
       const actionText =
         health === AlertClusterHealthType.Red
           ? i18n.translate('xpack.monitoring.alerts.clusterHealth.action.danger', {
diff --git a/x-pack/plugins/monitoring/server/alerts/cpu_usage_alert.test.ts b/x-pack/plugins/monitoring/server/alerts/cpu_usage_alert.test.ts
index a53ae1f9d0dd5..63195621fb9c8 100644
--- a/x-pack/plugins/monitoring/server/alerts/cpu_usage_alert.test.ts
+++ b/x-pack/plugins/monitoring/server/alerts/cpu_usage_alert.test.ts
@@ -17,16 +17,29 @@ jest.mock('../lib/alerts/fetch_clusters', () => ({
   fetchClusters: jest.fn(),
 }));
 
+jest.mock('../static_globals', () => ({
+  Globals: {
+    app: {
+      getLogger: () => ({ debug: jest.fn() }),
+      config: {
+        ui: {
+          ccs: { enabled: true },
+          metricbeat: { index: 'metricbeat-*' },
+          container: { elasticsearch: { enabled: false } },
+        },
+      },
+    },
+  },
+}));
+
 describe('CpuUsageAlert', () => {
   it('should have defaults', () => {
     const alert = new CpuUsageAlert();
-    expect(alert.type).toBe(ALERT_CPU_USAGE);
-    expect(alert.label).toBe('CPU Usage');
-    expect(alert.defaultThrottle).toBe('1d');
-    // @ts-ignore
-    expect(alert.defaultParams).toStrictEqual({ threshold: 85, duration: '5m' });
-    // @ts-ignore
-    expect(alert.actionVariables).toStrictEqual([
+    expect(alert.alertOptions.id).toBe(ALERT_CPU_USAGE);
+    expect(alert.alertOptions.name).toBe('CPU Usage');
+    expect(alert.alertOptions.throttle).toBe('1d');
+    expect(alert.alertOptions.defaultParams).toStrictEqual({ threshold: 85, duration: '5m' });
+    expect(alert.alertOptions.actionVariables).toStrictEqual([
       { name: 'nodes', description: 'The list of nodes reporting high cpu usage.' },
       { name: 'count', description: 'The number of nodes reporting high cpu usage.' },
       {
@@ -62,21 +75,6 @@ describe('CpuUsageAlert', () => {
       nodeName,
       cpuUsage,
     };
-    const getUiSettingsService = () => ({
-      asScopedToClient: jest.fn(),
-    });
-    const getLogger = () => ({
-      debug: jest.fn(),
-    });
-    const monitoringCluster = null;
-    const config = {
-      ui: {
-        ccs: { enabled: true },
-        container: { elasticsearch: { enabled: false } },
-        metricbeat: { index: 'metricbeat-*' },
-      },
-    };
-    const kibanaUrl = 'http://localhost:5601';
 
     const replaceState = jest.fn();
     const scheduleActions = jest.fn();
@@ -115,19 +113,10 @@ describe('CpuUsageAlert', () => {
 
     it('should fire actions', async () => {
       const alert = new CpuUsageAlert();
-      alert.initializeAlertType(
-        getUiSettingsService as any,
-        monitoringCluster as any,
-        getLogger as any,
-        config as any,
-        kibanaUrl,
-        false
-      );
       const type = alert.getAlertType();
       await type.executor({
         ...executorOptions,
-        // @ts-ignore
-        params: alert.defaultParams,
+        params: alert.alertOptions.defaultParams,
       } as any);
       const count = 1;
       expect(replaceState).toHaveBeenCalledWith({
@@ -142,7 +131,7 @@ describe('CpuUsageAlert', () => {
               isFiring: true,
               message: {
                 text:
-                  'Node #start_linkmyNodeName#end_link is reporting cpu usage of 91.00% at #absolute',
+                  'Node #start_linkmyNodeName#end_link is reporting cpu usage of 91% at #absolute',
                 nextSteps: [
                   {
                     text: '#start_linkCheck hot threads#end_link',
@@ -186,7 +175,6 @@ describe('CpuUsageAlert', () => {
                 ],
               },
               severity: 'danger',
-              resolvedMS: 0,
               triggeredMS: 1,
               lastCheckedMS: 0,
             },
@@ -200,7 +188,7 @@ describe('CpuUsageAlert', () => {
         actionPlain: 'Verify CPU levels across affected nodes.',
         clusterName,
         count,
-        nodes: `${nodeName}:${cpuUsage.toFixed(2)}`,
+        nodes: `${nodeName}:${cpuUsage}`,
         state: 'firing',
       });
     });
@@ -215,135 +203,17 @@ describe('CpuUsageAlert', () => {
         ];
       });
       const alert = new CpuUsageAlert();
-      alert.initializeAlertType(
-        getUiSettingsService as any,
-        monitoringCluster as any,
-        getLogger as any,
-        config as any,
-        kibanaUrl,
-        false
-      );
       const type = alert.getAlertType();
       await type.executor({
         ...executorOptions,
-        // @ts-ignore
-        params: alert.defaultParams,
+        params: alert.alertOptions.defaultParams,
       } as any);
       expect(replaceState).toHaveBeenCalledWith({
-        alertStates: [
-          {
-            ccs: undefined,
-            cluster: {
-              clusterUuid,
-              clusterName,
-            },
-            cpuUsage: 1,
-            nodeId,
-            nodeName,
-            ui: {
-              isFiring: false,
-              lastCheckedMS: 0,
-              message: null,
-              resolvedMS: 0,
-              severity: 'danger',
-              triggeredMS: 0,
-            },
-          },
-        ],
+        alertStates: [],
       });
       expect(scheduleActions).not.toHaveBeenCalled();
     });
 
-    it('should resolve with a resolved message', async () => {
-      (fetchCpuUsageNodeStats as jest.Mock).mockImplementation(() => {
-        return [
-          {
-            ...stat,
-            cpuUsage: 1,
-          },
-        ];
-      });
-      (getState as jest.Mock).mockImplementation(() => {
-        return {
-          alertStates: [
-            {
-              cluster: {
-                clusterUuid,
-                clusterName,
-              },
-              ccs: null,
-              cpuUsage: 91,
-              nodeId,
-              nodeName,
-              ui: {
-                isFiring: true,
-                message: null,
-                severity: 'danger',
-                resolvedMS: 0,
-                triggeredMS: 1,
-                lastCheckedMS: 0,
-              },
-            },
-          ],
-        };
-      });
-      const alert = new CpuUsageAlert();
-      alert.initializeAlertType(
-        getUiSettingsService as any,
-        monitoringCluster as any,
-        getLogger as any,
-        config as any,
-        kibanaUrl,
-        false
-      );
-      const type = alert.getAlertType();
-      await type.executor({
-        ...executorOptions,
-        // @ts-ignore
-        params: alert.defaultParams,
-      } as any);
-      const count = 1;
-      expect(replaceState).toHaveBeenCalledWith({
-        alertStates: [
-          {
-            cluster: { clusterUuid, clusterName },
-            ccs: null,
-            cpuUsage: 1,
-            nodeId,
-            nodeName,
-            ui: {
-              isFiring: false,
-              message: {
-                text:
-                  'The cpu usage on node myNodeName is now under the threshold, currently reporting at 1.00% as of #resolved',
-                tokens: [
-                  {
-                    startToken: '#resolved',
-                    type: 'time',
-                    isAbsolute: true,
-                    isRelative: false,
-                    timestamp: 1,
-                  },
-                ],
-              },
-              severity: 'danger',
-              resolvedMS: 1,
-              triggeredMS: 1,
-              lastCheckedMS: 0,
-            },
-          },
-        ],
-      });
-      expect(scheduleActions).toHaveBeenCalledWith('default', {
-        internalFullMessage: `CPU usage alert is resolved for ${count} node(s) in cluster: ${clusterName}.`,
-        internalShortMessage: `CPU usage alert is resolved for ${count} node(s) in cluster: ${clusterName}.`,
-        clusterName,
-        count,
-        nodes: `${nodeName}:1.00`,
-        state: 'resolved',
-      });
-    });
-
     it('should handle ccs', async () => {
       const ccs = 'testCluster';
       (fetchCpuUsageNodeStats as jest.Mock).mockImplementation(() => {
@@ -355,19 +225,10 @@ describe('CpuUsageAlert', () => {
         ];
       });
       const alert = new CpuUsageAlert();
-      alert.initializeAlertType(
-        getUiSettingsService as any,
-        monitoringCluster as any,
-        getLogger as any,
-        config as any,
-        kibanaUrl,
-        false
-      );
       const type = alert.getAlertType();
       await type.executor({
         ...executorOptions,
-        // @ts-ignore
-        params: alert.defaultParams,
+        params: alert.alertOptions.defaultParams,
       } as any);
       const count = 1;
       expect(scheduleActions).toHaveBeenCalledWith('default', {
@@ -377,228 +238,7 @@ describe('CpuUsageAlert', () => {
         actionPlain: 'Verify CPU levels across affected nodes.',
         clusterName,
         count,
-        nodes: `${nodeName}:${cpuUsage.toFixed(2)}`,
-        state: 'firing',
-      });
-    });
-
-    it('should show proper counts for resolved and firing nodes', async () => {
-      (fetchCpuUsageNodeStats as jest.Mock).mockImplementation(() => {
-        return [
-          {
-            ...stat,
-            cpuUsage: 1,
-          },
-          {
-            ...stat,
-            nodeId: 'anotherNode',
-            nodeName: 'anotherNode',
-            cpuUsage: 99,
-          },
-        ];
-      });
-      (getState as jest.Mock).mockImplementation(() => {
-        return {
-          alertStates: [
-            {
-              cluster: {
-                clusterUuid,
-                clusterName,
-              },
-              ccs: null,
-              cpuUsage: 91,
-              nodeId,
-              nodeName,
-              ui: {
-                isFiring: true,
-                message: null,
-                severity: 'danger',
-                resolvedMS: 0,
-                triggeredMS: 1,
-                lastCheckedMS: 0,
-              },
-            },
-            {
-              cluster: {
-                clusterUuid,
-                clusterName,
-              },
-              ccs: null,
-              cpuUsage: 100,
-              nodeId: 'anotherNode',
-              nodeName: 'anotherNode',
-              ui: {
-                isFiring: true,
-                message: null,
-                severity: 'danger',
-                resolvedMS: 0,
-                triggeredMS: 1,
-                lastCheckedMS: 0,
-              },
-            },
-          ],
-        };
-      });
-      const alert = new CpuUsageAlert();
-      alert.initializeAlertType(
-        getUiSettingsService as any,
-        monitoringCluster as any,
-        getLogger as any,
-        config as any,
-        kibanaUrl,
-        false
-      );
-      const type = alert.getAlertType();
-      await type.executor({
-        ...executorOptions,
-        // @ts-ignore
-        params: alert.defaultParams,
-      } as any);
-      const count = 1;
-      expect(replaceState).toHaveBeenCalledWith({
-        alertStates: [
-          {
-            cluster: { clusterUuid, clusterName },
-            ccs: null,
-            cpuUsage: 1,
-            nodeId,
-            nodeName,
-            ui: {
-              isFiring: false,
-              message: {
-                text:
-                  'The cpu usage on node myNodeName is now under the threshold, currently reporting at 1.00% as of #resolved',
-                tokens: [
-                  {
-                    startToken: '#resolved',
-                    type: 'time',
-                    isAbsolute: true,
-                    isRelative: false,
-                    timestamp: 1,
-                  },
-                ],
-              },
-              severity: 'danger',
-              resolvedMS: 1,
-              triggeredMS: 1,
-              lastCheckedMS: 0,
-            },
-          },
-          {
-            ccs: null,
-            cluster: { clusterUuid, clusterName },
-            cpuUsage: 99,
-            nodeId: 'anotherNode',
-            nodeName: 'anotherNode',
-            ui: {
-              isFiring: true,
-              message: {
-                text:
-                  'Node #start_linkanotherNode#end_link is reporting cpu usage of 99.00% at #absolute',
-                nextSteps: [
-                  {
-                    text: '#start_linkCheck hot threads#end_link',
-                    tokens: [
-                      {
-                        startToken: '#start_link',
-                        endToken: '#end_link',
-                        type: 'docLink',
-                        partialUrl:
-                          '{elasticWebsiteUrl}guide/en/elasticsearch/reference/{docLinkVersion}/cluster-nodes-hot-threads.html',
-                      },
-                    ],
-                  },
-                  {
-                    text: '#start_linkCheck long running tasks#end_link',
-                    tokens: [
-                      {
-                        startToken: '#start_link',
-                        endToken: '#end_link',
-                        type: 'docLink',
-                        partialUrl:
-                          '{elasticWebsiteUrl}guide/en/elasticsearch/reference/{docLinkVersion}/tasks.html',
-                      },
-                    ],
-                  },
-                ],
-                tokens: [
-                  {
-                    startToken: '#absolute',
-                    type: 'time',
-                    isAbsolute: true,
-                    isRelative: false,
-                    timestamp: 1,
-                  },
-                  {
-                    startToken: '#start_link',
-                    endToken: '#end_link',
-                    type: 'link',
-                    url: 'elasticsearch/nodes/anotherNode',
-                  },
-                ],
-              },
-              severity: 'danger',
-              resolvedMS: 0,
-              triggeredMS: 1,
-              lastCheckedMS: 0,
-            },
-          },
-        ],
-      });
-      expect(scheduleActions).toHaveBeenCalledTimes(1);
-      // expect(scheduleActions.mock.calls[0]).toEqual([
-      //   'default',
-      //   {
-      //     internalFullMessage: `CPU usage alert is resolved for ${count} node(s) in cluster: ${clusterName}.`,
-      //     internalShortMessage: `CPU usage alert is resolved for ${count} node(s) in cluster: ${clusterName}.`,
-      //     clusterName,
-      //     count,
-      //     nodes: `${nodeName}:1.00`,
-      //     state: 'resolved',
-      //   },
-      // ]);
-      expect(scheduleActions.mock.calls[0]).toEqual([
-        'default',
-        {
-          action: '[View nodes](elasticsearch/nodes)',
-          actionPlain: 'Verify CPU levels across affected nodes.',
-          internalFullMessage:
-            'CPU usage alert is firing for 1 node(s) in cluster: testCluster. [View nodes](elasticsearch/nodes)',
-          internalShortMessage:
-            'CPU usage alert is firing for 1 node(s) in cluster: testCluster. Verify CPU levels across affected nodes.',
-          nodes: 'anotherNode:99.00',
-          clusterName,
-          count,
-          state: 'firing',
-        },
-      ]);
-    });
-
-    it('should fire with different messaging for cloud', async () => {
-      const alert = new CpuUsageAlert();
-      alert.initializeAlertType(
-        getUiSettingsService as any,
-        monitoringCluster as any,
-        getLogger as any,
-        config as any,
-        kibanaUrl,
-        true
-      );
-      const type = alert.getAlertType();
-      await type.executor({
-        ...executorOptions,
-        // @ts-ignore
-        params: alert.defaultParams,
-      } as any);
-      const count = 1;
-      expect(scheduleActions).toHaveBeenCalledWith('default', {
-        internalFullMessage: `CPU usage alert is firing for ${count} node(s) in cluster: ${clusterName}. Verify CPU levels across affected nodes.`,
-        internalShortMessage: `CPU usage alert is firing for ${count} node(s) in cluster: ${clusterName}. Verify CPU levels across affected nodes.`,
-        action: `[View nodes](elasticsearch/nodes)`,
-        actionPlain: 'Verify CPU levels across affected nodes.',
-        clusterName,
-        count,
-        nodes: `${nodeName}:${cpuUsage.toFixed(2)}`,
+        nodes: `${nodeName}:${cpuUsage}`,
         state: 'firing',
       });
     });
diff --git a/x-pack/plugins/monitoring/server/alerts/cpu_usage_alert.ts b/x-pack/plugins/monitoring/server/alerts/cpu_usage_alert.ts
index e12660ce20035..7bdef1ee2c2c4 100644
--- a/x-pack/plugins/monitoring/server/alerts/cpu_usage_alert.ts
+++ b/x-pack/plugins/monitoring/server/alerts/cpu_usage_alert.ts
@@ -3,7 +3,7 @@
  * or more contributor license agreements. Licensed under the Elastic License;
  * you may not use this file except in compliance with the Elastic License.
  */
-import { IUiSettingsClient } from 'kibana/server';
+
 import { i18n } from '@kbn/i18n';
 import { BaseAlert } from './base_alert';
 import {
@@ -17,10 +17,9 @@ import {
   AlertMessageLinkToken,
   AlertInstanceState,
   CommonAlertFilter,
-  CommonAlertNodeUuidFilter,
   CommonAlertParams,
 } from '../../common/types/alerts';
-import { AlertInstance, AlertServices } from '../../../alerts/server';
+import { AlertInstance } from '../../../alerts/server';
 import {
   INDEX_PATTERN_ELASTICSEARCH,
   ALERT_CPU_USAGE,
@@ -29,54 +28,51 @@ import {
 import { fetchCpuUsageNodeStats } from '../lib/alerts/fetch_cpu_usage_node_stats';
 import { getCcsIndexPattern } from '../lib/alerts/get_ccs_index_pattern';
 import { AlertMessageTokenType, AlertSeverity } from '../../common/enums';
-import { RawAlertInstance } from '../../../alerts/common';
+import { RawAlertInstance, SanitizedAlert } from '../../../alerts/common';
 import { parseDuration } from '../../../alerts/common/parse_duration';
 import { AlertingDefaults, createLink } from './alert_helpers';
 import { appendMetricbeatIndex } from '../lib/alerts/append_mb_index';
-
-interface CpuUsageParams {
-  threshold: number;
-  duration: string;
-}
+import { Globals } from '../static_globals';
 
 export class CpuUsageAlert extends BaseAlert {
-  public type = ALERT_CPU_USAGE;
-  public label = ALERT_DETAILS[ALERT_CPU_USAGE].label;
-  public description = ALERT_DETAILS[ALERT_CPU_USAGE].description;
-
-  protected defaultParams: CpuUsageParams = {
-    threshold: 85,
-    duration: '5m',
-  };
-
-  protected actionVariables = [
-    {
-      name: 'nodes',
-      description: i18n.translate('xpack.monitoring.alerts.cpuUsage.actionVariables.nodes', {
-        defaultMessage: 'The list of nodes reporting high cpu usage.',
-      }),
-    },
-    {
-      name: 'count',
-      description: i18n.translate('xpack.monitoring.alerts.cpuUsage.actionVariables.count', {
-        defaultMessage: 'The number of nodes reporting high cpu usage.',
-      }),
-    },
-    ...Object.values(AlertingDefaults.ALERT_TYPE.context),
-  ];
+  constructor(public rawAlert?: SanitizedAlert) {
+    super(rawAlert, {
+      id: ALERT_CPU_USAGE,
+      name: ALERT_DETAILS[ALERT_CPU_USAGE].label,
+      accessorKey: 'cpuUsage',
+      defaultParams: {
+        threshold: 85,
+        duration: '5m',
+      },
+      actionVariables: [
+        {
+          name: 'nodes',
+          description: i18n.translate('xpack.monitoring.alerts.cpuUsage.actionVariables.nodes', {
+            defaultMessage: 'The list of nodes reporting high cpu usage.',
+          }),
+        },
+        {
+          name: 'count',
+          description: i18n.translate('xpack.monitoring.alerts.cpuUsage.actionVariables.count', {
+            defaultMessage: 'The number of nodes reporting high cpu usage.',
+          }),
+        },
+        ...Object.values(AlertingDefaults.ALERT_TYPE.context),
+      ],
+    });
+  }
 
   protected async fetchData(
     params: CommonAlertParams,
     callCluster: any,
     clusters: AlertCluster[],
-    uiSettings: IUiSettingsClient,
     availableCcs: string[]
   ): Promise<AlertData[]> {
-    let esIndexPattern = appendMetricbeatIndex(this.config, INDEX_PATTERN_ELASTICSEARCH);
+    let esIndexPattern = appendMetricbeatIndex(Globals.app.config, INDEX_PATTERN_ELASTICSEARCH);
     if (availableCcs) {
       esIndexPattern = getCcsIndexPattern(esIndexPattern, availableCcs);
     }
-    const duration = parseDuration(((params as unknown) as CpuUsageParams).duration);
+    const duration = parseDuration(params.duration);
     const endMs = +new Date();
     const startMs = endMs - duration;
     const stats = await fetchCpuUsageNodeStats(
@@ -85,18 +81,17 @@ export class CpuUsageAlert extends BaseAlert {
       esIndexPattern,
       startMs,
       endMs,
-      this.config.ui.max_bucket_size
+      Globals.app.config.ui.max_bucket_size
     );
     return stats.map((stat) => {
-      if (this.config.ui.container.elasticsearch.enabled) {
+      if (Globals.app.config.ui.container.elasticsearch.enabled) {
         stat.cpuUsage =
           (stat.containerUsage / (stat.containerPeriods * stat.containerQuota * 1000)) * 100;
       }
 
       return {
-        instanceKey: `${stat.clusterUuid}:${stat.nodeId}`,
         clusterUuid: stat.clusterUuid,
-        shouldFire: stat.cpuUsage > params.threshold,
+        shouldFire: stat.cpuUsage > params.threshold!,
         severity: AlertSeverity.Danger,
         meta: stat,
         ccs: stat.ccs,
@@ -105,25 +100,7 @@ export class CpuUsageAlert extends BaseAlert {
   }
 
   protected filterAlertInstance(alertInstance: RawAlertInstance, filters: CommonAlertFilter[]) {
-    const alertInstanceState = (alertInstance.state as unknown) as AlertInstanceState;
-    if (filters && filters.length) {
-      for (const _filter of filters) {
-        const filter = _filter as CommonAlertNodeUuidFilter;
-        if (filter && filter.nodeUuid) {
-          let nodeExistsInStates = false;
-          for (const state of alertInstanceState.alertStates) {
-            if ((state as AlertCpuUsageState).nodeId === filter.nodeUuid) {
-              nodeExistsInStates = true;
-              break;
-            }
-          }
-          if (!nodeExistsInStates) {
-            return false;
-          }
-        }
-      }
-    }
-    return true;
+    return super.filterAlertInstance(alertInstance, filters, true);
   }
 
   protected getDefaultAlertState(cluster: AlertCluster, item: AlertData): AlertState {
@@ -139,32 +116,12 @@ export class CpuUsageAlert extends BaseAlert {
 
   protected getUiMessage(alertState: AlertState, item: AlertData): AlertMessage {
     const stat = item.meta as AlertCpuUsageNodeStats;
-    if (!alertState.ui.isFiring) {
-      return {
-        text: i18n.translate('xpack.monitoring.alerts.cpuUsage.ui.resolvedMessage', {
-          defaultMessage: `The cpu usage on node {nodeName} is now under the threshold, currently reporting at {cpuUsage}% as of #resolved`,
-          values: {
-            nodeName: stat.nodeName,
-            cpuUsage: stat.cpuUsage.toFixed(2),
-          },
-        }),
-        tokens: [
-          {
-            startToken: '#resolved',
-            type: AlertMessageTokenType.Time,
-            isAbsolute: true,
-            isRelative: false,
-            timestamp: alertState.ui.resolvedMS,
-          } as AlertMessageTimeToken,
-        ],
-      };
-    }
     return {
       text: i18n.translate('xpack.monitoring.alerts.cpuUsage.ui.firingMessage', {
         defaultMessage: `Node #start_link{nodeName}#end_link is reporting cpu usage of {cpuUsage}% at #absolute`,
         values: {
           nodeName: stat.nodeName,
-          cpuUsage: stat.cpuUsage.toFixed(2),
+          cpuUsage: stat.cpuUsage,
         },
       }),
       nextSteps: [
@@ -201,23 +158,18 @@ export class CpuUsageAlert extends BaseAlert {
 
   protected executeActions(
     instance: AlertInstance,
-    instanceState: AlertInstanceState,
+    { alertStates }: AlertInstanceState,
     item: AlertData | null,
     cluster: AlertCluster
   ) {
-    if (instanceState.alertStates.length === 0) {
+    if (alertStates.length === 0) {
       return;
     }
 
-    const firingCount = instanceState.alertStates.filter((alertState) => alertState.ui.isFiring)
-      .length;
-    const firingNodes = instanceState.alertStates
-      .filter((_state) => (_state as AlertCpuUsageState).ui.isFiring)
-      .map((_state) => {
-        const state = _state as AlertCpuUsageState;
-        return `${state.nodeName}:${state.cpuUsage.toFixed(2)}`;
-      })
-      .join(',');
+    const firingNodes = alertStates.filter(
+      (alertState) => alertState.ui.isFiring
+    ) as AlertCpuUsageState[];
+    const firingCount = firingNodes.length;
     if (firingCount > 0) {
       const shortActionText = i18n.translate('xpack.monitoring.alerts.cpuUsage.shortAction', {
         defaultMessage: 'Verify CPU levels across affected nodes.',
@@ -250,127 +202,14 @@ export class CpuUsageAlert extends BaseAlert {
       );
       instance.scheduleActions('default', {
         internalShortMessage,
-        internalFullMessage: this.isCloud ? internalShortMessage : internalFullMessage,
+        internalFullMessage: Globals.app.isCloud ? internalShortMessage : internalFullMessage,
         state: AlertingDefaults.ALERT_STATE.firing,
-        nodes: firingNodes,
+        nodes: firingNodes.map(({ nodeName, cpuUsage }) => `${nodeName}:${cpuUsage}`).toString(),
         count: firingCount,
         clusterName: cluster.clusterName,
         action,
         actionPlain: shortActionText,
       });
-    } else {
-      const resolvedCount = instanceState.alertStates.filter(
-        (alertState) => !alertState.ui.isFiring
-      ).length;
-      const resolvedNodes = instanceState.alertStates
-        .filter((_state) => !(_state as AlertCpuUsageState).ui.isFiring)
-        .map((_state) => {
-          const state = _state as AlertCpuUsageState;
-          return `${state.nodeName}:${state.cpuUsage.toFixed(2)}`;
-        })
-        .join(',');
-      if (resolvedCount > 0) {
-        instance.scheduleActions('default', {
-          internalShortMessage: i18n.translate(
-            'xpack.monitoring.alerts.cpuUsage.resolved.internalShortMessage',
-            {
-              defaultMessage: `CPU usage alert is resolved for {count} node(s) in cluster: {clusterName}.`,
-              values: {
-                count: resolvedCount,
-                clusterName: cluster.clusterName,
-              },
-            }
-          ),
-          internalFullMessage: i18n.translate(
-            'xpack.monitoring.alerts.cpuUsage.resolved.internalFullMessage',
-            {
-              defaultMessage: `CPU usage alert is resolved for {count} node(s) in cluster: {clusterName}.`,
-              values: {
-                count: resolvedCount,
-                clusterName: cluster.clusterName,
-              },
-            }
-          ),
-          state: AlertingDefaults.ALERT_STATE.resolved,
-          nodes: resolvedNodes,
-          count: resolvedCount,
-          clusterName: cluster.clusterName,
-        });
-      }
-    }
-  }
-
-  protected async processData(
-    data: AlertData[],
-    clusters: AlertCluster[],
-    services: AlertServices
-  ) {
-    for (const cluster of clusters) {
-      const nodes = data.filter((_item) => _item.clusterUuid === cluster.clusterUuid);
-      if (nodes.length === 0) {
-        continue;
-      }
-      const firingNodeUuids = nodes.reduce((list: string[], node) => {
-        const stat = node.meta as AlertCpuUsageNodeStats;
-        if (node.shouldFire) {
-          list.push(stat.nodeId);
-        }
-        return list;
-      }, [] as string[]);
-      firingNodeUuids.sort(); // It doesn't matter how we sort, but keep the order consistent
-      const instanceId = `${this.type}:${cluster.clusterUuid}:${firingNodeUuids.join(',')}`;
-      const instance = services.alertInstanceFactory(instanceId);
-      const state = (instance.getState() as unknown) as AlertInstanceState;
-      const alertInstanceState: AlertInstanceState = { alertStates: state?.alertStates || [] };
-      let shouldExecuteActions = false;
-      for (const node of nodes) {
-        const stat = node.meta as AlertCpuUsageNodeStats;
-        let nodeState: AlertCpuUsageState;
-        const indexInState = alertInstanceState.alertStates.findIndex((alertState) => {
-          const nodeAlertState = alertState as AlertCpuUsageState;
-          return (
-            nodeAlertState.cluster.clusterUuid === cluster.clusterUuid &&
-            nodeAlertState.nodeId === (node.meta as AlertCpuUsageNodeStats).nodeId
-          );
-        });
-        if (indexInState > -1) {
-          nodeState = alertInstanceState.alertStates[indexInState] as AlertCpuUsageState;
-        } else {
-          nodeState = this.getDefaultAlertState(cluster, node) as AlertCpuUsageState;
-        }
-        nodeState.cpuUsage = stat.cpuUsage;
-        nodeState.nodeId = stat.nodeId;
-        nodeState.nodeName = stat.nodeName;
-
-        if (node.shouldFire) {
-          if (!nodeState.ui.isFiring) {
-            nodeState.ui.triggeredMS = new Date().valueOf();
-          }
-          nodeState.ui.isFiring = true;
-          nodeState.ui.message = this.getUiMessage(nodeState, node);
-          nodeState.ui.severity = node.severity;
-          nodeState.ui.resolvedMS = 0;
-          shouldExecuteActions = true;
-        } else if (!node.shouldFire && nodeState.ui.isFiring) {
-          nodeState.ui.isFiring = false;
-          nodeState.ui.resolvedMS = new Date().valueOf();
-          nodeState.ui.message = this.getUiMessage(nodeState, node);
-          shouldExecuteActions = true;
-        }
-        if (indexInState === -1) {
-          alertInstanceState.alertStates.push(nodeState);
-        } else {
-          alertInstanceState.alertStates = [
-            ...alertInstanceState.alertStates.slice(0, indexInState),
-            nodeState,
-            ...alertInstanceState.alertStates.slice(indexInState + 1),
-          ];
-        }
-      }
-      instance.replaceState(alertInstanceState);
-      if (shouldExecuteActions) {
-        this.executeActions(instance, alertInstanceState, null, cluster);
-      }
     }
   }
 }
diff --git a/x-pack/plugins/monitoring/server/alerts/disk_usage_alert.test.ts b/x-pack/plugins/monitoring/server/alerts/disk_usage_alert.test.ts
index 5605641992e1a..2f6137a6e5000 100644
--- a/x-pack/plugins/monitoring/server/alerts/disk_usage_alert.test.ts
+++ b/x-pack/plugins/monitoring/server/alerts/disk_usage_alert.test.ts
@@ -30,14 +30,29 @@ jest.mock('../lib/alerts/fetch_clusters', () => ({
   fetchClusters: jest.fn(),
 }));
 
+jest.mock('../static_globals', () => ({
+  Globals: {
+    app: {
+      getLogger: () => ({ debug: jest.fn() }),
+      config: {
+        ui: {
+          ccs: { enabled: true },
+          metricbeat: { index: 'metricbeat-*' },
+          container: { elasticsearch: { enabled: false } },
+        },
+      },
+    },
+  },
+}));
+
 describe('DiskUsageAlert', () => {
   it('should have defaults', () => {
     const alert = new DiskUsageAlert() as IDiskUsageAlertMock;
-    expect(alert.type).toBe(ALERT_DISK_USAGE);
-    expect(alert.label).toBe('Disk Usage');
-    expect(alert.defaultThrottle).toBe('1d');
-    expect(alert.defaultParams).toStrictEqual({ threshold: 80, duration: '5m' });
-    expect(alert.actionVariables).toStrictEqual([
+    expect(alert.alertOptions.id).toBe(ALERT_DISK_USAGE);
+    expect(alert.alertOptions.name).toBe('Disk Usage');
+    expect(alert.alertOptions.throttle).toBe('1d');
+    expect(alert.alertOptions.defaultParams).toStrictEqual({ threshold: 80, duration: '5m' });
+    expect(alert.alertOptions.actionVariables).toStrictEqual([
       { name: 'nodes', description: 'The list of nodes reporting high disk usage.' },
       { name: 'count', description: 'The number of nodes reporting high disk usage.' },
       {
@@ -73,21 +88,6 @@ describe('DiskUsageAlert', () => {
       nodeName,
       diskUsage,
     };
-    const getUiSettingsService = () => ({
-      asScopedToClient: jest.fn(),
-    });
-    const getLogger = () => ({
-      debug: jest.fn(),
-    });
-    const monitoringCluster = null;
-    const config = {
-      ui: {
-        ccs: { enabled: true },
-        container: { elasticsearch: { enabled: false } },
-        metricbeat: { index: 'metricbeat-*' },
-      },
-    };
-    const kibanaUrl = 'http://localhost:5601';
 
     const replaceState = jest.fn();
     const scheduleActions = jest.fn();
@@ -125,18 +125,10 @@ describe('DiskUsageAlert', () => {
 
     it('should fire actions', async () => {
       const alert = new DiskUsageAlert() as IDiskUsageAlertMock;
-      alert.initializeAlertType(
-        getUiSettingsService as any,
-        monitoringCluster as any,
-        getLogger as any,
-        config as any,
-        kibanaUrl,
-        false
-      );
       const type = alert.getAlertType();
       await type.executor({
         ...executorOptions,
-        params: alert.defaultParams,
+        params: alert.alertOptions.defaultParams,
       } as any);
       const count = 1;
       expect(scheduleActions).toHaveBeenCalledWith('default', {
@@ -146,7 +138,7 @@ describe('DiskUsageAlert', () => {
         actionPlain: 'Verify disk usage levels across affected nodes.',
         clusterName,
         count,
-        nodes: `${nodeName}:${diskUsage.toFixed(2)}`,
+        nodes: `${nodeName}:${diskUsage}`,
         state: 'firing',
       });
     });
@@ -162,18 +154,10 @@ describe('DiskUsageAlert', () => {
         ];
       });
       const alert = new DiskUsageAlert() as IDiskUsageAlertMock;
-      alert.initializeAlertType(
-        getUiSettingsService as any,
-        monitoringCluster as any,
-        getLogger as any,
-        config as any,
-        kibanaUrl,
-        false
-      );
       const type = alert.getAlertType();
       await type.executor({
         ...executorOptions,
-        params: alert.defaultParams,
+        params: alert.alertOptions.defaultParams,
       } as any);
       const count = 1;
       expect(scheduleActions).toHaveBeenCalledWith('default', {
@@ -183,35 +167,7 @@ describe('DiskUsageAlert', () => {
         actionPlain: 'Verify disk usage levels across affected nodes.',
         clusterName,
         count,
-        nodes: `${nodeName}:${diskUsage.toFixed(2)}`,
-        state: 'firing',
-      });
-    });
-
-    it('should fire with different messaging for cloud', async () => {
-      const alert = new DiskUsageAlert() as IDiskUsageAlertMock;
-      alert.initializeAlertType(
-        getUiSettingsService as any,
-        monitoringCluster as any,
-        getLogger as any,
-        config as any,
-        kibanaUrl,
-        true
-      );
-      const type = alert.getAlertType();
-      await type.executor({
-        ...executorOptions,
-        params: alert.defaultParams,
-      } as any);
-      const count = 1;
-      expect(scheduleActions).toHaveBeenCalledWith('default', {
-        internalFullMessage: `Disk usage alert is firing for ${count} node(s) in cluster: ${clusterName}. Verify disk usage levels across affected nodes.`,
-        internalShortMessage: `Disk usage alert is firing for ${count} node(s) in cluster: ${clusterName}. Verify disk usage levels across affected nodes.`,
-        action: `[View nodes](elasticsearch/nodes)`,
-        actionPlain: 'Verify disk usage levels across affected nodes.',
-        clusterName,
-        count,
-        nodes: `${nodeName}:${diskUsage.toFixed(2)}`,
+        nodes: `${nodeName}:${diskUsage}`,
         state: 'firing',
       });
     });
diff --git a/x-pack/plugins/monitoring/server/alerts/disk_usage_alert.ts b/x-pack/plugins/monitoring/server/alerts/disk_usage_alert.ts
index 658eb708acb91..133fe261d0791 100644
--- a/x-pack/plugins/monitoring/server/alerts/disk_usage_alert.ts
+++ b/x-pack/plugins/monitoring/server/alerts/disk_usage_alert.ts
@@ -3,7 +3,7 @@
  * or more contributor license agreements. Licensed under the Elastic License;
  * you may not use this file except in compliance with the Elastic License.
  */
-import { IUiSettingsClient, Logger } from 'kibana/server';
+
 import { i18n } from '@kbn/i18n';
 import { BaseAlert } from './base_alert';
 import {
@@ -18,7 +18,7 @@ import {
   CommonAlertFilter,
   CommonAlertParams,
 } from '../../common/types/alerts';
-import { AlertInstance, AlertServices } from '../../../alerts/server';
+import { AlertInstance } from '../../../alerts/server';
 import {
   INDEX_PATTERN_ELASTICSEARCH,
   ALERT_DISK_USAGE,
@@ -27,44 +27,46 @@ import {
 import { fetchDiskUsageNodeStats } from '../lib/alerts/fetch_disk_usage_node_stats';
 import { getCcsIndexPattern } from '../lib/alerts/get_ccs_index_pattern';
 import { AlertMessageTokenType, AlertSeverity } from '../../common/enums';
-import { RawAlertInstance } from '../../../alerts/common';
+import { RawAlertInstance, SanitizedAlert } from '../../../alerts/common';
 import { AlertingDefaults, createLink } from './alert_helpers';
 import { appendMetricbeatIndex } from '../lib/alerts/append_mb_index';
+import { Globals } from '../static_globals';
 
 export class DiskUsageAlert extends BaseAlert {
-  public type = ALERT_DISK_USAGE;
-  public label = ALERT_DETAILS[ALERT_DISK_USAGE].label;
-  public description = ALERT_DETAILS[ALERT_DISK_USAGE].description;
-
-  protected defaultParams = {
-    threshold: 80,
-    duration: '5m',
-  };
-
-  protected actionVariables = [
-    {
-      name: 'nodes',
-      description: i18n.translate('xpack.monitoring.alerts.diskUsage.actionVariables.nodes', {
-        defaultMessage: 'The list of nodes reporting high disk usage.',
-      }),
-    },
-    {
-      name: 'count',
-      description: i18n.translate('xpack.monitoring.alerts.diskUsage.actionVariables.count', {
-        defaultMessage: 'The number of nodes reporting high disk usage.',
-      }),
-    },
-    ...Object.values(AlertingDefaults.ALERT_TYPE.context),
-  ];
+  constructor(public rawAlert?: SanitizedAlert) {
+    super(rawAlert, {
+      id: ALERT_DISK_USAGE,
+      name: ALERT_DETAILS[ALERT_DISK_USAGE].label,
+      accessorKey: 'diskUsage',
+      defaultParams: {
+        threshold: 80,
+        duration: '5m',
+      },
+      actionVariables: [
+        {
+          name: 'nodes',
+          description: i18n.translate('xpack.monitoring.alerts.diskUsage.actionVariables.nodes', {
+            defaultMessage: 'The list of nodes reporting high disk usage.',
+          }),
+        },
+        {
+          name: 'count',
+          description: i18n.translate('xpack.monitoring.alerts.diskUsage.actionVariables.count', {
+            defaultMessage: 'The number of nodes reporting high disk usage.',
+          }),
+        },
+        ...Object.values(AlertingDefaults.ALERT_TYPE.context),
+      ],
+    });
+  }
 
   protected async fetchData(
     params: CommonAlertParams,
     callCluster: any,
     clusters: AlertCluster[],
-    uiSettings: IUiSettingsClient,
     availableCcs: string[]
   ): Promise<AlertData[]> {
-    let esIndexPattern = appendMetricbeatIndex(this.config, INDEX_PATTERN_ELASTICSEARCH);
+    let esIndexPattern = appendMetricbeatIndex(Globals.app.config, INDEX_PATTERN_ELASTICSEARCH);
     if (availableCcs) {
       esIndexPattern = getCcsIndexPattern(esIndexPattern, availableCcs);
     }
@@ -74,14 +76,13 @@ export class DiskUsageAlert extends BaseAlert {
       clusters,
       esIndexPattern,
       duration as string,
-      this.config.ui.max_bucket_size
+      Globals.app.config.ui.max_bucket_size
     );
 
     return stats.map((stat) => {
-      const { clusterUuid, nodeId, diskUsage, ccs } = stat;
+      const { clusterUuid, diskUsage, ccs } = stat;
       return {
-        instanceKey: `${clusterUuid}:${nodeId}`,
-        shouldFire: diskUsage > threshold,
+        shouldFire: diskUsage > threshold!,
         severity: AlertSeverity.Danger,
         meta: stat,
         clusterUuid,
@@ -91,15 +92,7 @@ export class DiskUsageAlert extends BaseAlert {
   }
 
   protected filterAlertInstance(alertInstance: RawAlertInstance, filters: CommonAlertFilter[]) {
-    const alertInstanceStates = alertInstance.state?.alertStates as AlertDiskUsageState[];
-    const nodeFilter = filters?.find((filter) => filter.nodeUuid);
-
-    if (!filters || !filters.length || !alertInstanceStates?.length || !nodeFilter?.nodeUuid) {
-      return true;
-    }
-
-    const nodeAlerts = alertInstanceStates.filter(({ nodeId }) => nodeId === nodeFilter.nodeUuid);
-    return Boolean(nodeAlerts.length);
+    return super.filterAlertInstance(alertInstance, filters, true);
   }
 
   protected getDefaultAlertState(cluster: AlertCluster, item: AlertData): AlertState {
@@ -110,26 +103,6 @@ export class DiskUsageAlert extends BaseAlert {
 
   protected getUiMessage(alertState: AlertState, item: AlertData): AlertMessage {
     const stat = item.meta as AlertDiskUsageState;
-    if (!alertState.ui.isFiring) {
-      return {
-        text: i18n.translate('xpack.monitoring.alerts.diskUsage.ui.resolvedMessage', {
-          defaultMessage: `The disk usage on node {nodeName} is now under the threshold, currently reporting at {diskUsage}% as of #resolved`,
-          values: {
-            nodeName: stat.nodeName,
-            diskUsage: stat.diskUsage.toFixed(2),
-          },
-        }),
-        tokens: [
-          {
-            startToken: '#resolved',
-            type: AlertMessageTokenType.Time,
-            isAbsolute: true,
-            isRelative: false,
-            timestamp: alertState.ui.resolvedMS,
-          } as AlertMessageTimeToken,
-        ],
-      };
-    }
     return {
       text: i18n.translate('xpack.monitoring.alerts.diskUsage.ui.firingMessage', {
         defaultMessage: `Node #start_link{nodeName}#end_link is reporting disk usage of {diskUsage}% at #absolute`,
@@ -234,93 +207,14 @@ export class DiskUsageAlert extends BaseAlert {
 
       instance.scheduleActions('default', {
         internalShortMessage,
-        internalFullMessage: this.isCloud ? internalShortMessage : internalFullMessage,
+        internalFullMessage: Globals.app.isCloud ? internalShortMessage : internalFullMessage,
         state: AlertingDefaults.ALERT_STATE.firing,
-        nodes: firingNodes
-          .map((state) => `${state.nodeName}:${state.diskUsage.toFixed(2)}`)
-          .join(','),
+        nodes: firingNodes.map((state) => `${state.nodeName}:${state.diskUsage}`).join(','),
         count: firingCount,
         clusterName: cluster.clusterName,
         action,
         actionPlain: shortActionText,
       });
-    } else {
-      const resolvedNodes = (alertStates as AlertDiskUsageState[])
-        .filter((state) => !state.ui.isFiring)
-        .map((state) => `${state.nodeName}:${state.diskUsage.toFixed(2)}`);
-      const resolvedCount = resolvedNodes.length;
-
-      if (resolvedCount > 0) {
-        const internalMessage = i18n.translate(
-          'xpack.monitoring.alerts.diskUsage.resolved.internalMessage',
-          {
-            defaultMessage: `Disk usage alert is resolved for {count} node(s) in cluster: {clusterName}.`,
-            values: {
-              count: resolvedCount,
-              clusterName: cluster.clusterName,
-            },
-          }
-        );
-
-        instance.scheduleActions('default', {
-          internalShortMessage: internalMessage,
-          internalFullMessage: internalMessage,
-          state: AlertingDefaults.ALERT_STATE.resolved,
-          nodes: resolvedNodes.join(','),
-          count: resolvedCount,
-          clusterName: cluster.clusterName,
-        });
-      }
     }
   }
-
-  protected async processData(
-    data: AlertData[],
-    clusters: AlertCluster[],
-    services: AlertServices,
-    logger: Logger,
-    state: any
-  ) {
-    const currentUTC = +new Date();
-    for (const cluster of clusters) {
-      const nodes = data.filter((node) => node.clusterUuid === cluster.clusterUuid);
-      if (!nodes.length) {
-        continue;
-      }
-
-      const firingNodeUuids = nodes
-        .filter((node) => node.shouldFire)
-        .map((node) => node.meta.nodeId)
-        .join(',');
-      const instanceId = `${this.type}:${cluster.clusterUuid}:${firingNodeUuids}`;
-      const instance = services.alertInstanceFactory(instanceId);
-      const newAlertStates: AlertDiskUsageState[] = [];
-
-      for (const node of nodes) {
-        const stat = node.meta as AlertDiskUsageState;
-        const nodeState = this.getDefaultAlertState(cluster, node) as AlertDiskUsageState;
-        nodeState.diskUsage = stat.diskUsage;
-        nodeState.nodeId = stat.nodeId;
-        nodeState.nodeName = stat.nodeName;
-
-        if (node.shouldFire) {
-          nodeState.ui.triggeredMS = currentUTC;
-          nodeState.ui.isFiring = true;
-          nodeState.ui.severity = node.severity;
-          newAlertStates.push(nodeState);
-        }
-        nodeState.ui.message = this.getUiMessage(nodeState, node);
-      }
-
-      const alertInstanceState = { alertStates: newAlertStates };
-      instance.replaceState(alertInstanceState);
-      if (newAlertStates.length) {
-        this.executeActions(instance, alertInstanceState, null, cluster);
-        state.lastExecutedAction = currentUTC;
-      }
-    }
-
-    state.lastChecked = currentUTC;
-    return state;
-  }
 }
diff --git a/x-pack/plugins/monitoring/server/alerts/elasticsearch_version_mismatch_alert.test.ts b/x-pack/plugins/monitoring/server/alerts/elasticsearch_version_mismatch_alert.test.ts
index 3422e8a7c78ad..46fdd1fa98563 100644
--- a/x-pack/plugins/monitoring/server/alerts/elasticsearch_version_mismatch_alert.test.ts
+++ b/x-pack/plugins/monitoring/server/alerts/elasticsearch_version_mismatch_alert.test.ts
@@ -17,14 +17,28 @@ jest.mock('../lib/alerts/fetch_clusters', () => ({
   fetchClusters: jest.fn(),
 }));
 
+jest.mock('../static_globals', () => ({
+  Globals: {
+    app: {
+      getLogger: () => ({ debug: jest.fn() }),
+      config: {
+        ui: {
+          ccs: { enabled: true },
+          metricbeat: { index: 'metricbeat-*' },
+          container: { elasticsearch: { enabled: false } },
+        },
+      },
+    },
+  },
+}));
+
 describe('ElasticsearchVersionMismatchAlert', () => {
   it('should have defaults', () => {
     const alert = new ElasticsearchVersionMismatchAlert();
-    expect(alert.type).toBe(ALERT_ELASTICSEARCH_VERSION_MISMATCH);
-    expect(alert.label).toBe('Elasticsearch version mismatch');
-    expect(alert.defaultThrottle).toBe('1d');
-    // @ts-ignore
-    expect(alert.actionVariables).toStrictEqual([
+    expect(alert.alertOptions.id).toBe(ALERT_ELASTICSEARCH_VERSION_MISMATCH);
+    expect(alert.alertOptions.name).toBe('Elasticsearch version mismatch');
+    expect(alert.alertOptions.throttle).toBe('1d');
+    expect(alert.alertOptions.actionVariables).toStrictEqual([
       {
         name: 'versionList',
         description: 'The versions of Elasticsearch running in this cluster.',
@@ -61,21 +75,6 @@ describe('ElasticsearchVersionMismatchAlert', () => {
         cluster_uuid: clusterUuid,
       },
     };
-    const getUiSettingsService = () => ({
-      asScopedToClient: jest.fn(),
-    });
-    const getLogger = () => ({
-      debug: jest.fn(),
-    });
-    const monitoringCluster = null;
-    const config = {
-      ui: {
-        ccs: { enabled: true },
-        container: { elasticsearch: { enabled: false } },
-        metricbeat: { index: 'metricbeat-*' },
-      },
-    };
-    const kibanaUrl = 'http://localhost:5601';
 
     const replaceState = jest.fn();
     const scheduleActions = jest.fn();
@@ -114,19 +113,11 @@ describe('ElasticsearchVersionMismatchAlert', () => {
 
     it('should fire actions', async () => {
       const alert = new ElasticsearchVersionMismatchAlert();
-      alert.initializeAlertType(
-        getUiSettingsService as any,
-        monitoringCluster as any,
-        getLogger as any,
-        config as any,
-        kibanaUrl,
-        false
-      );
       const type = alert.getAlertType();
       await type.executor({
         ...executorOptions,
         // @ts-ignore
-        params: alert.defaultParams,
+        params: alert.alertOptions.defaultParams,
       } as any);
       expect(replaceState).toHaveBeenCalledWith({
         alertStates: [
@@ -140,7 +131,6 @@ describe('ElasticsearchVersionMismatchAlert', () => {
                   'Multiple versions of Elasticsearch ([8.0.0, 7.2.1]) running in this cluster.',
               },
               severity: 'warning',
-              resolvedMS: 0,
               triggeredMS: 1,
               lastCheckedMS: 0,
             },
@@ -165,93 +155,14 @@ describe('ElasticsearchVersionMismatchAlert', () => {
         return [];
       });
       const alert = new ElasticsearchVersionMismatchAlert();
-      alert.initializeAlertType(
-        getUiSettingsService as any,
-        monitoringCluster as any,
-        getLogger as any,
-        config as any,
-        kibanaUrl,
-        false
-      );
       const type = alert.getAlertType();
       await type.executor({
         ...executorOptions,
         // @ts-ignore
-        params: alert.defaultParams,
+        params: alert.alertOptions.defaultParams,
       } as any);
       expect(replaceState).not.toHaveBeenCalledWith({});
       expect(scheduleActions).not.toHaveBeenCalled();
     });
-
-    it('should resolve with a resolved message', async () => {
-      (fetchLegacyAlerts as jest.Mock).mockImplementation(() => {
-        return [
-          {
-            ...legacyAlert,
-            resolved_timestamp: 1,
-          },
-        ];
-      });
-      (getState as jest.Mock).mockImplementation(() => {
-        return {
-          alertStates: [
-            {
-              cluster: {
-                clusterUuid,
-                clusterName,
-              },
-              ccs: undefined,
-              ui: {
-                isFiring: true,
-                message: null,
-                severity: 'danger',
-                resolvedMS: 0,
-                triggeredMS: 1,
-                lastCheckedMS: 0,
-              },
-            },
-          ],
-        };
-      });
-      const alert = new ElasticsearchVersionMismatchAlert();
-      alert.initializeAlertType(
-        getUiSettingsService as any,
-        monitoringCluster as any,
-        getLogger as any,
-        config as any,
-        kibanaUrl,
-        false
-      );
-      const type = alert.getAlertType();
-      await type.executor({
-        ...executorOptions,
-        // @ts-ignore
-        params: alert.defaultParams,
-      } as any);
-      expect(replaceState).toHaveBeenCalledWith({
-        alertStates: [
-          {
-            cluster: { clusterUuid, clusterName },
-            ccs: undefined,
-            ui: {
-              isFiring: false,
-              message: {
-                text: 'All versions of Elasticsearch are the same in this cluster.',
-              },
-              severity: 'danger',
-              resolvedMS: 1,
-              triggeredMS: 1,
-              lastCheckedMS: 0,
-            },
-          },
-        ],
-      });
-      expect(scheduleActions).toHaveBeenCalledWith('default', {
-        internalFullMessage: 'Elasticsearch version mismatch alert is resolved for testCluster.',
-        internalShortMessage: 'Elasticsearch version mismatch alert is resolved for testCluster.',
-        clusterName,
-        state: 'resolved',
-      });
-    });
   });
 });
diff --git a/x-pack/plugins/monitoring/server/alerts/elasticsearch_version_mismatch_alert.ts b/x-pack/plugins/monitoring/server/alerts/elasticsearch_version_mismatch_alert.ts
index 05498469b0c58..88b5b708d41f3 100644
--- a/x-pack/plugins/monitoring/server/alerts/elasticsearch_version_mismatch_alert.ts
+++ b/x-pack/plugins/monitoring/server/alerts/elasticsearch_version_mismatch_alert.ts
@@ -3,7 +3,7 @@
  * or more contributor license agreements. Licensed under the Elastic License;
  * you may not use this file except in compliance with the Elastic License.
  */
-import { IUiSettingsClient } from 'kibana/server';
+
 import { i18n } from '@kbn/i18n';
 import { BaseAlert } from './base_alert';
 import {
@@ -11,98 +11,42 @@ import {
   AlertCluster,
   AlertState,
   AlertMessage,
-  AlertInstanceState,
   LegacyAlert,
-  CommonAlertParams,
 } from '../../common/types/alerts';
 import { AlertInstance } from '../../../alerts/server';
-import {
-  INDEX_ALERTS,
-  ALERT_ELASTICSEARCH_VERSION_MISMATCH,
-  LEGACY_ALERT_DETAILS,
-} from '../../common/constants';
-import { getCcsIndexPattern } from '../lib/alerts/get_ccs_index_pattern';
+import { ALERT_ELASTICSEARCH_VERSION_MISMATCH, LEGACY_ALERT_DETAILS } from '../../common/constants';
 import { AlertSeverity } from '../../common/enums';
-import { fetchLegacyAlerts } from '../lib/alerts/fetch_legacy_alerts';
 import { AlertingDefaults } from './alert_helpers';
-
-const WATCH_NAME = 'elasticsearch_version_mismatch';
+import { SanitizedAlert } from '../../../alerts/common';
 
 export class ElasticsearchVersionMismatchAlert extends BaseAlert {
-  public type = ALERT_ELASTICSEARCH_VERSION_MISMATCH;
-  public label = LEGACY_ALERT_DETAILS[ALERT_ELASTICSEARCH_VERSION_MISMATCH].label;
-  public description = LEGACY_ALERT_DETAILS[ALERT_ELASTICSEARCH_VERSION_MISMATCH].description;
-  public isLegacy = true;
-
-  protected actionVariables = [
-    {
-      name: 'versionList',
-      description: i18n.translate(
-        'xpack.monitoring.alerts.elasticsearchVersionMismatch.actionVariables.clusterHealth',
+  constructor(public rawAlert?: SanitizedAlert) {
+    super(rawAlert, {
+      id: ALERT_ELASTICSEARCH_VERSION_MISMATCH,
+      name: LEGACY_ALERT_DETAILS[ALERT_ELASTICSEARCH_VERSION_MISMATCH].label,
+      legacy: {
+        watchName: 'elasticsearch_version_mismatch',
+        changeDataValues: { severity: AlertSeverity.Warning },
+      },
+      interval: '1d',
+      actionVariables: [
         {
-          defaultMessage: 'The versions of Elasticsearch running in this cluster.',
-        }
-      ),
-    },
-    ...Object.values(AlertingDefaults.ALERT_TYPE.context),
-  ];
-
-  protected async fetchData(
-    params: CommonAlertParams,
-    callCluster: any,
-    clusters: AlertCluster[],
-    uiSettings: IUiSettingsClient,
-    availableCcs: string[]
-  ): Promise<AlertData[]> {
-    let alertIndexPattern = INDEX_ALERTS;
-    if (availableCcs) {
-      alertIndexPattern = getCcsIndexPattern(alertIndexPattern, availableCcs);
-    }
-
-    const legacyAlerts = await fetchLegacyAlerts(
-      callCluster,
-      clusters,
-      alertIndexPattern,
-      WATCH_NAME,
-      this.config.ui.max_bucket_size
-    );
-
-    return legacyAlerts.reduce((accum: AlertData[], legacyAlert) => {
-      const severity = AlertSeverity.Warning;
-
-      accum.push({
-        instanceKey: `${legacyAlert.metadata.cluster_uuid}`,
-        clusterUuid: legacyAlert.metadata.cluster_uuid,
-        shouldFire: !legacyAlert.resolved_timestamp,
-        severity,
-        meta: legacyAlert,
-      });
-      return accum;
-    }, []);
-  }
-
-  private getVersions(legacyAlert: LegacyAlert) {
-    const prefixStr = 'Versions: ';
-    return legacyAlert.message.slice(
-      legacyAlert.message.indexOf(prefixStr) + prefixStr.length,
-      legacyAlert.message.length - 1
-    );
+          name: 'versionList',
+          description: i18n.translate(
+            'xpack.monitoring.alerts.elasticsearchVersionMismatch.actionVariables.clusterHealth',
+            {
+              defaultMessage: 'The versions of Elasticsearch running in this cluster.',
+            }
+          ),
+        },
+        ...Object.values(AlertingDefaults.ALERT_TYPE.context),
+      ],
+    });
   }
 
   protected getUiMessage(alertState: AlertState, item: AlertData): AlertMessage {
     const legacyAlert = item.meta as LegacyAlert;
     const versions = this.getVersions(legacyAlert);
-    if (!alertState.ui.isFiring) {
-      return {
-        text: i18n.translate(
-          'xpack.monitoring.alerts.elasticsearchVersionMismatch.ui.resolvedMessage',
-          {
-            defaultMessage: `All versions of Elasticsearch are the same in this cluster.`,
-          }
-        ),
-      };
-    }
-
     const text = i18n.translate(
       'xpack.monitoring.alerts.elasticsearchVersionMismatch.ui.firingMessage',
       {
@@ -120,40 +64,13 @@ export class ElasticsearchVersionMismatchAlert extends BaseAlert {
 
   protected async executeActions(
     instance: AlertInstance,
-    instanceState: AlertInstanceState,
+    alertState: AlertState,
     item: AlertData,
     cluster: AlertCluster
   ) {
-    if (instanceState.alertStates.length === 0) {
-      return;
-    }
-    const alertState = instanceState.alertStates[0];
     const legacyAlert = item.meta as LegacyAlert;
     const versions = this.getVersions(legacyAlert);
-    if (!alertState.ui.isFiring) {
-      instance.scheduleActions('default', {
-        internalShortMessage: i18n.translate(
-          'xpack.monitoring.alerts.elasticsearchVersionMismatch.resolved.internalShortMessage',
-          {
-            defaultMessage: `Elasticsearch version mismatch alert is resolved for {clusterName}.`,
-            values: {
-              clusterName: cluster.clusterName,
-            },
-          }
-        ),
-        internalFullMessage: i18n.translate(
-          'xpack.monitoring.alerts.elasticsearchVersionMismatch.resolved.internalFullMessage',
-          {
-            defaultMessage: `Elasticsearch version mismatch alert is resolved for {clusterName}.`,
-            values: {
-              clusterName: cluster.clusterName,
-            },
-          }
-        ),
-        state: AlertingDefaults.ALERT_STATE.resolved,
-        clusterName: cluster.clusterName,
-      });
-    } else {
+    if (alertState.ui.isFiring) {
       const shortActionText = i18n.translate(
         'xpack.monitoring.alerts.elasticsearchVersionMismatch.shortAction',
         {
diff --git a/x-pack/plugins/monitoring/server/alerts/kibana_version_mismatch_alert.test.ts b/x-pack/plugins/monitoring/server/alerts/kibana_version_mismatch_alert.test.ts
index 1082e9f6311a4..2367b53330ec5 100644
--- a/x-pack/plugins/monitoring/server/alerts/kibana_version_mismatch_alert.test.ts
+++ b/x-pack/plugins/monitoring/server/alerts/kibana_version_mismatch_alert.test.ts
@@ -17,14 +17,28 @@ jest.mock('../lib/alerts/fetch_clusters', () => ({
   fetchClusters: jest.fn(),
 }));
 
+jest.mock('../static_globals', () => ({
+  Globals: {
+    app: {
+      getLogger: () => ({ debug: jest.fn() }),
+      config: {
+        ui: {
+          ccs: { enabled: true },
+          metricbeat: { index: 'metricbeat-*' },
+          container: { elasticsearch: { enabled: false } },
+        },
+      },
+    },
+  },
+}));
+
 describe('KibanaVersionMismatchAlert', () => {
   it('should have defaults', () => {
     const alert = new KibanaVersionMismatchAlert();
-    expect(alert.type).toBe(ALERT_KIBANA_VERSION_MISMATCH);
-    expect(alert.label).toBe('Kibana version mismatch');
-    expect(alert.defaultThrottle).toBe('1d');
-    // @ts-ignore
-    expect(alert.actionVariables).toStrictEqual([
+    expect(alert.alertOptions.id).toBe(ALERT_KIBANA_VERSION_MISMATCH);
+    expect(alert.alertOptions.name).toBe('Kibana version mismatch');
+    expect(alert.alertOptions.throttle).toBe('1d');
+    expect(alert.alertOptions.actionVariables).toStrictEqual([
       {
         name: 'versionList',
         description: 'The versions of Kibana running in this cluster.',
@@ -64,21 +78,6 @@ describe('KibanaVersionMismatchAlert', () => {
         cluster_uuid: clusterUuid,
       },
     };
-    const getUiSettingsService = () => ({
-      asScopedToClient: jest.fn(),
-    });
-    const getLogger = () => ({
-      debug: jest.fn(),
-    });
-    const monitoringCluster = null;
-    const config = {
-      ui: {
-        ccs: { enabled: true },
-        container: { elasticsearch: { enabled: false } },
-        metricbeat: { index: 'metricbeat-*' },
-      },
-    };
-    const kibanaUrl = 'http://localhost:5601';
 
     const replaceState = jest.fn();
     const scheduleActions = jest.fn();
@@ -117,19 +116,10 @@ describe('KibanaVersionMismatchAlert', () => {
 
     it('should fire actions', async () => {
       const alert = new KibanaVersionMismatchAlert();
-      alert.initializeAlertType(
-        getUiSettingsService as any,
-        monitoringCluster as any,
-        getLogger as any,
-        config as any,
-        kibanaUrl,
-        false
-      );
       const type = alert.getAlertType();
       await type.executor({
         ...executorOptions,
-        // @ts-ignore
-        params: alert.defaultParams,
+        params: alert.alertOptions.defaultParams,
       } as any);
       expect(replaceState).toHaveBeenCalledWith({
         alertStates: [
@@ -142,7 +132,6 @@ describe('KibanaVersionMismatchAlert', () => {
                 text: 'Multiple versions of Kibana ([8.0.0, 7.2.1]) running in this cluster.',
               },
               severity: 'warning',
-              resolvedMS: 0,
               triggeredMS: 1,
               lastCheckedMS: 0,
             },
@@ -167,93 +156,13 @@ describe('KibanaVersionMismatchAlert', () => {
         return [];
       });
       const alert = new KibanaVersionMismatchAlert();
-      alert.initializeAlertType(
-        getUiSettingsService as any,
-        monitoringCluster as any,
-        getLogger as any,
-        config as any,
-        kibanaUrl,
-        false
-      );
       const type = alert.getAlertType();
       await type.executor({
         ...executorOptions,
-        // @ts-ignore
-        params: alert.defaultParams,
+        params: alert.alertOptions.defaultParams,
       } as any);
       expect(replaceState).not.toHaveBeenCalledWith({});
       expect(scheduleActions).not.toHaveBeenCalled();
     });
-
-    it('should resolve with a resolved message', async () => {
-      (fetchLegacyAlerts as jest.Mock).mockImplementation(() => {
-        return [
-          {
-            ...legacyAlert,
-            resolved_timestamp: 1,
-          },
-        ];
-      });
-      (getState as jest.Mock).mockImplementation(() => {
-        return {
-          alertStates: [
-            {
-              cluster: {
-                clusterUuid,
-                clusterName,
-              },
-              ccs: undefined,
-              ui: {
-                isFiring: true,
-                message: null,
-                severity: 'danger',
-                resolvedMS: 0,
-                triggeredMS: 1,
-                lastCheckedMS: 0,
-              },
-            },
-          ],
-        };
-      });
-      const alert = new KibanaVersionMismatchAlert();
-      alert.initializeAlertType(
-        getUiSettingsService as any,
-        monitoringCluster as any,
-        getLogger as any,
-        config as any,
-        kibanaUrl,
-        false
-      );
-      const type = alert.getAlertType();
-      await type.executor({
-        ...executorOptions,
-        // @ts-ignore
-        params: alert.defaultParams,
-      } as any);
-      expect(replaceState).toHaveBeenCalledWith({
-        alertStates: [
-          {
-            cluster: { clusterUuid, clusterName },
-            ccs: undefined,
-            ui: {
-              isFiring: false,
-              message: {
-                text: 'All versions of Kibana are the same in this cluster.',
-              },
-              severity: 'danger',
-              resolvedMS: 1,
-              triggeredMS: 1,
-              lastCheckedMS: 0,
-            },
-          },
-        ],
-      });
-      expect(scheduleActions).toHaveBeenCalledWith('default', {
-        internalFullMessage: 'Kibana version mismatch alert is resolved for testCluster.',
-        internalShortMessage: 'Kibana version mismatch alert is resolved for testCluster.',
-        clusterName,
-        state: 'resolved',
-      });
-    });
   });
 });
diff --git a/x-pack/plugins/monitoring/server/alerts/kibana_version_mismatch_alert.ts b/x-pack/plugins/monitoring/server/alerts/kibana_version_mismatch_alert.ts
index 984ee1fb396be..c9e5786484899 100644
--- a/x-pack/plugins/monitoring/server/alerts/kibana_version_mismatch_alert.ts
+++ b/x-pack/plugins/monitoring/server/alerts/kibana_version_mismatch_alert.ts
@@ -3,7 +3,7 @@
  * or more contributor license agreements. Licensed under the Elastic License;
  * you may not use this file except in compliance with the Elastic License.
  */
-import { IUiSettingsClient } from 'kibana/server';
+
 import { i18n } from '@kbn/i18n';
 import { BaseAlert } from './base_alert';
 import {
@@ -11,106 +11,55 @@ import {
   AlertCluster,
   AlertState,
   AlertMessage,
-  AlertInstanceState,
   LegacyAlert,
-  CommonAlertParams,
 } from '../../common/types/alerts';
 import { AlertInstance } from '../../../alerts/server';
-import {
-  INDEX_ALERTS,
-  ALERT_KIBANA_VERSION_MISMATCH,
-  LEGACY_ALERT_DETAILS,
-} from '../../common/constants';
-import { getCcsIndexPattern } from '../lib/alerts/get_ccs_index_pattern';
+import { ALERT_KIBANA_VERSION_MISMATCH, LEGACY_ALERT_DETAILS } from '../../common/constants';
 import { AlertSeverity } from '../../common/enums';
-import { fetchLegacyAlerts } from '../lib/alerts/fetch_legacy_alerts';
 import { AlertingDefaults } from './alert_helpers';
-
-const WATCH_NAME = 'kibana_version_mismatch';
+import { SanitizedAlert } from '../../../alerts/common';
 
 export class KibanaVersionMismatchAlert extends BaseAlert {
-  public type = ALERT_KIBANA_VERSION_MISMATCH;
-  public label = LEGACY_ALERT_DETAILS[ALERT_KIBANA_VERSION_MISMATCH].label;
-  public description = LEGACY_ALERT_DETAILS[ALERT_KIBANA_VERSION_MISMATCH].description;
-  public isLegacy = true;
-
-  protected actionVariables = [
-    {
-      name: 'versionList',
-      description: i18n.translate(
-        'xpack.monitoring.alerts.kibanaVersionMismatch.actionVariables.clusterHealth',
+  constructor(public rawAlert?: SanitizedAlert) {
+    super(rawAlert, {
+      id: ALERT_KIBANA_VERSION_MISMATCH,
+      name: LEGACY_ALERT_DETAILS[ALERT_KIBANA_VERSION_MISMATCH].label,
+      legacy: {
+        watchName: 'kibana_version_mismatch',
+        changeDataValues: { severity: AlertSeverity.Warning },
+      },
+      interval: '1d',
+      actionVariables: [
         {
-          defaultMessage: 'The versions of Kibana running in this cluster.',
-        }
-      ),
-    },
-    {
-      name: 'clusterName',
-      description: i18n.translate(
-        'xpack.monitoring.alerts.kibanaVersionMismatch.actionVariables.clusterName',
+          name: 'versionList',
+          description: i18n.translate(
+            'xpack.monitoring.alerts.kibanaVersionMismatch.actionVariables.clusterHealth',
+            {
+              defaultMessage: 'The versions of Kibana running in this cluster.',
+            }
+          ),
+        },
         {
-          defaultMessage: 'The cluster to which the instances belong.',
-        }
-      ),
-    },
-    AlertingDefaults.ALERT_TYPE.context.internalShortMessage,
-    AlertingDefaults.ALERT_TYPE.context.internalFullMessage,
-    AlertingDefaults.ALERT_TYPE.context.state,
-    AlertingDefaults.ALERT_TYPE.context.action,
-    AlertingDefaults.ALERT_TYPE.context.actionPlain,
-  ];
-
-  protected async fetchData(
-    params: CommonAlertParams,
-    callCluster: any,
-    clusters: AlertCluster[],
-    uiSettings: IUiSettingsClient,
-    availableCcs: string[]
-  ): Promise<AlertData[]> {
-    let alertIndexPattern = INDEX_ALERTS;
-    if (availableCcs) {
-      alertIndexPattern = getCcsIndexPattern(alertIndexPattern, availableCcs);
-    }
-    const legacyAlerts = await fetchLegacyAlerts(
-      callCluster,
-      clusters,
-      alertIndexPattern,
-      WATCH_NAME,
-      this.config.ui.max_bucket_size
-    );
-
-    return legacyAlerts.reduce((accum: AlertData[], legacyAlert) => {
-      const severity = AlertSeverity.Warning;
-      accum.push({
-        instanceKey: `${legacyAlert.metadata.cluster_uuid}`,
-        clusterUuid: legacyAlert.metadata.cluster_uuid,
-        shouldFire: !legacyAlert.resolved_timestamp,
-        severity,
-        meta: legacyAlert,
-      });
-      return accum;
-    }, []);
-  }
-
-  private getVersions(legacyAlert: LegacyAlert) {
-    const prefixStr = 'Versions: ';
-    return legacyAlert.message.slice(
-      legacyAlert.message.indexOf(prefixStr) + prefixStr.length,
-      legacyAlert.message.length - 1
-    );
+          name: 'clusterName',
+          description: i18n.translate(
+            'xpack.monitoring.alerts.kibanaVersionMismatch.actionVariables.clusterName',
+            {
+              defaultMessage: 'The cluster to which the instances belong.',
+            }
+          ),
+        },
+        AlertingDefaults.ALERT_TYPE.context.internalShortMessage,
+        AlertingDefaults.ALERT_TYPE.context.internalFullMessage,
+        AlertingDefaults.ALERT_TYPE.context.state,
+        AlertingDefaults.ALERT_TYPE.context.action,
+        AlertingDefaults.ALERT_TYPE.context.actionPlain,
+      ],
+    });
   }
 
   protected getUiMessage(alertState: AlertState, item: AlertData): AlertMessage {
     const legacyAlert = item.meta as LegacyAlert;
     const versions = this.getVersions(legacyAlert);
-    if (!alertState.ui.isFiring) {
-      return {
-        text: i18n.translate('xpack.monitoring.alerts.kibanaVersionMismatch.ui.resolvedMessage', {
-          defaultMessage: `All versions of Kibana are the same in this cluster.`,
-        }),
-      };
-    }
-
     const text = i18n.translate('xpack.monitoring.alerts.kibanaVersionMismatch.ui.firingMessage', {
       defaultMessage: `Multiple versions of Kibana ({versions}) running in this cluster.`,
       values: {
@@ -125,40 +74,13 @@ export class KibanaVersionMismatchAlert extends BaseAlert {
 
   protected async executeActions(
     instance: AlertInstance,
-    instanceState: AlertInstanceState,
+    alertState: AlertState,
     item: AlertData,
     cluster: AlertCluster
   ) {
-    if (instanceState.alertStates.length === 0) {
-      return;
-    }
-    const alertState = instanceState.alertStates[0];
     const legacyAlert = item.meta as LegacyAlert;
     const versions = this.getVersions(legacyAlert);
-    if (!alertState.ui.isFiring) {
-      instance.scheduleActions('default', {
-        internalShortMessage: i18n.translate(
-          'xpack.monitoring.alerts.kibanaVersionMismatch.resolved.internalShortMessage',
-          {
-            defaultMessage: `Kibana version mismatch alert is resolved for {clusterName}.`,
-            values: {
-              clusterName: cluster.clusterName,
-            },
-          }
-        ),
-        internalFullMessage: i18n.translate(
-          'xpack.monitoring.alerts.kibanaVersionMismatch.resolved.internalFullMessage',
-          {
-            defaultMessage: `Kibana version mismatch alert is resolved for {clusterName}.`,
-            values: {
-              clusterName: cluster.clusterName,
-            },
-          }
-        ),
-        state: AlertingDefaults.ALERT_STATE.resolved,
-        clusterName: cluster.clusterName,
-      });
-    } else {
+    if (alertState.ui.isFiring) {
       const shortActionText = i18n.translate(
         'xpack.monitoring.alerts.kibanaVersionMismatch.shortAction',
         {
diff --git a/x-pack/plugins/monitoring/server/alerts/license_expiration_alert.test.ts b/x-pack/plugins/monitoring/server/alerts/license_expiration_alert.test.ts
index b82b4c235acba..f7a3d321b960b 100644
--- a/x-pack/plugins/monitoring/server/alerts/license_expiration_alert.test.ts
+++ b/x-pack/plugins/monitoring/server/alerts/license_expiration_alert.test.ts
@@ -24,14 +24,29 @@ jest.mock('moment', () => {
   };
 });
 
+jest.mock('../static_globals', () => ({
+  Globals: {
+    app: {
+      getLogger: () => ({ debug: jest.fn() }),
+      config: {
+        ui: {
+          show_license_expiration: true,
+          ccs: { enabled: true },
+          metricbeat: { index: 'metricbeat-*' },
+          container: { elasticsearch: { enabled: false } },
+        },
+      },
+    },
+  },
+}));
+
 describe('LicenseExpirationAlert', () => {
   it('should have defaults', () => {
     const alert = new LicenseExpirationAlert();
-    expect(alert.type).toBe(ALERT_LICENSE_EXPIRATION);
-    expect(alert.label).toBe('License expiration');
-    expect(alert.defaultThrottle).toBe('1d');
-    // @ts-ignore
-    expect(alert.actionVariables).toStrictEqual([
+    expect(alert.alertOptions.id).toBe(ALERT_LICENSE_EXPIRATION);
+    expect(alert.alertOptions.name).toBe('License expiration');
+    expect(alert.alertOptions.throttle).toBe('1d');
+    expect(alert.alertOptions.actionVariables).toStrictEqual([
       { name: 'expiredDate', description: 'The date when the license expires.' },
       { name: 'clusterName', description: 'The cluster to which the license belong.' },
       {
@@ -67,22 +82,6 @@ describe('LicenseExpirationAlert', () => {
         time: 1,
       },
     };
-    const getUiSettingsService = () => ({
-      asScopedToClient: jest.fn(),
-    });
-    const getLogger = () => ({
-      debug: jest.fn(),
-    });
-    const monitoringCluster = null;
-    const config = {
-      ui: {
-        show_license_expiration: true,
-        ccs: { enabled: true },
-        container: { elasticsearch: { enabled: false } },
-        metricbeat: { index: 'metricbeat-*' },
-      },
-    };
-    const kibanaUrl = 'http://localhost:5601';
 
     const replaceState = jest.fn();
     const scheduleActions = jest.fn();
@@ -121,19 +120,10 @@ describe('LicenseExpirationAlert', () => {
 
     it('should fire actions', async () => {
       const alert = new LicenseExpirationAlert();
-      alert.initializeAlertType(
-        getUiSettingsService as any,
-        monitoringCluster as any,
-        getLogger as any,
-        config as any,
-        kibanaUrl,
-        false
-      );
       const type = alert.getAlertType();
       await type.executor({
         ...executorOptions,
-        // @ts-ignore
-        params: alert.defaultParams,
+        params: alert.alertOptions.defaultParams,
       } as any);
       expect(replaceState).toHaveBeenCalledWith({
         alertStates: [
@@ -169,7 +159,6 @@ describe('LicenseExpirationAlert', () => {
                 ],
               },
               severity: 'warning',
-              resolvedMS: 0,
               triggeredMS: 1,
               lastCheckedMS: 0,
             },
@@ -194,118 +183,11 @@ describe('LicenseExpirationAlert', () => {
         return [];
       });
       const alert = new LicenseExpirationAlert();
-      alert.initializeAlertType(
-        getUiSettingsService as any,
-        monitoringCluster as any,
-        getLogger as any,
-        config as any,
-        kibanaUrl,
-        false
-      );
-      const type = alert.getAlertType();
-      await type.executor({
-        ...executorOptions,
-        // @ts-ignore
-        params: alert.defaultParams,
-      } as any);
-      expect(replaceState).not.toHaveBeenCalledWith({});
-      expect(scheduleActions).not.toHaveBeenCalled();
-    });
-
-    it('should resolve with a resolved message', async () => {
-      (fetchLegacyAlerts as jest.Mock).mockImplementation(() => {
-        return [
-          {
-            ...legacyAlert,
-            resolved_timestamp: 1,
-          },
-        ];
-      });
-      (getState as jest.Mock).mockImplementation(() => {
-        return {
-          alertStates: [
-            {
-              cluster: {
-                clusterUuid,
-                clusterName,
-              },
-              ccs: undefined,
-              ui: {
-                isFiring: true,
-                message: null,
-                severity: 'danger',
-                resolvedMS: 0,
-                triggeredMS: 1,
-                lastCheckedMS: 0,
-              },
-            },
-          ],
-        };
-      });
-      const alert = new LicenseExpirationAlert();
-      alert.initializeAlertType(
-        getUiSettingsService as any,
-        monitoringCluster as any,
-        getLogger as any,
-        config as any,
-        kibanaUrl,
-        false
-      );
-      const type = alert.getAlertType();
-      await type.executor({
-        ...executorOptions,
-        // @ts-ignore
-        params: alert.defaultParams,
-      } as any);
-      expect(replaceState).toHaveBeenCalledWith({
-        alertStates: [
-          {
-            cluster: { clusterUuid, clusterName },
-            ccs: undefined,
-            ui: {
-              isFiring: false,
-              message: {
-                text: 'The license for this cluster is active.',
-              },
-              severity: 'danger',
-              resolvedMS: 1,
-              triggeredMS: 1,
-              lastCheckedMS: 0,
-            },
-          },
-        ],
-      });
-      expect(scheduleActions).toHaveBeenCalledWith('default', {
-        internalFullMessage: 'License expiration alert is resolved for testCluster.',
-        internalShortMessage: 'License expiration alert is resolved for testCluster.',
-        clusterName,
-        expiredDate: 'THE_DATE',
-        state: 'resolved',
-      });
-    });
-
-    it('should not fire actions if we are not showing license expiration', async () => {
-      const alert = new LicenseExpirationAlert();
-      const customConfig = {
-        ...config,
-        ui: {
-          ...config.ui,
-          show_license_expiration: false,
-        },
-      };
-      alert.initializeAlertType(
-        getUiSettingsService as any,
-        monitoringCluster as any,
-        getLogger as any,
-        customConfig as any,
-        kibanaUrl,
-        false
-      );
       const type = alert.getAlertType();
       await type.executor({
         ...executorOptions,
         // @ts-ignore
-        params: alert.defaultParams,
+        params: alert.alertOptions.defaultParams,
       } as any);
       expect(replaceState).not.toHaveBeenCalledWith({});
       expect(scheduleActions).not.toHaveBeenCalled();
diff --git a/x-pack/plugins/monitoring/server/alerts/license_expiration_alert.ts b/x-pack/plugins/monitoring/server/alerts/license_expiration_alert.ts
index 9692d95bfc6fe..80479023a3a60 100644
--- a/x-pack/plugins/monitoring/server/alerts/license_expiration_alert.ts
+++ b/x-pack/plugins/monitoring/server/alerts/license_expiration_alert.ts
@@ -3,8 +3,8 @@
  * or more contributor license agreements. Licensed under the Elastic License;
  * you may not use this file except in compliance with the Elastic License.
  */
+
 import moment from 'moment';
-import { IUiSettingsClient } from 'kibana/server';
 import { i18n } from '@kbn/i18n';
 import { BaseAlert } from './base_alert';
 import {
@@ -14,102 +14,65 @@ import {
   AlertMessage,
   AlertMessageTimeToken,
   AlertMessageLinkToken,
-  AlertInstanceState,
   LegacyAlert,
-  CommonAlertParams,
 } from '../../common/types/alerts';
 import { AlertExecutorOptions, AlertInstance } from '../../../alerts/server';
 import {
-  INDEX_ALERTS,
   ALERT_LICENSE_EXPIRATION,
   FORMAT_DURATION_TEMPLATE_SHORT,
   LEGACY_ALERT_DETAILS,
 } from '../../common/constants';
-import { getCcsIndexPattern } from '../lib/alerts/get_ccs_index_pattern';
 import { AlertMessageTokenType } from '../../common/enums';
-import { fetchLegacyAlerts } from '../lib/alerts/fetch_legacy_alerts';
-import { mapLegacySeverity } from '../lib/alerts/map_legacy_severity';
 import { AlertingDefaults } from './alert_helpers';
-
-const WATCH_NAME = 'xpack_license_expiration';
+import { SanitizedAlert } from '../../../alerts/common';
+import { Globals } from '../static_globals';
 
 export class LicenseExpirationAlert extends BaseAlert {
-  public type = ALERT_LICENSE_EXPIRATION;
-  public label = LEGACY_ALERT_DETAILS[ALERT_LICENSE_EXPIRATION].label;
-  public description = LEGACY_ALERT_DETAILS[ALERT_LICENSE_EXPIRATION].description;
-  public isLegacy = true;
-  protected actionVariables = [
-    {
-      name: 'expiredDate',
-      description: i18n.translate(
-        'xpack.monitoring.alerts.licenseExpiration.actionVariables.expiredDate',
+  constructor(public rawAlert?: SanitizedAlert) {
+    super(rawAlert, {
+      id: ALERT_LICENSE_EXPIRATION,
+      name: LEGACY_ALERT_DETAILS[ALERT_LICENSE_EXPIRATION].label,
+      legacy: {
+        watchName: 'xpack_license_expiration',
+      },
+      interval: '1d',
+      actionVariables: [
         {
-          defaultMessage: 'The date when the license expires.',
-        }
-      ),
-    },
-    {
-      name: 'clusterName',
-      description: i18n.translate(
-        'xpack.monitoring.alerts.licenseExpiration.actionVariables.clusterName',
+          name: 'expiredDate',
+          description: i18n.translate(
+            'xpack.monitoring.alerts.licenseExpiration.actionVariables.expiredDate',
+            {
+              defaultMessage: 'The date when the license expires.',
+            }
+          ),
+        },
         {
-          defaultMessage: 'The cluster to which the license belong.',
-        }
-      ),
-    },
-    AlertingDefaults.ALERT_TYPE.context.internalShortMessage,
-    AlertingDefaults.ALERT_TYPE.context.internalFullMessage,
-    AlertingDefaults.ALERT_TYPE.context.state,
-    AlertingDefaults.ALERT_TYPE.context.action,
-    AlertingDefaults.ALERT_TYPE.context.actionPlain,
-  ];
+          name: 'clusterName',
+          description: i18n.translate(
+            'xpack.monitoring.alerts.licenseExpiration.actionVariables.clusterName',
+            {
+              defaultMessage: 'The cluster to which the license belong.',
+            }
+          ),
+        },
+        AlertingDefaults.ALERT_TYPE.context.internalShortMessage,
+        AlertingDefaults.ALERT_TYPE.context.internalFullMessage,
+        AlertingDefaults.ALERT_TYPE.context.state,
+        AlertingDefaults.ALERT_TYPE.context.action,
+        AlertingDefaults.ALERT_TYPE.context.actionPlain,
+      ],
+    });
+  }
 
   protected async execute(options: AlertExecutorOptions): Promise<any> {
-    if (!this.config.ui.show_license_expiration) {
+    if (!Globals.app.config.ui.show_license_expiration) {
       return;
     }
     return await super.execute(options);
   }
 
-  protected async fetchData(
-    params: CommonAlertParams,
-    callCluster: any,
-    clusters: AlertCluster[],
-    uiSettings: IUiSettingsClient,
-    availableCcs: string[]
-  ): Promise<AlertData[]> {
-    let alertIndexPattern = INDEX_ALERTS;
-    if (availableCcs) {
-      alertIndexPattern = getCcsIndexPattern(alertIndexPattern, availableCcs);
-    }
-    const legacyAlerts = await fetchLegacyAlerts(
-      callCluster,
-      clusters,
-      alertIndexPattern,
-      WATCH_NAME,
-      this.config.ui.max_bucket_size
-    );
-    return legacyAlerts.reduce((accum: AlertData[], legacyAlert) => {
-      accum.push({
-        instanceKey: `${legacyAlert.metadata.cluster_uuid}`,
-        clusterUuid: legacyAlert.metadata.cluster_uuid,
-        shouldFire: !legacyAlert.resolved_timestamp,
-        severity: mapLegacySeverity(legacyAlert.metadata.severity),
-        meta: legacyAlert,
-      });
-      return accum;
-    }, []);
-  }
-
   protected getUiMessage(alertState: AlertState, item: AlertData): AlertMessage {
     const legacyAlert = item.meta as LegacyAlert;
-    if (!alertState.ui.isFiring) {
-      return {
-        text: i18n.translate('xpack.monitoring.alerts.licenseExpiration.ui.resolvedMessage', {
-          defaultMessage: `The license for this cluster is active.`,
-        }),
-      };
-    }
     return {
       text: i18n.translate('xpack.monitoring.alerts.licenseExpiration.ui.firingMessage', {
         defaultMessage: `The license for this cluster expires in #relative at #absolute. #start_linkPlease update your license.#end_link`,
@@ -141,41 +104,13 @@ export class LicenseExpirationAlert extends BaseAlert {
 
   protected async executeActions(
     instance: AlertInstance,
-    instanceState: AlertInstanceState,
+    alertState: AlertState,
     item: AlertData,
     cluster: AlertCluster
   ) {
-    if (instanceState.alertStates.length === 0) {
-      return;
-    }
-    const alertState = instanceState.alertStates[0];
     const legacyAlert = item.meta as LegacyAlert;
     const $expiry = moment(legacyAlert.metadata.time);
-    if (!alertState.ui.isFiring) {
-      instance.scheduleActions('default', {
-        internalShortMessage: i18n.translate(
-          'xpack.monitoring.alerts.licenseExpiration.resolved.internalShortMessage',
-          {
-            defaultMessage: `License expiration alert is resolved for {clusterName}.`,
-            values: {
-              clusterName: cluster.clusterName,
-            },
-          }
-        ),
-        internalFullMessage: i18n.translate(
-          'xpack.monitoring.alerts.licenseExpiration.resolved.internalFullMessage',
-          {
-            defaultMessage: `License expiration alert is resolved for {clusterName}.`,
-            values: {
-              clusterName: cluster.clusterName,
-            },
-          }
-        ),
-        state: AlertingDefaults.ALERT_STATE.resolved,
-        expiredDate: $expiry.format(FORMAT_DURATION_TEMPLATE_SHORT).trim(),
-        clusterName: cluster.clusterName,
-      });
-    } else {
+    if (alertState.ui.isFiring) {
       const actionText = i18n.translate('xpack.monitoring.alerts.licenseExpiration.action', {
         defaultMessage: 'Please update your license.',
       });
diff --git a/x-pack/plugins/monitoring/server/alerts/logstash_version_mismatch_alert.test.ts b/x-pack/plugins/monitoring/server/alerts/logstash_version_mismatch_alert.test.ts
index d3729660040d8..a021a0e6fe179 100644
--- a/x-pack/plugins/monitoring/server/alerts/logstash_version_mismatch_alert.test.ts
+++ b/x-pack/plugins/monitoring/server/alerts/logstash_version_mismatch_alert.test.ts
@@ -17,14 +17,29 @@ jest.mock('../lib/alerts/fetch_clusters', () => ({
   fetchClusters: jest.fn(),
 }));
 
+jest.mock('../static_globals', () => ({
+  Globals: {
+    app: {
+      getLogger: () => ({ debug: jest.fn() }),
+      config: {
+        ui: {
+          show_license_expiration: true,
+          ccs: { enabled: true },
+          metricbeat: { index: 'metricbeat-*' },
+          container: { elasticsearch: { enabled: false } },
+        },
+      },
+    },
+  },
+}));
+
 describe('LogstashVersionMismatchAlert', () => {
   it('should have defaults', () => {
     const alert = new LogstashVersionMismatchAlert();
-    expect(alert.type).toBe(ALERT_LOGSTASH_VERSION_MISMATCH);
-    expect(alert.label).toBe('Logstash version mismatch');
-    expect(alert.defaultThrottle).toBe('1d');
-    // @ts-ignore
-    expect(alert.actionVariables).toStrictEqual([
+    expect(alert.alertOptions.id).toBe(ALERT_LOGSTASH_VERSION_MISMATCH);
+    expect(alert.alertOptions.name).toBe('Logstash version mismatch');
+    expect(alert.alertOptions.throttle).toBe('1d');
+    expect(alert.alertOptions.actionVariables).toStrictEqual([
       {
         name: 'versionList',
         description: 'The versions of Logstash running in this cluster.',
@@ -61,21 +76,6 @@ describe('LogstashVersionMismatchAlert', () => {
         cluster_uuid: clusterUuid,
       },
     };
-    const getUiSettingsService = () => ({
-      asScopedToClient: jest.fn(),
-    });
-    const getLogger = () => ({
-      debug: jest.fn(),
-    });
-    const monitoringCluster = null;
-    const config = {
-      ui: {
-        ccs: { enabled: true },
-        container: { elasticsearch: { enabled: false } },
-        metricbeat: { index: 'metricbeat-*' },
-      },
-    };
-    const kibanaUrl = 'http://localhost:5601';
 
     const replaceState = jest.fn();
     const scheduleActions = jest.fn();
@@ -114,19 +114,11 @@ describe('LogstashVersionMismatchAlert', () => {
 
     it('should fire actions', async () => {
       const alert = new LogstashVersionMismatchAlert();
-      alert.initializeAlertType(
-        getUiSettingsService as any,
-        monitoringCluster as any,
-        getLogger as any,
-        config as any,
-        kibanaUrl,
-        false
-      );
       const type = alert.getAlertType();
       await type.executor({
         ...executorOptions,
         // @ts-ignore
-        params: alert.defaultParams,
+        params: alert.alertOptions.defaultParams,
       } as any);
       expect(replaceState).toHaveBeenCalledWith({
         alertStates: [
@@ -139,7 +131,6 @@ describe('LogstashVersionMismatchAlert', () => {
                 text: 'Multiple versions of Logstash ([8.0.0, 7.2.1]) running in this cluster.',
               },
               severity: 'warning',
-              resolvedMS: 0,
               triggeredMS: 1,
               lastCheckedMS: 0,
             },
@@ -164,93 +155,14 @@ describe('LogstashVersionMismatchAlert', () => {
         return [];
       });
       const alert = new LogstashVersionMismatchAlert();
-      alert.initializeAlertType(
-        getUiSettingsService as any,
-        monitoringCluster as any,
-        getLogger as any,
-        config as any,
-        kibanaUrl,
-        false
-      );
       const type = alert.getAlertType();
       await type.executor({
         ...executorOptions,
         // @ts-ignore
-        params: alert.defaultParams,
+        params: alert.alertOptions.defaultParams,
       } as any);
       expect(replaceState).not.toHaveBeenCalledWith({});
       expect(scheduleActions).not.toHaveBeenCalled();
     });
-
-    it('should resolve with a resolved message', async () => {
-      (fetchLegacyAlerts as jest.Mock).mockImplementation(() => {
-        return [
-          {
-            ...legacyAlert,
-            resolved_timestamp: 1,
-          },
-        ];
-      });
-      (getState as jest.Mock).mockImplementation(() => {
-        return {
-          alertStates: [
-            {
-              cluster: {
-                clusterUuid,
-                clusterName,
-              },
-              ccs: undefined,
-              ui: {
-                isFiring: true,
-                message: null,
-                severity: 'danger',
-                resolvedMS: 0,
-                triggeredMS: 1,
-                lastCheckedMS: 0,
-              },
-            },
-          ],
-        };
-      });
-      const alert = new LogstashVersionMismatchAlert();
-      alert.initializeAlertType(
-        getUiSettingsService as any,
-        monitoringCluster as any,
-        getLogger as any,
-        config as any,
-        kibanaUrl,
-        false
-      );
-      const type = alert.getAlertType();
-      await type.executor({
-        ...executorOptions,
-        // @ts-ignore
-        params: alert.defaultParams,
-      } as any);
-      expect(replaceState).toHaveBeenCalledWith({
-        alertStates: [
-          {
-            cluster: { clusterUuid, clusterName },
-            ccs: undefined,
-            ui: {
-              isFiring: false,
-              message: {
-                text: 'All versions of Logstash are the same in this cluster.',
-              },
-              severity: 'danger',
-              resolvedMS: 1,
-              triggeredMS: 1,
-              lastCheckedMS: 0,
-            },
-          },
-        ],
-      });
-      expect(scheduleActions).toHaveBeenCalledWith('default', {
-        internalFullMessage: 'Logstash version mismatch alert is resolved for testCluster.',
-        internalShortMessage: 'Logstash version mismatch alert is resolved for testCluster.',
-        clusterName,
-        state: 'resolved',
-      });
-    });
   });
 });
diff --git a/x-pack/plugins/monitoring/server/alerts/logstash_version_mismatch_alert.ts b/x-pack/plugins/monitoring/server/alerts/logstash_version_mismatch_alert.ts
index 61967b2f6559a..98640fb6e183a 100644
--- a/x-pack/plugins/monitoring/server/alerts/logstash_version_mismatch_alert.ts
+++ b/x-pack/plugins/monitoring/server/alerts/logstash_version_mismatch_alert.ts
@@ -3,7 +3,7 @@
  * or more contributor license agreements. Licensed under the Elastic License;
  * you may not use this file except in compliance with the Elastic License.
  */
-import { IUiSettingsClient } from 'kibana/server';
+
 import { i18n } from '@kbn/i18n';
 import { BaseAlert } from './base_alert';
 import {
@@ -11,94 +11,42 @@ import {
   AlertCluster,
   AlertState,
   AlertMessage,
-  AlertInstanceState,
   LegacyAlert,
-  CommonAlertParams,
 } from '../../common/types/alerts';
 import { AlertInstance } from '../../../alerts/server';
-import {
-  INDEX_ALERTS,
-  ALERT_LOGSTASH_VERSION_MISMATCH,
-  LEGACY_ALERT_DETAILS,
-} from '../../common/constants';
-import { getCcsIndexPattern } from '../lib/alerts/get_ccs_index_pattern';
+import { ALERT_LOGSTASH_VERSION_MISMATCH, LEGACY_ALERT_DETAILS } from '../../common/constants';
 import { AlertSeverity } from '../../common/enums';
-import { fetchLegacyAlerts } from '../lib/alerts/fetch_legacy_alerts';
 import { AlertingDefaults } from './alert_helpers';
-
-const WATCH_NAME = 'logstash_version_mismatch';
+import { SanitizedAlert } from '../../../alerts/common';
 
 export class LogstashVersionMismatchAlert extends BaseAlert {
-  public type = ALERT_LOGSTASH_VERSION_MISMATCH;
-  public label = LEGACY_ALERT_DETAILS[ALERT_LOGSTASH_VERSION_MISMATCH].label;
-  public description = LEGACY_ALERT_DETAILS[ALERT_LOGSTASH_VERSION_MISMATCH].description;
-  public isLegacy = true;
-
-  protected actionVariables = [
-    {
-      name: 'versionList',
-      description: i18n.translate(
-        'xpack.monitoring.alerts.logstashVersionMismatch.actionVariables.clusterHealth',
+  constructor(public rawAlert?: SanitizedAlert) {
+    super(rawAlert, {
+      id: ALERT_LOGSTASH_VERSION_MISMATCH,
+      name: LEGACY_ALERT_DETAILS[ALERT_LOGSTASH_VERSION_MISMATCH].label,
+      legacy: {
+        watchName: 'logstash_version_mismatch',
+        changeDataValues: { severity: AlertSeverity.Warning },
+      },
+      interval: '1d',
+      actionVariables: [
         {
-          defaultMessage: 'The versions of Logstash running in this cluster.',
-        }
-      ),
-    },
-    ...Object.values(AlertingDefaults.ALERT_TYPE.context),
-  ];
-
-  protected async fetchData(
-    params: CommonAlertParams,
-    callCluster: any,
-    clusters: AlertCluster[],
-    uiSettings: IUiSettingsClient,
-    availableCcs: string[]
-  ): Promise<AlertData[]> {
-    let alertIndexPattern = INDEX_ALERTS;
-    if (availableCcs) {
-      alertIndexPattern = getCcsIndexPattern(alertIndexPattern, availableCcs);
-    }
-    const legacyAlerts = await fetchLegacyAlerts(
-      callCluster,
-      clusters,
-      alertIndexPattern,
-      WATCH_NAME,
-      this.config.ui.max_bucket_size
-    );
-
-    return legacyAlerts.reduce((accum: AlertData[], legacyAlert) => {
-      const severity = AlertSeverity.Warning;
-
-      accum.push({
-        instanceKey: `${legacyAlert.metadata.cluster_uuid}`,
-        clusterUuid: legacyAlert.metadata.cluster_uuid,
-        shouldFire: !legacyAlert.resolved_timestamp,
-        severity,
-        meta: legacyAlert,
-      });
-      return accum;
-    }, []);
-  }
-
-  private getVersions(legacyAlert: LegacyAlert) {
-    const prefixStr = 'Versions: ';
-    return legacyAlert.message.slice(
-      legacyAlert.message.indexOf(prefixStr) + prefixStr.length,
-      legacyAlert.message.length - 1
-    );
+          name: 'versionList',
+          description: i18n.translate(
+            'xpack.monitoring.alerts.logstashVersionMismatch.actionVariables.clusterHealth',
+            {
+              defaultMessage: 'The versions of Logstash running in this cluster.',
+            }
+          ),
+        },
+        ...Object.values(AlertingDefaults.ALERT_TYPE.context),
+      ],
+    });
   }
 
   protected getUiMessage(alertState: AlertState, item: AlertData): AlertMessage {
     const legacyAlert = item.meta as LegacyAlert;
     const versions = this.getVersions(legacyAlert);
-    if (!alertState.ui.isFiring) {
-      return {
-        text: i18n.translate('xpack.monitoring.alerts.logstashVersionMismatch.ui.resolvedMessage', {
-          defaultMessage: `All versions of Logstash are the same in this cluster.`,
-        }),
-      };
-    }
-
     const text = i18n.translate(
       'xpack.monitoring.alerts.logstashVersionMismatch.ui.firingMessage',
       {
@@ -116,40 +64,13 @@ export class LogstashVersionMismatchAlert extends BaseAlert {
 
   protected async executeActions(
     instance: AlertInstance,
-    instanceState: AlertInstanceState,
+    alertState: AlertState,
     item: AlertData,
     cluster: AlertCluster
   ) {
-    if (instanceState.alertStates.length === 0) {
-      return;
-    }
-    const alertState = instanceState.alertStates[0];
     const legacyAlert = item.meta as LegacyAlert;
     const versions = this.getVersions(legacyAlert);
-    if (!alertState.ui.isFiring) {
-      instance.scheduleActions('default', {
-        internalShortMessage: i18n.translate(
-          'xpack.monitoring.alerts.logstashVersionMismatch.resolved.internalShortMessage',
-          {
-            defaultMessage: `Logstash version mismatch alert is resolved for {clusterName}.`,
-            values: {
-              clusterName: cluster.clusterName,
-            },
-          }
-        ),
-        internalFullMessage: i18n.translate(
-          'xpack.monitoring.alerts.logstashVersionMismatch.resolved.internalFullMessage',
-          {
-            defaultMessage: `Logstash version mismatch alert is resolved for {clusterName}.`,
-            values: {
-              clusterName: cluster.clusterName,
-            },
-          }
-        ),
-        state: AlertingDefaults.ALERT_STATE.resolved,
-        clusterName: cluster.clusterName,
-      });
-    } else {
+    if (alertState.ui.isFiring) {
       const shortActionText = i18n.translate(
         'xpack.monitoring.alerts.logstashVersionMismatch.shortAction',
         {
diff --git a/x-pack/plugins/monitoring/server/alerts/memory_usage_alert.ts b/x-pack/plugins/monitoring/server/alerts/memory_usage_alert.ts
index 1564b9727c64b..860cd41f9057d 100644
--- a/x-pack/plugins/monitoring/server/alerts/memory_usage_alert.ts
+++ b/x-pack/plugins/monitoring/server/alerts/memory_usage_alert.ts
@@ -3,7 +3,7 @@
  * or more contributor license agreements. Licensed under the Elastic License;
  * you may not use this file except in compliance with the Elastic License.
  */
-import { IUiSettingsClient, Logger } from 'kibana/server';
+
 import { i18n } from '@kbn/i18n';
 import { BaseAlert } from './base_alert';
 import {
@@ -18,7 +18,7 @@ import {
   CommonAlertFilter,
   CommonAlertParams,
 } from '../../common/types/alerts';
-import { AlertInstance, AlertServices } from '../../../alerts/server';
+import { AlertInstance } from '../../../alerts/server';
 import {
   INDEX_PATTERN_ELASTICSEARCH,
   ALERT_MEMORY_USAGE,
@@ -27,45 +27,47 @@ import {
 import { fetchMemoryUsageNodeStats } from '../lib/alerts/fetch_memory_usage_node_stats';
 import { getCcsIndexPattern } from '../lib/alerts/get_ccs_index_pattern';
 import { AlertMessageTokenType, AlertSeverity } from '../../common/enums';
-import { RawAlertInstance } from '../../../alerts/common';
+import { RawAlertInstance, SanitizedAlert } from '../../../alerts/common';
 import { AlertingDefaults, createLink } from './alert_helpers';
 import { appendMetricbeatIndex } from '../lib/alerts/append_mb_index';
 import { parseDuration } from '../../../alerts/common/parse_duration';
+import { Globals } from '../static_globals';
 
 export class MemoryUsageAlert extends BaseAlert {
-  public type = ALERT_MEMORY_USAGE;
-  public label = ALERT_DETAILS[ALERT_MEMORY_USAGE].label;
-  public description = ALERT_DETAILS[ALERT_MEMORY_USAGE].description;
-
-  protected defaultParams = {
-    threshold: 85,
-    duration: '5m',
-  };
-
-  protected actionVariables = [
-    {
-      name: 'nodes',
-      description: i18n.translate('xpack.monitoring.alerts.memoryUsage.actionVariables.nodes', {
-        defaultMessage: 'The list of nodes reporting high memory usage.',
-      }),
-    },
-    {
-      name: 'count',
-      description: i18n.translate('xpack.monitoring.alerts.memoryUsage.actionVariables.count', {
-        defaultMessage: 'The number of nodes reporting high memory usage.',
-      }),
-    },
-    ...Object.values(AlertingDefaults.ALERT_TYPE.context),
-  ];
+  constructor(public rawAlert?: SanitizedAlert) {
+    super(rawAlert, {
+      id: ALERT_MEMORY_USAGE,
+      name: ALERT_DETAILS[ALERT_MEMORY_USAGE].label,
+      accessorKey: 'memoryUsage',
+      defaultParams: {
+        threshold: 85,
+        duration: '5m',
+      },
+      actionVariables: [
+        {
+          name: 'nodes',
+          description: i18n.translate('xpack.monitoring.alerts.memoryUsage.actionVariables.nodes', {
+            defaultMessage: 'The list of nodes reporting high memory usage.',
+          }),
+        },
+        {
+          name: 'count',
+          description: i18n.translate('xpack.monitoring.alerts.memoryUsage.actionVariables.count', {
+            defaultMessage: 'The number of nodes reporting high memory usage.',
+          }),
+        },
+        ...Object.values(AlertingDefaults.ALERT_TYPE.context),
+      ],
+    });
+  }
 
   protected async fetchData(
     params: CommonAlertParams,
     callCluster: any,
     clusters: AlertCluster[],
-    uiSettings: IUiSettingsClient,
     availableCcs: string[]
   ): Promise<AlertData[]> {
-    let esIndexPattern = appendMetricbeatIndex(this.config, INDEX_PATTERN_ELASTICSEARCH);
+    let esIndexPattern = appendMetricbeatIndex(Globals.app.config, INDEX_PATTERN_ELASTICSEARCH);
     if (availableCcs) {
       esIndexPattern = getCcsIndexPattern(esIndexPattern, availableCcs);
     }
@@ -80,14 +82,13 @@ export class MemoryUsageAlert extends BaseAlert {
       esIndexPattern,
       startMs,
       endMs,
-      this.config.ui.max_bucket_size
+      Globals.app.config.ui.max_bucket_size
     );
 
     return stats.map((stat) => {
-      const { clusterUuid, nodeId, memoryUsage, ccs } = stat;
+      const { clusterUuid, memoryUsage, ccs } = stat;
       return {
-        instanceKey: `${clusterUuid}:${nodeId}`,
-        shouldFire: memoryUsage > threshold,
+        shouldFire: memoryUsage > threshold!,
         severity: AlertSeverity.Danger,
         meta: stat,
         clusterUuid,
@@ -97,15 +98,7 @@ export class MemoryUsageAlert extends BaseAlert {
   }
 
   protected filterAlertInstance(alertInstance: RawAlertInstance, filters: CommonAlertFilter[]) {
-    const alertInstanceStates = alertInstance.state?.alertStates as AlertMemoryUsageState[];
-    const nodeFilter = filters?.find((filter) => filter.nodeUuid);
-
-    if (!filters || !filters.length || !alertInstanceStates?.length || !nodeFilter?.nodeUuid) {
-      return true;
-    }
-
-    const nodeAlerts = alertInstanceStates.filter(({ nodeId }) => nodeId === nodeFilter.nodeUuid);
-    return Boolean(nodeAlerts.length);
+    return super.filterAlertInstance(alertInstance, filters, true);
   }
 
   protected getDefaultAlertState(cluster: AlertCluster, item: AlertData): AlertState {
@@ -116,26 +109,6 @@ export class MemoryUsageAlert extends BaseAlert {
 
   protected getUiMessage(alertState: AlertState, item: AlertData): AlertMessage {
     const stat = item.meta as AlertMemoryUsageState;
-    if (!alertState.ui.isFiring) {
-      return {
-        text: i18n.translate('xpack.monitoring.alerts.memoryUsage.ui.resolvedMessage', {
-          defaultMessage: `The JVM memory usage on node {nodeName} is now under the threshold, currently reporting at {memoryUsage}% as of #resolved`,
-          values: {
-            nodeName: stat.nodeName,
-            memoryUsage: stat.memoryUsage.toFixed(2),
-          },
-        }),
-        tokens: [
-          {
-            startToken: '#resolved',
-            type: AlertMessageTokenType.Time,
-            isAbsolute: true,
-            isRelative: false,
-            timestamp: alertState.ui.resolvedMS,
-          } as AlertMessageTimeToken,
-        ],
-      };
-    }
     return {
       text: i18n.translate('xpack.monitoring.alerts.memoryUsage.ui.firingMessage', {
         defaultMessage: `Node #start_link{nodeName}#end_link is reporting JVM memory usage of {memoryUsage}% at #absolute`,
@@ -246,7 +219,7 @@ export class MemoryUsageAlert extends BaseAlert {
 
       instance.scheduleActions('default', {
         internalShortMessage,
-        internalFullMessage: this.isCloud ? internalShortMessage : internalFullMessage,
+        internalFullMessage: Globals.app.isCloud ? internalShortMessage : internalFullMessage,
         state: AlertingDefaults.ALERT_STATE.firing,
         nodes: firingNodes
           .map((state) => `${state.nodeName}:${state.memoryUsage.toFixed(2)}`)
@@ -256,83 +229,6 @@ export class MemoryUsageAlert extends BaseAlert {
         action,
         actionPlain: shortActionText,
       });
-    } else {
-      const resolvedNodes = (alertStates as AlertMemoryUsageState[])
-        .filter((state) => !state.ui.isFiring)
-        .map((state) => `${state.nodeName}:${state.memoryUsage.toFixed(2)}`);
-      const resolvedCount = resolvedNodes.length;
-
-      if (resolvedCount > 0) {
-        const internalMessage = i18n.translate(
-          'xpack.monitoring.alerts.memoryUsage.resolved.internalMessage',
-          {
-            defaultMessage: `Memory usage alert is resolved for {count} node(s) in cluster: {clusterName}.`,
-            values: {
-              count: resolvedCount,
-              clusterName: cluster.clusterName,
-            },
-          }
-        );
-
-        instance.scheduleActions('default', {
-          internalShortMessage: internalMessage,
-          internalFullMessage: internalMessage,
-          state: AlertingDefaults.ALERT_STATE.resolved,
-          nodes: resolvedNodes.join(','),
-          count: resolvedCount,
-          clusterName: cluster.clusterName,
-        });
-      }
     }
   }
-
-  protected async processData(
-    data: AlertData[],
-    clusters: AlertCluster[],
-    services: AlertServices,
-    logger: Logger,
-    state: any
-  ) {
-    const currentUTC = +new Date();
-    for (const cluster of clusters) {
-      const nodes = data.filter((node) => node.clusterUuid === cluster.clusterUuid);
-      if (!nodes.length) {
-        continue;
-      }
-
-      const firingNodeUuids = nodes
-        .filter((node) => node.shouldFire)
-        .map((node) => node.meta.nodeId)
-        .join(',');
-      const instanceId = `${this.type}:${cluster.clusterUuid}:${firingNodeUuids}`;
-      const instance = services.alertInstanceFactory(instanceId);
-      const newAlertStates: AlertMemoryUsageState[] = [];
-
-      for (const node of nodes) {
-        const stat = node.meta as AlertMemoryUsageState;
-        const nodeState = this.getDefaultAlertState(cluster, node) as AlertMemoryUsageState;
-        nodeState.memoryUsage = stat.memoryUsage;
-        nodeState.nodeId = stat.nodeId;
-        nodeState.nodeName = stat.nodeName;
-
-        if (node.shouldFire) {
-          nodeState.ui.triggeredMS = currentUTC;
-          nodeState.ui.isFiring = true;
-          nodeState.ui.severity = node.severity;
-          newAlertStates.push(nodeState);
-        }
-        nodeState.ui.message = this.getUiMessage(nodeState, node);
-      }
-
-      const alertInstanceState = { alertStates: newAlertStates };
-      instance.replaceState(alertInstanceState);
-      if (newAlertStates.length) {
-        this.executeActions(instance, alertInstanceState, null, cluster);
-        state.lastExecutedAction = currentUTC;
-      }
-    }
-
-    state.lastChecked = currentUTC;
-    return state;
-  }
 }
diff --git a/x-pack/plugins/monitoring/server/alerts/missing_monitoring_data_alert.test.ts b/x-pack/plugins/monitoring/server/alerts/missing_monitoring_data_alert.test.ts
index 1332148a61cdd..12bb27ce132d0 100644
--- a/x-pack/plugins/monitoring/server/alerts/missing_monitoring_data_alert.test.ts
+++ b/x-pack/plugins/monitoring/server/alerts/missing_monitoring_data_alert.test.ts
@@ -17,18 +17,33 @@ jest.mock('../lib/alerts/fetch_clusters', () => ({
   fetchClusters: jest.fn(),
 }));
 
+jest.mock('../static_globals', () => ({
+  Globals: {
+    app: {
+      getLogger: () => ({ debug: jest.fn() }),
+      url: 'http://localhost:5601',
+      config: {
+        ui: {
+          show_license_expiration: true,
+          ccs: { enabled: true },
+          metricbeat: { index: 'metricbeat-*' },
+          container: { elasticsearch: { enabled: false } },
+        },
+      },
+    },
+  },
+}));
+
 describe('MissingMonitoringDataAlert', () => {
   it('should have defaults', () => {
     const alert = new MissingMonitoringDataAlert();
-    expect(alert.type).toBe(ALERT_MISSING_MONITORING_DATA);
-    expect(alert.label).toBe('Missing monitoring data');
-    expect(alert.defaultThrottle).toBe('6h');
-    // @ts-ignore
-    expect(alert.defaultParams).toStrictEqual({ limit: '1d', duration: '15m' });
-    // @ts-ignore
-    expect(alert.actionVariables).toStrictEqual([
-      { name: 'stackProducts', description: 'The stack products missing monitoring data.' },
-      { name: 'count', description: 'The number of stack products missing monitoring data.' },
+    expect(alert.alertOptions.id).toBe(ALERT_MISSING_MONITORING_DATA);
+    expect(alert.alertOptions.name).toBe('Missing monitoring data');
+    expect(alert.alertOptions.throttle).toBe('6h');
+    expect(alert.alertOptions.defaultParams).toStrictEqual({ limit: '1d', duration: '15m' });
+    expect(alert.alertOptions.actionVariables).toStrictEqual([
+      { name: 'nodes', description: 'The list of nodes missing monitoring data.' },
+      { name: 'count', description: 'The number of nodes missing monitoring data.' },
       {
         name: 'internalShortMessage',
         description: 'The short internal message generated by Elastic.',
@@ -53,34 +68,17 @@ describe('MissingMonitoringDataAlert', () => {
 
     const clusterUuid = 'abc123';
     const clusterName = 'testCluster';
-    const stackProduct = 'elasticsearch';
-    const stackProductUuid = 'esNode1';
-    const stackProductName = 'esName1';
+    const nodeId = 'esNode1';
+    const nodeName = 'esName1';
     const gapDuration = 3000001;
     const missingData = [
       {
-        stackProduct,
-        stackProductUuid,
-        stackProductName,
+        nodeId,
+        nodeName,
         clusterUuid,
         gapDuration,
       },
     ];
-    const getUiSettingsService = () => ({
-      asScopedToClient: jest.fn(),
-    });
-    const getLogger = () => ({
-      debug: jest.fn(),
-    });
-    const monitoringCluster = null;
-    const config = {
-      ui: {
-        ccs: { enabled: true },
-        container: { elasticsearch: { enabled: false } },
-        metricbeat: { index: 'metricbeat-*' },
-      },
-    };
-    const kibanaUrl = 'http://localhost:5601';
 
     const replaceState = jest.fn();
     const scheduleActions = jest.fn();
@@ -119,19 +117,10 @@ describe('MissingMonitoringDataAlert', () => {
 
     it('should fire actions', async () => {
       const alert = new MissingMonitoringDataAlert();
-      alert.initializeAlertType(
-        getUiSettingsService as any,
-        monitoringCluster as any,
-        getLogger as any,
-        config as any,
-        kibanaUrl,
-        false
-      );
       const type = alert.getAlertType();
       await type.executor({
         ...executorOptions,
-        // @ts-ignore
-        params: alert.defaultParams,
+        params: alert.alertOptions.defaultParams,
       } as any);
       const count = 1;
       expect(replaceState).toHaveBeenCalledWith({
@@ -140,9 +129,8 @@ describe('MissingMonitoringDataAlert', () => {
             ccs: undefined,
             cluster: { clusterUuid, clusterName },
             gapDuration,
-            stackProduct,
-            stackProductName,
-            stackProductUuid,
+            nodeName,
+            nodeId,
             ui: {
               isFiring: true,
               message: {
@@ -175,7 +163,6 @@ describe('MissingMonitoringDataAlert', () => {
                 ],
               },
               severity: 'danger',
-              resolvedMS: 0,
               triggeredMS: 1,
               lastCheckedMS: 0,
             },
@@ -183,14 +170,14 @@ describe('MissingMonitoringDataAlert', () => {
         ],
       });
       expect(scheduleActions).toHaveBeenCalledWith('default', {
-        internalFullMessage: `We have not detected any monitoring data for 1 stack product(s) in cluster: testCluster. [View what monitoring data we do have for these stack products.](http://localhost:5601/app/monitoring#/overview?_g=(cluster_uuid:abc123))`,
-        internalShortMessage: `We have not detected any monitoring data for 1 stack product(s) in cluster: testCluster. Verify these stack products are up and running, then double check the monitoring settings.`,
-        action: `[View what monitoring data we do have for these stack products.](http://localhost:5601/app/monitoring#/overview?_g=(cluster_uuid:abc123))`,
+        internalFullMessage: `We have not detected any monitoring data for 1 node(s) in cluster: testCluster. [View what monitoring data we do have for these nodes.](http://localhost:5601/app/monitoring#/overview?_g=(cluster_uuid:abc123))`,
+        internalShortMessage: `We have not detected any monitoring data for 1 node(s) in cluster: testCluster. Verify these nodes are up and running, then double check the monitoring settings.`,
+        nodes: 'node: esName1',
+        action: `[View what monitoring data we do have for these nodes.](http://localhost:5601/app/monitoring#/overview?_g=(cluster_uuid:abc123))`,
         actionPlain:
-          'Verify these stack products are up and running, then double check the monitoring settings.',
+          'Verify these nodes are up and running, then double check the monitoring settings.',
         clusterName,
         count,
-        stackProducts: 'Elasticsearch node: esName1',
         state: 'firing',
       });
     });
@@ -205,137 +192,18 @@ describe('MissingMonitoringDataAlert', () => {
         ];
       });
       const alert = new MissingMonitoringDataAlert();
-      alert.initializeAlertType(
-        getUiSettingsService as any,
-        monitoringCluster as any,
-        getLogger as any,
-        config as any,
-        kibanaUrl,
-        false
-      );
       const type = alert.getAlertType();
       await type.executor({
         ...executorOptions,
         // @ts-ignore
-        params: alert.defaultParams,
+        params: alert.alertOptions.defaultParams,
       } as any);
       expect(replaceState).toHaveBeenCalledWith({
-        alertStates: [
-          {
-            cluster: {
-              clusterUuid,
-              clusterName,
-            },
-            gapDuration: 1,
-            stackProduct,
-            stackProductName,
-            stackProductUuid,
-            ui: {
-              isFiring: false,
-              lastCheckedMS: 0,
-              message: null,
-              resolvedMS: 0,
-              severity: 'danger',
-              triggeredMS: 0,
-            },
-          },
-        ],
+        alertStates: [],
       });
       expect(scheduleActions).not.toHaveBeenCalled();
     });
 
-    it('should resolve with a resolved message', async () => {
-      (fetchMissingMonitoringData as jest.Mock).mockImplementation(() => {
-        return [
-          {
-            ...missingData[0],
-            gapDuration: 1,
-          },
-        ];
-      });
-      (getState as jest.Mock).mockImplementation(() => {
-        return {
-          alertStates: [
-            {
-              cluster: {
-                clusterUuid,
-                clusterName,
-              },
-              ccs: null,
-              gapDuration: 1,
-              stackProduct,
-              stackProductName,
-              stackProductUuid,
-              ui: {
-                isFiring: true,
-                message: null,
-                severity: 'danger',
-                resolvedMS: 0,
-                triggeredMS: 1,
-                lastCheckedMS: 0,
-              },
-            },
-          ],
-        };
-      });
-      const alert = new MissingMonitoringDataAlert();
-      alert.initializeAlertType(
-        getUiSettingsService as any,
-        monitoringCluster as any,
-        getLogger as any,
-        config as any,
-        kibanaUrl,
-        false
-      );
-      const type = alert.getAlertType();
-      await type.executor({
-        ...executorOptions,
-        // @ts-ignore
-        params: alert.defaultParams,
-      } as any);
-      const count = 1;
-      expect(replaceState).toHaveBeenCalledWith({
-        alertStates: [
-          {
-            cluster: { clusterUuid, clusterName },
-            ccs: null,
-            gapDuration: 1,
-            stackProduct,
-            stackProductName,
-            stackProductUuid,
-            ui: {
-              isFiring: false,
-              message: {
-                text:
-                  'We are now seeing monitoring data for the Elasticsearch node: esName1, as of #resolved',
-                tokens: [
-                  {
-                    startToken: '#resolved',
-                    type: 'time',
-                    isAbsolute: true,
-                    isRelative: false,
-                    timestamp: 1,
-                  },
-                ],
-              },
-              severity: 'danger',
-              resolvedMS: 1,
-              triggeredMS: 1,
-              lastCheckedMS: 0,
-            },
-          },
-        ],
-      });
-      expect(scheduleActions).toHaveBeenCalledWith('default', {
-        internalFullMessage: `We are now seeing monitoring data for 1 stack product(s) in cluster testCluster.`,
-        internalShortMessage: `We are now seeing monitoring data for 1 stack product(s) in cluster: testCluster.`,
-        clusterName,
-        count,
-        stackProducts: 'Elasticsearch node: esName1',
-        state: 'resolved',
-      });
-    });
-
     it('should handle ccs', async () => {
       const ccs = 'testCluster';
       (fetchMissingMonitoringData as jest.Mock).mockImplementation(() => {
@@ -347,60 +215,22 @@ describe('MissingMonitoringDataAlert', () => {
         ];
       });
       const alert = new MissingMonitoringDataAlert();
-      alert.initializeAlertType(
-        getUiSettingsService as any,
-        monitoringCluster as any,
-        getLogger as any,
-        config as any,
-        kibanaUrl,
-        false
-      );
-      const type = alert.getAlertType();
-      await type.executor({
-        ...executorOptions,
-        // @ts-ignore
-        params: alert.defaultParams,
-      } as any);
-      const count = 1;
-      expect(scheduleActions).toHaveBeenCalledWith('default', {
-        internalFullMessage: `We have not detected any monitoring data for 1 stack product(s) in cluster: testCluster. [View what monitoring data we do have for these stack products.](http://localhost:5601/app/monitoring#/overview?_g=(cluster_uuid:abc123,ccs:testCluster))`,
-        internalShortMessage: `We have not detected any monitoring data for 1 stack product(s) in cluster: testCluster. Verify these stack products are up and running, then double check the monitoring settings.`,
-        action: `[View what monitoring data we do have for these stack products.](http://localhost:5601/app/monitoring#/overview?_g=(cluster_uuid:abc123,ccs:testCluster))`,
-        actionPlain:
-          'Verify these stack products are up and running, then double check the monitoring settings.',
-        clusterName,
-        count,
-        stackProducts: 'Elasticsearch node: esName1',
-        state: 'firing',
-      });
-    });
-
-    it('should fire with different messaging for cloud', async () => {
-      const alert = new MissingMonitoringDataAlert();
-      alert.initializeAlertType(
-        getUiSettingsService as any,
-        monitoringCluster as any,
-        getLogger as any,
-        config as any,
-        kibanaUrl,
-        true
-      );
       const type = alert.getAlertType();
       await type.executor({
         ...executorOptions,
         // @ts-ignore
-        params: alert.defaultParams,
+        params: alert.alertOptions.defaultParams,
       } as any);
       const count = 1;
       expect(scheduleActions).toHaveBeenCalledWith('default', {
-        internalFullMessage: `We have not detected any monitoring data for 1 stack product(s) in cluster: testCluster. Verify these stack products are up and running, then double check the monitoring settings.`,
-        internalShortMessage: `We have not detected any monitoring data for 1 stack product(s) in cluster: testCluster. Verify these stack products are up and running, then double check the monitoring settings.`,
-        action: `[View what monitoring data we do have for these stack products.](http://localhost:5601/app/monitoring#/overview?_g=(cluster_uuid:abc123))`,
+        internalFullMessage: `We have not detected any monitoring data for 1 node(s) in cluster: testCluster. [View what monitoring data we do have for these nodes.](http://localhost:5601/app/monitoring#/overview?_g=(cluster_uuid:abc123,ccs:testCluster))`,
+        internalShortMessage: `We have not detected any monitoring data for 1 node(s) in cluster: testCluster. Verify these nodes are up and running, then double check the monitoring settings.`,
+        nodes: 'node: esName1',
+        action: `[View what monitoring data we do have for these nodes.](http://localhost:5601/app/monitoring#/overview?_g=(cluster_uuid:abc123,ccs:testCluster))`,
         actionPlain:
-          'Verify these stack products are up and running, then double check the monitoring settings.',
+          'Verify these nodes are up and running, then double check the monitoring settings.',
         clusterName,
         count,
-        stackProducts: 'Elasticsearch node: esName1',
         state: 'firing',
       });
     });
diff --git a/x-pack/plugins/monitoring/server/alerts/missing_monitoring_data_alert.ts b/x-pack/plugins/monitoring/server/alerts/missing_monitoring_data_alert.ts
index 4001c6b9b3ed2..1c93ff4a28719 100644
--- a/x-pack/plugins/monitoring/server/alerts/missing_monitoring_data_alert.ts
+++ b/x-pack/plugins/monitoring/server/alerts/missing_monitoring_data_alert.ts
@@ -3,7 +3,7 @@
  * or more contributor license agreements. Licensed under the Elastic License;
  * you may not use this file except in compliance with the Elastic License.
  */
-import { IUiSettingsClient, Logger } from 'kibana/server';
+
 import { i18n } from '@kbn/i18n';
 import moment from 'moment';
 import { BaseAlert } from './base_alert';
@@ -12,107 +12,55 @@ import {
   AlertCluster,
   AlertState,
   AlertMessage,
-  AlertMissingDataState,
-  AlertMissingData,
+  AlertNodeState,
   AlertMessageTimeToken,
-  AlertInstanceState,
   CommonAlertFilter,
   CommonAlertParams,
-  CommonAlertStackProductFilter,
-  CommonAlertNodeUuidFilter,
 } from '../../common/types/alerts';
-import { AlertInstance, AlertServices } from '../../../alerts/server';
+import { AlertInstance } from '../../../alerts/server';
 import {
   INDEX_PATTERN,
   ALERT_MISSING_MONITORING_DATA,
-  INDEX_PATTERN_ELASTICSEARCH,
   ALERT_DETAILS,
 } from '../../common/constants';
 import { getCcsIndexPattern } from '../lib/alerts/get_ccs_index_pattern';
 import { AlertMessageTokenType, AlertSeverity } from '../../common/enums';
-import { RawAlertInstance } from '../../../alerts/common';
+import { RawAlertInstance, SanitizedAlert } from '../../../alerts/common';
 import { parseDuration } from '../../../alerts/common/parse_duration';
 import { appendMetricbeatIndex } from '../lib/alerts/append_mb_index';
 import { fetchMissingMonitoringData } from '../lib/alerts/fetch_missing_monitoring_data';
-import { getTypeLabelForStackProduct } from '../lib/alerts/get_type_label_for_stack_product';
-import { getListingLinkForStackProduct } from '../lib/alerts/get_listing_link_for_stack_product';
-import { getStackProductLabel } from '../lib/alerts/get_stack_product_label';
-import { fetchClusters } from '../lib/alerts/fetch_clusters';
-import { fetchAvailableCcs } from '../lib/alerts/fetch_available_ccs';
 import { AlertingDefaults, createLink } from './alert_helpers';
-
-const RESOLVED = i18n.translate('xpack.monitoring.alerts.missingData.resolved', {
-  defaultMessage: 'resolved',
-});
-const FIRING = i18n.translate('xpack.monitoring.alerts.missingData.firing', {
-  defaultMessage: 'firing',
-});
-
-const DEFAULT_DURATION = '15m';
-const DEFAULT_LIMIT = '1d';
+import { Globals } from '../static_globals';
 
 // Go a bit farther back because we need to detect the difference between seeing the monitoring data versus just not looking far enough back
 const LIMIT_BUFFER = 3 * 60 * 1000;
 
-interface MissingDataParams {
-  duration: string;
-  limit: string;
-}
-
 export class MissingMonitoringDataAlert extends BaseAlert {
-  public defaultThrottle: string = '6h';
-
-  public type = ALERT_MISSING_MONITORING_DATA;
-  public label = ALERT_DETAILS[ALERT_MISSING_MONITORING_DATA].label;
-  public description = ALERT_DETAILS[ALERT_MISSING_MONITORING_DATA].description;
-
-  protected defaultParams: MissingDataParams = {
-    duration: DEFAULT_DURATION,
-    limit: DEFAULT_LIMIT,
-  };
-
-  protected actionVariables = [
-    {
-      name: 'stackProducts',
-      description: i18n.translate(
-        'xpack.monitoring.alerts.missingData.actionVariables.stackProducts',
-        {
-          defaultMessage: 'The stack products missing monitoring data.',
-        }
-      ),
-    },
-    {
-      name: 'count',
-      description: i18n.translate('xpack.monitoring.alerts.missingData.actionVariables.count', {
-        defaultMessage: 'The number of stack products missing monitoring data.',
-      }),
-    },
-    ...Object.values(AlertingDefaults.ALERT_TYPE.context),
-  ];
-
-  protected async fetchClusters(
-    callCluster: any,
-    availableCcs: string[] | undefined = undefined,
-    params: CommonAlertParams
-  ) {
-    const limit = parseDuration(((params as unknown) as MissingDataParams).limit);
-    let ccs;
-    if (!availableCcs) {
-      ccs = this.config.ui.ccs.enabled ? await fetchAvailableCcs(callCluster) : undefined;
-    } else {
-      ccs = availableCcs;
-    }
-    // Support CCS use cases by querying to find available remote clusters
-    // and then adding those to the index pattern we are searching against
-    let esIndexPattern = appendMetricbeatIndex(this.config, INDEX_PATTERN_ELASTICSEARCH);
-    if (ccs) {
-      esIndexPattern = getCcsIndexPattern(esIndexPattern, ccs);
-    }
-    return await fetchClusters(callCluster, esIndexPattern, {
-      timestamp: {
-        format: 'epoch_millis',
-        gte: limit - LIMIT_BUFFER,
+  constructor(public rawAlert?: SanitizedAlert) {
+    super(rawAlert, {
+      id: ALERT_MISSING_MONITORING_DATA,
+      name: ALERT_DETAILS[ALERT_MISSING_MONITORING_DATA].label,
+      defaultParams: {
+        duration: '15m',
+        limit: '1d',
       },
+      throttle: '6h',
+      accessorKey: 'gapDuration',
+      actionVariables: [
+        {
+          name: 'nodes',
+          description: i18n.translate('xpack.monitoring.alerts.missingData.actionVariables.nodes', {
+            defaultMessage: 'The list of nodes missing monitoring data.',
+          }),
+        },
+        {
+          name: 'count',
+          description: i18n.translate('xpack.monitoring.alerts.missingData.actionVariables.count', {
+            defaultMessage: 'The number of nodes missing monitoring data.',
+          }),
+        },
+        ...Object.values(AlertingDefaults.ALERT_TYPE.context),
+      ],
     });
   }
 
@@ -120,78 +68,36 @@ export class MissingMonitoringDataAlert extends BaseAlert {
     params: CommonAlertParams,
     callCluster: any,
     clusters: AlertCluster[],
-    uiSettings: IUiSettingsClient,
     availableCcs: string[]
   ): Promise<AlertData[]> {
-    let indexPattern = appendMetricbeatIndex(this.config, INDEX_PATTERN);
+    let indexPattern = appendMetricbeatIndex(Globals.app.config, INDEX_PATTERN);
     if (availableCcs) {
       indexPattern = getCcsIndexPattern(indexPattern, availableCcs);
     }
-    const duration = parseDuration(((params as unknown) as MissingDataParams).duration);
-    const limit = parseDuration(((params as unknown) as MissingDataParams).limit);
+    const duration = parseDuration(params.duration);
+    const limit = parseDuration(params.limit!);
     const now = +new Date();
     const missingData = await fetchMissingMonitoringData(
       callCluster,
       clusters,
       indexPattern,
-      this.config.ui.max_bucket_size,
+      Globals.app.config.ui.max_bucket_size,
       now,
       now - limit - LIMIT_BUFFER
     );
     return missingData.map((missing) => {
       return {
-        instanceKey: `${missing.clusterUuid}:${missing.stackProduct}:${missing.stackProductUuid}`,
         clusterUuid: missing.clusterUuid,
         shouldFire: missing.gapDuration > duration,
         severity: AlertSeverity.Danger,
-        meta: { missing, limit },
+        meta: { ...missing, limit },
         ccs: missing.ccs,
       };
     });
   }
 
   protected filterAlertInstance(alertInstance: RawAlertInstance, filters: CommonAlertFilter[]) {
-    const alertInstanceState = (alertInstance.state as unknown) as AlertInstanceState;
-    if (filters && filters.length) {
-      for (const filter of filters) {
-        const stackProductFilter = filter as CommonAlertStackProductFilter;
-        if (stackProductFilter && stackProductFilter.stackProduct) {
-          let existsInState = false;
-          for (const state of alertInstanceState.alertStates) {
-            if ((state as AlertMissingDataState).stackProduct === stackProductFilter.stackProduct) {
-              existsInState = true;
-              break;
-            }
-          }
-          if (!existsInState) {
-            return false;
-          }
-        }
-      }
-    }
-    return true;
-  }
-
-  protected filterAlertState(alertState: AlertState, filters: CommonAlertFilter[]) {
-    const state = alertState as AlertMissingDataState;
-    if (filters && filters.length) {
-      for (const filter of filters) {
-        const stackProductFilter = filter as CommonAlertStackProductFilter;
-        if (stackProductFilter && stackProductFilter.stackProduct) {
-          if (state.stackProduct !== stackProductFilter.stackProduct) {
-            return false;
-          }
-        }
-
-        const nodeUuidFilter = filter as CommonAlertNodeUuidFilter;
-        if (nodeUuidFilter && nodeUuidFilter.nodeUuid) {
-          if (state.stackProductUuid !== nodeUuidFilter.nodeUuid) {
-            return false;
-          }
-        }
-      }
-    }
-    return true;
+    return super.filterAlertInstance(alertInstance, filters, true);
   }
 
   protected getDefaultAlertState(cluster: AlertCluster, item: AlertData): AlertState {
@@ -206,68 +112,30 @@ export class MissingMonitoringDataAlert extends BaseAlert {
   }
 
   protected getUiMessage(alertState: AlertState, item: AlertData): AlertMessage {
-    const { missing, limit } = item.meta as { missing: AlertMissingData; limit: number };
-    if (!alertState.ui.isFiring) {
-      if (missing.gapDuration > limit) {
-        return {
-          text: i18n.translate('xpack.monitoring.alerts.missingData.ui.notQuiteResolvedMessage', {
-            defaultMessage: `We are still not seeing monitoring data for the {stackProduct} {type}: {stackProductName} and will stop trying. To change this, configure the alert to look farther back for data.`,
-            values: {
-              stackProduct: getStackProductLabel(missing.stackProduct),
-              type: getTypeLabelForStackProduct(missing.stackProduct, false),
-              stackProductName: missing.stackProductName,
-            },
-          }),
-        };
-      }
-      return {
-        text: i18n.translate('xpack.monitoring.alerts.missingData.ui.resolvedMessage', {
-          defaultMessage: `We are now seeing monitoring data for the {stackProduct} {type}: {stackProductName}, as of #resolved`,
-          values: {
-            stackProduct: getStackProductLabel(missing.stackProduct),
-            type: getTypeLabelForStackProduct(missing.stackProduct, false),
-            stackProductName: missing.stackProductName,
-          },
-        }),
-        tokens: [
-          {
-            startToken: '#resolved',
-            type: AlertMessageTokenType.Time,
-            isAbsolute: true,
-            isRelative: false,
-            timestamp: alertState.ui.resolvedMS,
-          } as AlertMessageTimeToken,
-        ],
-      };
-    }
+    const { nodeName, gapDuration } = item.meta as {
+      nodeName: string;
+      gapDuration: number;
+      limit: number;
+    };
     return {
       text: i18n.translate('xpack.monitoring.alerts.missingData.ui.firingMessage', {
-        defaultMessage: `For the past {gapDuration}, we have not detected any monitoring data from the {stackProduct} {type}: {stackProductName}, starting at #absolute`,
+        defaultMessage: `For the past {gapDuration}, we have not detected any monitoring data from the Elasticsearch node: {nodeName}, starting at #absolute`,
         values: {
-          gapDuration: moment.duration(missing.gapDuration, 'milliseconds').humanize(),
-          stackProduct: getStackProductLabel(missing.stackProduct),
-          type: getTypeLabelForStackProduct(missing.stackProduct, false),
-          stackProductName: missing.stackProductName,
+          gapDuration: moment.duration(gapDuration, 'milliseconds').humanize(),
+          nodeName,
         },
       }),
       nextSteps: [
         createLink(
           i18n.translate('xpack.monitoring.alerts.missingData.ui.nextSteps.viewAll', {
-            defaultMessage: `#start_linkView all {stackProduct} {type}#end_link`,
-            values: {
-              type: getTypeLabelForStackProduct(missing.stackProduct),
-              stackProduct: getStackProductLabel(missing.stackProduct),
-            },
+            defaultMessage: `#start_linkView all Elasticsearch nodes#end_link`,
           }),
-          getListingLinkForStackProduct(missing.stackProduct),
+          'elasticsearch/nodes',
           AlertMessageTokenType.Link
         ),
         {
           text: i18n.translate('xpack.monitoring.alerts.missingData.ui.nextSteps.verifySettings', {
-            defaultMessage: `Verify monitoring settings on the {type}`,
-            values: {
-              type: getTypeLabelForStackProduct(missing.stackProduct, false),
-            },
+            defaultMessage: `Verify monitoring settings on the node`,
           }),
         },
       ],
@@ -285,42 +153,29 @@ export class MissingMonitoringDataAlert extends BaseAlert {
 
   protected executeActions(
     instance: AlertInstance,
-    instanceState: AlertInstanceState,
+    { alertStates }: { alertStates: AlertNodeState[] },
     item: AlertData | null,
     cluster: AlertCluster
   ) {
-    if (instanceState.alertStates.length === 0) {
-      return;
-    }
+    const firingNodes = alertStates.filter((alertState) => alertState.ui.isFiring);
+    const firingCount = firingNodes.length;
 
-    const firingCount = instanceState.alertStates.filter((alertState) => alertState.ui.isFiring)
-      .length;
-    const firingStackProducts = instanceState.alertStates
-      .filter((_state) => (_state as AlertMissingDataState).ui.isFiring)
-      .map((_state) => {
-        const state = _state as AlertMissingDataState;
-        return `${getStackProductLabel(state.stackProduct)} ${getTypeLabelForStackProduct(
-          state.stackProduct,
-          false
-        )}: ${state.stackProductName}`;
-      })
-      .join(', ');
     if (firingCount > 0) {
       const shortActionText = i18n.translate('xpack.monitoring.alerts.missingData.shortAction', {
         defaultMessage:
-          'Verify these stack products are up and running, then double check the monitoring settings.',
+          'Verify these nodes are up and running, then double check the monitoring settings.',
       });
       const fullActionText = i18n.translate('xpack.monitoring.alerts.missingData.fullAction', {
-        defaultMessage: 'View what monitoring data we do have for these stack products.',
+        defaultMessage: 'View what monitoring data we do have for these nodes.',
       });
 
-      const ccs = instanceState.alertStates.find((state) => state.ccs)?.ccs;
+      const ccs = alertStates.find((state) => state.ccs)?.ccs;
       const globalStateLink = this.createGlobalStateLink('overview', cluster.clusterUuid, ccs);
       const action = `[${fullActionText}](${globalStateLink})`;
       const internalShortMessage = i18n.translate(
         'xpack.monitoring.alerts.missingData.firing.internalShortMessage',
         {
-          defaultMessage: `We have not detected any monitoring data for {count} stack product(s) in cluster: {clusterName}. {shortActionText}`,
+          defaultMessage: `We have not detected any monitoring data for {count} node(s) in cluster: {clusterName}. {shortActionText}`,
           values: {
             count: firingCount,
             clusterName: cluster.clusterName,
@@ -331,7 +186,7 @@ export class MissingMonitoringDataAlert extends BaseAlert {
       const internalFullMessage = i18n.translate(
         'xpack.monitoring.alerts.missingData.firing.internalFullMessage',
         {
-          defaultMessage: `We have not detected any monitoring data for {count} stack product(s) in cluster: {clusterName}. {action}`,
+          defaultMessage: `We have not detected any monitoring data for {count} node(s) in cluster: {clusterName}. {action}`,
           values: {
             count: firingCount,
             clusterName: cluster.clusterName,
@@ -341,139 +196,14 @@ export class MissingMonitoringDataAlert extends BaseAlert {
       );
       instance.scheduleActions('default', {
         internalShortMessage,
-        internalFullMessage: this.isCloud ? internalShortMessage : internalFullMessage,
-        state: FIRING,
-        stackProducts: firingStackProducts,
+        internalFullMessage: Globals.app.isCloud ? internalShortMessage : internalFullMessage,
+        state: AlertingDefaults.ALERT_STATE.firing,
+        nodes: firingNodes.map((state) => `node: ${state.nodeName}`).toString(),
         count: firingCount,
         clusterName: cluster.clusterName,
         action,
         actionPlain: shortActionText,
       });
-    } else {
-      const resolvedCount = instanceState.alertStates.filter(
-        (alertState) => !alertState.ui.isFiring
-      ).length;
-      const resolvedStackProducts = instanceState.alertStates
-        .filter((_state) => !(_state as AlertMissingDataState).ui.isFiring)
-        .map((_state) => {
-          const state = _state as AlertMissingDataState;
-          return `${getStackProductLabel(state.stackProduct)} ${getTypeLabelForStackProduct(
-            state.stackProduct,
-            false
-          )}: ${state.stackProductName}`;
-        })
-        .join(',');
-      if (resolvedCount > 0) {
-        instance.scheduleActions('default', {
-          internalShortMessage: i18n.translate(
-            'xpack.monitoring.alerts.missingData.resolved.internalShortMessage',
-            {
-              defaultMessage: `We are now seeing monitoring data for {count} stack product(s) in cluster: {clusterName}.`,
-              values: {
-                count: resolvedCount,
-                clusterName: cluster.clusterName,
-              },
-            }
-          ),
-          internalFullMessage: i18n.translate(
-            'xpack.monitoring.alerts.missingData.resolved.internalFullMessage',
-            {
-              defaultMessage: `We are now seeing monitoring data for {count} stack product(s) in cluster {clusterName}.`,
-              values: {
-                count: resolvedCount,
-                clusterName: cluster.clusterName,
-              },
-            }
-          ),
-          state: RESOLVED,
-          stackProducts: resolvedStackProducts,
-          count: resolvedCount,
-          clusterName: cluster.clusterName,
-        });
-      }
-    }
-  }
-
-  protected async processData(
-    data: AlertData[],
-    clusters: AlertCluster[],
-    services: AlertServices,
-    logger: Logger
-  ) {
-    for (const cluster of clusters) {
-      const stackProducts = data.filter((_item) => _item.clusterUuid === cluster.clusterUuid);
-      if (stackProducts.length === 0) {
-        continue;
-      }
-
-      const firingInstances = stackProducts.reduce((list: string[], stackProduct) => {
-        const { missing } = stackProduct.meta as { missing: AlertMissingData; limit: number };
-        if (stackProduct.shouldFire) {
-          list.push(`${missing.stackProduct}:${missing.stackProductUuid}`);
-        }
-        return list;
-      }, [] as string[]);
-      firingInstances.sort(); // It doesn't matter how we sort, but keep the order consistent
-      const instanceId = `${this.type}:${cluster.clusterUuid}:${firingInstances.join(',')}`;
-      const instance = services.alertInstanceFactory(instanceId);
-      const instanceState = (instance.getState() as unknown) as AlertInstanceState;
-      const alertInstanceState: AlertInstanceState = {
-        alertStates: instanceState?.alertStates || [],
-      };
-      let shouldExecuteActions = false;
-      for (const stackProduct of stackProducts) {
-        const { missing } = stackProduct.meta as { missing: AlertMissingData; limit: number };
-        let state: AlertMissingDataState;
-        const indexInState = alertInstanceState.alertStates.findIndex((alertState) => {
-          const _alertState = alertState as AlertMissingDataState;
-          return (
-            _alertState.cluster.clusterUuid === cluster.clusterUuid &&
-            _alertState.stackProduct === missing.stackProduct &&
-            _alertState.stackProductUuid === missing.stackProductUuid
-          );
-        });
-        if (indexInState > -1) {
-          state = alertInstanceState.alertStates[indexInState] as AlertMissingDataState;
-        } else {
-          state = this.getDefaultAlertState(cluster, stackProduct) as AlertMissingDataState;
-        }
-
-        state.stackProduct = missing.stackProduct;
-        state.stackProductUuid = missing.stackProductUuid;
-        state.stackProductName = missing.stackProductName;
-        state.gapDuration = missing.gapDuration;
-
-        if (stackProduct.shouldFire) {
-          if (!state.ui.isFiring) {
-            state.ui.triggeredMS = new Date().valueOf();
-          }
-          state.ui.isFiring = true;
-          state.ui.message = this.getUiMessage(state, stackProduct);
-          state.ui.severity = stackProduct.severity;
-          state.ui.resolvedMS = 0;
-          shouldExecuteActions = true;
-        } else if (!stackProduct.shouldFire && state.ui.isFiring) {
-          state.ui.isFiring = false;
-          state.ui.resolvedMS = new Date().valueOf();
-          state.ui.message = this.getUiMessage(state, stackProduct);
-          shouldExecuteActions = true;
-        }
-
-        if (indexInState === -1) {
-          alertInstanceState.alertStates.push(state);
-        } else {
-          alertInstanceState.alertStates = [
-            ...alertInstanceState.alertStates.slice(0, indexInState),
-            state,
-            ...alertInstanceState.alertStates.slice(indexInState + 1),
-          ];
-        }
-      }
-
-      instance.replaceState(alertInstanceState);
-      if (shouldExecuteActions) {
-        this.executeActions(instance, alertInstanceState, null, cluster);
-      }
     }
   }
 }
diff --git a/x-pack/plugins/monitoring/server/alerts/nodes_changed_alert.test.ts b/x-pack/plugins/monitoring/server/alerts/nodes_changed_alert.test.ts
index 63b061649027a..99be91dc293cb 100644
--- a/x-pack/plugins/monitoring/server/alerts/nodes_changed_alert.test.ts
+++ b/x-pack/plugins/monitoring/server/alerts/nodes_changed_alert.test.ts
@@ -24,14 +24,28 @@ jest.mock('moment', () => {
   };
 });
 
+jest.mock('../static_globals', () => ({
+  Globals: {
+    app: {
+      getLogger: () => ({ debug: jest.fn() }),
+      config: {
+        ui: {
+          ccs: { enabled: true },
+          metricbeat: { index: 'metricbeat-*' },
+          container: { elasticsearch: { enabled: false } },
+        },
+      },
+    },
+  },
+}));
+
 describe('NodesChangedAlert', () => {
   it('should have defaults', () => {
     const alert = new NodesChangedAlert();
-    expect(alert.type).toBe(ALERT_NODES_CHANGED);
-    expect(alert.label).toBe('Nodes changed');
-    expect(alert.defaultThrottle).toBe('1d');
-    // @ts-ignore
-    expect(alert.actionVariables).toStrictEqual([
+    expect(alert.alertOptions.id).toBe(ALERT_NODES_CHANGED);
+    expect(alert.alertOptions.name).toBe('Nodes changed');
+    expect(alert.alertOptions.throttle).toBe('1d');
+    expect(alert.alertOptions.actionVariables).toStrictEqual([
       { name: 'added', description: 'The list of nodes added to the cluster.' },
       { name: 'removed', description: 'The list of nodes removed from the cluster.' },
       { name: 'restarted', description: 'The list of nodes restarted in the cluster.' },
@@ -74,21 +88,6 @@ describe('NodesChangedAlert', () => {
         },
       },
     };
-    const getUiSettingsService = () => ({
-      asScopedToClient: jest.fn(),
-    });
-    const getLogger = () => ({
-      debug: jest.fn(),
-    });
-    const monitoringCluster = null;
-    const config = {
-      ui: {
-        ccs: { enabled: true },
-        container: { elasticsearch: { enabled: false } },
-        metricbeat: { index: 'metricbeat-*' },
-      },
-    };
-    const kibanaUrl = 'http://localhost:5601';
 
     const replaceState = jest.fn();
     const scheduleActions = jest.fn();
@@ -127,19 +126,11 @@ describe('NodesChangedAlert', () => {
 
     it('should fire actions', async () => {
       const alert = new NodesChangedAlert();
-      alert.initializeAlertType(
-        getUiSettingsService as any,
-        monitoringCluster as any,
-        getLogger as any,
-        config as any,
-        kibanaUrl,
-        false
-      );
       const type = alert.getAlertType();
       await type.executor({
         ...executorOptions,
         // @ts-ignore
-        params: alert.defaultParams,
+        params: alert.alertOptions.defaultParams,
       } as any);
       expect(replaceState).toHaveBeenCalledWith({
         alertStates: [
@@ -152,7 +143,6 @@ describe('NodesChangedAlert', () => {
                 text: "Elasticsearch nodes 'test' restarted in this cluster.",
               },
               severity: 'warning',
-              resolvedMS: 0,
               triggeredMS: 1,
               lastCheckedMS: 0,
             },
@@ -179,88 +169,14 @@ describe('NodesChangedAlert', () => {
         return [];
       });
       const alert = new NodesChangedAlert();
-      alert.initializeAlertType(
-        getUiSettingsService as any,
-        monitoringCluster as any,
-        getLogger as any,
-        config as any,
-        kibanaUrl,
-        false
-      );
       const type = alert.getAlertType();
       await type.executor({
         ...executorOptions,
         // @ts-ignore
-        params: alert.defaultParams,
+        params: alert.alertOptions.defaultParams,
       } as any);
       expect(replaceState).not.toHaveBeenCalledWith({});
       expect(scheduleActions).not.toHaveBeenCalled();
     });
-
-    // This doesn't work because this watch is weird where it sets the resolved timestamp right away
-    // It is not really worth fixing as this watch will go away in 8.0
-    // it('should resolve with a resolved message', async () => {
-    //   (fetchLegacyAlerts as jest.Mock).mockImplementation(() => {
-    //     return [];
-    //   });
-    //   (getState as jest.Mock).mockImplementation(() => {
-    //     return {
-    //       alertStates: [
-    //         {
-    //           cluster: {
-    //             clusterUuid,
-    //             clusterName,
-    //           },
-    //           ccs: undefined,
-    //           ui: {
-    //             isFiring: true,
-    //             message: null,
-    //             severity: 'danger',
-    //             resolvedMS: 0,
-    //             triggeredMS: 1,
-    //             lastCheckedMS: 0,
-    //           },
-    //         },
-    //       ],
-    //     };
-    //   });
-    //   const alert = new NodesChangedAlert();
-    //   alert.initializeAlertType(
-    //     getUiSettingsService as any,
-    //     monitoringCluster as any,
-    //     getLogger as any,
-    //     config as any,
-    //     kibanaUrl
-    //   );
-    //   const type = alert.getAlertType();
-    //   await type.executor({
-    //     ...executorOptions,
-    //     // @ts-ignore
-    //     params: alert.defaultParams,
-    //   } as any);
-    //   expect(replaceState).toHaveBeenCalledWith({
-    //     alertStates: [
-    //       {
-    //         cluster: { clusterUuid, clusterName },
-    //         ccs: undefined,
-    //         ui: {
-    //           isFiring: false,
-    //           message: {
-    //             text: "The license for this cluster is active.",
-    //           },
-    //           severity: 'danger',
-    //           resolvedMS: 1,
-    //           triggeredMS: 1,
-    //           lastCheckedMS: 0,
-    //         },
-    //       },
-    //     ],
-    //   });
-    //   expect(scheduleActions).toHaveBeenCalledWith('default', {
-    //     clusterName,
-    //     expiredDate: 'THE_DATE',
-    //     state: 'resolved',
-    //   });
-    // });
   });
 });
diff --git a/x-pack/plugins/monitoring/server/alerts/nodes_changed_alert.ts b/x-pack/plugins/monitoring/server/alerts/nodes_changed_alert.ts
index e86998d27238b..47d5c5ac2c241 100644
--- a/x-pack/plugins/monitoring/server/alerts/nodes_changed_alert.ts
+++ b/x-pack/plugins/monitoring/server/alerts/nodes_changed_alert.ts
@@ -3,7 +3,7 @@
  * or more contributor license agreements. Licensed under the Elastic License;
  * you may not use this file except in compliance with the Elastic License.
  */
-import { IUiSettingsClient } from 'kibana/server';
+
 import { i18n } from '@kbn/i18n';
 import { BaseAlert } from './base_alert';
 import {
@@ -11,88 +11,63 @@ import {
   AlertCluster,
   AlertState,
   AlertMessage,
-  AlertInstanceState,
   LegacyAlert,
   LegacyAlertNodesChangedList,
-  CommonAlertParams,
 } from '../../common/types/alerts';
 import { AlertInstance } from '../../../alerts/server';
-import { INDEX_ALERTS, ALERT_NODES_CHANGED, LEGACY_ALERT_DETAILS } from '../../common/constants';
-import { getCcsIndexPattern } from '../lib/alerts/get_ccs_index_pattern';
-import { fetchLegacyAlerts } from '../lib/alerts/fetch_legacy_alerts';
-import { mapLegacySeverity } from '../lib/alerts/map_legacy_severity';
+import { ALERT_NODES_CHANGED, LEGACY_ALERT_DETAILS } from '../../common/constants';
 import { AlertingDefaults } from './alert_helpers';
-
-const WATCH_NAME = 'elasticsearch_nodes';
+import { SanitizedAlert } from '../../../alerts/common';
 
 export class NodesChangedAlert extends BaseAlert {
-  public type = ALERT_NODES_CHANGED;
-  public label = LEGACY_ALERT_DETAILS[ALERT_NODES_CHANGED].label;
-  public description = LEGACY_ALERT_DETAILS[ALERT_NODES_CHANGED].description;
-  public isLegacy = true;
-
-  protected actionVariables = [
-    {
-      name: 'added',
-      description: i18n.translate('xpack.monitoring.alerts.nodesChanged.actionVariables.added', {
-        defaultMessage: 'The list of nodes added to the cluster.',
-      }),
-    },
-    {
-      name: 'removed',
-      description: i18n.translate('xpack.monitoring.alerts.nodesChanged.actionVariables.removed', {
-        defaultMessage: 'The list of nodes removed from the cluster.',
-      }),
-    },
-    {
-      name: 'restarted',
-      description: i18n.translate(
-        'xpack.monitoring.alerts.nodesChanged.actionVariables.restarted',
+  constructor(public rawAlert?: SanitizedAlert) {
+    super(rawAlert, {
+      id: ALERT_NODES_CHANGED,
+      name: LEGACY_ALERT_DETAILS[ALERT_NODES_CHANGED].label,
+      legacy: {
+        watchName: 'elasticsearch_nodes',
+        changeDataValues: { shouldFire: true },
+      },
+      actionVariables: [
         {
-          defaultMessage: 'The list of nodes restarted in the cluster.',
-        }
-      ),
-    },
-    ...Object.values(AlertingDefaults.ALERT_TYPE.context),
-  ];
-
-  private getNodeStates(legacyAlert: LegacyAlert): LegacyAlertNodesChangedList | undefined {
-    return legacyAlert.nodes;
+          name: 'added',
+          description: i18n.translate(
+            'xpack.monitoring.alerts.nodesChanged.actionVariables.added',
+            {
+              defaultMessage: 'The list of nodes added to the cluster.',
+            }
+          ),
+        },
+        {
+          name: 'removed',
+          description: i18n.translate(
+            'xpack.monitoring.alerts.nodesChanged.actionVariables.removed',
+            {
+              defaultMessage: 'The list of nodes removed from the cluster.',
+            }
+          ),
+        },
+        {
+          name: 'restarted',
+          description: i18n.translate(
+            'xpack.monitoring.alerts.nodesChanged.actionVariables.restarted',
+            {
+              defaultMessage: 'The list of nodes restarted in the cluster.',
+            }
+          ),
+        },
+        ...Object.values(AlertingDefaults.ALERT_TYPE.context),
+      ],
+    });
   }
 
-  protected async fetchData(
-    params: CommonAlertParams,
-    callCluster: any,
-    clusters: AlertCluster[],
-    uiSettings: IUiSettingsClient,
-    availableCcs: string[]
-  ): Promise<AlertData[]> {
-    let alertIndexPattern = INDEX_ALERTS;
-    if (availableCcs) {
-      alertIndexPattern = getCcsIndexPattern(alertIndexPattern, availableCcs);
-    }
-    const legacyAlerts = await fetchLegacyAlerts(
-      callCluster,
-      clusters,
-      alertIndexPattern,
-      WATCH_NAME,
-      this.config.ui.max_bucket_size
-    );
-    return legacyAlerts.reduce((accum: AlertData[], legacyAlert) => {
-      accum.push({
-        instanceKey: `${legacyAlert.metadata.cluster_uuid}`,
-        clusterUuid: legacyAlert.metadata.cluster_uuid,
-        shouldFire: true, // This alert always has a resolved timestamp
-        severity: mapLegacySeverity(legacyAlert.metadata.severity),
-        meta: legacyAlert,
-      });
-      return accum;
-    }, []);
+  private getNodeStates(legacyAlert: LegacyAlert): LegacyAlertNodesChangedList {
+    return legacyAlert.nodes || { added: {}, removed: {}, restarted: {} };
   }
 
   protected getUiMessage(alertState: AlertState, item: AlertData): AlertMessage {
     const legacyAlert = item.meta as LegacyAlert;
-    const states = this.getNodeStates(legacyAlert) || { added: {}, removed: {}, restarted: {} };
+    const states = this.getNodeStates(legacyAlert);
     if (!alertState.ui.isFiring) {
       return {
         text: i18n.translate('xpack.monitoring.alerts.nodesChanged.ui.resolvedMessage', {
@@ -151,39 +126,12 @@ export class NodesChangedAlert extends BaseAlert {
 
   protected async executeActions(
     instance: AlertInstance,
-    instanceState: AlertInstanceState,
+    alertState: AlertState,
     item: AlertData,
     cluster: AlertCluster
   ) {
-    if (instanceState.alertStates.length === 0) {
-      return;
-    }
-    const alertState = instanceState.alertStates[0];
     const legacyAlert = item.meta as LegacyAlert;
-    if (!alertState.ui.isFiring) {
-      instance.scheduleActions('default', {
-        internalShortMessage: i18n.translate(
-          'xpack.monitoring.alerts.nodesChanged.resolved.internalShortMessage',
-          {
-            defaultMessage: `Elasticsearch nodes changed alert is resolved for {clusterName}.`,
-            values: {
-              clusterName: cluster.clusterName,
-            },
-          }
-        ),
-        internalFullMessage: i18n.translate(
-          'xpack.monitoring.alerts.nodesChanged.resolved.internalFullMessage',
-          {
-            defaultMessage: `Elasticsearch nodes changed alert is resolved for {clusterName}.`,
-            values: {
-              clusterName: cluster.clusterName,
-            },
-          }
-        ),
-        state: AlertingDefaults.ALERT_STATE.resolved,
-        clusterName: cluster.clusterName,
-      });
-    } else {
+    if (alertState.ui.isFiring) {
       const shortActionText = i18n.translate('xpack.monitoring.alerts.nodesChanged.shortAction', {
         defaultMessage: 'Verify that you added, removed, or restarted nodes.',
       });
@@ -191,7 +139,7 @@ export class NodesChangedAlert extends BaseAlert {
         defaultMessage: 'View nodes',
       });
       const action = `[${fullActionText}](elasticsearch/nodes)`;
-      const states = this.getNodeStates(legacyAlert) || { added: {}, removed: {}, restarted: {} };
+      const states = this.getNodeStates(legacyAlert);
       const added = Object.values(states.added).join(',');
       const removed = Object.values(states.removed).join(',');
       const restarted = Object.values(states.restarted).join(',');
diff --git a/x-pack/plugins/monitoring/server/alerts/thread_pool_rejections_alert_base.ts b/x-pack/plugins/monitoring/server/alerts/thread_pool_rejections_alert_base.ts
index 4905ae73b0545..2d8ccabaac853 100644
--- a/x-pack/plugins/monitoring/server/alerts/thread_pool_rejections_alert_base.ts
+++ b/x-pack/plugins/monitoring/server/alerts/thread_pool_rejections_alert_base.ts
@@ -3,7 +3,7 @@
  * or more contributor license agreements. Licensed under the Elastic License;
  * you may not use this file except in compliance with the Elastic License.
  */
-import { IUiSettingsClient, Logger } from 'kibana/server';
+
 import { i18n } from '@kbn/i18n';
 import { BaseAlert } from './base_alert';
 import {
@@ -16,7 +16,7 @@ import {
   CommonAlertFilter,
   ThreadPoolRejectionsAlertParams,
 } from '../../common/types/alerts';
-import { AlertInstance, AlertServices } from '../../../alerts/server';
+import { AlertInstance } from '../../../alerts/server';
 import { INDEX_PATTERN_ELASTICSEARCH } from '../../common/constants';
 import { fetchThreadPoolRejectionStats } from '../lib/alerts/fetch_thread_pool_rejections_stats';
 import { getCcsIndexPattern } from '../lib/alerts/get_ccs_index_pattern';
@@ -24,6 +24,7 @@ import { AlertMessageTokenType, AlertSeverity } from '../../common/enums';
 import { Alert, RawAlertInstance } from '../../../alerts/common';
 import { AlertingDefaults, createLink } from './alert_helpers';
 import { appendMetricbeatIndex } from '../lib/alerts/append_mb_index';
+import { Globals } from '../static_globals';
 
 type ActionVariables = Array<{ name: string; description: string }>;
 
@@ -44,29 +45,31 @@ export class ThreadPoolRejectionsAlertBase extends BaseAlert {
     ];
   }
 
-  protected defaultParams: ThreadPoolRejectionsAlertParams = {
-    threshold: 300,
-    duration: '5m',
-  };
-
   constructor(
     rawAlert: Alert | undefined = undefined,
-    public readonly type: string,
+    public readonly id: string,
     public readonly threadPoolType: string,
-    public readonly label: string,
+    public readonly name: string,
     public readonly actionVariables: ActionVariables
   ) {
-    super(rawAlert);
+    super(rawAlert, {
+      id,
+      name,
+      defaultParams: {
+        threshold: 300,
+        duration: '5m',
+      },
+      actionVariables,
+    });
   }
 
   protected async fetchData(
     params: ThreadPoolRejectionsAlertParams,
     callCluster: any,
     clusters: AlertCluster[],
-    uiSettings: IUiSettingsClient,
     availableCcs: string[]
   ): Promise<AlertData[]> {
-    let esIndexPattern = appendMetricbeatIndex(this.config, INDEX_PATTERN_ELASTICSEARCH);
+    let esIndexPattern = appendMetricbeatIndex(Globals.app.config, INDEX_PATTERN_ELASTICSEARCH);
     if (availableCcs) {
       esIndexPattern = getCcsIndexPattern(esIndexPattern, availableCcs);
     }
@@ -77,16 +80,15 @@ export class ThreadPoolRejectionsAlertBase extends BaseAlert {
       callCluster,
       clusters,
       esIndexPattern,
-      this.config.ui.max_bucket_size,
+      Globals.app.config.ui.max_bucket_size,
       this.threadPoolType,
       duration
     );
 
     return stats.map((stat) => {
-      const { clusterUuid, nodeId, rejectionCount, ccs } = stat;
+      const { clusterUuid, rejectionCount, ccs } = stat;
 
       return {
-        instanceKey: `${clusterUuid}:${nodeId}`,
         shouldFire: rejectionCount > threshold,
         rejectionCount,
         severity: AlertSeverity.Danger,
@@ -98,23 +100,11 @@ export class ThreadPoolRejectionsAlertBase extends BaseAlert {
   }
 
   protected filterAlertInstance(alertInstance: RawAlertInstance, filters: CommonAlertFilter[]) {
-    const alertInstanceStates = alertInstance.state
-      ?.alertStates as AlertThreadPoolRejectionsState[];
-    const nodeUuid = filters?.find((filter) => filter.nodeUuid)?.nodeUuid;
-
-    if (!alertInstanceStates?.length || !nodeUuid) {
-      return true;
-    }
-
-    const nodeAlerts = alertInstanceStates.filter(({ nodeId }) => nodeId === nodeUuid);
-    return Boolean(nodeAlerts.length);
+    return super.filterAlertInstance(alertInstance, filters, true);
   }
 
-  protected getUiMessage(
-    alertState: AlertThreadPoolRejectionsState,
-    rejectionCount: number
-  ): AlertMessage {
-    const { nodeName, nodeId } = alertState;
+  protected getUiMessage(alertState: AlertThreadPoolRejectionsState): AlertMessage {
+    const { nodeName, nodeId, rejectionCount } = alertState;
     return {
       text: i18n.translate('xpack.monitoring.alerts.threadPoolRejections.ui.firingMessage', {
         defaultMessage: `Node #start_link{nodeName}#end_link is reporting {rejectionCount} {type} rejections at #absolute`,
@@ -244,7 +234,7 @@ export class ThreadPoolRejectionsAlertBase extends BaseAlert {
 
     instance.scheduleActions('default', {
       internalShortMessage,
-      internalFullMessage: this.isCloud ? internalShortMessage : internalFullMessage,
+      internalFullMessage: Globals.app.isCloud ? internalShortMessage : internalFullMessage,
       threadPoolType: type,
       state: AlertingDefaults.ALERT_STATE.firing,
       count,
@@ -253,60 +243,4 @@ export class ThreadPoolRejectionsAlertBase extends BaseAlert {
       actionPlain: shortActionText,
     });
   }
-
-  protected async processData(
-    data: AlertData[],
-    clusters: AlertCluster[],
-    services: AlertServices,
-    logger: Logger,
-    state: { lastChecked?: number }
-  ) {
-    const currentUTC = +new Date();
-    for (const cluster of clusters) {
-      const nodes = data.filter((node) => node.clusterUuid === cluster.clusterUuid);
-      if (!nodes.length) {
-        continue;
-      }
-
-      const firingNodeUuids = nodes.filter((node) => node.shouldFire);
-
-      if (!firingNodeUuids.length) {
-        continue;
-      }
-
-      const instanceSuffix = firingNodeUuids.map((node) => node.meta.nodeId);
-
-      const instancePrefix = `${this.type}:${cluster.clusterUuid}:`;
-      const alertInstanceId = `${instancePrefix}:${instanceSuffix}`;
-      const alertInstance = services.alertInstanceFactory(alertInstanceId);
-      const newAlertStates: AlertThreadPoolRejectionsState[] = [];
-
-      for (const node of nodes) {
-        if (!node.shouldFire) {
-          continue;
-        }
-        const stat = node.meta as AlertThreadPoolRejectionsState;
-        const nodeState = this.getDefaultAlertState(
-          cluster,
-          node
-        ) as AlertThreadPoolRejectionsState;
-        const { nodeId, nodeName, rejectionCount } = stat;
-        nodeState.nodeId = nodeId;
-        nodeState.nodeName = nodeName;
-        nodeState.ui.triggeredMS = currentUTC;
-        nodeState.ui.isFiring = true;
-        nodeState.ui.severity = node.severity;
-        nodeState.ui.message = this.getUiMessage(nodeState, rejectionCount);
-        newAlertStates.push(nodeState);
-      }
-
-      alertInstance.replaceState({ alertStates: newAlertStates });
-      if (newAlertStates.length) {
-        this.executeActions(alertInstance, newAlertStates, cluster);
-      }
-    }
-
-    state.lastChecked = currentUTC;
-    return state;
-  }
 }
diff --git a/x-pack/plugins/monitoring/server/lib/alerts/fetch_missing_monitoring_data.test.ts b/x-pack/plugins/monitoring/server/lib/alerts/fetch_missing_monitoring_data.test.ts
index 7edd7496805a0..3f50c48dd8a73 100644
--- a/x-pack/plugins/monitoring/server/lib/alerts/fetch_missing_monitoring_data.test.ts
+++ b/x-pack/plugins/monitoring/server/lib/alerts/fetch_missing_monitoring_data.test.ts
@@ -90,17 +90,15 @@ describe('fetchMissingMonitoringData', () => {
     );
     expect(result).toEqual([
       {
-        stackProduct: 'elasticsearch',
-        stackProductUuid: 'nodeUuid1',
-        stackProductName: 'nodeName1',
+        nodeId: 'nodeUuid1',
+        nodeName: 'nodeName1',
         clusterUuid: 'clusterUuid1',
         gapDuration: 1,
         ccs: null,
       },
       {
-        stackProduct: 'elasticsearch',
-        stackProductUuid: 'nodeUuid2',
-        stackProductName: 'nodeName2',
+        nodeId: 'nodeUuid2',
+        nodeName: 'nodeName2',
         clusterUuid: 'clusterUuid1',
         gapDuration: 8,
         ccs: null,
@@ -148,9 +146,8 @@ describe('fetchMissingMonitoringData', () => {
     );
     expect(result).toEqual([
       {
-        stackProduct: 'elasticsearch',
-        stackProductUuid: 'nodeUuid1',
-        stackProductName: 'nodeName1',
+        nodeId: 'nodeUuid1',
+        nodeName: 'nodeName1',
         clusterUuid: 'clusterUuid1',
         gapDuration: 1,
         ccs: 'Monitoring',
diff --git a/x-pack/plugins/monitoring/server/lib/alerts/fetch_missing_monitoring_data.ts b/x-pack/plugins/monitoring/server/lib/alerts/fetch_missing_monitoring_data.ts
index b4e12e5d86139..30706a0b3c922 100644
--- a/x-pack/plugins/monitoring/server/lib/alerts/fetch_missing_monitoring_data.ts
+++ b/x-pack/plugins/monitoring/server/lib/alerts/fetch_missing_monitoring_data.ts
@@ -5,7 +5,6 @@
  */
 import { get } from 'lodash';
 import { AlertCluster, AlertMissingData } from '../../../common/types/alerts';
-import { ELASTICSEARCH_SYSTEM_ID } from '../../../common/constants';
 
 interface ClusterBucketESResponse {
   key: string;
@@ -126,19 +125,14 @@ export async function fetchMissingMonitoringData(
     const uuidBuckets = clusterBucket.es_uuids.buckets;
 
     for (const uuidBucket of uuidBuckets) {
-      const stackProductUuid = uuidBucket.key;
+      const nodeId = uuidBucket.key;
       const indexName = get(uuidBucket, `document.hits.hits[0]._index`);
       const differenceInMs = nowInMs - uuidBucket.most_recent.value;
-      const stackProductName = get(
-        uuidBucket,
-        `document.hits.hits[0]._source.source_node.name`,
-        stackProductUuid
-      );
+      const nodeName = get(uuidBucket, `document.hits.hits[0]._source.source_node.name`, nodeId);
 
-      uniqueList[`${clusterUuid}${stackProductUuid}`] = {
-        stackProduct: ELASTICSEARCH_SYSTEM_ID,
-        stackProductUuid,
-        stackProductName,
+      uniqueList[`${clusterUuid}${nodeId}`] = {
+        nodeId,
+        nodeName,
         clusterUuid,
         gapDuration: differenceInMs,
         ccs: indexName.includes(':') ? indexName.split(':')[0] : null,
diff --git a/x-pack/plugins/monitoring/server/lib/alerts/fetch_status.test.ts b/x-pack/plugins/monitoring/server/lib/alerts/fetch_status.test.ts
index c31ab91866b1d..a65d0c49a38cd 100644
--- a/x-pack/plugins/monitoring/server/lib/alerts/fetch_status.test.ts
+++ b/x-pack/plugins/monitoring/server/lib/alerts/fetch_status.test.ts
@@ -14,11 +14,24 @@ import {
   ALERT_MISSING_MONITORING_DATA,
 } from '../../../common/constants';
 
+jest.mock('../../static_globals', () => ({
+  Globals: {
+    app: {
+      getLogger: jest.fn(),
+      config: {
+        ui: {
+          ccs: { enabled: true },
+          metricbeat: { index: 'metricbeat-*' },
+          container: { elasticsearch: { enabled: false } },
+        },
+      },
+    },
+  },
+}));
+
 describe('fetchStatus', () => {
   const alertType = ALERT_CPU_USAGE;
   const alertTypes = [alertType];
-  const start = 0;
-  const end = 0;
   const id = 1;
   const defaultClusterState = {
     clusterUuid: 'abc',
@@ -28,7 +41,6 @@ describe('fetchStatus', () => {
     isFiring: false,
     severity: AlertSeverity.Success,
     message: null,
-    resolvedMS: 0,
     lastCheckedMS: 0,
     triggeredMS: 0,
   };
@@ -65,21 +77,11 @@ describe('fetchStatus', () => {
       alertsClient as any,
       licenseService as any,
       alertTypes,
-      defaultClusterState.clusterUuid,
-      start,
-      end
+      defaultClusterState.clusterUuid
     );
     expect(status).toEqual({
       monitoring_alert_cpu_usage: {
-        alert: {
-          isLegacy: false,
-          label: 'CPU Usage',
-          paramDetails: {},
-          rawAlert: { id: 1 },
-          type: 'monitoring_alert_cpu_usage',
-        },
-        enabled: true,
-        exists: true,
+        rawAlert: { id: 1 },
         states: [],
       },
     });
@@ -100,50 +102,19 @@ describe('fetchStatus', () => {
       alertsClient as any,
       licenseService as any,
       alertTypes,
-      defaultClusterState.clusterUuid,
-      start,
-      end
+      defaultClusterState.clusterUuid
     );
     expect(Object.values(status).length).toBe(1);
     expect(Object.keys(status)).toEqual(alertTypes);
     expect(status[alertType].states[0].state.ui.isFiring).toBe(true);
   });
 
-  it('should return alerts that have been resolved in the time period', async () => {
-    alertStates = [
-      {
-        cluster: defaultClusterState,
-        ui: {
-          ...defaultUiState,
-          resolvedMS: 1500,
-        },
-      },
-    ];
-
-    const customStart = 1000;
-    const customEnd = 2000;
-
-    const status = await fetchStatus(
-      alertsClient as any,
-      licenseService as any,
-      alertTypes,
-      defaultClusterState.clusterUuid,
-      customStart,
-      customEnd
-    );
-    expect(Object.values(status).length).toBe(1);
-    expect(Object.keys(status)).toEqual(alertTypes);
-    expect(status[alertType].states[0].state.ui.isFiring).toBe(false);
-  });
-
   it('should pass in the right filter to the alerts client', async () => {
     await fetchStatus(
       alertsClient as any,
       licenseService as any,
       alertTypes,
-      defaultClusterState.clusterUuid,
-      start,
-      end
+      defaultClusterState.clusterUuid
     );
     expect((alertsClient.find as jest.Mock).mock.calls[0][0].options.filter).toBe(
       `alert.attributes.alertTypeId:${alertType}`
@@ -159,9 +130,7 @@ describe('fetchStatus', () => {
       alertsClient as any,
       licenseService as any,
       alertTypes,
-      defaultClusterState.clusterUuid,
-      start,
-      end
+      defaultClusterState.clusterUuid
     );
     expect(status[alertType].states.length).toEqual(0);
   });
@@ -176,14 +145,13 @@ describe('fetchStatus', () => {
       alertsClient as any,
       licenseService as any,
       alertTypes,
-      defaultClusterState.clusterUuid,
-      start,
-      end
+      defaultClusterState.clusterUuid
     );
     expect(status).toEqual({});
   });
 
-  it('should pass along the license service', async () => {
+  // seems to only work with it.only(), holding state somewhere
+  it.skip('should pass along the license service', async () => {
     const customLicenseService = {
       getWatcherFeature: jest.fn().mockImplementation(() => ({
         isAvailable: true,
@@ -194,9 +162,7 @@ describe('fetchStatus', () => {
       alertsClient as any,
       customLicenseService as any,
       [ALERT_CLUSTER_HEALTH],
-      defaultClusterState.clusterUuid,
-      start,
-      end
+      defaultClusterState.clusterUuid
     );
     expect(customLicenseService.getWatcherFeature).toHaveBeenCalled();
   });
@@ -233,9 +199,7 @@ describe('fetchStatus', () => {
       customAlertsClient as any,
       licenseService as any,
       [ALERT_CPU_USAGE, ALERT_DISK_USAGE, ALERT_MISSING_MONITORING_DATA],
-      defaultClusterState.clusterUuid,
-      start,
-      end
+      defaultClusterState.clusterUuid
     );
     expect(Object.keys(status)).toEqual([
       ALERT_CPU_USAGE,
diff --git a/x-pack/plugins/monitoring/server/lib/alerts/fetch_status.ts b/x-pack/plugins/monitoring/server/lib/alerts/fetch_status.ts
index ed860ee21344d..3944a13f349cb 100644
--- a/x-pack/plugins/monitoring/server/lib/alerts/fetch_status.ts
+++ b/x-pack/plugins/monitoring/server/lib/alerts/fetch_status.ts
@@ -3,7 +3,7 @@
  * or more contributor license agreements. Licensed under the Elastic License;
  * you may not use this file except in compliance with the Elastic License.
  */
-import moment from 'moment';
+
 import { AlertInstanceState } from '../../../common/types/alerts';
 import { AlertsClient } from '../../../../alerts/server';
 import { AlertsFactory } from '../../alerts';
@@ -20,8 +20,6 @@ export async function fetchStatus(
   licenseService: MonitoringLicenseService,
   alertTypes: string[] | undefined,
   clusterUuid: string,
-  start: number,
-  end: number,
   filters: CommonAlertFilter[] = []
 ): Promise<{ [type: string]: CommonAlertStatus }> {
   const types: Array<{ type: string; result: CommonAlertStatus }> = [];
@@ -29,19 +27,13 @@ export async function fetchStatus(
   await Promise.all(
     (alertTypes || ALERTS).map(async (type) => {
       const alert = await AlertsFactory.getByType(type, alertsClient);
-      if (!alert || !alert.isEnabled(licenseService)) {
-        return;
-      }
-      const serialized = alert.serialize();
-      if (!serialized) {
+      if (!alert || !alert.isEnabled(licenseService) || !alert.rawAlert) {
         return;
       }
 
       const result: CommonAlertStatus = {
-        exists: false,
-        enabled: false,
         states: [],
-        alert: serialized,
+        rawAlert: alert.rawAlert,
       };
 
       types.push({ type, result });
@@ -51,9 +43,6 @@ export async function fetchStatus(
         return result;
       }
 
-      result.exists = true;
-      result.enabled = true;
-
       // Now that we have the id, we can get the state
       const states = await alert.getStates(alertsClient, id, filters);
       if (!states) {
@@ -62,6 +51,9 @@ export async function fetchStatus(
 
       result.states = Object.values(states).reduce((accum: CommonAlertState[], instance: any) => {
         const alertInstanceState = instance.state as AlertInstanceState;
+        if (!alertInstanceState.alertStates) {
+          return accum;
+        }
         for (const state of alertInstanceState.alertStates) {
           const meta = instance.meta;
           if (clusterUuid && state.cluster.clusterUuid !== clusterUuid) {
@@ -69,8 +61,7 @@ export async function fetchStatus(
           }
 
           let firing = false;
-          const isInBetween = moment(state.ui.resolvedMS).isBetween(start, end);
-          if (state.ui.isFiring || isInBetween) {
+          if (state.ui.isFiring) {
             firing = true;
           }
           accum.push({ firing, state, meta });
diff --git a/x-pack/plugins/monitoring/server/lib/alerts/get_listing_link_for_stack_product.ts b/x-pack/plugins/monitoring/server/lib/alerts/get_listing_link_for_stack_product.ts
deleted file mode 100644
index 1936ac1bc6183..0000000000000
--- a/x-pack/plugins/monitoring/server/lib/alerts/get_listing_link_for_stack_product.ts
+++ /dev/null
@@ -1,28 +0,0 @@
-/*
- * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
- * or more contributor license agreements. Licensed under the Elastic License;
- * you may not use this file except in compliance with the Elastic License.
- */
-import {
-  BEATS_SYSTEM_ID,
-  ELASTICSEARCH_SYSTEM_ID,
-  KIBANA_SYSTEM_ID,
-  LOGSTASH_SYSTEM_ID,
-  APM_SYSTEM_ID,
-} from '../../../common/constants';
-
-export function getListingLinkForStackProduct(stackProduct: string) {
-  switch (stackProduct) {
-    case ELASTICSEARCH_SYSTEM_ID:
-      return 'elasticsearch/nodes';
-    case LOGSTASH_SYSTEM_ID:
-      return 'logstash/nodes';
-    case KIBANA_SYSTEM_ID:
-      return 'kibana/instances';
-    case BEATS_SYSTEM_ID:
-      return 'beats/beats';
-    case APM_SYSTEM_ID:
-      return 'apm/instances';
-  }
-  return '';
-}
diff --git a/x-pack/plugins/monitoring/server/lib/alerts/get_stack_product_label.ts b/x-pack/plugins/monitoring/server/lib/alerts/get_stack_product_label.ts
deleted file mode 100644
index 9dafd775bac14..0000000000000
--- a/x-pack/plugins/monitoring/server/lib/alerts/get_stack_product_label.ts
+++ /dev/null
@@ -1,17 +0,0 @@
-/*
- * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
- * or more contributor license agreements. Licensed under the Elastic License;
- * you may not use this file except in compliance with the Elastic License.
- */
-import { capitalize } from 'lodash';
-import { APM_SYSTEM_ID, BEATS_SYSTEM_ID } from '../../../common/constants';
-
-export function getStackProductLabel(stackProduct: string) {
-  switch (stackProduct) {
-    case APM_SYSTEM_ID:
-      return 'APM';
-    case BEATS_SYSTEM_ID:
-      return 'Beat';
-  }
-  return capitalize(stackProduct);
-}
diff --git a/x-pack/plugins/monitoring/server/lib/alerts/get_type_label_for_stack_product.ts b/x-pack/plugins/monitoring/server/lib/alerts/get_type_label_for_stack_product.ts
deleted file mode 100644
index 74801de10438f..0000000000000
--- a/x-pack/plugins/monitoring/server/lib/alerts/get_type_label_for_stack_product.ts
+++ /dev/null
@@ -1,51 +0,0 @@
-/*
- * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
- * or more contributor license agreements. Licensed under the Elastic License;
- * you may not use this file except in compliance with the Elastic License.
- */
-import { i18n } from '@kbn/i18n';
-import {
-  BEATS_SYSTEM_ID,
-  ELASTICSEARCH_SYSTEM_ID,
-  KIBANA_SYSTEM_ID,
-  LOGSTASH_SYSTEM_ID,
-  APM_SYSTEM_ID,
-} from '../../../common/constants';
-
-const NODES = i18n.translate('xpack.monitoring.alerts.typeLabel.nodes', {
-  defaultMessage: 'nodes',
-});
-
-const INSTANCES = i18n.translate('xpack.monitoring.alerts.typeLabel.instances', {
-  defaultMessage: 'instances',
-});
-
-const SERVERS = i18n.translate('xpack.monitoring.alerts.typeLabel.servers', {
-  defaultMessage: 'servers',
-});
-
-const NODE = i18n.translate('xpack.monitoring.alerts.typeLabel.node', {
-  defaultMessage: 'node',
-});
-
-const INSTANCE = i18n.translate('xpack.monitoring.alerts.typeLabel.instance', {
-  defaultMessage: 'instance',
-});
-
-const SERVER = i18n.translate('xpack.monitoring.alerts.typeLabel.server', {
-  defaultMessage: 'server',
-});
-
-export function getTypeLabelForStackProduct(stackProduct: string, plural: boolean = true) {
-  switch (stackProduct) {
-    case ELASTICSEARCH_SYSTEM_ID:
-    case LOGSTASH_SYSTEM_ID:
-      return plural ? NODES : NODE;
-    case KIBANA_SYSTEM_ID:
-    case BEATS_SYSTEM_ID:
-      return plural ? INSTANCES : INSTANCE;
-    case APM_SYSTEM_ID:
-      return plural ? SERVERS : SERVER;
-  }
-  return 'n/a';
-}
diff --git a/x-pack/plugins/monitoring/server/lib/cluster/get_clusters_from_request.js b/x-pack/plugins/monitoring/server/lib/cluster/get_clusters_from_request.js
index b676abd3de2dd..543deba3cf735 100644
--- a/x-pack/plugins/monitoring/server/lib/cluster/get_clusters_from_request.js
+++ b/x-pack/plugins/monitoring/server/lib/cluster/get_clusters_from_request.js
@@ -157,10 +157,7 @@ export async function getClustersFromRequest(
                 alertsClient,
                 req.server.plugins.monitoring.info,
                 undefined,
-                cluster.cluster_uuid,
-                start,
-                end,
-                []
+                cluster.cluster_uuid
               ),
               alertsMeta: {
                 enabled: true,
diff --git a/x-pack/plugins/monitoring/server/plugin.ts b/x-pack/plugins/monitoring/server/plugin.ts
index af5e1fca76308..9478e24c9560f 100644
--- a/x-pack/plugins/monitoring/server/plugin.ts
+++ b/x-pack/plugins/monitoring/server/plugin.ts
@@ -49,6 +49,8 @@ import {
   LegacyRequest,
 } from './types';
 
+import { Globals } from './static_globals';
+
 // This is used to test the version of kibana
 const snapshotRegex = /-snapshot/i;
 
@@ -115,26 +117,10 @@ export class Plugin {
       log: this.log,
     });
 
+    Globals.init(core, plugins.cloud, cluster, config, this.getLogger);
     const serverInfo = core.http.getServerInfo();
-    let kibanaUrl = `${serverInfo.protocol}://${serverInfo.hostname}:${serverInfo.port}`;
-    if (core.http.basePath.serverBasePath) {
-      kibanaUrl += `/${core.http.basePath.serverBasePath}`;
-    }
-    const getUiSettingsService = async () => {
-      const coreStart = (await core.getStartServices())[0];
-      return coreStart.uiSettings;
-    };
-    const isCloud = Boolean(plugins.cloud?.isCloudEnabled);
     const alerts = AlertsFactory.getAll();
     for (const alert of alerts) {
-      alert.initializeAlertType(
-        getUiSettingsService,
-        cluster,
-        this.getLogger,
-        config,
-        kibanaUrl,
-        isCloud
-      );
       plugins.alerts?.registerType(alert.getAlertType());
     }
 
diff --git a/x-pack/plugins/monitoring/server/routes/api/v1/alerts/status.ts b/x-pack/plugins/monitoring/server/routes/api/v1/alerts/status.ts
index 29a27ac3d05e7..5f61094bc1da1 100644
--- a/x-pack/plugins/monitoring/server/routes/api/v1/alerts/status.ts
+++ b/x-pack/plugins/monitoring/server/routes/api/v1/alerts/status.ts
@@ -32,11 +32,7 @@ export function alertStatusRoute(server: any, npRoute: RouteDependencies) {
     async (context, request, response) => {
       try {
         const { clusterUuid } = request.params;
-        const {
-          alertTypeIds,
-          timeRange: { min, max },
-          filters,
-        } = request.body;
+        const { alertTypeIds, filters } = request.body;
         const alertsClient = context.alerting?.getAlertsClient();
         if (!alertsClient) {
           return response.ok({ body: undefined });
@@ -47,8 +43,6 @@ export function alertStatusRoute(server: any, npRoute: RouteDependencies) {
           npRoute.licenseService,
           alertTypeIds,
           clusterUuid,
-          min,
-          max,
           filters as CommonAlertFilter[]
         );
         return response.ok({ body: status });
diff --git a/x-pack/plugins/monitoring/server/static_globals.ts b/x-pack/plugins/monitoring/server/static_globals.ts
new file mode 100644
index 0000000000000..afa26f25919f9
--- /dev/null
+++ b/x-pack/plugins/monitoring/server/static_globals.ts
@@ -0,0 +1,51 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License;
+ * you may not use this file except in compliance with the Elastic License.
+ */
+
+import { CoreSetup, ILegacyCustomClusterClient, Logger } from 'kibana/server';
+import url from 'url';
+import { CloudSetup } from '../../cloud/server';
+import { MonitoringConfig } from './config';
+
+type GetLogger = (...scopes: string[]) => Logger;
+
+interface IAppGlobals {
+  url: string;
+  isCloud: boolean;
+  monitoringCluster: ILegacyCustomClusterClient;
+  config: MonitoringConfig;
+  getLogger: GetLogger;
+}
+
+export class Globals {
+  private static _app: IAppGlobals;
+
+  public static init(
+    coreSetup: CoreSetup,
+    cloud: CloudSetup | undefined,
+    monitoringCluster: ILegacyCustomClusterClient,
+    config: MonitoringConfig,
+    getLogger: GetLogger
+  ) {
+    const { protocol, hostname, port } = coreSetup.http.getServerInfo();
+    const pathname = coreSetup.http.basePath.serverBasePath;
+    Globals._app = {
+      url: url.format({ protocol, hostname, port, pathname }),
+      isCloud: cloud?.isCloudEnabled || false,
+      monitoringCluster,
+      config,
+      getLogger,
+    };
+  }
+
+  public static get app(): Readonly<IAppGlobals> {
+    if (!Globals._app) {
+      throw new Error(
+        'Stack Monitoring: App globals needs to be initiated with Globals.init(...) before use'
+      );
+    }
+    return Globals._app;
+  }
+}
diff --git a/x-pack/plugins/security_solution/cypress/cypress.json b/x-pack/plugins/security_solution/cypress/cypress.json
index d934afec127c2..0eaa224101452 100644
--- a/x-pack/plugins/security_solution/cypress/cypress.json
+++ b/x-pack/plugins/security_solution/cypress/cypress.json
@@ -1,7 +1,6 @@
 {
   "baseUrl": "http://localhost:5601",
-  "defaultCommandTimeout": 120000,
-  "experimentalNetworkStubbing": true,
+  "defaultCommandTimeout": 60000,
   "retries": {
     "runMode": 2
   },
diff --git a/x-pack/plugins/security_solution/cypress/integration/alerts.spec.ts b/x-pack/plugins/security_solution/cypress/integration/alerts.spec.ts
index ada1e65ede26d..04b3f6f13ecab 100644
--- a/x-pack/plugins/security_solution/cypress/integration/alerts.spec.ts
+++ b/x-pack/plugins/security_solution/cypress/integration/alerts.spec.ts
@@ -25,15 +25,13 @@ import {
   markInProgressFirstAlert,
   goToInProgressAlerts,
 } from '../tasks/alerts';
+import { removeSignalsIndex } from '../tasks/api_calls';
 import { esArchiverLoad, esArchiverUnload } from '../tasks/es_archiver';
 import { loginAndWaitForPage } from '../tasks/login';
 
 import { DETECTIONS_URL } from '../urls/navigation';
 
-// FLAKY: https://github.com/elastic/kibana/issues/83773
-// FLAKY: https://github.com/elastic/kibana/issues/83774
-// FLAKY: https://github.com/elastic/kibana/issues/83775
-describe.skip('Alerts', () => {
+describe('Alerts', () => {
   context('Closing alerts', () => {
     beforeEach(() => {
       esArchiverLoad('alerts');
@@ -41,6 +39,7 @@ describe.skip('Alerts', () => {
     });
 
     afterEach(() => {
+      removeSignalsIndex();
       esArchiverUnload('alerts');
     });
 
@@ -170,6 +169,7 @@ describe.skip('Alerts', () => {
     });
 
     afterEach(() => {
+      removeSignalsIndex();
       esArchiverUnload('closed_alerts');
     });
 
@@ -221,6 +221,7 @@ describe.skip('Alerts', () => {
     });
 
     afterEach(() => {
+      removeSignalsIndex();
       esArchiverUnload('alerts');
     });
 
diff --git a/x-pack/plugins/security_solution/cypress/integration/alerts_detection_rules_custom.spec.ts b/x-pack/plugins/security_solution/cypress/integration/alerts_detection_rules_custom.spec.ts
index bc7a867a33b98..2776a4472bb66 100644
--- a/x-pack/plugins/security_solution/cypress/integration/alerts_detection_rules_custom.spec.ts
+++ b/x-pack/plugins/security_solution/cypress/integration/alerts_detection_rules_custom.spec.ts
@@ -85,6 +85,7 @@ import {
   waitForLoadElasticPrebuiltDetectionRulesTableToBeLoaded,
   waitForRulesToBeLoaded,
 } from '../tasks/alerts_detection_rules';
+import { removeSignalsIndex } from '../tasks/api_calls';
 import {
   createAndActivateRule,
   fillAboutRule,
@@ -119,6 +120,7 @@ describe('Custom detection rules creation', () => {
 
   after(() => {
     deleteRule();
+    removeSignalsIndex();
     esArchiverUnload('timeline');
   });
 
@@ -213,8 +215,7 @@ describe('Custom detection rules creation', () => {
   });
 });
 
-// FLAKY: https://github.com/elastic/kibana/issues/83793
-describe.skip('Custom detection rules deletion and edition', () => {
+describe('Custom detection rules deletion and edition', () => {
   beforeEach(() => {
     esArchiverLoad('custom_rules');
     loginAndWaitForPageWithoutDateRange(DETECTIONS_URL);
@@ -224,6 +225,7 @@ describe.skip('Custom detection rules deletion and edition', () => {
   });
 
   afterEach(() => {
+    removeSignalsIndex();
     esArchiverUnload('custom_rules');
   });
 
diff --git a/x-pack/plugins/security_solution/cypress/integration/alerts_detection_rules_export.spec.ts b/x-pack/plugins/security_solution/cypress/integration/alerts_detection_rules_export.spec.ts
index de8e5bc3d1088..d6b347b1112ef 100644
--- a/x-pack/plugins/security_solution/cypress/integration/alerts_detection_rules_export.spec.ts
+++ b/x-pack/plugins/security_solution/cypress/integration/alerts_detection_rules_export.spec.ts
@@ -10,6 +10,7 @@ import {
   waitForAlertsPanelToBeLoaded,
 } from '../tasks/alerts';
 import { exportFirstRule } from '../tasks/alerts_detection_rules';
+import { removeSignalsIndex } from '../tasks/api_calls';
 import { esArchiverLoad, esArchiverUnload } from '../tasks/es_archiver';
 import { loginAndWaitForPageWithoutDateRange } from '../tasks/login';
 
@@ -17,18 +18,17 @@ import { DETECTIONS_URL } from '../urls/navigation';
 
 const EXPECTED_EXPORTED_RULE_FILE_PATH = 'cypress/test_files/expected_rules_export.ndjson';
 
-// FLAKY: https://github.com/elastic/kibana/issues/85217
-describe.skip('Export rules', () => {
+describe('Export rules', () => {
   before(() => {
     esArchiverLoad('export_rule');
-    cy.server();
-    cy.route(
+    cy.intercept(
       'POST',
-      '**api/detection_engine/rules/_export?exclude_export_details=false&file_name=rules_export.ndjson*'
+      '/api/detection_engine/rules/_export?exclude_export_details=false&file_name=rules_export.ndjson'
     ).as('export');
   });
 
   after(() => {
+    removeSignalsIndex();
     esArchiverUnload('export_rule');
   });
 
@@ -38,9 +38,9 @@ describe.skip('Export rules', () => {
     waitForAlertsIndexToBeCreated();
     goToManageAlertsDetectionRules();
     exportFirstRule();
-    cy.wait('@export').then((xhr) => {
+    cy.wait('@export').then(({ response }) => {
       cy.readFile(EXPECTED_EXPORTED_RULE_FILE_PATH).then(($expectedExportedJson) => {
-        cy.wrap(xhr.responseBody).should('eql', $expectedExportedJson);
+        cy.wrap(response!.body).should('eql', $expectedExportedJson);
       });
     });
   });
diff --git a/x-pack/plugins/security_solution/cypress/integration/alerts_detection_rules_indicator_match.spec.ts b/x-pack/plugins/security_solution/cypress/integration/alerts_detection_rules_indicator_match.spec.ts
index 7824a7b55f5e9..193d5939d04af 100644
--- a/x-pack/plugins/security_solution/cypress/integration/alerts_detection_rules_indicator_match.spec.ts
+++ b/x-pack/plugins/security_solution/cypress/integration/alerts_detection_rules_indicator_match.spec.ts
@@ -88,9 +88,7 @@ const expectedMitre = formatMitreAttackDescription(newThreatIndicatorRule.mitre)
 const expectedNumberOfRules = 1;
 const expectedNumberOfAlerts = 1;
 
-// FLAKY: https://github.com/elastic/kibana/issues/85215
-// FLAKY: https://github.com/elastic/kibana/issues/85216
-describe.skip('Detection rules, Indicator Match', () => {
+describe('Detection rules, Indicator Match', () => {
   beforeEach(() => {
     esArchiverLoad('threat_indicator');
     esArchiverLoad('threat_data');
diff --git a/x-pack/plugins/security_solution/cypress/integration/cases_connector_options.spec.ts b/x-pack/plugins/security_solution/cypress/integration/cases_connector_options.spec.ts
index f227042a0f9dc..1d580b93af235 100644
--- a/x-pack/plugins/security_solution/cypress/integration/cases_connector_options.spec.ts
+++ b/x-pack/plugins/security_solution/cypress/integration/cases_connector_options.spec.ts
@@ -28,21 +28,20 @@ import { CONNECTOR_CARD_DETAILS, CONNECTOR_TITLE } from '../screens/case_details
 
 describe('Cases connector incident fields', () => {
   before(() => {
-    cy.server();
-    cy.route('GET', '**/api/cases/configure/connectors/_find', mockConnectorsResponse);
-    cy.route2('POST', `**/api/actions/action/${connectorIds.jira}/_execute`, (req) => {
+    cy.intercept('GET', '/api/cases/configure/connectors/_find', mockConnectorsResponse);
+    cy.intercept('POST', `/api/actions/action/${connectorIds.jira}/_execute`, (req) => {
       const response =
-        JSON.parse(req.body).params.subAction === 'issueTypes'
+        req.body.params.subAction === 'issueTypes'
           ? executeResponses.jira.issueTypes
           : executeResponses.jira.fieldsByIssueType;
-      req.reply(JSON.stringify(response));
+      req.reply(response);
     });
-    cy.route2('POST', `**/api/actions/action/${connectorIds.resilient}/_execute`, (req) => {
+    cy.intercept('POST', `/api/actions/action/${connectorIds.resilient}/_execute`, (req) => {
       const response =
-        JSON.parse(req.body).params.subAction === 'incidentTypes'
+        req.body.params.subAction === 'incidentTypes'
           ? executeResponses.resilient.incidentTypes
           : executeResponses.resilient.severity;
-      req.reply(JSON.stringify(response));
+      req.reply(response);
     });
   });
 
diff --git a/x-pack/plugins/security_solution/cypress/integration/cases_connectors.spec.ts b/x-pack/plugins/security_solution/cypress/integration/cases_connectors.spec.ts
index ed885ad653e5d..f664c61df298a 100644
--- a/x-pack/plugins/security_solution/cypress/integration/cases_connectors.spec.ts
+++ b/x-pack/plugins/security_solution/cypress/integration/cases_connectors.spec.ts
@@ -19,9 +19,8 @@ import { CASES_URL } from '../urls/navigation';
 
 describe('Cases connectors', () => {
   before(() => {
-    cy.server();
-    cy.route('POST', '**/api/actions/action').as('createConnector');
-    cy.route('POST', '**/api/cases/configure').as('saveConnector');
+    cy.intercept('POST', '/api/actions/action').as('createConnector');
+    cy.intercept('POST', '/api/cases/configure').as('saveConnector');
   });
 
   it('Configures a new connector', () => {
@@ -30,13 +29,15 @@ describe('Cases connectors', () => {
     openAddNewConnectorOption();
     addServiceNowConnector(serviceNowConnector);
 
-    cy.wait('@createConnector').its('status').should('eql', 200);
-    cy.get(TOASTER).should('have.text', "Created 'New connector'");
-    cy.get(TOASTER).should('not.exist');
+    cy.wait('@createConnector').then(({ response }) => {
+      cy.wrap(response!.statusCode).should('eql', 200);
+      cy.get(TOASTER).should('have.text', "Created 'New connector'");
+      cy.get(TOASTER).should('not.exist');
 
-    selectLastConnectorCreated();
+      selectLastConnectorCreated(response!.body.id);
 
-    cy.wait('@saveConnector', { timeout: 10000 }).its('status').should('eql', 200);
-    cy.get(TOASTER).should('have.text', 'Saved external connection settings');
+      cy.wait('@saveConnector', { timeout: 10000 }).its('response.statusCode').should('eql', 200);
+      cy.get(TOASTER).should('have.text', 'Saved external connection settings');
+    });
   });
 });
diff --git a/x-pack/plugins/security_solution/cypress/integration/timeline_creation.spec.ts b/x-pack/plugins/security_solution/cypress/integration/timeline_creation.spec.ts
index 8ce60450671b9..d2562e6bd00d9 100644
--- a/x-pack/plugins/security_solution/cypress/integration/timeline_creation.spec.ts
+++ b/x-pack/plugins/security_solution/cypress/integration/timeline_creation.spec.ts
@@ -9,8 +9,8 @@ import {
   FAVORITE_TIMELINE,
   LOCKED_ICON,
   NOTES,
-  NOTES_BUTTON,
-  NOTES_COUNT,
+  NOTES_TAB_BUTTON,
+  // NOTES_COUNT,
   NOTES_TEXT_AREA,
   PIN_EVENT,
   TIMELINE_DESCRIPTION,
@@ -32,7 +32,6 @@ import {
   addFilter,
   addNameToTimeline,
   addNotesToTimeline,
-  closeNotes,
   closeTimeline,
   createNewTimeline,
   markAsFavorite,
@@ -47,12 +46,9 @@ import { OVERVIEW_URL } from '../urls/navigation';
 
 // FLAKY: https://github.com/elastic/kibana/issues/79389
 describe.skip('Timelines', () => {
-  before(() => {
-    cy.server();
-    cy.route('PATCH', '**/api/timeline').as('timeline');
-  });
+  it('Creates a timeline', () => {
+    cy.intercept('PATCH', '/api/timeline').as('timeline');
 
-  it('Creates a timeline', async () => {
     loginAndWaitForPage(OVERVIEW_URL);
     openTimelineUsingToggle();
     populateTimeline();
@@ -64,37 +60,36 @@ describe.skip('Timelines', () => {
 
     addNameToTimeline(timeline.title);
 
-    const response = await cy.wait('@timeline').promisify();
-    const timelineId = JSON.parse(response.xhr.responseText).data.persistTimeline.timeline
-      .savedObjectId;
+    cy.wait('@timeline').then(({ response }) => {
+      const timelineId = response!.body.data.persistTimeline.timeline.savedObjectId;
 
-    addDescriptionToTimeline(timeline.description);
-    addNotesToTimeline(timeline.notes);
-    closeNotes();
-    markAsFavorite();
-    waitForTimelineChanges();
-    createNewTimeline();
-    closeTimeline();
-    openTimelineFromSettings();
+      addDescriptionToTimeline(timeline.description);
+      addNotesToTimeline(timeline.notes);
+      markAsFavorite();
+      waitForTimelineChanges();
+      createNewTimeline();
+      closeTimeline();
+      openTimelineFromSettings();
 
-    cy.contains(timeline.title).should('exist');
-    cy.get(TIMELINES_DESCRIPTION).first().should('have.text', timeline.description);
-    cy.get(TIMELINES_PINNED_EVENT_COUNT).first().should('have.text', '1');
-    cy.get(TIMELINES_NOTES_COUNT).first().should('have.text', '1');
-    cy.get(TIMELINES_FAVORITE).first().should('exist');
+      cy.contains(timeline.title).should('exist');
+      cy.get(TIMELINES_DESCRIPTION).first().should('have.text', timeline.description);
+      cy.get(TIMELINES_PINNED_EVENT_COUNT).first().should('have.text', '1');
+      cy.get(TIMELINES_NOTES_COUNT).first().should('have.text', '1');
+      cy.get(TIMELINES_FAVORITE).first().should('exist');
 
-    openTimeline(timelineId);
+      openTimeline(timelineId);
 
-    cy.get(FAVORITE_TIMELINE).should('exist');
-    cy.get(TIMELINE_TITLE).should('have.attr', 'value', timeline.title);
-    cy.get(TIMELINE_DESCRIPTION).should('have.attr', 'value', timeline.description);
-    cy.get(TIMELINE_QUERY).should('have.text', timeline.query);
-    // Comments this assertion until we agreed what to do with the filters.
-    // cy.get(TIMELINE_FILTER(timeline.filter)).should('exist');
-    cy.get(NOTES_COUNT).should('have.text', '1');
-    cy.get(PIN_EVENT).should('have.attr', 'aria-label', 'Pinned event');
-    cy.get(NOTES_BUTTON).click();
-    cy.get(NOTES_TEXT_AREA).should('have.attr', 'placeholder', 'Add a Note');
-    cy.get(NOTES).should('have.text', timeline.notes);
+      cy.get(FAVORITE_TIMELINE).should('exist');
+      cy.get(TIMELINE_TITLE).should('have.text', timeline.title);
+      cy.get(TIMELINE_DESCRIPTION).should('have.text', timeline.description);
+      cy.get(TIMELINE_QUERY).should('have.text', timeline.query);
+      // Comments this assertion until we agreed what to do with the filters.
+      // cy.get(TIMELINE_FILTER(timeline.filter)).should('exist');
+      // cy.get(NOTES_COUNT).should('have.text', '1');
+      cy.get(PIN_EVENT).should('have.attr', 'aria-label', 'Pinned event');
+      cy.get(NOTES_TAB_BUTTON).click();
+      cy.get(NOTES_TEXT_AREA).should('exist');
+      cy.get(NOTES).should('have.text', timeline.notes);
+    });
   });
 });
diff --git a/x-pack/plugins/security_solution/cypress/integration/timeline_data_providers.spec.ts b/x-pack/plugins/security_solution/cypress/integration/timeline_data_providers.spec.ts
index 8bfb6eba3e1fd..288e2178d71ae 100644
--- a/x-pack/plugins/security_solution/cypress/integration/timeline_data_providers.spec.ts
+++ b/x-pack/plugins/security_solution/cypress/integration/timeline_data_providers.spec.ts
@@ -20,12 +20,11 @@ import {
 
 import { loginAndWaitForPage } from '../tasks/login';
 import { openTimelineUsingToggle } from '../tasks/security_main';
-import { createNewTimeline } from '../tasks/timeline';
+import { closeTimeline, createNewTimeline } from '../tasks/timeline';
 
 import { HOSTS_URL } from '../urls/navigation';
 
-// FLAKY: https://github.com/elastic/kibana/issues/62060
-describe.skip('timeline data providers', () => {
+describe('timeline data providers', () => {
   before(() => {
     loginAndWaitForPage(HOSTS_URL);
     waitForAllHostsToBeLoaded();
@@ -33,6 +32,7 @@ describe.skip('timeline data providers', () => {
 
   afterEach(() => {
     createNewTimeline();
+    closeTimeline();
   });
 
   it('renders the data provider of a host dragged from the All Hosts widget on the hosts page', () => {
diff --git a/x-pack/plugins/security_solution/cypress/integration/timeline_template_creation.spec.ts b/x-pack/plugins/security_solution/cypress/integration/timeline_template_creation.spec.ts
index 74576f53242aa..fc7125288b743 100644
--- a/x-pack/plugins/security_solution/cypress/integration/timeline_template_creation.spec.ts
+++ b/x-pack/plugins/security_solution/cypress/integration/timeline_template_creation.spec.ts
@@ -9,8 +9,8 @@ import {
   FAVORITE_TIMELINE,
   LOCKED_ICON,
   NOTES,
-  NOTES_BUTTON,
-  NOTES_COUNT,
+  NOTES_TAB_BUTTON,
+  // NOTES_COUNT,
   NOTES_TEXT_AREA,
   PIN_EVENT,
   TIMELINE_DESCRIPTION,
@@ -31,7 +31,6 @@ import {
   addFilter,
   addNameToTimeline,
   addNotesToTimeline,
-  closeNotes,
   closeTimeline,
   createNewTimelineTemplate,
   markAsFavorite,
@@ -43,11 +42,9 @@ import { openTimeline } from '../tasks/timelines';
 
 import { OVERVIEW_URL } from '../urls/navigation';
 
-// FLAKY: https://github.com/elastic/kibana/issues/79967
-describe.skip('Timeline Templates', () => {
+describe('Timeline Templates', () => {
   before(() => {
-    cy.server();
-    cy.route('PATCH', '**/api/timeline').as('timeline');
+    cy.intercept('PATCH', '/api/timeline').as('timeline');
   });
 
   it('Creates a timeline template', async () => {
@@ -65,36 +62,35 @@ describe.skip('Timeline Templates', () => {
 
     addNameToTimeline(timeline.title);
 
-    const response = await cy.wait('@timeline').promisify();
-    const timelineId = JSON.parse(response.xhr.responseText).data.persistTimeline.timeline
-      .savedObjectId;
+    cy.wait('@timeline').then(({ response }) => {
+      const timelineId = response!.body.data.persistTimeline.timeline.savedObjectId;
 
-    addDescriptionToTimeline(timeline.description);
-    addNotesToTimeline(timeline.notes);
-    closeNotes();
-    markAsFavorite();
-    waitForTimelineChanges();
-    createNewTimelineTemplate();
-    closeTimeline();
-    openTimelineTemplateFromSettings(timelineId);
+      addDescriptionToTimeline(timeline.description);
+      addNotesToTimeline(timeline.notes);
+      markAsFavorite();
+      waitForTimelineChanges();
+      createNewTimelineTemplate();
+      closeTimeline();
+      openTimelineTemplateFromSettings(timelineId);
 
-    cy.contains(timeline.title).should('exist');
-    cy.get(TIMELINES_DESCRIPTION).first().should('have.text', timeline.description);
-    cy.get(TIMELINES_PINNED_EVENT_COUNT).first().should('have.text', '1');
-    cy.get(TIMELINES_NOTES_COUNT).first().should('have.text', '1');
-    cy.get(TIMELINES_FAVORITE).first().should('exist');
+      cy.contains(timeline.title).should('exist');
+      cy.get(TIMELINES_DESCRIPTION).first().should('have.text', timeline.description);
+      cy.get(TIMELINES_PINNED_EVENT_COUNT).first().should('have.text', '1');
+      cy.get(TIMELINES_NOTES_COUNT).first().should('have.text', '1');
+      cy.get(TIMELINES_FAVORITE).first().should('exist');
 
-    openTimeline(timelineId);
+      openTimeline(timelineId);
 
-    cy.get(FAVORITE_TIMELINE).should('exist');
-    cy.get(TIMELINE_TITLE).should('have.attr', 'value', timeline.title);
-    cy.get(TIMELINE_DESCRIPTION).should('have.attr', 'value', timeline.description);
-    cy.get(TIMELINE_QUERY).should('have.text', timeline.query);
-    // Comments this assertion until we agreed what to do with the filters.
-    // cy.get(TIMELINE_FILTER(timeline.filter)).should('exist');
-    cy.get(NOTES_COUNT).should('have.text', '1');
-    cy.get(NOTES_BUTTON).click();
-    cy.get(NOTES_TEXT_AREA).should('have.attr', 'placeholder', 'Add a Note');
-    cy.get(NOTES).should('have.text', timeline.notes);
+      cy.get(FAVORITE_TIMELINE).should('exist');
+      cy.get(TIMELINE_TITLE).should('have.text', timeline.title);
+      cy.get(TIMELINE_DESCRIPTION).should('have.text', timeline.description);
+      cy.get(TIMELINE_QUERY).should('have.text', timeline.query);
+      // Comments this assertion until we agreed what to do with the filters.
+      // cy.get(TIMELINE_FILTER(timeline.filter)).should('exist');
+      // cy.get(NOTES_COUNT).should('have.text', '1');
+      cy.get(NOTES_TAB_BUTTON).click();
+      cy.get(NOTES_TEXT_AREA).should('exist');
+      cy.get(NOTES).should('have.text', timeline.notes);
+    });
   });
 });
diff --git a/x-pack/plugins/security_solution/cypress/integration/timeline_templates_export.spec.ts b/x-pack/plugins/security_solution/cypress/integration/timeline_templates_export.spec.ts
index bf8a01f6cf072..6e80bab0acd8f 100644
--- a/x-pack/plugins/security_solution/cypress/integration/timeline_templates_export.spec.ts
+++ b/x-pack/plugins/security_solution/cypress/integration/timeline_templates_export.spec.ts
@@ -5,7 +5,7 @@
  */
 
 import { exportTimeline } from '../tasks/timelines';
-import { esArchiverLoad } from '../tasks/es_archiver';
+import { esArchiverLoad, esArchiverUnload } from '../tasks/es_archiver';
 import { loginAndWaitForPageWithoutDateRange } from '../tasks/login';
 import { timeline as timelineTemplate } from '../objects/timeline';
 
@@ -15,31 +15,34 @@ import { addNameToTimeline, closeTimeline, createNewTimelineTemplate } from '../
 describe('Export timelines', () => {
   before(() => {
     esArchiverLoad('timeline');
-    cy.server();
-    cy.route('PATCH', '**/api/timeline').as('timeline');
-    cy.route('POST', '**api/timeline/_export?file_name=timelines_export.ndjson*').as('export');
+    cy.intercept('PATCH', '/api/timeline').as('timeline');
+    cy.intercept('POST', '/api/timeline/_export?file_name=timelines_export.ndjson').as('export');
   });
 
-  it('Exports a custom timeline template', async () => {
+  after(() => {
+    esArchiverUnload('timeline');
+  });
+
+  it('Exports a custom timeline template', () => {
     loginAndWaitForPageWithoutDateRange(TIMELINE_TEMPLATES_URL);
     createNewTimelineTemplate();
     addNameToTimeline(timelineTemplate.title);
     closeTimeline();
 
-    const result = await cy.wait('@timeline').promisify();
-
-    const timelineId = JSON.parse(result.xhr.responseText).data.persistTimeline.timeline
-      .savedObjectId;
-    const templateTimelineId = JSON.parse(result.xhr.responseText).data.persistTimeline.timeline
-      .templateTimelineId;
+    cy.wait('@timeline').then(({ response }) => {
+      const {
+        savedObjectId: timelineId,
+        templateTimelineId,
+      } = response!.body.data.persistTimeline.timeline;
 
-    await exportTimeline(timelineId);
+      exportTimeline(timelineId);
 
-    cy.wait('@export').then((response) => {
-      cy.wrap(JSON.parse(response.xhr.responseText).templateTimelineId).should(
-        'eql',
-        templateTimelineId
-      );
+      cy.wait('@export').then(({ response: exportResponse }) => {
+        cy.wrap(JSON.parse(exportResponse!.body as string).templateTimelineId).should(
+          'eql',
+          templateTimelineId
+        );
+      });
     });
   });
 });
diff --git a/x-pack/plugins/security_solution/cypress/integration/timeline_toggle_column.spec.ts b/x-pack/plugins/security_solution/cypress/integration/timeline_toggle_column.spec.ts
index e4f303fb89fda..766c036d3ec0d 100644
--- a/x-pack/plugins/security_solution/cypress/integration/timeline_toggle_column.spec.ts
+++ b/x-pack/plugins/security_solution/cypress/integration/timeline_toggle_column.spec.ts
@@ -11,10 +11,12 @@ import {
   TIMESTAMP_TOGGLE_FIELD,
 } from '../screens/timeline';
 
+import { esArchiverLoad, esArchiverUnload } from '../tasks/es_archiver';
 import { loginAndWaitForPage } from '../tasks/login';
 import { openTimelineUsingToggle } from '../tasks/security_main';
 import {
   checkIdToggleField,
+  closeTimeline,
   createNewTimeline,
   dragAndDropIdToggleFieldToTimeline,
   expandFirstTimelineEventDetails,
@@ -26,9 +28,14 @@ import { HOSTS_URL } from '../urls/navigation';
 
 describe('toggle column in timeline', () => {
   before(() => {
+    esArchiverLoad('timeline');
     loginAndWaitForPage(HOSTS_URL);
   });
 
+  after(() => {
+    esArchiverUnload('timeline');
+  });
+
   beforeEach(() => {
     openTimelineUsingToggle();
     populateTimeline();
@@ -36,6 +43,7 @@ describe('toggle column in timeline', () => {
 
   afterEach(() => {
     createNewTimeline();
+    closeTimeline();
   });
 
   it('displays a checked Toggle field checkbox for `@timestamp`, a default timeline column', () => {
@@ -44,6 +52,7 @@ describe('toggle column in timeline', () => {
   });
 
   it('displays an Unchecked Toggle field checkbox for `_id`, because it is NOT a default timeline column', () => {
+    expandFirstTimelineEventDetails();
     cy.get(ID_TOGGLE_FIELD).should('not.be.checked');
   });
 
diff --git a/x-pack/plugins/security_solution/cypress/integration/timelines_export.spec.ts b/x-pack/plugins/security_solution/cypress/integration/timelines_export.spec.ts
index 103bbaad8f303..72e1b293327d1 100644
--- a/x-pack/plugins/security_solution/cypress/integration/timelines_export.spec.ts
+++ b/x-pack/plugins/security_solution/cypress/integration/timelines_export.spec.ts
@@ -15,8 +15,7 @@ const EXPECTED_EXPORTED_TIMELINE_PATH = 'cypress/test_files/expected_timelines_e
 describe('Export timelines', () => {
   before(() => {
     esArchiverLoad('timeline');
-    cy.server();
-    cy.route('POST', '**api/timeline/_export?file_name=timelines_export.ndjson*').as('export');
+    cy.intercept('POST', '/api/timeline/_export?file_name=timelines_export.ndjson').as('export');
   });
 
   after(() => {
@@ -32,9 +31,9 @@ describe('Export timelines', () => {
       const timelineId = parsedJson.savedObjectId;
       exportTimeline(timelineId);
 
-      cy.wait('@export').then((response) => {
-        cy.wrap(response.status).should('eql', 200);
-        cy.wrap(response.xhr.responseText).should('eql', $expectedExportedJson);
+      cy.wait('@export').then(({ response }) => {
+        cy.wrap(response!.statusCode).should('eql', 200);
+        cy.wrap(response!.body).should('eql', $expectedExportedJson);
       });
     });
   });
diff --git a/x-pack/plugins/security_solution/cypress/integration/url_state.spec.ts b/x-pack/plugins/security_solution/cypress/integration/url_state.spec.ts
index 3a941209de736..d5ef97ba685b4 100644
--- a/x-pack/plugins/security_solution/cypress/integration/url_state.spec.ts
+++ b/x-pack/plugins/security_solution/cypress/integration/url_state.spec.ts
@@ -31,12 +31,7 @@ import { openAllHosts } from '../tasks/hosts/main';
 import { waitForIpsTableToBeLoaded } from '../tasks/network/flows';
 import { clearSearchBar, kqlSearch, navigateFromHeaderTo } from '../tasks/security_header';
 import { openTimelineUsingToggle } from '../tasks/security_main';
-import {
-  addNameToTimeline,
-  closeTimeline,
-  populateTimeline,
-  waitForTimelineChanges,
-} from '../tasks/timeline';
+import { addNameToTimeline, closeTimeline, populateTimeline } from '../tasks/timeline';
 
 import { HOSTS_URL } from '../urls/navigation';
 import { ABSOLUTE_DATE_RANGE } from '../urls/state';
@@ -53,7 +48,8 @@ const ABSOLUTE_DATE = {
   startTimeTimeline: '2019-08-02T20:03:29.186Z',
 };
 
-describe('url state', () => {
+// SKIP: https://github.com/elastic/kibana/issues/85289
+describe.skip('url state', () => {
   it('sets the global start and end dates from the url', () => {
     loginAndWaitForPageWithoutDateRange(ABSOLUTE_DATE_RANGE.url);
     cy.get(DATE_PICKER_START_DATE_POPOVER_BUTTON).should(
@@ -225,18 +221,14 @@ describe('url state', () => {
     openTimelineUsingToggle();
     populateTimeline();
 
-    cy.server();
-    cy.route('PATCH', '**/api/timeline').as('timeline');
+    cy.intercept('PATCH', '/api/timeline').as('timeline');
 
-    waitForTimelineChanges();
     addNameToTimeline(timeline.title);
-    waitForTimelineChanges();
 
-    cy.wait('@timeline').then((response) => {
+    cy.wait('@timeline').then(({ response }) => {
       closeTimeline();
-      cy.wrap(response.status).should('eql', 200);
-      const JsonResponse = JSON.parse(response.xhr.responseText);
-      const timelineId = JsonResponse.data.persistTimeline.timeline.savedObjectId;
+      cy.wrap(response!.statusCode).should('eql', 200);
+      const timelineId = response!.body.data.persistTimeline.timeline.savedObjectId;
       cy.visit('/app/home');
       cy.visit(`/app/security/timelines?timeline=(id:'${timelineId}',isOpen:!t)`);
       cy.get(DATE_PICKER_APPLY_BUTTON_TIMELINE).should('exist');
diff --git a/x-pack/plugins/security_solution/cypress/integration/value_lists.spec.ts b/x-pack/plugins/security_solution/cypress/integration/value_lists.spec.ts
index b97e1a874da7a..341ca31715356 100644
--- a/x-pack/plugins/security_solution/cypress/integration/value_lists.spec.ts
+++ b/x-pack/plugins/security_solution/cypress/integration/value_lists.spec.ts
@@ -160,62 +160,61 @@ describe('value lists', () => {
     });
 
     describe('export list types', () => {
-      beforeEach(() => {
-        cy.server();
-        cy.route('POST', '**/api/lists/items/_export?list_id=*').as('exportList');
-      });
-
       it('exports a "keyword" list from an uploaded file', () => {
         const listName = 'value_list.txt';
+        cy.intercept('POST', `/api/lists/items/_export?list_id=${listName}`).as('exportList');
         importValueList('value_list.txt', 'keyword');
         openValueListsModal();
         exportValueList();
-        cy.wait('@exportList').then((xhr) => {
+        cy.wait('@exportList').then(({ response }) => {
           cy.fixture(listName).then((list: string) => {
             const [lineOne, lineTwo] = list.split('\n');
-            expect(xhr.responseBody).to.contain(lineOne);
-            expect(xhr.responseBody).to.contain(lineTwo);
+            expect(response!.body).to.contain(lineOne);
+            expect(response!.body).to.contain(lineTwo);
           });
         });
       });
 
       it('exports a "text" list from an uploaded file', () => {
         const listName = 'value_list.txt';
+        cy.intercept('POST', `/api/lists/items/_export?list_id=${listName}`).as('exportList');
         importValueList(listName, 'text');
         openValueListsModal();
         exportValueList();
-        cy.wait('@exportList').then((xhr) => {
+        cy.wait('@exportList').then(({ response }) => {
           cy.fixture(listName).then((list: string) => {
             const [lineOne, lineTwo] = list.split('\n');
-            expect(xhr.responseBody).to.contain(lineOne);
-            expect(xhr.responseBody).to.contain(lineTwo);
+            expect(response!.body).to.contain(lineOne);
+            expect(response!.body).to.contain(lineTwo);
           });
         });
       });
 
       it('exports a "ip" list from an uploaded file', () => {
         const listName = 'ip_list.txt';
+        cy.intercept('POST', `/api/lists/items/_export?list_id=${listName}`).as('exportList');
         importValueList(listName, 'ip');
         openValueListsModal();
         exportValueList();
-        cy.wait('@exportList').then((xhr) => {
+        cy.wait('@exportList').then(({ response }) => {
           cy.fixture(listName).then((list: string) => {
             const [lineOne, lineTwo] = list.split('\n');
-            expect(xhr.responseBody).to.contain(lineOne);
-            expect(xhr.responseBody).to.contain(lineTwo);
+            expect(response!.body).to.contain(lineOne);
+            expect(response!.body).to.contain(lineTwo);
           });
         });
       });
 
       it('exports a "ip_range" list from an uploaded file', () => {
         const listName = 'cidr_list.txt';
+        cy.intercept('POST', `/api/lists/items/_export?list_id=${listName}`).as('exportList');
         importValueList(listName, 'ip_range', ['192.168.100.0']);
         openValueListsModal();
         exportValueList();
-        cy.wait('@exportList').then((xhr) => {
+        cy.wait('@exportList').then(({ response }) => {
           cy.fixture(listName).then((list: string) => {
             const [lineOne] = list.split('\n');
-            expect(xhr.responseBody).to.contain(lineOne);
+            expect(response!.body).to.contain(lineOne);
           });
         });
       });
diff --git a/x-pack/plugins/security_solution/cypress/screens/timeline.ts b/x-pack/plugins/security_solution/cypress/screens/timeline.ts
index ea0e132bf07b5..9397307684d6a 100644
--- a/x-pack/plugins/security_solution/cypress/screens/timeline.ts
+++ b/x-pack/plugins/security_solution/cypress/screens/timeline.ts
@@ -23,8 +23,6 @@ export const CASE = (id: string) => {
   return `[data-test-subj="cases-table-row-${id}"]`;
 };
 
-export const CLOSE_NOTES_BTN = '[data-test-subj="notesModal"] .euiButtonIcon';
-
 export const CLOSE_TIMELINE_BTN = '[data-test-subj="close-timeline"]';
 
 export const COMBO_BOX = '.euiComboBoxOption__content';
@@ -38,6 +36,8 @@ export const DRAGGABLE_HEADER =
 
 export const FAVORITE_TIMELINE = '[data-test-subj="timeline-favorite-filled-star"]';
 
+export const GRAPH_TAB_BUTTON = '[data-test-subj="timelineTabs-graph"]';
+
 export const HEADER = '[data-test-subj="header"]';
 
 export const HEADERS_GROUP = '[data-test-subj="headers-group"]';
@@ -50,11 +50,11 @@ export const ID_TOGGLE_FIELD = '[data-test-subj="toggle-field-_id"]';
 
 export const LOCKED_ICON = '[data-test-subj="timeline-date-picker-lock-button"]';
 
-export const NOTES = '[data-test-subj="markdown-root"]';
+export const NOTES = '[data-test-subj="note-card-body"]';
 
-export const NOTES_TEXT_AREA = '[data-test-subj="add-a-note"]';
+export const NOTES_TEXT_AREA = '[data-test-subj="add-a-note"] textarea';
 
-export const NOTES_BUTTON = '[data-test-subj="timeline-notes-button-large"]';
+export const NOTES_TAB_BUTTON = '[data-test-subj="timelineTabs-notes"]';
 
 export const NOTES_COUNT = '[data-test-subj="timeline-notes-count"]';
 
@@ -65,6 +65,8 @@ export const OPEN_TIMELINE_TEMPLATE_ICON =
 
 export const PIN_EVENT = '[data-test-subj="pin"]';
 
+export const PINNED_TAB_BUTTON = '[data-test-subj="timelineTabs-pinned"]';
+
 export const PROVIDER_BADGE = '[data-test-subj="providerBadge"]';
 
 export const REMOVE_COLUMN = '[data-test-subj="remove-column"]';
@@ -92,7 +94,7 @@ export const TIMELINE_DATA_PROVIDERS_EMPTY =
 
 export const TIMELINE_DESCRIPTION = '[data-test-subj="timeline-description"]';
 
-export const TIMELINE_DESCRIPTION_INPUT = '[data-test-subj="timeline-description-input"]';
+export const TIMELINE_DESCRIPTION_INPUT = '[data-test-subj="timeline-description-textarea"]';
 
 export const TIMELINE_DROPPED_DATA_PROVIDERS = '[data-test-subj="providerContainer"]';
 
@@ -137,3 +139,5 @@ export const TOGGLE_TIMELINE_EXPAND_EVENT = '[data-test-subj="expand-event"]';
 export const TIMELINE_EDIT_MODAL_OPEN_BUTTON = '[data-test-subj="save-timeline-button-icon"]';
 
 export const TIMELINE_EDIT_MODAL_SAVE_BUTTON = '[data-test-subj="save-button"]';
+
+export const QUERY_TAB_BUTTON = '[data-test-subj="timelineTabs-query"]';
diff --git a/x-pack/plugins/security_solution/cypress/support/commands.js b/x-pack/plugins/security_solution/cypress/support/commands.js
index 95a52794628b1..ef6cce8fd9fd8 100644
--- a/x-pack/plugins/security_solution/cypress/support/commands.js
+++ b/x-pack/plugins/security_solution/cypress/support/commands.js
@@ -48,11 +48,9 @@ const getFindRequestConfig = (searchStrategyName, factoryQueryType) => {
 Cypress.Commands.add(
   'stubSearchStrategyApi',
   function (stubObject, factoryQueryType, searchStrategyName = 'securitySolutionSearchStrategy') {
-    cy.route2('POST', '/internal/bsearch', (req) => {
-      const bodyObj = JSON.parse(req.body);
+    cy.intercept('POST', '/internal/bsearch', (req) => {
       const findRequestConfig = getFindRequestConfig(searchStrategyName, factoryQueryType);
-
-      const requestIndex = findIndex(findRequestConfig, bodyObj.batch);
+      const requestIndex = findIndex(findRequestConfig, req.body.batch);
 
       if (requestIndex > -1) {
         return req.reply((res) => {
diff --git a/x-pack/plugins/security_solution/cypress/support/index.js b/x-pack/plugins/security_solution/cypress/support/index.js
index 1328bea0e2918..f6f0056abf8f0 100644
--- a/x-pack/plugins/security_solution/cypress/support/index.js
+++ b/x-pack/plugins/security_solution/cypress/support/index.js
@@ -21,7 +21,6 @@
 
 // Import commands.js using ES2015 syntax:
 import './commands';
-import 'cypress-promise/register';
 
 Cypress.Cookies.defaults({
   preserve: 'sid',
@@ -33,10 +32,5 @@ Cypress.on('uncaught:exception', (err) => {
   }
 });
 
-Cypress.on('window:before:load', (win) => {
-  win.fetch = null;
-  win.Blob = null;
-});
-
 // Alternatively you can use CommonJS syntax:
 // require('./commands')
diff --git a/x-pack/plugins/security_solution/cypress/tasks/alerts_detection_rules.ts b/x-pack/plugins/security_solution/cypress/tasks/alerts_detection_rules.ts
index bcee151a6be42..71c97654b9d67 100644
--- a/x-pack/plugins/security_solution/cypress/tasks/alerts_detection_rules.ts
+++ b/x-pack/plugins/security_solution/cypress/tasks/alerts_detection_rules.ts
@@ -126,7 +126,7 @@ export const waitForRulesToBeLoaded = () => {
 };
 
 export const checkAutoRefresh = (ms: number, condition: string) => {
-  cy.get(ASYNC_LOADING_PROGRESS).should('not.be.visible');
+  cy.get(ASYNC_LOADING_PROGRESS).should('not.exist');
   cy.tick(ms);
   cy.get(ASYNC_LOADING_PROGRESS).should(condition);
 };
@@ -136,7 +136,7 @@ export const dismissAllRulesIdleModal = () => {
     .eq(1)
     .should('exist')
     .click({ force: true, multiple: true });
-  cy.get(RULE_AUTO_REFRESH_IDLE_MODAL).should('not.be.visible');
+  cy.get(RULE_AUTO_REFRESH_IDLE_MODAL).should('not.exist');
 };
 
 export const checkAllRulesIdleModal = (condition: string) => {
diff --git a/x-pack/plugins/security_solution/cypress/tasks/configure_cases.ts b/x-pack/plugins/security_solution/cypress/tasks/configure_cases.ts
index b39cbeba7b85e..1022cb30f48e4 100644
--- a/x-pack/plugins/security_solution/cypress/tasks/configure_cases.ts
+++ b/x-pack/plugins/security_solution/cypress/tasks/configure_cases.ts
@@ -38,11 +38,7 @@ export const openAddNewConnectorOption = () => {
   });
 };
 
-export const selectLastConnectorCreated = () => {
+export const selectLastConnectorCreated = (id: string) => {
   cy.get(CONNECTORS_DROPDOWN).click({ force: true });
-  cy.get('@createConnector')
-    .its('response')
-    .then((response) => {
-      cy.get(CONNECTOR(response.body.id)).click();
-    });
+  cy.get(CONNECTOR(id)).click();
 };
diff --git a/x-pack/plugins/security_solution/cypress/tasks/rule_details.ts b/x-pack/plugins/security_solution/cypress/tasks/rule_details.ts
index 9dd23a1dfa71f..7f973aef8e477 100644
--- a/x-pack/plugins/security_solution/cypress/tasks/rule_details.ts
+++ b/x-pack/plugins/security_solution/cypress/tasks/rule_details.ts
@@ -24,12 +24,11 @@ import {
 } from '../screens/rule_details';
 
 export const activatesRule = () => {
-  cy.server();
-  cy.route('PATCH', '**/api/detection_engine/rules/_bulk_update').as('bulk_update');
+  cy.intercept('PATCH', '/api/detection_engine/rules/_bulk_update').as('bulk_update');
   cy.get(RULE_SWITCH).should('be.visible');
   cy.get(RULE_SWITCH).click();
-  cy.wait('@bulk_update').then((response) => {
-    cy.wrap(response.status).should('eql', 200);
+  cy.wait('@bulk_update').then(({ response }) => {
+    cy.wrap(response!.statusCode).should('eql', 200);
   });
 };
 
@@ -50,7 +49,7 @@ export const addsException = (exception: Exception) => {
   cy.get(CLOSE_ALERTS_CHECKBOX).click({ force: true });
   cy.get(CONFIRM_BTN).click();
   cy.get(CONFIRM_BTN).should('have.attr', 'disabled');
-  cy.get(CONFIRM_BTN).should('not.have.attr', 'disabled');
+  cy.get(CONFIRM_BTN).should('not.exist');
 };
 
 export const addsExceptionFromRuleSettings = (exception: Exception) => {
@@ -68,7 +67,7 @@ export const addsExceptionFromRuleSettings = (exception: Exception) => {
   cy.get(CLOSE_ALERTS_CHECKBOX).click({ force: true });
   cy.get(CONFIRM_BTN).click();
   cy.get(CONFIRM_BTN).should('have.attr', 'disabled');
-  cy.get(CONFIRM_BTN).should('not.have.attr', 'disabled');
+  cy.get(CONFIRM_BTN).should('not.exist');
 };
 
 export const goToAlertsTab = () => {
diff --git a/x-pack/plugins/security_solution/cypress/tasks/timeline.ts b/x-pack/plugins/security_solution/cypress/tasks/timeline.ts
index 10a2ff27666c0..b9703bad7705a 100644
--- a/x-pack/plugins/security_solution/cypress/tasks/timeline.ts
+++ b/x-pack/plugins/security_solution/cypress/tasks/timeline.ts
@@ -16,14 +16,13 @@ import {
   ATTACH_TIMELINE_TO_NEW_CASE_ICON,
   CASE,
   CLOSE_TIMELINE_BTN,
-  CLOSE_NOTES_BTN,
   COMBO_BOX,
   CREATE_NEW_TIMELINE,
   HEADER,
   ID_FIELD,
   ID_HEADER_FIELD,
   ID_TOGGLE_FIELD,
-  NOTES_BUTTON,
+  NOTES_TAB_BUTTON,
   NOTES_TEXT_AREA,
   OPEN_TIMELINE_ICON,
   PIN_EVENT,
@@ -34,7 +33,7 @@ import {
   SERVER_SIDE_EVENT_COUNT,
   STAR_ICON,
   TIMELINE_CHANGES_IN_PROGRESS,
-  TIMELINE_DESCRIPTION,
+  TIMELINE_DESCRIPTION_INPUT,
   TIMELINE_FIELDS_BUTTON,
   TIMELINE_FILTER_FIELD,
   TIMELINE_FILTER_OPERATOR,
@@ -49,6 +48,7 @@ import {
   OPEN_TIMELINE_TEMPLATE_ICON,
   TIMELINE_EDIT_MODAL_OPEN_BUTTON,
   TIMELINE_EDIT_MODAL_SAVE_BUTTON,
+  QUERY_TAB_BUTTON,
 } from '../screens/timeline';
 import { TIMELINES_TABLE } from '../screens/timelines';
 
@@ -57,8 +57,11 @@ import { drag, drop } from '../tasks/common';
 export const hostExistsQuery = 'host.name: *';
 
 export const addDescriptionToTimeline = (description: string) => {
-  cy.get(TIMELINE_DESCRIPTION).type(`${description}{enter}`);
-  cy.get(TIMELINE_DESCRIPTION).should('have.attr', 'value', description);
+  cy.get(TIMELINE_EDIT_MODAL_OPEN_BUTTON).first().click();
+  cy.get(TIMELINE_DESCRIPTION_INPUT).type(`${description}{enter}`);
+  cy.get(TIMELINE_DESCRIPTION_INPUT).invoke('val').should('equal', description);
+  cy.get(TIMELINE_EDIT_MODAL_SAVE_BUTTON).click();
+  cy.get(TIMELINE_TITLE_INPUT).should('not.exist');
 };
 
 export const addNameToTimeline = (name: string) => {
@@ -66,12 +69,14 @@ export const addNameToTimeline = (name: string) => {
   cy.get(TIMELINE_TITLE_INPUT).type(`${name}{enter}`);
   cy.get(TIMELINE_TITLE_INPUT).should('have.attr', 'value', name);
   cy.get(TIMELINE_EDIT_MODAL_SAVE_BUTTON).click();
+  cy.get(TIMELINE_TITLE_INPUT).should('not.exist');
 };
 
 export const addNotesToTimeline = (notes: string) => {
-  cy.get(NOTES_BUTTON).click();
+  cy.get(NOTES_TAB_BUTTON).click();
   cy.get(NOTES_TEXT_AREA).type(notes);
   cy.get(ADD_NOTE_BUTTON).click();
+  cy.get(QUERY_TAB_BUTTON).click();
 };
 
 export const addFilter = (filter: TimelineFilter) => {
@@ -107,10 +112,6 @@ export const checkIdToggleField = () => {
   });
 };
 
-export const closeNotes = () => {
-  cy.get(CLOSE_NOTES_BTN).click();
-};
-
 export const closeTimeline = () => {
   cy.get(CLOSE_TIMELINE_BTN).filter(':visible').click({ force: true });
 };
@@ -119,7 +120,6 @@ export const createNewTimeline = () => {
   cy.get(TIMELINE_SETTINGS_ICON).filter(':visible').click({ force: true });
   cy.get(CREATE_NEW_TIMELINE).should('be.visible');
   cy.get(CREATE_NEW_TIMELINE).click();
-  cy.get(CLOSE_TIMELINE_BTN).filter(':visible').click({ force: true });
 };
 
 export const createNewTimelineTemplate = () => {
@@ -149,7 +149,7 @@ export const openTimelineInspectButton = () => {
 };
 
 export const openTimelineFromSettings = () => {
-  cy.get(TIMELINE_SETTINGS_ICON).click({ force: true });
+  cy.get(TIMELINE_SETTINGS_ICON).filter(':visible').click({ force: true });
   cy.get(OPEN_TIMELINE_ICON).click({ force: true });
 };
 
diff --git a/x-pack/plugins/security_solution/public/detections/pages/detection_engine/rules/helpers.tsx b/x-pack/plugins/security_solution/public/detections/pages/detection_engine/rules/helpers.tsx
index 513982f099c61..36a1248f94dd4 100644
--- a/x-pack/plugins/security_solution/public/detections/pages/detection_engine/rules/helpers.tsx
+++ b/x-pack/plugins/security_solution/public/detections/pages/detection_engine/rules/helpers.tsx
@@ -377,7 +377,11 @@ export const getActionMessageParams = memoizeOne(
       state: [{ name: 'signals_count', description: 'state.signals_count' }],
       params: [],
       context: [
-        { name: 'results_link', description: 'context.results_link' },
+        {
+          name: 'results_link',
+          description: 'context.results_link',
+          useWithTripleBracesInTemplates: true,
+        },
         ...actionMessageRuleParams.map((param) => {
           const extendedParam = `rule.${param}`;
           return { name: extendedParam, description: `context.${extendedParam}` };
diff --git a/x-pack/plugins/security_solution/public/timelines/components/flyout/header/index.tsx b/x-pack/plugins/security_solution/public/timelines/components/flyout/header/index.tsx
index b22d071a97d12..e09eedcd34dd1 100644
--- a/x-pack/plugins/security_solution/public/timelines/components/flyout/header/index.tsx
+++ b/x-pack/plugins/security_solution/public/timelines/components/flyout/header/index.tsx
@@ -136,12 +136,9 @@ const TimelineNameComponent: React.FC<FlyoutHeaderProps> = ({ timelineId }) => {
   const content = useMemo(() => (title.length ? title : placeholder), [title, placeholder]);
 
   return (
-    <>
-      <EuiText>
-        <h3 data-test-subj="timeline-title">{content}</h3>
-      </EuiText>
-      <SaveTimelineButton timelineId={timelineId} />
-    </>
+    <EuiText>
+      <h3 data-test-subj="timeline-title">{content}</h3>
+    </EuiText>
   );
 };
 
@@ -158,12 +155,9 @@ const TimelineDescriptionComponent: React.FC<FlyoutHeaderProps> = ({ timelineId
   ]);
 
   return (
-    <>
-      <EuiText size="s" data-test-subj="timeline-description">
-        {content}
-      </EuiText>
-      <SaveTimelineButton timelineId={timelineId} />
-    </>
+    <EuiText size="s" data-test-subj="timeline-description">
+      {content}
+    </EuiText>
   );
 };
 
@@ -209,9 +203,11 @@ const FlyoutHeaderComponent: React.FC<FlyoutHeaderProps> = ({ timelineId }) => (
       <EuiFlexGroup data-test-subj="properties-left" direction="column" gutterSize="none">
         <RowFlexItem>
           <TimelineName timelineId={timelineId} />
+          <SaveTimelineButton timelineId={timelineId} />
         </RowFlexItem>
         <RowFlexItem>
           <TimelineDescription timelineId={timelineId} />
+          <SaveTimelineButton timelineId={timelineId} />
         </RowFlexItem>
         <EuiFlexItem>
           <TimelineStatusInfo timelineId={timelineId} />
diff --git a/x-pack/plugins/security_solution/public/timelines/components/timeline/header/title_and_description.test.tsx b/x-pack/plugins/security_solution/public/timelines/components/timeline/header/title_and_description.test.tsx
index bcc90a25d5789..cb31765bd9c37 100644
--- a/x-pack/plugins/security_solution/public/timelines/components/timeline/header/title_and_description.test.tsx
+++ b/x-pack/plugins/security_solution/public/timelines/components/timeline/header/title_and_description.test.tsx
@@ -7,19 +7,13 @@
 import React from 'react';
 import { shallow } from 'enzyme';
 import { TimelineTitleAndDescription } from './title_and_description';
-import { useShallowEqualSelector } from '../../../../common/hooks/use_selector';
+import { useDeepEqualSelector } from '../../../../common/hooks/use_selector';
 import { useCreateTimelineButton } from '../properties/use_create_timeline';
 import { TimelineType } from '../../../../../common/types/timeline';
 import * as i18n from './translations';
 
 jest.mock('../../../../common/hooks/use_selector', () => ({
-  useShallowEqualSelector: jest.fn(),
-}));
-
-jest.mock('../../../../timelines/store/timeline', () => ({
-  timelineSelectors: {
-    selectTimeline: jest.fn(),
-  },
+  useDeepEqualSelector: jest.fn(),
 }));
 
 jest.mock('../properties/use_create_timeline', () => ({
@@ -47,7 +41,7 @@ describe('TimelineTitleAndDescription', () => {
     const mockGetButton = jest.fn().mockReturnValue(<div data-test-subj="mock-discard-button" />);
 
     beforeEach(() => {
-      (useShallowEqualSelector as jest.Mock).mockReturnValue({
+      (useDeepEqualSelector as jest.Mock).mockReturnValue({
         description: '',
         isSaving: true,
         savedObjectId: null,
@@ -60,7 +54,7 @@ describe('TimelineTitleAndDescription', () => {
     });
 
     afterEach(() => {
-      (useShallowEqualSelector as jest.Mock).mockReset();
+      (useDeepEqualSelector as jest.Mock).mockReset();
       (useCreateTimelineButton as jest.Mock).mockReset();
       mockGetButton.mockClear();
     });
@@ -78,7 +72,7 @@ describe('TimelineTitleAndDescription', () => {
     });
 
     test('Show correct header for save timeline template modal', () => {
-      (useShallowEqualSelector as jest.Mock).mockReturnValue({
+      (useDeepEqualSelector as jest.Mock).mockReturnValue({
         description: '',
         isSaving: true,
         savedObjectId: null,
@@ -124,7 +118,7 @@ describe('TimelineTitleAndDescription', () => {
     const mockGetButton = jest.fn().mockReturnValue(<div data-test-subj="mock-discard-button" />);
 
     beforeEach(() => {
-      (useShallowEqualSelector as jest.Mock).mockReturnValue({
+      (useDeepEqualSelector as jest.Mock).mockReturnValue({
         description: 'xxxx',
         isSaving: true,
         savedObjectId: '1234',
@@ -137,7 +131,7 @@ describe('TimelineTitleAndDescription', () => {
     });
 
     afterEach(() => {
-      (useShallowEqualSelector as jest.Mock).mockReset();
+      (useDeepEqualSelector as jest.Mock).mockReset();
       (useCreateTimelineButton as jest.Mock).mockReset();
       mockGetButton.mockClear();
     });
@@ -155,7 +149,7 @@ describe('TimelineTitleAndDescription', () => {
     });
 
     test('Show correct header for save timeline template modal', () => {
-      (useShallowEqualSelector as jest.Mock).mockReturnValue({
+      (useDeepEqualSelector as jest.Mock).mockReturnValue({
         description: 'xxxx',
         isSaving: true,
         savedObjectId: '1234',
@@ -197,7 +191,7 @@ describe('TimelineTitleAndDescription', () => {
     const mockGetButton = jest.fn().mockReturnValue(<div data-test-subj="mock-discard-button" />);
 
     beforeEach(() => {
-      (useShallowEqualSelector as jest.Mock).mockReturnValue({
+      (useDeepEqualSelector as jest.Mock).mockReturnValue({
         description: '',
         isSaving: true,
         savedObjectId: null,
@@ -211,7 +205,7 @@ describe('TimelineTitleAndDescription', () => {
     });
 
     afterEach(() => {
-      (useShallowEqualSelector as jest.Mock).mockReset();
+      (useDeepEqualSelector as jest.Mock).mockReset();
       (useCreateTimelineButton as jest.Mock).mockReset();
       mockGetButton.mockClear();
     });
@@ -237,7 +231,7 @@ describe('TimelineTitleAndDescription', () => {
     });
 
     test('get discardTimelineTemplateButton with correct props', () => {
-      (useShallowEqualSelector as jest.Mock).mockReturnValue({
+      (useDeepEqualSelector as jest.Mock).mockReturnValue({
         description: 'xxxx',
         isSaving: true,
         savedObjectId: null,
diff --git a/x-pack/plugins/security_solution/public/timelines/components/timeline/header/title_and_description.tsx b/x-pack/plugins/security_solution/public/timelines/components/timeline/header/title_and_description.tsx
index eca889a788bca..72e7778347f44 100644
--- a/x-pack/plugins/security_solution/public/timelines/components/timeline/header/title_and_description.tsx
+++ b/x-pack/plugins/security_solution/public/timelines/components/timeline/header/title_and_description.tsx
@@ -15,11 +15,11 @@ import {
   EuiProgress,
   EuiCallOut,
 } from '@elastic/eui';
-import React, { useCallback, useEffect, useMemo, useRef } from 'react';
+import React, { useCallback, useEffect, useMemo, useState, useRef } from 'react';
 import { useDispatch } from 'react-redux';
 import styled from 'styled-components';
 import { TimelineType } from '../../../../../common/types/timeline';
-import { useShallowEqualSelector } from '../../../../common/hooks/use_selector';
+import { useDeepEqualSelector } from '../../../../common/hooks/use_selector';
 import { timelineActions, timelineSelectors } from '../../../../timelines/store/timeline';
 import { TimelineInput } from '../../../store/timeline/actions';
 import { Description, Name } from '../properties/helpers';
@@ -62,9 +62,10 @@ const usePrevious = (value: unknown) => {
 // the unsaved timeline / template
 export const TimelineTitleAndDescription = React.memo<TimelineTitleAndDescriptionProps>(
   ({ timelineId, toggleSaveTimeline, showWarning }) => {
-    const timeline = useShallowEqualSelector((state) =>
-      timelineSelectors.selectTimeline(state, timelineId)
-    );
+    // TODO: Refactor to use useForm() instead
+    const [isFormSubmitted, setFormSubmitted] = useState(false);
+    const getTimeline = useMemo(() => timelineSelectors.getTimelineByIdSelector(), []);
+    const timeline = useDeepEqualSelector((state) => getTimeline(state, timelineId));
 
     const { isSaving, savedObjectId, title, timelineType } = timeline;
 
@@ -76,10 +77,12 @@ export const TimelineTitleAndDescription = React.memo<TimelineTitleAndDescriptio
     );
 
     const handleClick = useCallback(() => {
+      // TODO: Refactor action to take only title and description as params not the whole timeline
       onSaveTimeline({
         ...timeline,
         id: timelineId,
       });
+      setFormSubmitted(true);
     }, [onSaveTimeline, timeline, timelineId]);
 
     const { getButton } = useCreateTimelineButton({ timelineId, timelineType });
@@ -99,10 +102,10 @@ export const TimelineTitleAndDescription = React.memo<TimelineTitleAndDescriptio
     );
 
     useEffect(() => {
-      if (!isSaving && prevIsSaving) {
+      if (isFormSubmitted && !isSaving && prevIsSaving) {
         toggleSaveTimeline();
       }
-    }, [isSaving, prevIsSaving, toggleSaveTimeline]);
+    }, [isFormSubmitted, isSaving, prevIsSaving, toggleSaveTimeline]);
 
     const modalHeader =
       savedObjectId == null
diff --git a/x-pack/plugins/security_solution/public/timelines/components/timeline/index.tsx b/x-pack/plugins/security_solution/public/timelines/components/timeline/index.tsx
index 6b27eea64aeb9..37145b9348ac1 100644
--- a/x-pack/plugins/security_solution/public/timelines/components/timeline/index.tsx
+++ b/x-pack/plugins/security_solution/public/timelines/components/timeline/index.tsx
@@ -17,7 +17,7 @@ import { useSourcererScope } from '../../../common/containers/sourcerer';
 import { SourcererScopeName } from '../../../common/store/sourcerer/model';
 import { FlyoutHeader, FlyoutHeaderPanel } from '../flyout/header';
 import { TimelineType } from '../../../../common/types/timeline';
-import { useDeepEqualSelector } from '../../../common/hooks/use_selector';
+import { useDeepEqualSelector, useShallowEqualSelector } from '../../../common/hooks/use_selector';
 import { activeTimeline } from '../../containers/active_timeline_context';
 import * as i18n from './translations';
 import { TabsContent } from './tabs_content';
@@ -40,13 +40,24 @@ export interface Props {
   timelineId: string;
 }
 
+const TimelineSavingProgressComponent: React.FC<Props> = ({ timelineId }) => {
+  const getTimeline = useMemo(() => timelineSelectors.getTimelineByIdSelector(), []);
+  const isSaving = useShallowEqualSelector(
+    (state) => (getTimeline(state, timelineId) ?? timelineDefaults).isSaving
+  );
+
+  return isSaving ? <EuiProgress size="s" color="primary" position="absolute" /> : null;
+};
+
+const TimelineSavingProgress = React.memo(TimelineSavingProgressComponent);
+
 const StatefulTimelineComponent: React.FC<Props> = ({ timelineId }) => {
   const dispatch = useDispatch();
   const getTimeline = useMemo(() => timelineSelectors.getTimelineByIdSelector(), []);
   const { selectedPatterns } = useSourcererScope(SourcererScopeName.timeline);
-  const { graphEventId, isSaving, savedObjectId, timelineType } = useDeepEqualSelector((state) =>
+  const { graphEventId, savedObjectId, timelineType } = useDeepEqualSelector((state) =>
     pick(
-      ['graphEventId', 'isSaving', 'savedObjectId', 'timelineType'],
+      ['graphEventId', 'savedObjectId', 'timelineType'],
       getTimeline(state, timelineId) ?? timelineDefaults
     )
   );
@@ -68,7 +79,7 @@ const StatefulTimelineComponent: React.FC<Props> = ({ timelineId }) => {
 
   return (
     <TimelineContainer data-test-subj="timeline">
-      {isSaving && <EuiProgress size="s" color="primary" position="absolute" />}
+      <TimelineSavingProgress timelineId={timelineId} />
       {timelineType === TimelineType.template && (
         <TimelineTemplateBadge>{i18n.TIMELINE_TEMPLATE}</TimelineTemplateBadge>
       )}
diff --git a/x-pack/plugins/security_solution/public/timelines/components/timeline/properties/helpers.tsx b/x-pack/plugins/security_solution/public/timelines/components/timeline/properties/helpers.tsx
index bc83d42d31c98..494b3cefba6f1 100644
--- a/x-pack/plugins/security_solution/public/timelines/components/timeline/properties/helpers.tsx
+++ b/x-pack/plugins/security_solution/public/timelines/components/timeline/properties/helpers.tsx
@@ -79,6 +79,7 @@ const AddToFavoritesButtonComponent: React.FC<AddToFavoritesButtonProps> = ({ ti
       fill={isFavorite}
       iconType={isFavorite ? 'starFilled' : 'starEmpty'}
       onClick={handleClick}
+      data-test-subj={`timeline-favorite-${isFavorite ? 'filled' : 'empty'}-star`}
     >
       {isFavorite ? i18n.REMOVE_FROM_FAVORITES : i18n.ADD_TO_FAVORITES}
     </EuiButton>
diff --git a/x-pack/plugins/security_solution/public/timelines/components/timeline/tabs_content/index.tsx b/x-pack/plugins/security_solution/public/timelines/components/timeline/tabs_content/index.tsx
index 14c6275e792c5..c9c2b1b1c2af9 100644
--- a/x-pack/plugins/security_solution/public/timelines/components/timeline/tabs_content/index.tsx
+++ b/x-pack/plugins/security_solution/public/timelines/components/timeline/tabs_content/index.tsx
@@ -61,41 +61,42 @@ const PinnedTab: React.FC<BasicTimelineTab> = memo(({ timelineId }) => (
 ));
 PinnedTab.displayName = 'PinnedTab';
 
-const ActiveTimelineTab: React.FC<BasicTimelineTab & { activeTimelineTab: TimelineTabs }> = memo(
-  ({ activeTimelineTab, timelineId }) => {
-    const getTab = useCallback(
-      (tab: TimelineTabs) => {
-        switch (tab) {
-          case TimelineTabs.graph:
-            return <GraphTab timelineId={timelineId} />;
-          case TimelineTabs.notes:
-            return <NotesTab timelineId={timelineId} />;
-          case TimelineTabs.pinned:
-            return <PinnedTab timelineId={timelineId} />;
-          default:
-            return null;
-        }
-      },
-      [timelineId]
-    );
-
-    /* Future developer -> why are we doing that
-     * It is really expansive to re-render the QueryTab because the drag/drop
-     * Therefore, we are only hiding its dom when switching to another tab
-     * to avoid mounting/un-mounting === re-render
-     */
-    return (
-      <>
-        <HideShowContainer $isVisible={TimelineTabs.query === activeTimelineTab}>
-          <QueryTab timelineId={timelineId} />
-        </HideShowContainer>
-        <HideShowContainer $isVisible={TimelineTabs.query !== activeTimelineTab}>
-          {activeTimelineTab !== TimelineTabs.query && getTab(activeTimelineTab)}
-        </HideShowContainer>
-      </>
-    );
-  }
-);
+type ActiveTimelineTabProps = BasicTimelineTab & { activeTimelineTab: TimelineTabs };
+
+const ActiveTimelineTab = memo<ActiveTimelineTabProps>(({ activeTimelineTab, timelineId }) => {
+  const getTab = useCallback(
+    (tab: TimelineTabs) => {
+      switch (tab) {
+        case TimelineTabs.graph:
+          return <GraphTab timelineId={timelineId} />;
+        case TimelineTabs.notes:
+          return <NotesTab timelineId={timelineId} />;
+        case TimelineTabs.pinned:
+          return <PinnedTab timelineId={timelineId} />;
+        default:
+          return null;
+      }
+    },
+    [timelineId]
+  );
+
+  /* Future developer -> why are we doing that
+   * It is really expansive to re-render the QueryTab because the drag/drop
+   * Therefore, we are only hiding its dom when switching to another tab
+   * to avoid mounting/un-mounting === re-render
+   */
+  return (
+    <>
+      <HideShowContainer $isVisible={TimelineTabs.query === activeTimelineTab}>
+        <QueryTab timelineId={timelineId} />
+      </HideShowContainer>
+      <HideShowContainer $isVisible={TimelineTabs.query !== activeTimelineTab}>
+        {activeTimelineTab !== TimelineTabs.query && getTab(activeTimelineTab)}
+      </HideShowContainer>
+    </>
+  );
+});
+
 ActiveTimelineTab.displayName = 'ActiveTimelineTab';
 
 const TabsContentComponent: React.FC<BasicTimelineTab> = ({ timelineId, graphEventId }) => {
@@ -145,6 +146,7 @@ const TabsContentComponent: React.FC<BasicTimelineTab> = ({ timelineId, graphEve
     <>
       <EuiTabs>
         <EuiTab
+          data-test-subj={`timelineTabs-${TimelineTabs.query}`}
           onClick={setQueryAsActiveTab}
           isSelected={activeTab === TimelineTabs.query}
           disabled={false}
@@ -153,6 +155,7 @@ const TabsContentComponent: React.FC<BasicTimelineTab> = ({ timelineId, graphEve
           {i18n.QUERY_TAB}
         </EuiTab>
         <EuiTab
+          data-test-subj={`timelineTabs-${TimelineTabs.graph}`}
           onClick={setGraphAsActiveTab}
           isSelected={activeTab === TimelineTabs.graph}
           disabled={!graphEventId}
@@ -161,6 +164,7 @@ const TabsContentComponent: React.FC<BasicTimelineTab> = ({ timelineId, graphEve
           {i18n.GRAPH_TAB}
         </EuiTab>
         <EuiTab
+          data-test-subj={`timelineTabs-${TimelineTabs.notes}`}
           onClick={setNotesAsActiveTab}
           isSelected={activeTab === TimelineTabs.notes}
           disabled={false}
@@ -169,6 +173,7 @@ const TabsContentComponent: React.FC<BasicTimelineTab> = ({ timelineId, graphEve
           {i18n.NOTES_TAB}
         </EuiTab>
         <EuiTab
+          data-test-subj={`timelineTabs-${TimelineTabs.pinned}`}
           onClick={setPinnedAsActiveTab}
           isSelected={activeTab === TimelineTabs.pinned}
           disabled={true}
diff --git a/x-pack/plugins/translations/translations/ja-JP.json b/x-pack/plugins/translations/translations/ja-JP.json
index 9df495717b431..1f36a5a71537b 100644
--- a/x-pack/plugins/translations/translations/ja-JP.json
+++ b/x-pack/plugins/translations/translations/ja-JP.json
@@ -11425,12 +11425,7 @@
     "xpack.maps.styles.dynamicColorSelect.qualitativeOrQuantitativeAriaLabel": "「番号として」を選択して色範囲内の番号でマップするか、または「カテゴリーとして」を選択してカラーパレットで分類します。",
     "xpack.maps.styles.dynamicColorSelect.quantitativeLabel": "番号として",
     "xpack.maps.styles.fieldMetaOptions.isEnabled.categoricalLabel": "インデックスからカテゴリーを取得",
-    "xpack.maps.styles.fieldMetaOptions.isEnabled.colorLabel": "インデックスからカラーランプ範囲を計算",
-    "xpack.maps.styles.fieldMetaOptions.isEnabled.defaultLabel": "インデックスからシンボル化範囲を計算",
-    "xpack.maps.styles.fieldMetaOptions.isEnabled.sizeLabel": "インデックスからシンボルサイズを計算",
-    "xpack.maps.styles.fieldMetaOptions.isEnabled.widthLabel": "インデックスから枠線幅を計算",
     "xpack.maps.styles.fieldMetaOptions.popoverToggle": "フィールドメタオプションポップオーバー切り替え",
-    "xpack.maps.styles.fieldMetaOptions.sigmaLabel": "シグマ",
     "xpack.maps.styles.icon.customMapLabel": "カスタムアイコンパレット",
     "xpack.maps.styles.iconStops.deleteButtonAriaLabel": "削除",
     "xpack.maps.styles.iconStops.deleteButtonLabel": "削除",
@@ -13598,8 +13593,6 @@
     "xpack.monitoring.alerts.clusterHealth.firing.internalShortMessage": "クラスター正常性アラートが{clusterName}に対して作動しています。現在の正常性は{health}です。{actionText}",
     "xpack.monitoring.alerts.clusterHealth.label": "クラスターの正常性",
     "xpack.monitoring.alerts.clusterHealth.redMessage": "見つからないプライマリおよびレプリカシャードを割り当て",
-    "xpack.monitoring.alerts.clusterHealth.resolved.internalFullMessage": "クラスター正常性アラートが{clusterName}に対して作動しています。",
-    "xpack.monitoring.alerts.clusterHealth.resolved.internalShortMessage": "クラスター正常性アラートが{clusterName}に対して作動しています。",
     "xpack.monitoring.alerts.clusterHealth.ui.firingMessage": "Elasticsearchクラスターの正常性は{health}です。",
     "xpack.monitoring.alerts.clusterHealth.ui.nextSteps.message1": "{message}. #start_linkView now#end_link",
     "xpack.monitoring.alerts.clusterHealth.yellowMessage": "見つからないレプリカシャードを割り当て",
@@ -13611,13 +13604,10 @@
     "xpack.monitoring.alerts.cpuUsage.label": "CPU使用状況",
     "xpack.monitoring.alerts.cpuUsage.paramDetails.duration.label": "平均を確認",
     "xpack.monitoring.alerts.cpuUsage.paramDetails.threshold.label": "CPUが終了したときに通知",
-    "xpack.monitoring.alerts.cpuUsage.resolved.internalFullMessage": "CPU使用状況アラートは、クラスター{clusterName}の{count}個のノードで解決されました。",
-    "xpack.monitoring.alerts.cpuUsage.resolved.internalShortMessage": "CPU使用状況アラートは、クラスター{clusterName}の{count}個のノードで解決されました。",
     "xpack.monitoring.alerts.cpuUsage.shortAction": "影響を受けるノード全体のCPUレベルを検証します。",
     "xpack.monitoring.alerts.cpuUsage.ui.firingMessage": "ノード#start_link{nodeName}#end_linkは、#absoluteでCPU使用率{cpuUsage}%を報告しています",
     "xpack.monitoring.alerts.cpuUsage.ui.nextSteps.hotThreads": "#start_linkCheck hot threads#end_link",
     "xpack.monitoring.alerts.cpuUsage.ui.nextSteps.runningTasks": "#start_linkCheck long running tasks#end_link",
-    "xpack.monitoring.alerts.cpuUsage.ui.resolvedMessage": "ノード{nodeName}でのCPU使用状況は現在しきい値を下回っています。現在、#resolved時点で、{cpuUsage}%と報告されています。",
     "xpack.monitoring.alerts.diskUsage.actionVariables.count": "高ディスク使用率を報告しているノード数。",
     "xpack.monitoring.alerts.diskUsage.actionVariables.nodes": "高ディスク使用率を報告しているノードのリスト。",
     "xpack.monitoring.alerts.diskUsage.firing.internalFullMessage": "ディスク使用状況アラートは、クラスター{clusterName}の{count}個のノードで実行されています。{action}",
@@ -13626,7 +13616,6 @@
     "xpack.monitoring.alerts.diskUsage.label": "ディスク使用量",
     "xpack.monitoring.alerts.diskUsage.paramDetails.duration.label": "平均を確認",
     "xpack.monitoring.alerts.diskUsage.paramDetails.threshold.label": "ディスク容量が超過したときに通知",
-    "xpack.monitoring.alerts.diskUsage.resolved.internalMessage": "ディスク使用状況アラートは、クラスター{clusterName}の{count}個のノードで解決されました。",
     "xpack.monitoring.alerts.diskUsage.shortAction": "影響を受けるノード全体のディスク使用状況レベルを検証します。",
     "xpack.monitoring.alerts.diskUsage.ui.firingMessage": "ノード#start_link{nodeName}#end_linkは、#absoluteでディスク使用率{diskUsage}%を報告しています",
     "xpack.monitoring.alerts.diskUsage.ui.nextSteps.addMoreNodes": "#start_linkその他のデータノードを追加#end_link",
@@ -13634,17 +13623,13 @@
     "xpack.monitoring.alerts.diskUsage.ui.nextSteps.ilmPolicies": "#start_linkILMポリシーを導入#end_link",
     "xpack.monitoring.alerts.diskUsage.ui.nextSteps.resizeYourDeployment": "#start_linkデプロイのサイズを変更（ECE）#end_link",
     "xpack.monitoring.alerts.diskUsage.ui.nextSteps.tuneDisk": "#start_linkディスク使用状況の最適化#end_link",
-    "xpack.monitoring.alerts.diskUsage.ui.resolvedMessage": "ノード{nodeName}でのディスク使用状況は現在しきい値を下回っています。現在、#resolved時点で、{diskUsage}%と報告されています。",
     "xpack.monitoring.alerts.elasticsearchVersionMismatch.actionVariables.clusterHealth": "このクラスターを実行しているElasticsearchのバージョン。",
     "xpack.monitoring.alerts.elasticsearchVersionMismatch.firing.internalFullMessage": "{clusterName}に対してElasticsearchバージョン不一致アラートが実行されています。Elasticsearchは{versions}を実行しています。{action}",
     "xpack.monitoring.alerts.elasticsearchVersionMismatch.firing.internalShortMessage": "{clusterName}に対してElasticsearchバージョン不一致アラートが実行されています。{shortActionText}",
     "xpack.monitoring.alerts.elasticsearchVersionMismatch.fullAction": "ノードの表示",
     "xpack.monitoring.alerts.elasticsearchVersionMismatch.label": "Elasticsearchバージョン不一致",
-    "xpack.monitoring.alerts.elasticsearchVersionMismatch.resolved.internalFullMessage": "{clusterName}のElasticsearchバージョン不一致アラートが解決されました。",
-    "xpack.monitoring.alerts.elasticsearchVersionMismatch.resolved.internalShortMessage": "{clusterName}のElasticsearchバージョン不一致アラートが解決されました。",
     "xpack.monitoring.alerts.elasticsearchVersionMismatch.shortAction": "すべてのノードのバージョンが同じことを確認してください。",
     "xpack.monitoring.alerts.elasticsearchVersionMismatch.ui.firingMessage": "このクラスターでは、複数のバージョンのElasticsearch（{versions}）が実行されています。",
-    "xpack.monitoring.alerts.elasticsearchVersionMismatch.ui.resolvedMessage": "このクラスターではすべてのElasticsearchのバージョンが同じです。",
     "xpack.monitoring.alerts.flyoutExpressions.timeUnits.dayLabel": "{timeValue, plural, one {日} other {日}}",
     "xpack.monitoring.alerts.flyoutExpressions.timeUnits.hourLabel": "{timeValue, plural, one {時間} other {時間}}",
     "xpack.monitoring.alerts.flyoutExpressions.timeUnits.minuteLabel": "{timeValue, plural, one {分} other {分}}",
@@ -13655,11 +13640,8 @@
     "xpack.monitoring.alerts.kibanaVersionMismatch.firing.internalShortMessage": "{clusterName}に対してKibanaバージョン不一致アラートが実行されています。{shortActionText}",
     "xpack.monitoring.alerts.kibanaVersionMismatch.fullAction": "インスタンスを表示",
     "xpack.monitoring.alerts.kibanaVersionMismatch.label": "Kibanaバージョン不一致",
-    "xpack.monitoring.alerts.kibanaVersionMismatch.resolved.internalFullMessage": "{clusterName}のKibanaバージョン不一致アラートが解決されました。",
-    "xpack.monitoring.alerts.kibanaVersionMismatch.resolved.internalShortMessage": "{clusterName}のKibanaバージョン不一致アラートが解決されました。",
     "xpack.monitoring.alerts.kibanaVersionMismatch.shortAction": "すべてのインスタンスのバージョンが同じことを確認してください。",
     "xpack.monitoring.alerts.kibanaVersionMismatch.ui.firingMessage": "このクラスターでは、複数のバージョンのKibana（{versions}）が実行されています。",
-    "xpack.monitoring.alerts.kibanaVersionMismatch.ui.resolvedMessage": "このクラスターではすべてのKibanaのバージョンが同じです。",
     "xpack.monitoring.alerts.legacyAlert.expressionText": "構成するものがありません。",
     "xpack.monitoring.alerts.licenseExpiration.action": "ライセンスを更新してください。",
     "xpack.monitoring.alerts.licenseExpiration.actionVariables.clusterName": "ライセンスが属しているクラスター。",
@@ -13667,20 +13649,14 @@
     "xpack.monitoring.alerts.licenseExpiration.firing.internalFullMessage": "ライセンス有効期限アラートが{clusterName}に対して実行されています。ライセンスは{expiredDate}に期限切れになります。{action}",
     "xpack.monitoring.alerts.licenseExpiration.firing.internalShortMessage": "{clusterName}に対してライセンス有効期限アラートが実行されています。ライセンスは{expiredDate}に期限切れになります。{actionText}",
     "xpack.monitoring.alerts.licenseExpiration.label": "ライセンス期限",
-    "xpack.monitoring.alerts.licenseExpiration.resolved.internalFullMessage": "{clusterName}のライセンス有効期限アラートが解決されました。",
-    "xpack.monitoring.alerts.licenseExpiration.resolved.internalShortMessage": "{clusterName}のライセンス有効期限アラートが解決されました。",
     "xpack.monitoring.alerts.licenseExpiration.ui.firingMessage": "このクラスターのライセンスは#absoluteの#relativeに期限切れになります。#start_linkライセンスを更新してください。#end_link",
-    "xpack.monitoring.alerts.licenseExpiration.ui.resolvedMessage": "このクラスターのライセンスは有効です。",
     "xpack.monitoring.alerts.logstashVersionMismatch.actionVariables.clusterHealth": "このクラスターを実行しているLogstashのバージョン。",
     "xpack.monitoring.alerts.logstashVersionMismatch.firing.internalFullMessage": "{clusterName}に対してLogstashバージョン不一致アラートが実行されています。Logstashは{versions}を実行しています。{action}",
     "xpack.monitoring.alerts.logstashVersionMismatch.firing.internalShortMessage": "{clusterName}に対してLogstashバージョン不一致アラートが実行されています。{shortActionText}",
     "xpack.monitoring.alerts.logstashVersionMismatch.fullAction": "ノードの表示",
     "xpack.monitoring.alerts.logstashVersionMismatch.label": "Logstashバージョン不一致",
-    "xpack.monitoring.alerts.logstashVersionMismatch.resolved.internalFullMessage": "{clusterName}のLogstashバージョン不一致アラートが解決されました。",
-    "xpack.monitoring.alerts.logstashVersionMismatch.resolved.internalShortMessage": "{clusterName}のLogstashバージョン不一致アラートが解決されました。",
     "xpack.monitoring.alerts.logstashVersionMismatch.shortAction": "すべてのノードのバージョンが同じことを確認してください。",
     "xpack.monitoring.alerts.logstashVersionMismatch.ui.firingMessage": "このクラスターでは、複数のバージョンのLogstash（{versions}）が実行されています。",
-    "xpack.monitoring.alerts.logstashVersionMismatch.ui.resolvedMessage": "このクラスターではすべてのLogstashのバージョンが同じです。",
     "xpack.monitoring.alerts.memoryUsage.actionVariables.count": "高メモリー使用率を報告しているノード数。",
     "xpack.monitoring.alerts.memoryUsage.actionVariables.nodes": "高メモリー使用率を報告しているノードのリスト。",
     "xpack.monitoring.alerts.memoryUsage.firing.internalFullMessage": "メモリー使用状況アラートは、クラスター{clusterName}の{count}個のノードで実行されています。{action}",
@@ -13689,7 +13665,6 @@
     "xpack.monitoring.alerts.memoryUsage.label": "メモリー使用状況（JVM）",
     "xpack.monitoring.alerts.memoryUsage.paramDetails.duration.label": "平均を確認",
     "xpack.monitoring.alerts.memoryUsage.paramDetails.threshold.label": "メモリー使用状況が超過したときに通知",
-    "xpack.monitoring.alerts.memoryUsage.resolved.internalMessage": "メモリー使用状況アラートは、クラスター{clusterName}の{count}個のノードで解決されました。",
     "xpack.monitoring.alerts.memoryUsage.shortAction": "影響を受けるノード全体のメモリー使用状況レベルを検証します。",
     "xpack.monitoring.alerts.memoryUsage.ui.firingMessage": "ノード#start_link{nodeName}#end_linkは、#absoluteでJVMメモリー使用率{memoryUsage}%を報告しています",
     "xpack.monitoring.alerts.memoryUsage.ui.nextSteps.addMoreNodes": "#start_linkその他のデータノードを追加#end_link",
@@ -13697,26 +13672,15 @@
     "xpack.monitoring.alerts.memoryUsage.ui.nextSteps.managingHeap": "#start_linkESヒープの管理#end_link",
     "xpack.monitoring.alerts.memoryUsage.ui.nextSteps.resizeYourDeployment": "#start_linkデプロイのサイズを変更（ECE）#end_link",
     "xpack.monitoring.alerts.memoryUsage.ui.nextSteps.tuneThreadPools": "#start_linkスレッドプールの微調整#end_link",
-    "xpack.monitoring.alerts.memoryUsage.ui.resolvedMessage": "ノード{nodeName}でのJVMメモリー使用状況は現在しきい値を下回っています。現在、#resolved時点で、{memoryUsage}%と報告されています。",
     "xpack.monitoring.alerts.migrate.manageAction.requiredFieldError": "{field} は必須フィールドです。",
     "xpack.monitoring.alerts.missingData.actionVariables.count": "監視データが見つからないスタック製品数。",
-    "xpack.monitoring.alerts.missingData.actionVariables.stackProducts": "監視データが見つからないスタック製品。",
-    "xpack.monitoring.alerts.missingData.firing": "実行中",
     "xpack.monitoring.alerts.missingData.firing.internalFullMessage": "クラスター{clusterName}では、{count}個のスタック製品の監視データが検出されませんでした。{action}",
     "xpack.monitoring.alerts.missingData.firing.internalShortMessage": "クラスター{clusterName}では、{count}個のスタック製品の監視データが検出されませんでした。{shortActionText}",
     "xpack.monitoring.alerts.missingData.fullAction": "これらのスタック製品に関連する監視データを表示します。",
     "xpack.monitoring.alerts.missingData.label": "見つからない監視データ",
     "xpack.monitoring.alerts.missingData.paramDetails.duration.label": "監視データが見つからない場合に通知",
     "xpack.monitoring.alerts.missingData.paramDetails.limit.label": "遡って監視データを検索",
-    "xpack.monitoring.alerts.missingData.resolved": "解決済み",
-    "xpack.monitoring.alerts.missingData.resolved.internalFullMessage": "クラスター{clusterName}では、{count}個のスタック製品の監視データが確認されています。",
-    "xpack.monitoring.alerts.missingData.resolved.internalShortMessage": "クラスター{clusterName}では、{count}個のスタック製品の監視データが確認されています。",
     "xpack.monitoring.alerts.missingData.shortAction": "これらのスタック製品が起動して実行中であることを検証してから、監視設定を確認してください。",
-    "xpack.monitoring.alerts.missingData.ui.firingMessage": "#absolute以降、過去{gapDuration}には、{stackProduct} {type}: {stackProductName}から監視データが検出されていません。",
-    "xpack.monitoring.alerts.missingData.ui.nextSteps.verifySettings": "{type}で監視設定を検証",
-    "xpack.monitoring.alerts.missingData.ui.nextSteps.viewAll": "#start_linkすべての{stackProduct} {type}を表示#end_link",
-    "xpack.monitoring.alerts.missingData.ui.notQuiteResolvedMessage": "まだ{stackProduct} {type}：{stackProductName}の監視データが確認されていません。試行を停止します。これを変更するには、さらに過去のデータを検索するようにアラートを構成します。",
-    "xpack.monitoring.alerts.missingData.ui.resolvedMessage": "#resolved時点では、{stackProduct} {type}: {stackProductName}の監視データが確認されています。",
     "xpack.monitoring.alerts.missingData.validation.duration": "有効な期間が必要です。",
     "xpack.monitoring.alerts.missingData.validation.limit": "有効な上限が必要です。",
     "xpack.monitoring.alerts.nodesChanged.actionVariables.added": "ノードのリストがクラスターに追加されました。",
@@ -13726,8 +13690,6 @@
     "xpack.monitoring.alerts.nodesChanged.firing.internalShortMessage": "{clusterName}に対してノード変更アラートが実行されています。{shortActionText}",
     "xpack.monitoring.alerts.nodesChanged.fullAction": "ノードの表示",
     "xpack.monitoring.alerts.nodesChanged.label": "ノードが変更されました",
-    "xpack.monitoring.alerts.nodesChanged.resolved.internalFullMessage": "{clusterName}のElasticsearchノード変更アラートが解決されました。",
-    "xpack.monitoring.alerts.nodesChanged.resolved.internalShortMessage": "{clusterName}のElasticsearchノード変更アラートが解決されました。",
     "xpack.monitoring.alerts.nodesChanged.shortAction": "ノードを追加、削除、または再起動したことを確認してください。",
     "xpack.monitoring.alerts.nodesChanged.ui.addedFiringMessage": "Elasticsearchノード「{added}」がこのクラスターに追加されました。",
     "xpack.monitoring.alerts.nodesChanged.ui.nothingDetectedFiringMessage": "Elasticsearchノードが変更されました",
@@ -13742,19 +13704,12 @@
     "xpack.monitoring.alerts.panel.muteTitle": "ミュート",
     "xpack.monitoring.alerts.panel.ummuteAlert.errorTitle": "アラートをミュート解除できません",
     "xpack.monitoring.alerts.state.firing": "実行中",
-    "xpack.monitoring.alerts.state.resolved": "解決済み",
     "xpack.monitoring.alerts.status.alertsTooltip": "アラート",
     "xpack.monitoring.alerts.status.clearText": "クリア",
     "xpack.monitoring.alerts.status.clearToolip": "アラートは実行されていません",
     "xpack.monitoring.alerts.status.highSeverityTooltip": "すぐに対処が必要な致命的な問題があります！",
     "xpack.monitoring.alerts.status.lowSeverityTooltip": "低重要度の問題があります",
     "xpack.monitoring.alerts.status.mediumSeverityTooltip": "スタックに影響を及ぼす可能性がある問題があります。",
-    "xpack.monitoring.alerts.typeLabel.instance": "インスタンス",
-    "xpack.monitoring.alerts.typeLabel.instances": "インスタンス",
-    "xpack.monitoring.alerts.typeLabel.node": "ノード",
-    "xpack.monitoring.alerts.typeLabel.nodes": "ノード",
-    "xpack.monitoring.alerts.typeLabel.server": "サーバー",
-    "xpack.monitoring.alerts.typeLabel.servers": "サーバー",
     "xpack.monitoring.alerts.validation.duration": "有効な期間が必要です。",
     "xpack.monitoring.alerts.validation.threshold": "有効な数字が必要です。",
     "xpack.monitoring.apm.healthStatusLabel": "ヘルス: {status}",
@@ -13808,7 +13763,6 @@
     "xpack.monitoring.beats.instance.typeLabel": "タイプ",
     "xpack.monitoring.beats.instance.uptimeLabel": "起動時間",
     "xpack.monitoring.beats.instance.versionLabel": "バージョン",
-    "xpack.monitoring.beats.instances.alertsColumnTitle": "アラート",
     "xpack.monitoring.beats.instances.allocatedMemoryTitle": "割当メモリー",
     "xpack.monitoring.beats.instances.bytesSentRateTitle": "送信バイトレート",
     "xpack.monitoring.beats.instances.nameTitle": "名前",
diff --git a/x-pack/plugins/translations/translations/zh-CN.json b/x-pack/plugins/translations/translations/zh-CN.json
index fc70ada752a94..3151b863cc4a1 100644
--- a/x-pack/plugins/translations/translations/zh-CN.json
+++ b/x-pack/plugins/translations/translations/zh-CN.json
@@ -11438,12 +11438,7 @@
     "xpack.maps.styles.dynamicColorSelect.qualitativeOrQuantitativeAriaLabel": "选择`作为数字`以在颜色范围中按数字映射，或选择`作为类别`以按调色板归类。",
     "xpack.maps.styles.dynamicColorSelect.quantitativeLabel": "作为数字",
     "xpack.maps.styles.fieldMetaOptions.isEnabled.categoricalLabel": "从索引获取类别",
-    "xpack.maps.styles.fieldMetaOptions.isEnabled.colorLabel": "从索引计算颜色渐变范围",
-    "xpack.maps.styles.fieldMetaOptions.isEnabled.defaultLabel": "从索引计算符号化范围",
-    "xpack.maps.styles.fieldMetaOptions.isEnabled.sizeLabel": "从索引计算符号大小范围",
-    "xpack.maps.styles.fieldMetaOptions.isEnabled.widthLabel": "从索引计算边框宽度范围",
     "xpack.maps.styles.fieldMetaOptions.popoverToggle": "字段元数据选项弹出框切换",
-    "xpack.maps.styles.fieldMetaOptions.sigmaLabel": "Sigma",
     "xpack.maps.styles.icon.customMapLabel": "定制图标调色板",
     "xpack.maps.styles.iconStops.deleteButtonAriaLabel": "删除",
     "xpack.maps.styles.iconStops.deleteButtonLabel": "删除",
@@ -13615,11 +13610,8 @@
     "xpack.monitoring.alerts.clusterHealth.firing.internalShortMessage": "为 {clusterName} 触发了集群运行状况告警。当前运行状况为 {health}。{actionText}",
     "xpack.monitoring.alerts.clusterHealth.label": "集群运行状况",
     "xpack.monitoring.alerts.clusterHealth.redMessage": "分配缺失的主分片和副本分片",
-    "xpack.monitoring.alerts.clusterHealth.resolved.internalFullMessage": "已为 {clusterName} 解决集群运行状况告警。",
-    "xpack.monitoring.alerts.clusterHealth.resolved.internalShortMessage": "已为 {clusterName} 解决集群运行状况告警。",
     "xpack.monitoring.alerts.clusterHealth.ui.firingMessage": "Elasticsearch 集群运行状况为 {health}。",
     "xpack.monitoring.alerts.clusterHealth.ui.nextSteps.message1": "{message}。#start_linkView now#end_link",
-    "xpack.monitoring.alerts.clusterHealth.ui.resolvedMessage": "Elasticsearch 集群运行状况为绿色。",
     "xpack.monitoring.alerts.clusterHealth.yellowMessage": "分配缺失的副本分片",
     "xpack.monitoring.alerts.cpuUsage.actionVariables.count": "报告高 CPU 使用率的节点数目。",
     "xpack.monitoring.alerts.cpuUsage.actionVariables.nodes": "报告高 CPU 使用率的节点列表。",
@@ -13629,13 +13621,10 @@
     "xpack.monitoring.alerts.cpuUsage.label": "CPU 使用率",
     "xpack.monitoring.alerts.cpuUsage.paramDetails.duration.label": "查看以下范围的平均值：",
     "xpack.monitoring.alerts.cpuUsage.paramDetails.threshold.label": "CPU 超过以下值时通知：",
-    "xpack.monitoring.alerts.cpuUsage.resolved.internalFullMessage": "已为集群 {clusterName} 中的 {count} 个节点解决 CPU 使用率告警。",
-    "xpack.monitoring.alerts.cpuUsage.resolved.internalShortMessage": "已为集群 {clusterName} 中的 {count} 个节点解决 CPU 使用率告警。",
     "xpack.monitoring.alerts.cpuUsage.shortAction": "跨受影响节点验证 CPU 级别。",
     "xpack.monitoring.alerts.cpuUsage.ui.firingMessage": "节点 #start_link{nodeName}#end_link 于 #absolute报告 cpu 使用率为 {cpuUsage}%",
     "xpack.monitoring.alerts.cpuUsage.ui.nextSteps.hotThreads": "#start_link检查热线程#end_link",
     "xpack.monitoring.alerts.cpuUsage.ui.nextSteps.runningTasks": "#start_link检查长时间运行的任务#end_link",
-    "xpack.monitoring.alerts.cpuUsage.ui.resolvedMessage": "节点 {nodeName} 上的 cpu 使用率现在低于阈值，当前报告截止到 #resolved 为 {cpuUsage}%",
     "xpack.monitoring.alerts.diskUsage.actionVariables.count": "报告高磁盘使用率的节点数目。",
     "xpack.monitoring.alerts.diskUsage.actionVariables.nodes": "报告高磁盘使用率的节点列表。",
     "xpack.monitoring.alerts.diskUsage.firing.internalFullMessage": "为集群 {clusterName} 中的 {count} 个节点触发了磁盘使用率告警。{action}",
@@ -13644,7 +13633,6 @@
     "xpack.monitoring.alerts.diskUsage.label": "磁盘使用率",
     "xpack.monitoring.alerts.diskUsage.paramDetails.duration.label": "查看以下期间的平均值：",
     "xpack.monitoring.alerts.diskUsage.paramDetails.threshold.label": "磁盘容量超过以下值时通知",
-    "xpack.monitoring.alerts.diskUsage.resolved.internalMessage": "为集群 {clusterName} 中的 {count} 个节点解决了磁盘使用率告警。",
     "xpack.monitoring.alerts.diskUsage.shortAction": "验证受影响节点的磁盘使用水平。",
     "xpack.monitoring.alerts.diskUsage.ui.firingMessage": "节点 #start_link{nodeName}#end_link 于 #absolute 报告磁盘使用率为 {diskUsage}%",
     "xpack.monitoring.alerts.diskUsage.ui.nextSteps.addMoreNodes": "#start_link添加更多数据节点#end_link",
@@ -13652,17 +13640,13 @@
     "xpack.monitoring.alerts.diskUsage.ui.nextSteps.ilmPolicies": "#start_link实施 ILM 策略#end_link",
     "xpack.monitoring.alerts.diskUsage.ui.nextSteps.resizeYourDeployment": "#start_link对您的部署进行大小调整 (ECE)#end_link",
     "xpack.monitoring.alerts.diskUsage.ui.nextSteps.tuneDisk": "#start_link调整磁盘使用率#end_link",
-    "xpack.monitoring.alerts.diskUsage.ui.resolvedMessage": "节点 {nodeName} 的磁盘使用率现在低于阈值，截止到 #resolved 目前报告为 {diskUsage}%",
     "xpack.monitoring.alerts.elasticsearchVersionMismatch.actionVariables.clusterHealth": "在此集群中运行的 Elasticsearch 版本。",
     "xpack.monitoring.alerts.elasticsearchVersionMismatch.firing.internalFullMessage": "为 {clusterName} 触发了 Elasticsearch 版本不匹配告警。Elasticsearch 正在运行 {versions}。{action}",
     "xpack.monitoring.alerts.elasticsearchVersionMismatch.firing.internalShortMessage": "为 {clusterName} 触发了 Elasticsearch 版本不匹配告警。{shortActionText}",
     "xpack.monitoring.alerts.elasticsearchVersionMismatch.fullAction": "查看节点",
     "xpack.monitoring.alerts.elasticsearchVersionMismatch.label": "Elasticsearch 版本不匹配",
-    "xpack.monitoring.alerts.elasticsearchVersionMismatch.resolved.internalFullMessage": "为 {clusterName} 解决了 Elasticsearch 版本不匹配告警。",
-    "xpack.monitoring.alerts.elasticsearchVersionMismatch.resolved.internalShortMessage": "为 {clusterName} 解决了 Elasticsearch 版本不匹配告警。",
     "xpack.monitoring.alerts.elasticsearchVersionMismatch.shortAction": "确认所有节点具有相同的版本。",
     "xpack.monitoring.alerts.elasticsearchVersionMismatch.ui.firingMessage": "在此集群中运行的多个 Elasticsearch ({versions}) 版本。",
-    "xpack.monitoring.alerts.elasticsearchVersionMismatch.ui.resolvedMessage": "在此集群中所有 Elasticsearch 版本都相同。",
     "xpack.monitoring.alerts.flyoutExpressions.timeUnits.dayLabel": "{timeValue, plural, one {天} other {天}}",
     "xpack.monitoring.alerts.flyoutExpressions.timeUnits.hourLabel": "{timeValue, plural, one {小时} other {小时}}",
     "xpack.monitoring.alerts.flyoutExpressions.timeUnits.minuteLabel": "{timeValue, plural, one {分钟} other {分钟}}",
@@ -13673,11 +13657,8 @@
     "xpack.monitoring.alerts.kibanaVersionMismatch.firing.internalShortMessage": "为 {clusterName} 触发了 Kibana 版本不匹配告警。{shortActionText}",
     "xpack.monitoring.alerts.kibanaVersionMismatch.fullAction": "查看实例",
     "xpack.monitoring.alerts.kibanaVersionMismatch.label": "Kibana 版本不匹配",
-    "xpack.monitoring.alerts.kibanaVersionMismatch.resolved.internalFullMessage": "为 {clusterName} 解决了 Kibana 版本不匹配告警。",
-    "xpack.monitoring.alerts.kibanaVersionMismatch.resolved.internalShortMessage": "为 {clusterName} 解决了 Kibana 版本不匹配告警。",
     "xpack.monitoring.alerts.kibanaVersionMismatch.shortAction": "确认所有实例具有相同的版本。",
     "xpack.monitoring.alerts.kibanaVersionMismatch.ui.firingMessage": "在此集群中运行着多个 Kibana ({versions}) 版本。",
-    "xpack.monitoring.alerts.kibanaVersionMismatch.ui.resolvedMessage": "在此集群中所有 Kibana 版本都相同。",
     "xpack.monitoring.alerts.legacyAlert.expressionText": "没有可配置的内容。",
     "xpack.monitoring.alerts.licenseExpiration.action": "请更新您的许可证。",
     "xpack.monitoring.alerts.licenseExpiration.actionVariables.clusterName": "许可证所属的集群。",
@@ -13685,20 +13666,14 @@
     "xpack.monitoring.alerts.licenseExpiration.firing.internalFullMessage": "为 {clusterName} 触发了许可证到期告警。您的许可证将于 {expiredDate}到期。{action}",
     "xpack.monitoring.alerts.licenseExpiration.firing.internalShortMessage": "为 {clusterName} 触发了许可证到期告警。您的许可证将于 {expiredDate}到期。{actionText}",
     "xpack.monitoring.alerts.licenseExpiration.label": "许可证到期",
-    "xpack.monitoring.alerts.licenseExpiration.resolved.internalFullMessage": "为 {clusterName} 解决了许可证到期告警。",
-    "xpack.monitoring.alerts.licenseExpiration.resolved.internalShortMessage": "为 {clusterName} 解决了许可证到期告警。",
     "xpack.monitoring.alerts.licenseExpiration.ui.firingMessage": "此集群的许可证将于 #relative后，即 #absolute到期。 #start_link请更新您的许可证。#end_link",
-    "xpack.monitoring.alerts.licenseExpiration.ui.resolvedMessage": "此集群的许可证处于活动状态。",
     "xpack.monitoring.alerts.logstashVersionMismatch.actionVariables.clusterHealth": "此集群中运行的 Logstash 版本。",
     "xpack.monitoring.alerts.logstashVersionMismatch.firing.internalFullMessage": "为 {clusterName} 触发了 Logstash 版本不匹配告警。Logstash 正在运行 {versions}。{action}",
     "xpack.monitoring.alerts.logstashVersionMismatch.firing.internalShortMessage": "为 {clusterName} 触发了 Logstash 版本不匹配告警。{shortActionText}",
     "xpack.monitoring.alerts.logstashVersionMismatch.fullAction": "查看节点",
     "xpack.monitoring.alerts.logstashVersionMismatch.label": "Logstash 版本不匹配",
-    "xpack.monitoring.alerts.logstashVersionMismatch.resolved.internalFullMessage": "为 {clusterName} 解决了 Logstash 版本不匹配告警。",
-    "xpack.monitoring.alerts.logstashVersionMismatch.resolved.internalShortMessage": "为 {clusterName} 解决了 Logstash 版本不匹配告警。",
     "xpack.monitoring.alerts.logstashVersionMismatch.shortAction": "确认所有节点具有相同的版本。",
     "xpack.monitoring.alerts.logstashVersionMismatch.ui.firingMessage": "在此集群中运行着多个 Logstash ({versions}) 版本。",
-    "xpack.monitoring.alerts.logstashVersionMismatch.ui.resolvedMessage": "在此集群中所有 Logstash 版本都相同。",
     "xpack.monitoring.alerts.memoryUsage.actionVariables.count": "报告高内存使用率的节点数目。",
     "xpack.monitoring.alerts.memoryUsage.actionVariables.nodes": "报告高内存使用率的节点列表。",
     "xpack.monitoring.alerts.memoryUsage.firing.internalFullMessage": "为集群 {clusterName} 中的 {count} 个节点触发了内存使用率告警。{action}",
@@ -13707,7 +13682,6 @@
     "xpack.monitoring.alerts.memoryUsage.label": "内存使用率 (JVM)",
     "xpack.monitoring.alerts.memoryUsage.paramDetails.duration.label": "查看以下期间的平均值：",
     "xpack.monitoring.alerts.memoryUsage.paramDetails.threshold.label": "内存使用率超过以下值时通知",
-    "xpack.monitoring.alerts.memoryUsage.resolved.internalMessage": "为集群 {clusterName} 中的 {count} 个节点解决了内存使用率告警。",
     "xpack.monitoring.alerts.memoryUsage.shortAction": "验证受影响节点的内存使用率水平。",
     "xpack.monitoring.alerts.memoryUsage.ui.firingMessage": "节点 #start_link{nodeName}#end_link 将于 #absolute 报告 JVM 内存使用率为 {memoryUsage}%",
     "xpack.monitoring.alerts.memoryUsage.ui.nextSteps.addMoreNodes": "#start_link添加更多数据节点#end_link",
@@ -13715,26 +13689,15 @@
     "xpack.monitoring.alerts.memoryUsage.ui.nextSteps.managingHeap": "#start_link管理 ES 堆#end_link",
     "xpack.monitoring.alerts.memoryUsage.ui.nextSteps.resizeYourDeployment": "#start_link对您的部署进行大小调整 (ECE)#end_link",
     "xpack.monitoring.alerts.memoryUsage.ui.nextSteps.tuneThreadPools": "#start_link调整线程池#end_link",
-    "xpack.monitoring.alerts.memoryUsage.ui.resolvedMessage": "节点 {nodeName} 的 JVM 内存使用率现在低于阈值，截止到 #resolved 目标报告为 {memoryUsage}%",
     "xpack.monitoring.alerts.migrate.manageAction.requiredFieldError": "{field} 是必填字段。",
     "xpack.monitoring.alerts.missingData.actionVariables.count": "缺少监测数据的堆栈产品数目。",
-    "xpack.monitoring.alerts.missingData.actionVariables.stackProducts": "缺少监测数据的堆栈产品。",
-    "xpack.monitoring.alerts.missingData.firing": "触发",
     "xpack.monitoring.alerts.missingData.firing.internalFullMessage": "我们尚未检测到集群 {clusterName} 中 {count} 个堆栈产品的任何监测数据。{action}",
     "xpack.monitoring.alerts.missingData.firing.internalShortMessage": "我们尚未检测到集群 {clusterName} 中 {count} 个堆栈产品的任何监测数据。{shortActionText}",
     "xpack.monitoring.alerts.missingData.fullAction": "查看我们拥有这些堆栈产品的哪些监测数据。",
     "xpack.monitoring.alerts.missingData.label": "缺少监测数据",
     "xpack.monitoring.alerts.missingData.paramDetails.duration.label": "缺少以下对象的监测数据时通知",
     "xpack.monitoring.alerts.missingData.paramDetails.limit.label": "追溯到遥远的过去以获取监测数据",
-    "xpack.monitoring.alerts.missingData.resolved": "已解决",
-    "xpack.monitoring.alerts.missingData.resolved.internalFullMessage": "我们现在看到集群 {clusterName} 中 {count} 个堆栈产品的监测数据。",
-    "xpack.monitoring.alerts.missingData.resolved.internalShortMessage": "我们现在看到集群 {clusterName} 中 {count} 个堆栈产品的监测数据。",
     "xpack.monitoring.alerts.missingData.shortAction": "验证这些堆栈产品是否已启动并正常运行，然后仔细检查监测设置。",
-    "xpack.monitoring.alerts.missingData.ui.firingMessage": "在过去的 {gapDuration}，从 #absolute 开始，我们尚未检测到来自 {stackProduct} {type}: {stackProductName} 的任何监测数据",
-    "xpack.monitoring.alerts.missingData.ui.nextSteps.verifySettings": "验证 {type} 上的监测设置",
-    "xpack.monitoring.alerts.missingData.ui.nextSteps.viewAll": "#start_link查看所有 {stackProduct} {type}#end_link",
-    "xpack.monitoring.alerts.missingData.ui.notQuiteResolvedMessage": "我们还没有看到 {stackProduct} {type}: {stackProductName} 的监测数据，将停止试用。要更改此设置，请配置告警，以追溯到更远的过去以获取数据。",
-    "xpack.monitoring.alerts.missingData.ui.resolvedMessage": "我们现在看到截止 #resolved 的 {stackProduct} {type}: {stackProductName} 的监测数据",
     "xpack.monitoring.alerts.missingData.validation.duration": "需要有效的持续时间。",
     "xpack.monitoring.alerts.missingData.validation.limit": "需要有效的限值。",
     "xpack.monitoring.alerts.nodesChanged.actionVariables.added": "添加到集群的节点列表。",
@@ -13744,8 +13707,6 @@
     "xpack.monitoring.alerts.nodesChanged.firing.internalShortMessage": "为 {clusterName} 触发了节点已更改告警。{shortActionText}",
     "xpack.monitoring.alerts.nodesChanged.fullAction": "查看节点",
     "xpack.monitoring.alerts.nodesChanged.label": "已更改节点",
-    "xpack.monitoring.alerts.nodesChanged.resolved.internalFullMessage": "已为 {clusterName} 解决 Elasticsearch 节点已更改告警。",
-    "xpack.monitoring.alerts.nodesChanged.resolved.internalShortMessage": "已为 {clusterName} 解决 Elasticsearch 节点已更改告警。",
     "xpack.monitoring.alerts.nodesChanged.shortAction": "确认您已添加、移除或重新启动节点。",
     "xpack.monitoring.alerts.nodesChanged.ui.addedFiringMessage": "Elasticsearch 节点“{added}”已添加到此集群。",
     "xpack.monitoring.alerts.nodesChanged.ui.nothingDetectedFiringMessage": "Elasticsearch 节点已更改",
@@ -13760,19 +13721,12 @@
     "xpack.monitoring.alerts.panel.muteTitle": "静音",
     "xpack.monitoring.alerts.panel.ummuteAlert.errorTitle": "无法取消告警静音",
     "xpack.monitoring.alerts.state.firing": "触发",
-    "xpack.monitoring.alerts.state.resolved": "已解决",
     "xpack.monitoring.alerts.status.alertsTooltip": "告警",
     "xpack.monitoring.alerts.status.clearText": "清除",
     "xpack.monitoring.alerts.status.clearToolip": "无告警触发",
     "xpack.monitoring.alerts.status.highSeverityTooltip": "有一些紧急问题需要您立即关注！",
     "xpack.monitoring.alerts.status.lowSeverityTooltip": "存在一些低紧急问题。",
     "xpack.monitoring.alerts.status.mediumSeverityTooltip": "有一些问题可能会影响您的堆栈。",
-    "xpack.monitoring.alerts.typeLabel.instance": "实例",
-    "xpack.monitoring.alerts.typeLabel.instances": "实例",
-    "xpack.monitoring.alerts.typeLabel.node": "节点",
-    "xpack.monitoring.alerts.typeLabel.nodes": "节点",
-    "xpack.monitoring.alerts.typeLabel.server": "服务器",
-    "xpack.monitoring.alerts.typeLabel.servers": "服务器",
     "xpack.monitoring.alerts.validation.duration": "需要有效的持续时间。",
     "xpack.monitoring.alerts.validation.threshold": "需要有效的数字。",
     "xpack.monitoring.apm.healthStatusLabel": "运行状况：{status}",
@@ -13826,7 +13780,6 @@
     "xpack.monitoring.beats.instance.typeLabel": "类型",
     "xpack.monitoring.beats.instance.uptimeLabel": "运行时间",
     "xpack.monitoring.beats.instance.versionLabel": "版本",
-    "xpack.monitoring.beats.instances.alertsColumnTitle": "告警",
     "xpack.monitoring.beats.instances.allocatedMemoryTitle": "已分配内存",
     "xpack.monitoring.beats.instances.bytesSentRateTitle": "已发送字节速率",
     "xpack.monitoring.beats.instances.nameTitle": "名称",
diff --git a/x-pack/plugins/triggers_actions_ui/README.md b/x-pack/plugins/triggers_actions_ui/README.md
index 2d80dda964a0b..629ab944ac623 100644
--- a/x-pack/plugins/triggers_actions_ui/README.md
+++ b/x-pack/plugins/triggers_actions_ui/README.md
@@ -1463,9 +1463,9 @@ interface ActionAccordionFormProps {
 |actionTypeRegistry|Registry for action types.|
 |toastNotifications|Toast messages  Plugin Setup Contract.|
 |docLinks|Documentation links Plugin Start Contract.|
-|actionTypes|Optional property, which allowes to define a list of available actions specific for a current plugin.|
-|actionTypes|Optional property, which allowes to define a list of variables for action 'message' property.|
-|defaultActionMessage|Optional property, which allowes to define a message value for action with 'message' property.|
+|actionTypes|Optional property, which allows to define a list of available actions specific for a current plugin.|
+|messageVariables|Optional property, which allows to define a list of variables for action 'message' property. Set `useWithTripleBracesInTemplates` to true if you don't want the variable escaped when rendering.|
+|defaultActionMessage|Optional property, which allows to define a message value for action with 'message' property.|
 |capabilities|Kibana core's Capabilities ApplicationStart['capabilities'].|
 
 |Property|Description|
diff --git a/x-pack/plugins/triggers_actions_ui/public/application/components/add_message_variables.test.tsx b/x-pack/plugins/triggers_actions_ui/public/application/components/add_message_variables.test.tsx
new file mode 100644
index 0000000000000..9e54dc2add0e2
--- /dev/null
+++ b/x-pack/plugins/triggers_actions_ui/public/application/components/add_message_variables.test.tsx
@@ -0,0 +1,90 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License;
+ * you may not use this file except in compliance with the Elastic License.
+ */
+
+import React from 'react';
+import { mountWithIntl } from '@kbn/test/jest';
+import { AddMessageVariables } from './add_message_variables';
+
+describe('AddMessageVariables', () => {
+  test('renders variables with double brances by default', () => {
+    const onSelectEventHandler = jest.fn();
+    const wrapper = mountWithIntl(
+      <AddMessageVariables
+        messageVariables={[
+          {
+            name: 'myVar',
+            description: 'My variable description',
+          },
+        ]}
+        paramsProperty="foo"
+        onSelectEventHandler={onSelectEventHandler}
+      />
+    );
+
+    wrapper.find('[data-test-subj="fooAddVariableButton"]').first().simulate('click');
+
+    expect(
+      wrapper.find('[data-test-subj="variableMenuButton-0-templated-name"]').first().text()
+    ).toEqual('{{myVar}}');
+  });
+
+  test('renders variables with tripple braces when specified', () => {
+    const onSelectEventHandler = jest.fn();
+    const wrapper = mountWithIntl(
+      <AddMessageVariables
+        messageVariables={[
+          {
+            name: 'myVar',
+            description: 'My variable description',
+            useWithTripleBracesInTemplates: true,
+          },
+        ]}
+        paramsProperty="foo"
+        onSelectEventHandler={onSelectEventHandler}
+      />
+    );
+
+    wrapper.find('[data-test-subj="fooAddVariableButton"]').first().simulate('click');
+
+    expect(
+      wrapper.find('[data-test-subj="variableMenuButton-0-templated-name"]').first().text()
+    ).toEqual('{{{myVar}}}');
+  });
+
+  test('onSelectEventHandler is called with proper action variable', () => {
+    const onSelectEventHandler = jest.fn();
+    const wrapper = mountWithIntl(
+      <AddMessageVariables
+        messageVariables={[
+          {
+            name: 'myVar1',
+            description: 'My variable 1 description',
+          },
+          {
+            name: 'myVar2',
+            description: 'My variable 1 description',
+            useWithTripleBracesInTemplates: true,
+          },
+        ]}
+        paramsProperty="foo"
+        onSelectEventHandler={onSelectEventHandler}
+      />
+    );
+
+    wrapper.find('[data-test-subj="fooAddVariableButton"]').first().simulate('click');
+    wrapper
+      .find('[data-test-subj="variableMenuButton-1-templated-name"]')
+      .first()
+      .simulate('click');
+
+    expect(onSelectEventHandler).toHaveBeenCalledTimes(1);
+    expect(onSelectEventHandler).toHaveBeenCalledWith({
+      name: 'myVar2',
+      description: 'My variable 1 description',
+      useWithTripleBracesInTemplates: true,
+    });
+  });
+});
diff --git a/x-pack/plugins/triggers_actions_ui/public/application/components/add_message_variables.tsx b/x-pack/plugins/triggers_actions_ui/public/application/components/add_message_variables.tsx
index 79a69a6af0828..8af3e4f87bc4d 100644
--- a/x-pack/plugins/triggers_actions_ui/public/application/components/add_message_variables.tsx
+++ b/x-pack/plugins/triggers_actions_ui/public/application/components/add_message_variables.tsx
@@ -14,11 +14,12 @@ import {
 } from '@elastic/eui';
 import './add_message_variables.scss';
 import { ActionVariable } from '../../types';
+import { templateActionVariable } from '../lib';
 
 interface Props {
   messageVariables?: ActionVariable[];
   paramsProperty: string;
-  onSelectEventHandler: (variable: string) => void;
+  onSelectEventHandler: (variable: ActionVariable) => void;
 }
 
 export const AddMessageVariables: React.FunctionComponent<Props> = ({
@@ -35,12 +36,14 @@ export const AddMessageVariables: React.FunctionComponent<Props> = ({
         data-test-subj={`variableMenuButton-${variable.name}`}
         icon="empty"
         onClick={() => {
-          onSelectEventHandler(variable.name);
+          onSelectEventHandler(variable);
           setIsVariablesPopoverOpen(false);
         }}
       >
         <>
-          <EuiText size="m">{`{{${variable.name}}}`}</EuiText>
+          <EuiText size="m" data-test-subj={`variableMenuButton-${i}-templated-name`}>
+            {templateActionVariable(variable)}
+          </EuiText>
           <EuiText size="m" color="subdued">
             <div className="euiTextColor--subdued">{variable.description}</div>
           </EuiText>
diff --git a/x-pack/plugins/triggers_actions_ui/public/application/components/json_editor_with_message_variables.test.tsx b/x-pack/plugins/triggers_actions_ui/public/application/components/json_editor_with_message_variables.test.tsx
new file mode 100644
index 0000000000000..419266e39a340
--- /dev/null
+++ b/x-pack/plugins/triggers_actions_ui/public/application/components/json_editor_with_message_variables.test.tsx
@@ -0,0 +1,65 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License;
+ * you may not use this file except in compliance with the Elastic License.
+ */
+
+import React from 'react';
+import { mountWithIntl } from '@kbn/test/jest';
+import { JsonEditorWithMessageVariables } from './json_editor_with_message_variables';
+
+describe('JsonEditorWithMessageVariables', () => {
+  const onDocumentsChange = jest.fn();
+  const props = {
+    messageVariables: [
+      {
+        name: 'myVar',
+        description: 'My variable description',
+      },
+    ],
+    paramsProperty: 'foo',
+    label: 'label',
+    onDocumentsChange,
+  };
+
+  beforeEach(() => jest.resetAllMocks());
+
+  test('renders variables with double braces by default', () => {
+    const wrapper = mountWithIntl(<JsonEditorWithMessageVariables {...props} />);
+
+    wrapper.find('[data-test-subj="fooAddVariableButton"]').first().simulate('click');
+    wrapper
+      .find('[data-test-subj="variableMenuButton-0-templated-name"]')
+      .first()
+      .simulate('click');
+
+    expect(wrapper.find('[data-test-subj="fooJsonEditor"]').first().prop('value')).toEqual(
+      '{{myVar}}'
+    );
+  });
+
+  test('renders variables with triple braces when specified', () => {
+    const wrapper = mountWithIntl(
+      <JsonEditorWithMessageVariables
+        {...props}
+        messageVariables={[
+          {
+            name: 'myVar',
+            description: 'My variable description',
+            useWithTripleBracesInTemplates: true,
+          },
+        ]}
+      />
+    );
+
+    wrapper.find('[data-test-subj="fooAddVariableButton"]').first().simulate('click');
+    wrapper
+      .find('[data-test-subj="variableMenuButton-0-templated-name"]')
+      .first()
+      .simulate('click');
+
+    expect(wrapper.find('[data-test-subj="fooJsonEditor"]').first().prop('value')).toEqual(
+      '{{{myVar}}}'
+    );
+  });
+});
diff --git a/x-pack/plugins/triggers_actions_ui/public/application/components/json_editor_with_message_variables.tsx b/x-pack/plugins/triggers_actions_ui/public/application/components/json_editor_with_message_variables.tsx
index e1f368a3f5028..0f3e7bb0e94d6 100644
--- a/x-pack/plugins/triggers_actions_ui/public/application/components/json_editor_with_message_variables.tsx
+++ b/x-pack/plugins/triggers_actions_ui/public/application/components/json_editor_with_message_variables.tsx
@@ -12,6 +12,7 @@ import { XJson } from '../../../../../../src/plugins/es_ui_shared/public';
 
 import { AddMessageVariables } from './add_message_variables';
 import { ActionVariable } from '../../types';
+import { templateActionVariable } from '../lib';
 
 interface Props {
   messageVariables?: ActionVariable[];
@@ -43,8 +44,8 @@ export const JsonEditorWithMessageVariables: React.FunctionComponent<Props> = ({
 
   const { convertToJson, setXJson, xJson } = useXJsonMode(inputTargetValue ?? null);
 
-  const onSelectMessageVariable = (variable: string) => {
-    const templatedVar = `{{${variable}}}`;
+  const onSelectMessageVariable = (variable: ActionVariable) => {
+    const templatedVar = templateActionVariable(variable);
     let newValue = '';
     if (cursorPosition) {
       const cursor = cursorPosition.getCursor();
@@ -71,7 +72,7 @@ export const JsonEditorWithMessageVariables: React.FunctionComponent<Props> = ({
       labelAppend={
         <AddMessageVariables
           messageVariables={messageVariables}
-          onSelectEventHandler={(variable: string) => onSelectMessageVariable(variable)}
+          onSelectEventHandler={onSelectMessageVariable}
           paramsProperty={paramsProperty}
         />
       }
diff --git a/x-pack/plugins/triggers_actions_ui/public/application/components/text_area_with_message_variables.test.tsx b/x-pack/plugins/triggers_actions_ui/public/application/components/text_area_with_message_variables.test.tsx
new file mode 100644
index 0000000000000..2b83b27f0c662
--- /dev/null
+++ b/x-pack/plugins/triggers_actions_ui/public/application/components/text_area_with_message_variables.test.tsx
@@ -0,0 +1,64 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License;
+ * you may not use this file except in compliance with the Elastic License.
+ */
+
+import React from 'react';
+import { mountWithIntl } from '@kbn/test/jest';
+import { TextAreaWithMessageVariables } from './text_area_with_message_variables';
+
+describe('TextAreaWithMessageVariables', () => {
+  const editAction = jest.fn();
+  const props = {
+    messageVariables: [
+      {
+        name: 'myVar',
+        description: 'My variable description',
+      },
+    ],
+    paramsProperty: 'foo',
+    index: 0,
+    editAction,
+    label: 'label',
+  };
+
+  beforeEach(() => jest.resetAllMocks());
+
+  test('renders variables with double braces by default', () => {
+    const wrapper = mountWithIntl(<TextAreaWithMessageVariables {...props} />);
+
+    wrapper.find('[data-test-subj="fooAddVariableButton"]').first().simulate('click');
+    wrapper
+      .find('[data-test-subj="variableMenuButton-0-templated-name"]')
+      .first()
+      .simulate('click');
+
+    expect(editAction).toHaveBeenCalledTimes(1);
+    expect(editAction).toHaveBeenCalledWith(props.paramsProperty, '{{myVar}}', props.index);
+  });
+
+  test('renders variables with triple braces when specified', () => {
+    const wrapper = mountWithIntl(
+      <TextAreaWithMessageVariables
+        {...props}
+        messageVariables={[
+          {
+            name: 'myVar',
+            description: 'My variable description',
+            useWithTripleBracesInTemplates: true,
+          },
+        ]}
+      />
+    );
+
+    wrapper.find('[data-test-subj="fooAddVariableButton"]').first().simulate('click');
+    wrapper
+      .find('[data-test-subj="variableMenuButton-0-templated-name"]')
+      .first()
+      .simulate('click');
+
+    expect(editAction).toHaveBeenCalledTimes(1);
+    expect(editAction).toHaveBeenCalledWith(props.paramsProperty, '{{{myVar}}}', props.index);
+  });
+});
diff --git a/x-pack/plugins/triggers_actions_ui/public/application/components/text_area_with_message_variables.tsx b/x-pack/plugins/triggers_actions_ui/public/application/components/text_area_with_message_variables.tsx
index f5095101d96b5..ce2661a5a0f79 100644
--- a/x-pack/plugins/triggers_actions_ui/public/application/components/text_area_with_message_variables.tsx
+++ b/x-pack/plugins/triggers_actions_ui/public/application/components/text_area_with_message_variables.tsx
@@ -8,6 +8,7 @@ import { EuiTextArea, EuiFormRow } from '@elastic/eui';
 import './add_message_variables.scss';
 import { AddMessageVariables } from './add_message_variables';
 import { ActionVariable } from '../../types';
+import { templateActionVariable } from '../lib';
 
 interface Props {
   messageVariables?: ActionVariable[];
@@ -30,8 +31,8 @@ export const TextAreaWithMessageVariables: React.FunctionComponent<Props> = ({
 }) => {
   const [currentTextElement, setCurrentTextElement] = useState<HTMLTextAreaElement | null>(null);
 
-  const onSelectMessageVariable = (variable: string) => {
-    const templatedVar = `{{${variable}}}`;
+  const onSelectMessageVariable = (variable: ActionVariable) => {
+    const templatedVar = templateActionVariable(variable);
     const startPosition = currentTextElement?.selectionStart ?? 0;
     const endPosition = currentTextElement?.selectionEnd ?? 0;
     const newValue =
@@ -54,7 +55,7 @@ export const TextAreaWithMessageVariables: React.FunctionComponent<Props> = ({
       labelAppend={
         <AddMessageVariables
           messageVariables={messageVariables}
-          onSelectEventHandler={(variable: string) => onSelectMessageVariable(variable)}
+          onSelectEventHandler={onSelectMessageVariable}
           paramsProperty={paramsProperty}
         />
       }
diff --git a/x-pack/plugins/triggers_actions_ui/public/application/components/text_field_with_message_variables.test.tsx b/x-pack/plugins/triggers_actions_ui/public/application/components/text_field_with_message_variables.test.tsx
new file mode 100644
index 0000000000000..a3b2caa7a55ea
--- /dev/null
+++ b/x-pack/plugins/triggers_actions_ui/public/application/components/text_field_with_message_variables.test.tsx
@@ -0,0 +1,64 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License;
+ * you may not use this file except in compliance with the Elastic License.
+ */
+
+import React from 'react';
+import { mountWithIntl } from '@kbn/test/jest';
+import { TextFieldWithMessageVariables } from './text_field_with_message_variables';
+
+describe('TextFieldWithMessageVariables', () => {
+  const editAction = jest.fn();
+  const props = {
+    messageVariables: [
+      {
+        name: 'myVar',
+        description: 'My variable description',
+      },
+    ],
+    paramsProperty: 'foo',
+    index: 0,
+    editAction,
+    label: 'label',
+  };
+
+  beforeEach(() => jest.resetAllMocks());
+
+  test('renders variables with double braces by default', () => {
+    const wrapper = mountWithIntl(<TextFieldWithMessageVariables {...props} />);
+
+    wrapper.find('[data-test-subj="fooAddVariableButton"]').first().simulate('click');
+    wrapper
+      .find('[data-test-subj="variableMenuButton-0-templated-name"]')
+      .first()
+      .simulate('click');
+
+    expect(editAction).toHaveBeenCalledTimes(1);
+    expect(editAction).toHaveBeenCalledWith(props.paramsProperty, '{{myVar}}', props.index);
+  });
+
+  test('renders variables with triple braces when specified', () => {
+    const wrapper = mountWithIntl(
+      <TextFieldWithMessageVariables
+        {...props}
+        messageVariables={[
+          {
+            name: 'myVar',
+            description: 'My variable description',
+            useWithTripleBracesInTemplates: true,
+          },
+        ]}
+      />
+    );
+
+    wrapper.find('[data-test-subj="fooAddVariableButton"]').first().simulate('click');
+    wrapper
+      .find('[data-test-subj="variableMenuButton-0-templated-name"]')
+      .first()
+      .simulate('click');
+
+    expect(editAction).toHaveBeenCalledTimes(1);
+    expect(editAction).toHaveBeenCalledWith(props.paramsProperty, '{{{myVar}}}', props.index);
+  });
+});
diff --git a/x-pack/plugins/triggers_actions_ui/public/application/components/text_field_with_message_variables.tsx b/x-pack/plugins/triggers_actions_ui/public/application/components/text_field_with_message_variables.tsx
index e2eba6b8a7f0f..44f22b0a27bcc 100644
--- a/x-pack/plugins/triggers_actions_ui/public/application/components/text_field_with_message_variables.tsx
+++ b/x-pack/plugins/triggers_actions_ui/public/application/components/text_field_with_message_variables.tsx
@@ -8,6 +8,7 @@ import { EuiFieldText } from '@elastic/eui';
 import './add_message_variables.scss';
 import { AddMessageVariables } from './add_message_variables';
 import { ActionVariable } from '../../types';
+import { templateActionVariable } from '../lib';
 
 interface Props {
   messageVariables?: ActionVariable[];
@@ -30,8 +31,8 @@ export const TextFieldWithMessageVariables: React.FunctionComponent<Props> = ({
 }) => {
   const [currentTextElement, setCurrentTextElement] = useState<HTMLInputElement | null>(null);
 
-  const onSelectMessageVariable = (variable: string) => {
-    const templatedVar = `{{${variable}}}`;
+  const onSelectMessageVariable = (variable: ActionVariable) => {
+    const templatedVar = templateActionVariable(variable);
     const startPosition = currentTextElement?.selectionStart ?? 0;
     const endPosition = currentTextElement?.selectionEnd ?? 0;
     const newValue =
@@ -66,7 +67,7 @@ export const TextFieldWithMessageVariables: React.FunctionComponent<Props> = ({
       append={
         <AddMessageVariables
           messageVariables={messageVariables}
-          onSelectEventHandler={(variable: string) => onSelectMessageVariable(variable)}
+          onSelectEventHandler={onSelectMessageVariable}
           paramsProperty={paramsProperty}
         />
       }
diff --git a/x-pack/plugins/triggers_actions_ui/public/application/lib/action_variables.test.ts b/x-pack/plugins/triggers_actions_ui/public/application/lib/action_variables.test.ts
index 80e94f8a80f0e..daf51dcd43812 100644
--- a/x-pack/plugins/triggers_actions_ui/public/application/lib/action_variables.test.ts
+++ b/x-pack/plugins/triggers_actions_ui/public/application/lib/action_variables.test.ts
@@ -230,6 +230,85 @@ describe('transformActionVariables', () => {
       ]
     `);
   });
+
+  test('should return useWithTripleBracesInTemplates with action variables if specified', () => {
+    const alertType = getAlertType({
+      context: [
+        { name: 'fooC', description: 'fooC-description', useWithTripleBracesInTemplates: true },
+        { name: 'barC', description: 'barC-description' },
+      ],
+      state: [
+        { name: 'fooS', description: 'fooS-description' },
+        { name: 'barS', description: 'barS-description', useWithTripleBracesInTemplates: true },
+      ],
+      params: [
+        {
+          name: 'fooP',
+          description: 'fooP-description',
+          useWithTripleBracesInTemplates: true,
+        },
+      ],
+    });
+    expect(transformActionVariables(alertType.actionVariables)).toMatchInlineSnapshot(`
+      Array [
+        Object {
+          "description": "The id of the alert.",
+          "name": "alertId",
+        },
+        Object {
+          "description": "The name of the alert.",
+          "name": "alertName",
+        },
+        Object {
+          "description": "The spaceId of the alert.",
+          "name": "spaceId",
+        },
+        Object {
+          "description": "The tags of the alert.",
+          "name": "tags",
+        },
+        Object {
+          "description": "The date the alert scheduled the action.",
+          "name": "date",
+        },
+        Object {
+          "description": "The alert instance id that scheduled actions for the alert.",
+          "name": "alertInstanceId",
+        },
+        Object {
+          "description": "The alert action group that was used to scheduled actions for the alert.",
+          "name": "alertActionGroup",
+        },
+        Object {
+          "description": "The human readable name of the alert action group that was used to scheduled actions for the alert.",
+          "name": "alertActionGroupName",
+        },
+        Object {
+          "description": "fooC-description",
+          "name": "context.fooC",
+          "useWithTripleBracesInTemplates": true,
+        },
+        Object {
+          "description": "barC-description",
+          "name": "context.barC",
+        },
+        Object {
+          "description": "fooP-description",
+          "name": "params.fooP",
+          "useWithTripleBracesInTemplates": true,
+        },
+        Object {
+          "description": "fooS-description",
+          "name": "state.fooS",
+        },
+        Object {
+          "description": "barS-description",
+          "name": "state.barS",
+          "useWithTripleBracesInTemplates": true,
+        },
+      ]
+    `);
+  });
 });
 
 function getAlertType(actionVariables: ActionVariables): AlertType {
diff --git a/x-pack/plugins/triggers_actions_ui/public/application/lib/action_variables.ts b/x-pack/plugins/triggers_actions_ui/public/application/lib/action_variables.ts
index ba0c873948f6c..0bec0efec2966 100644
--- a/x-pack/plugins/triggers_actions_ui/public/application/lib/action_variables.ts
+++ b/x-pack/plugins/triggers_actions_ui/public/application/lib/action_variables.ts
@@ -29,7 +29,7 @@ export enum AlertProvidedActionVariables {
 
 function prefixKeys(actionVariables: ActionVariable[], prefix: string): ActionVariable[] {
   return actionVariables.map((actionVariable) => {
-    return { name: `${prefix}${actionVariable.name}`, description: actionVariable.description };
+    return { ...actionVariable, name: `${prefix}${actionVariable.name}` };
   });
 }
 
diff --git a/x-pack/plugins/triggers_actions_ui/public/application/lib/index.ts b/x-pack/plugins/triggers_actions_ui/public/application/lib/index.ts
new file mode 100644
index 0000000000000..a7784bdbeeecb
--- /dev/null
+++ b/x-pack/plugins/triggers_actions_ui/public/application/lib/index.ts
@@ -0,0 +1,7 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License;
+ * you may not use this file except in compliance with the Elastic License.
+ */
+
+export { templateActionVariable } from './template_action_variable';
diff --git a/x-pack/plugins/triggers_actions_ui/public/application/lib/template_action_variable.test.ts b/x-pack/plugins/triggers_actions_ui/public/application/lib/template_action_variable.test.ts
new file mode 100644
index 0000000000000..1abdb93d210df
--- /dev/null
+++ b/x-pack/plugins/triggers_actions_ui/public/application/lib/template_action_variable.test.ts
@@ -0,0 +1,24 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License;
+ * you may not use this file except in compliance with the Elastic License.
+ */
+
+import { templateActionVariable } from './template_action_variable';
+
+describe('templateActionVariable', () => {
+  const actionVariable = {
+    name: 'myVar',
+    description: 'My variable description',
+  };
+
+  test('variable returns with double braces by default', () => {
+    expect(templateActionVariable(actionVariable)).toEqual('{{myVar}}');
+  });
+
+  test('variable returns with triple braces when specified', () => {
+    expect(
+      templateActionVariable({ ...actionVariable, useWithTripleBracesInTemplates: true })
+    ).toEqual('{{{myVar}}}');
+  });
+});
diff --git a/x-pack/plugins/triggers_actions_ui/public/application/lib/template_action_variable.ts b/x-pack/plugins/triggers_actions_ui/public/application/lib/template_action_variable.ts
new file mode 100644
index 0000000000000..e0b44b5d942ed
--- /dev/null
+++ b/x-pack/plugins/triggers_actions_ui/public/application/lib/template_action_variable.ts
@@ -0,0 +1,13 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License;
+ * you may not use this file except in compliance with the Elastic License.
+ */
+
+import { ActionVariable } from '../../types';
+
+export function templateActionVariable(variable: ActionVariable) {
+  return variable.useWithTripleBracesInTemplates
+    ? `{{{${variable.name}}}}`
+    : `{{${variable.name}}}`;
+}
diff --git a/x-pack/plugins/triggers_actions_ui/public/application/sections/alert_details/components/alert_instances.scss b/x-pack/plugins/triggers_actions_ui/public/application/sections/alert_details/components/alert_instances.scss
new file mode 100644
index 0000000000000..76fd94fd4044b
--- /dev/null
+++ b/x-pack/plugins/triggers_actions_ui/public/application/sections/alert_details/components/alert_instances.scss
@@ -0,0 +1,11 @@
+// Add truncation to heath status
+
+.actionsInstanceList__health {
+  width: 100%;
+
+  .euiFlexItem:last-of-type {
+    @include euiTextTruncate;
+    min-width: 0;
+    width: 85%;
+  }
+}
diff --git a/x-pack/plugins/triggers_actions_ui/public/application/sections/alert_details/components/alert_instances.tsx b/x-pack/plugins/triggers_actions_ui/public/application/sections/alert_details/components/alert_instances.tsx
index e0c4c663bc231..893f085cd664a 100644
--- a/x-pack/plugins/triggers_actions_ui/public/application/sections/alert_details/components/alert_instances.tsx
+++ b/x-pack/plugins/triggers_actions_ui/public/application/sections/alert_details/components/alert_instances.tsx
@@ -24,6 +24,7 @@ import {
   withBulkAlertOperations,
 } from '../../common/components/with_bulk_alert_api_operations';
 import { DEFAULT_SEARCH_PAGE_SIZE } from '../../../constants';
+import './alert_instances.scss';
 
 type AlertInstancesProps = {
   alert: Alert;
@@ -46,6 +47,7 @@ export const alertInstancesTableColumns = (
     ),
     sortable: false,
     truncateText: true,
+    width: '45%',
     'data-test-subj': 'alertInstancesTableCell-instance',
     render: (value: string) => {
       return (
@@ -61,10 +63,10 @@ export const alertInstancesTableColumns = (
       'xpack.triggersActionsUI.sections.alertDetails.alertInstancesList.columns.status',
       { defaultMessage: 'Status' }
     ),
-    width: '100px',
+    width: '15%',
     render: (value: AlertInstanceListItemStatus, instance: AlertInstanceListItem) => {
       return (
-        <EuiHealth color={value.healthColor}>
+        <EuiHealth color={value.healthColor} className="actionsInstanceList__health">
           {value.label}
           {value.actionGroup ? ` (${value.actionGroup})` : ``}
         </EuiHealth>
@@ -75,7 +77,7 @@ export const alertInstancesTableColumns = (
   },
   {
     field: 'start',
-    width: '200px',
+    width: '190px',
     render: (value: Date | undefined, instance: AlertInstanceListItem) => {
       return value ? moment(value).format('D MMM YYYY @ HH:mm:ss') : '';
     },
@@ -88,7 +90,6 @@ export const alertInstancesTableColumns = (
   },
   {
     field: 'duration',
-    align: CENTER_ALIGNMENT,
     render: (value: number, instance: AlertInstanceListItem) => {
       return value ? durationAsString(moment.duration(value)) : '';
     },
@@ -97,7 +98,7 @@ export const alertInstancesTableColumns = (
       { defaultMessage: 'Duration' }
     ),
     sortable: false,
-    width: '100px',
+    width: '80px',
     'data-test-subj': 'alertInstancesTableCell-duration',
   },
   {
@@ -192,6 +193,7 @@ export function AlertInstances({
         columns={alertInstancesTableColumns(onMuteAction, readOnly)}
         data-test-subj="alertInstancesList"
         tableLayout="fixed"
+        className="alertInstancesList"
       />
     </Fragment>
   );
diff --git a/x-pack/plugins/triggers_actions_ui/public/types.ts b/x-pack/plugins/triggers_actions_ui/public/types.ts
index 1e11102516fc1..acd242eed17fe 100644
--- a/x-pack/plugins/triggers_actions_ui/public/types.ts
+++ b/x-pack/plugins/triggers_actions_ui/public/types.ts
@@ -127,6 +127,7 @@ export type ActionConnectorTableItem = ActionConnector & {
 export interface ActionVariable {
   name: string;
   description: string;
+  useWithTripleBracesInTemplates?: boolean;
 }
 
 type AsActionVariables<Keys extends string> = {
diff --git a/x-pack/plugins/uptime/public/components/overview/monitor_list/__tests__/__snapshots__/monitor_list.test.tsx.snap b/x-pack/plugins/uptime/public/components/overview/monitor_list/__tests__/__snapshots__/monitor_list.test.tsx.snap
index edd901253f509..39f860f76f2bd 100644
--- a/x-pack/plugins/uptime/public/components/overview/monitor_list/__tests__/__snapshots__/monitor_list.test.tsx.snap
+++ b/x-pack/plugins/uptime/public/components/overview/monitor_list/__tests__/__snapshots__/monitor_list.test.tsx.snap
@@ -92,7 +92,6 @@ exports[`MonitorList component MonitorListPagination component renders a no item
             "nextPagePagination": null,
             "prevPagePagination": null,
             "summaries": Array [],
-            "totalSummaryCount": 0,
           },
           "loading": false,
         }
@@ -299,7 +298,6 @@ exports[`MonitorList component MonitorListPagination component renders the pagin
                 },
               },
             ],
-            "totalSummaryCount": 2,
           },
           "loading": false,
         }
@@ -403,7 +401,6 @@ exports[`MonitorList component renders a no items message when no data is provid
             "nextPagePagination": null,
             "prevPagePagination": null,
             "summaries": Array [],
-            "totalSummaryCount": 0,
           },
           "loading": true,
         }
@@ -611,7 +608,6 @@ exports[`MonitorList component renders error list 1`] = `
                 },
               },
             ],
-            "totalSummaryCount": 2,
           },
           "loading": false,
         }
@@ -818,7 +814,6 @@ exports[`MonitorList component renders loading state 1`] = `
                 },
               },
             ],
-            "totalSummaryCount": 2,
           },
           "loading": true,
         }
@@ -1857,7 +1852,6 @@ exports[`MonitorList component shallow renders the monitor list 1`] = `
                 },
               },
             ],
-            "totalSummaryCount": 2,
           },
           "loading": false,
         }
diff --git a/x-pack/plugins/uptime/public/components/overview/monitor_list/__tests__/monitor_list.test.tsx b/x-pack/plugins/uptime/public/components/overview/monitor_list/__tests__/monitor_list.test.tsx
index 769df84a6b83b..a158f6f67b48f 100644
--- a/x-pack/plugins/uptime/public/components/overview/monitor_list/__tests__/monitor_list.test.tsx
+++ b/x-pack/plugins/uptime/public/components/overview/monitor_list/__tests__/monitor_list.test.tsx
@@ -125,7 +125,6 @@ describe('MonitorList component', () => {
       nextPagePagination: null,
       prevPagePagination: null,
       summaries: [testFooSummary, testBarSummary],
-      totalSummaryCount: 2,
     };
   };
 
@@ -164,7 +163,6 @@ describe('MonitorList component', () => {
             summaries: [],
             nextPagePagination: null,
             prevPagePagination: null,
-            totalSummaryCount: 0,
           },
           loading: true,
         }}
@@ -236,7 +234,6 @@ describe('MonitorList component', () => {
           sortOrder: SortOrder.ASC,
         }),
         summaries: [testFooSummary, testBarSummary],
-        totalSummaryCount: 2,
       };
     });
 
@@ -265,7 +262,6 @@ describe('MonitorList component', () => {
               summaries: [],
               nextPagePagination: null,
               prevPagePagination: null,
-              totalSummaryCount: 0,
             },
             loading: false,
           }}
diff --git a/x-pack/plugins/uptime/public/components/overview/monitor_list/monitor_list_drawer/__tests__/data.json b/x-pack/plugins/uptime/public/components/overview/monitor_list/monitor_list_drawer/__tests__/data.json
index 012280c8147dd..1bbdcd4a30078 100644
--- a/x-pack/plugins/uptime/public/components/overview/monitor_list/monitor_list_drawer/__tests__/data.json
+++ b/x-pack/plugins/uptime/public/components/overview/monitor_list/monitor_list_drawer/__tests__/data.json
@@ -3,7 +3,6 @@
     "monitorStates": {
       "prevPagePagination": null,
       "nextPagePagination": null,
-      "totalSummaryCount": 147428,
       "summaries": [
         {
           "monitor_id": "andrewvc-com",
diff --git a/x-pack/plugins/uptime/public/lib/__mocks__/uptime_store.mock.ts b/x-pack/plugins/uptime/public/lib/__mocks__/uptime_store.mock.ts
index f985fd42f31c4..0f600fcc20f6f 100644
--- a/x-pack/plugins/uptime/public/lib/__mocks__/uptime_store.mock.ts
+++ b/x-pack/plugins/uptime/public/lib/__mocks__/uptime_store.mock.ts
@@ -79,7 +79,6 @@ export const mockStore = {
       prevPagePagination: null,
       nextPagePagination: null,
       summaries: [],
-      totalSummaryCount: 0,
     },
     loading: false,
   },
diff --git a/x-pack/plugins/uptime/public/state/reducers/monitor_list.ts b/x-pack/plugins/uptime/public/state/reducers/monitor_list.ts
index fed7e78995d03..c3ff90dbc3d92 100644
--- a/x-pack/plugins/uptime/public/state/reducers/monitor_list.ts
+++ b/x-pack/plugins/uptime/public/state/reducers/monitor_list.ts
@@ -20,7 +20,6 @@ export const initialState: MonitorList = {
     nextPagePagination: null,
     prevPagePagination: null,
     summaries: [],
-    totalSummaryCount: 0,
   },
   loading: false,
 };
diff --git a/x-pack/plugins/uptime/public/state/selectors/__tests__/index.test.ts b/x-pack/plugins/uptime/public/state/selectors/__tests__/index.test.ts
index 93f757b6baa8b..f1a68318be863 100644
--- a/x-pack/plugins/uptime/public/state/selectors/__tests__/index.test.ts
+++ b/x-pack/plugins/uptime/public/state/selectors/__tests__/index.test.ts
@@ -78,7 +78,6 @@ describe('state selectors', () => {
         prevPagePagination: null,
         nextPagePagination: null,
         summaries: [],
-        totalSummaryCount: 0,
       },
       loading: false,
     },
diff --git a/x-pack/plugins/uptime/server/lib/requests/get_snapshot_counts.ts b/x-pack/plugins/uptime/server/lib/requests/get_snapshot_counts.ts
index 9df20c79a6106..000cd2714a29b 100644
--- a/x-pack/plugins/uptime/server/lib/requests/get_snapshot_counts.ts
+++ b/x-pack/plugins/uptime/server/lib/requests/get_snapshot_counts.ts
@@ -8,6 +8,7 @@ import { UMElasticsearchQueryFn } from '../adapters';
 import { CONTEXT_DEFAULTS } from '../../../common/constants';
 import { Snapshot } from '../../../common/runtime_types';
 import { QueryContext } from './search';
+import { ESFilter } from '../../../../../typings/elasticsearch';
 
 export interface GetSnapshotCountParams {
   dateRangeStart: string;
@@ -42,7 +43,7 @@ const statusCount = async (context: QueryContext): Promise<Snapshot> => {
   });
 
   return (
-    res.aggregations?.counts?.value ?? {
+    (res.aggregations?.counts?.value as Snapshot) ?? {
       total: 0,
       up: 0,
       down: 0,
@@ -50,7 +51,7 @@ const statusCount = async (context: QueryContext): Promise<Snapshot> => {
   );
 };
 
-const statusCountBody = (filters: any): any => {
+const statusCountBody = (filters: ESFilter[]) => {
   return {
     size: 0,
     query: {
diff --git a/x-pack/plugins/uptime/server/lib/requests/search/__tests__/query_context.test.ts b/x-pack/plugins/uptime/server/lib/requests/search/__tests__/query_context.test.ts
index b4de286a5b92d..10421ecf2b81f 100644
--- a/x-pack/plugins/uptime/server/lib/requests/search/__tests__/query_context.test.ts
+++ b/x-pack/plugins/uptime/server/lib/requests/search/__tests__/query_context.test.ts
@@ -7,6 +7,7 @@
 import { QueryContext } from '../query_context';
 import { CursorPagination } from '../types';
 import { CursorDirection, SortOrder } from '../../../../../common/runtime_types';
+import { getUptimeESMockClient } from '../../__tests__/helper';
 
 describe(QueryContext, () => {
   // 10 minute range
@@ -19,7 +20,17 @@ describe(QueryContext, () => {
   };
 
   let qc: QueryContext;
-  beforeEach(() => (qc = new QueryContext({}, rangeStart, rangeEnd, pagination, null, 10)));
+  beforeEach(
+    () =>
+      (qc = new QueryContext(
+        getUptimeESMockClient().uptimeEsClient,
+        rangeStart,
+        rangeEnd,
+        pagination,
+        null,
+        10
+      ))
+  );
 
   describe('dateRangeFilter()', () => {
     const expectedRange = {
diff --git a/x-pack/plugins/uptime/server/lib/requests/search/__tests__/test_helpers.ts b/x-pack/plugins/uptime/server/lib/requests/search/__tests__/test_helpers.ts
index 205b283d40d6a..9c322fbeec413 100644
--- a/x-pack/plugins/uptime/server/lib/requests/search/__tests__/test_helpers.ts
+++ b/x-pack/plugins/uptime/server/lib/requests/search/__tests__/test_helpers.ts
@@ -7,6 +7,7 @@
 import { CursorPagination } from '../types';
 import { CursorDirection, SortOrder } from '../../../../../common/runtime_types';
 import { QueryContext } from '../query_context';
+import { getUptimeESMockClient } from '../../__tests__/helper';
 
 export const nextPagination = (key: any): CursorPagination => {
   return {
@@ -16,5 +17,13 @@ export const nextPagination = (key: any): CursorPagination => {
   };
 };
 export const simpleQueryContext = (): QueryContext => {
-  return new QueryContext(undefined, '', '', nextPagination('something'), undefined, 0, '');
+  return new QueryContext(
+    getUptimeESMockClient().uptimeEsClient,
+    '',
+    '',
+    nextPagination('something'),
+    undefined,
+    0,
+    ''
+  );
 };
diff --git a/x-pack/plugins/uptime/server/lib/requests/search/find_potential_matches.ts b/x-pack/plugins/uptime/server/lib/requests/search/find_potential_matches.ts
index 2331d991e3af3..2bc68b09e136f 100644
--- a/x-pack/plugins/uptime/server/lib/requests/search/find_potential_matches.ts
+++ b/x-pack/plugins/uptime/server/lib/requests/search/find_potential_matches.ts
@@ -5,7 +5,6 @@
  */
 
 import { set } from '@elastic/safer-lodash-set';
-import { get } from 'lodash';
 import { QueryContext } from './query_context';
 
 /**
@@ -21,9 +20,10 @@ export const findPotentialMatches = async (
 ) => {
   const { body: queryResult } = await query(queryContext, searchAfter, size);
   const monitorIds: string[] = [];
-  get<any>(queryResult, 'aggregations.monitors.buckets', []).forEach((b: any) => {
+
+  (queryResult.aggregations?.monitors.buckets ?? []).forEach((b) => {
     const monitorId = b.key.monitor_id;
-    monitorIds.push(monitorId);
+    monitorIds.push(monitorId as string);
   });
 
   return {
@@ -53,11 +53,6 @@ const queryBody = async (queryContext: QueryContext, searchAfter: any, size: num
     size: 0,
     query: { bool: { filter: filters } },
     aggs: {
-      has_timespan: {
-        filter: {
-          exists: { field: 'monitor.timespan' },
-        },
-      },
       monitors: {
         composite: {
           size,
diff --git a/x-pack/plugins/uptime/server/lib/requests/search/query_context.ts b/x-pack/plugins/uptime/server/lib/requests/search/query_context.ts
index bcfb3035920fb..8cb221cb5eae4 100644
--- a/x-pack/plugins/uptime/server/lib/requests/search/query_context.ts
+++ b/x-pack/plugins/uptime/server/lib/requests/search/query_context.ts
@@ -5,13 +5,14 @@
  */
 
 import moment from 'moment';
-import { ElasticsearchClient } from 'kibana/server';
 import { CursorPagination } from './types';
 import { parseRelativeDate } from '../../helper';
 import { CursorDirection, SortOrder } from '../../../../common/runtime_types';
+import { UptimeESClient } from '../../lib';
+import { ESFilter } from '../../../../../../typings/elasticsearch';
 
 export class QueryContext {
-  callES: ElasticsearchClient;
+  callES: UptimeESClient;
   dateRangeStart: string;
   dateRangeEnd: string;
   pagination: CursorPagination;
@@ -21,7 +22,7 @@ export class QueryContext {
   hasTimespanCache?: boolean;
 
   constructor(
-    database: any,
+    database: UptimeESClient,
     dateRangeStart: string,
     dateRangeEnd: string,
     pagination: CursorPagination,
@@ -38,15 +39,16 @@ export class QueryContext {
     this.statusFilter = statusFilter;
   }
 
-  async search(params: any): Promise<any> {
-    return this.callES.search({ body: params.body });
+  async search<TParams>(params: TParams) {
+    return this.callES.search(params);
   }
 
   async count(params: any): Promise<any> {
-    return this.callES.count(params);
+    const { body } = await this.callES.count(params);
+    return body;
   }
 
-  async dateAndCustomFilters(): Promise<any[]> {
+  async dateAndCustomFilters(): Promise<ESFilter[]> {
     const clauses = [await this.dateRangeFilter()];
     if (this.filterClause) {
       clauses.push(this.filterClause);
diff --git a/x-pack/plugins/uptime/server/rest_api/monitors/monitor_list.ts b/x-pack/plugins/uptime/server/rest_api/monitors/monitor_list.ts
index 3eac49341b2c2..50fe616ae9cb5 100644
--- a/x-pack/plugins/uptime/server/rest_api/monitors/monitor_list.ts
+++ b/x-pack/plugins/uptime/server/rest_api/monitors/monitor_list.ts
@@ -38,33 +38,29 @@ export const createMonitorListRoute: UMRestApiRouteFactory = (libs) => ({
       const decodedPagination = pagination
         ? JSON.parse(decodeURIComponent(pagination))
         : CONTEXT_DEFAULTS.CURSOR_PAGINATION;
-      const [
-        indexStatus,
-        { summaries, nextPagePagination, prevPagePagination },
-      ] = await Promise.all([
-        libs.requests.getIndexStatus({ uptimeEsClient }),
-        libs.requests.getMonitorStates({
-          uptimeEsClient,
-          dateRangeStart,
-          dateRangeEnd,
-          pagination: decodedPagination,
-          pageSize,
-          filters,
-          // this is added to make typescript happy,
-          // this sort of reassignment used to be further downstream but I've moved it here
-          // because this code is going to be decomissioned soon
-          statusFilter: statusFilter || undefined,
-        }),
-      ]);
 
-      const totalSummaryCount = indexStatus?.docCount ?? 0;
+      const {
+        summaries,
+        nextPagePagination,
+        prevPagePagination,
+      } = await libs.requests.getMonitorStates({
+        uptimeEsClient,
+        dateRangeStart,
+        dateRangeEnd,
+        pagination: decodedPagination,
+        pageSize,
+        filters,
+        // this is added to make typescript happy,
+        // this sort of reassignment used to be further downstream but I've moved it here
+        // because this code is going to be decomissioned soon
+        statusFilter: statusFilter || undefined,
+      });
 
       return response.ok({
         body: {
           summaries,
           nextPagePagination,
           prevPagePagination,
-          totalSummaryCount,
         },
       });
     } catch (e) {
diff --git a/x-pack/test/api_integration/apis/uptime/rest/monitor_states_real_data.ts b/x-pack/test/api_integration/apis/uptime/rest/monitor_states_real_data.ts
index bdc18ac831d27..6eb6851c44e45 100644
--- a/x-pack/test/api_integration/apis/uptime/rest/monitor_states_real_data.ts
+++ b/x-pack/test/api_integration/apis/uptime/rest/monitor_states_real_data.ts
@@ -17,7 +17,6 @@ interface ExpectedMonitorStatesPage {
   absFrom: number;
   absTo: number;
   size: number;
-  totalCount: number;
   prevPagination: null | string;
   nextPagination: null | string;
 }
@@ -34,14 +33,13 @@ const checkMonitorStatesResponse = ({
   absFrom,
   absTo,
   size,
-  totalCount,
   prevPagination,
   nextPagination,
 }: ExpectedMonitorStatesPage) => {
   const decoded = MonitorSummariesResultType.decode(response);
   expect(isRight(decoded)).to.be.ok();
   if (isRight(decoded)) {
-    const { summaries, prevPagePagination, nextPagePagination, totalSummaryCount } = decoded.right;
+    const { summaries, prevPagePagination, nextPagePagination } = decoded.right;
     expect(summaries).to.have.length(size);
     expect(summaries?.map((s) => s.monitor_id)).to.eql(statesIds);
     expect(
@@ -55,7 +53,6 @@ const checkMonitorStatesResponse = ({
         expect(point.timestamp).to.be.lessThan(absTo);
       });
     });
-    expect(totalSummaryCount).to.be(totalCount);
     expect(prevPagePagination).to.be(prevPagination);
     expect(nextPagePagination).to.eql(nextPagination);
   }
@@ -84,7 +81,6 @@ export default function ({ getService }: FtrProviderContext) {
         absFrom,
         absTo,
         size: 1,
-        totalCount: 2000,
         prevPagination: null,
         nextPagination: null,
       });
@@ -468,7 +464,6 @@ export default function ({ getService }: FtrProviderContext) {
         },
       ];
 
-      const totalCount = 2000;
       let pagination: string | null = null;
       for (let page = 1; page <= expectedPageCount; page++) {
         const baseUrl = `${API_URLS.MONITOR_LIST}?dateRangeStart=${from}&dateRangeEnd=${to}&pageSize=${size}`;
@@ -482,7 +477,6 @@ export default function ({ getService }: FtrProviderContext) {
           absFrom,
           absTo,
           size,
-          totalCount,
         });
 
         // Test to see if the previous page pagination works on every page (other than the first)
@@ -496,7 +490,6 @@ export default function ({ getService }: FtrProviderContext) {
             absFrom,
             absTo,
             size,
-            totalCount,
           });
         }
       }
@@ -525,7 +518,6 @@ export default function ({ getService }: FtrProviderContext) {
         absFrom,
         absTo,
         size: LENGTH,
-        totalCount: 2000,
         prevPagination: null,
         nextPagination:
           '{"cursorDirection":"AFTER","sortOrder":"ASC","cursorKey":{"monitor_id":"0009-up"}}',
diff --git a/x-pack/test/security_api_integration/tests/session_idle/cleanup.ts b/x-pack/test/security_api_integration/tests/session_idle/cleanup.ts
index 876aaa6a70b7a..a5fc0a2134fc0 100644
--- a/x-pack/test/security_api_integration/tests/session_idle/cleanup.ts
+++ b/x-pack/test/security_api_integration/tests/session_idle/cleanup.ts
@@ -94,9 +94,9 @@ export default function ({ getService }: FtrProviderContext) {
       expect(await getNumberOfSessionDocuments()).to.be(1);
 
       // Cleanup routine runs every 10s, and idle timeout threshold is three times larger than 5s
-      // idle timeout, let's wait for 30s to make sure cleanup routine runs when idle timeout
+      // idle timeout, let's wait for 40s to make sure cleanup routine runs when idle timeout
       // threshold is exceeded.
-      await delay(30000);
+      await delay(40000);
 
       // Session info is removed from the index and cookie isn't valid anymore
       expect(await getNumberOfSessionDocuments()).to.be(0);
@@ -139,9 +139,9 @@ export default function ({ getService }: FtrProviderContext) {
       expect(await getNumberOfSessionDocuments()).to.be(4);
 
       // Cleanup routine runs every 10s, and idle timeout threshold is three times larger than 5s
-      // idle timeout, let's wait for 30s to make sure cleanup routine runs when idle timeout
+      // idle timeout, let's wait for 40s to make sure cleanup routine runs when idle timeout
       // threshold is exceeded.
-      await delay(30000);
+      await delay(40000);
 
       // Session for basic and SAML that used global session settings should not be valid anymore.
       expect(await getNumberOfSessionDocuments()).to.be(2);
diff --git a/x-pack/test/security_api_integration/tests/session_lifespan/cleanup.ts b/x-pack/test/security_api_integration/tests/session_lifespan/cleanup.ts
index 328e17307a05f..100fa3f21fe01 100644
--- a/x-pack/test/security_api_integration/tests/session_lifespan/cleanup.ts
+++ b/x-pack/test/security_api_integration/tests/session_lifespan/cleanup.ts
@@ -91,9 +91,9 @@ export default function ({ getService }: FtrProviderContext) {
       });
       expect(await getNumberOfSessionDocuments()).to.be(1);
 
-      // Cleanup routine runs every 10s, let's wait for 30s to make sure it runs multiple times and
+      // Cleanup routine runs every 10s, let's wait for 40s to make sure it runs multiple times and
       // when lifespan is exceeded.
-      await delay(30000);
+      await delay(40000);
 
       // Session info is removed from the index and cookie isn't valid anymore
       expect(await getNumberOfSessionDocuments()).to.be(0);
@@ -134,9 +134,9 @@ export default function ({ getService }: FtrProviderContext) {
       });
       expect(await getNumberOfSessionDocuments()).to.be(4);
 
-      // Cleanup routine runs every 10s, let's wait for 30s to make sure it runs multiple times and
+      // Cleanup routine runs every 10s, let's wait for 40s to make sure it runs multiple times and
       // when lifespan is exceeded.
-      await delay(30000);
+      await delay(40000);
 
       // Session for basic and SAML that used global session settings should not be valid anymore.
       expect(await getNumberOfSessionDocuments()).to.be(2);
diff --git a/yarn.lock b/yarn.lock
index 16588a92956d9..cd847b3ad6e85 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -1324,10 +1324,10 @@
     snap-shot-compare "2.8.3"
     snap-shot-store "1.2.3"
 
-"@cypress/webpack-preprocessor@^5.4.10":
-  version "5.4.10"
-  resolved "https://registry.yarnpkg.com/@cypress/webpack-preprocessor/-/webpack-preprocessor-5.4.10.tgz#ed0a3ed495f5455899f7c567830b37477c3f26f5"
-  integrity sha512-6j809mAQcZsAbpIaQFlKwFQPKv1Y+ZyLr9bpW7d2utMGVll0W8Up4RPhIuAf4q9Tx+DOBQoiCpy/n0cRPxporw==
+"@cypress/webpack-preprocessor@^5.4.11":
+  version "5.4.11"
+  resolved "https://registry.yarnpkg.com/@cypress/webpack-preprocessor/-/webpack-preprocessor-5.4.11.tgz#77f86e399f04969d5d8692ada96c794c52d38f87"
+  integrity sha512-6kj0HsaWf1s0UT4qkABuwl676sW8S8lSTai3NUcF3BWj9BqhN4JPd2DdGcHNkNmYRkjpklPeGUHqAOyqMDj5+A==
   dependencies:
     bluebird "^3.7.1"
     debug "^4.1.1"
@@ -6755,6 +6755,16 @@ ansicolors@~0.3.2:
   resolved "https://registry.yarnpkg.com/ansicolors/-/ansicolors-0.3.2.tgz#665597de86a9ffe3aa9bfbe6cae5c6ea426b4979"
   integrity sha1-ZlWX3oap/+Oqm/vmyuXG6kJrSXk=
 
+antlr4ts-cli@^0.5.0-alpha.3:
+  version "0.5.0-alpha.3"
+  resolved "https://registry.yarnpkg.com/antlr4ts-cli/-/antlr4ts-cli-0.5.0-alpha.3.tgz#1f581b2a3c840d3921a2f3b1e739e48c7e7c18cd"
+  integrity sha512-i6oyxfaXU6qnw4HgyeSIsOLlsvT7zU3vmenoJKFNVFP1QNodtJMZYpnyxc8TmOFpJs7fEoWanLavSSDEmcCZBQ==
+
+antlr4ts@^0.5.0-alpha.3:
+  version "0.5.0-alpha.3"
+  resolved "https://registry.yarnpkg.com/antlr4ts/-/antlr4ts-0.5.0-alpha.3.tgz#fa6d39d88d6b96341a8afef45867af9abcb38766"
+  integrity sha512-La89tKkGcHFIVuruv4Bm1esc3zLmES2NOTEwwNS1pudz+zx/0FNqQeUu9p48i9/QHKPVqjN87LB+q3buTg7oDQ==
+
 any-base@^1.1.0:
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/any-base/-/any-base-1.1.0.tgz#ae101a62bc08a597b4c9ab5b7089d456630549fe"
@@ -9938,6 +9948,11 @@ commander@^5.0.0:
   resolved "https://registry.yarnpkg.com/commander/-/commander-5.0.0.tgz#dbf1909b49e5044f8fdaf0adc809f0c0722bdfd0"
   integrity sha512-JrDGPAKjMGSP1G0DUoaceEJ3DZgAfr/q6X7FVk4+U5KxUSKviYGM2k6zWkfyyBHy5rAtzgYJFa1ro2O9PtoxwQ==
 
+commander@^5.1.0:
+  version "5.1.0"
+  resolved "https://registry.yarnpkg.com/commander/-/commander-5.1.0.tgz#46abbd1652f8e059bddaef99bbdcb2ad9cf179ae"
+  integrity sha512-P0CysNDQ7rtVw4QIQtm+MRxV66vKFSvlsQvGYXZWR3qFU0jlMKHZZZgw8e+8DSah4UDKMqnknRDQz+xuQXQ/Zg==
+
 common-tags@1.8.0, common-tags@^1.8.0:
   version "1.8.0"
   resolved "https://registry.yarnpkg.com/common-tags/-/common-tags-1.8.0.tgz#8e3153e542d4a39e9b10554434afaaf98956a937"
@@ -10801,10 +10816,10 @@ cypress-promise@^1.1.0:
   resolved "https://registry.yarnpkg.com/cypress-promise/-/cypress-promise-1.1.0.tgz#f2d66965945fe198431aaf692d5157cea9d47b25"
   integrity sha512-DhIf5PJ/a0iY+Yii6n7Rbwq+9TJxU4pupXYzf9mZd8nPG0AzQrj9i+pqINv4xbI2EV1p+PKW3maCkR7oPG4GrA==
 
-cypress@^5.5.0:
-  version "5.5.0"
-  resolved "https://registry.yarnpkg.com/cypress/-/cypress-5.5.0.tgz#1da0355794a43247f8a80cb7f505e83e1cf847cb"
-  integrity sha512-UHEiTca8AUTevbT2pWkHQlxoHtXmbq+h6Eiu/Mz8DqpNkF98zjTBLv/HFiKJUU5rQzp9EwSWtms33p5TWCJ8tQ==
+cypress@^6.0.1:
+  version "6.0.1"
+  resolved "https://registry.yarnpkg.com/cypress/-/cypress-6.0.1.tgz#86857ca2f527c3723575737deab42fd8f2a209df"
+  integrity sha512-3xtQZ0YM65soLgKQUgn2wg2IbWsM6A2yBg6L4RF31mZHr5LNKdO2/9sgiwxEVMKu2C2m6+IQ75zHP41kZP5rPg==
   dependencies:
     "@cypress/listr-verbose-renderer" "^0.4.1"
     "@cypress/request" "^2.88.5"
@@ -10818,7 +10833,7 @@ cypress@^5.5.0:
     chalk "^4.1.0"
     check-more-types "^2.24.0"
     cli-table3 "~0.6.0"
-    commander "^4.1.1"
+    commander "^5.1.0"
     common-tags "^1.8.0"
     debug "^4.1.1"
     eventemitter2 "^6.4.2"