From 2a8ad9aa43d0bc1c87442739bbec00e5f2b0f6e3 Mon Sep 17 00:00:00 2001 From: Marcin Tojek Date: Mon, 30 Mar 2020 16:43:24 +0200 Subject: [PATCH] Fix: if closing tag (#310) --- dev/import-beats/agent.go | 4 +- .../dataset/broker/agent/stream/stream.yml | 6 +- .../dataset/queue/agent/stream/stream.yml | 6 +- .../dataset/topic/agent/stream/stream.yml | 6 +- .../dataset/billing/agent/stream/stream.yml | 2 +- .../cloudtrail/agent/stream/stream.yml | 10 +-- .../cloudwatch-logs/agent/stream/stream.yml | 10 +-- .../agent/stream/stream.yml | 4 +- .../dataset/ec2-logs/agent/stream/stream.yml | 10 +-- .../ec2-metrics/agent/stream/stream.yml | 4 +- .../dataset/elb-logs/agent/stream/stream.yml | 10 +-- .../elb-metrics/agent/stream/stream.yml | 4 +- .../natgateway/agent/stream/stream.yml | 4 +- .../dataset/rds/agent/stream/stream.yml | 4 +- .../s3_daily_storage/agent/stream/stream.yml | 6 +- .../s3_request/agent/stream/stream.yml | 6 +- .../dataset/s3access/agent/stream/stream.yml | 10 +-- .../dataset/sqs/agent/stream/stream.yml | 4 +- .../transitgateway/agent/stream/stream.yml | 4 +- .../dataset/usage/agent/stream/stream.yml | 4 +- .../dataset/vpcflow/agent/stream/stream.yml | 12 ++-- .../dataset/vpn/agent/stream/stream.yml | 4 +- .../compute_vm/agent/stream/stream.yml | 8 +-- .../agent/stream/stream.yml | 8 +-- .../agent/stream/stream.yml | 8 +-- .../agent/stream/stream.yml | 8 +-- .../container_service/agent/stream/stream.yml | 8 +-- .../database_account/agent/stream/stream.yml | 8 +-- .../dataset/monitor/agent/stream/stream.yml | 12 ++-- .../dataset/storage/agent/stream/stream.yml | 8 +-- .../dataset/state/agent/stream/stream.yml | 2 +- .../dataset/stats/agent/stream/stream.yml | 2 +- .../dataset/log/agent/stream/stream.yml | 2 +- .../dataset/asa/agent/stream/stream.yml | 2 +- .../dataset/ftd/agent/stream/stream.yml | 2 +- .../dataset/ios/agent/stream/stream.yml | 2 +- .../dataset/container/agent/stream/stream.yml | 12 ++-- .../dataset/counter/agent/stream/stream.yml | 12 ++-- .../dataset/value/agent/stream/stream.yml | 12 ++-- .../dataset/collector/agent/stream/stream.yml | 4 +- .../dataset/ccr/agent/stream/stream.yml | 2 +- .../cluster_stats/agent/stream/stream.yml | 2 +- .../dataset/enrich/agent/stream/stream.yml | 2 +- .../dataset/index/agent/stream/stream.yml | 2 +- .../index_recovery/agent/stream/stream.yml | 2 +- .../index_summary/agent/stream/stream.yml | 2 +- .../dataset/ml_job/agent/stream/stream.yml | 2 +- .../node_stats/agent/stream/stream.yml | 2 +- .../dataset/shard/agent/stream/stream.yml | 2 +- .../dataset/expvar/agent/stream/stream.yml | 4 +- .../dataset/heap/agent/stream/stream.yml | 2 +- .../dataset/audit/agent/stream/stream.yml | 2 +- .../dataset/compute/agent/stream/stream.yml | 8 +-- .../dataset/firewall/agent/stream/stream.yml | 2 +- .../loadbalancing/agent/stream/stream.yml | 8 +-- .../dataset/pubsub/agent/stream/stream.yml | 8 +-- .../dataset/storage/agent/stream/stream.yml | 8 +-- .../dataset/vpcflow/agent/stream/stream.yml | 2 +- .../dataset/info/agent/stream/stream.yml | 4 +- .../dataset/stat/agent/stream/stream.yml | 4 +- .../dataset/qmgr/agent/stream/stream.yml | 2 +- .../dataset/log/agent/stream/stream.yml | 4 +- .../dataset/stats/agent/stream/stream.yml | 2 +- .../dataset/status/agent/stream/stream.yml | 2 +- .../dataset/container/agent/stream/stream.yml | 6 +- .../dataset/event/fields/fields.yml | 13 ++++ .../dataset/node/agent/stream/stream.yml | 6 +- .../dataset/pod/agent/stream/stream.yml | 6 +- .../state_container/agent/stream/stream.yml | 2 +- .../state_cronjob/agent/stream/stream.yml | 2 +- .../state_deployment/agent/stream/stream.yml | 2 +- .../state_node/agent/stream/stream.yml | 2 +- .../agent/stream/stream.yml | 2 +- .../agent/stream/stream.yml | 2 +- .../dataset/state_pod/agent/stream/stream.yml | 2 +- .../state_replicaset/agent/stream/stream.yml | 2 +- .../agent/stream/stream.yml | 2 +- .../state_service/agent/stream/stream.yml | 2 +- .../state_statefulset/agent/stream/stream.yml | 2 +- .../agent/stream/stream.yml | 2 +- .../dataset/system/agent/stream/stream.yml | 6 +- .../dataset/volume/agent/stream/stream.yml | 6 +- .../dataset/log/agent/stream/stream.yml | 2 +- .../dataset/node/agent/stream/stream.yml | 2 +- .../node_stats/agent/stream/stream.yml | 2 +- .../dataset/threat/agent/stream/stream.yml | 2 +- .../performance/agent/stream/stream.yml | 4 +- .../transaction_log/agent/stream/stream.yml | 4 +- .../stubstatus/agent/stream/stream.yml | 2 +- .../dataset/audit/agent/stream/stream.yml | 26 +++---- .../dataset/system/agent/stream/stream.yml | 2 +- .../dataset/collector/agent/stream/stream.yml | 6 +- .../dataset/panos/agent/stream/stream.yml | 2 +- .../dataset/pool/agent/stream/stream.yml | 2 +- .../dataset/query/agent/stream/stream.yml | 2 - .../dataset/query/manifest.yml | 6 -- .../remote_write/agent/stream/stream.yml | 6 -- .../dataset/remote_write/manifest.yml | 5 -- .../dataset/query/agent/stream/stream.yml | 6 +- .../dataset/eve/agent/stream/stream.yml | 2 +- .../dataset/core/agent/stream/stream.yml | 2 +- .../dataset/cpu/agent/stream/stream.yml | 10 +-- .../filesystem/agent/stream/stream.yml | 2 +- .../dataset/fsstat/agent/stream/stream.yml | 2 +- .../dataset/load/agent/stream/stream.yml | 10 +-- .../dataset/memory/agent/stream/stream.yml | 10 +-- .../dataset/network/agent/stream/stream.yml | 10 +-- .../dataset/process/agent/stream/stream.yml | 10 +-- .../dataset/process/fields/fields.yml | 4 +- .../process_summary/agent/stream/stream.yml | 10 +-- .../socket_summary/agent/stream/stream.yml | 10 +-- .../dataset/uptime/agent/stream/stream.yml | 6 +- ...fd6e0-faa0-11e6-947f-177f697178b8-ecs.json | 68 ++++++++++++------- .../Metricbeat-system-overview-ecs.json | 20 +++--- ...97ee0-1b96-11e7-8ada-3df93aab833e-ecs.json | 11 ++- ...fdb80-4d1d-11e7-b5f2-2b7c1895bf32-ecs.json | 21 ++++-- dev/packages/beats/system-0.0.1/manifest.yml | 2 +- .../dataset/cache/agent/stream/stream.yml | 2 +- .../dataset/memory/agent/stream/stream.yml | 2 +- .../dataset/requests/agent/stream/stream.yml | 2 +- .../dataset/threading/agent/stream/stream.yml | 2 +- .../dataset/status/agent/stream/stream.yml | 2 +- .../dataset/datastore/agent/stream/stream.yml | 6 +- .../dataset/host/agent/stream/stream.yml | 6 +- .../virtualmachine/agent/stream/stream.yml | 6 +- .../dataset/perfmon/agent/stream/stream.yml | 4 +- .../connection/agent/stream/stream.yml | 2 +- .../dataset/dce_rpc/agent/stream/stream.yml | 2 +- .../dataset/dhcp/agent/stream/stream.yml | 2 +- .../dataset/dnp3/agent/stream/stream.yml | 2 +- .../dataset/dns/agent/stream/stream.yml | 2 +- .../dataset/dpd/agent/stream/stream.yml | 2 +- .../dataset/ftp/agent/stream/stream.yml | 2 +- .../dataset/http/agent/stream/stream.yml | 2 +- .../dataset/irc/agent/stream/stream.yml | 2 +- .../dataset/kerberos/agent/stream/stream.yml | 2 +- .../dataset/modbus/agent/stream/stream.yml | 2 +- .../dataset/mysql/agent/stream/stream.yml | 2 +- .../dataset/notice/agent/stream/stream.yml | 2 +- .../dataset/ntlm/agent/stream/stream.yml | 2 +- .../dataset/radius/agent/stream/stream.yml | 2 +- .../dataset/rdp/agent/stream/stream.yml | 2 +- .../dataset/rfb/agent/stream/stream.yml | 2 +- .../dataset/sip/agent/stream/stream.yml | 2 +- .../dataset/smb_cmd/agent/stream/stream.yml | 2 +- .../dataset/smb_files/agent/stream/stream.yml | 2 +- .../smb_mapping/agent/stream/stream.yml | 2 +- .../dataset/smtp/agent/stream/stream.yml | 2 +- .../dataset/snmp/agent/stream/stream.yml | 2 +- .../dataset/socks/agent/stream/stream.yml | 2 +- .../dataset/ssh/agent/stream/stream.yml | 2 +- .../dataset/ssl/agent/stream/stream.yml | 2 +- .../dataset/syslog/agent/stream/stream.yml | 2 +- 153 files changed, 408 insertions(+), 370 deletions(-) diff --git a/dev/import-beats/agent.go b/dev/import-beats/agent.go index 46b231f05..ad632ea6d 100644 --- a/dev/import-beats/agent.go +++ b/dev/import-beats/agent.go @@ -104,7 +104,7 @@ func transformAgentConfigFile(configFilePath string) ([]byte, error) { line = strings.ReplaceAll(line, " }}", "}}") line = strings.ReplaceAll(line, "{{if .", "{{if this.") line = strings.ReplaceAll(line, "{{if", "{{#if") - line = strings.ReplaceAll(line, "{{end}}", "{{/end}}") + line = strings.ReplaceAll(line, "{{end}}", "{{/if}}") line = strings.ReplaceAll(line, "{{.", "{{this.") line = strings.ReplaceAll(line, "{{range .", "{{#each this.") line = strings.ReplaceAll(line, ".}}", "}}") @@ -186,7 +186,7 @@ func createAgentContentForMetrics(modulePath, moduleName, datasetName string, st } buffer.WriteString(fmt.Sprintf("%s: {{%s}}\n", variableName, variableName)) if !isAgentConfigOptionRequired(variableName) { - buffer.WriteString(fmt.Sprintf("{{#if %s}}\n", variableName)) + buffer.WriteString("{{/if}}\n") } } return agentContent{ diff --git a/dev/packages/beats/activemq-0.0.1/dataset/broker/agent/stream/stream.yml b/dev/packages/beats/activemq-0.0.1/dataset/broker/agent/stream/stream.yml index 395327747..f11f5dbad 100644 --- a/dev/packages/beats/activemq-0.0.1/dataset/broker/agent/stream/stream.yml +++ b/dev/packages/beats/activemq-0.0.1/dataset/broker/agent/stream/stream.yml @@ -3,11 +3,11 @@ metricsets: ["broker"] hosts: {{hosts}} {{#if password}} password: {{password}} -{{#if password}} +{{/if}} {{#if path}} path: {{path}} -{{#if path}} +{{/if}} period: {{period}} {{#if username}} username: {{username}} -{{#if username}} +{{/if}} diff --git a/dev/packages/beats/activemq-0.0.1/dataset/queue/agent/stream/stream.yml b/dev/packages/beats/activemq-0.0.1/dataset/queue/agent/stream/stream.yml index 2da47e412..206174db0 100644 --- a/dev/packages/beats/activemq-0.0.1/dataset/queue/agent/stream/stream.yml +++ b/dev/packages/beats/activemq-0.0.1/dataset/queue/agent/stream/stream.yml @@ -3,11 +3,11 @@ metricsets: ["queue"] hosts: {{hosts}} {{#if password}} password: {{password}} -{{#if password}} +{{/if}} {{#if path}} path: {{path}} -{{#if path}} +{{/if}} period: {{period}} {{#if username}} username: {{username}} -{{#if username}} +{{/if}} diff --git a/dev/packages/beats/activemq-0.0.1/dataset/topic/agent/stream/stream.yml b/dev/packages/beats/activemq-0.0.1/dataset/topic/agent/stream/stream.yml index 7df56b25c..a03922da4 100644 --- a/dev/packages/beats/activemq-0.0.1/dataset/topic/agent/stream/stream.yml +++ b/dev/packages/beats/activemq-0.0.1/dataset/topic/agent/stream/stream.yml @@ -3,11 +3,11 @@ metricsets: ["topic"] hosts: {{hosts}} {{#if password}} password: {{password}} -{{#if password}} +{{/if}} {{#if path}} path: {{path}} -{{#if path}} +{{/if}} period: {{period}} {{#if username}} username: {{username}} -{{#if username}} +{{/if}} diff --git a/dev/packages/beats/aws-0.0.1/dataset/billing/agent/stream/stream.yml b/dev/packages/beats/aws-0.0.1/dataset/billing/agent/stream/stream.yml index 84acf0fa2..92f5dcb3d 100644 --- a/dev/packages/beats/aws-0.0.1/dataset/billing/agent/stream/stream.yml +++ b/dev/packages/beats/aws-0.0.1/dataset/billing/agent/stream/stream.yml @@ -3,4 +3,4 @@ metricsets: ["billing"] period: {{period}} {{#if regions}} regions: {{regions}} -{{#if regions}} +{{/if}} diff --git a/dev/packages/beats/aws-0.0.1/dataset/cloudtrail/agent/stream/stream.yml b/dev/packages/beats/aws-0.0.1/dataset/cloudtrail/agent/stream/stream.yml index a229a6e03..169c940af 100644 --- a/dev/packages/beats/aws-0.0.1/dataset/cloudtrail/agent/stream/stream.yml +++ b/dev/packages/beats/aws-0.0.1/dataset/cloudtrail/agent/stream/stream.yml @@ -12,17 +12,17 @@ queue_url: {{this.queue_url}} expand_event_list_from_field: Records {{#if this.credential_profile_name}} credential_profile_name: {{this.credential_profile_name}} -{{/end}} +{{/if}} {{#if this.shared_credential_file}} shared_credential_file: {{this.shared_credential_file}} -{{/end}} +{{/if}} {{#if this.visibility_timeout}} visibility_timeout: {{this.visibility_timeout}} -{{/end}} +{{/if}} {{#if this.api_timeout}} api_timeout: {{this.api_timeout}} -{{/end}} +{{/if}} {{#if this.endpoint}} endpoint: {{this.endpoint}} -{{/end}} +{{/if}} {{/if}} diff --git a/dev/packages/beats/aws-0.0.1/dataset/cloudwatch-logs/agent/stream/stream.yml b/dev/packages/beats/aws-0.0.1/dataset/cloudwatch-logs/agent/stream/stream.yml index adb0af860..9e39f70d6 100644 --- a/dev/packages/beats/aws-0.0.1/dataset/cloudwatch-logs/agent/stream/stream.yml +++ b/dev/packages/beats/aws-0.0.1/dataset/cloudwatch-logs/agent/stream/stream.yml @@ -11,17 +11,17 @@ input: s3 queue_url: {{this.queue_url}} {{#if this.credential_profile_name}} credential_profile_name: {{this.credential_profile_name}} -{{/end}} +{{/if}} {{#if this.shared_credential_file}} shared_credential_file: {{this.shared_credential_file}} -{{/end}} +{{/if}} {{#if this.visibility_timeout}} visibility_timeout: {{this.visibility_timeout}} -{{/end}} +{{/if}} {{#if this.api_timeout}} api_timeout: {{this.api_timeout}} -{{/end}} +{{/if}} {{#if this.endpoint}} endpoint: {{this.endpoint}} -{{/end}} +{{/if}} {{/if}} diff --git a/dev/packages/beats/aws-0.0.1/dataset/cloudwatch-metrics/agent/stream/stream.yml b/dev/packages/beats/aws-0.0.1/dataset/cloudwatch-metrics/agent/stream/stream.yml index 86681e67e..12cdbcae7 100644 --- a/dev/packages/beats/aws-0.0.1/dataset/cloudwatch-metrics/agent/stream/stream.yml +++ b/dev/packages/beats/aws-0.0.1/dataset/cloudwatch-metrics/agent/stream/stream.yml @@ -2,8 +2,8 @@ input: aws/metrics metricsets: ["cloudwatch"] {{#if credential_profile_name}} credential_profile_name: {{credential_profile_name}} -{{#if credential_profile_name}} +{{/if}} {{#if metrics}} metrics: {{metrics}} -{{#if metrics}} +{{/if}} period: {{period}} diff --git a/dev/packages/beats/aws-0.0.1/dataset/ec2-logs/agent/stream/stream.yml b/dev/packages/beats/aws-0.0.1/dataset/ec2-logs/agent/stream/stream.yml index adb0af860..9e39f70d6 100644 --- a/dev/packages/beats/aws-0.0.1/dataset/ec2-logs/agent/stream/stream.yml +++ b/dev/packages/beats/aws-0.0.1/dataset/ec2-logs/agent/stream/stream.yml @@ -11,17 +11,17 @@ input: s3 queue_url: {{this.queue_url}} {{#if this.credential_profile_name}} credential_profile_name: {{this.credential_profile_name}} -{{/end}} +{{/if}} {{#if this.shared_credential_file}} shared_credential_file: {{this.shared_credential_file}} -{{/end}} +{{/if}} {{#if this.visibility_timeout}} visibility_timeout: {{this.visibility_timeout}} -{{/end}} +{{/if}} {{#if this.api_timeout}} api_timeout: {{this.api_timeout}} -{{/end}} +{{/if}} {{#if this.endpoint}} endpoint: {{this.endpoint}} -{{/end}} +{{/if}} {{/if}} diff --git a/dev/packages/beats/aws-0.0.1/dataset/ec2-metrics/agent/stream/stream.yml b/dev/packages/beats/aws-0.0.1/dataset/ec2-metrics/agent/stream/stream.yml index a465ffd40..fcaa09445 100644 --- a/dev/packages/beats/aws-0.0.1/dataset/ec2-metrics/agent/stream/stream.yml +++ b/dev/packages/beats/aws-0.0.1/dataset/ec2-metrics/agent/stream/stream.yml @@ -2,8 +2,8 @@ input: aws/metrics metricsets: ["ec2"] {{#if credential_profile_name}} credential_profile_name: {{credential_profile_name}} -{{#if credential_profile_name}} +{{/if}} period: {{period}} {{#if tags_filter}} tags_filter: {{tags_filter}} -{{#if tags_filter}} +{{/if}} diff --git a/dev/packages/beats/aws-0.0.1/dataset/elb-logs/agent/stream/stream.yml b/dev/packages/beats/aws-0.0.1/dataset/elb-logs/agent/stream/stream.yml index adb0af860..9e39f70d6 100644 --- a/dev/packages/beats/aws-0.0.1/dataset/elb-logs/agent/stream/stream.yml +++ b/dev/packages/beats/aws-0.0.1/dataset/elb-logs/agent/stream/stream.yml @@ -11,17 +11,17 @@ input: s3 queue_url: {{this.queue_url}} {{#if this.credential_profile_name}} credential_profile_name: {{this.credential_profile_name}} -{{/end}} +{{/if}} {{#if this.shared_credential_file}} shared_credential_file: {{this.shared_credential_file}} -{{/end}} +{{/if}} {{#if this.visibility_timeout}} visibility_timeout: {{this.visibility_timeout}} -{{/end}} +{{/if}} {{#if this.api_timeout}} api_timeout: {{this.api_timeout}} -{{/end}} +{{/if}} {{#if this.endpoint}} endpoint: {{this.endpoint}} -{{/end}} +{{/if}} {{/if}} diff --git a/dev/packages/beats/aws-0.0.1/dataset/elb-metrics/agent/stream/stream.yml b/dev/packages/beats/aws-0.0.1/dataset/elb-metrics/agent/stream/stream.yml index 3479604d7..8ba671a15 100644 --- a/dev/packages/beats/aws-0.0.1/dataset/elb-metrics/agent/stream/stream.yml +++ b/dev/packages/beats/aws-0.0.1/dataset/elb-metrics/agent/stream/stream.yml @@ -2,8 +2,8 @@ input: aws/metrics metricsets: ["elb"] {{#if credential_profile_name}} credential_profile_name: {{credential_profile_name}} -{{#if credential_profile_name}} +{{/if}} period: {{period}} {{#if tags_filter}} tags_filter: {{tags_filter}} -{{#if tags_filter}} +{{/if}} diff --git a/dev/packages/beats/aws-0.0.1/dataset/natgateway/agent/stream/stream.yml b/dev/packages/beats/aws-0.0.1/dataset/natgateway/agent/stream/stream.yml index 6d14de5df..5516dee2e 100644 --- a/dev/packages/beats/aws-0.0.1/dataset/natgateway/agent/stream/stream.yml +++ b/dev/packages/beats/aws-0.0.1/dataset/natgateway/agent/stream/stream.yml @@ -2,8 +2,8 @@ input: aws/metrics metricsets: ["natgateway"] {{#if credential_profile_name}} credential_profile_name: {{credential_profile_name}} -{{#if credential_profile_name}} +{{/if}} period: {{period}} {{#if tags_filter}} tags_filter: {{tags_filter}} -{{#if tags_filter}} +{{/if}} diff --git a/dev/packages/beats/aws-0.0.1/dataset/rds/agent/stream/stream.yml b/dev/packages/beats/aws-0.0.1/dataset/rds/agent/stream/stream.yml index 2506cf02a..d73a57705 100644 --- a/dev/packages/beats/aws-0.0.1/dataset/rds/agent/stream/stream.yml +++ b/dev/packages/beats/aws-0.0.1/dataset/rds/agent/stream/stream.yml @@ -2,8 +2,8 @@ input: aws/metrics metricsets: ["rds"] {{#if credential_profile_name}} credential_profile_name: {{credential_profile_name}} -{{#if credential_profile_name}} +{{/if}} period: {{period}} {{#if tags_filter}} tags_filter: {{tags_filter}} -{{#if tags_filter}} +{{/if}} diff --git a/dev/packages/beats/aws-0.0.1/dataset/s3_daily_storage/agent/stream/stream.yml b/dev/packages/beats/aws-0.0.1/dataset/s3_daily_storage/agent/stream/stream.yml index 64bf9e060..9e9cbc14c 100644 --- a/dev/packages/beats/aws-0.0.1/dataset/s3_daily_storage/agent/stream/stream.yml +++ b/dev/packages/beats/aws-0.0.1/dataset/s3_daily_storage/agent/stream/stream.yml @@ -2,11 +2,11 @@ input: aws/metrics metricsets: ["s3_daily_storage"] {{#if access_key_id}} access_key_id: {{access_key_id}} -{{#if access_key_id}} +{{/if}} period: {{period}} {{#if secret_access_key}} secret_access_key: {{secret_access_key}} -{{#if secret_access_key}} +{{/if}} {{#if session_token}} session_token: {{session_token}} -{{#if session_token}} +{{/if}} diff --git a/dev/packages/beats/aws-0.0.1/dataset/s3_request/agent/stream/stream.yml b/dev/packages/beats/aws-0.0.1/dataset/s3_request/agent/stream/stream.yml index 2dcb5fa42..55da43bb2 100644 --- a/dev/packages/beats/aws-0.0.1/dataset/s3_request/agent/stream/stream.yml +++ b/dev/packages/beats/aws-0.0.1/dataset/s3_request/agent/stream/stream.yml @@ -2,11 +2,11 @@ input: aws/metrics metricsets: ["s3_request"] {{#if access_key_id}} access_key_id: {{access_key_id}} -{{#if access_key_id}} +{{/if}} period: {{period}} {{#if secret_access_key}} secret_access_key: {{secret_access_key}} -{{#if secret_access_key}} +{{/if}} {{#if session_token}} session_token: {{session_token}} -{{#if session_token}} +{{/if}} diff --git a/dev/packages/beats/aws-0.0.1/dataset/s3access/agent/stream/stream.yml b/dev/packages/beats/aws-0.0.1/dataset/s3access/agent/stream/stream.yml index adb0af860..9e39f70d6 100644 --- a/dev/packages/beats/aws-0.0.1/dataset/s3access/agent/stream/stream.yml +++ b/dev/packages/beats/aws-0.0.1/dataset/s3access/agent/stream/stream.yml @@ -11,17 +11,17 @@ input: s3 queue_url: {{this.queue_url}} {{#if this.credential_profile_name}} credential_profile_name: {{this.credential_profile_name}} -{{/end}} +{{/if}} {{#if this.shared_credential_file}} shared_credential_file: {{this.shared_credential_file}} -{{/end}} +{{/if}} {{#if this.visibility_timeout}} visibility_timeout: {{this.visibility_timeout}} -{{/end}} +{{/if}} {{#if this.api_timeout}} api_timeout: {{this.api_timeout}} -{{/end}} +{{/if}} {{#if this.endpoint}} endpoint: {{this.endpoint}} -{{/end}} +{{/if}} {{/if}} diff --git a/dev/packages/beats/aws-0.0.1/dataset/sqs/agent/stream/stream.yml b/dev/packages/beats/aws-0.0.1/dataset/sqs/agent/stream/stream.yml index 7fc903484..8443412a3 100644 --- a/dev/packages/beats/aws-0.0.1/dataset/sqs/agent/stream/stream.yml +++ b/dev/packages/beats/aws-0.0.1/dataset/sqs/agent/stream/stream.yml @@ -2,8 +2,8 @@ input: aws/metrics metricsets: ["sqs"] {{#if credential_profile_name}} credential_profile_name: {{credential_profile_name}} -{{#if credential_profile_name}} +{{/if}} period: {{period}} {{#if regions}} regions: {{regions}} -{{#if regions}} +{{/if}} diff --git a/dev/packages/beats/aws-0.0.1/dataset/transitgateway/agent/stream/stream.yml b/dev/packages/beats/aws-0.0.1/dataset/transitgateway/agent/stream/stream.yml index ea5a45037..23b58262e 100644 --- a/dev/packages/beats/aws-0.0.1/dataset/transitgateway/agent/stream/stream.yml +++ b/dev/packages/beats/aws-0.0.1/dataset/transitgateway/agent/stream/stream.yml @@ -2,8 +2,8 @@ input: aws/metrics metricsets: ["transitgateway"] {{#if credential_profile_name}} credential_profile_name: {{credential_profile_name}} -{{#if credential_profile_name}} +{{/if}} period: {{period}} {{#if tags_filter}} tags_filter: {{tags_filter}} -{{#if tags_filter}} +{{/if}} diff --git a/dev/packages/beats/aws-0.0.1/dataset/usage/agent/stream/stream.yml b/dev/packages/beats/aws-0.0.1/dataset/usage/agent/stream/stream.yml index 21834aa4d..019543ceb 100644 --- a/dev/packages/beats/aws-0.0.1/dataset/usage/agent/stream/stream.yml +++ b/dev/packages/beats/aws-0.0.1/dataset/usage/agent/stream/stream.yml @@ -2,8 +2,8 @@ input: aws/metrics metricsets: ["usage"] {{#if credential_profile_name}} credential_profile_name: {{credential_profile_name}} -{{#if credential_profile_name}} +{{/if}} period: {{period}} {{#if tags_filter}} tags_filter: {{tags_filter}} -{{#if tags_filter}} +{{/if}} diff --git a/dev/packages/beats/aws-0.0.1/dataset/vpcflow/agent/stream/stream.yml b/dev/packages/beats/aws-0.0.1/dataset/vpcflow/agent/stream/stream.yml index 848592528..c38037034 100644 --- a/dev/packages/beats/aws-0.0.1/dataset/vpcflow/agent/stream/stream.yml +++ b/dev/packages/beats/aws-0.0.1/dataset/vpcflow/agent/stream/stream.yml @@ -3,19 +3,19 @@ input: s3 queue_url: {{this.queue_url}} {{#if this.credential_profile_name}} credential_profile_name: {{this.credential_profile_name}} -{{/end}} +{{/if}} {{#if this.shared_credential_file}} shared_credential_file: {{this.shared_credential_file}} -{{/end}} +{{/if}} {{#if this.visibility_timeout}} visibility_timeout: {{this.visibility_timeout}} -{{/end}} +{{/if}} {{#if this.api_timeout}} api_timeout: {{this.api_timeout}} -{{/end}} +{{/if}} {{#if this.endpoint}} endpoint: {{this.endpoint}} -{{/end}} +{{/if}} {{else if input == "file"}} input: log paths: @@ -23,7 +23,7 @@ paths: - {{this}} {{/each}} exclude_files: [".gz$"] -{{/end}} +{{/if}} processors: - drop_event: when.regexp.message: "^version" diff --git a/dev/packages/beats/aws-0.0.1/dataset/vpn/agent/stream/stream.yml b/dev/packages/beats/aws-0.0.1/dataset/vpn/agent/stream/stream.yml index bda31328a..d81151ebf 100644 --- a/dev/packages/beats/aws-0.0.1/dataset/vpn/agent/stream/stream.yml +++ b/dev/packages/beats/aws-0.0.1/dataset/vpn/agent/stream/stream.yml @@ -2,8 +2,8 @@ input: aws/metrics metricsets: ["vpn"] {{#if credential_profile_name}} credential_profile_name: {{credential_profile_name}} -{{#if credential_profile_name}} +{{/if}} period: {{period}} {{#if tags_filter}} tags_filter: {{tags_filter}} -{{#if tags_filter}} +{{/if}} diff --git a/dev/packages/beats/azure-0.0.1/dataset/compute_vm/agent/stream/stream.yml b/dev/packages/beats/azure-0.0.1/dataset/compute_vm/agent/stream/stream.yml index 3d54f22c5..e569345a0 100644 --- a/dev/packages/beats/azure-0.0.1/dataset/compute_vm/agent/stream/stream.yml +++ b/dev/packages/beats/azure-0.0.1/dataset/compute_vm/agent/stream/stream.yml @@ -2,14 +2,14 @@ input: azure/metrics metricsets: ["compute_vm"] {{#if client_id}} client_id: {{client_id}} -{{#if client_id}} +{{/if}} {{#if client_secret}} client_secret: {{client_secret}} -{{#if client_secret}} +{{/if}} period: {{period}} {{#if subscription_id}} subscription_id: {{subscription_id}} -{{#if subscription_id}} +{{/if}} {{#if tenant_id}} tenant_id: {{tenant_id}} -{{#if tenant_id}} +{{/if}} diff --git a/dev/packages/beats/azure-0.0.1/dataset/compute_vm_scaleset/agent/stream/stream.yml b/dev/packages/beats/azure-0.0.1/dataset/compute_vm_scaleset/agent/stream/stream.yml index c58c2dd97..c20bd5a7a 100644 --- a/dev/packages/beats/azure-0.0.1/dataset/compute_vm_scaleset/agent/stream/stream.yml +++ b/dev/packages/beats/azure-0.0.1/dataset/compute_vm_scaleset/agent/stream/stream.yml @@ -2,14 +2,14 @@ input: azure/metrics metricsets: ["compute_vm_scaleset"] {{#if client_id}} client_id: {{client_id}} -{{#if client_id}} +{{/if}} {{#if client_secret}} client_secret: {{client_secret}} -{{#if client_secret}} +{{/if}} period: {{period}} {{#if subscription_id}} subscription_id: {{subscription_id}} -{{#if subscription_id}} +{{/if}} {{#if tenant_id}} tenant_id: {{tenant_id}} -{{#if tenant_id}} +{{/if}} diff --git a/dev/packages/beats/azure-0.0.1/dataset/container_instance/agent/stream/stream.yml b/dev/packages/beats/azure-0.0.1/dataset/container_instance/agent/stream/stream.yml index 8157cd93e..a2a75d94c 100644 --- a/dev/packages/beats/azure-0.0.1/dataset/container_instance/agent/stream/stream.yml +++ b/dev/packages/beats/azure-0.0.1/dataset/container_instance/agent/stream/stream.yml @@ -2,14 +2,14 @@ input: azure/metrics metricsets: ["container_instance"] {{#if client_id}} client_id: {{client_id}} -{{#if client_id}} +{{/if}} {{#if client_secret}} client_secret: {{client_secret}} -{{#if client_secret}} +{{/if}} period: {{period}} {{#if subscription_id}} subscription_id: {{subscription_id}} -{{#if subscription_id}} +{{/if}} {{#if tenant_id}} tenant_id: {{tenant_id}} -{{#if tenant_id}} +{{/if}} diff --git a/dev/packages/beats/azure-0.0.1/dataset/container_registry/agent/stream/stream.yml b/dev/packages/beats/azure-0.0.1/dataset/container_registry/agent/stream/stream.yml index e1122c5d7..92f14e144 100644 --- a/dev/packages/beats/azure-0.0.1/dataset/container_registry/agent/stream/stream.yml +++ b/dev/packages/beats/azure-0.0.1/dataset/container_registry/agent/stream/stream.yml @@ -2,14 +2,14 @@ input: azure/metrics metricsets: ["container_registry"] {{#if client_id}} client_id: {{client_id}} -{{#if client_id}} +{{/if}} {{#if client_secret}} client_secret: {{client_secret}} -{{#if client_secret}} +{{/if}} period: {{period}} {{#if subscription_id}} subscription_id: {{subscription_id}} -{{#if subscription_id}} +{{/if}} {{#if tenant_id}} tenant_id: {{tenant_id}} -{{#if tenant_id}} +{{/if}} diff --git a/dev/packages/beats/azure-0.0.1/dataset/container_service/agent/stream/stream.yml b/dev/packages/beats/azure-0.0.1/dataset/container_service/agent/stream/stream.yml index f05190d04..2e0c4ee7d 100644 --- a/dev/packages/beats/azure-0.0.1/dataset/container_service/agent/stream/stream.yml +++ b/dev/packages/beats/azure-0.0.1/dataset/container_service/agent/stream/stream.yml @@ -2,14 +2,14 @@ input: azure/metrics metricsets: ["container_service"] {{#if client_id}} client_id: {{client_id}} -{{#if client_id}} +{{/if}} {{#if client_secret}} client_secret: {{client_secret}} -{{#if client_secret}} +{{/if}} period: {{period}} {{#if subscription_id}} subscription_id: {{subscription_id}} -{{#if subscription_id}} +{{/if}} {{#if tenant_id}} tenant_id: {{tenant_id}} -{{#if tenant_id}} +{{/if}} diff --git a/dev/packages/beats/azure-0.0.1/dataset/database_account/agent/stream/stream.yml b/dev/packages/beats/azure-0.0.1/dataset/database_account/agent/stream/stream.yml index 856600f8d..d13198fed 100644 --- a/dev/packages/beats/azure-0.0.1/dataset/database_account/agent/stream/stream.yml +++ b/dev/packages/beats/azure-0.0.1/dataset/database_account/agent/stream/stream.yml @@ -2,14 +2,14 @@ input: azure/metrics metricsets: ["database_account"] {{#if client_id}} client_id: {{client_id}} -{{#if client_id}} +{{/if}} {{#if client_secret}} client_secret: {{client_secret}} -{{#if client_secret}} +{{/if}} period: {{period}} {{#if subscription_id}} subscription_id: {{subscription_id}} -{{#if subscription_id}} +{{/if}} {{#if tenant_id}} tenant_id: {{tenant_id}} -{{#if tenant_id}} +{{/if}} diff --git a/dev/packages/beats/azure-0.0.1/dataset/monitor/agent/stream/stream.yml b/dev/packages/beats/azure-0.0.1/dataset/monitor/agent/stream/stream.yml index 60e19808a..8094cdc49 100644 --- a/dev/packages/beats/azure-0.0.1/dataset/monitor/agent/stream/stream.yml +++ b/dev/packages/beats/azure-0.0.1/dataset/monitor/agent/stream/stream.yml @@ -2,20 +2,20 @@ input: azure/metrics metricsets: ["monitor"] {{#if client_id}} client_id: {{client_id}} -{{#if client_id}} +{{/if}} {{#if client_secret}} client_secret: {{client_secret}} -{{#if client_secret}} +{{/if}} period: {{period}} {{#if refresh_list_interval}} refresh_list_interval: {{refresh_list_interval}} -{{#if refresh_list_interval}} +{{/if}} {{#if resources}} resources: {{resources}} -{{#if resources}} +{{/if}} {{#if subscription_id}} subscription_id: {{subscription_id}} -{{#if subscription_id}} +{{/if}} {{#if tenant_id}} tenant_id: {{tenant_id}} -{{#if tenant_id}} +{{/if}} diff --git a/dev/packages/beats/azure-0.0.1/dataset/storage/agent/stream/stream.yml b/dev/packages/beats/azure-0.0.1/dataset/storage/agent/stream/stream.yml index 72f9ca13e..c2aec5c7d 100644 --- a/dev/packages/beats/azure-0.0.1/dataset/storage/agent/stream/stream.yml +++ b/dev/packages/beats/azure-0.0.1/dataset/storage/agent/stream/stream.yml @@ -2,14 +2,14 @@ input: azure/metrics metricsets: ["storage"] {{#if client_id}} client_id: {{client_id}} -{{#if client_id}} +{{/if}} {{#if client_secret}} client_secret: {{client_secret}} -{{#if client_secret}} +{{/if}} period: {{period}} {{#if subscription_id}} subscription_id: {{subscription_id}} -{{#if subscription_id}} +{{/if}} {{#if tenant_id}} tenant_id: {{tenant_id}} -{{#if tenant_id}} +{{/if}} diff --git a/dev/packages/beats/beat-0.0.1/dataset/state/agent/stream/stream.yml b/dev/packages/beats/beat-0.0.1/dataset/state/agent/stream/stream.yml index 63aaa2a4f..21459c9f6 100644 --- a/dev/packages/beats/beat-0.0.1/dataset/state/agent/stream/stream.yml +++ b/dev/packages/beats/beat-0.0.1/dataset/state/agent/stream/stream.yml @@ -4,4 +4,4 @@ hosts: {{hosts}} period: {{period}} {{#if xpack.enabled}} xpack.enabled: {{xpack.enabled}} -{{#if xpack.enabled}} +{{/if}} diff --git a/dev/packages/beats/beat-0.0.1/dataset/stats/agent/stream/stream.yml b/dev/packages/beats/beat-0.0.1/dataset/stats/agent/stream/stream.yml index 2a1c6fac3..a0873b102 100644 --- a/dev/packages/beats/beat-0.0.1/dataset/stats/agent/stream/stream.yml +++ b/dev/packages/beats/beat-0.0.1/dataset/stats/agent/stream/stream.yml @@ -4,4 +4,4 @@ hosts: {{hosts}} period: {{period}} {{#if xpack.enabled}} xpack.enabled: {{xpack.enabled}} -{{#if xpack.enabled}} +{{/if}} diff --git a/dev/packages/beats/cef-0.0.1/dataset/log/agent/stream/stream.yml b/dev/packages/beats/cef-0.0.1/dataset/log/agent/stream/stream.yml index ff2c9a5a4..780e404a3 100644 --- a/dev/packages/beats/cef-0.0.1/dataset/log/agent/stream/stream.yml +++ b/dev/packages/beats/cef-0.0.1/dataset/log/agent/stream/stream.yml @@ -9,7 +9,7 @@ paths: - {{this}} {{/each}} exclude_files: [".gz$"] -{{/end}} +{{/if}} tags: {{this.tags}} processors: - rename: diff --git a/dev/packages/beats/cisco-0.0.1/dataset/asa/agent/stream/stream.yml b/dev/packages/beats/cisco-0.0.1/dataset/asa/agent/stream/stream.yml index 8111a7925..81fdfbe16 100644 --- a/dev/packages/beats/cisco-0.0.1/dataset/asa/agent/stream/stream.yml +++ b/dev/packages/beats/cisco-0.0.1/dataset/asa/agent/stream/stream.yml @@ -9,7 +9,7 @@ paths: - {{this}} {{/each}} exclude_files: [".gz$"] -{{/end}} +{{/if}} tags: {{this.tags}} processors: - add_locale: ~ diff --git a/dev/packages/beats/cisco-0.0.1/dataset/ftd/agent/stream/stream.yml b/dev/packages/beats/cisco-0.0.1/dataset/ftd/agent/stream/stream.yml index 51e2082c2..eca3e5cc4 100644 --- a/dev/packages/beats/cisco-0.0.1/dataset/ftd/agent/stream/stream.yml +++ b/dev/packages/beats/cisco-0.0.1/dataset/ftd/agent/stream/stream.yml @@ -8,7 +8,7 @@ paths: - {{this}} {{/each}} exclude_files: [".gz$"] -{{/end}} +{{/if}} tags: {{this.tags}} processors: - add_locale: ~ diff --git a/dev/packages/beats/cisco-0.0.1/dataset/ios/agent/stream/stream.yml b/dev/packages/beats/cisco-0.0.1/dataset/ios/agent/stream/stream.yml index 579e54151..04384ebf0 100644 --- a/dev/packages/beats/cisco-0.0.1/dataset/ios/agent/stream/stream.yml +++ b/dev/packages/beats/cisco-0.0.1/dataset/ios/agent/stream/stream.yml @@ -9,7 +9,7 @@ paths: - {{this}} {{/each}} exclude_files: [".gz$"] -{{/end}} +{{/if}} tags: {{this.tags}} processors: - add_locale: ~ diff --git a/dev/packages/beats/cloudfoundry-0.0.1/dataset/container/agent/stream/stream.yml b/dev/packages/beats/cloudfoundry-0.0.1/dataset/container/agent/stream/stream.yml index 657ea48e0..b773bfa48 100644 --- a/dev/packages/beats/cloudfoundry-0.0.1/dataset/container/agent/stream/stream.yml +++ b/dev/packages/beats/cloudfoundry-0.0.1/dataset/container/agent/stream/stream.yml @@ -2,19 +2,19 @@ input: cloudfoundry/metrics metricsets: ["container"] {{#if api_address}} api_address: {{api_address}} -{{#if api_address}} +{{/if}} {{#if client_id}} client_id: {{client_id}} -{{#if client_id}} +{{/if}} {{#if client_secret}} client_secret: {{client_secret}} -{{#if client_secret}} +{{/if}} {{#if doppler_address}} doppler_address: {{doppler_address}} -{{#if doppler_address}} +{{/if}} {{#if rlp_address}} rlp_address: {{rlp_address}} -{{#if rlp_address}} +{{/if}} {{#if uaa_address}} uaa_address: {{uaa_address}} -{{#if uaa_address}} +{{/if}} diff --git a/dev/packages/beats/cloudfoundry-0.0.1/dataset/counter/agent/stream/stream.yml b/dev/packages/beats/cloudfoundry-0.0.1/dataset/counter/agent/stream/stream.yml index 3bc664e27..0059ed955 100644 --- a/dev/packages/beats/cloudfoundry-0.0.1/dataset/counter/agent/stream/stream.yml +++ b/dev/packages/beats/cloudfoundry-0.0.1/dataset/counter/agent/stream/stream.yml @@ -2,19 +2,19 @@ input: cloudfoundry/metrics metricsets: ["counter"] {{#if api_address}} api_address: {{api_address}} -{{#if api_address}} +{{/if}} {{#if client_id}} client_id: {{client_id}} -{{#if client_id}} +{{/if}} {{#if client_secret}} client_secret: {{client_secret}} -{{#if client_secret}} +{{/if}} {{#if doppler_address}} doppler_address: {{doppler_address}} -{{#if doppler_address}} +{{/if}} {{#if rlp_address}} rlp_address: {{rlp_address}} -{{#if rlp_address}} +{{/if}} {{#if uaa_address}} uaa_address: {{uaa_address}} -{{#if uaa_address}} +{{/if}} diff --git a/dev/packages/beats/cloudfoundry-0.0.1/dataset/value/agent/stream/stream.yml b/dev/packages/beats/cloudfoundry-0.0.1/dataset/value/agent/stream/stream.yml index d65014c2a..563e0fbc9 100644 --- a/dev/packages/beats/cloudfoundry-0.0.1/dataset/value/agent/stream/stream.yml +++ b/dev/packages/beats/cloudfoundry-0.0.1/dataset/value/agent/stream/stream.yml @@ -2,19 +2,19 @@ input: cloudfoundry/metrics metricsets: ["value"] {{#if api_address}} api_address: {{api_address}} -{{#if api_address}} +{{/if}} {{#if client_id}} client_id: {{client_id}} -{{#if client_id}} +{{/if}} {{#if client_secret}} client_secret: {{client_secret}} -{{#if client_secret}} +{{/if}} {{#if doppler_address}} doppler_address: {{doppler_address}} -{{#if doppler_address}} +{{/if}} {{#if rlp_address}} rlp_address: {{rlp_address}} -{{#if rlp_address}} +{{/if}} {{#if uaa_address}} uaa_address: {{uaa_address}} -{{#if uaa_address}} +{{/if}} diff --git a/dev/packages/beats/dropwizard-0.0.1/dataset/collector/agent/stream/stream.yml b/dev/packages/beats/dropwizard-0.0.1/dataset/collector/agent/stream/stream.yml index a3c29f679..56800c983 100644 --- a/dev/packages/beats/dropwizard-0.0.1/dataset/collector/agent/stream/stream.yml +++ b/dev/packages/beats/dropwizard-0.0.1/dataset/collector/agent/stream/stream.yml @@ -3,8 +3,8 @@ metricsets: ["collector"] hosts: {{hosts}} {{#if metrics_path}} metrics_path: {{metrics_path}} -{{#if metrics_path}} +{{/if}} {{#if namespace}} namespace: {{namespace}} -{{#if namespace}} +{{/if}} period: {{period}} diff --git a/dev/packages/beats/elasticsearch-0.0.1/dataset/ccr/agent/stream/stream.yml b/dev/packages/beats/elasticsearch-0.0.1/dataset/ccr/agent/stream/stream.yml index f9a4b47a8..3e7d1275d 100644 --- a/dev/packages/beats/elasticsearch-0.0.1/dataset/ccr/agent/stream/stream.yml +++ b/dev/packages/beats/elasticsearch-0.0.1/dataset/ccr/agent/stream/stream.yml @@ -4,4 +4,4 @@ hosts: {{hosts}} period: {{period}} {{#if xpack.enabled}} xpack.enabled: {{xpack.enabled}} -{{#if xpack.enabled}} +{{/if}} diff --git a/dev/packages/beats/elasticsearch-0.0.1/dataset/cluster_stats/agent/stream/stream.yml b/dev/packages/beats/elasticsearch-0.0.1/dataset/cluster_stats/agent/stream/stream.yml index 47f30c36b..623f36616 100644 --- a/dev/packages/beats/elasticsearch-0.0.1/dataset/cluster_stats/agent/stream/stream.yml +++ b/dev/packages/beats/elasticsearch-0.0.1/dataset/cluster_stats/agent/stream/stream.yml @@ -4,4 +4,4 @@ hosts: {{hosts}} period: {{period}} {{#if xpack.enabled}} xpack.enabled: {{xpack.enabled}} -{{#if xpack.enabled}} +{{/if}} diff --git a/dev/packages/beats/elasticsearch-0.0.1/dataset/enrich/agent/stream/stream.yml b/dev/packages/beats/elasticsearch-0.0.1/dataset/enrich/agent/stream/stream.yml index 69eae8aa4..64a6f980b 100644 --- a/dev/packages/beats/elasticsearch-0.0.1/dataset/enrich/agent/stream/stream.yml +++ b/dev/packages/beats/elasticsearch-0.0.1/dataset/enrich/agent/stream/stream.yml @@ -4,4 +4,4 @@ hosts: {{hosts}} period: {{period}} {{#if xpack.enabled}} xpack.enabled: {{xpack.enabled}} -{{#if xpack.enabled}} +{{/if}} diff --git a/dev/packages/beats/elasticsearch-0.0.1/dataset/index/agent/stream/stream.yml b/dev/packages/beats/elasticsearch-0.0.1/dataset/index/agent/stream/stream.yml index 236c01cb0..6ada7d1b3 100644 --- a/dev/packages/beats/elasticsearch-0.0.1/dataset/index/agent/stream/stream.yml +++ b/dev/packages/beats/elasticsearch-0.0.1/dataset/index/agent/stream/stream.yml @@ -4,4 +4,4 @@ hosts: {{hosts}} period: {{period}} {{#if xpack.enabled}} xpack.enabled: {{xpack.enabled}} -{{#if xpack.enabled}} +{{/if}} diff --git a/dev/packages/beats/elasticsearch-0.0.1/dataset/index_recovery/agent/stream/stream.yml b/dev/packages/beats/elasticsearch-0.0.1/dataset/index_recovery/agent/stream/stream.yml index 524e4ccda..696705a81 100644 --- a/dev/packages/beats/elasticsearch-0.0.1/dataset/index_recovery/agent/stream/stream.yml +++ b/dev/packages/beats/elasticsearch-0.0.1/dataset/index_recovery/agent/stream/stream.yml @@ -4,4 +4,4 @@ hosts: {{hosts}} period: {{period}} {{#if xpack.enabled}} xpack.enabled: {{xpack.enabled}} -{{#if xpack.enabled}} +{{/if}} diff --git a/dev/packages/beats/elasticsearch-0.0.1/dataset/index_summary/agent/stream/stream.yml b/dev/packages/beats/elasticsearch-0.0.1/dataset/index_summary/agent/stream/stream.yml index c5fc1cd8e..1d20e77a1 100644 --- a/dev/packages/beats/elasticsearch-0.0.1/dataset/index_summary/agent/stream/stream.yml +++ b/dev/packages/beats/elasticsearch-0.0.1/dataset/index_summary/agent/stream/stream.yml @@ -4,4 +4,4 @@ hosts: {{hosts}} period: {{period}} {{#if xpack.enabled}} xpack.enabled: {{xpack.enabled}} -{{#if xpack.enabled}} +{{/if}} diff --git a/dev/packages/beats/elasticsearch-0.0.1/dataset/ml_job/agent/stream/stream.yml b/dev/packages/beats/elasticsearch-0.0.1/dataset/ml_job/agent/stream/stream.yml index 078b20cb7..a3bbe3067 100644 --- a/dev/packages/beats/elasticsearch-0.0.1/dataset/ml_job/agent/stream/stream.yml +++ b/dev/packages/beats/elasticsearch-0.0.1/dataset/ml_job/agent/stream/stream.yml @@ -4,4 +4,4 @@ hosts: {{hosts}} period: {{period}} {{#if xpack.enabled}} xpack.enabled: {{xpack.enabled}} -{{#if xpack.enabled}} +{{/if}} diff --git a/dev/packages/beats/elasticsearch-0.0.1/dataset/node_stats/agent/stream/stream.yml b/dev/packages/beats/elasticsearch-0.0.1/dataset/node_stats/agent/stream/stream.yml index ff6975bca..a6265e5b6 100644 --- a/dev/packages/beats/elasticsearch-0.0.1/dataset/node_stats/agent/stream/stream.yml +++ b/dev/packages/beats/elasticsearch-0.0.1/dataset/node_stats/agent/stream/stream.yml @@ -4,4 +4,4 @@ hosts: {{hosts}} period: {{period}} {{#if xpack.enabled}} xpack.enabled: {{xpack.enabled}} -{{#if xpack.enabled}} +{{/if}} diff --git a/dev/packages/beats/elasticsearch-0.0.1/dataset/shard/agent/stream/stream.yml b/dev/packages/beats/elasticsearch-0.0.1/dataset/shard/agent/stream/stream.yml index 89fda593d..34796a21e 100644 --- a/dev/packages/beats/elasticsearch-0.0.1/dataset/shard/agent/stream/stream.yml +++ b/dev/packages/beats/elasticsearch-0.0.1/dataset/shard/agent/stream/stream.yml @@ -4,4 +4,4 @@ hosts: {{hosts}} period: {{period}} {{#if xpack.enabled}} xpack.enabled: {{xpack.enabled}} -{{#if xpack.enabled}} +{{/if}} diff --git a/dev/packages/beats/golang-0.0.1/dataset/expvar/agent/stream/stream.yml b/dev/packages/beats/golang-0.0.1/dataset/expvar/agent/stream/stream.yml index 0d330a8bb..79011b391 100644 --- a/dev/packages/beats/golang-0.0.1/dataset/expvar/agent/stream/stream.yml +++ b/dev/packages/beats/golang-0.0.1/dataset/expvar/agent/stream/stream.yml @@ -2,7 +2,7 @@ input: golang/metrics metricsets: ["expvar"] {{#if expvar.namespace}} expvar.namespace: {{expvar.namespace}} -{{#if expvar.namespace}} +{{/if}} {{#if expvar.path}} expvar.path: {{expvar.path}} -{{#if expvar.path}} +{{/if}} diff --git a/dev/packages/beats/golang-0.0.1/dataset/heap/agent/stream/stream.yml b/dev/packages/beats/golang-0.0.1/dataset/heap/agent/stream/stream.yml index 4d90898d3..8b19276c1 100644 --- a/dev/packages/beats/golang-0.0.1/dataset/heap/agent/stream/stream.yml +++ b/dev/packages/beats/golang-0.0.1/dataset/heap/agent/stream/stream.yml @@ -2,4 +2,4 @@ input: golang/metrics metricsets: ["heap"] {{#if heap.path}} heap.path: {{heap.path}} -{{#if heap.path}} +{{/if}} diff --git a/dev/packages/beats/googlecloud-0.0.1/dataset/audit/agent/stream/stream.yml b/dev/packages/beats/googlecloud-0.0.1/dataset/audit/agent/stream/stream.yml index b67084f90..d405d47b8 100644 --- a/dev/packages/beats/googlecloud-0.0.1/dataset/audit/agent/stream/stream.yml +++ b/dev/packages/beats/googlecloud-0.0.1/dataset/audit/agent/stream/stream.yml @@ -11,7 +11,7 @@ paths: - {{this}} {{/each}} exclude_files: [".gz$"] -{{/end}} +{{/if}} processors: - script: lang: javascript diff --git a/dev/packages/beats/googlecloud-0.0.1/dataset/compute/agent/stream/stream.yml b/dev/packages/beats/googlecloud-0.0.1/dataset/compute/agent/stream/stream.yml index c700251b5..f5d82d293 100644 --- a/dev/packages/beats/googlecloud-0.0.1/dataset/compute/agent/stream/stream.yml +++ b/dev/packages/beats/googlecloud-0.0.1/dataset/compute/agent/stream/stream.yml @@ -2,14 +2,14 @@ input: googlecloud/metrics metricsets: ["compute"] {{#if credentials_file_path}} credentials_file_path: {{credentials_file_path}} -{{#if credentials_file_path}} +{{/if}} {{#if exclude_labels}} exclude_labels: {{exclude_labels}} -{{#if exclude_labels}} +{{/if}} period: {{period}} {{#if project_id}} project_id: {{project_id}} -{{#if project_id}} +{{/if}} {{#if zone}} zone: {{zone}} -{{#if zone}} +{{/if}} diff --git a/dev/packages/beats/googlecloud-0.0.1/dataset/firewall/agent/stream/stream.yml b/dev/packages/beats/googlecloud-0.0.1/dataset/firewall/agent/stream/stream.yml index 2a9642f98..1d85a0110 100644 --- a/dev/packages/beats/googlecloud-0.0.1/dataset/firewall/agent/stream/stream.yml +++ b/dev/packages/beats/googlecloud-0.0.1/dataset/firewall/agent/stream/stream.yml @@ -11,7 +11,7 @@ paths: - {{this}} {{/each}} exclude_files: [".gz$"] -{{/end}} +{{/if}} processors: - script: lang: javascript diff --git a/dev/packages/beats/googlecloud-0.0.1/dataset/loadbalancing/agent/stream/stream.yml b/dev/packages/beats/googlecloud-0.0.1/dataset/loadbalancing/agent/stream/stream.yml index 7e44293ef..20c0a8a24 100644 --- a/dev/packages/beats/googlecloud-0.0.1/dataset/loadbalancing/agent/stream/stream.yml +++ b/dev/packages/beats/googlecloud-0.0.1/dataset/loadbalancing/agent/stream/stream.yml @@ -2,14 +2,14 @@ input: googlecloud/metrics metricsets: ["loadbalancing"] {{#if credentials_file_path}} credentials_file_path: {{credentials_file_path}} -{{#if credentials_file_path}} +{{/if}} {{#if exclude_labels}} exclude_labels: {{exclude_labels}} -{{#if exclude_labels}} +{{/if}} period: {{period}} {{#if project_id}} project_id: {{project_id}} -{{#if project_id}} +{{/if}} {{#if zone}} zone: {{zone}} -{{#if zone}} +{{/if}} diff --git a/dev/packages/beats/googlecloud-0.0.1/dataset/pubsub/agent/stream/stream.yml b/dev/packages/beats/googlecloud-0.0.1/dataset/pubsub/agent/stream/stream.yml index 07fdf67f5..36dd2fa9d 100644 --- a/dev/packages/beats/googlecloud-0.0.1/dataset/pubsub/agent/stream/stream.yml +++ b/dev/packages/beats/googlecloud-0.0.1/dataset/pubsub/agent/stream/stream.yml @@ -2,14 +2,14 @@ input: googlecloud/metrics metricsets: ["pubsub"] {{#if credentials_file_path}} credentials_file_path: {{credentials_file_path}} -{{#if credentials_file_path}} +{{/if}} {{#if exclude_labels}} exclude_labels: {{exclude_labels}} -{{#if exclude_labels}} +{{/if}} period: {{period}} {{#if project_id}} project_id: {{project_id}} -{{#if project_id}} +{{/if}} {{#if zone}} zone: {{zone}} -{{#if zone}} +{{/if}} diff --git a/dev/packages/beats/googlecloud-0.0.1/dataset/storage/agent/stream/stream.yml b/dev/packages/beats/googlecloud-0.0.1/dataset/storage/agent/stream/stream.yml index e5e5f7b62..67a08bedd 100644 --- a/dev/packages/beats/googlecloud-0.0.1/dataset/storage/agent/stream/stream.yml +++ b/dev/packages/beats/googlecloud-0.0.1/dataset/storage/agent/stream/stream.yml @@ -2,14 +2,14 @@ input: googlecloud/metrics metricsets: ["storage"] {{#if credentials_file_path}} credentials_file_path: {{credentials_file_path}} -{{#if credentials_file_path}} +{{/if}} {{#if exclude_labels}} exclude_labels: {{exclude_labels}} -{{#if exclude_labels}} +{{/if}} period: {{period}} {{#if project_id}} project_id: {{project_id}} -{{#if project_id}} +{{/if}} {{#if region}} region: {{region}} -{{#if region}} +{{/if}} diff --git a/dev/packages/beats/googlecloud-0.0.1/dataset/vpcflow/agent/stream/stream.yml b/dev/packages/beats/googlecloud-0.0.1/dataset/vpcflow/agent/stream/stream.yml index 77cdb9778..ff2997409 100644 --- a/dev/packages/beats/googlecloud-0.0.1/dataset/vpcflow/agent/stream/stream.yml +++ b/dev/packages/beats/googlecloud-0.0.1/dataset/vpcflow/agent/stream/stream.yml @@ -11,7 +11,7 @@ paths: - {{this}} {{/each}} exclude_files: [".gz$"] -{{/end}} +{{/if}} processors: - script: lang: javascript diff --git a/dev/packages/beats/haproxy-0.0.1/dataset/info/agent/stream/stream.yml b/dev/packages/beats/haproxy-0.0.1/dataset/info/agent/stream/stream.yml index fbd3fdcf4..e01c67e0f 100644 --- a/dev/packages/beats/haproxy-0.0.1/dataset/info/agent/stream/stream.yml +++ b/dev/packages/beats/haproxy-0.0.1/dataset/info/agent/stream/stream.yml @@ -3,8 +3,8 @@ metricsets: ["info"] hosts: {{hosts}} {{#if password}} password: {{password}} -{{#if password}} +{{/if}} period: {{period}} {{#if username}} username: {{username}} -{{#if username}} +{{/if}} diff --git a/dev/packages/beats/haproxy-0.0.1/dataset/stat/agent/stream/stream.yml b/dev/packages/beats/haproxy-0.0.1/dataset/stat/agent/stream/stream.yml index 98d771358..32038b5ce 100644 --- a/dev/packages/beats/haproxy-0.0.1/dataset/stat/agent/stream/stream.yml +++ b/dev/packages/beats/haproxy-0.0.1/dataset/stat/agent/stream/stream.yml @@ -3,8 +3,8 @@ metricsets: ["stat"] hosts: {{hosts}} {{#if password}} password: {{password}} -{{#if password}} +{{/if}} period: {{period}} {{#if username}} username: {{username}} -{{#if username}} +{{/if}} diff --git a/dev/packages/beats/ibmmq-0.0.1/dataset/qmgr/agent/stream/stream.yml b/dev/packages/beats/ibmmq-0.0.1/dataset/qmgr/agent/stream/stream.yml index f95e6bfc1..61174ca60 100644 --- a/dev/packages/beats/ibmmq-0.0.1/dataset/qmgr/agent/stream/stream.yml +++ b/dev/packages/beats/ibmmq-0.0.1/dataset/qmgr/agent/stream/stream.yml @@ -3,5 +3,5 @@ metricsets: ["qmgr"] hosts: {{hosts}} {{#if metrics_path}} metrics_path: {{metrics_path}} -{{#if metrics_path}} +{{/if}} period: {{period}} diff --git a/dev/packages/beats/iptables-0.0.1/dataset/log/agent/stream/stream.yml b/dev/packages/beats/iptables-0.0.1/dataset/log/agent/stream/stream.yml index d072cd0b5..abd4e0840 100644 --- a/dev/packages/beats/iptables-0.0.1/dataset/log/agent/stream/stream.yml +++ b/dev/packages/beats/iptables-0.0.1/dataset/log/agent/stream/stream.yml @@ -9,7 +9,7 @@ paths: - {{this}} {{/each}} exclude_files: [".gz$"] -{{/end}} +{{/if}} tags: {{this.tags}} processors: - add_locale: ~ @@ -44,4 +44,4 @@ processors: fields: icmp_type: iptables.icmp.type icmp_code: iptables.icmp.code -{{/end}} +{{/if}} diff --git a/dev/packages/beats/kibana-0.0.1/dataset/stats/agent/stream/stream.yml b/dev/packages/beats/kibana-0.0.1/dataset/stats/agent/stream/stream.yml index b2c9d318d..c27ebae9e 100644 --- a/dev/packages/beats/kibana-0.0.1/dataset/stats/agent/stream/stream.yml +++ b/dev/packages/beats/kibana-0.0.1/dataset/stats/agent/stream/stream.yml @@ -4,4 +4,4 @@ hosts: {{hosts}} period: {{period}} {{#if xpack.enabled}} xpack.enabled: {{xpack.enabled}} -{{#if xpack.enabled}} +{{/if}} diff --git a/dev/packages/beats/kibana-0.0.1/dataset/status/agent/stream/stream.yml b/dev/packages/beats/kibana-0.0.1/dataset/status/agent/stream/stream.yml index 49d1418fa..e68dc9487 100644 --- a/dev/packages/beats/kibana-0.0.1/dataset/status/agent/stream/stream.yml +++ b/dev/packages/beats/kibana-0.0.1/dataset/status/agent/stream/stream.yml @@ -2,6 +2,6 @@ input: kibana/metrics metricsets: ["status"] {{#if basepath}} basepath: {{basepath}} -{{#if basepath}} +{{/if}} hosts: {{hosts}} period: {{period}} diff --git a/dev/packages/beats/kubernetes-0.0.1/dataset/container/agent/stream/stream.yml b/dev/packages/beats/kubernetes-0.0.1/dataset/container/agent/stream/stream.yml index b9d8c4357..2c19ace93 100644 --- a/dev/packages/beats/kubernetes-0.0.1/dataset/container/agent/stream/stream.yml +++ b/dev/packages/beats/kubernetes-0.0.1/dataset/container/agent/stream/stream.yml @@ -2,12 +2,12 @@ input: kubernetes/metrics metricsets: ["container"] {{#if add_metadata}} add_metadata: {{add_metadata}} -{{#if add_metadata}} +{{/if}} {{#if bearer_token_file}} bearer_token_file: {{bearer_token_file}} -{{#if bearer_token_file}} +{{/if}} hosts: {{hosts}} period: {{period}} {{#if ssl.verification_mode}} ssl.verification_mode: {{ssl.verification_mode}} -{{#if ssl.verification_mode}} +{{/if}} diff --git a/dev/packages/beats/kubernetes-0.0.1/dataset/event/fields/fields.yml b/dev/packages/beats/kubernetes-0.0.1/dataset/event/fields/fields.yml index 67441582f..b25630f24 100644 --- a/dev/packages/beats/kubernetes-0.0.1/dataset/event/fields/fields.yml +++ b/dev/packages/beats/kubernetes-0.0.1/dataset/event/fields/fields.yml @@ -33,6 +33,19 @@ type: keyword description: > Type of the given event + - name: source + type: group + description: > + The component reporting this event + fields: + - name: component + type: keyword + description: > + Component from which the event is generated + - name: host + type: keyword + description: > + Node name on which the event is generated - name: metadata type: group description: > diff --git a/dev/packages/beats/kubernetes-0.0.1/dataset/node/agent/stream/stream.yml b/dev/packages/beats/kubernetes-0.0.1/dataset/node/agent/stream/stream.yml index 824880f2d..7a5c4504d 100644 --- a/dev/packages/beats/kubernetes-0.0.1/dataset/node/agent/stream/stream.yml +++ b/dev/packages/beats/kubernetes-0.0.1/dataset/node/agent/stream/stream.yml @@ -2,12 +2,12 @@ input: kubernetes/metrics metricsets: ["node"] {{#if add_metadata}} add_metadata: {{add_metadata}} -{{#if add_metadata}} +{{/if}} {{#if bearer_token_file}} bearer_token_file: {{bearer_token_file}} -{{#if bearer_token_file}} +{{/if}} hosts: {{hosts}} period: {{period}} {{#if ssl.verification_mode}} ssl.verification_mode: {{ssl.verification_mode}} -{{#if ssl.verification_mode}} +{{/if}} diff --git a/dev/packages/beats/kubernetes-0.0.1/dataset/pod/agent/stream/stream.yml b/dev/packages/beats/kubernetes-0.0.1/dataset/pod/agent/stream/stream.yml index 486d45399..a873384d1 100644 --- a/dev/packages/beats/kubernetes-0.0.1/dataset/pod/agent/stream/stream.yml +++ b/dev/packages/beats/kubernetes-0.0.1/dataset/pod/agent/stream/stream.yml @@ -2,12 +2,12 @@ input: kubernetes/metrics metricsets: ["pod"] {{#if add_metadata}} add_metadata: {{add_metadata}} -{{#if add_metadata}} +{{/if}} {{#if bearer_token_file}} bearer_token_file: {{bearer_token_file}} -{{#if bearer_token_file}} +{{/if}} hosts: {{hosts}} period: {{period}} {{#if ssl.verification_mode}} ssl.verification_mode: {{ssl.verification_mode}} -{{#if ssl.verification_mode}} +{{/if}} diff --git a/dev/packages/beats/kubernetes-0.0.1/dataset/state_container/agent/stream/stream.yml b/dev/packages/beats/kubernetes-0.0.1/dataset/state_container/agent/stream/stream.yml index e8bc095b1..0cd3079f0 100644 --- a/dev/packages/beats/kubernetes-0.0.1/dataset/state_container/agent/stream/stream.yml +++ b/dev/packages/beats/kubernetes-0.0.1/dataset/state_container/agent/stream/stream.yml @@ -2,6 +2,6 @@ input: kubernetes/metrics metricsets: ["state_container"] {{#if add_metadata}} add_metadata: {{add_metadata}} -{{#if add_metadata}} +{{/if}} hosts: {{hosts}} period: {{period}} diff --git a/dev/packages/beats/kubernetes-0.0.1/dataset/state_cronjob/agent/stream/stream.yml b/dev/packages/beats/kubernetes-0.0.1/dataset/state_cronjob/agent/stream/stream.yml index 26a93f109..76e5b13f9 100644 --- a/dev/packages/beats/kubernetes-0.0.1/dataset/state_cronjob/agent/stream/stream.yml +++ b/dev/packages/beats/kubernetes-0.0.1/dataset/state_cronjob/agent/stream/stream.yml @@ -2,6 +2,6 @@ input: kubernetes/metrics metricsets: ["state_cronjob"] {{#if add_metadata}} add_metadata: {{add_metadata}} -{{#if add_metadata}} +{{/if}} hosts: {{hosts}} period: {{period}} diff --git a/dev/packages/beats/kubernetes-0.0.1/dataset/state_deployment/agent/stream/stream.yml b/dev/packages/beats/kubernetes-0.0.1/dataset/state_deployment/agent/stream/stream.yml index e6696f11e..feb33aca6 100644 --- a/dev/packages/beats/kubernetes-0.0.1/dataset/state_deployment/agent/stream/stream.yml +++ b/dev/packages/beats/kubernetes-0.0.1/dataset/state_deployment/agent/stream/stream.yml @@ -2,6 +2,6 @@ input: kubernetes/metrics metricsets: ["state_deployment"] {{#if add_metadata}} add_metadata: {{add_metadata}} -{{#if add_metadata}} +{{/if}} hosts: {{hosts}} period: {{period}} diff --git a/dev/packages/beats/kubernetes-0.0.1/dataset/state_node/agent/stream/stream.yml b/dev/packages/beats/kubernetes-0.0.1/dataset/state_node/agent/stream/stream.yml index 47e1be331..d96337f8a 100644 --- a/dev/packages/beats/kubernetes-0.0.1/dataset/state_node/agent/stream/stream.yml +++ b/dev/packages/beats/kubernetes-0.0.1/dataset/state_node/agent/stream/stream.yml @@ -2,6 +2,6 @@ input: kubernetes/metrics metricsets: ["state_node"] {{#if add_metadata}} add_metadata: {{add_metadata}} -{{#if add_metadata}} +{{/if}} hosts: {{hosts}} period: {{period}} diff --git a/dev/packages/beats/kubernetes-0.0.1/dataset/state_persistentvolume/agent/stream/stream.yml b/dev/packages/beats/kubernetes-0.0.1/dataset/state_persistentvolume/agent/stream/stream.yml index ae8c30d08..e9ef4d6d1 100644 --- a/dev/packages/beats/kubernetes-0.0.1/dataset/state_persistentvolume/agent/stream/stream.yml +++ b/dev/packages/beats/kubernetes-0.0.1/dataset/state_persistentvolume/agent/stream/stream.yml @@ -2,6 +2,6 @@ input: kubernetes/metrics metricsets: ["state_persistentvolume"] {{#if add_metadata}} add_metadata: {{add_metadata}} -{{#if add_metadata}} +{{/if}} hosts: {{hosts}} period: {{period}} diff --git a/dev/packages/beats/kubernetes-0.0.1/dataset/state_persistentvolumeclaim/agent/stream/stream.yml b/dev/packages/beats/kubernetes-0.0.1/dataset/state_persistentvolumeclaim/agent/stream/stream.yml index 456f444cf..4b08cfac5 100644 --- a/dev/packages/beats/kubernetes-0.0.1/dataset/state_persistentvolumeclaim/agent/stream/stream.yml +++ b/dev/packages/beats/kubernetes-0.0.1/dataset/state_persistentvolumeclaim/agent/stream/stream.yml @@ -2,6 +2,6 @@ input: kubernetes/metrics metricsets: ["state_persistentvolumeclaim"] {{#if add_metadata}} add_metadata: {{add_metadata}} -{{#if add_metadata}} +{{/if}} hosts: {{hosts}} period: {{period}} diff --git a/dev/packages/beats/kubernetes-0.0.1/dataset/state_pod/agent/stream/stream.yml b/dev/packages/beats/kubernetes-0.0.1/dataset/state_pod/agent/stream/stream.yml index 62371b1d8..050b28648 100644 --- a/dev/packages/beats/kubernetes-0.0.1/dataset/state_pod/agent/stream/stream.yml +++ b/dev/packages/beats/kubernetes-0.0.1/dataset/state_pod/agent/stream/stream.yml @@ -2,6 +2,6 @@ input: kubernetes/metrics metricsets: ["state_pod"] {{#if add_metadata}} add_metadata: {{add_metadata}} -{{#if add_metadata}} +{{/if}} hosts: {{hosts}} period: {{period}} diff --git a/dev/packages/beats/kubernetes-0.0.1/dataset/state_replicaset/agent/stream/stream.yml b/dev/packages/beats/kubernetes-0.0.1/dataset/state_replicaset/agent/stream/stream.yml index a2e1ba78c..638f4b59f 100644 --- a/dev/packages/beats/kubernetes-0.0.1/dataset/state_replicaset/agent/stream/stream.yml +++ b/dev/packages/beats/kubernetes-0.0.1/dataset/state_replicaset/agent/stream/stream.yml @@ -2,6 +2,6 @@ input: kubernetes/metrics metricsets: ["state_replicaset"] {{#if add_metadata}} add_metadata: {{add_metadata}} -{{#if add_metadata}} +{{/if}} hosts: {{hosts}} period: {{period}} diff --git a/dev/packages/beats/kubernetes-0.0.1/dataset/state_resourcequota/agent/stream/stream.yml b/dev/packages/beats/kubernetes-0.0.1/dataset/state_resourcequota/agent/stream/stream.yml index b1966e947..d2bf92fd5 100644 --- a/dev/packages/beats/kubernetes-0.0.1/dataset/state_resourcequota/agent/stream/stream.yml +++ b/dev/packages/beats/kubernetes-0.0.1/dataset/state_resourcequota/agent/stream/stream.yml @@ -2,6 +2,6 @@ input: kubernetes/metrics metricsets: ["state_resourcequota"] {{#if add_metadata}} add_metadata: {{add_metadata}} -{{#if add_metadata}} +{{/if}} hosts: {{hosts}} period: {{period}} diff --git a/dev/packages/beats/kubernetes-0.0.1/dataset/state_service/agent/stream/stream.yml b/dev/packages/beats/kubernetes-0.0.1/dataset/state_service/agent/stream/stream.yml index e80cd0b96..eb1ded0af 100644 --- a/dev/packages/beats/kubernetes-0.0.1/dataset/state_service/agent/stream/stream.yml +++ b/dev/packages/beats/kubernetes-0.0.1/dataset/state_service/agent/stream/stream.yml @@ -2,6 +2,6 @@ input: kubernetes/metrics metricsets: ["state_service"] {{#if add_metadata}} add_metadata: {{add_metadata}} -{{#if add_metadata}} +{{/if}} hosts: {{hosts}} period: {{period}} diff --git a/dev/packages/beats/kubernetes-0.0.1/dataset/state_statefulset/agent/stream/stream.yml b/dev/packages/beats/kubernetes-0.0.1/dataset/state_statefulset/agent/stream/stream.yml index 32fca17e8..432fa83de 100644 --- a/dev/packages/beats/kubernetes-0.0.1/dataset/state_statefulset/agent/stream/stream.yml +++ b/dev/packages/beats/kubernetes-0.0.1/dataset/state_statefulset/agent/stream/stream.yml @@ -2,6 +2,6 @@ input: kubernetes/metrics metricsets: ["state_statefulset"] {{#if add_metadata}} add_metadata: {{add_metadata}} -{{#if add_metadata}} +{{/if}} hosts: {{hosts}} period: {{period}} diff --git a/dev/packages/beats/kubernetes-0.0.1/dataset/state_storageclass/agent/stream/stream.yml b/dev/packages/beats/kubernetes-0.0.1/dataset/state_storageclass/agent/stream/stream.yml index 2ea62f47c..c6b37e580 100644 --- a/dev/packages/beats/kubernetes-0.0.1/dataset/state_storageclass/agent/stream/stream.yml +++ b/dev/packages/beats/kubernetes-0.0.1/dataset/state_storageclass/agent/stream/stream.yml @@ -2,6 +2,6 @@ input: kubernetes/metrics metricsets: ["state_storageclass"] {{#if add_metadata}} add_metadata: {{add_metadata}} -{{#if add_metadata}} +{{/if}} hosts: {{hosts}} period: {{period}} diff --git a/dev/packages/beats/kubernetes-0.0.1/dataset/system/agent/stream/stream.yml b/dev/packages/beats/kubernetes-0.0.1/dataset/system/agent/stream/stream.yml index 49c6bc54c..94f50d28c 100644 --- a/dev/packages/beats/kubernetes-0.0.1/dataset/system/agent/stream/stream.yml +++ b/dev/packages/beats/kubernetes-0.0.1/dataset/system/agent/stream/stream.yml @@ -2,12 +2,12 @@ input: kubernetes/metrics metricsets: ["system"] {{#if add_metadata}} add_metadata: {{add_metadata}} -{{#if add_metadata}} +{{/if}} {{#if bearer_token_file}} bearer_token_file: {{bearer_token_file}} -{{#if bearer_token_file}} +{{/if}} hosts: {{hosts}} period: {{period}} {{#if ssl.verification_mode}} ssl.verification_mode: {{ssl.verification_mode}} -{{#if ssl.verification_mode}} +{{/if}} diff --git a/dev/packages/beats/kubernetes-0.0.1/dataset/volume/agent/stream/stream.yml b/dev/packages/beats/kubernetes-0.0.1/dataset/volume/agent/stream/stream.yml index aa2939ed1..789315611 100644 --- a/dev/packages/beats/kubernetes-0.0.1/dataset/volume/agent/stream/stream.yml +++ b/dev/packages/beats/kubernetes-0.0.1/dataset/volume/agent/stream/stream.yml @@ -2,12 +2,12 @@ input: kubernetes/metrics metricsets: ["volume"] {{#if add_metadata}} add_metadata: {{add_metadata}} -{{#if add_metadata}} +{{/if}} {{#if bearer_token_file}} bearer_token_file: {{bearer_token_file}} -{{#if bearer_token_file}} +{{/if}} hosts: {{hosts}} period: {{period}} {{#if ssl.verification_mode}} ssl.verification_mode: {{ssl.verification_mode}} -{{#if ssl.verification_mode}} +{{/if}} diff --git a/dev/packages/beats/logstash-0.0.1/dataset/log/agent/stream/stream.yml b/dev/packages/beats/logstash-0.0.1/dataset/log/agent/stream/stream.yml index 2636dd6d0..635750584 100644 --- a/dev/packages/beats/logstash-0.0.1/dataset/log/agent/stream/stream.yml +++ b/dev/packages/beats/logstash-0.0.1/dataset/log/agent/stream/stream.yml @@ -9,7 +9,7 @@ multiline: pattern: ^\[[0-9]{4}-[0-9]{2}-[0-9]{2} negate: true match: after -{{/end}} +{{/if}} processors: # Locale for timezone is only needed in non-json logs - add_locale.when.not.regexp.message: "^{" diff --git a/dev/packages/beats/logstash-0.0.1/dataset/node/agent/stream/stream.yml b/dev/packages/beats/logstash-0.0.1/dataset/node/agent/stream/stream.yml index 691103e44..26909cd6f 100644 --- a/dev/packages/beats/logstash-0.0.1/dataset/node/agent/stream/stream.yml +++ b/dev/packages/beats/logstash-0.0.1/dataset/node/agent/stream/stream.yml @@ -4,4 +4,4 @@ hosts: {{hosts}} period: {{period}} {{#if xpack.enabled}} xpack.enabled: {{xpack.enabled}} -{{#if xpack.enabled}} +{{/if}} diff --git a/dev/packages/beats/logstash-0.0.1/dataset/node_stats/agent/stream/stream.yml b/dev/packages/beats/logstash-0.0.1/dataset/node_stats/agent/stream/stream.yml index 7069810c7..2c59fbe69 100644 --- a/dev/packages/beats/logstash-0.0.1/dataset/node_stats/agent/stream/stream.yml +++ b/dev/packages/beats/logstash-0.0.1/dataset/node_stats/agent/stream/stream.yml @@ -4,4 +4,4 @@ hosts: {{hosts}} period: {{period}} {{#if xpack.enabled}} xpack.enabled: {{xpack.enabled}} -{{#if xpack.enabled}} +{{/if}} diff --git a/dev/packages/beats/misp-0.0.1/dataset/threat/agent/stream/stream.yml b/dev/packages/beats/misp-0.0.1/dataset/threat/agent/stream/stream.yml index 91efbda1c..a8114d57a 100644 --- a/dev/packages/beats/misp-0.0.1/dataset/threat/agent/stream/stream.yml +++ b/dev/packages/beats/misp-0.0.1/dataset/threat/agent/stream/stream.yml @@ -17,7 +17,7 @@ paths: - {{this}} {{/each}} exclude_files: [".gz$"] -{{/end}} +{{/if}} processors: - script: lang: javascript diff --git a/dev/packages/beats/mssql-0.0.1/dataset/performance/agent/stream/stream.yml b/dev/packages/beats/mssql-0.0.1/dataset/performance/agent/stream/stream.yml index 1a605a690..bbbe912c8 100644 --- a/dev/packages/beats/mssql-0.0.1/dataset/performance/agent/stream/stream.yml +++ b/dev/packages/beats/mssql-0.0.1/dataset/performance/agent/stream/stream.yml @@ -3,8 +3,8 @@ metricsets: ["performance"] hosts: {{hosts}} {{#if password}} password: {{password}} -{{#if password}} +{{/if}} period: {{period}} {{#if username}} username: {{username}} -{{#if username}} +{{/if}} diff --git a/dev/packages/beats/mssql-0.0.1/dataset/transaction_log/agent/stream/stream.yml b/dev/packages/beats/mssql-0.0.1/dataset/transaction_log/agent/stream/stream.yml index ddb433602..433035599 100644 --- a/dev/packages/beats/mssql-0.0.1/dataset/transaction_log/agent/stream/stream.yml +++ b/dev/packages/beats/mssql-0.0.1/dataset/transaction_log/agent/stream/stream.yml @@ -3,8 +3,8 @@ metricsets: ["transaction_log"] hosts: {{hosts}} {{#if password}} password: {{password}} -{{#if password}} +{{/if}} period: {{period}} {{#if username}} username: {{username}} -{{#if username}} +{{/if}} diff --git a/dev/packages/beats/nginx-0.0.1/dataset/stubstatus/agent/stream/stream.yml b/dev/packages/beats/nginx-0.0.1/dataset/stubstatus/agent/stream/stream.yml index 5d1e7164a..da952e0c6 100644 --- a/dev/packages/beats/nginx-0.0.1/dataset/stubstatus/agent/stream/stream.yml +++ b/dev/packages/beats/nginx-0.0.1/dataset/stubstatus/agent/stream/stream.yml @@ -4,4 +4,4 @@ hosts: {{hosts}} period: {{period}} {{#if server_status_path}} server_status_path: {{server_status_path}} -{{#if server_status_path}} +{{/if}} diff --git a/dev/packages/beats/o365-0.0.1/dataset/audit/agent/stream/stream.yml b/dev/packages/beats/o365-0.0.1/dataset/audit/agent/stream/stream.yml index 21d1a6402..4bb2e1e52 100644 --- a/dev/packages/beats/o365-0.0.1/dataset/audit/agent/stream/stream.yml +++ b/dev/packages/beats/o365-0.0.1/dataset/audit/agent/stream/stream.yml @@ -1,37 +1,37 @@ {{#if input == "o365audit"}} input: o365audit -{{#if this.application_id}}application_id: {{this.application_id}}{{/end}} +{{#if this.application_id}}application_id: {{this.application_id}}{{/if}} tenant_id: {{#each this.tenants}} - {{this.id}} -{{/end}} -{{#if this.certificate}}certificate: {{this.certificate}}{{/end}} -{{#if this.key}}key: {{this.key}}{{/end}} -{{#if this.key_passphrase}}key_passphrase: {{this.key_passphrase}}{{/end}} -{{#if this.client_secret}}client_secret: {{this.client_secret}}{{/end}} +{{/if}} +{{#if this.certificate}}certificate: {{this.certificate}}{{/if}} +{{#if this.key}}key: {{this.key}}{{/if}} +{{#if this.key_passphrase}}key_passphrase: {{this.key_passphrase}}{{/if}} +{{#if this.client_secret}}client_secret: {{this.client_secret}}{{/if}} {{#if "string" == (printf "%T" .content_type)}} content_type: {{this.content_type}} {{else}} content_type: {{#each this.content_type}} - {{this}} -{{/end}} -{{/end}} +{{/if}} +{{/if}} {{#if this.api}} api: {{#each api}} - {{this}} {{/each}} -{{/end}} +{{/if}} {{else if input == "file"}} input: log paths: {{#each this.paths}} - {{this}} -{{/end}} +{{/if}} exclude_files: [".gz$"] json.add_error_key: true -{{/end}} +{{/if}} processors: {{#if input == "file"}} - rename: @@ -42,7 +42,7 @@ processors: field: o365audit.CreationTime layouts: - 2006-01-02T15:04:05 -{{/end}} +{{/if}} - script: lang: javascript id: o365audit_script @@ -53,4 +53,4 @@ processors: {{#each this.tenants}} - id: "{{this.id}}" name: "{{this.name}}" - {{/end}} + {{/if}} diff --git a/dev/packages/beats/okta-0.0.1/dataset/system/agent/stream/stream.yml b/dev/packages/beats/okta-0.0.1/dataset/system/agent/stream/stream.yml index 79d8e0bf4..b6e840b90 100644 --- a/dev/packages/beats/okta-0.0.1/dataset/system/agent/stream/stream.yml +++ b/dev/packages/beats/okta-0.0.1/dataset/system/agent/stream/stream.yml @@ -20,7 +20,7 @@ paths: - {{this}} {{/each}} exclude_files: [".gz$"] -{{/end}} +{{/if}} processors: - script: lang: javascript diff --git a/dev/packages/beats/openmetrics-0.0.1/dataset/collector/agent/stream/stream.yml b/dev/packages/beats/openmetrics-0.0.1/dataset/collector/agent/stream/stream.yml index 1c53182cb..e1919727c 100644 --- a/dev/packages/beats/openmetrics-0.0.1/dataset/collector/agent/stream/stream.yml +++ b/dev/packages/beats/openmetrics-0.0.1/dataset/collector/agent/stream/stream.yml @@ -3,11 +3,11 @@ metricsets: ["collector"] hosts: {{hosts}} {{#if metrics_filters.exclude}} metrics_filters.exclude: {{metrics_filters.exclude}} -{{#if metrics_filters.exclude}} +{{/if}} {{#if metrics_filters.include}} metrics_filters.include: {{metrics_filters.include}} -{{#if metrics_filters.include}} +{{/if}} {{#if metrics_path}} metrics_path: {{metrics_path}} -{{#if metrics_path}} +{{/if}} period: {{period}} diff --git a/dev/packages/beats/panw-0.0.1/dataset/panos/agent/stream/stream.yml b/dev/packages/beats/panw-0.0.1/dataset/panos/agent/stream/stream.yml index 3feaffa03..68f097b29 100644 --- a/dev/packages/beats/panw-0.0.1/dataset/panos/agent/stream/stream.yml +++ b/dev/packages/beats/panw-0.0.1/dataset/panos/agent/stream/stream.yml @@ -9,7 +9,7 @@ paths: - {{this}} {{/each}} exclude_files: [".gz$"] -{{/end}} +{{/if}} tags: {{this.tags}} processors: - add_locale: ~ diff --git a/dev/packages/beats/php_fpm-0.0.1/dataset/pool/agent/stream/stream.yml b/dev/packages/beats/php_fpm-0.0.1/dataset/pool/agent/stream/stream.yml index c0ca5971e..b855006bf 100644 --- a/dev/packages/beats/php_fpm-0.0.1/dataset/pool/agent/stream/stream.yml +++ b/dev/packages/beats/php_fpm-0.0.1/dataset/pool/agent/stream/stream.yml @@ -4,4 +4,4 @@ hosts: {{hosts}} period: {{period}} {{#if status_path}} status_path: {{status_path}} -{{#if status_path}} +{{/if}} diff --git a/dev/packages/beats/prometheus-0.0.1/dataset/query/agent/stream/stream.yml b/dev/packages/beats/prometheus-0.0.1/dataset/query/agent/stream/stream.yml index 3d969c188..551763fb1 100644 --- a/dev/packages/beats/prometheus-0.0.1/dataset/query/agent/stream/stream.yml +++ b/dev/packages/beats/prometheus-0.0.1/dataset/query/agent/stream/stream.yml @@ -1,4 +1,2 @@ input: prometheus/metrics metricsets: ["query"] -hosts: {{hosts}} -period: {{period}} diff --git a/dev/packages/beats/prometheus-0.0.1/dataset/query/manifest.yml b/dev/packages/beats/prometheus-0.0.1/dataset/query/manifest.yml index 0f135097a..dbff9a126 100644 --- a/dev/packages/beats/prometheus-0.0.1/dataset/query/manifest.yml +++ b/dev/packages/beats/prometheus-0.0.1/dataset/query/manifest.yml @@ -4,11 +4,5 @@ release: beta type: metrics streams: - input: prometheus/metrics - vars: - - default: - - localhost:9090 - name: hosts - - default: 10s - name: period title: Prometheus query metrics description: Collect Prometheus query metrics diff --git a/dev/packages/beats/prometheus-0.0.1/dataset/remote_write/agent/stream/stream.yml b/dev/packages/beats/prometheus-0.0.1/dataset/remote_write/agent/stream/stream.yml index 4f887263f..7d326ed42 100644 --- a/dev/packages/beats/prometheus-0.0.1/dataset/remote_write/agent/stream/stream.yml +++ b/dev/packages/beats/prometheus-0.0.1/dataset/remote_write/agent/stream/stream.yml @@ -1,8 +1,2 @@ input: prometheus/metrics metricsets: ["remote_write"] -{{#if host}} -host: {{host}} -{{#if host}} -{{#if port}} -port: {{port}} -{{#if port}} diff --git a/dev/packages/beats/prometheus-0.0.1/dataset/remote_write/manifest.yml b/dev/packages/beats/prometheus-0.0.1/dataset/remote_write/manifest.yml index 41b935f09..de0ffbf59 100644 --- a/dev/packages/beats/prometheus-0.0.1/dataset/remote_write/manifest.yml +++ b/dev/packages/beats/prometheus-0.0.1/dataset/remote_write/manifest.yml @@ -4,10 +4,5 @@ release: beta type: metrics streams: - input: prometheus/metrics - vars: - - default: localhost - name: host - - default: "9201" - name: port title: Prometheus remote_write metrics description: Collect Prometheus remote_write metrics diff --git a/dev/packages/beats/sql-0.0.1/dataset/query/agent/stream/stream.yml b/dev/packages/beats/sql-0.0.1/dataset/query/agent/stream/stream.yml index 8a32b663f..51a963d60 100644 --- a/dev/packages/beats/sql-0.0.1/dataset/query/agent/stream/stream.yml +++ b/dev/packages/beats/sql-0.0.1/dataset/query/agent/stream/stream.yml @@ -2,12 +2,12 @@ input: sql/metrics metricsets: ["query"] {{#if driver}} driver: {{driver}} -{{#if driver}} +{{/if}} hosts: {{hosts}} period: {{period}} {{#if sql_query}} sql_query: {{sql_query}} -{{#if sql_query}} +{{/if}} {{#if sql_response_format}} sql_response_format: {{sql_response_format}} -{{#if sql_response_format}} +{{/if}} diff --git a/dev/packages/beats/suricata-0.0.1/dataset/eve/agent/stream/stream.yml b/dev/packages/beats/suricata-0.0.1/dataset/eve/agent/stream/stream.yml index b2153400d..9d704dc9c 100644 --- a/dev/packages/beats/suricata-0.0.1/dataset/eve/agent/stream/stream.yml +++ b/dev/packages/beats/suricata-0.0.1/dataset/eve/agent/stream/stream.yml @@ -39,7 +39,7 @@ processors: - suricata.eve.timestamp {{#if this.community_id}} - community_id: -{{/end}} +{{/if}} - if: equals: suricata.eve.event_type: dns diff --git a/dev/packages/beats/system-0.0.1/dataset/core/agent/stream/stream.yml b/dev/packages/beats/system-0.0.1/dataset/core/agent/stream/stream.yml index 3ea2e655e..4f2a587c6 100644 --- a/dev/packages/beats/system-0.0.1/dataset/core/agent/stream/stream.yml +++ b/dev/packages/beats/system-0.0.1/dataset/core/agent/stream/stream.yml @@ -2,4 +2,4 @@ input: system/metrics metricsets: ["core"] {{#if core.metrics}} core.metrics: {{core.metrics}} -{{#if core.metrics}} +{{/if}} diff --git a/dev/packages/beats/system-0.0.1/dataset/cpu/agent/stream/stream.yml b/dev/packages/beats/system-0.0.1/dataset/cpu/agent/stream/stream.yml index 0f3403754..a67aa1ff0 100644 --- a/dev/packages/beats/system-0.0.1/dataset/cpu/agent/stream/stream.yml +++ b/dev/packages/beats/system-0.0.1/dataset/cpu/agent/stream/stream.yml @@ -2,17 +2,17 @@ input: system/metrics metricsets: ["cpu"] {{#if core.metrics}} core.metrics: {{core.metrics}} -{{#if core.metrics}} +{{/if}} {{#if cpu.metrics}} cpu.metrics: {{cpu.metrics}} -{{#if cpu.metrics}} +{{/if}} period: {{period}} {{#if process.include_top_n.by_cpu}} process.include_top_n.by_cpu: {{process.include_top_n.by_cpu}} -{{#if process.include_top_n.by_cpu}} +{{/if}} {{#if process.include_top_n.by_memory}} process.include_top_n.by_memory: {{process.include_top_n.by_memory}} -{{#if process.include_top_n.by_memory}} +{{/if}} {{#if processes}} processes: {{processes}} -{{#if processes}} +{{/if}} diff --git a/dev/packages/beats/system-0.0.1/dataset/filesystem/agent/stream/stream.yml b/dev/packages/beats/system-0.0.1/dataset/filesystem/agent/stream/stream.yml index 8eaf74115..1e532bd13 100644 --- a/dev/packages/beats/system-0.0.1/dataset/filesystem/agent/stream/stream.yml +++ b/dev/packages/beats/system-0.0.1/dataset/filesystem/agent/stream/stream.yml @@ -3,4 +3,4 @@ metricsets: ["filesystem"] period: {{period}} {{#if processors}} processors: {{processors}} -{{#if processors}} +{{/if}} diff --git a/dev/packages/beats/system-0.0.1/dataset/fsstat/agent/stream/stream.yml b/dev/packages/beats/system-0.0.1/dataset/fsstat/agent/stream/stream.yml index 9133a02f0..eae3c47dd 100644 --- a/dev/packages/beats/system-0.0.1/dataset/fsstat/agent/stream/stream.yml +++ b/dev/packages/beats/system-0.0.1/dataset/fsstat/agent/stream/stream.yml @@ -3,4 +3,4 @@ metricsets: ["fsstat"] period: {{period}} {{#if processors}} processors: {{processors}} -{{#if processors}} +{{/if}} diff --git a/dev/packages/beats/system-0.0.1/dataset/load/agent/stream/stream.yml b/dev/packages/beats/system-0.0.1/dataset/load/agent/stream/stream.yml index e81d1e3ca..ad7b5563c 100644 --- a/dev/packages/beats/system-0.0.1/dataset/load/agent/stream/stream.yml +++ b/dev/packages/beats/system-0.0.1/dataset/load/agent/stream/stream.yml @@ -2,17 +2,17 @@ input: system/metrics metricsets: ["load"] {{#if core.metrics}} core.metrics: {{core.metrics}} -{{#if core.metrics}} +{{/if}} {{#if cpu.metrics}} cpu.metrics: {{cpu.metrics}} -{{#if cpu.metrics}} +{{/if}} period: {{period}} {{#if process.include_top_n.by_cpu}} process.include_top_n.by_cpu: {{process.include_top_n.by_cpu}} -{{#if process.include_top_n.by_cpu}} +{{/if}} {{#if process.include_top_n.by_memory}} process.include_top_n.by_memory: {{process.include_top_n.by_memory}} -{{#if process.include_top_n.by_memory}} +{{/if}} {{#if processes}} processes: {{processes}} -{{#if processes}} +{{/if}} diff --git a/dev/packages/beats/system-0.0.1/dataset/memory/agent/stream/stream.yml b/dev/packages/beats/system-0.0.1/dataset/memory/agent/stream/stream.yml index 70a337ff0..b72774530 100644 --- a/dev/packages/beats/system-0.0.1/dataset/memory/agent/stream/stream.yml +++ b/dev/packages/beats/system-0.0.1/dataset/memory/agent/stream/stream.yml @@ -2,17 +2,17 @@ input: system/metrics metricsets: ["memory"] {{#if core.metrics}} core.metrics: {{core.metrics}} -{{#if core.metrics}} +{{/if}} {{#if cpu.metrics}} cpu.metrics: {{cpu.metrics}} -{{#if cpu.metrics}} +{{/if}} period: {{period}} {{#if process.include_top_n.by_cpu}} process.include_top_n.by_cpu: {{process.include_top_n.by_cpu}} -{{#if process.include_top_n.by_cpu}} +{{/if}} {{#if process.include_top_n.by_memory}} process.include_top_n.by_memory: {{process.include_top_n.by_memory}} -{{#if process.include_top_n.by_memory}} +{{/if}} {{#if processes}} processes: {{processes}} -{{#if processes}} +{{/if}} diff --git a/dev/packages/beats/system-0.0.1/dataset/network/agent/stream/stream.yml b/dev/packages/beats/system-0.0.1/dataset/network/agent/stream/stream.yml index dde2abd80..384c6e7a4 100644 --- a/dev/packages/beats/system-0.0.1/dataset/network/agent/stream/stream.yml +++ b/dev/packages/beats/system-0.0.1/dataset/network/agent/stream/stream.yml @@ -2,17 +2,17 @@ input: system/metrics metricsets: ["network"] {{#if core.metrics}} core.metrics: {{core.metrics}} -{{#if core.metrics}} +{{/if}} {{#if cpu.metrics}} cpu.metrics: {{cpu.metrics}} -{{#if cpu.metrics}} +{{/if}} period: {{period}} {{#if process.include_top_n.by_cpu}} process.include_top_n.by_cpu: {{process.include_top_n.by_cpu}} -{{#if process.include_top_n.by_cpu}} +{{/if}} {{#if process.include_top_n.by_memory}} process.include_top_n.by_memory: {{process.include_top_n.by_memory}} -{{#if process.include_top_n.by_memory}} +{{/if}} {{#if processes}} processes: {{processes}} -{{#if processes}} +{{/if}} diff --git a/dev/packages/beats/system-0.0.1/dataset/process/agent/stream/stream.yml b/dev/packages/beats/system-0.0.1/dataset/process/agent/stream/stream.yml index 2be7bd7c1..d3298d717 100644 --- a/dev/packages/beats/system-0.0.1/dataset/process/agent/stream/stream.yml +++ b/dev/packages/beats/system-0.0.1/dataset/process/agent/stream/stream.yml @@ -2,17 +2,17 @@ input: system/metrics metricsets: ["process"] {{#if core.metrics}} core.metrics: {{core.metrics}} -{{#if core.metrics}} +{{/if}} {{#if cpu.metrics}} cpu.metrics: {{cpu.metrics}} -{{#if cpu.metrics}} +{{/if}} period: {{period}} {{#if process.include_top_n.by_cpu}} process.include_top_n.by_cpu: {{process.include_top_n.by_cpu}} -{{#if process.include_top_n.by_cpu}} +{{/if}} {{#if process.include_top_n.by_memory}} process.include_top_n.by_memory: {{process.include_top_n.by_memory}} -{{#if process.include_top_n.by_memory}} +{{/if}} {{#if processes}} processes: {{processes}} -{{#if processes}} +{{/if}} diff --git a/dev/packages/beats/system-0.0.1/dataset/process/fields/fields.yml b/dev/packages/beats/system-0.0.1/dataset/process/fields/fields.yml index 244fbe5c7..d5a284d24 100644 --- a/dev/packages/beats/system-0.0.1/dataset/process/fields/fields.yml +++ b/dev/packages/beats/system-0.0.1/dataset/process/fields/fields.yml @@ -91,12 +91,12 @@ type: long format: bytes description: > - The total virtual memory the process has. + The total virtual memory the process has. On Windows this represents the Commit Charge (the total amount of memory that the memory manager has committed for a running process) value in bytes for this process. - name: rss.bytes type: long format: bytes description: > - The Resident Set Size. The amount of memory the process occupied in main memory (RAM). + The Resident Set Size. The amount of memory the process occupied in main memory (RAM). On Windows this represents the current working set size, in bytes. - name: rss.pct type: scaled_float format: percent diff --git a/dev/packages/beats/system-0.0.1/dataset/process_summary/agent/stream/stream.yml b/dev/packages/beats/system-0.0.1/dataset/process_summary/agent/stream/stream.yml index 17a6fdd26..9cbb7facb 100644 --- a/dev/packages/beats/system-0.0.1/dataset/process_summary/agent/stream/stream.yml +++ b/dev/packages/beats/system-0.0.1/dataset/process_summary/agent/stream/stream.yml @@ -2,17 +2,17 @@ input: system/metrics metricsets: ["process_summary"] {{#if core.metrics}} core.metrics: {{core.metrics}} -{{#if core.metrics}} +{{/if}} {{#if cpu.metrics}} cpu.metrics: {{cpu.metrics}} -{{#if cpu.metrics}} +{{/if}} period: {{period}} {{#if process.include_top_n.by_cpu}} process.include_top_n.by_cpu: {{process.include_top_n.by_cpu}} -{{#if process.include_top_n.by_cpu}} +{{/if}} {{#if process.include_top_n.by_memory}} process.include_top_n.by_memory: {{process.include_top_n.by_memory}} -{{#if process.include_top_n.by_memory}} +{{/if}} {{#if processes}} processes: {{processes}} -{{#if processes}} +{{/if}} diff --git a/dev/packages/beats/system-0.0.1/dataset/socket_summary/agent/stream/stream.yml b/dev/packages/beats/system-0.0.1/dataset/socket_summary/agent/stream/stream.yml index 81cee4f0d..828058703 100644 --- a/dev/packages/beats/system-0.0.1/dataset/socket_summary/agent/stream/stream.yml +++ b/dev/packages/beats/system-0.0.1/dataset/socket_summary/agent/stream/stream.yml @@ -2,17 +2,17 @@ input: system/metrics metricsets: ["socket_summary"] {{#if core.metrics}} core.metrics: {{core.metrics}} -{{#if core.metrics}} +{{/if}} {{#if cpu.metrics}} cpu.metrics: {{cpu.metrics}} -{{#if cpu.metrics}} +{{/if}} period: {{period}} {{#if process.include_top_n.by_cpu}} process.include_top_n.by_cpu: {{process.include_top_n.by_cpu}} -{{#if process.include_top_n.by_cpu}} +{{/if}} {{#if process.include_top_n.by_memory}} process.include_top_n.by_memory: {{process.include_top_n.by_memory}} -{{#if process.include_top_n.by_memory}} +{{/if}} {{#if processes}} processes: {{processes}} -{{#if processes}} +{{/if}} diff --git a/dev/packages/beats/system-0.0.1/dataset/uptime/agent/stream/stream.yml b/dev/packages/beats/system-0.0.1/dataset/uptime/agent/stream/stream.yml index 94c48aaa0..3d7790fcf 100644 --- a/dev/packages/beats/system-0.0.1/dataset/uptime/agent/stream/stream.yml +++ b/dev/packages/beats/system-0.0.1/dataset/uptime/agent/stream/stream.yml @@ -2,11 +2,11 @@ input: system/metrics metricsets: ["uptime"] {{#if core.metrics}} core.metrics: {{core.metrics}} -{{#if core.metrics}} +{{/if}} {{#if cpu.metrics}} cpu.metrics: {{cpu.metrics}} -{{#if cpu.metrics}} +{{/if}} period: {{period}} {{#if processes}} processes: {{processes}} -{{#if processes}} +{{/if}} diff --git a/dev/packages/beats/system-0.0.1/kibana/dashboard/79ffd6e0-faa0-11e6-947f-177f697178b8-ecs.json b/dev/packages/beats/system-0.0.1/kibana/dashboard/79ffd6e0-faa0-11e6-947f-177f697178b8-ecs.json index c0420b9a2..26b590627 100644 --- a/dev/packages/beats/system-0.0.1/kibana/dashboard/79ffd6e0-faa0-11e6-947f-177f697178b8-ecs.json +++ b/dev/packages/beats/system-0.0.1/kibana/dashboard/79ffd6e0-faa0-11e6-947f-177f697178b8-ecs.json @@ -18,6 +18,7 @@ }, "panelsJSON": [ { + "embeddableConfig": {}, "gridData": { "h": 15, "i": "1", @@ -27,9 +28,10 @@ }, "panelIndex": "1", "panelRefName": "panel_0", - "version": "7.3.0" + "version": "7.6.0" }, { + "embeddableConfig": {}, "gridData": { "h": 15, "i": "2", @@ -39,9 +41,10 @@ }, "panelIndex": "2", "panelRefName": "panel_1", - "version": "7.3.0" + "version": "7.6.0" }, { + "embeddableConfig": {}, "gridData": { "h": 15, "i": "3", @@ -51,9 +54,10 @@ }, "panelIndex": "3", "panelRefName": "panel_2", - "version": "7.3.0" + "version": "7.6.0" }, { + "embeddableConfig": {}, "gridData": { "h": 15, "i": "4", @@ -63,9 +67,10 @@ }, "panelIndex": "4", "panelRefName": "panel_3", - "version": "7.3.0" + "version": "7.6.0" }, { + "embeddableConfig": {}, "gridData": { "h": 15, "i": "5", @@ -75,9 +80,10 @@ }, "panelIndex": "5", "panelRefName": "panel_4", - "version": "7.3.0" + "version": "7.6.0" }, { + "embeddableConfig": {}, "gridData": { "h": 15, "i": "6", @@ -87,9 +93,10 @@ }, "panelIndex": "6", "panelRefName": "panel_5", - "version": "7.3.0" + "version": "7.6.0" }, { + "embeddableConfig": {}, "gridData": { "h": 15, "i": "7", @@ -99,9 +106,10 @@ }, "panelIndex": "7", "panelRefName": "panel_6", - "version": "7.3.0" + "version": "7.6.0" }, { + "embeddableConfig": {}, "gridData": { "h": 15, "i": "8", @@ -111,9 +119,10 @@ }, "panelIndex": "8", "panelRefName": "panel_7", - "version": "7.3.0" + "version": "7.6.0" }, { + "embeddableConfig": {}, "gridData": { "h": 10, "i": "9", @@ -123,9 +132,10 @@ }, "panelIndex": "9", "panelRefName": "panel_8", - "version": "7.3.0" + "version": "7.6.0" }, { + "embeddableConfig": {}, "gridData": { "h": 10, "i": "10", @@ -135,9 +145,10 @@ }, "panelIndex": "10", "panelRefName": "panel_9", - "version": "7.3.0" + "version": "7.6.0" }, { + "embeddableConfig": {}, "gridData": { "h": 10, "i": "11", @@ -147,9 +158,10 @@ }, "panelIndex": "11", "panelRefName": "panel_10", - "version": "7.3.0" + "version": "7.6.0" }, { + "embeddableConfig": {}, "gridData": { "h": 10, "i": "12", @@ -159,9 +171,10 @@ }, "panelIndex": "12", "panelRefName": "panel_11", - "version": "7.3.0" + "version": "7.6.0" }, { + "embeddableConfig": {}, "gridData": { "h": 10, "i": "13", @@ -171,9 +184,10 @@ }, "panelIndex": "13", "panelRefName": "panel_12", - "version": "7.3.0" + "version": "7.6.0" }, { + "embeddableConfig": {}, "gridData": { "h": 10, "i": "14", @@ -183,9 +197,10 @@ }, "panelIndex": "14", "panelRefName": "panel_13", - "version": "7.3.0" + "version": "7.6.0" }, { + "embeddableConfig": {}, "gridData": { "h": 5, "i": "16", @@ -195,9 +210,10 @@ }, "panelIndex": "16", "panelRefName": "panel_14", - "version": "7.3.0" + "version": "7.6.0" }, { + "embeddableConfig": {}, "gridData": { "h": 10, "i": "21", @@ -207,9 +223,10 @@ }, "panelIndex": "21", "panelRefName": "panel_15", - "version": "7.3.0" + "version": "7.6.0" }, { + "embeddableConfig": {}, "gridData": { "h": 10, "i": "22", @@ -219,9 +236,10 @@ }, "panelIndex": "22", "panelRefName": "panel_16", - "version": "7.3.0" + "version": "7.6.0" }, { + "embeddableConfig": {}, "gridData": { "h": 10, "i": "23", @@ -231,9 +249,10 @@ }, "panelIndex": "23", "panelRefName": "panel_17", - "version": "7.3.0" + "version": "7.6.0" }, { + "embeddableConfig": {}, "gridData": { "h": 10, "i": "25", @@ -243,9 +262,10 @@ }, "panelIndex": "25", "panelRefName": "panel_18", - "version": "7.3.0" + "version": "7.6.0" }, { + "embeddableConfig": {}, "gridData": { "h": 15, "i": "27", @@ -255,9 +275,10 @@ }, "panelIndex": "27", "panelRefName": "panel_19", - "version": "7.3.0" + "version": "7.6.0" }, { + "embeddableConfig": {}, "gridData": { "h": 15, "i": "28", @@ -267,7 +288,7 @@ }, "panelIndex": "28", "panelRefName": "panel_20", - "version": "7.3.0" + "version": "7.6.0" }, { "embeddableConfig": { @@ -286,9 +307,10 @@ }, "panelIndex": "29", "panelRefName": "panel_21", - "version": "7.3.0" + "version": "7.6.0" }, { + "embeddableConfig": {}, "gridData": { "h": 5, "i": "30", @@ -298,7 +320,7 @@ }, "panelIndex": "30", "panelRefName": "panel_22", - "version": "7.3.0" + "version": "7.6.0" } ], "timeRestore": false, diff --git a/dev/packages/beats/system-0.0.1/kibana/dashboard/Metricbeat-system-overview-ecs.json b/dev/packages/beats/system-0.0.1/kibana/dashboard/Metricbeat-system-overview-ecs.json index c03040a8d..c612f482d 100644 --- a/dev/packages/beats/system-0.0.1/kibana/dashboard/Metricbeat-system-overview-ecs.json +++ b/dev/packages/beats/system-0.0.1/kibana/dashboard/Metricbeat-system-overview-ecs.json @@ -28,7 +28,7 @@ }, "panelIndex": "9", "panelRefName": "panel_0", - "version": "7.3.0" + "version": "7.6.0" }, { "embeddableConfig": { @@ -47,7 +47,7 @@ }, "panelIndex": "11", "panelRefName": "panel_1", - "version": "7.3.0" + "version": "7.6.0" }, { "embeddableConfig": { @@ -66,7 +66,7 @@ }, "panelIndex": "12", "panelRefName": "panel_2", - "version": "7.3.0" + "version": "7.6.0" }, { "embeddableConfig": {}, @@ -79,7 +79,7 @@ }, "panelIndex": "13", "panelRefName": "panel_3", - "version": "7.3.0" + "version": "7.6.0" }, { "embeddableConfig": { @@ -101,7 +101,7 @@ }, "panelIndex": "14", "panelRefName": "panel_4", - "version": "7.3.0" + "version": "7.6.0" }, { "embeddableConfig": { @@ -120,7 +120,7 @@ }, "panelIndex": "16", "panelRefName": "panel_5", - "version": "7.3.0" + "version": "7.6.0" }, { "embeddableConfig": {}, @@ -133,7 +133,7 @@ }, "panelIndex": "17", "panelRefName": "panel_6", - "version": "7.3.0" + "version": "7.6.0" }, { "embeddableConfig": {}, @@ -146,7 +146,7 @@ }, "panelIndex": "18", "panelRefName": "panel_7", - "version": "7.3.0" + "version": "7.6.0" }, { "embeddableConfig": {}, @@ -159,7 +159,7 @@ }, "panelIndex": "19", "panelRefName": "panel_8", - "version": "7.3.0" + "version": "7.6.0" }, { "embeddableConfig": {}, @@ -172,7 +172,7 @@ }, "panelIndex": "20", "panelRefName": "panel_9", - "version": "7.3.0" + "version": "7.6.0" } ], "timeRestore": false, diff --git a/dev/packages/beats/system-0.0.1/kibana/visualization/34f97ee0-1b96-11e7-8ada-3df93aab833e-ecs.json b/dev/packages/beats/system-0.0.1/kibana/visualization/34f97ee0-1b96-11e7-8ada-3df93aab833e-ecs.json index 17dd7d3b0..db99207a3 100644 --- a/dev/packages/beats/system-0.0.1/kibana/visualization/34f97ee0-1b96-11e7-8ada-3df93aab833e-ecs.json +++ b/dev/packages/beats/system-0.0.1/kibana/visualization/34f97ee0-1b96-11e7-8ada-3df93aab833e-ecs.json @@ -18,6 +18,7 @@ "params": { "axis_formatter": "number", "axis_position": "left", + "axis_scale": "normal", "bar_color_rules": [ { "bar_color": "rgba(104,188,0,1)", @@ -38,6 +39,8 @@ "value": 0.85 } ], + "default_index_pattern": "metrics-*", + "default_timefield": "@timestamp", "drilldown_url": "", "filter": { "language": "lucene", @@ -46,6 +49,7 @@ "id": "9f7e48a0-1b95-11e7-8ada-3df93aab833e", "index_pattern": "metrics-*", "interval": "auto", + "isModelInvalid": false, "series": [ { "axis_position": "right", @@ -57,9 +61,13 @@ "line_width": 1, "metrics": [ { + "agg_with": "avg", "field": "system.filesystem.used.pct", "id": "9f7e48a2-1b95-11e7-8ada-3df93aab833e", - "type": "avg" + "order": "desc", + "order_by": "@timestamp", + "size": 1, + "type": "top_hit" } ], "point_size": 1, @@ -72,6 +80,7 @@ "show_grid": 1, "show_legend": 1, "time_field": "@timestamp", + "time_range_mode": "entire_time_range", "type": "top_n" }, "title": "Disk Usage [Metricbeat System] ECS", diff --git a/dev/packages/beats/system-0.0.1/kibana/visualization/825fdb80-4d1d-11e7-b5f2-2b7c1895bf32-ecs.json b/dev/packages/beats/system-0.0.1/kibana/visualization/825fdb80-4d1d-11e7-b5f2-2b7c1895bf32-ecs.json index 9a8e3c06a..b4c9bb5db 100644 --- a/dev/packages/beats/system-0.0.1/kibana/visualization/825fdb80-4d1d-11e7-b5f2-2b7c1895bf32-ecs.json +++ b/dev/packages/beats/system-0.0.1/kibana/visualization/825fdb80-4d1d-11e7-b5f2-2b7c1895bf32-ecs.json @@ -18,6 +18,9 @@ "params": { "axis_formatter": "number", "axis_position": "left", + "axis_scale": "normal", + "default_index_pattern": "logs-*", + "default_timefield": "@timestamp", "filter": "", "gauge_color_rules": [ { @@ -46,6 +49,7 @@ "id": "4e4dc780-4d1d-11e7-b5f2-2b7c1895bf32", "index_pattern": "metrics-*", "interval": "auto", + "isModelInvalid": false, "series": [ { "axis_position": "right", @@ -58,19 +62,27 @@ "line_width": 1, "metrics": [ { + "agg_with": "avg", "field": "system.fsstat.total_size.used", "id": "4e4dee91-4d1d-11e7-b5f2-2b7c1895bf32", - "type": "avg" + "order": "desc", + "order_by": "@timestamp", + "size": 1, + "type": "top_hit" }, { + "agg_with": "avg", "field": "system.fsstat.total_size.total", "id": "57c96ee0-4d54-11e7-b5f2-2b7c1895bf32", - "type": "avg" + "order": "desc", + "order_by": "@timestamp", + "size": 1, + "type": "top_hit" }, { "id": "6304cca0-4d54-11e7-b5f2-2b7c1895bf32", - "script": "params.total != null \u0026\u0026 params.total \u003e 0 ? params.used/params.total : null", - "type": "calculation", + "script": "params.used/params.total ", + "type": "math", "variables": [ { "field": "4e4dee91-4d1d-11e7-b5f2-2b7c1895bf32", @@ -94,6 +106,7 @@ "show_grid": 1, "show_legend": 1, "time_field": "@timestamp", + "time_range_mode": "entire_time_range", "type": "gauge" }, "title": "Disk used [Metricbeat System] ECS", diff --git a/dev/packages/beats/system-0.0.1/manifest.yml b/dev/packages/beats/system-0.0.1/manifest.yml index 81a3097a4..3a42b6ef2 100644 --- a/dev/packages/beats/system-0.0.1/manifest.yml +++ b/dev/packages/beats/system-0.0.1/manifest.yml @@ -11,7 +11,7 @@ categories: release: ga requirement: kibana: - versions: '>=7.4.0 <8.0.0' + versions: '>=7.6.0 <8.0.0' elasticsearch: versions: '>7.0.1' screenshots: diff --git a/dev/packages/beats/tomcat-0.0.1/dataset/cache/agent/stream/stream.yml b/dev/packages/beats/tomcat-0.0.1/dataset/cache/agent/stream/stream.yml index 66a192fc0..23c8e186a 100644 --- a/dev/packages/beats/tomcat-0.0.1/dataset/cache/agent/stream/stream.yml +++ b/dev/packages/beats/tomcat-0.0.1/dataset/cache/agent/stream/stream.yml @@ -3,5 +3,5 @@ metricsets: ["cache"] hosts: {{hosts}} {{#if path}} path: {{path}} -{{#if path}} +{{/if}} period: {{period}} diff --git a/dev/packages/beats/tomcat-0.0.1/dataset/memory/agent/stream/stream.yml b/dev/packages/beats/tomcat-0.0.1/dataset/memory/agent/stream/stream.yml index c041a707c..249bb14ef 100644 --- a/dev/packages/beats/tomcat-0.0.1/dataset/memory/agent/stream/stream.yml +++ b/dev/packages/beats/tomcat-0.0.1/dataset/memory/agent/stream/stream.yml @@ -3,5 +3,5 @@ metricsets: ["memory"] hosts: {{hosts}} {{#if path}} path: {{path}} -{{#if path}} +{{/if}} period: {{period}} diff --git a/dev/packages/beats/tomcat-0.0.1/dataset/requests/agent/stream/stream.yml b/dev/packages/beats/tomcat-0.0.1/dataset/requests/agent/stream/stream.yml index 92ca93b03..d2ed8ac82 100644 --- a/dev/packages/beats/tomcat-0.0.1/dataset/requests/agent/stream/stream.yml +++ b/dev/packages/beats/tomcat-0.0.1/dataset/requests/agent/stream/stream.yml @@ -3,5 +3,5 @@ metricsets: ["requests"] hosts: {{hosts}} {{#if path}} path: {{path}} -{{#if path}} +{{/if}} period: {{period}} diff --git a/dev/packages/beats/tomcat-0.0.1/dataset/threading/agent/stream/stream.yml b/dev/packages/beats/tomcat-0.0.1/dataset/threading/agent/stream/stream.yml index a615740f1..a378e485b 100644 --- a/dev/packages/beats/tomcat-0.0.1/dataset/threading/agent/stream/stream.yml +++ b/dev/packages/beats/tomcat-0.0.1/dataset/threading/agent/stream/stream.yml @@ -3,5 +3,5 @@ metricsets: ["threading"] hosts: {{hosts}} {{#if path}} path: {{path}} -{{#if path}} +{{/if}} period: {{period}} diff --git a/dev/packages/beats/uwsgi-0.0.1/dataset/status/agent/stream/stream.yml b/dev/packages/beats/uwsgi-0.0.1/dataset/status/agent/stream/stream.yml index 065c3e124..434a19474 100644 --- a/dev/packages/beats/uwsgi-0.0.1/dataset/status/agent/stream/stream.yml +++ b/dev/packages/beats/uwsgi-0.0.1/dataset/status/agent/stream/stream.yml @@ -2,6 +2,6 @@ input: uwsgi/metrics metricsets: ["status"] {{#if enable}} enable: {{enable}} -{{#if enable}} +{{/if}} hosts: {{hosts}} period: {{period}} diff --git a/dev/packages/beats/vsphere-0.0.1/dataset/datastore/agent/stream/stream.yml b/dev/packages/beats/vsphere-0.0.1/dataset/datastore/agent/stream/stream.yml index cea526a86..784b9314d 100644 --- a/dev/packages/beats/vsphere-0.0.1/dataset/datastore/agent/stream/stream.yml +++ b/dev/packages/beats/vsphere-0.0.1/dataset/datastore/agent/stream/stream.yml @@ -3,11 +3,11 @@ metricsets: ["datastore"] hosts: {{hosts}} {{#if insecure}} insecure: {{insecure}} -{{#if insecure}} +{{/if}} {{#if password}} password: {{password}} -{{#if password}} +{{/if}} period: {{period}} {{#if username}} username: {{username}} -{{#if username}} +{{/if}} diff --git a/dev/packages/beats/vsphere-0.0.1/dataset/host/agent/stream/stream.yml b/dev/packages/beats/vsphere-0.0.1/dataset/host/agent/stream/stream.yml index 66b51b948..564f24dee 100644 --- a/dev/packages/beats/vsphere-0.0.1/dataset/host/agent/stream/stream.yml +++ b/dev/packages/beats/vsphere-0.0.1/dataset/host/agent/stream/stream.yml @@ -3,11 +3,11 @@ metricsets: ["host"] hosts: {{hosts}} {{#if insecure}} insecure: {{insecure}} -{{#if insecure}} +{{/if}} {{#if password}} password: {{password}} -{{#if password}} +{{/if}} period: {{period}} {{#if username}} username: {{username}} -{{#if username}} +{{/if}} diff --git a/dev/packages/beats/vsphere-0.0.1/dataset/virtualmachine/agent/stream/stream.yml b/dev/packages/beats/vsphere-0.0.1/dataset/virtualmachine/agent/stream/stream.yml index ad4852bb3..9221b28dc 100644 --- a/dev/packages/beats/vsphere-0.0.1/dataset/virtualmachine/agent/stream/stream.yml +++ b/dev/packages/beats/vsphere-0.0.1/dataset/virtualmachine/agent/stream/stream.yml @@ -3,11 +3,11 @@ metricsets: ["virtualmachine"] hosts: {{hosts}} {{#if insecure}} insecure: {{insecure}} -{{#if insecure}} +{{/if}} {{#if password}} password: {{password}} -{{#if password}} +{{/if}} period: {{period}} {{#if username}} username: {{username}} -{{#if username}} +{{/if}} diff --git a/dev/packages/beats/windows-0.0.1/dataset/perfmon/agent/stream/stream.yml b/dev/packages/beats/windows-0.0.1/dataset/perfmon/agent/stream/stream.yml index cd90608b5..170db1205 100644 --- a/dev/packages/beats/windows-0.0.1/dataset/perfmon/agent/stream/stream.yml +++ b/dev/packages/beats/windows-0.0.1/dataset/perfmon/agent/stream/stream.yml @@ -2,8 +2,8 @@ input: windows/metrics metricsets: ["perfmon"] {{#if perfmon.group_measurements_by_instance}} perfmon.group_measurements_by_instance: {{perfmon.group_measurements_by_instance}} -{{#if perfmon.group_measurements_by_instance}} +{{/if}} {{#if perfmon.ignore_non_existent_counters}} perfmon.ignore_non_existent_counters: {{perfmon.ignore_non_existent_counters}} -{{#if perfmon.ignore_non_existent_counters}} +{{/if}} period: {{period}} diff --git a/dev/packages/beats/zeek-0.0.1/dataset/connection/agent/stream/stream.yml b/dev/packages/beats/zeek-0.0.1/dataset/connection/agent/stream/stream.yml index 9267b6108..cb641bc37 100644 --- a/dev/packages/beats/zeek-0.0.1/dataset/connection/agent/stream/stream.yml +++ b/dev/packages/beats/zeek-0.0.1/dataset/connection/agent/stream/stream.yml @@ -69,4 +69,4 @@ processors: fields: source_ip: source.address destination_ip: destination.address -{{/end}} +{{/if}} diff --git a/dev/packages/beats/zeek-0.0.1/dataset/dce_rpc/agent/stream/stream.yml b/dev/packages/beats/zeek-0.0.1/dataset/dce_rpc/agent/stream/stream.yml index 60e59f1d2..5b5635313 100644 --- a/dev/packages/beats/zeek-0.0.1/dataset/dce_rpc/agent/stream/stream.yml +++ b/dev/packages/beats/zeek-0.0.1/dataset/dce_rpc/agent/stream/stream.yml @@ -29,4 +29,4 @@ processors: fail_on_error: false {{#if this.community_id}} - community_id: -{{/end}} +{{/if}} diff --git a/dev/packages/beats/zeek-0.0.1/dataset/dhcp/agent/stream/stream.yml b/dev/packages/beats/zeek-0.0.1/dataset/dhcp/agent/stream/stream.yml index 8a56ef309..9400983f6 100644 --- a/dev/packages/beats/zeek-0.0.1/dataset/dhcp/agent/stream/stream.yml +++ b/dev/packages/beats/zeek-0.0.1/dataset/dhcp/agent/stream/stream.yml @@ -74,4 +74,4 @@ processors: fields: source.address: zeek.dhcp.address.client destination.address: zeek.dhcp.address.server -{{/end}} +{{/if}} diff --git a/dev/packages/beats/zeek-0.0.1/dataset/dnp3/agent/stream/stream.yml b/dev/packages/beats/zeek-0.0.1/dataset/dnp3/agent/stream/stream.yml index 89e198bbe..2132489c6 100644 --- a/dev/packages/beats/zeek-0.0.1/dataset/dnp3/agent/stream/stream.yml +++ b/dev/packages/beats/zeek-0.0.1/dataset/dnp3/agent/stream/stream.yml @@ -38,4 +38,4 @@ processors: fields: source_ip: source.address destination_ip: destination.address -{{/end}} +{{/if}} diff --git a/dev/packages/beats/zeek-0.0.1/dataset/dns/agent/stream/stream.yml b/dev/packages/beats/zeek-0.0.1/dataset/dns/agent/stream/stream.yml index 4cba61b09..0b62c0ee9 100644 --- a/dev/packages/beats/zeek-0.0.1/dataset/dns/agent/stream/stream.yml +++ b/dev/packages/beats/zeek-0.0.1/dataset/dns/agent/stream/stream.yml @@ -135,7 +135,7 @@ processors: target_field: dns.question.registered_domain {{#if this.community_id}} - community_id: ~ -{{/end}} +{{/if}} - timestamp: ignore_missing: true field: zeek.dns.ts diff --git a/dev/packages/beats/zeek-0.0.1/dataset/dpd/agent/stream/stream.yml b/dev/packages/beats/zeek-0.0.1/dataset/dpd/agent/stream/stream.yml index 6c45763e4..fda5ea18c 100644 --- a/dev/packages/beats/zeek-0.0.1/dataset/dpd/agent/stream/stream.yml +++ b/dev/packages/beats/zeek-0.0.1/dataset/dpd/agent/stream/stream.yml @@ -31,4 +31,4 @@ processors: fields: source_ip: source.address destination_ip: destination.address -{{/end}} +{{/if}} diff --git a/dev/packages/beats/zeek-0.0.1/dataset/ftp/agent/stream/stream.yml b/dev/packages/beats/zeek-0.0.1/dataset/ftp/agent/stream/stream.yml index ac2df4714..0227422c8 100644 --- a/dev/packages/beats/zeek-0.0.1/dataset/ftp/agent/stream/stream.yml +++ b/dev/packages/beats/zeek-0.0.1/dataset/ftp/agent/stream/stream.yml @@ -48,4 +48,4 @@ processors: fields: source_ip: source.address destination_ip: destination.address -{{/end}} +{{/if}} diff --git a/dev/packages/beats/zeek-0.0.1/dataset/http/agent/stream/stream.yml b/dev/packages/beats/zeek-0.0.1/dataset/http/agent/stream/stream.yml index 91fbc26d1..23d3a85ff 100644 --- a/dev/packages/beats/zeek-0.0.1/dataset/http/agent/stream/stream.yml +++ b/dev/packages/beats/zeek-0.0.1/dataset/http/agent/stream/stream.yml @@ -54,4 +54,4 @@ processors: fields: source_ip: source.address destination_ip: destination.address -{{/end}} +{{/if}} diff --git a/dev/packages/beats/zeek-0.0.1/dataset/irc/agent/stream/stream.yml b/dev/packages/beats/zeek-0.0.1/dataset/irc/agent/stream/stream.yml index 6029a8cf5..42dd984ce 100644 --- a/dev/packages/beats/zeek-0.0.1/dataset/irc/agent/stream/stream.yml +++ b/dev/packages/beats/zeek-0.0.1/dataset/irc/agent/stream/stream.yml @@ -38,4 +38,4 @@ processors: fields: source_ip: source.address destination_ip: destination.address -{{/end}} +{{/if}} diff --git a/dev/packages/beats/zeek-0.0.1/dataset/kerberos/agent/stream/stream.yml b/dev/packages/beats/zeek-0.0.1/dataset/kerberos/agent/stream/stream.yml index 9fd7f9328..5e190ebbf 100644 --- a/dev/packages/beats/zeek-0.0.1/dataset/kerberos/agent/stream/stream.yml +++ b/dev/packages/beats/zeek-0.0.1/dataset/kerberos/agent/stream/stream.yml @@ -56,4 +56,4 @@ processors: fields: source_ip: source.address destination_ip: destination.address -{{/end}} +{{/if}} diff --git a/dev/packages/beats/zeek-0.0.1/dataset/modbus/agent/stream/stream.yml b/dev/packages/beats/zeek-0.0.1/dataset/modbus/agent/stream/stream.yml index 2d964ddd2..64e2a01c6 100644 --- a/dev/packages/beats/zeek-0.0.1/dataset/modbus/agent/stream/stream.yml +++ b/dev/packages/beats/zeek-0.0.1/dataset/modbus/agent/stream/stream.yml @@ -34,4 +34,4 @@ processors: fields: source_ip: source.address destination_ip: destination.address -{{/end}} +{{/if}} diff --git a/dev/packages/beats/zeek-0.0.1/dataset/mysql/agent/stream/stream.yml b/dev/packages/beats/zeek-0.0.1/dataset/mysql/agent/stream/stream.yml index 48a3fe40c..e76aca2a3 100644 --- a/dev/packages/beats/zeek-0.0.1/dataset/mysql/agent/stream/stream.yml +++ b/dev/packages/beats/zeek-0.0.1/dataset/mysql/agent/stream/stream.yml @@ -32,4 +32,4 @@ processors: fields: source_ip: source.address destination_ip: destination.address -{{/end}} +{{/if}} diff --git a/dev/packages/beats/zeek-0.0.1/dataset/notice/agent/stream/stream.yml b/dev/packages/beats/zeek-0.0.1/dataset/notice/agent/stream/stream.yml index a77b7f8d3..137e7e173 100644 --- a/dev/packages/beats/zeek-0.0.1/dataset/notice/agent/stream/stream.yml +++ b/dev/packages/beats/zeek-0.0.1/dataset/notice/agent/stream/stream.yml @@ -60,4 +60,4 @@ processors: fields: source_ip: source.address destination_ip: destination.address -{{/end}} +{{/if}} diff --git a/dev/packages/beats/zeek-0.0.1/dataset/ntlm/agent/stream/stream.yml b/dev/packages/beats/zeek-0.0.1/dataset/ntlm/agent/stream/stream.yml index 5316b4c31..e346545cc 100644 --- a/dev/packages/beats/zeek-0.0.1/dataset/ntlm/agent/stream/stream.yml +++ b/dev/packages/beats/zeek-0.0.1/dataset/ntlm/agent/stream/stream.yml @@ -40,4 +40,4 @@ processors: fields: source_ip: source.address destination_ip: destination.address -{{/end}} +{{/if}} diff --git a/dev/packages/beats/zeek-0.0.1/dataset/radius/agent/stream/stream.yml b/dev/packages/beats/zeek-0.0.1/dataset/radius/agent/stream/stream.yml index 4b07898c3..951a6672c 100644 --- a/dev/packages/beats/zeek-0.0.1/dataset/radius/agent/stream/stream.yml +++ b/dev/packages/beats/zeek-0.0.1/dataset/radius/agent/stream/stream.yml @@ -32,4 +32,4 @@ processors: fields: source_ip: source.address destination_ip: destination.address -{{/end}} +{{/if}} diff --git a/dev/packages/beats/zeek-0.0.1/dataset/rdp/agent/stream/stream.yml b/dev/packages/beats/zeek-0.0.1/dataset/rdp/agent/stream/stream.yml index 485186466..05fb33c59 100644 --- a/dev/packages/beats/zeek-0.0.1/dataset/rdp/agent/stream/stream.yml +++ b/dev/packages/beats/zeek-0.0.1/dataset/rdp/agent/stream/stream.yml @@ -54,4 +54,4 @@ processors: fields: source_ip: source.address destination_ip: destination.address -{{/end}} +{{/if}} diff --git a/dev/packages/beats/zeek-0.0.1/dataset/rfb/agent/stream/stream.yml b/dev/packages/beats/zeek-0.0.1/dataset/rfb/agent/stream/stream.yml index 11d729af6..c915a9c1b 100644 --- a/dev/packages/beats/zeek-0.0.1/dataset/rfb/agent/stream/stream.yml +++ b/dev/packages/beats/zeek-0.0.1/dataset/rfb/agent/stream/stream.yml @@ -44,4 +44,4 @@ processors: fields: source_ip: source.address destination_ip: destination.address -{{/end}} +{{/if}} diff --git a/dev/packages/beats/zeek-0.0.1/dataset/sip/agent/stream/stream.yml b/dev/packages/beats/zeek-0.0.1/dataset/sip/agent/stream/stream.yml index 390eb2333..d95f5e253 100644 --- a/dev/packages/beats/zeek-0.0.1/dataset/sip/agent/stream/stream.yml +++ b/dev/packages/beats/zeek-0.0.1/dataset/sip/agent/stream/stream.yml @@ -56,4 +56,4 @@ processors: fields: source_ip: source.address destination_ip: destination.address -{{/end}} +{{/if}} diff --git a/dev/packages/beats/zeek-0.0.1/dataset/smb_cmd/agent/stream/stream.yml b/dev/packages/beats/zeek-0.0.1/dataset/smb_cmd/agent/stream/stream.yml index ac70a04d8..2486f4319 100644 --- a/dev/packages/beats/zeek-0.0.1/dataset/smb_cmd/agent/stream/stream.yml +++ b/dev/packages/beats/zeek-0.0.1/dataset/smb_cmd/agent/stream/stream.yml @@ -66,4 +66,4 @@ processors: fields: source_ip: source.address destination_ip: destination.address -{{/end}} +{{/if}} diff --git a/dev/packages/beats/zeek-0.0.1/dataset/smb_files/agent/stream/stream.yml b/dev/packages/beats/zeek-0.0.1/dataset/smb_files/agent/stream/stream.yml index f2960cca6..346ad64d4 100644 --- a/dev/packages/beats/zeek-0.0.1/dataset/smb_files/agent/stream/stream.yml +++ b/dev/packages/beats/zeek-0.0.1/dataset/smb_files/agent/stream/stream.yml @@ -32,4 +32,4 @@ processors: fields: source_ip: source.address destination_ip: destination.address -{{/end}} +{{/if}} diff --git a/dev/packages/beats/zeek-0.0.1/dataset/smb_mapping/agent/stream/stream.yml b/dev/packages/beats/zeek-0.0.1/dataset/smb_mapping/agent/stream/stream.yml index 0954fabb8..b41f891cf 100644 --- a/dev/packages/beats/zeek-0.0.1/dataset/smb_mapping/agent/stream/stream.yml +++ b/dev/packages/beats/zeek-0.0.1/dataset/smb_mapping/agent/stream/stream.yml @@ -32,4 +32,4 @@ processors: fields: source_ip: source.address destination_ip: destination.address -{{/end}} +{{/if}} diff --git a/dev/packages/beats/zeek-0.0.1/dataset/smtp/agent/stream/stream.yml b/dev/packages/beats/zeek-0.0.1/dataset/smtp/agent/stream/stream.yml index 26ccccfc8..7ef6d6afd 100644 --- a/dev/packages/beats/zeek-0.0.1/dataset/smtp/agent/stream/stream.yml +++ b/dev/packages/beats/zeek-0.0.1/dataset/smtp/agent/stream/stream.yml @@ -38,4 +38,4 @@ processors: fields: source_ip: source.address destination_ip: destination.address -{{/end}} +{{/if}} diff --git a/dev/packages/beats/zeek-0.0.1/dataset/snmp/agent/stream/stream.yml b/dev/packages/beats/zeek-0.0.1/dataset/snmp/agent/stream/stream.yml index a431d5e48..3c50a3374 100644 --- a/dev/packages/beats/zeek-0.0.1/dataset/snmp/agent/stream/stream.yml +++ b/dev/packages/beats/zeek-0.0.1/dataset/snmp/agent/stream/stream.yml @@ -40,4 +40,4 @@ processors: fields: source_ip: source.address destination_ip: destination.address -{{/end}} +{{/if}} diff --git a/dev/packages/beats/zeek-0.0.1/dataset/socks/agent/stream/stream.yml b/dev/packages/beats/zeek-0.0.1/dataset/socks/agent/stream/stream.yml index ba1c92577..0327e80a1 100644 --- a/dev/packages/beats/zeek-0.0.1/dataset/socks/agent/stream/stream.yml +++ b/dev/packages/beats/zeek-0.0.1/dataset/socks/agent/stream/stream.yml @@ -38,4 +38,4 @@ processors: fields: source_ip: source.address destination_ip: destination.address -{{/end}} +{{/if}} diff --git a/dev/packages/beats/zeek-0.0.1/dataset/ssh/agent/stream/stream.yml b/dev/packages/beats/zeek-0.0.1/dataset/ssh/agent/stream/stream.yml index 3e69a4869..690beb032 100644 --- a/dev/packages/beats/zeek-0.0.1/dataset/ssh/agent/stream/stream.yml +++ b/dev/packages/beats/zeek-0.0.1/dataset/ssh/agent/stream/stream.yml @@ -46,4 +46,4 @@ processors: fields: source_ip: source.address destination_ip: destination.address -{{/end}} +{{/if}} diff --git a/dev/packages/beats/zeek-0.0.1/dataset/ssl/agent/stream/stream.yml b/dev/packages/beats/zeek-0.0.1/dataset/ssl/agent/stream/stream.yml index 625c6585a..72dca0cb2 100644 --- a/dev/packages/beats/zeek-0.0.1/dataset/ssl/agent/stream/stream.yml +++ b/dev/packages/beats/zeek-0.0.1/dataset/ssl/agent/stream/stream.yml @@ -45,4 +45,4 @@ processors: fields: source_ip: source.address destination_ip: destination.address -{{/end}} +{{/if}} diff --git a/dev/packages/beats/zeek-0.0.1/dataset/syslog/agent/stream/stream.yml b/dev/packages/beats/zeek-0.0.1/dataset/syslog/agent/stream/stream.yml index 7a7dd4b47..d08b7c6b7 100644 --- a/dev/packages/beats/zeek-0.0.1/dataset/syslog/agent/stream/stream.yml +++ b/dev/packages/beats/zeek-0.0.1/dataset/syslog/agent/stream/stream.yml @@ -35,4 +35,4 @@ processors: fields: source_ip: source.address destination_ip: destination.addresss -{{/end}} +{{/if}}