Skip to content

Commit

Permalink
[src] Azure Ocean Cluster V2 - Export Logs (#614)
Browse files Browse the repository at this point in the history
[src] Data Integration - Support Azure Blob as a new vendor
  • Loading branch information
sidaniel authored May 29, 2024
1 parent 187f34a commit 12b04d1
Show file tree
Hide file tree
Showing 10 changed files with 70 additions and 1 deletion.
3 changes: 2 additions & 1 deletion api/services/dataIntegration/parameters/vendor.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -5,4 +5,5 @@ example: s3
schema:
type: string
enum:
- s3
- s3
- azureBlob
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
type: object
title: Azure Blob
required:
- storageAccount
- container
properties:
storageAccount:
type: string
description: |
The name of the storage account to use.
example: myStorageAccount
container:
description: |
The container in which your files will be stored within the storage account.
type: string
example: dev
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
type: object
title: Azure Blob
properties:
storageAccount:
type: string
description: |
The name of the storage account to use.
example: myStorageAccount
container:
description: |
The container in which your files will be stored within the storage account.
type: string
example: dev
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@ properties:
description: The vendor for the data integration. This value affects the expected `config`.
enum:
- s3
- azureBlob
name:
description: The name of the data integration.
type: string
Expand All @@ -20,3 +21,4 @@ properties:
description: The config of this data integration. Depends on the value of `vendor`.
oneOf:
- $ref: './s3DataIntegrationCreate.yaml'
- $ref: './azureBlobDataIntegrationCreate.yaml'
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@ properties:
description: The vendor for the data integration. This value affects the expected `config`.
enum:
- s3
- azureBlob
#- datadog - NOT PUBLISHED YET
name:
description: The name of the data integration.
Expand Down Expand Up @@ -44,4 +45,5 @@ properties:
description: The config of this data integration. Depends on the value of `vendor`.
oneOf:
- $ref: './s3DataIntegrationCreate.yaml'
- $ref: './azureBlobDataIntegrationCreate.yaml'
# - $ref: './datadogDataIntegration.yaml' NOT PUBLISHED YET
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@ properties:
**This value is immutable and must be the same as the existing data integration.**
enum:
- s3
- azureBlob
name:
description: The name of the data integration.
type: string
Expand All @@ -26,3 +27,4 @@ properties:
description: The config of this data integration. Depends on the value of `vendor`.
oneOf:
- $ref: './s3DataIntegrationUpdate.yaml'
- $ref: './azureBlobDataIntegrationUpdate.yaml'
2 changes: 2 additions & 0 deletions api/services/ocean/aks/schemas/create/ocean-cluster.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -58,6 +58,8 @@ properties:
$ref: "../../schemas/ocean-autoScaler.yaml"
scheduling:
$ref: "../../schemas/ocean-scheduling.yaml"
logging:
$ref: "../../schemas/ocean-logging.yaml"
health:
$ref: "../../schemas/ocean-health.yaml"
virtualNodeGroupTemplate:
Expand Down
2 changes: 2 additions & 0 deletions api/services/ocean/aks/schemas/ocean-cluster.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -53,6 +53,8 @@ properties:
$ref: "../schemas/ocean-autoScaler.yaml"
scheduling:
$ref: "../schemas/ocean-scheduling.yaml"
logging:
$ref: "../schemas/ocean-logging.yaml"
health:
$ref: "../schemas/ocean-health.yaml"
virtualNodeGroupTemplate:
Expand Down
27 changes: 27 additions & 0 deletions api/services/ocean/aks/schemas/ocean-logging.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,27 @@
type: object
title: Ocean AKS Logging
description: The Ocean AKS Logging object.
required:
- export
properties:
export:
type: object
title: The Ocean AKS Logging Export
description: The Ocean AKS Logging Export object.
required:
- azureBlob
properties:
azureBlob:
type: object
title: The Ocean AKS Logging Azure Blob Export
description: |
Exports your cluster's logs to the storage account and container configured on the storage account [data integration](/#operation/DataIntegrationCreate) given.
Each file contains logs of 3 minutes where each log is separated by a new line and saved as a JSON.
The file formats are `container`/`accountId`_`oceanId`_`oceanName`_`startTime`.log
required:
- id
properties:
id:
type: string
description: The identifier of The Azure Blob data integration to export the logs to.
example: di-123
2 changes: 2 additions & 0 deletions api/services/ocean/aks/schemas/update/ocean-cluster.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,8 @@ properties:
$ref: "../../schemas/ocean-autoScaler.yaml"
scheduling:
$ref: "../../schemas/ocean-scheduling.yaml"
logging:
$ref: "../../schemas/ocean-logging.yaml"
health:
$ref: "../../schemas/ocean-health.yaml"
virtualNodeGroupTemplate:
Expand Down

0 comments on commit 12b04d1

Please sign in to comment.