Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[Backport 2.x] Fix integration labeling to identify S3 integrations #1165

Merged
merged 1 commit into from
Oct 24, 2023
Merged

[Backport 2.x] Fix integration labeling to identify S3 integrations #1165

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
20 changes: 5 additions & 15 deletions public/components/integrations/components/available_integration_overview_page.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -117,7 +117,9 @@ export function AvailableIntegrationOverviewPage(props: AvailableIntegrationOver
http.get(`${INTEGRATIONS_BASE}/repository`).then((exists) => {
setData(exists.data);

let newItems = exists.data.hits.flatMap((hit: { labels?: string[] }) => hit.labels ?? []);
let newItems = exists.data.hits.flatMap(
(hit: { labels?: string[] }) => hit.labels?.sort() ?? []
);
newItems = [...new Set(newItems)].sort().map((newItem) => {
return {
name: newItem,
Expand Down Expand Up @@ -182,13 +184,7 @@ export function AvailableIntegrationOverviewPage(props: AvailableIntegrationOver
{isCardView
? AvailableIntegrationsCardView({
data: {
hits: data.hits.filter((hit) =>
helper.every((compon) =>
hit.components
.map((x) => x.name.split('_').findLast(() => true))
.includes(compon)
)
),
hits: data.hits.filter((hit) => helper.every((tag) => hit.labels?.includes(tag))),
},
isCardView,
setCardView,
Expand All @@ -200,13 +196,7 @@ export function AvailableIntegrationOverviewPage(props: AvailableIntegrationOver
: AvailableIntegrationsTable({
loading: false,
data: {
hits: data.hits.filter((hit) =>
helper.every((compon) =>
hit.components
.map((x) => x.name.split('_').findLast(() => true))
.includes(compon)
)
),
hits: data.hits.filter((hit) => helper.every((tag) => hit.labels?.includes(tag))),
},
isCardView,
setCardView,
Expand Down
2 changes: 1 addition & 1 deletion server/adaptors/integrations/__data__/repository/apache/apache-1.0.0.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
"description": "Apache web logs collector",
"license": "Apache-2.0",
"type": "logs_apache",
"labels": ["log", "communication", "http"],
"labels": ["Observability", "Logs"],
"author": "OpenSearch",
"sourceUrl": "https://github.com/opensearch-project/dashboards-observability/tree/main/server/adaptors/integrations/__data__/repository/apache/info",
"statics": {
Expand Down
2 changes: 1 addition & 1 deletion server/adaptors/integrations/__data__/repository/aws_cloudfront/aws_cloudfront-1.0.0.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
"description": "AWS cloudfront Object Store",
"license": "Apache-2.0",
"type": "logs-aws_cloudfront",
"labels": ["log", "aws", "s3", "cloud", "cloudfront"],
"labels": ["Observability", "Logs", "AWS", "Cloud"],
"author": "OpenSearch",
"sourceUrl": "https://github.com/opensearch-project/dashboards-observability/tree/main/server/adaptors/integrations/__data__/repository/aws_cloudfront/info",
"statics": {
Expand Down
2 changes: 1 addition & 1 deletion server/adaptors/integrations/__data__/repository/aws_cloudtrail/aws_cloudtrail-1.0.0.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
"description": "AWS CloudTrail log collector",
"license": "Apache-2.0",
"type": "logs-aws_cloudtrail",
"labels": ["log", "aws", "s3", "cloud", "cloudtrail"],
"labels": ["Observability", "Logs", "AWS", "Flint S3", "Cloud"],
"author": "OpenSearch",
"sourceUrl": "https://github.com/opensearch-project/dashboards-observability/tree/main/server/adaptors/integrations/__data__/repository/aws_cloudtrail/info",
"statics": {
Expand Down
2 changes: 1 addition & 1 deletion server/adaptors/integrations/__data__/repository/aws_elb/aws_elb-1.0.0.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
"description": "AWS Elastic Load Balancer collector",
"license": "Apache-2.0",
"type": "logs_elb",
"labels": ["log", "aws", "communication", "http", "cloud", "elb", "url"],
"labels": ["Observability", "Logs", "AWS", "Flint S3", "Cloud"],
"author": "OpenSearch",
"sourceUrl": "https://github.com/opensearch-project/dashboards-observability/tree/main/server/adaptors/integrations/__data__/repository/aws_elb/info",
"statics": {
Expand Down
2 changes: 1 addition & 1 deletion server/adaptors/integrations/__data__/repository/aws_rds/aws_rds-1.0.0.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
"description": "AWS RDS",
"license": "Apache-2.0",
"type": "logs_rds",
"labels": ["log", "aws", "s3", "cloud", "rds"],
"labels": ["Observability", "Logs", "AWS", "Cloud"],
"author": "OpenSearch",
"sourceUrl": "https://github.com/opensearch-project/dashboards-observability/tree/main/server/adaptors/integrations/__data__/repository/aws_rds/info",
"statics": {
Expand Down
2 changes: 1 addition & 1 deletion server/adaptors/integrations/__data__/repository/aws_s3/aws_s3-1.0.0.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
"description": "AWS S3 Object Store",
"license": "Apache-2.0",
"type": "logs_s3",
"labels": ["log", "aws", "s3", "cloud"],
"labels": ["Observability", "Logs", "AWS", "Cloud"],
"author": "OpenSearch",
"sourceUrl": "https://github.com/opensearch-project/dashboards-observability/tree/main/server/adaptors/integrations/__data__/repository/aws_s3/info",
"statics": {
Expand Down
2 changes: 1 addition & 1 deletion server/adaptors/integrations/__data__/repository/aws_vpc_flow/aws_vpc_flow-1.0.0.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
"description": "AWS VPC Flow log collector",
"license": "Apache-2.0",
"type": "logs_vpc",
"labels": ["log", "aws", "s3", "cloud", "communication", "vpc"],
"labels": ["Observability", "Logs", "AWS", "Flint S3", "Cloud"],
"author": "Haidong Wang",
"sourceUrl": "https://github.com/opensearch-project/dashboards-observability/tree/main/server/adaptors/integrations/__data__/repository/aws_vpc_flow/info",
"statics": {
Expand Down
2 changes: 1 addition & 1 deletion server/adaptors/integrations/__data__/repository/aws_waf/aws_waf-1.0.0.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
"description": "AWS waf log collector",
"license": "Apache-2.0",
"type": "logs_waf",
"labels": ["log", "aws", "s3", "cloud", "waf"],
"labels": ["Observability", "Logs", "AWS", "Cloud"],
"author": "OpenSearch",
"sourceUrl": "https://github.com/opensearch-project/dashboards-observability/tree/main/server/adaptors/integrations/__data__/repository/aws_waf/info",
"statics": {
Expand Down
2 changes: 1 addition & 1 deletion server/adaptors/integrations/__data__/repository/k8s/k8s-1.0.0.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
"description": "Kubernetes web logs collector",
"license": "Apache-2.0",
"type": "logs-k8s",
"labels": ["log", "k8s", "cloud", "container"],
"labels": ["Observability", "Logs", "Cloud"],
"author": "OpenSearch",
"sourceUrl": "https://github.com/opensearch-project/dashboards-observability/tree/main/server/adaptors/integrations/__data__/repository/k8s/info",
"statics": {
Expand Down
2 changes: 1 addition & 1 deletion server/adaptors/integrations/__data__/repository/nginx/nginx-1.0.0.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
"description": "Nginx HTTP server collector",
"license": "Apache-2.0",
"type": "logs",
"labels": ["log", "http", "communication"],
"labels": ["Observability", "Logs", "Flint S3"],
"author": "OpenSearch",
"sourceUrl": "https://github.com/opensearch-project/dashboards-observability/tree/main/server/adaptors/integrations/__data__/repository/nginx/info",
"statics": {
Expand Down
1 change: 1 addition & 0 deletions server/adaptors/integrations/validators.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,7 @@ const templateSchema: JSONSchemaType<IntegrationConfig> = {
license: { type: 'string' },
type: { type: 'string' },
labels: { type: 'array', items: { type: 'string' }, nullable: true },
tags: { type: 'array', items: { type: 'string' }, nullable: true },
author: { type: 'string', nullable: true },
description: { type: 'string', nullable: true },
sourceUrl: { type: 'string', nullable: true },
Expand Down