Merge branch 'main' into improve-artifacts-mocked-data-cy

elastic · Aug 2, 2024 · 9da80f1 · 9da80f1
2 parents 653f6fc + 4edcdef
commit 9da80f1
Show file tree

Hide file tree

Showing 28 changed files with 2,340 additions and 150 deletions.
diff --git a/.buildkite/scripts/steps/code_generation/security_solution_codegen.sh b/.buildkite/scripts/steps/code_generation/security_solution_codegen.sh
@@ -15,6 +15,9 @@ echo -e "\n[Security Solution OpenAPI Code Generation] Lists Common Package\n"
 echo -e "\n[Security Solution OpenAPI Code Generation] Exceptions Common Package\n"
 (cd packages/kbn-securitysolution-exceptions-common && yarn openapi:generate)
 
+echo -e "\n[Security Solution OpenAPI Code Generation] Endpoint Exceptions Common Package\n"
+(cd packages/kbn-securitysolution-endpoint-exceptions-common && yarn openapi:generate)
+
 echo -e "\n[Security Solution OpenAPI Code Generation] Security Solution Plugin\n"
 (cd x-pack/plugins/security_solution && yarn openapi:generate)
 

diff --git a/.buildkite/scripts/steps/openapi_bundling/security_solution_openapi_bundling.sh b/.buildkite/scripts/steps/openapi_bundling/security_solution_openapi_bundling.sh
@@ -21,6 +21,9 @@ echo -e "\n[Security Solution OpenAPI Bundling] Lists API\n"
 echo -e "\n[Security Solution OpenAPI Bundling] Exceptions API\n"
 (cd packages/kbn-securitysolution-exceptions-common && yarn openapi:bundle)
 
+echo -e "\n[Security Solution OpenAPI Bundling] Endpoint Exceptions API\n"
+(cd packages/kbn-securitysolution-endpoint-exceptions-common && yarn openapi:bundle)
+
 echo -e "\n[Security Solution OpenAPI Bundling] Endpoint Management API\n"
 (cd x-pack/plugins/security_solution && yarn openapi:bundle:endpoint-management)
 

diff --git a/package.json b/package.json
@@ -1184,7 +1184,7 @@
     "remark-gfm": "1.0.0",
     "remark-parse-no-trim": "^8.0.4",
     "remark-stringify": "^8.0.3",
-    "require-in-the-middle": "^7.3.0",
+    "require-in-the-middle": "^7.4.0",
     "reselect": "^4.1.8",
     "resize-observer-polyfill": "1.5.1",
     "rison-node": "1.0.2",

diff --git a/packages/kbn-monaco/src/console/lexer_rules/console_output.ts b/packages/kbn-monaco/src/console/lexer_rules/console_output.ts
@@ -35,8 +35,10 @@ export const consoleOutputLexerRules: monaco.languages.IMonarchLanguage = {
       matchTokensWithEOL('status.success', /\b2\d{2}(?: \w+)*$/, 'root'),
       // Redirection messages (status codes 300 – 399)
       matchTokensWithEOL('status.redirect', /\b3\d{2}(?: \w+)*$/, 'root'),
-      // Client and server error responses (status codes 400 – 599)
-      matchTokensWithEOL('status.error', /\b[4-5]\d{2}(?: \w+)*$/, 'root'),
+      // Client error responses (status codes 400 – 499)
+      matchTokensWithEOL('status.warning', /\b4\d{2}(?: \w+)*$/, 'root'),
+      // Server error responses (status codes 500 – 599)
+      matchTokensWithEOL('status.error', /\b5\d{2}(?: \w+)*$/, 'root'),
     ],
   },
 };
diff --git a/packages/kbn-monaco/src/console/theme.ts b/packages/kbn-monaco/src/console/theme.ts
@@ -39,23 +39,23 @@ export const buildConsoleTheme = (): monaco.editor.IStandaloneThemeData => {
       ),
       ...buildRuleGroup(
         ['status.info'],
-        makeHighContrastColor(euiThemeVars.euiColorWarningText)(background),
-        true
+        makeHighContrastColor(euiThemeVars.euiTextColor)(background)
       ),
       ...buildRuleGroup(
         ['status.success'],
-        makeHighContrastColor(euiThemeVars.euiColorSuccessText)(background),
-        true
+        makeHighContrastColor(euiThemeVars.euiTextColor)(euiThemeVars.euiColorSuccess)
       ),
       ...buildRuleGroup(
         ['status.redirect'],
-        makeHighContrastColor(euiThemeVars.euiColorWarningText)(background),
-        true
+        makeHighContrastColor(euiThemeVars.euiTextColor)(background)
+      ),
+      ...buildRuleGroup(
+        ['status.warning'],
+        makeHighContrastColor(euiThemeVars.euiTextColor)(euiThemeVars.euiColorWarning)
       ),
       ...buildRuleGroup(
         ['status.error'],
-        makeHighContrastColor(euiThemeVars.euiColorDangerText)(background),
-        true
+        makeHighContrastColor('#FFFFFF')(euiThemeVars.euiColorDanger)
       ),
       ...buildRuleGroup(['method'], makeHighContrastColor(methodTextColor)(background)),
       ...buildRuleGroup(['url'], makeHighContrastColor(urlTextColor)(background)),

diff --git a/packages/kbn-search-connectors/types/native_connectors.ts b/packages/kbn-search-connectors/types/native_connectors.ts
@@ -2017,12 +2017,7 @@ export const NATIVE_CONNECTOR_DEFINITIONS: Record<string, NativeConnector | unde
       },
       use_document_level_security: {
         default_value: null,
-        depends_on: [
-          {
-            field: 'data_source',
-            value: 'jira_cloud',
-          },
-        ],
+        depends_on: [],
         display: DisplayType.TOGGLE,
         label: ENABLE_DOCUMENT_LEVEL_SECURITY_LABEL,
         options: [],