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.

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

Add input groups support #685

Merged
merged 23 commits into from
Apr 14, 2021
Merged
Show file tree
Hide file tree
Changes from 6 commits
Commits
Show all changes
23 commits
Select commit Hold shift + click to select a range
c1aa90f
add icons from policy templates and package level vars
kaiyan-sheng Mar 29, 2021
d26ab1d
add categories at policy template level
kaiyan-sheng Mar 29, 2021
0540e30
Merge remote-tracking branch 'upstream/master' into input_groups
kaiyan-sheng Mar 29, 2021
3761555
update format
kaiyan-sheng Mar 29, 2021
ffedd09
add screenshots at policy template level
kaiyan-sheng Mar 29, 2021
fc13d63
adjust test data package version
kaiyan-sheng Mar 29, 2021
06ad054
Merge remote-tracking branch 'upstream/master' into input_groups
kaiyan-sheng Mar 31, 2021
e3e844d
Add policy template icons into /search endpoint
kaiyan-sheng Mar 31, 2021
a6a596f
fix base policy templates
kaiyan-sheng Mar 31, 2021
0a1cdcb
Fix policy template icon path
kaiyan-sheng Apr 1, 2021
45348d0
fix screenshot paths
kaiyan-sheng Apr 1, 2021
39db2ea
update /categories endpoint to include policy templates
kaiyan-sheng Apr 1, 2021
8a3e734
add include_policy_templates parameter for /categories endpoint
kaiyan-sheng Apr 5, 2021
777176e
update README for /categories?include_policy_templates=true
kaiyan-sheng Apr 5, 2021
78e7990
add changelog
kaiyan-sheng Apr 5, 2021
b11ecd1
add input_groups into manifest.yml
kaiyan-sheng Apr 7, 2021
ea0b18e
add readme into policy templates
kaiyan-sheng Apr 8, 2021
3fbf902
fix include_policy_templates flag
kaiyan-sheng Apr 8, 2021
5b546c2
Merge remote-tracking branch 'upstream/master' into input_groups
kaiyan-sheng Apr 8, 2021
2ef3d80
fix include_policy_templates
kaiyan-sheng Apr 8, 2021
e55db35
Merge remote-tracking branch 'upstream/master' into input_groups
kaiyan-sheng Apr 12, 2021
423cf8a
remove predefined input groups
kaiyan-sheng Apr 12, 2021
ab574d3
add check for os.PathError
kaiyan-sheng Apr 14, 2021
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
7 changes: 6 additions & 1 deletion testdata/generated/categories-experimental.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,13 +2,18 @@
{
"id": "aws",
"title": "AWS",
"count": 1
"count": 2
},
{
"id": "azure",
"title": "Azure",
"count": 1
},
{
"id": "cloud",
"title": "Cloud",
"count": 1
},
{
"id": "containers",
"title": "Containers",
Expand Down
10 changes: 10 additions & 0 deletions testdata/generated/categories.json
Original file line number Diff line number Diff line change
@@ -1,9 +1,19 @@
[
{
"id": "aws",
"title": "AWS",
"count": 1
},
{
"id": "azure",
"title": "Azure",
"count": 1
},
{
"id": "cloud",
"title": "Cloud",
"count": 1
},
{
"id": "containers",
"title": "Containers",
Expand Down
293 changes: 293 additions & 0 deletions testdata/generated/package/input_groups/0.0.1/index.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,293 @@
{
"name": "aws",
"title": "AWS",
"version": "0.0.1",
"release": "beta",
"description": "AWS Integration",
"type": "integration",
"download": "/epr/aws/aws-0.0.1.zip",
"path": "/package/aws/0.0.1",
"icons": [
{
"src": "/img/logo_aws.svg",
"path": "/package/aws/0.0.1/img/logo_aws.svg",
"title": "logo aws",
"size": "32x32",
"type": "image/svg+xml"
},
{
"src": "/img/logo_ec2.svg",
kaiyan-sheng marked this conversation as resolved.
Show resolved Hide resolved
"path": "/package/aws/0.0.1/img/logo_ec2.svg",
"title": "AWS EC2 logo",
"size": "32x32",
"type": "image/svg+xml"
}
],
"format_version": "1.0.0",
"readme": "/package/aws/0.0.1/docs/README.md",
"license": "basic",
"categories": [
"aws",
"cloud"
],
"conditions": {
"kibana.version": "~7.x.x"
},
"screenshots": [
{
"src": "/img/metricbeat-aws-overview.png",
"path": "/package/aws/0.0.1/img/metricbeat-aws-overview.png",
"title": "metricbeat aws overview",
"size": "3848x2440",
"type": "image/png"
}
],
"assets": [
"/package/aws/0.0.1/manifest.yml",
"/package/aws/0.0.1/docs/README.md",
"/package/aws/0.0.1/img/logo_aws.svg",
"/package/aws/0.0.1/img/logo_ec2.svg",
"/package/aws/0.0.1/img/metricbeat-aws-ec2-overview.png",
"/package/aws/0.0.1/img/metricbeat-aws-overview.png",
"/package/aws/0.0.1/data_stream/ec2_logs/manifest.yml",
"/package/aws/0.0.1/data_stream/ec2_metrics/manifest.yml",
"/package/aws/0.0.1/data_stream/ec2_metrics/sample_event.json",
"/package/aws/0.0.1/kibana/dashboard/0c610510-5cbd-11e9-8477-077ec9664dbd.json",
"/package/aws/0.0.1/kibana/visualization/0a994af0-5c9d-11e9-8477-077ec9664dbd.json",
"/package/aws/0.0.1/kibana/visualization/36f872a0-5c03-11e9-85b4-19d0072eb4f2.json",
"/package/aws/0.0.1/kibana/visualization/38f96190-5c99-11e9-8477-077ec9664dbd.json",
"/package/aws/0.0.1/kibana/visualization/7e4084e0-5c99-11e9-8477-077ec9664dbd.json",
"/package/aws/0.0.1/kibana/visualization/80844540-5c97-11e9-8477-077ec9664dbd.json",
"/package/aws/0.0.1/kibana/visualization/ab48c3f0-5ca6-11e9-8477-077ec9664dbd.json",
"/package/aws/0.0.1/data_stream/ec2_logs/fields/agent.yml",
"/package/aws/0.0.1/data_stream/ec2_logs/fields/base-fields.yml",
"/package/aws/0.0.1/data_stream/ec2_logs/fields/ecs.yml",
"/package/aws/0.0.1/data_stream/ec2_logs/fields/fields.yml",
"/package/aws/0.0.1/data_stream/ec2_metrics/fields/agent.yml",
"/package/aws/0.0.1/data_stream/ec2_metrics/fields/base-fields.yml",
"/package/aws/0.0.1/data_stream/ec2_metrics/fields/ecs.yml",
"/package/aws/0.0.1/data_stream/ec2_metrics/fields/fields.yml",
"/package/aws/0.0.1/data_stream/ec2_metrics/fields/package-fields.yml",
"/package/aws/0.0.1/data_stream/ec2_logs/agent/stream/s3.yml.hbs",
"/package/aws/0.0.1/data_stream/ec2_logs/elasticsearch/ingest_pipeline/default.yml",
"/package/aws/0.0.1/data_stream/ec2_metrics/agent/stream/stream.yml.hbs"
],
"policy_templates": [
{
"name": "ec2",
"title": "AWS EC2",
"description": "Collect logs and metrics from EC2 service",
"inputs": [
{
"type": "s3",
"vars": [
{
"name": "visibility_timeout",
"type": "text",
"title": "Visibility Timeout",
"description": "The duration that the received messages are hidden from subsequent retrieve requests after being retrieved by a ReceiveMessage request. The maximum is 12 hours.",
"multi": false,
"required": false,
"show_user": false
},
{
"name": "api_timeout",
"type": "text",
"title": "API Timeout",
"description": "The maximum duration of AWS API can take. The maximum is half of the visibility timeout value.",
"multi": false,
"required": false,
"show_user": false
}
],
"title": "Collect logs from EC2 service",
"description": "Collecting EC2 logs using S3 input",
"input_group": "logs"
},
{
"type": "aws/metrics",
"title": "Collect metrics from EC2 service",
"description": "Collecting EC2 metrics using AWS CloudWatch",
"input_group": "metrics"
}
],
"multiple": true,
"icons": [
{
"src": "/img/logo_ec2.svg",
"path": "",
"title": "AWS EC2 logo",
"size": "32x32",
"type": "image/svg+xml"
}
],
"categories": [
"compute"
],
"screenshots": [
{
"src": "/img/metricbeat-aws-ec2-overview.png",
"path": "",
"title": "metricbeat aws ec2 overview",
"size": "2640x2240",
"type": "image/png"
}
]
}
],
"data_streams": [
{
"type": "logs",
"dataset": "aws.ec2_logs",
"title": "AWS EC2 logs",
"release": "beta",
"ingest_pipeline": "default",
"streams": [
{
"input": "s3",
"vars": [
{
"name": "queue_url",
"type": "text",
"title": "Queue URL",
"description": "URL of the AWS SQS queue that messages will be received from.",
"multi": false,
"required": true,
"show_user": true
},
{
"name": "fips_enabled",
"type": "bool",
"title": "Enable S3 FIPS",
"description": "Enabling this option changes the service name from `s3` to `s3-fips` for connecting to the correct service endpoint.",
"multi": false,
"required": false,
"show_user": false,
"default": false
}
],
"template_path": "s3.yml.hbs",
"title": "AWS EC2 logs",
"description": "Collect AWS EC2 logs using s3 input",
"enabled": true
}
],
"package": "aws",
"path": "ec2_logs"
},
{
"type": "metrics",
"dataset": "aws.ec2_metrics",
"title": "AWS EC2 metrics",
"release": "beta",
"streams": [
{
"input": "aws/metrics",
"vars": [
{
"name": "period",
"type": "text",
"title": "Period",
"multi": false,
"required": true,
"show_user": true,
"default": "5m"
},
{
"name": "regions",
"type": "text",
"title": "Regions",
"multi": true,
"required": false,
"show_user": true
},
{
"name": "latency",
"type": "text",
"title": "Latency",
"multi": false,
"required": false,
"show_user": false
},
{
"name": "tags_filter",
"type": "yaml",
"title": "Tags Filter",
"multi": false,
"required": false,
"show_user": false,
"default": "# - key: \"created-by\"\n # value: \"foo\"\n"
}
],
"template_path": "stream.yml.hbs",
"title": "AWS EC2 metrics",
"description": "Collect AWS EC2 metrics",
"enabled": true
}
],
"package": "aws",
"path": "ec2_metrics"
}
],
"vars": [
{
"name": "shared_credential_file",
"type": "text",
"title": "Shared Credential File",
"description": "Directory of the shared credentials file.",
"multi": false,
"required": false,
"show_user": false
},
{
"name": "credential_profile_name",
"type": "text",
"title": "Credential Profile Name",
"multi": false,
"required": false,
"show_user": true
},
{
"name": "access_key_id",
"type": "text",
"title": "Access Key ID",
"multi": false,
"required": false,
"show_user": false
},
{
"name": "secret_access_key",
"type": "text",
"title": "Secret Access Key",
"multi": false,
"required": false,
"show_user": false
},
{
"name": "session_token",
"type": "text",
"title": "Session Token",
"multi": false,
"required": false,
"show_user": false
},
{
"name": "role_arn",
"type": "text",
"title": "Role ARN",
"multi": false,
"required": false,
"show_user": false
},
{
"name": "endpoint",
"type": "text",
"title": "Endpoint",
"description": "URL of the entry point for an AWS web service.",
"multi": false,
"required": false,
"show_user": false,
"default": "amazonaws.com"
}
]
}
Loading