Merge branch '7.9' into backport/7.9/pr-74341

docs/drilldowns/explore-underlying-data.asciidoc

@@ -33,9 +33,9 @@ applies the filters and time range created by the events that triggered the acti
 [role="screenshot"]
 image::images/explore_data_in_chart.png[Explore underlying data from chart]
 
-You can disable this action by adding the following line to your `kibana.yml` config.
+To enable this action add the following line to your `kibana.yml` config.
 
 ["source","yml"]
 -----------
-xpack.discoverEnhanced.actions.exploreDataInChart.enabled: false
+xpack.discoverEnhanced.actions.exploreDataInChart.enabled: true
 -----------

docs/user/monitoring/index.asciidoc

@@ -2,6 +2,7 @@ include::xpack-monitoring.asciidoc[]
 include::beats-details.asciidoc[leveloffset=+1]
 include::cluster-alerts.asciidoc[leveloffset=+1]
 include::elasticsearch-details.asciidoc[leveloffset=+1]
+include::kibana-alerts.asciidoc[leveloffset=+1]
 include::kibana-details.asciidoc[leveloffset=+1]
 include::logstash-details.asciidoc[leveloffset=+1]
 include::monitoring-troubleshooting.asciidoc[leveloffset=+1]

docs/user/monitoring/kibana-alerts.asciidoc

@@ -0,0 +1,36 @@
+[role="xpack"]
+[[kibana-alerts]]
+= {kib} Alerts
+
+The {stack} {monitor-features} provide
+<<alerting-getting-started,{kib} alerts>> out-of-the box to notify you of
+potential issues in the {stack}. These alerts are preconfigured based on the
+best practices recommended by Elastic. However, you can tailor them to meet your 
+specific needs.
+
+When you open *{stack-monitor-app}*, the preconfigured {kib} alerts are
+created automatically. If you collect monitoring data from multiple clusters,
+these alerts can search, detect, and notify on various conditions across the
+clusters. The alerts are visible alongside your existing {watcher} cluster
+alerts. You can view details about the alerts that are active and view health
+and performance data for {es}, {ls}, and Beats in real time, as well as
+analyze past performance. You can also modify active alerts.
+
+[role="screenshot"]
+image::user/monitoring/images/monitoring-kibana-alerts.png["Kibana alerts in the Stack Monitoring app"]
+
+To review and modify all the available alerts, use
+<<managing-alerts-and-actions,*{alerts-ui}*>> in *{stack-manage-app}*.
+
+[discrete]
+[[kibana-alerts-cpu-threshold]]
+== CPU threshold
+
+This alert is triggered when a node runs a consistently high CPU load. By
+default, the trigger condition is set at 85% or more averaged over the last 5
+minutes. The alert is grouped across all the nodes of the cluster by running
+checks on a schedule time of 1 minute with a re-notify internal of 1 day. 
+
+NOTE: Some action types are subscription features, while others are free.
+For a comparison of the Elastic subscription levels, see the alerting section of
+the {subscriptions}[Subscriptions page].

x-pack/plugins/discover_enhanced/server/config.ts

@@ -10,7 +10,7 @@ import { PluginConfigDescriptor } from '../../../../src/core/server';
 export const configSchema = schema.object({
   actions: schema.object({
     exploreDataInChart: schema.object({
-      enabled: schema.boolean({ defaultValue: true }),
+      enabled: schema.boolean({ defaultValue: false }),
     }),
   }),
 });

x-pack/plugins/observability/public/services/get_observability_alerts.ts

@@ -11,15 +11,12 @@ const allowedConsumers = ['apm', 'uptime', 'logs', 'metrics', 'alerts'];
 
 export async function getObservabilityAlerts({ core }: { core: AppMountContext['core'] }) {
   try {
-    const { data = [] }: { data: Alert[] } = await core.http.get(
-      core.http.basePath.prepend('/api/alerts/_find'),
-      {
-        query: {
-          page: 1,
-          per_page: 20,
-        },
-      }
-    );
+    const { data = [] }: { data: Alert[] } = await core.http.get('/api/alerts/_find', {
+      query: {
+        page: 1,
+        per_page: 20,
+      },
+    });
 
     return data.filter(({ consumer }) => allowedConsumers.includes(consumer));
   } catch (e) {

x-pack/test/functional/apps/dashboard/drilldowns/index.ts

@@ -24,6 +24,9 @@ export default function ({ loadTestFile, getService }: FtrProviderContext) {
 
     loadTestFile(require.resolve('./dashboard_drilldowns'));
     loadTestFile(require.resolve('./explore_data_panel_action'));
-    loadTestFile(require.resolve('./explore_data_chart_action'));
+
+    // Disabled for now as it requires xpack.discoverEnhanced.actions.exploreDataInChart.enabled
+    // setting set in kibana.yml to work. Once that is enabled by default, we can re-enable this test suite.
+    // loadTestFile(require.resolve('./explore_data_chart_action'));
   });
 }