Merge remote-tracking branch 'origin/main' into openshift-ai-integration

# Conflicts:
#	output/schema/schema.json

Author: Jan-Kazlouski-elastic

compiler/src/model/utils.ts

@@ -877,6 +877,11 @@ function hoistPropertyAnnotations (property: model.Property, jsDocs: JSDoc[]): v
         assert(jsDocs, Array.isArray(value), 'The default value should be an array')
         property.serverDefault = value
       } else {
+        // JSDoc prevents literal @ in values, but the at sign can be escaped
+        if (value.startsWith('\\@')) {
+          value = value.replace('\\@', '@')
+        }
+
         switch (property.type.type.name) {
           case 'boolean':
             assert(jsDocs, value === 'true' || value === 'false', `The default value for ${property.name} should be a boolean`)

docs/modeling-guide.md

@@ -601,6 +601,18 @@ class Foo {
 }
 ```
 
+If you need an `@` sign, you can escape it:
+
+```ts
+class Foo {
+  /**
+   * Field containing event timestamp.
+   * @server_default \@timestamp
+   */
+  timestamp_field?: Field
+}
+```
+
 #### `@doc_id`
 
 An identifier that can be used for generating the doc url in clients.