-
Notifications
You must be signed in to change notification settings - Fork 55
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Add JSON5 parsing capabilities for integration configs (#1732)
* update live mv table name (#1725) Signed-off-by: YANGDB <yang.db.dev@gmail.com> Signed-off-by: dev241202@gmail.com <dev241202@gmail.com> * Integrated JSON5 Signed-off-by: dev241202@gmail.com <dev241202@gmail.com> * json_data_adaptor Signed-off-by: dev241202@gmail.com <dev241202@gmail.com> * Added tests for JSON5 Signed-off-by: dev241202@gmail.com <dev241202@gmail.com> * Updated integration configs to json5 Signed-off-by: dev241202@gmail.com <dev241202@gmail.com> * Revert "update live mv table name (#1725)" This reverts commit 71597f5. Signed-off-by: dev241202@gmail.com <dev241202@gmail.com> * Updated filename Signed-off-by: dev241202@gmail.com <dev241202@gmail.com> * Delete t --count 5c93001..fe64d02 Signed-off-by: Devesh Rahatekar <79015420+devesh-2002@users.noreply.github.com> * Updated some integrations Signed-off-by: dev241202@gmail.com <dev241202@gmail.com> --------- Signed-off-by: YANGDB <yang.db.dev@gmail.com> Signed-off-by: dev241202@gmail.com <dev241202@gmail.com> Signed-off-by: Devesh Rahatekar <79015420+devesh-2002@users.noreply.github.com> Signed-off-by: Simeon Widdis <sawiddis@gmail.com> Co-authored-by: YANGDB <yang.db.dev@gmail.com> Co-authored-by: Simeon Widdis <sawiddis@gmail.com>
- Loading branch information
1 parent
d3ab3cd
commit 9532b7d
Showing
5 changed files
with
90 additions
and
159 deletions.
There are no files selected for viewing
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
118 changes: 40 additions & 78 deletions
118
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,90 +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": "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: "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: "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 | ||
} | ||
], | ||
"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" | ||
} | ||
} |
122 changes: 42 additions & 80 deletions
122
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,94 +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": "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: "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: "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 | ||
} | ||
], | ||
"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" | ||
} | ||
} |
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