[PoC] Discover context

.buildkite/pipelines/es_serverless/emergency_release_branch_testing.yml

@@ -9,9 +9,7 @@ notify:
     if: "build.state == 'passed' || build.state == 'failed' || build.state == 'scheduled'"
 
 steps:
-  - trigger: "kibana-artifacts-container-image"
-    label: ":docker: Build Kibana Artifacts Container Image"
-    build:
-      branch: $BUILDKITE_BRANCH
-      commit: $BUILDKITE_COMMIT
-      message: Running PR build for $BUILDKITE_BRANCH
+  - command: "ts-node .buildkite/scripts/serverless/emergency_release/trigger_container_build.ts"
+    label: "Trigger container build if there are new commits"
+    env:
+      DRY_RUN: $DRY_RUN

.buildkite/scripts/common/env.sh

@@ -70,9 +70,6 @@ export TEST_BROWSER_HEADLESS=1
 
 export ELASTIC_APM_ENVIRONMENT=ci
 export ELASTIC_APM_TRANSACTION_SAMPLE_RATE=0.1
-export ELASTIC_APM_SERVER_URL=https://kibana-ci-apm.apm.us-central1.gcp.cloud.es.io
-# Not really a secret, if APM supported public auth we would use it and APM requires that we use this name
-export ELASTIC_APM_SECRET_TOKEN=7YKhoXsO4MzjhXjx2c
 
 if is_pr; then
   if is_pr_with_label "ci:collect-apm"; then

.buildkite/scripts/lifecycle/pre_command.sh

@@ -154,6 +154,13 @@ export GCS_SA_CDN_BUCKET
 GCS_SA_CDN_URL="$(vault_get gcs-sa-cdn-prod cdn)"
 export GCS_SA_CDN_URL
 
+
+ELASTIC_APM_SERVER_URL=$(vault_get project-kibana-ci-apm apm_server_url)
+export ELASTIC_APM_SERVER_URL
+
+ELASTIC_APM_API_KEY=$(vault_get project-kibana-ci-apm apm_server_api_key)
+export ELASTIC_APM_API_KEY
+
 # Setup Failed Test Reporter Elasticsearch credentials
 {
   TEST_FAILURES_ES_CLOUD_ID=$(vault_get failed_tests_reporter_es cloud_id)

.buildkite/scripts/serverless/create_deploy_tag/generate_gpctl_trigger.ts

@@ -20,7 +20,7 @@ async function main() {
 
 function uploadTriggerStep(commitSha: string) {
   const triggerStep: BuildkiteTriggerStep = {
-    label: ':releasethekaken: Trigger GPCTL / Release Kibana',
+    label: ':ship: Trigger GPCTL / Release Kibana',
     trigger: 'gpctl-promote',
     async: true,
     build: {

.buildkite/scripts/serverless/emergency_release/trigger_container_build.ts

@@ -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
+ * 2.0 and the Server Side Public License, v 1; you may not use this file except
+ * in compliance with, at your election, the Elastic License 2.0 or the Server
+ * Side Public License, v 1.
+ */
+
+import { execSync } from 'child_process';
+import { BuildkiteClient, BuildkiteTriggerStep } from '#pipeline-utils';
+
+const DRY_RUN = !!process.env.DRY_RUN?.match(/^(true|1)$/i);
+const buildkite = new BuildkiteClient();
+
+async function main() {
+  const commitSha = process.env.OVERRIDE_COMMIT || process.env.BUILDKITE_COMMIT;
+
+  if (!isCurrentHeadInMain(commitSha!)) {
+    if (!DRY_RUN) {
+      console.log(
+        `DRY_RUN: Commit ${commitSha} isn't in main, triggering container build :green_heart:`
+      );
+    } else {
+      console.log(`Commit ${commitSha} isn't in main, triggering container build :green_heart:`);
+      uploadTriggerBuildStep();
+    }
+  } else {
+    if (!DRY_RUN) {
+      console.log(`DRY_RUN: Commit ${commitSha} is in main, no build necessary :yellow_heart:`);
+    } else {
+      console.log(`Commit ${commitSha} is in main, no trigger necessary :yellow_heart:`);
+    }
+  }
+}
+
+function isCurrentHeadInMain(commitSha: string) {
+  const containmentTest = execSync(
+    `git branch -r --contains '${commitSha}' | grep -E "(upstream|origin)/main" | wc -l`
+  ).toString();
+
+  return parseInt(containmentTest, 10) >= 1;
+}
+
+function uploadTriggerBuildStep() {
+  const triggerStep: BuildkiteTriggerStep = {
+    label: ':point_right: Trigger emergency commit container build',
+    trigger: 'kibana-artifacts-container-image',
+    build: {
+      message: `Triggered by '${process.env.BUILDKITE_PIPELINE_NAME || 'unknown'}'`,
+      env: {},
+    },
+  };
+
+  buildkite.uploadSteps([triggerStep]);
+}
+
+main()
+  .then(() => {
+    console.log('Trigger container build step uploaded.');
+  })
+  .catch((error) => {
+    console.error(error);
+    process.exit(1);
+  });

docs/user/alerting/rule-types.asciidoc

@@ -39,35 +39,14 @@ see {subscriptions}[the subscription page].
 [[observability-rules]]
 === {observability} rules
 
-{observability} rules are categorized into APM and {user-experience}, Logs, Metrics, {stack-monitor-app}, and Uptime.
+{observability} rules detect complex conditions in your observability data and create alerts when a rule's conditions are met. For example, you can create a rule that detects when the value of a metric exceeds a specified threshold or when an anomaly occurs on a system or service you are monitoring. For more information, refer to {observability-guide}/create-alerts.html[Alerting].
 
 [NOTE]
 ==============================================
 If you create a rule in the {observability} app, its alerts are not visible in
 *{stack-manage-app} > {rules-ui}*. They are visible only in the {observability} app.
 ==============================================
 
-[cols="2*<"]
-|===
-
-
-| <<apm-alerts, APM and User Experience>>
-| Detect complex conditions in *APM* data and trigger built-in actions when the conditions are met.
-
-| {observability-guide}/logs-threshold-alert.html[Logs rules]
-| Detect complex conditions in the {logs-app}.
-
-| {observability-guide}/metrics-threshold-alert.html[Metrics rules]
-| Detect complex conditions in the {metrics-app}.
-
-| {observability-guide}/slo-burn-rate-alert.html[SLO burn rate rule]
-| Detect when the burn rate is above a defined threshold.
-
-| {observability-guide}/monitor-status-alert.html[Uptime rules]
-| Detect complex conditions in the {uptime-app}.
-
-|===
-
 [float]
 [[ml-rules]]
 === Machine learning rules