-
Notifications
You must be signed in to change notification settings - Fork 52
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
[Backport 2.x] Integration enhancements (#1870)
* Add recursive file lookup for all table creation queries * Change the versions and source urls * Change the source url to release of catalog repo, and fix the formats for apache and nginx * Reverted some version changes on integrations with only doc link changes --------- Signed-off-by: Ryan Liang <jiallian@amazon.com>
- Loading branch information
Showing
16 changed files
with
115 additions
and
101 deletions.
There are no files selected for viewing
4 changes: 2 additions & 2 deletions
4
...n_cloudfront/amazon_cloudfront-1.0.0.json → ...n_cloudfront/amazon_cloudfront-1.1.0.json
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
4 changes: 2 additions & 2 deletions
4
...repository/amazon_s3/amazon_s3-1.0.0.json → ...repository/amazon_s3/amazon_s3-1.1.0.json
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
4 changes: 2 additions & 2 deletions
4
...mazon_vpc_flow/amazon_vpc_flow-1.0.0.json → ...mazon_vpc_flow/amazon_vpc_flow-1.1.0.json
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
74 changes: 37 additions & 37 deletions
74
server/adaptors/integrations/__data__/repository/apache/apache-1.0.0.json
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,52 +1,52 @@ | ||
| { | ||
| name: "apache", | ||
| version: "1.0.0", | ||
| displayName: "Apache Access Logs", | ||
| description: "Insights on applications using the standard Apache access log format.", | ||
| license: "Apache-2.0", | ||
| type: "logs_apache", | ||
| labels: ["Observability", "Logs", "Flint S3"], | ||
| author: "OpenSearch", | ||
| sourceUrl: "https://github.com/opensearch-project/dashboards-observability/tree/main/server/adaptors/integrations/__data__/repository/apache/info", | ||
| workflows: [ | ||
| "name": "apache", | ||
| "version": "1.0.0", | ||
| "displayName": "Apache Access Logs", | ||
| "description": "Insights on applications using the standard Apache access log format.", | ||
| "license": "Apache-2.0", | ||
| "type": "logs_apache", | ||
| "labels": ["Observability", "Logs", "Flint S3"], | ||
| "author": "OpenSearch", | ||
| "sourceUrl": "https://github.com/opensearch-project/opensearch-catalog/releases/tag/apache-1.0.0", | ||
| "workflows": [ | ||
| { | ||
| name: "queries", | ||
| label: "Queries (recommended)", | ||
| description: "Tables and pre-written queries for quickly getting insights on your data.", | ||
| enabled_by_default: true | ||
| "name": "queries", | ||
| "label": "Queries (recommended)", | ||
| "description": "Tables and pre-written queries for quickly getting insights on your data.", | ||
| "enabled_by_default": true | ||
| }, | ||
| { | ||
| name: "dashboards", | ||
| label: "Dashboards & Visualizations", | ||
| description: "Dashboards and indices that enable you to easily visualize important metrics.", | ||
| enabled_by_default: false | ||
| "name": "dashboards", | ||
| "label": "Dashboards & Visualizations", | ||
| "description": "Dashboards and indices that enable you to easily visualize important metrics.", | ||
| "enabled_by_default": false | ||
| } | ||
| ], | ||
| statics: { | ||
| logo: { | ||
| annotation: "Apache Logo", | ||
| path: "logo.png" | ||
| "statics": { | ||
| "logo": { | ||
| "annotation": "Apache Logo", | ||
| "path": "logo.png" | ||
| }, | ||
| gallery: [ | ||
| "gallery": [ | ||
| { | ||
| annotation: "Apache Dashboard", | ||
| path: "dashboard1.png" | ||
| "annotation": "Apache Dashboard", | ||
| "path": "dashboard1.png" | ||
| } | ||
| ] | ||
| }, | ||
| components: [ | ||
| { name: "communication", version: "1.0.0" }, | ||
| { name: "http", version: "1.0.0" }, | ||
| { name: "logs_apache", version: "1.0.0" } | ||
| "components": [ | ||
| { "name": "communication", "version": "1.0.0" }, | ||
| { "name": "http", "version": "1.0.0" }, | ||
| { "name": "logs_apache", "version": "1.0.0" } | ||
| ], | ||
| assets: [ | ||
| { name: "apache", version: "1.0.0", extension: "ndjson", type: "savedObjectBundle", workflows: ["dashboards"] }, | ||
| { name: "example_queries", version: "1.0.0", extension: "ndjson", type: "savedObjectBundle", workflows: ["queries"] }, | ||
| { name: "create_table", version: "1.0.0", extension: "sql", type: "query" }, | ||
| { name: "create_skipping_index", version: "1.0.0", extension: "sql", type: "query", workflows: ["queries"] }, | ||
| { name: "create_mv", version: "1.0.0", extension: "sql", type: "query", workflows: ["dashboards"] } | ||
| "assets": [ | ||
| { "name": "apache", "version": "1.0.0", "extension": "ndjson", "type": "savedObjectBundle", "workflows": ["dashboards"] }, | ||
| { "name": "example_queries", "version": "1.0.0", "extension": "ndjson", "type": "savedObjectBundle", "workflows": ["queries"] }, | ||
| { "name": "create_table", "version": "1.0.0", "extension": "sql", "type": "query" }, | ||
| { "name": "create_skipping_index", "version": "1.0.0", "extension": "sql", "type": "query", "workflows": ["queries"] }, | ||
| { "name": "create_mv", "version": "1.0.0", "extension": "sql", "type": "query", "workflows": ["dashboards"] } | ||
| ], | ||
| sampleData: { | ||
| path: "sample.json" | ||
| "sampleData": { | ||
| "path": "sample.json" | ||
| } | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
4 changes: 2 additions & 2 deletions
4
.../aws_cloudtrail/aws_cloudtrail-1.0.0.json → .../aws_cloudtrail/aws_cloudtrail-1.1.0.json
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
4 changes: 2 additions & 2 deletions
4
...a__/repository/aws_waf/aws_waf-1.0.0.json → ...a__/repository/aws_waf/aws_waf-1.1.0.json
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
8 changes: 5 additions & 3 deletions
8
server/adaptors/integrations/__data__/repository/haproxy/assets/create_table-1.0.0.sql
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,7 +1,9 @@ | ||
| CREATE EXTERNAL TABLE {table_name} ( | ||
| record STRING | ||
| ) USING csv | ||
| LOCATION '{s3_bucket_location}' | ||
| ) | ||
| USING csv | ||
| OPTIONS ( | ||
| sep='\0x1E' | ||
| sep='\0x1E', | ||
| recursiveFileLookup='true' | ||
| ) | ||
| LOCATION '{s3_bucket_location}' |
4 changes: 2 additions & 2 deletions
4
...a__/repository/haproxy/haproxy-1.0.0.json → ...a__/repository/haproxy/haproxy-1.1.0.json
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
78 changes: 39 additions & 39 deletions
78
server/adaptors/integrations/__data__/repository/nginx/nginx-1.0.0.json
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,56 +1,56 @@ | ||
| { | ||
| name: "nginx", | ||
| version: "1.0.0", | ||
| displayName: "Nginx", | ||
| description: "Analyze Nginx access logs.", | ||
| license: "Apache-2.0", | ||
| type: "logs", | ||
| labels: ["Observability", "Logs", "Flint S3"], | ||
| author: "OpenSearch", | ||
| sourceUrl: "https://github.com/opensearch-project/dashboards-observability/tree/main/server/adaptors/integrations/__data__/repository/nginx/info", | ||
| workflows: [ | ||
| "name": "nginx", | ||
| "version": "1.0.0", | ||
| "displayName": "Nginx", | ||
| "description": "Analyze Nginx access logs.", | ||
| "license": "Apache-2.0", | ||
| "type": "logs", | ||
| "labels": ["Observability", "Logs", "Flint S3"], | ||
| "author": "OpenSearch", | ||
| "sourceUrl": "https://github.com/opensearch-project/opensearch-catalog/releases/tag/nginx-1.0.0", | ||
| "workflows": [ | ||
| { | ||
| name: "queries", | ||
| label: "Queries (recommended)", | ||
| description: "Tables and pre-written queries for quickly getting insights on your data.", | ||
| enabled_by_default: true | ||
| "name": "queries", | ||
| "label": "Queries (recommended)", | ||
| "description": "Tables and pre-written queries for quickly getting insights on your data.", | ||
| "enabled_by_default": true | ||
| }, | ||
| { | ||
| name: "dashboards", | ||
| label: "Dashboards & Visualizations", | ||
| description: "Dashboards and indices that enable you to easily visualize important metrics.", | ||
| enabled_by_default: false | ||
| "name": "dashboards", | ||
| "label": "Dashboards & Visualizations", | ||
| "description": "Dashboards and indices that enable you to easily visualize important metrics.", | ||
| "enabled_by_default": false | ||
| } | ||
| ], | ||
| statics: { | ||
| logo: { | ||
| annotation: "NginX Logo", | ||
| path: "logo.svg" | ||
| "statics": { | ||
| "logo": { | ||
| "annotation": "NginX Logo", | ||
| "path": "logo.svg" | ||
| }, | ||
| gallery: [ | ||
| "gallery": [ | ||
| { | ||
| annotation: "NginX Dashboard", | ||
| path: "dashboard1.png" | ||
| "annotation": "NginX Dashboard", | ||
| "path": "dashboard1.png" | ||
| }, | ||
| { | ||
| annotation: "NginX Dashboard view", | ||
| path: "dashboard2.png" | ||
| "annotation": "NginX Dashboard view", | ||
| "path": "dashboard2.png" | ||
| } | ||
| ] | ||
| }, | ||
| components: [ | ||
| { name: "communication", version: "1.0.0" }, | ||
| { name: "http", version: "1.0.0" }, | ||
| { name: "logs", version: "1.0.0" } | ||
| "components": [ | ||
| { "name": "communication", "version": "1.0.0" }, | ||
| { "name": "http", "version": "1.0.0" }, | ||
| { "name": "logs", "version": "1.0.0" } | ||
| ], | ||
| assets: [ | ||
| { name: "nginx", version: "1.0.0", extension: "ndjson", type: "savedObjectBundle", workflows: ["dashboards"] }, | ||
| { name: "create_table", version: "1.0.0", extension: "sql", type: "query" }, | ||
| { name: "create_skipping_index", version: "1.0.0", extension: "sql", type: "query", workflows: ["queries"] }, | ||
| { name: "create_mv", version: "1.0.0", extension: "sql", type: "query", workflows: ["dashboards"] }, | ||
| { name: "example_queries", version: "1.0.0", extension: "ndjson", type: "savedObjectBundle", workflows: ["queries"] } | ||
| "assets": [ | ||
| { "name": "nginx", "version": "1.0.0", "extension": "ndjson", "type": "savedObjectBundle", "workflows": ["dashboards"] }, | ||
| { "name": "create_table", "version": "1.0.0", "extension": "sql", "type": "query" }, | ||
| { "name": "create_skipping_index", "version": "1.0.0", "extension": "sql", "type": "query", "workflows": ["queries"] }, | ||
| { "name": "create_mv", "version": "1.0.0", "extension": "sql", "type": "query", "workflows": ["dashboards"] }, | ||
| { "name": "example_queries", "version": "1.0.0", "extension": "ndjson", "type": "savedObjectBundle", "workflows": ["queries"] } | ||
| ], | ||
| sampleData: { | ||
| path: "sample.json" | ||
| "sampleData": { | ||
| "path": "sample.json" | ||
| } | ||
| } |