Merge branch 'main' into docs/add-lb-metrics

digitalocean · Sep 6, 2024 · 56edd3c · 56edd3c
2 parents 85c7e02 + ccd01a3
commit 56edd3c
Show file tree

Hide file tree

Showing 13 changed files with 42 additions and 209 deletions.
diff --git a/specification/DigitalOcean-public.v2.yaml b/specification/DigitalOcean-public.v2.yaml
@@ -570,14 +570,6 @@ paths:
     get:
       $ref: 'resources/apps/apps_get_logs_active_deployment_aggregate.yml'
 
-  /v2/apps/tiers:
-    get:
-      $ref: 'resources/apps/apps_list_tiers.yml'
-
-  /v2/apps/tiers/{slug}:
-    get:
-      $ref: 'resources/apps/apps_get_tier.yml'
-
   /v2/apps/tiers/instance_sizes:
     get:
       $ref: 'resources/apps/apps_list_instanceSizes.yml'

diff --git a/specification/resources/apps/apps_get_tier.yml b/specification/resources/apps/apps_get_tier.yml
diff --git a/specification/resources/apps/apps_list_tiers.yml b/specification/resources/apps/apps_list_tiers.yml
diff --git a/specification/resources/apps/examples/curl/apps_get_tier.yml b/specification/resources/apps/examples/curl/apps_get_tier.yml
diff --git a/specification/resources/apps/examples/curl/apps_list_tiers.yml b/specification/resources/apps/examples/curl/apps_list_tiers.yml
diff --git a/specification/resources/apps/examples/python/apps_get_tier.yml b/specification/resources/apps/examples/python/apps_get_tier.yml
diff --git a/specification/resources/apps/examples/python/apps_list_tiers.yml b/specification/resources/apps/examples/python/apps_list_tiers.yml
diff --git a/specification/resources/apps/models/app_component_base.yml b/specification/resources/apps/models/app_component_base.yml
@@ -59,4 +59,7 @@ properties:
     example: node-js
 
   log_destinations:
-    $ref: app_log_destination_definition.yml
+    type: array
+    items:
+      $ref: app_log_destination_definition.yml
+    description: A list of configured log forwarding destinations.
diff --git a/specification/resources/apps/models/app_functions_spec.yml b/specification/resources/apps/models/app_functions_spec.yml
@@ -50,7 +50,10 @@ properties:
     $ref: apps_gitlab_source_spec.yml
 
   log_destinations:
-    $ref: app_log_destination_definition.yml
+    type: array
+    items:
+      $ref: app_log_destination_definition.yml
+    description: A list of configured log forwarding destinations.
 
 required:
 - name
diff --git a/specification/resources/apps/models/apps_tier.yml b/specification/resources/apps/models/apps_tier.yml
diff --git a/specification/resources/apps/responses/all_tiers.yml b/specification/resources/apps/responses/all_tiers.yml
diff --git a/specification/resources/apps/responses/get_tier.yml b/specification/resources/apps/responses/get_tier.yml
diff --git a/specification/resources/databases/responses/logsink.yml b/specification/resources/databases/responses/logsink.yml
@@ -11,39 +11,44 @@ headers:
 content:
   application/json:
     schema:
-      allOf:
-        - $ref: "../models/logsink_verbose.yml"
-      required:
-        - sink_id
-        - sink_name
-        - sink_type
-        - config
+      properties:
+        sink:
+          allOf:
+            - $ref: "../models/logsink_verbose.yml"
+          required:
+            - sink_id
+            - sink_name
+            - sink_type
+            - config
     examples:
       Create an opensearch logsink:
         value:
-          sink_id: "dfcc9f57d86bf58e321c2c6c31c7a971be244ac7"
-          sink_name: "logs-sink"
-          sink_type: "opensearch"
-          config:
-            url: https://user:[email protected]:25060
-            index_prefix: "opensearch-logs"
-            index_days_max: 5
+          sink:
+            sink_id: "dfcc9f57d86bf58e321c2c6c31c7a971be244ac7"
+            sink_name: "logs-sink"
+            sink_type: "opensearch"
+            config:
+              url: https://user:[email protected]:25060
+              index_prefix: "opensearch-logs"
+              index_days_max: 5
       Create an elasticsearch logsink:
         value:
-          sink_id: "dfcc9f57d86bf58e321c2c6c31c7a971be244ac7"
-          sink_name: "logs-sink"
-          sink_type: "elasticsearch"
-          config:
-            url: https://user:[email protected]:25060
-            index_prefix: "elasticsearch-logs"
-            index_days_max: 5
+          sink:
+            sink_id: "dfcc9f57d86bf58e321c2c6c31c7a971be244ac7"
+            sink_name: "logs-sink"
+            sink_type: "elasticsearch"
+            config:
+              url: https://user:[email protected]:25060
+              index_prefix: "elasticsearch-logs"
+              index_days_max: 5
       Create a rsyslog logsink:
         value:
-          sink_id: "dfcc9f57d86bf58e321c2c6c31c7a971be244ac7"
-          sink_name: logs-sink
-          sink_type: rsyslog
-          config:
-            server: 192.168.0.1
-            port: 514
-            tls: false
-            format: rfc5424
+          sink:
+            sink_id: "dfcc9f57d86bf58e321c2c6c31c7a971be244ac7"
+            sink_name: logs-sink
+            sink_type: rsyslog
+            config:
+              server: 192.168.0.1
+              port: 514
+              tls: false
+              format: rfc5424