Add descriptions, remove queue

elastic · Feb 15, 2021 · eaaa67f · eaaa67f
1 parent 6eb04ec
commit eaaa67f
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 28 deletions.
diff --git a/apmpackage/apm/0.1.0/agent/input/template.yml.hbs b/apmpackage/apm/0.1.0/agent/input/template.yml.hbs
@@ -13,6 +13,3 @@ apm-server:
     rum.response_headers: {{rum_response_headers}}
     rum.event_rate.limit: {{rum_event_rate_limit}}
     rum.event_rate.lru_size: {{rum_event_rate_lru_size}}
-queue.mem.events: {{queue_mem_events}}
-queue.mem.flush.min_events: {{queue_mem_flush_min_events}}
-queue.mem.flush.timeout: {{queue_mem_flush_timeout}}
diff --git a/apmpackage/apm/0.1.0/manifest.yml b/apmpackage/apm/0.1.0/manifest.yml
@@ -37,76 +37,67 @@ policy_templates:
         show_user: true
       - name: api_key_enabled
         type: bool
-        title: Enable API Key Auth between APM Server and Agents
+        title: API Key Auth
+        description: Enable API Key auth between APM Server and APM Agents.
         required: false
         show_user: true
         default: false
       - name: enable_rum
         type: bool
         title: Enable RUM
+        description: Enable Real User Monitoring (RUM).
         required: true
         show_user: true
         default: false
       - name: api_key_limit
         type: int
-        title: Maximum number of allowed API Keys between APM Server and Agents
+        title: Maximum number of API Keys
+        description: Restrict number of unique API Keys per minute, used for auth between APM Agents and Server.  
         required: false
         show_user: false
         default: 100
       - name: capture_personal_data
         type: bool
-        title: Capture personal data (e.g. IP, User Agent)
+        title: Capture personal data
+        description: Capture personal data such as IP or User Agent.
         required: false
         show_user: false
         default: true
       - name: rum_allow_origins
         type: string
-        title: RUM - Allow Origins
+        title: RUM - Origin Headers
+        description: Allowed Origin headers to be sent by User Agents. 
         multi: true
         required: false
         show_user: false
         default: ['*']
       - name: rum_allow_headers
         type: string
         title: RUM - Access-Control-Allow-Headers
+        description: Supported Access-Control-Allow-Headers in addition to "Content-Type", "Content-Encoding" and "Accept".
         multi: true
         required: false
         show_user: false
       - name: rum_response_headers
         type: yaml
-        title: RUM - Custom response headers
+        title: RUM - Custom HTTP response headers
+        description: Added to RUM responses, e.g. for security policy compliance.
         required: false
         show_user: false
       - name: rum_event_rate_limit
         type: int
-        title: RUM - Maximum events per IP per second
+        title: RUM - Rate limit events per IP
+        description: Maximum number of events allowed per IP per second. 
         required: false
         show_user: false
         default: 300
       - name: rum_event_rate_lru_size
         type: int
-        title: RUM - Cache size (unique IPs)
+        title: RUM - Rate limit cache size 
+        description: Number of unique IPs to be cached for the rate limiter. 
         required: false
         show_user: false
         default: 1000
-      - name: queue_mem_events
-        type: int
-        title: Event buffer capacity (number of events)
-        required: false
-        show_user: false
-        default: 4096   
-      - name: queue_mem_flush_min_events
-        type: int
-        title: Event buffer flush batch size (number of events)
-        required: false
-        show_user: false
-        default: 2048   
-      - name: queue_mem_flush_timeout
-        type: string
-        title: Event buffer flush timeout
-        required: false
-        show_user: false
-        default: '1s'   
       - name: max_event_bytes
         type: int
         title: Maximum size per event (bytes)