From 7dec8ba14114a962945fb467d69a89c59952f6ab Mon Sep 17 00:00:00 2001 From: Marcin Tojek Date: Mon, 30 Mar 2020 20:35:38 +0200 Subject: [PATCH 1/4] Render README without fields --- .../mysql/docs/README.md | 261 ++++++++++++++++++ .../nginx/docs/README.md | 104 +++++++ dev/import-beats/docs.go | 48 ++-- dev/import-beats/packages.go | 13 +- .../beats/activemq-0.0.1/docs/README.md | 14 - .../beats/activemq-0.0.1/manifest.yml | 3 +- .../beats/aerospike-0.0.1/docs/README.md | 14 - .../beats/aerospike-0.0.1/manifest.yml | 3 +- .../beats/apache-0.0.1/docs/README.md | 14 - dev/packages/beats/apache-0.0.1/manifest.yml | 3 +- .../beats/appsearch-0.0.1/docs/README.md | 14 - .../beats/auditd-0.0.1/docs/README.md | 14 - dev/packages/beats/auditd-0.0.1/manifest.yml | 3 +- dev/packages/beats/aws-0.0.1/docs/README.md | 14 - dev/packages/beats/aws-0.0.1/manifest.yml | 3 +- dev/packages/beats/azure-0.0.1/docs/README.md | 14 - dev/packages/beats/azure-0.0.1/manifest.yml | 3 +- dev/packages/beats/beat-0.0.1/docs/README.md | 14 - dev/packages/beats/cef-0.0.1/docs/README.md | 14 - dev/packages/beats/cef-0.0.1/manifest.yml | 3 +- dev/packages/beats/ceph-0.0.1/docs/README.md | 14 - dev/packages/beats/ceph-0.0.1/manifest.yml | 3 +- dev/packages/beats/cisco-0.0.1/docs/README.md | 14 - dev/packages/beats/cisco-0.0.1/manifest.yml | 3 +- .../beats/cloudfoundry-0.0.1/docs/README.md | 14 - .../beats/cockroachdb-0.0.1/docs/README.md | 14 - .../beats/cockroachdb-0.0.1/manifest.yml | 3 +- .../beats/consul-0.0.1/docs/README.md | 14 - dev/packages/beats/consul-0.0.1/manifest.yml | 3 +- .../beats/coredns-0.0.1/docs/README.md | 14 - dev/packages/beats/coredns-0.0.1/manifest.yml | 3 +- .../beats/couchbase-0.0.1/docs/README.md | 14 - .../beats/couchbase-0.0.1/manifest.yml | 3 +- .../beats/couchdb-0.0.1/docs/README.md | 14 - dev/packages/beats/couchdb-0.0.1/manifest.yml | 3 +- .../beats/docker-0.0.1/docs/README.md | 14 - dev/packages/beats/docker-0.0.1/manifest.yml | 3 +- .../beats/dropwizard-0.0.1/docs/README.md | 14 - .../beats/elasticsearch-0.0.1/docs/README.md | 14 - .../beats/envoyproxy-0.0.1/docs/README.md | 14 - .../beats/envoyproxy-0.0.1/manifest.yml | 3 +- dev/packages/beats/etcd-0.0.1/docs/README.md | 14 - .../beats/golang-0.0.1/docs/README.md | 14 - dev/packages/beats/golang-0.0.1/manifest.yml | 3 +- .../beats/googlecloud-0.0.1/docs/README.md | 14 - .../beats/googlecloud-0.0.1/manifest.yml | 3 +- .../beats/graphite-0.0.1/docs/README.md | 14 - .../beats/haproxy-0.0.1/docs/README.md | 14 - dev/packages/beats/haproxy-0.0.1/manifest.yml | 3 +- dev/packages/beats/http-0.0.1/docs/README.md | 14 - dev/packages/beats/ibmmq-0.0.1/docs/README.md | 14 - dev/packages/beats/ibmmq-0.0.1/manifest.yml | 3 +- .../beats/icinga-0.0.1/docs/README.md | 14 - dev/packages/beats/icinga-0.0.1/manifest.yml | 3 +- dev/packages/beats/iis-0.0.1/docs/README.md | 14 - dev/packages/beats/iis-0.0.1/manifest.yml | 3 +- .../beats/iptables-0.0.1/docs/README.md | 14 - .../beats/iptables-0.0.1/manifest.yml | 3 +- dev/packages/beats/istio-0.0.1/docs/README.md | 14 - .../beats/jolokia-0.0.1/docs/README.md | 14 - dev/packages/beats/kafka-0.0.1/docs/README.md | 14 - dev/packages/beats/kafka-0.0.1/manifest.yml | 3 +- .../beats/kibana-0.0.1/docs/README.md | 14 - .../beats/kubernetes-0.0.1/docs/README.md | 14 - .../beats/kubernetes-0.0.1/manifest.yml | 3 +- dev/packages/beats/kvm-0.0.1/docs/README.md | 14 - .../beats/logstash-0.0.1/docs/README.md | 14 - .../beats/logstash-0.0.1/manifest.yml | 3 +- .../beats/memcached-0.0.1/docs/README.md | 14 - dev/packages/beats/misp-0.0.1/docs/README.md | 14 - dev/packages/beats/misp-0.0.1/manifest.yml | 3 +- .../beats/mongodb-0.0.1/docs/README.md | 14 - dev/packages/beats/mongodb-0.0.1/manifest.yml | 3 +- dev/packages/beats/mssql-0.0.1/docs/README.md | 14 - dev/packages/beats/mssql-0.0.1/manifest.yml | 3 +- dev/packages/beats/munin-0.0.1/docs/README.md | 14 - .../galera_status/agent/stream/stream.yml | 11 + .../dataset/galera_status/manifest.yml | 12 + .../dataset/status/agent/stream/stream.yml | 9 + .../mysql-0.0.1/dataset/status/manifest.yml | 6 + dev/packages/beats/mysql-0.0.1/docs/README.md | 258 ++++++++++++++++- dev/packages/beats/mysql-0.0.1/manifest.yml | 3 +- dev/packages/beats/nats-0.0.1/docs/README.md | 14 - dev/packages/beats/nats-0.0.1/manifest.yml | 3 +- .../beats/netflow-0.0.1/docs/README.md | 14 - dev/packages/beats/netflow-0.0.1/manifest.yml | 3 +- dev/packages/beats/nginx-0.0.1/docs/README.md | 101 ++++++- dev/packages/beats/nginx-0.0.1/manifest.yml | 3 +- dev/packages/beats/o365-0.0.1/docs/README.md | 14 - dev/packages/beats/o365-0.0.1/manifest.yml | 3 +- dev/packages/beats/okta-0.0.1/docs/README.md | 14 - dev/packages/beats/okta-0.0.1/manifest.yml | 3 +- .../beats/openmetrics-0.0.1/docs/README.md | 14 - .../beats/oracle-0.0.1/docs/README.md | 14 - dev/packages/beats/oracle-0.0.1/manifest.yml | 3 +- .../beats/osquery-0.0.1/docs/README.md | 14 - dev/packages/beats/osquery-0.0.1/manifest.yml | 3 +- dev/packages/beats/panw-0.0.1/docs/README.md | 14 - dev/packages/beats/panw-0.0.1/manifest.yml | 3 +- .../beats/php_fpm-0.0.1/docs/README.md | 14 - .../beats/postgresql-0.0.1/docs/README.md | 14 - .../beats/postgresql-0.0.1/manifest.yml | 3 +- .../beats/prometheus-0.0.1/docs/README.md | 14 - .../beats/prometheus-0.0.1/manifest.yml | 3 +- .../beats/rabbitmq-0.0.1/docs/README.md | 14 - .../beats/rabbitmq-0.0.1/manifest.yml | 3 +- dev/packages/beats/redis-0.0.1/docs/README.md | 14 - dev/packages/beats/redis-0.0.1/manifest.yml | 3 +- .../redisenterprise-0.0.1/docs/README.md | 14 - .../beats/redisenterprise-0.0.1/manifest.yml | 3 +- dev/packages/beats/santa-0.0.1/docs/README.md | 14 - dev/packages/beats/santa-0.0.1/manifest.yml | 3 +- dev/packages/beats/sql-0.0.1/docs/README.md | 14 - dev/packages/beats/stan-0.0.1/docs/README.md | 14 - dev/packages/beats/stan-0.0.1/manifest.yml | 3 +- .../beats/statsd-0.0.1/docs/README.md | 14 - .../beats/suricata-0.0.1/docs/README.md | 14 - .../beats/suricata-0.0.1/manifest.yml | 3 +- .../beats/system-0.0.1/docs/README.md | 14 - dev/packages/beats/system-0.0.1/manifest.yml | 3 +- .../beats/tomcat-0.0.1/docs/README.md | 14 - dev/packages/beats/tomcat-0.0.1/manifest.yml | 3 +- .../beats/traefik-0.0.1/docs/README.md | 14 - dev/packages/beats/traefik-0.0.1/manifest.yml | 3 +- dev/packages/beats/uwsgi-0.0.1/docs/README.md | 14 - dev/packages/beats/uwsgi-0.0.1/manifest.yml | 3 +- .../beats/vsphere-0.0.1/docs/README.md | 14 - dev/packages/beats/vsphere-0.0.1/manifest.yml | 3 +- .../beats/windows-0.0.1/docs/README.md | 14 - dev/packages/beats/windows-0.0.1/manifest.yml | 3 +- dev/packages/beats/zeek-0.0.1/docs/README.md | 14 - dev/packages/beats/zeek-0.0.1/manifest.yml | 3 +- .../beats/zookeeper-0.0.1/docs/README.md | 14 - .../beats/zookeeper-0.0.1/manifest.yml | 3 +- 134 files changed, 833 insertions(+), 1132 deletions(-) create mode 100644 dev/import-beats-resources/mysql/docs/README.md create mode 100644 dev/import-beats-resources/nginx/docs/README.md diff --git a/dev/import-beats-resources/mysql/docs/README.md b/dev/import-beats-resources/mysql/docs/README.md new file mode 100644 index 000000000..ef6f0012b --- /dev/null +++ b/dev/import-beats-resources/mysql/docs/README.md @@ -0,0 +1,261 @@ +# MySQL Integration + +This integration periodically fetches logs and metrics from [https://www.mysql.com/](MySQL) servers. + +## Compatibility + +The `error` and `slowlog` datasets were tested with logs from MySQL 5.5, 5.7 and 8.0, MariaDB 10.1, 10.2 and 10.3, and Percona 5.7 and 8.0. + +The `galera_status` and `status` datasets were tested with MySQL and Percona 5.7 and 8.0 and are expected to work with all +versions >= 5.7.0. It is also tested with MariaDB 10.2, 10.3 and 10.4. + +## Logs + +### error + +The `error` dataset collects the MySQL error logs. + +**Exported fields** + +| Field | Description | Type | +|----------------------------- |-------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- |------ | +| nginx.access.remote_ip_list | An array of remote IP addresses. It is a list because it is common to include, besides the client IP address, IP addresses from headers like X-Forwarded-For. Real source IP is restored to source.ip. | ip | + + +### slowlog + +The `slowlog` dataset collects the MySQL slow logs. + +**Exported fields** + +| Field | Description | Type | +|--------------------------- |-------------------------------------------------------------------------------- |------ | +| nginx.error.connection_id | Connection identifier. | ip | + +## Metrics + +### galera_status + +The `galera_status` dataset periodically fetches metrics from [http://galeracluster.com/](Galera)-MySQL cluster servers. + +An example event for `galera_status` looks as following: + +```$json +{ + "@timestamp":"2016-05-23T08:05:34.853Z", + "agent": { + "hostname": "host.example.com", + "name": "host.example.com" + }, + "event": { + "dataset": "mysql.galera_status", + "duration": 115000 + }, + "metricset": { + "name": "galera_status" + }, + "mysql":{ + "galera_status":{ + "apply": { + "oooe": 0, + "oool": 0, + "window": 1 + }, + "connected": "ON", + "flow_ctl": { + "recv": 0, + "sent": 0, + "paused": 0, + "paused_ns": 0 + }, + "ready": "ON", + "received": { + "count": 173, + "bytes": 152425 + }, + "local": { + "state": "Synced", + "bf_aborts": 0, + "cert_failures": 0, + "commits": 1325, + "recv": { + "queue_max": 2, + "queue_min": 0, + "queue": 0, + "queue_avg": 0.011561 + }, + "replays": 0, + "send": { + "queue_min": 0, + "queue": 0, + "queue_avg": 0, + "queue_max": 1 + } + }, + "evs": { + "evict": "", + "state": "OPERATIONAL" + }, + "repl": { + "bytes": 1689804, + "data_bytes": 1540647, + "keys": 4170, + "keys_bytes": 63973, + "other_bytes": 0, + "count": 1331 + }, + "commit": { + "oooe": 0, + "window": 1 + }, + "cluster": { + "conf_id": 930, + "size": 3, + "status": "Primary" + }, + "last_committed": 23944, + "cert": { + "deps_distance": 43.524557, + "index_size": 22, + "interval": 0 + } + } + } +} +``` + +The fields reported are: + +| Field | Description | Type | +|--------------------------- |-------------------------------------------------------------------------------- |--------- | +| nginx.stubstatus.hostname | Nginx hostname. | keyword | + +### status + +The MySQL `status` dataset collects data from MySQL by running a `SHOW GLOBAL STATUS;` SQL query. This query returns a large number of metrics. + +An example event for `status` looks as following: + +```$json +{ + "@timestamp":"2016-05-23T08:05:34.853Z", + "agent": { + "hostname": "host.example.com", + "name": "host.example.com" + }, + "event": { + "dataset": "mysql.status", + "duration": 115000 + }, + "metricset": { + "name": "status" + }, + "mysql": { + "status": { + "aborted": { + "clients": 3, + "connects": 4 + }, + "binlog": { + "cache": { + "disk_use": 0, + "use": 0 + } + }, + "bytes": { + "received": 1272, + "sent": 47735 + }, + "command": { + "delete": 0, + "insert": 0, + "select": 1, + "update": 0 + }, + "connections": 12, + "created": { + "tmp": { + "disk_tables": 0, + "files": 5, + "tables": 6 + } + }, + "delayed": { + "errors": 0, + "insert_threads": 0, + "writes": 0 + }, + "flush_commands": 1, + "handler": { + "commit": 0, + "delete": 0, + "external_lock": 140, + "mrr_init": 0, + "prepare": 0, + "read": { + "first": 3, + "key": 2, + "last": 0, + "next": 32, + "prev": 0, + "rnd": 0, + "rnd_next": 1728 + }, + "rollback": 0, + "savepoint": 0, + "savepoint_rollback": 0, + "update": 0, + "write": 1705 + }, + "innodb": { + "buffer_pool": { + "bytes": { + "data": 6914048, + "dirty": 0 + }, + "pages": { + "data": 422, + "dirty": 0, + "flushed": 207, + "free": 7768, + "misc": 1, + "total": 8191 + }, + "pool": { + "reads": 423, + "wait_free": 0 + }, + "read": { + "ahead": 0, + "ahead_evicted": 0, + "ahead_rnd": 0, + "requests": 14198 + }, + "write_requests": 207 + } + }, + "max_used_connections": 3, + "open": { + "files": 16, + "streams": 0, + "tables": 60 + }, + "opened_tables": 67, + "queries": 10, + "questions": 9, + "threads": { + "cached": 0, + "connected": 3, + "created": 3, + "running": 1 + } + } + } +} +``` + +The fields reported are: + +| Field | Description | Type | +|--------------------------- |-------------------------------------------------------------------------------- |--------- | +| nginx.stubstatus.hostname | Nginx hostname. | keyword | diff --git a/dev/import-beats-resources/nginx/docs/README.md b/dev/import-beats-resources/nginx/docs/README.md new file mode 100644 index 000000000..f95a6d6af --- /dev/null +++ b/dev/import-beats-resources/nginx/docs/README.md @@ -0,0 +1,104 @@ +# Nginx Integration + +This integration periodically fetches metrics from [https://nginx.org/](Nginx) servers. + + +## Compatibility + +The Nginx stubstatus metrics were tested with Nginx 1.9 and are expected to work with all version >= 1.9. The logs were tested with version 1.10. On Windows, the module was tested with Nginx installed from the Chocolatey repository. + + +## Logs + + +**Timezone support** + +This datasource parses logs that don’t contain timezone information. For these logs, the Elastic Agent reads the local timezone and uses it when parsing to convert the timestamp to UTC. The timezone to be used for parsing is included in the event in the event.timezone field. + +To disable this conversion, the event.timezone field can be removed with the drop_fields processor. + +If logs are originated from systems or applications with a different timezone to the local one, the event.timezone field can be overwritten with the original timezone using the add_fields processor. + +### Access Logs + +Access logs collects the nginx access logs. + +**Exported fields** + +| Field | Description | Type | +|----------------------------- |-------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- |------ | +| nginx.access.remote_ip_list | An array of remote IP addresses. It is a list because it is common to include, besides the client IP address, IP addresses from headers like X-Forwarded-For. Real source IP is restored to source.ip. | ip | +| nginx.stubstatus.active | The current number of active client connections including Waiting connections. | long | +| nginx.stubstatus.accepts | The total number of accepted client connections. | long | +| nginx.stubstatus.handled | The total number of handled client connections. | long | +| nginx.stubstatus.dropped | The total number of dropped client connections. | long | + +### Error Logs + +Error logs collects the nginx error logs. + +**Exported fields** + +| Field | Description | Type | +|--------------------------- |-------------------------------------------------------------------------------- |------ | +| nginx.error.connection_id | Connection identifier. | ip | +| nginx.stubstatus.active | The current number of active client connections including Waiting connections. | long | +| nginx.stubstatus.accepts | The total number of accepted client connections. | long | +| nginx.stubstatus.handled | The total number of handled client connections. | long | +| nginx.stubstatus.dropped | The total number of dropped client connections. | long | + +## Metrics + +### Stubstatus Metrics + +The Nginx stubstatus stream collects data from the Nginx ngx_http_stub_status module. It scrapes the server status data from the web page generated by ngx_http_stub_status. + +This is a default stream. If the host datasource is unconfigured, this stream is enabled by default. + +An example event for nginx looks as following: + +```$json +{ + "@timestamp": "2017-10-12T08:05:34.853Z", + "agent": { + "hostname": "host.example.com", + "name": "host.example.com" + }, + "event": { + "dataset": "nginx.stubstatus", + "duration": 115000, + "module": "nginx" + }, + "metricset": { + "name": "stubstatus" + }, + "nginx": { + "stubstatus": { + "accepts": 6254, + "active": 2, + "current": 1, + "dropped": 0, + "handled": 6254, + "hostname": "127.0.0.1", + "reading": 0, + "requests": 6259, + "waiting": 1, + "writing": 1 + } + }, + "service": { + "address": "127.0.0.1", + "type": "nginx" + } +} +``` + +The fields reported are: + +| Field | Description | Type | +|--------------------------- |-------------------------------------------------------------------------------- |--------- | +| nginx.stubstatus.hostname | Nginx hostname. | keyword | +| nginx.stubstatus.active | The current number of active client connections including Waiting connections. | long | +| nginx.stubstatus.accepts | The total number of accepted client connections. | long | +| nginx.stubstatus.handled | The total number of handled client connections. | long | +| nginx.stubstatus.dropped | The total number of dropped client connections. | long | diff --git a/dev/import-beats/docs.go b/dev/import-beats/docs.go index c26a4cbd5..a17c87b85 100644 --- a/dev/import-beats/docs.go +++ b/dev/import-beats/docs.go @@ -5,46 +5,38 @@ package main import ( - "bytes" + "os" + "path/filepath" "text/template" "github.com/pkg/errors" ) -var readmeTemplate = template.Must(template.New("readme").Parse(`# {{ .ModuleTitle }} Integration - -TODO - -## Compatibility - -TODO - -### Inputs - -TODO - -## Dashboard - -TODO`)) +var emptyReadmeTemplate = template.Must(template.New("README.md").Parse("TODO")) type docContent struct { fileName string - body []byte + body *template.Template } -type readmeTemplateModel struct { - ModuleTitle string -} - -func createDocs(moduleTitle string) ([]docContent, error) { - var body bytes.Buffer - err := readmeTemplate.Execute(&body, readmeTemplateModel{ - ModuleTitle: moduleTitle, - }) +func createDocTemplates(packageDocsPath string) ([]docContent, error) { + readmeTemplate, err := createReadmeTemplate(filepath.Join(packageDocsPath, "README.md")) if err != nil { - return nil, errors.Wrapf(err, "rendering README template failed") + return nil, errors.Wrapf(err, "creating README template failed") } return []docContent{ - {fileName: "README.md", body: body.Bytes()}, + {fileName: "README.md", body: readmeTemplate}, }, nil } + +func createReadmeTemplate(readmePath string) (*template.Template, error) { + t := template.New("README.md") + t, err := t.ParseFiles(readmePath) + if os.IsNotExist(err) { + return emptyReadmeTemplate, nil + } + if err != nil { + return nil, errors.Wrapf(err, "parsing template failed (path: %s)", readmePath) + } + return t, nil +} diff --git a/dev/import-beats/packages.go b/dev/import-beats/packages.go index 6c679f65d..ba8cda39c 100644 --- a/dev/import-beats/packages.go +++ b/dev/import-beats/packages.go @@ -197,7 +197,8 @@ func (r *packageRepository) createPackagesFromSource(beatsDir, beatName, beatTyp // docs if len(aPackage.docs) == 0 { - docs, err := createDocs(moduleTitle) + packageDocsPath := filepath.Join("dev/import-beats-resources", moduleDir.Name(), "docs") + docs, err := createDocTemplates(packageDocsPath) if err != nil { return err } @@ -338,7 +339,7 @@ func (r *packageRepository) save(outputDir string) error { for fileName, body := range objects { resourceFilePath := filepath.Join(resourcePath, fileName) - log.Printf("\tcreate resouce file: %s", resourceFilePath) + log.Printf("\tcreate resource file: %s", resourceFilePath) err = ioutil.WriteFile(resourceFilePath, body, 0644) if err != nil { return errors.Wrapf(err, "writing resource file failed (path: %s)", resourceFilePath) @@ -359,9 +360,13 @@ func (r *packageRepository) save(outputDir string) error { log.Printf("\twrite '%s' file\n", doc.fileName) docFilePath := filepath.Join(docsPath, doc.fileName) - err = ioutil.WriteFile(docFilePath, doc.body, 0644) + f, err := os.OpenFile(docFilePath, os.O_RDWR|os.O_CREATE|os.O_TRUNC, 0644) if err != nil { - return errors.Wrapf(err, "writing doc file failed (path: %s)", docFilePath) + return errors.Wrapf(err, "opening doc file failed (path: %s)", docFilePath) + } + err = doc.body.Execute(f, nil) + if err != nil { + return errors.Wrapf(err, "rendering doc file failed (path: %s)", docFilePath) } } } diff --git a/dev/packages/beats/activemq-0.0.1/docs/README.md b/dev/packages/beats/activemq-0.0.1/docs/README.md index 5b360bf3f..30404ce4c 100644 --- a/dev/packages/beats/activemq-0.0.1/docs/README.md +++ b/dev/packages/beats/activemq-0.0.1/docs/README.md @@ -1,15 +1 @@ -# activemq Integration - -TODO - -## Compatibility - -TODO - -### Inputs - -TODO - -## Dashboard - TODO \ No newline at end of file diff --git a/dev/packages/beats/activemq-0.0.1/manifest.yml b/dev/packages/beats/activemq-0.0.1/manifest.yml index ba171bb4a..0dacc7a2a 100644 --- a/dev/packages/beats/activemq-0.0.1/manifest.yml +++ b/dev/packages/beats/activemq-0.0.1/manifest.yml @@ -10,8 +10,7 @@ categories: - metrics release: ga requirement: - kibana: - versions: '>=7.4.0 <8.0.0' + kibana: {} elasticsearch: versions: '>7.0.1' screenshots: diff --git a/dev/packages/beats/aerospike-0.0.1/docs/README.md b/dev/packages/beats/aerospike-0.0.1/docs/README.md index adf512e22..30404ce4c 100644 --- a/dev/packages/beats/aerospike-0.0.1/docs/README.md +++ b/dev/packages/beats/aerospike-0.0.1/docs/README.md @@ -1,15 +1 @@ -# Aerospike Integration - -TODO - -## Compatibility - -TODO - -### Inputs - -TODO - -## Dashboard - TODO \ No newline at end of file diff --git a/dev/packages/beats/aerospike-0.0.1/manifest.yml b/dev/packages/beats/aerospike-0.0.1/manifest.yml index 3ab883ed5..23936ce5b 100644 --- a/dev/packages/beats/aerospike-0.0.1/manifest.yml +++ b/dev/packages/beats/aerospike-0.0.1/manifest.yml @@ -9,8 +9,7 @@ categories: - metrics release: ga requirement: - kibana: - versions: '>=7.3.0 <8.0.0' + kibana: {} elasticsearch: {} screenshots: - src: /img/metricbeat-aerospike-overview.png diff --git a/dev/packages/beats/apache-0.0.1/docs/README.md b/dev/packages/beats/apache-0.0.1/docs/README.md index 6bdf8675f..30404ce4c 100644 --- a/dev/packages/beats/apache-0.0.1/docs/README.md +++ b/dev/packages/beats/apache-0.0.1/docs/README.md @@ -1,15 +1 @@ -# Apache Integration - -TODO - -## Compatibility - -TODO - -### Inputs - -TODO - -## Dashboard - TODO \ No newline at end of file diff --git a/dev/packages/beats/apache-0.0.1/manifest.yml b/dev/packages/beats/apache-0.0.1/manifest.yml index fb7400ca7..1e6f8c4b2 100644 --- a/dev/packages/beats/apache-0.0.1/manifest.yml +++ b/dev/packages/beats/apache-0.0.1/manifest.yml @@ -10,8 +10,7 @@ categories: - metrics release: ga requirement: - kibana: - versions: '>=7.3.0 <8.0.0' + kibana: {} elasticsearch: versions: '>7.0.1' screenshots: diff --git a/dev/packages/beats/appsearch-0.0.1/docs/README.md b/dev/packages/beats/appsearch-0.0.1/docs/README.md index 02ae61f05..30404ce4c 100644 --- a/dev/packages/beats/appsearch-0.0.1/docs/README.md +++ b/dev/packages/beats/appsearch-0.0.1/docs/README.md @@ -1,15 +1 @@ -# App Search Integration - -TODO - -## Compatibility - -TODO - -### Inputs - -TODO - -## Dashboard - TODO \ No newline at end of file diff --git a/dev/packages/beats/auditd-0.0.1/docs/README.md b/dev/packages/beats/auditd-0.0.1/docs/README.md index a8ca7218e..30404ce4c 100644 --- a/dev/packages/beats/auditd-0.0.1/docs/README.md +++ b/dev/packages/beats/auditd-0.0.1/docs/README.md @@ -1,15 +1 @@ -# Auditd Integration - -TODO - -## Compatibility - -TODO - -### Inputs - -TODO - -## Dashboard - TODO \ No newline at end of file diff --git a/dev/packages/beats/auditd-0.0.1/manifest.yml b/dev/packages/beats/auditd-0.0.1/manifest.yml index c42ba4bde..aa533cd50 100644 --- a/dev/packages/beats/auditd-0.0.1/manifest.yml +++ b/dev/packages/beats/auditd-0.0.1/manifest.yml @@ -9,8 +9,7 @@ categories: - logs release: ga requirement: - kibana: - versions: '>=7.3.0 <8.0.0' + kibana: {} elasticsearch: versions: '>7.0.1' screenshots: diff --git a/dev/packages/beats/aws-0.0.1/docs/README.md b/dev/packages/beats/aws-0.0.1/docs/README.md index e44ade553..30404ce4c 100644 --- a/dev/packages/beats/aws-0.0.1/docs/README.md +++ b/dev/packages/beats/aws-0.0.1/docs/README.md @@ -1,15 +1 @@ -# AWS Integration - -TODO - -## Compatibility - -TODO - -### Inputs - -TODO - -## Dashboard - TODO \ No newline at end of file diff --git a/dev/packages/beats/aws-0.0.1/manifest.yml b/dev/packages/beats/aws-0.0.1/manifest.yml index 015a99008..c64514b4d 100644 --- a/dev/packages/beats/aws-0.0.1/manifest.yml +++ b/dev/packages/beats/aws-0.0.1/manifest.yml @@ -10,8 +10,7 @@ categories: - metrics release: ga requirement: - kibana: - versions: '>=7.6.1 <8.0.0' + kibana: {} elasticsearch: versions: '>7.0.1' screenshots: diff --git a/dev/packages/beats/azure-0.0.1/docs/README.md b/dev/packages/beats/azure-0.0.1/docs/README.md index e4d8e8090..30404ce4c 100644 --- a/dev/packages/beats/azure-0.0.1/docs/README.md +++ b/dev/packages/beats/azure-0.0.1/docs/README.md @@ -1,15 +1 @@ -# Azure Integration - -TODO - -## Compatibility - -TODO - -### Inputs - -TODO - -## Dashboard - TODO \ No newline at end of file diff --git a/dev/packages/beats/azure-0.0.1/manifest.yml b/dev/packages/beats/azure-0.0.1/manifest.yml index afe3fcc11..f71adc5e4 100644 --- a/dev/packages/beats/azure-0.0.1/manifest.yml +++ b/dev/packages/beats/azure-0.0.1/manifest.yml @@ -10,8 +10,7 @@ categories: - metrics release: beta requirement: - kibana: - versions: '>=7.6.0 <8.0.0' + kibana: {} elasticsearch: versions: '>7.0.1' screenshots: diff --git a/dev/packages/beats/beat-0.0.1/docs/README.md b/dev/packages/beats/beat-0.0.1/docs/README.md index 18edc7d86..30404ce4c 100644 --- a/dev/packages/beats/beat-0.0.1/docs/README.md +++ b/dev/packages/beats/beat-0.0.1/docs/README.md @@ -1,15 +1 @@ -# Beat Integration - -TODO - -## Compatibility - -TODO - -### Inputs - -TODO - -## Dashboard - TODO \ No newline at end of file diff --git a/dev/packages/beats/cef-0.0.1/docs/README.md b/dev/packages/beats/cef-0.0.1/docs/README.md index 2f2040939..30404ce4c 100644 --- a/dev/packages/beats/cef-0.0.1/docs/README.md +++ b/dev/packages/beats/cef-0.0.1/docs/README.md @@ -1,15 +1 @@ -# CEF Integration - -TODO - -## Compatibility - -TODO - -### Inputs - -TODO - -## Dashboard - TODO \ No newline at end of file diff --git a/dev/packages/beats/cef-0.0.1/manifest.yml b/dev/packages/beats/cef-0.0.1/manifest.yml index d22c20886..ade850200 100644 --- a/dev/packages/beats/cef-0.0.1/manifest.yml +++ b/dev/packages/beats/cef-0.0.1/manifest.yml @@ -9,8 +9,7 @@ categories: - logs release: ga requirement: - kibana: - versions: '>=7.3.0 <8.0.0' + kibana: {} elasticsearch: versions: '>7.0.1' datasources: diff --git a/dev/packages/beats/ceph-0.0.1/docs/README.md b/dev/packages/beats/ceph-0.0.1/docs/README.md index fa0670fc4..30404ce4c 100644 --- a/dev/packages/beats/ceph-0.0.1/docs/README.md +++ b/dev/packages/beats/ceph-0.0.1/docs/README.md @@ -1,15 +1 @@ -# Ceph Integration - -TODO - -## Compatibility - -TODO - -### Inputs - -TODO - -## Dashboard - TODO \ No newline at end of file diff --git a/dev/packages/beats/ceph-0.0.1/manifest.yml b/dev/packages/beats/ceph-0.0.1/manifest.yml index 18c4d73a2..3936d7fa5 100644 --- a/dev/packages/beats/ceph-0.0.1/manifest.yml +++ b/dev/packages/beats/ceph-0.0.1/manifest.yml @@ -9,8 +9,7 @@ categories: - metrics release: ga requirement: - kibana: - versions: '>=7.3.0 <8.0.0' + kibana: {} elasticsearch: {} screenshots: - src: /img/ceph-overview-dashboard.png diff --git a/dev/packages/beats/cisco-0.0.1/docs/README.md b/dev/packages/beats/cisco-0.0.1/docs/README.md index 26f9fd266..30404ce4c 100644 --- a/dev/packages/beats/cisco-0.0.1/docs/README.md +++ b/dev/packages/beats/cisco-0.0.1/docs/README.md @@ -1,15 +1 @@ -# Cisco Integration - -TODO - -## Compatibility - -TODO - -### Inputs - -TODO - -## Dashboard - TODO \ No newline at end of file diff --git a/dev/packages/beats/cisco-0.0.1/manifest.yml b/dev/packages/beats/cisco-0.0.1/manifest.yml index cd3c60161..6757afa2c 100644 --- a/dev/packages/beats/cisco-0.0.1/manifest.yml +++ b/dev/packages/beats/cisco-0.0.1/manifest.yml @@ -9,8 +9,7 @@ categories: - logs release: ga requirement: - kibana: - versions: '>=7.0.0-SNAPSHOT <8.0.0' + kibana: {} elasticsearch: versions: '>7.0.1' screenshots: diff --git a/dev/packages/beats/cloudfoundry-0.0.1/docs/README.md b/dev/packages/beats/cloudfoundry-0.0.1/docs/README.md index 8bf3a6917..30404ce4c 100644 --- a/dev/packages/beats/cloudfoundry-0.0.1/docs/README.md +++ b/dev/packages/beats/cloudfoundry-0.0.1/docs/README.md @@ -1,15 +1 @@ -# cloudfoundry Integration - -TODO - -## Compatibility - -TODO - -### Inputs - -TODO - -## Dashboard - TODO \ No newline at end of file diff --git a/dev/packages/beats/cockroachdb-0.0.1/docs/README.md b/dev/packages/beats/cockroachdb-0.0.1/docs/README.md index 13ca0056e..30404ce4c 100644 --- a/dev/packages/beats/cockroachdb-0.0.1/docs/README.md +++ b/dev/packages/beats/cockroachdb-0.0.1/docs/README.md @@ -1,15 +1 @@ -# CockroachDB Integration - -TODO - -## Compatibility - -TODO - -### Inputs - -TODO - -## Dashboard - TODO \ No newline at end of file diff --git a/dev/packages/beats/cockroachdb-0.0.1/manifest.yml b/dev/packages/beats/cockroachdb-0.0.1/manifest.yml index c3d3ebc6d..f84b0c392 100644 --- a/dev/packages/beats/cockroachdb-0.0.1/manifest.yml +++ b/dev/packages/beats/cockroachdb-0.0.1/manifest.yml @@ -9,8 +9,7 @@ categories: - metrics release: beta requirement: - kibana: - versions: '>=7.3.0 <8.0.0' + kibana: {} elasticsearch: {} screenshots: - src: /img/metricbeat-cockroachdb-overview.png diff --git a/dev/packages/beats/consul-0.0.1/docs/README.md b/dev/packages/beats/consul-0.0.1/docs/README.md index 57072750d..30404ce4c 100644 --- a/dev/packages/beats/consul-0.0.1/docs/README.md +++ b/dev/packages/beats/consul-0.0.1/docs/README.md @@ -1,15 +1 @@ -# consul Integration - -TODO - -## Compatibility - -TODO - -### Inputs - -TODO - -## Dashboard - TODO \ No newline at end of file diff --git a/dev/packages/beats/consul-0.0.1/manifest.yml b/dev/packages/beats/consul-0.0.1/manifest.yml index 58daf11fc..ec71ca92a 100644 --- a/dev/packages/beats/consul-0.0.1/manifest.yml +++ b/dev/packages/beats/consul-0.0.1/manifest.yml @@ -9,8 +9,7 @@ categories: - metrics release: beta requirement: - kibana: - versions: '>=7.0.0-SNAPSHOT <8.0.0' + kibana: {} elasticsearch: {} screenshots: - src: /img/metricbeat-consul.png diff --git a/dev/packages/beats/coredns-0.0.1/docs/README.md b/dev/packages/beats/coredns-0.0.1/docs/README.md index de2d71466..30404ce4c 100644 --- a/dev/packages/beats/coredns-0.0.1/docs/README.md +++ b/dev/packages/beats/coredns-0.0.1/docs/README.md @@ -1,15 +1 @@ -# Coredns Integration - -TODO - -## Compatibility - -TODO - -### Inputs - -TODO - -## Dashboard - TODO \ No newline at end of file diff --git a/dev/packages/beats/coredns-0.0.1/manifest.yml b/dev/packages/beats/coredns-0.0.1/manifest.yml index f2abc5f61..c8d322fb4 100644 --- a/dev/packages/beats/coredns-0.0.1/manifest.yml +++ b/dev/packages/beats/coredns-0.0.1/manifest.yml @@ -10,8 +10,7 @@ categories: - metrics release: ga requirement: - kibana: - versions: '>=8.0.0-SNAPSHOT <8.0.0' + kibana: {} elasticsearch: {} screenshots: - src: /img/kibana-coredns.jpg diff --git a/dev/packages/beats/couchbase-0.0.1/docs/README.md b/dev/packages/beats/couchbase-0.0.1/docs/README.md index 87a075d1b..30404ce4c 100644 --- a/dev/packages/beats/couchbase-0.0.1/docs/README.md +++ b/dev/packages/beats/couchbase-0.0.1/docs/README.md @@ -1,15 +1 @@ -# Couchbase Integration - -TODO - -## Compatibility - -TODO - -### Inputs - -TODO - -## Dashboard - TODO \ No newline at end of file diff --git a/dev/packages/beats/couchbase-0.0.1/manifest.yml b/dev/packages/beats/couchbase-0.0.1/manifest.yml index 917b432f7..38af1f204 100644 --- a/dev/packages/beats/couchbase-0.0.1/manifest.yml +++ b/dev/packages/beats/couchbase-0.0.1/manifest.yml @@ -9,8 +9,7 @@ categories: - metrics release: ga requirement: - kibana: - versions: '>=7.3.0 <8.0.0' + kibana: {} elasticsearch: {} screenshots: - src: /img/metricbeat-couchbase-overview.png diff --git a/dev/packages/beats/couchdb-0.0.1/docs/README.md b/dev/packages/beats/couchdb-0.0.1/docs/README.md index daf5f4879..30404ce4c 100644 --- a/dev/packages/beats/couchdb-0.0.1/docs/README.md +++ b/dev/packages/beats/couchdb-0.0.1/docs/README.md @@ -1,15 +1 @@ -# CouchDB Integration - -TODO - -## Compatibility - -TODO - -### Inputs - -TODO - -## Dashboard - TODO \ No newline at end of file diff --git a/dev/packages/beats/couchdb-0.0.1/manifest.yml b/dev/packages/beats/couchdb-0.0.1/manifest.yml index 418328f89..9ccf867f8 100644 --- a/dev/packages/beats/couchdb-0.0.1/manifest.yml +++ b/dev/packages/beats/couchdb-0.0.1/manifest.yml @@ -9,8 +9,7 @@ categories: - metrics release: ga requirement: - kibana: - versions: '>=7.3.0 <8.0.0' + kibana: {} elasticsearch: {} screenshots: - src: /img/metricbeat-couchdb-overview.png diff --git a/dev/packages/beats/docker-0.0.1/docs/README.md b/dev/packages/beats/docker-0.0.1/docs/README.md index cac524d4b..30404ce4c 100644 --- a/dev/packages/beats/docker-0.0.1/docs/README.md +++ b/dev/packages/beats/docker-0.0.1/docs/README.md @@ -1,15 +1 @@ -# Docker Integration - -TODO - -## Compatibility - -TODO - -### Inputs - -TODO - -## Dashboard - TODO \ No newline at end of file diff --git a/dev/packages/beats/docker-0.0.1/manifest.yml b/dev/packages/beats/docker-0.0.1/manifest.yml index 39db97bff..947f4c95a 100644 --- a/dev/packages/beats/docker-0.0.1/manifest.yml +++ b/dev/packages/beats/docker-0.0.1/manifest.yml @@ -9,8 +9,7 @@ categories: - metrics release: ga requirement: - kibana: - versions: '>=7.3.0 <8.0.0' + kibana: {} elasticsearch: {} icons: - src: /img/logo_docker.svg diff --git a/dev/packages/beats/dropwizard-0.0.1/docs/README.md b/dev/packages/beats/dropwizard-0.0.1/docs/README.md index 75b622640..30404ce4c 100644 --- a/dev/packages/beats/dropwizard-0.0.1/docs/README.md +++ b/dev/packages/beats/dropwizard-0.0.1/docs/README.md @@ -1,15 +1 @@ -# Dropwizard Integration - -TODO - -## Compatibility - -TODO - -### Inputs - -TODO - -## Dashboard - TODO \ No newline at end of file diff --git a/dev/packages/beats/elasticsearch-0.0.1/docs/README.md b/dev/packages/beats/elasticsearch-0.0.1/docs/README.md index 5092dbe62..30404ce4c 100644 --- a/dev/packages/beats/elasticsearch-0.0.1/docs/README.md +++ b/dev/packages/beats/elasticsearch-0.0.1/docs/README.md @@ -1,15 +1 @@ -# elasticsearch Integration - -TODO - -## Compatibility - -TODO - -### Inputs - -TODO - -## Dashboard - TODO \ No newline at end of file diff --git a/dev/packages/beats/envoyproxy-0.0.1/docs/README.md b/dev/packages/beats/envoyproxy-0.0.1/docs/README.md index ebf6cf6b8..30404ce4c 100644 --- a/dev/packages/beats/envoyproxy-0.0.1/docs/README.md +++ b/dev/packages/beats/envoyproxy-0.0.1/docs/README.md @@ -1,15 +1 @@ -# Envoyproxy Integration - -TODO - -## Compatibility - -TODO - -### Inputs - -TODO - -## Dashboard - TODO \ No newline at end of file diff --git a/dev/packages/beats/envoyproxy-0.0.1/manifest.yml b/dev/packages/beats/envoyproxy-0.0.1/manifest.yml index 0fc007345..4851a393d 100644 --- a/dev/packages/beats/envoyproxy-0.0.1/manifest.yml +++ b/dev/packages/beats/envoyproxy-0.0.1/manifest.yml @@ -10,8 +10,7 @@ categories: - metrics release: ga requirement: - kibana: - versions: '>=8.0.0-SNAPSHOT <8.0.0' + kibana: {} elasticsearch: {} screenshots: - src: /img/kibana-envoyproxy.jpg diff --git a/dev/packages/beats/etcd-0.0.1/docs/README.md b/dev/packages/beats/etcd-0.0.1/docs/README.md index 261c62013..30404ce4c 100644 --- a/dev/packages/beats/etcd-0.0.1/docs/README.md +++ b/dev/packages/beats/etcd-0.0.1/docs/README.md @@ -1,15 +1 @@ -# Etcd Integration - -TODO - -## Compatibility - -TODO - -### Inputs - -TODO - -## Dashboard - TODO \ No newline at end of file diff --git a/dev/packages/beats/golang-0.0.1/docs/README.md b/dev/packages/beats/golang-0.0.1/docs/README.md index 605fff9ec..30404ce4c 100644 --- a/dev/packages/beats/golang-0.0.1/docs/README.md +++ b/dev/packages/beats/golang-0.0.1/docs/README.md @@ -1,15 +1 @@ -# Golang Integration - -TODO - -## Compatibility - -TODO - -### Inputs - -TODO - -## Dashboard - TODO \ No newline at end of file diff --git a/dev/packages/beats/golang-0.0.1/manifest.yml b/dev/packages/beats/golang-0.0.1/manifest.yml index 95a051b68..2936d1fdc 100644 --- a/dev/packages/beats/golang-0.0.1/manifest.yml +++ b/dev/packages/beats/golang-0.0.1/manifest.yml @@ -9,8 +9,7 @@ categories: - metrics release: ga requirement: - kibana: - versions: '>=7.3.0 <8.0.0' + kibana: {} elasticsearch: {} icons: - src: /img/logo_golang.svg diff --git a/dev/packages/beats/googlecloud-0.0.1/docs/README.md b/dev/packages/beats/googlecloud-0.0.1/docs/README.md index 3f35de770..30404ce4c 100644 --- a/dev/packages/beats/googlecloud-0.0.1/docs/README.md +++ b/dev/packages/beats/googlecloud-0.0.1/docs/README.md @@ -1,15 +1 @@ -# Google Cloud Integration - -TODO - -## Compatibility - -TODO - -### Inputs - -TODO - -## Dashboard - TODO \ No newline at end of file diff --git a/dev/packages/beats/googlecloud-0.0.1/manifest.yml b/dev/packages/beats/googlecloud-0.0.1/manifest.yml index 31dd15ff0..f0cc05f21 100644 --- a/dev/packages/beats/googlecloud-0.0.1/manifest.yml +++ b/dev/packages/beats/googlecloud-0.0.1/manifest.yml @@ -10,8 +10,7 @@ categories: - metrics release: ga requirement: - kibana: - versions: '>=7.6.1 <8.0.0' + kibana: {} elasticsearch: versions: '>7.0.1' screenshots: diff --git a/dev/packages/beats/graphite-0.0.1/docs/README.md b/dev/packages/beats/graphite-0.0.1/docs/README.md index edbebe4ca..30404ce4c 100644 --- a/dev/packages/beats/graphite-0.0.1/docs/README.md +++ b/dev/packages/beats/graphite-0.0.1/docs/README.md @@ -1,15 +1 @@ -# Graphite Integration - -TODO - -## Compatibility - -TODO - -### Inputs - -TODO - -## Dashboard - TODO \ No newline at end of file diff --git a/dev/packages/beats/haproxy-0.0.1/docs/README.md b/dev/packages/beats/haproxy-0.0.1/docs/README.md index 9669dc52b..30404ce4c 100644 --- a/dev/packages/beats/haproxy-0.0.1/docs/README.md +++ b/dev/packages/beats/haproxy-0.0.1/docs/README.md @@ -1,15 +1 @@ -# haproxy Integration - -TODO - -## Compatibility - -TODO - -### Inputs - -TODO - -## Dashboard - TODO \ No newline at end of file diff --git a/dev/packages/beats/haproxy-0.0.1/manifest.yml b/dev/packages/beats/haproxy-0.0.1/manifest.yml index 734f8b580..6f68fcaed 100644 --- a/dev/packages/beats/haproxy-0.0.1/manifest.yml +++ b/dev/packages/beats/haproxy-0.0.1/manifest.yml @@ -10,8 +10,7 @@ categories: - metrics release: ga requirement: - kibana: - versions: '>=7.3.0 <8.0.0' + kibana: {} elasticsearch: versions: '>7.0.1' screenshots: diff --git a/dev/packages/beats/http-0.0.1/docs/README.md b/dev/packages/beats/http-0.0.1/docs/README.md index b5566a6b2..30404ce4c 100644 --- a/dev/packages/beats/http-0.0.1/docs/README.md +++ b/dev/packages/beats/http-0.0.1/docs/README.md @@ -1,15 +1 @@ -# HTTP Integration - -TODO - -## Compatibility - -TODO - -### Inputs - -TODO - -## Dashboard - TODO \ No newline at end of file diff --git a/dev/packages/beats/ibmmq-0.0.1/docs/README.md b/dev/packages/beats/ibmmq-0.0.1/docs/README.md index 968d3c1c4..30404ce4c 100644 --- a/dev/packages/beats/ibmmq-0.0.1/docs/README.md +++ b/dev/packages/beats/ibmmq-0.0.1/docs/README.md @@ -1,15 +1 @@ -# ibmmq Integration - -TODO - -## Compatibility - -TODO - -### Inputs - -TODO - -## Dashboard - TODO \ No newline at end of file diff --git a/dev/packages/beats/ibmmq-0.0.1/manifest.yml b/dev/packages/beats/ibmmq-0.0.1/manifest.yml index 9a9c35e94..63aa16d54 100644 --- a/dev/packages/beats/ibmmq-0.0.1/manifest.yml +++ b/dev/packages/beats/ibmmq-0.0.1/manifest.yml @@ -10,8 +10,7 @@ categories: - metrics release: ga requirement: - kibana: - versions: '>=7.4.0 <8.0.0' + kibana: {} elasticsearch: versions: '>7.0.1' screenshots: diff --git a/dev/packages/beats/icinga-0.0.1/docs/README.md b/dev/packages/beats/icinga-0.0.1/docs/README.md index bf1e7968d..30404ce4c 100644 --- a/dev/packages/beats/icinga-0.0.1/docs/README.md +++ b/dev/packages/beats/icinga-0.0.1/docs/README.md @@ -1,15 +1 @@ -# Icinga Integration - -TODO - -## Compatibility - -TODO - -### Inputs - -TODO - -## Dashboard - TODO \ No newline at end of file diff --git a/dev/packages/beats/icinga-0.0.1/manifest.yml b/dev/packages/beats/icinga-0.0.1/manifest.yml index ff1bcb553..24416ef5a 100644 --- a/dev/packages/beats/icinga-0.0.1/manifest.yml +++ b/dev/packages/beats/icinga-0.0.1/manifest.yml @@ -9,8 +9,7 @@ categories: - logs release: ga requirement: - kibana: - versions: '>=7.3.0 <8.0.0' + kibana: {} elasticsearch: versions: '>7.0.1' screenshots: diff --git a/dev/packages/beats/iis-0.0.1/docs/README.md b/dev/packages/beats/iis-0.0.1/docs/README.md index 36ff0f4f4..30404ce4c 100644 --- a/dev/packages/beats/iis-0.0.1/docs/README.md +++ b/dev/packages/beats/iis-0.0.1/docs/README.md @@ -1,15 +1 @@ -# IIS Integration - -TODO - -## Compatibility - -TODO - -### Inputs - -TODO - -## Dashboard - TODO \ No newline at end of file diff --git a/dev/packages/beats/iis-0.0.1/manifest.yml b/dev/packages/beats/iis-0.0.1/manifest.yml index 27147bbd9..18560d22c 100644 --- a/dev/packages/beats/iis-0.0.1/manifest.yml +++ b/dev/packages/beats/iis-0.0.1/manifest.yml @@ -10,8 +10,7 @@ categories: - metrics release: ga requirement: - kibana: - versions: '>=7.3.0 <8.0.0' + kibana: {} elasticsearch: versions: '>7.0.1' screenshots: diff --git a/dev/packages/beats/iptables-0.0.1/docs/README.md b/dev/packages/beats/iptables-0.0.1/docs/README.md index e6f75102d..30404ce4c 100644 --- a/dev/packages/beats/iptables-0.0.1/docs/README.md +++ b/dev/packages/beats/iptables-0.0.1/docs/README.md @@ -1,15 +1 @@ -# iptables Integration - -TODO - -## Compatibility - -TODO - -### Inputs - -TODO - -## Dashboard - TODO \ No newline at end of file diff --git a/dev/packages/beats/iptables-0.0.1/manifest.yml b/dev/packages/beats/iptables-0.0.1/manifest.yml index fb61ca555..8b57b8a9a 100644 --- a/dev/packages/beats/iptables-0.0.1/manifest.yml +++ b/dev/packages/beats/iptables-0.0.1/manifest.yml @@ -9,8 +9,7 @@ categories: - logs release: ga requirement: - kibana: - versions: '>=7.3.0 <8.0.0' + kibana: {} elasticsearch: versions: '>7.0.1' screenshots: diff --git a/dev/packages/beats/istio-0.0.1/docs/README.md b/dev/packages/beats/istio-0.0.1/docs/README.md index 17d888e69..30404ce4c 100644 --- a/dev/packages/beats/istio-0.0.1/docs/README.md +++ b/dev/packages/beats/istio-0.0.1/docs/README.md @@ -1,15 +1 @@ -# istio Integration - -TODO - -## Compatibility - -TODO - -### Inputs - -TODO - -## Dashboard - TODO \ No newline at end of file diff --git a/dev/packages/beats/jolokia-0.0.1/docs/README.md b/dev/packages/beats/jolokia-0.0.1/docs/README.md index b89c6b50c..30404ce4c 100644 --- a/dev/packages/beats/jolokia-0.0.1/docs/README.md +++ b/dev/packages/beats/jolokia-0.0.1/docs/README.md @@ -1,15 +1 @@ -# Jolokia Integration - -TODO - -## Compatibility - -TODO - -### Inputs - -TODO - -## Dashboard - TODO \ No newline at end of file diff --git a/dev/packages/beats/kafka-0.0.1/docs/README.md b/dev/packages/beats/kafka-0.0.1/docs/README.md index a66f48f87..30404ce4c 100644 --- a/dev/packages/beats/kafka-0.0.1/docs/README.md +++ b/dev/packages/beats/kafka-0.0.1/docs/README.md @@ -1,15 +1 @@ -# Kafka Integration - -TODO - -## Compatibility - -TODO - -### Inputs - -TODO - -## Dashboard - TODO \ No newline at end of file diff --git a/dev/packages/beats/kafka-0.0.1/manifest.yml b/dev/packages/beats/kafka-0.0.1/manifest.yml index 53a378d92..71e5e22f4 100644 --- a/dev/packages/beats/kafka-0.0.1/manifest.yml +++ b/dev/packages/beats/kafka-0.0.1/manifest.yml @@ -10,8 +10,7 @@ categories: - metrics release: ga requirement: - kibana: - versions: '>=7.3.0 <8.0.0' + kibana: {} elasticsearch: versions: '>7.0.1' screenshots: diff --git a/dev/packages/beats/kibana-0.0.1/docs/README.md b/dev/packages/beats/kibana-0.0.1/docs/README.md index d7a7aad9f..30404ce4c 100644 --- a/dev/packages/beats/kibana-0.0.1/docs/README.md +++ b/dev/packages/beats/kibana-0.0.1/docs/README.md @@ -1,15 +1 @@ -# kibana Integration - -TODO - -## Compatibility - -TODO - -### Inputs - -TODO - -## Dashboard - TODO \ No newline at end of file diff --git a/dev/packages/beats/kubernetes-0.0.1/docs/README.md b/dev/packages/beats/kubernetes-0.0.1/docs/README.md index 4d2906315..30404ce4c 100644 --- a/dev/packages/beats/kubernetes-0.0.1/docs/README.md +++ b/dev/packages/beats/kubernetes-0.0.1/docs/README.md @@ -1,15 +1 @@ -# Kubernetes Integration - -TODO - -## Compatibility - -TODO - -### Inputs - -TODO - -## Dashboard - TODO \ No newline at end of file diff --git a/dev/packages/beats/kubernetes-0.0.1/manifest.yml b/dev/packages/beats/kubernetes-0.0.1/manifest.yml index 5d54e8250..7b8ca2d37 100644 --- a/dev/packages/beats/kubernetes-0.0.1/manifest.yml +++ b/dev/packages/beats/kubernetes-0.0.1/manifest.yml @@ -9,8 +9,7 @@ categories: - metrics release: ga requirement: - kibana: - versions: '>=7.3.0 <8.0.0' + kibana: {} elasticsearch: {} screenshots: - src: /img/metricbeat-kubernetes-controllermanager.png diff --git a/dev/packages/beats/kvm-0.0.1/docs/README.md b/dev/packages/beats/kvm-0.0.1/docs/README.md index 82aad9c8e..30404ce4c 100644 --- a/dev/packages/beats/kvm-0.0.1/docs/README.md +++ b/dev/packages/beats/kvm-0.0.1/docs/README.md @@ -1,15 +1 @@ -# kvm Integration - -TODO - -## Compatibility - -TODO - -### Inputs - -TODO - -## Dashboard - TODO \ No newline at end of file diff --git a/dev/packages/beats/logstash-0.0.1/docs/README.md b/dev/packages/beats/logstash-0.0.1/docs/README.md index 5867b2fa0..30404ce4c 100644 --- a/dev/packages/beats/logstash-0.0.1/docs/README.md +++ b/dev/packages/beats/logstash-0.0.1/docs/README.md @@ -1,15 +1 @@ -# logstash Integration - -TODO - -## Compatibility - -TODO - -### Inputs - -TODO - -## Dashboard - TODO \ No newline at end of file diff --git a/dev/packages/beats/logstash-0.0.1/manifest.yml b/dev/packages/beats/logstash-0.0.1/manifest.yml index a8dda03c8..f595838bd 100644 --- a/dev/packages/beats/logstash-0.0.1/manifest.yml +++ b/dev/packages/beats/logstash-0.0.1/manifest.yml @@ -10,8 +10,7 @@ categories: - metrics release: ga requirement: - kibana: - versions: '>=7.3.0 <8.0.0' + kibana: {} elasticsearch: versions: '>7.0.1' screenshots: diff --git a/dev/packages/beats/memcached-0.0.1/docs/README.md b/dev/packages/beats/memcached-0.0.1/docs/README.md index af0c7c487..30404ce4c 100644 --- a/dev/packages/beats/memcached-0.0.1/docs/README.md +++ b/dev/packages/beats/memcached-0.0.1/docs/README.md @@ -1,15 +1 @@ -# Memcached Integration - -TODO - -## Compatibility - -TODO - -### Inputs - -TODO - -## Dashboard - TODO \ No newline at end of file diff --git a/dev/packages/beats/misp-0.0.1/docs/README.md b/dev/packages/beats/misp-0.0.1/docs/README.md index 6d67b0f05..30404ce4c 100644 --- a/dev/packages/beats/misp-0.0.1/docs/README.md +++ b/dev/packages/beats/misp-0.0.1/docs/README.md @@ -1,15 +1 @@ -# MISP Integration - -TODO - -## Compatibility - -TODO - -### Inputs - -TODO - -## Dashboard - TODO \ No newline at end of file diff --git a/dev/packages/beats/misp-0.0.1/manifest.yml b/dev/packages/beats/misp-0.0.1/manifest.yml index b3b2b2448..9f0a761a2 100644 --- a/dev/packages/beats/misp-0.0.1/manifest.yml +++ b/dev/packages/beats/misp-0.0.1/manifest.yml @@ -9,8 +9,7 @@ categories: - logs release: ga requirement: - kibana: - versions: '>=8.0.0-SNAPSHOT <8.0.0' + kibana: {} elasticsearch: versions: '>7.0.1' screenshots: diff --git a/dev/packages/beats/mongodb-0.0.1/docs/README.md b/dev/packages/beats/mongodb-0.0.1/docs/README.md index d3a183699..30404ce4c 100644 --- a/dev/packages/beats/mongodb-0.0.1/docs/README.md +++ b/dev/packages/beats/mongodb-0.0.1/docs/README.md @@ -1,15 +1 @@ -# mongodb Integration - -TODO - -## Compatibility - -TODO - -### Inputs - -TODO - -## Dashboard - TODO \ No newline at end of file diff --git a/dev/packages/beats/mongodb-0.0.1/manifest.yml b/dev/packages/beats/mongodb-0.0.1/manifest.yml index b4f90a182..fcf242d1b 100644 --- a/dev/packages/beats/mongodb-0.0.1/manifest.yml +++ b/dev/packages/beats/mongodb-0.0.1/manifest.yml @@ -10,8 +10,7 @@ categories: - metrics release: ga requirement: - kibana: - versions: '>=7.3.0 <8.0.0' + kibana: {} elasticsearch: versions: '>7.0.1' screenshots: diff --git a/dev/packages/beats/mssql-0.0.1/docs/README.md b/dev/packages/beats/mssql-0.0.1/docs/README.md index 7803cccea..30404ce4c 100644 --- a/dev/packages/beats/mssql-0.0.1/docs/README.md +++ b/dev/packages/beats/mssql-0.0.1/docs/README.md @@ -1,15 +1 @@ -# mssql Integration - -TODO - -## Compatibility - -TODO - -### Inputs - -TODO - -## Dashboard - TODO \ No newline at end of file diff --git a/dev/packages/beats/mssql-0.0.1/manifest.yml b/dev/packages/beats/mssql-0.0.1/manifest.yml index 7f4fecfa2..09bfa6dda 100644 --- a/dev/packages/beats/mssql-0.0.1/manifest.yml +++ b/dev/packages/beats/mssql-0.0.1/manifest.yml @@ -10,8 +10,7 @@ categories: - metrics release: ga requirement: - kibana: - versions: '>=7.0.0-alpha2 <8.0.0' + kibana: {} elasticsearch: versions: '>7.0.1' datasources: diff --git a/dev/packages/beats/munin-0.0.1/docs/README.md b/dev/packages/beats/munin-0.0.1/docs/README.md index 96c070366..30404ce4c 100644 --- a/dev/packages/beats/munin-0.0.1/docs/README.md +++ b/dev/packages/beats/munin-0.0.1/docs/README.md @@ -1,15 +1 @@ -# Munin Integration - -TODO - -## Compatibility - -TODO - -### Inputs - -TODO - -## Dashboard - TODO \ No newline at end of file diff --git a/dev/packages/beats/mysql-0.0.1/dataset/galera_status/agent/stream/stream.yml b/dev/packages/beats/mysql-0.0.1/dataset/galera_status/agent/stream/stream.yml index 0e179b6e8..aa257b5b0 100644 --- a/dev/packages/beats/mysql-0.0.1/dataset/galera_status/agent/stream/stream.yml +++ b/dev/packages/beats/mysql-0.0.1/dataset/galera_status/agent/stream/stream.yml @@ -1,2 +1,13 @@ input: mysql/metrics metricsets: ["galera_status"] +hosts: {{hosts}} +{{#if password}} +password: {{password}} +{{/if}} +period: {{period}} +{{#if raw}} +raw: {{raw}} +{{/if}} +{{#if username}} +username: {{username}} +{{/if}} diff --git a/dev/packages/beats/mysql-0.0.1/dataset/galera_status/manifest.yml b/dev/packages/beats/mysql-0.0.1/dataset/galera_status/manifest.yml index 56fb13c37..e8fadb07d 100644 --- a/dev/packages/beats/mysql-0.0.1/dataset/galera_status/manifest.yml +++ b/dev/packages/beats/mysql-0.0.1/dataset/galera_status/manifest.yml @@ -4,5 +4,17 @@ release: beta type: metrics streams: - input: mysql/metrics + vars: + - default: + - root:secret@tcp(127.0.0.1:3306)/ + name: hosts + - default: secret + name: password + - default: 10s + name: period + - default: false + name: raw + - default: root + name: username title: MySQL galera_status metrics description: Collect MySQL galera_status metrics diff --git a/dev/packages/beats/mysql-0.0.1/dataset/status/agent/stream/stream.yml b/dev/packages/beats/mysql-0.0.1/dataset/status/agent/stream/stream.yml index 7b3449fe6..fd53a18e6 100644 --- a/dev/packages/beats/mysql-0.0.1/dataset/status/agent/stream/stream.yml +++ b/dev/packages/beats/mysql-0.0.1/dataset/status/agent/stream/stream.yml @@ -1,4 +1,13 @@ input: mysql/metrics metricsets: ["status"] hosts: {{hosts}} +{{#if password}} +password: {{password}} +{{/if}} period: {{period}} +{{#if raw}} +raw: {{raw}} +{{/if}} +{{#if username}} +username: {{username}} +{{/if}} diff --git a/dev/packages/beats/mysql-0.0.1/dataset/status/manifest.yml b/dev/packages/beats/mysql-0.0.1/dataset/status/manifest.yml index d1fa0dc54..4becb599f 100644 --- a/dev/packages/beats/mysql-0.0.1/dataset/status/manifest.yml +++ b/dev/packages/beats/mysql-0.0.1/dataset/status/manifest.yml @@ -8,7 +8,13 @@ streams: - default: - root:secret@tcp(127.0.0.1:3306)/ name: hosts + - default: secret + name: password - default: 10s name: period + - default: false + name: raw + - default: root + name: username title: MySQL status metrics description: Collect MySQL status metrics diff --git a/dev/packages/beats/mysql-0.0.1/docs/README.md b/dev/packages/beats/mysql-0.0.1/docs/README.md index 87a445852..ef6f0012b 100644 --- a/dev/packages/beats/mysql-0.0.1/docs/README.md +++ b/dev/packages/beats/mysql-0.0.1/docs/README.md @@ -1,15 +1,261 @@ # MySQL Integration -TODO +This integration periodically fetches logs and metrics from [https://www.mysql.com/](MySQL) servers. ## Compatibility -TODO +The `error` and `slowlog` datasets were tested with logs from MySQL 5.5, 5.7 and 8.0, MariaDB 10.1, 10.2 and 10.3, and Percona 5.7 and 8.0. -### Inputs +The `galera_status` and `status` datasets were tested with MySQL and Percona 5.7 and 8.0 and are expected to work with all +versions >= 5.7.0. It is also tested with MariaDB 10.2, 10.3 and 10.4. -TODO +## Logs -## Dashboard +### error -TODO \ No newline at end of file +The `error` dataset collects the MySQL error logs. + +**Exported fields** + +| Field | Description | Type | +|----------------------------- |-------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- |------ | +| nginx.access.remote_ip_list | An array of remote IP addresses. It is a list because it is common to include, besides the client IP address, IP addresses from headers like X-Forwarded-For. Real source IP is restored to source.ip. | ip | + + +### slowlog + +The `slowlog` dataset collects the MySQL slow logs. + +**Exported fields** + +| Field | Description | Type | +|--------------------------- |-------------------------------------------------------------------------------- |------ | +| nginx.error.connection_id | Connection identifier. | ip | + +## Metrics + +### galera_status + +The `galera_status` dataset periodically fetches metrics from [http://galeracluster.com/](Galera)-MySQL cluster servers. + +An example event for `galera_status` looks as following: + +```$json +{ + "@timestamp":"2016-05-23T08:05:34.853Z", + "agent": { + "hostname": "host.example.com", + "name": "host.example.com" + }, + "event": { + "dataset": "mysql.galera_status", + "duration": 115000 + }, + "metricset": { + "name": "galera_status" + }, + "mysql":{ + "galera_status":{ + "apply": { + "oooe": 0, + "oool": 0, + "window": 1 + }, + "connected": "ON", + "flow_ctl": { + "recv": 0, + "sent": 0, + "paused": 0, + "paused_ns": 0 + }, + "ready": "ON", + "received": { + "count": 173, + "bytes": 152425 + }, + "local": { + "state": "Synced", + "bf_aborts": 0, + "cert_failures": 0, + "commits": 1325, + "recv": { + "queue_max": 2, + "queue_min": 0, + "queue": 0, + "queue_avg": 0.011561 + }, + "replays": 0, + "send": { + "queue_min": 0, + "queue": 0, + "queue_avg": 0, + "queue_max": 1 + } + }, + "evs": { + "evict": "", + "state": "OPERATIONAL" + }, + "repl": { + "bytes": 1689804, + "data_bytes": 1540647, + "keys": 4170, + "keys_bytes": 63973, + "other_bytes": 0, + "count": 1331 + }, + "commit": { + "oooe": 0, + "window": 1 + }, + "cluster": { + "conf_id": 930, + "size": 3, + "status": "Primary" + }, + "last_committed": 23944, + "cert": { + "deps_distance": 43.524557, + "index_size": 22, + "interval": 0 + } + } + } +} +``` + +The fields reported are: + +| Field | Description | Type | +|--------------------------- |-------------------------------------------------------------------------------- |--------- | +| nginx.stubstatus.hostname | Nginx hostname. | keyword | + +### status + +The MySQL `status` dataset collects data from MySQL by running a `SHOW GLOBAL STATUS;` SQL query. This query returns a large number of metrics. + +An example event for `status` looks as following: + +```$json +{ + "@timestamp":"2016-05-23T08:05:34.853Z", + "agent": { + "hostname": "host.example.com", + "name": "host.example.com" + }, + "event": { + "dataset": "mysql.status", + "duration": 115000 + }, + "metricset": { + "name": "status" + }, + "mysql": { + "status": { + "aborted": { + "clients": 3, + "connects": 4 + }, + "binlog": { + "cache": { + "disk_use": 0, + "use": 0 + } + }, + "bytes": { + "received": 1272, + "sent": 47735 + }, + "command": { + "delete": 0, + "insert": 0, + "select": 1, + "update": 0 + }, + "connections": 12, + "created": { + "tmp": { + "disk_tables": 0, + "files": 5, + "tables": 6 + } + }, + "delayed": { + "errors": 0, + "insert_threads": 0, + "writes": 0 + }, + "flush_commands": 1, + "handler": { + "commit": 0, + "delete": 0, + "external_lock": 140, + "mrr_init": 0, + "prepare": 0, + "read": { + "first": 3, + "key": 2, + "last": 0, + "next": 32, + "prev": 0, + "rnd": 0, + "rnd_next": 1728 + }, + "rollback": 0, + "savepoint": 0, + "savepoint_rollback": 0, + "update": 0, + "write": 1705 + }, + "innodb": { + "buffer_pool": { + "bytes": { + "data": 6914048, + "dirty": 0 + }, + "pages": { + "data": 422, + "dirty": 0, + "flushed": 207, + "free": 7768, + "misc": 1, + "total": 8191 + }, + "pool": { + "reads": 423, + "wait_free": 0 + }, + "read": { + "ahead": 0, + "ahead_evicted": 0, + "ahead_rnd": 0, + "requests": 14198 + }, + "write_requests": 207 + } + }, + "max_used_connections": 3, + "open": { + "files": 16, + "streams": 0, + "tables": 60 + }, + "opened_tables": 67, + "queries": 10, + "questions": 9, + "threads": { + "cached": 0, + "connected": 3, + "created": 3, + "running": 1 + } + } + } +} +``` + +The fields reported are: + +| Field | Description | Type | +|--------------------------- |-------------------------------------------------------------------------------- |--------- | +| nginx.stubstatus.hostname | Nginx hostname. | keyword | diff --git a/dev/packages/beats/mysql-0.0.1/manifest.yml b/dev/packages/beats/mysql-0.0.1/manifest.yml index 08ad76052..ec46daf3e 100644 --- a/dev/packages/beats/mysql-0.0.1/manifest.yml +++ b/dev/packages/beats/mysql-0.0.1/manifest.yml @@ -10,8 +10,7 @@ categories: - metrics release: ga requirement: - kibana: - versions: '>=7.3.1 <8.0.0' + kibana: {} elasticsearch: versions: '>7.0.1' screenshots: diff --git a/dev/packages/beats/nats-0.0.1/docs/README.md b/dev/packages/beats/nats-0.0.1/docs/README.md index 4c9afe7b0..30404ce4c 100644 --- a/dev/packages/beats/nats-0.0.1/docs/README.md +++ b/dev/packages/beats/nats-0.0.1/docs/README.md @@ -1,15 +1 @@ -# nats Integration - -TODO - -## Compatibility - -TODO - -### Inputs - -TODO - -## Dashboard - TODO \ No newline at end of file diff --git a/dev/packages/beats/nats-0.0.1/manifest.yml b/dev/packages/beats/nats-0.0.1/manifest.yml index ce33f54b9..74908b067 100644 --- a/dev/packages/beats/nats-0.0.1/manifest.yml +++ b/dev/packages/beats/nats-0.0.1/manifest.yml @@ -10,8 +10,7 @@ categories: - metrics release: ga requirement: - kibana: - versions: '>=7.3.0 <8.0.0' + kibana: {} elasticsearch: versions: '>7.0.1' screenshots: diff --git a/dev/packages/beats/netflow-0.0.1/docs/README.md b/dev/packages/beats/netflow-0.0.1/docs/README.md index e57abc950..30404ce4c 100644 --- a/dev/packages/beats/netflow-0.0.1/docs/README.md +++ b/dev/packages/beats/netflow-0.0.1/docs/README.md @@ -1,15 +1 @@ -# NetFlow Integration - -TODO - -## Compatibility - -TODO - -### Inputs - -TODO - -## Dashboard - TODO \ No newline at end of file diff --git a/dev/packages/beats/netflow-0.0.1/manifest.yml b/dev/packages/beats/netflow-0.0.1/manifest.yml index a2742b811..4f2589199 100644 --- a/dev/packages/beats/netflow-0.0.1/manifest.yml +++ b/dev/packages/beats/netflow-0.0.1/manifest.yml @@ -9,8 +9,7 @@ categories: - logs release: ga requirement: - kibana: - versions: '>=7.3.0 <8.0.0' + kibana: {} elasticsearch: {} datasources: - name: netflow diff --git a/dev/packages/beats/nginx-0.0.1/docs/README.md b/dev/packages/beats/nginx-0.0.1/docs/README.md index 097429273..f95a6d6af 100644 --- a/dev/packages/beats/nginx-0.0.1/docs/README.md +++ b/dev/packages/beats/nginx-0.0.1/docs/README.md @@ -1,15 +1,104 @@ # Nginx Integration -TODO +This integration periodically fetches metrics from [https://nginx.org/](Nginx) servers. + ## Compatibility -TODO +The Nginx stubstatus metrics were tested with Nginx 1.9 and are expected to work with all version >= 1.9. The logs were tested with version 1.10. On Windows, the module was tested with Nginx installed from the Chocolatey repository. + + +## Logs + + +**Timezone support** + +This datasource parses logs that don’t contain timezone information. For these logs, the Elastic Agent reads the local timezone and uses it when parsing to convert the timestamp to UTC. The timezone to be used for parsing is included in the event in the event.timezone field. + +To disable this conversion, the event.timezone field can be removed with the drop_fields processor. + +If logs are originated from systems or applications with a different timezone to the local one, the event.timezone field can be overwritten with the original timezone using the add_fields processor. + +### Access Logs + +Access logs collects the nginx access logs. + +**Exported fields** + +| Field | Description | Type | +|----------------------------- |-------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- |------ | +| nginx.access.remote_ip_list | An array of remote IP addresses. It is a list because it is common to include, besides the client IP address, IP addresses from headers like X-Forwarded-For. Real source IP is restored to source.ip. | ip | +| nginx.stubstatus.active | The current number of active client connections including Waiting connections. | long | +| nginx.stubstatus.accepts | The total number of accepted client connections. | long | +| nginx.stubstatus.handled | The total number of handled client connections. | long | +| nginx.stubstatus.dropped | The total number of dropped client connections. | long | + +### Error Logs + +Error logs collects the nginx error logs. + +**Exported fields** + +| Field | Description | Type | +|--------------------------- |-------------------------------------------------------------------------------- |------ | +| nginx.error.connection_id | Connection identifier. | ip | +| nginx.stubstatus.active | The current number of active client connections including Waiting connections. | long | +| nginx.stubstatus.accepts | The total number of accepted client connections. | long | +| nginx.stubstatus.handled | The total number of handled client connections. | long | +| nginx.stubstatus.dropped | The total number of dropped client connections. | long | + +## Metrics + +### Stubstatus Metrics + +The Nginx stubstatus stream collects data from the Nginx ngx_http_stub_status module. It scrapes the server status data from the web page generated by ngx_http_stub_status. + +This is a default stream. If the host datasource is unconfigured, this stream is enabled by default. -### Inputs +An example event for nginx looks as following: -TODO +```$json +{ + "@timestamp": "2017-10-12T08:05:34.853Z", + "agent": { + "hostname": "host.example.com", + "name": "host.example.com" + }, + "event": { + "dataset": "nginx.stubstatus", + "duration": 115000, + "module": "nginx" + }, + "metricset": { + "name": "stubstatus" + }, + "nginx": { + "stubstatus": { + "accepts": 6254, + "active": 2, + "current": 1, + "dropped": 0, + "handled": 6254, + "hostname": "127.0.0.1", + "reading": 0, + "requests": 6259, + "waiting": 1, + "writing": 1 + } + }, + "service": { + "address": "127.0.0.1", + "type": "nginx" + } +} +``` -## Dashboard +The fields reported are: -TODO \ No newline at end of file +| Field | Description | Type | +|--------------------------- |-------------------------------------------------------------------------------- |--------- | +| nginx.stubstatus.hostname | Nginx hostname. | keyword | +| nginx.stubstatus.active | The current number of active client connections including Waiting connections. | long | +| nginx.stubstatus.accepts | The total number of accepted client connections. | long | +| nginx.stubstatus.handled | The total number of handled client connections. | long | +| nginx.stubstatus.dropped | The total number of dropped client connections. | long | diff --git a/dev/packages/beats/nginx-0.0.1/manifest.yml b/dev/packages/beats/nginx-0.0.1/manifest.yml index f7d226a5e..abf4f000f 100644 --- a/dev/packages/beats/nginx-0.0.1/manifest.yml +++ b/dev/packages/beats/nginx-0.0.1/manifest.yml @@ -10,8 +10,7 @@ categories: - metrics release: ga requirement: - kibana: - versions: '>=7.3.0 <8.0.0' + kibana: {} elasticsearch: versions: '>7.0.1' screenshots: diff --git a/dev/packages/beats/o365-0.0.1/docs/README.md b/dev/packages/beats/o365-0.0.1/docs/README.md index 4032bfe92..30404ce4c 100644 --- a/dev/packages/beats/o365-0.0.1/docs/README.md +++ b/dev/packages/beats/o365-0.0.1/docs/README.md @@ -1,15 +1 @@ -# Office 365 Integration - -TODO - -## Compatibility - -TODO - -### Inputs - -TODO - -## Dashboard - TODO \ No newline at end of file diff --git a/dev/packages/beats/o365-0.0.1/manifest.yml b/dev/packages/beats/o365-0.0.1/manifest.yml index be8684665..d9ccf3dac 100644 --- a/dev/packages/beats/o365-0.0.1/manifest.yml +++ b/dev/packages/beats/o365-0.0.1/manifest.yml @@ -9,8 +9,7 @@ categories: - logs release: ga requirement: - kibana: - versions: '>=7.6.0 <8.0.0' + kibana: {} elasticsearch: versions: '>7.0.1' screenshots: diff --git a/dev/packages/beats/okta-0.0.1/docs/README.md b/dev/packages/beats/okta-0.0.1/docs/README.md index 169eeb2d5..30404ce4c 100644 --- a/dev/packages/beats/okta-0.0.1/docs/README.md +++ b/dev/packages/beats/okta-0.0.1/docs/README.md @@ -1,15 +1 @@ -# Okta Integration - -TODO - -## Compatibility - -TODO - -### Inputs - -TODO - -## Dashboard - TODO \ No newline at end of file diff --git a/dev/packages/beats/okta-0.0.1/manifest.yml b/dev/packages/beats/okta-0.0.1/manifest.yml index 4692350d5..7d83386cd 100644 --- a/dev/packages/beats/okta-0.0.1/manifest.yml +++ b/dev/packages/beats/okta-0.0.1/manifest.yml @@ -9,8 +9,7 @@ categories: - logs release: ga requirement: - kibana: - versions: '>=8.0.0-SNAPSHOT <8.0.0' + kibana: {} elasticsearch: versions: '>7.0.1' screenshots: diff --git a/dev/packages/beats/openmetrics-0.0.1/docs/README.md b/dev/packages/beats/openmetrics-0.0.1/docs/README.md index 1caacb477..30404ce4c 100644 --- a/dev/packages/beats/openmetrics-0.0.1/docs/README.md +++ b/dev/packages/beats/openmetrics-0.0.1/docs/README.md @@ -1,15 +1 @@ -# Openmetrics Integration - -TODO - -## Compatibility - -TODO - -### Inputs - -TODO - -## Dashboard - TODO \ No newline at end of file diff --git a/dev/packages/beats/oracle-0.0.1/docs/README.md b/dev/packages/beats/oracle-0.0.1/docs/README.md index a456f22f4..30404ce4c 100644 --- a/dev/packages/beats/oracle-0.0.1/docs/README.md +++ b/dev/packages/beats/oracle-0.0.1/docs/README.md @@ -1,15 +1 @@ -# Oracle Integration - -TODO - -## Compatibility - -TODO - -### Inputs - -TODO - -## Dashboard - TODO \ No newline at end of file diff --git a/dev/packages/beats/oracle-0.0.1/manifest.yml b/dev/packages/beats/oracle-0.0.1/manifest.yml index 85117f0bd..d3d9b46df 100644 --- a/dev/packages/beats/oracle-0.0.1/manifest.yml +++ b/dev/packages/beats/oracle-0.0.1/manifest.yml @@ -9,8 +9,7 @@ categories: - metrics release: ga requirement: - kibana: - versions: '>=8.0.0-SNAPSHOT <8.0.0' + kibana: {} elasticsearch: {} screenshots: - src: /img/metricbeat-oracle-overview.png diff --git a/dev/packages/beats/osquery-0.0.1/docs/README.md b/dev/packages/beats/osquery-0.0.1/docs/README.md index 8445e7224..30404ce4c 100644 --- a/dev/packages/beats/osquery-0.0.1/docs/README.md +++ b/dev/packages/beats/osquery-0.0.1/docs/README.md @@ -1,15 +1 @@ -# Osquery Integration - -TODO - -## Compatibility - -TODO - -### Inputs - -TODO - -## Dashboard - TODO \ No newline at end of file diff --git a/dev/packages/beats/osquery-0.0.1/manifest.yml b/dev/packages/beats/osquery-0.0.1/manifest.yml index 53a992729..51469d580 100644 --- a/dev/packages/beats/osquery-0.0.1/manifest.yml +++ b/dev/packages/beats/osquery-0.0.1/manifest.yml @@ -9,8 +9,7 @@ categories: - logs release: ga requirement: - kibana: - versions: '>=7.3.0 <8.0.0' + kibana: {} elasticsearch: versions: '>7.0.1' screenshots: diff --git a/dev/packages/beats/panw-0.0.1/docs/README.md b/dev/packages/beats/panw-0.0.1/docs/README.md index 0441b3ee2..30404ce4c 100644 --- a/dev/packages/beats/panw-0.0.1/docs/README.md +++ b/dev/packages/beats/panw-0.0.1/docs/README.md @@ -1,15 +1 @@ -# panw Integration - -TODO - -## Compatibility - -TODO - -### Inputs - -TODO - -## Dashboard - TODO \ No newline at end of file diff --git a/dev/packages/beats/panw-0.0.1/manifest.yml b/dev/packages/beats/panw-0.0.1/manifest.yml index 5373c85a6..7160a0058 100644 --- a/dev/packages/beats/panw-0.0.1/manifest.yml +++ b/dev/packages/beats/panw-0.0.1/manifest.yml @@ -9,8 +9,7 @@ categories: - logs release: ga requirement: - kibana: - versions: '>=7.3.0 <8.0.0' + kibana: {} elasticsearch: versions: '>7.0.1' screenshots: diff --git a/dev/packages/beats/php_fpm-0.0.1/docs/README.md b/dev/packages/beats/php_fpm-0.0.1/docs/README.md index 786ed79db..30404ce4c 100644 --- a/dev/packages/beats/php_fpm-0.0.1/docs/README.md +++ b/dev/packages/beats/php_fpm-0.0.1/docs/README.md @@ -1,15 +1 @@ -# PHP_FPM Integration - -TODO - -## Compatibility - -TODO - -### Inputs - -TODO - -## Dashboard - TODO \ No newline at end of file diff --git a/dev/packages/beats/postgresql-0.0.1/docs/README.md b/dev/packages/beats/postgresql-0.0.1/docs/README.md index af69e95b8..30404ce4c 100644 --- a/dev/packages/beats/postgresql-0.0.1/docs/README.md +++ b/dev/packages/beats/postgresql-0.0.1/docs/README.md @@ -1,15 +1 @@ -# PostgreSQL Integration - -TODO - -## Compatibility - -TODO - -### Inputs - -TODO - -## Dashboard - TODO \ No newline at end of file diff --git a/dev/packages/beats/postgresql-0.0.1/manifest.yml b/dev/packages/beats/postgresql-0.0.1/manifest.yml index 43f9a1c6d..82569d470 100644 --- a/dev/packages/beats/postgresql-0.0.1/manifest.yml +++ b/dev/packages/beats/postgresql-0.0.1/manifest.yml @@ -10,8 +10,7 @@ categories: - metrics release: ga requirement: - kibana: - versions: '>=7.3.1 <8.0.0' + kibana: {} elasticsearch: versions: '>7.0.1' screenshots: diff --git a/dev/packages/beats/prometheus-0.0.1/docs/README.md b/dev/packages/beats/prometheus-0.0.1/docs/README.md index 4d1720981..30404ce4c 100644 --- a/dev/packages/beats/prometheus-0.0.1/docs/README.md +++ b/dev/packages/beats/prometheus-0.0.1/docs/README.md @@ -1,15 +1 @@ -# Prometheus Integration - -TODO - -## Compatibility - -TODO - -### Inputs - -TODO - -## Dashboard - TODO \ No newline at end of file diff --git a/dev/packages/beats/prometheus-0.0.1/manifest.yml b/dev/packages/beats/prometheus-0.0.1/manifest.yml index f96f8efe2..bd87701ec 100644 --- a/dev/packages/beats/prometheus-0.0.1/manifest.yml +++ b/dev/packages/beats/prometheus-0.0.1/manifest.yml @@ -10,8 +10,7 @@ categories: - metrics release: ga requirement: - kibana: - versions: '>=7.3.0 <8.0.0' + kibana: {} elasticsearch: {} screenshots: - src: /img/metricbeat-prometheus-overview.png diff --git a/dev/packages/beats/rabbitmq-0.0.1/docs/README.md b/dev/packages/beats/rabbitmq-0.0.1/docs/README.md index 65eda2007..30404ce4c 100644 --- a/dev/packages/beats/rabbitmq-0.0.1/docs/README.md +++ b/dev/packages/beats/rabbitmq-0.0.1/docs/README.md @@ -1,15 +1 @@ -# RabbitMQ Integration - -TODO - -## Compatibility - -TODO - -### Inputs - -TODO - -## Dashboard - TODO \ No newline at end of file diff --git a/dev/packages/beats/rabbitmq-0.0.1/manifest.yml b/dev/packages/beats/rabbitmq-0.0.1/manifest.yml index ef04ac473..28b23fdc6 100644 --- a/dev/packages/beats/rabbitmq-0.0.1/manifest.yml +++ b/dev/packages/beats/rabbitmq-0.0.1/manifest.yml @@ -10,8 +10,7 @@ categories: - metrics release: ga requirement: - kibana: - versions: '>=7.3.0 <8.0.0' + kibana: {} elasticsearch: versions: '>7.0.1' icons: diff --git a/dev/packages/beats/redis-0.0.1/docs/README.md b/dev/packages/beats/redis-0.0.1/docs/README.md index 2e31a56fa..30404ce4c 100644 --- a/dev/packages/beats/redis-0.0.1/docs/README.md +++ b/dev/packages/beats/redis-0.0.1/docs/README.md @@ -1,15 +1 @@ -# Redis Integration - -TODO - -## Compatibility - -TODO - -### Inputs - -TODO - -## Dashboard - TODO \ No newline at end of file diff --git a/dev/packages/beats/redis-0.0.1/manifest.yml b/dev/packages/beats/redis-0.0.1/manifest.yml index 9ef6f14c8..7c28324cd 100644 --- a/dev/packages/beats/redis-0.0.1/manifest.yml +++ b/dev/packages/beats/redis-0.0.1/manifest.yml @@ -10,8 +10,7 @@ categories: - metrics release: ga requirement: - kibana: - versions: '>=7.3.0 <8.0.0' + kibana: {} elasticsearch: versions: '>7.0.1' screenshots: diff --git a/dev/packages/beats/redisenterprise-0.0.1/docs/README.md b/dev/packages/beats/redisenterprise-0.0.1/docs/README.md index b706252fd..30404ce4c 100644 --- a/dev/packages/beats/redisenterprise-0.0.1/docs/README.md +++ b/dev/packages/beats/redisenterprise-0.0.1/docs/README.md @@ -1,15 +1 @@ -# Redis Enterprise Integration - -TODO - -## Compatibility - -TODO - -### Inputs - -TODO - -## Dashboard - TODO \ No newline at end of file diff --git a/dev/packages/beats/redisenterprise-0.0.1/manifest.yml b/dev/packages/beats/redisenterprise-0.0.1/manifest.yml index 90c44e241..d0d98264b 100644 --- a/dev/packages/beats/redisenterprise-0.0.1/manifest.yml +++ b/dev/packages/beats/redisenterprise-0.0.1/manifest.yml @@ -9,8 +9,7 @@ categories: - metrics release: beta requirement: - kibana: - versions: '>=7.1.0 <8.0.0' + kibana: {} elasticsearch: {} screenshots: - src: /img/metricbeat-redisenterprise-overview.png diff --git a/dev/packages/beats/santa-0.0.1/docs/README.md b/dev/packages/beats/santa-0.0.1/docs/README.md index 6aeb328d7..30404ce4c 100644 --- a/dev/packages/beats/santa-0.0.1/docs/README.md +++ b/dev/packages/beats/santa-0.0.1/docs/README.md @@ -1,15 +1 @@ -# Google Santa Integration - -TODO - -## Compatibility - -TODO - -### Inputs - -TODO - -## Dashboard - TODO \ No newline at end of file diff --git a/dev/packages/beats/santa-0.0.1/manifest.yml b/dev/packages/beats/santa-0.0.1/manifest.yml index 0611324b4..627651cfd 100644 --- a/dev/packages/beats/santa-0.0.1/manifest.yml +++ b/dev/packages/beats/santa-0.0.1/manifest.yml @@ -9,8 +9,7 @@ categories: - logs release: ga requirement: - kibana: - versions: '>=7.0.0-alpha1-SNAPSHOT <8.0.0' + kibana: {} elasticsearch: versions: '>7.0.1' screenshots: diff --git a/dev/packages/beats/sql-0.0.1/docs/README.md b/dev/packages/beats/sql-0.0.1/docs/README.md index 292235a18..30404ce4c 100644 --- a/dev/packages/beats/sql-0.0.1/docs/README.md +++ b/dev/packages/beats/sql-0.0.1/docs/README.md @@ -1,15 +1 @@ -# sql Integration - -TODO - -## Compatibility - -TODO - -### Inputs - -TODO - -## Dashboard - TODO \ No newline at end of file diff --git a/dev/packages/beats/stan-0.0.1/docs/README.md b/dev/packages/beats/stan-0.0.1/docs/README.md index 4f4a38df7..30404ce4c 100644 --- a/dev/packages/beats/stan-0.0.1/docs/README.md +++ b/dev/packages/beats/stan-0.0.1/docs/README.md @@ -1,15 +1 @@ -# Stan Integration - -TODO - -## Compatibility - -TODO - -### Inputs - -TODO - -## Dashboard - TODO \ No newline at end of file diff --git a/dev/packages/beats/stan-0.0.1/manifest.yml b/dev/packages/beats/stan-0.0.1/manifest.yml index 75b7d9e7d..6e97e67a6 100644 --- a/dev/packages/beats/stan-0.0.1/manifest.yml +++ b/dev/packages/beats/stan-0.0.1/manifest.yml @@ -9,8 +9,7 @@ categories: - metrics release: ga requirement: - kibana: - versions: '>=7.5.2 <8.0.0' + kibana: {} elasticsearch: {} screenshots: - src: /img/metricbeat-stan-overview.png diff --git a/dev/packages/beats/statsd-0.0.1/docs/README.md b/dev/packages/beats/statsd-0.0.1/docs/README.md index 7578c9db6..30404ce4c 100644 --- a/dev/packages/beats/statsd-0.0.1/docs/README.md +++ b/dev/packages/beats/statsd-0.0.1/docs/README.md @@ -1,15 +1 @@ -# Statsd Integration - -TODO - -## Compatibility - -TODO - -### Inputs - -TODO - -## Dashboard - TODO \ No newline at end of file diff --git a/dev/packages/beats/suricata-0.0.1/docs/README.md b/dev/packages/beats/suricata-0.0.1/docs/README.md index 2ee63b48d..30404ce4c 100644 --- a/dev/packages/beats/suricata-0.0.1/docs/README.md +++ b/dev/packages/beats/suricata-0.0.1/docs/README.md @@ -1,15 +1 @@ -# Suricata Integration - -TODO - -## Compatibility - -TODO - -### Inputs - -TODO - -## Dashboard - TODO \ No newline at end of file diff --git a/dev/packages/beats/suricata-0.0.1/manifest.yml b/dev/packages/beats/suricata-0.0.1/manifest.yml index 87f3860a5..6a8ec4a13 100644 --- a/dev/packages/beats/suricata-0.0.1/manifest.yml +++ b/dev/packages/beats/suricata-0.0.1/manifest.yml @@ -9,8 +9,7 @@ categories: - logs release: ga requirement: - kibana: - versions: '>=7.3.0 <8.0.0' + kibana: {} elasticsearch: versions: '>7.0.1' screenshots: diff --git a/dev/packages/beats/system-0.0.1/docs/README.md b/dev/packages/beats/system-0.0.1/docs/README.md index 58620d3c7..30404ce4c 100644 --- a/dev/packages/beats/system-0.0.1/docs/README.md +++ b/dev/packages/beats/system-0.0.1/docs/README.md @@ -1,15 +1 @@ -# System Integration - -TODO - -## Compatibility - -TODO - -### Inputs - -TODO - -## Dashboard - TODO \ No newline at end of file diff --git a/dev/packages/beats/system-0.0.1/manifest.yml b/dev/packages/beats/system-0.0.1/manifest.yml index 3a42b6ef2..646509ed7 100644 --- a/dev/packages/beats/system-0.0.1/manifest.yml +++ b/dev/packages/beats/system-0.0.1/manifest.yml @@ -10,8 +10,7 @@ categories: - metrics release: ga requirement: - kibana: - versions: '>=7.6.0 <8.0.0' + kibana: {} elasticsearch: versions: '>7.0.1' screenshots: diff --git a/dev/packages/beats/tomcat-0.0.1/docs/README.md b/dev/packages/beats/tomcat-0.0.1/docs/README.md index fdeba909d..30404ce4c 100644 --- a/dev/packages/beats/tomcat-0.0.1/docs/README.md +++ b/dev/packages/beats/tomcat-0.0.1/docs/README.md @@ -1,15 +1 @@ -# Tomcat Integration - -TODO - -## Compatibility - -TODO - -### Inputs - -TODO - -## Dashboard - TODO \ No newline at end of file diff --git a/dev/packages/beats/tomcat-0.0.1/manifest.yml b/dev/packages/beats/tomcat-0.0.1/manifest.yml index 2236bbc2b..fdbdc12bb 100644 --- a/dev/packages/beats/tomcat-0.0.1/manifest.yml +++ b/dev/packages/beats/tomcat-0.0.1/manifest.yml @@ -9,8 +9,7 @@ categories: - metrics release: beta requirement: - kibana: - versions: '>=8.0.0-SNAPSHOT <8.0.0' + kibana: {} elasticsearch: {} screenshots: - src: /img/metricbeat-tomcat-overview.png diff --git a/dev/packages/beats/traefik-0.0.1/docs/README.md b/dev/packages/beats/traefik-0.0.1/docs/README.md index 29ad55e2e..30404ce4c 100644 --- a/dev/packages/beats/traefik-0.0.1/docs/README.md +++ b/dev/packages/beats/traefik-0.0.1/docs/README.md @@ -1,15 +1 @@ -# Traefik Integration - -TODO - -## Compatibility - -TODO - -### Inputs - -TODO - -## Dashboard - TODO \ No newline at end of file diff --git a/dev/packages/beats/traefik-0.0.1/manifest.yml b/dev/packages/beats/traefik-0.0.1/manifest.yml index 3a536a1fd..bbe473cf1 100644 --- a/dev/packages/beats/traefik-0.0.1/manifest.yml +++ b/dev/packages/beats/traefik-0.0.1/manifest.yml @@ -10,8 +10,7 @@ categories: - metrics release: ga requirement: - kibana: - versions: '>=7.3.0 <8.0.0' + kibana: {} elasticsearch: versions: '>7.0.1' screenshots: diff --git a/dev/packages/beats/uwsgi-0.0.1/docs/README.md b/dev/packages/beats/uwsgi-0.0.1/docs/README.md index 0b55263f0..30404ce4c 100644 --- a/dev/packages/beats/uwsgi-0.0.1/docs/README.md +++ b/dev/packages/beats/uwsgi-0.0.1/docs/README.md @@ -1,15 +1 @@ -# uwsgi Integration - -TODO - -## Compatibility - -TODO - -### Inputs - -TODO - -## Dashboard - TODO \ No newline at end of file diff --git a/dev/packages/beats/uwsgi-0.0.1/manifest.yml b/dev/packages/beats/uwsgi-0.0.1/manifest.yml index 91ea5d15b..bb3ec45b3 100644 --- a/dev/packages/beats/uwsgi-0.0.1/manifest.yml +++ b/dev/packages/beats/uwsgi-0.0.1/manifest.yml @@ -9,8 +9,7 @@ categories: - metrics release: ga requirement: - kibana: - versions: '>=7.3.0 <8.0.0' + kibana: {} elasticsearch: {} screenshots: - src: /img/uwsgi_dashboard.png diff --git a/dev/packages/beats/vsphere-0.0.1/docs/README.md b/dev/packages/beats/vsphere-0.0.1/docs/README.md index f47ca56ed..30404ce4c 100644 --- a/dev/packages/beats/vsphere-0.0.1/docs/README.md +++ b/dev/packages/beats/vsphere-0.0.1/docs/README.md @@ -1,15 +1 @@ -# vSphere Integration - -TODO - -## Compatibility - -TODO - -### Inputs - -TODO - -## Dashboard - TODO \ No newline at end of file diff --git a/dev/packages/beats/vsphere-0.0.1/manifest.yml b/dev/packages/beats/vsphere-0.0.1/manifest.yml index 5f103abb6..70a4322ac 100644 --- a/dev/packages/beats/vsphere-0.0.1/manifest.yml +++ b/dev/packages/beats/vsphere-0.0.1/manifest.yml @@ -9,8 +9,7 @@ categories: - metrics release: ga requirement: - kibana: - versions: '>=7.4.0 <8.0.0' + kibana: {} elasticsearch: {} screenshots: - src: /img/metricbeat_vsphere_dashboard.png diff --git a/dev/packages/beats/windows-0.0.1/docs/README.md b/dev/packages/beats/windows-0.0.1/docs/README.md index 627968312..30404ce4c 100644 --- a/dev/packages/beats/windows-0.0.1/docs/README.md +++ b/dev/packages/beats/windows-0.0.1/docs/README.md @@ -1,15 +1 @@ -# Windows Integration - -TODO - -## Compatibility - -TODO - -### Inputs - -TODO - -## Dashboard - TODO \ No newline at end of file diff --git a/dev/packages/beats/windows-0.0.1/manifest.yml b/dev/packages/beats/windows-0.0.1/manifest.yml index a48119064..3f53b9ea2 100644 --- a/dev/packages/beats/windows-0.0.1/manifest.yml +++ b/dev/packages/beats/windows-0.0.1/manifest.yml @@ -9,8 +9,7 @@ categories: - metrics release: ga requirement: - kibana: - versions: '>=7.3.0 <8.0.0' + kibana: {} elasticsearch: {} screenshots: - src: /img/metricbeat-windows-service.png diff --git a/dev/packages/beats/zeek-0.0.1/docs/README.md b/dev/packages/beats/zeek-0.0.1/docs/README.md index f8304c024..30404ce4c 100644 --- a/dev/packages/beats/zeek-0.0.1/docs/README.md +++ b/dev/packages/beats/zeek-0.0.1/docs/README.md @@ -1,15 +1 @@ -# Zeek Integration - -TODO - -## Compatibility - -TODO - -### Inputs - -TODO - -## Dashboard - TODO \ No newline at end of file diff --git a/dev/packages/beats/zeek-0.0.1/manifest.yml b/dev/packages/beats/zeek-0.0.1/manifest.yml index ccdeb43d2..07efeb061 100644 --- a/dev/packages/beats/zeek-0.0.1/manifest.yml +++ b/dev/packages/beats/zeek-0.0.1/manifest.yml @@ -9,8 +9,7 @@ categories: - logs release: ga requirement: - kibana: - versions: '>=7.0.0-beta1 <8.0.0' + kibana: {} elasticsearch: versions: '>7.0.1' screenshots: diff --git a/dev/packages/beats/zookeeper-0.0.1/docs/README.md b/dev/packages/beats/zookeeper-0.0.1/docs/README.md index 98c08c83a..30404ce4c 100644 --- a/dev/packages/beats/zookeeper-0.0.1/docs/README.md +++ b/dev/packages/beats/zookeeper-0.0.1/docs/README.md @@ -1,15 +1 @@ -# ZooKeeper Integration - -TODO - -## Compatibility - -TODO - -### Inputs - -TODO - -## Dashboard - TODO \ No newline at end of file diff --git a/dev/packages/beats/zookeeper-0.0.1/manifest.yml b/dev/packages/beats/zookeeper-0.0.1/manifest.yml index 60f423c80..5cb38e6a0 100644 --- a/dev/packages/beats/zookeeper-0.0.1/manifest.yml +++ b/dev/packages/beats/zookeeper-0.0.1/manifest.yml @@ -9,8 +9,7 @@ categories: - metrics release: ga requirement: - kibana: - versions: '>=7.0.0-alpha2 <8.0.0' + kibana: {} elasticsearch: {} screenshots: - src: /img/metricbeat-zookeeper.png From c2d0bee3c01134bb8da9a786846eedc45d30ddb8 Mon Sep 17 00:00:00 2001 From: Marcin Tojek Date: Tue, 31 Mar 2020 13:10:07 +0200 Subject: [PATCH 2/4] Add MySQL docs --- .../mysql/docs/README.md | 21 +- .../nginx/docs/README.md | 30 +-- dev/import-beats/docs.go | 150 ++++++++++++-- dev/import-beats/packages.go | 44 ++++- .../beats/activemq-0.0.1/manifest.yml | 3 +- .../beats/aerospike-0.0.1/manifest.yml | 3 +- dev/packages/beats/apache-0.0.1/manifest.yml | 3 +- dev/packages/beats/auditd-0.0.1/manifest.yml | 3 +- dev/packages/beats/aws-0.0.1/manifest.yml | 3 +- dev/packages/beats/azure-0.0.1/manifest.yml | 3 +- dev/packages/beats/cef-0.0.1/manifest.yml | 3 +- dev/packages/beats/ceph-0.0.1/manifest.yml | 3 +- dev/packages/beats/cisco-0.0.1/manifest.yml | 3 +- .../beats/cockroachdb-0.0.1/manifest.yml | 3 +- dev/packages/beats/consul-0.0.1/manifest.yml | 3 +- dev/packages/beats/coredns-0.0.1/manifest.yml | 3 +- .../beats/couchbase-0.0.1/manifest.yml | 3 +- dev/packages/beats/couchdb-0.0.1/manifest.yml | 3 +- dev/packages/beats/docker-0.0.1/manifest.yml | 3 +- .../beats/envoyproxy-0.0.1/manifest.yml | 3 +- dev/packages/beats/golang-0.0.1/manifest.yml | 3 +- .../beats/googlecloud-0.0.1/manifest.yml | 3 +- dev/packages/beats/haproxy-0.0.1/manifest.yml | 3 +- dev/packages/beats/ibmmq-0.0.1/manifest.yml | 3 +- dev/packages/beats/icinga-0.0.1/manifest.yml | 3 +- dev/packages/beats/iis-0.0.1/manifest.yml | 3 +- .../beats/iptables-0.0.1/manifest.yml | 3 +- dev/packages/beats/kafka-0.0.1/manifest.yml | 3 +- .../beats/kubernetes-0.0.1/manifest.yml | 3 +- .../beats/logstash-0.0.1/manifest.yml | 3 +- dev/packages/beats/misp-0.0.1/manifest.yml | 3 +- dev/packages/beats/mongodb-0.0.1/manifest.yml | 3 +- dev/packages/beats/mssql-0.0.1/manifest.yml | 3 +- dev/packages/beats/mysql-0.0.1/docs/README.md | 185 ++++++++++++++++-- dev/packages/beats/mysql-0.0.1/manifest.yml | 3 +- dev/packages/beats/nats-0.0.1/manifest.yml | 3 +- dev/packages/beats/netflow-0.0.1/manifest.yml | 3 +- dev/packages/beats/nginx-0.0.1/docs/README.md | 67 ++++--- dev/packages/beats/nginx-0.0.1/manifest.yml | 3 +- dev/packages/beats/o365-0.0.1/manifest.yml | 3 +- dev/packages/beats/okta-0.0.1/manifest.yml | 3 +- dev/packages/beats/oracle-0.0.1/manifest.yml | 3 +- dev/packages/beats/osquery-0.0.1/manifest.yml | 3 +- dev/packages/beats/panw-0.0.1/manifest.yml | 3 +- .../beats/postgresql-0.0.1/manifest.yml | 3 +- .../beats/prometheus-0.0.1/manifest.yml | 3 +- .../beats/rabbitmq-0.0.1/manifest.yml | 3 +- dev/packages/beats/redis-0.0.1/manifest.yml | 3 +- .../beats/redisenterprise-0.0.1/manifest.yml | 3 +- dev/packages/beats/santa-0.0.1/manifest.yml | 3 +- dev/packages/beats/stan-0.0.1/manifest.yml | 3 +- .../beats/suricata-0.0.1/manifest.yml | 3 +- dev/packages/beats/system-0.0.1/manifest.yml | 3 +- dev/packages/beats/tomcat-0.0.1/manifest.yml | 3 +- dev/packages/beats/traefik-0.0.1/manifest.yml | 3 +- dev/packages/beats/uwsgi-0.0.1/manifest.yml | 3 +- dev/packages/beats/vsphere-0.0.1/manifest.yml | 3 +- dev/packages/beats/windows-0.0.1/manifest.yml | 3 +- dev/packages/beats/zeek-0.0.1/manifest.yml | 3 +- .../beats/zookeeper-0.0.1/manifest.yml | 3 +- 60 files changed, 504 insertions(+), 155 deletions(-) diff --git a/dev/import-beats-resources/mysql/docs/README.md b/dev/import-beats-resources/mysql/docs/README.md index ef6f0012b..549f7adc1 100644 --- a/dev/import-beats-resources/mysql/docs/README.md +++ b/dev/import-beats-resources/mysql/docs/README.md @@ -15,22 +15,13 @@ versions >= 5.7.0. It is also tested with MariaDB 10.2, 10.3 and 10.4. The `error` dataset collects the MySQL error logs. -**Exported fields** - -| Field | Description | Type | -|----------------------------- |-------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- |------ | -| nginx.access.remote_ip_list | An array of remote IP addresses. It is a list because it is common to include, besides the client IP address, IP addresses from headers like X-Forwarded-For. Real source IP is restored to source.ip. | ip | - +{{fields "error"}} ### slowlog The `slowlog` dataset collects the MySQL slow logs. -**Exported fields** - -| Field | Description | Type | -|--------------------------- |-------------------------------------------------------------------------------- |------ | -| nginx.error.connection_id | Connection identifier. | ip | +{{fields "slowlog"}} ## Metrics @@ -126,9 +117,7 @@ An example event for `galera_status` looks as following: The fields reported are: -| Field | Description | Type | -|--------------------------- |-------------------------------------------------------------------------------- |--------- | -| nginx.stubstatus.hostname | Nginx hostname. | keyword | +{{fields "galera_status"}} ### status @@ -256,6 +245,4 @@ An example event for `status` looks as following: The fields reported are: -| Field | Description | Type | -|--------------------------- |-------------------------------------------------------------------------------- |--------- | -| nginx.stubstatus.hostname | Nginx hostname. | keyword | +{{fields "status"}} diff --git a/dev/import-beats-resources/nginx/docs/README.md b/dev/import-beats-resources/nginx/docs/README.md index f95a6d6af..2f008de4a 100644 --- a/dev/import-beats-resources/nginx/docs/README.md +++ b/dev/import-beats-resources/nginx/docs/README.md @@ -23,29 +23,13 @@ If logs are originated from systems or applications with a different timezone to Access logs collects the nginx access logs. -**Exported fields** - -| Field | Description | Type | -|----------------------------- |-------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- |------ | -| nginx.access.remote_ip_list | An array of remote IP addresses. It is a list because it is common to include, besides the client IP address, IP addresses from headers like X-Forwarded-For. Real source IP is restored to source.ip. | ip | -| nginx.stubstatus.active | The current number of active client connections including Waiting connections. | long | -| nginx.stubstatus.accepts | The total number of accepted client connections. | long | -| nginx.stubstatus.handled | The total number of handled client connections. | long | -| nginx.stubstatus.dropped | The total number of dropped client connections. | long | +{{fields "access"}} ### Error Logs Error logs collects the nginx error logs. -**Exported fields** - -| Field | Description | Type | -|--------------------------- |-------------------------------------------------------------------------------- |------ | -| nginx.error.connection_id | Connection identifier. | ip | -| nginx.stubstatus.active | The current number of active client connections including Waiting connections. | long | -| nginx.stubstatus.accepts | The total number of accepted client connections. | long | -| nginx.stubstatus.handled | The total number of handled client connections. | long | -| nginx.stubstatus.dropped | The total number of dropped client connections. | long | +{{fields "error"}} ## Metrics @@ -93,12 +77,4 @@ An example event for nginx looks as following: } ``` -The fields reported are: - -| Field | Description | Type | -|--------------------------- |-------------------------------------------------------------------------------- |--------- | -| nginx.stubstatus.hostname | Nginx hostname. | keyword | -| nginx.stubstatus.active | The current number of active client connections including Waiting connections. | long | -| nginx.stubstatus.accepts | The total number of accepted client connections. | long | -| nginx.stubstatus.handled | The total number of handled client connections. | long | -| nginx.stubstatus.dropped | The total number of dropped client connections. | long | +{{fields "stubstatus"}} diff --git a/dev/import-beats/docs.go b/dev/import-beats/docs.go index a17c87b85..693f790ac 100644 --- a/dev/import-beats/docs.go +++ b/dev/import-beats/docs.go @@ -5,38 +5,160 @@ package main import ( + "fmt" + "github.com/pkg/errors" + "gopkg.in/yaml.v2" "os" "path/filepath" + "sort" + "strings" "text/template" - - "github.com/pkg/errors" ) var emptyReadmeTemplate = template.Must(template.New("README.md").Parse("TODO")) +type fieldsTableRecord struct { + name string + description string + aType string +} + type docContent struct { fileName string - body *template.Template + templatePath string } func createDocTemplates(packageDocsPath string) ([]docContent, error) { - readmeTemplate, err := createReadmeTemplate(filepath.Join(packageDocsPath, "README.md")) - if err != nil { - return nil, errors.Wrapf(err, "creating README template failed") + readmePath := filepath.Join(packageDocsPath, "README.md") + _, err := os.Stat(readmePath) + if err != nil && !os.IsNotExist(err) { + return nil, errors.Wrapf(err, "reading README template failed") + } + if os.IsNotExist(err) { + readmePath = "" } return []docContent{ - {fileName: "README.md", body: readmeTemplate}, + {fileName: "README.md", templatePath: readmePath}, }, nil } -func createReadmeTemplate(readmePath string) (*template.Template, error) { - t := template.New("README.md") - t, err := t.ParseFiles(readmePath) - if os.IsNotExist(err) { - return emptyReadmeTemplate, nil +func renderExportedFields(packageDataset string, datasets datasetContentArray) (string, error) { + for _, dataset := range datasets { + if packageDataset == dataset.name { + var buffer strings.Builder + buffer.WriteString("**Exported fields**") + buffer.WriteString("\n\n") + + if len(dataset.fields.files) == 0 { + buffer.WriteString("(no fields available)") + } else { + collected, err := collectFields(dataset.fields) + if err != nil { + return "", errors.Wrapf(err, "collecting fields failed") + } + + buffer.WriteString("| Field | Description | Type |\n") + buffer.WriteString("|---|---|---|\n") + for _, c := range collected { + buffer.WriteString(fmt.Sprintf("| %s | %s | %s |\n", c.name, c.description, c.aType)) + } + } + return buffer.String(), nil + } + } + return "", fmt.Errorf("missing dataset: %s", packageDataset) +} + +func collectFields(content fieldsContent) ([]fieldsTableRecord, error) { + var records []fieldsTableRecord + for _, fieldsFile := range content.files { + var fs []mapStr + err := yaml.Unmarshal(fieldsFile, &fs) + if err != nil { + return nil, errors.Wrapf(err, "unmarshalling fields file failed") + } + + for _, f := range fs { + records, err = visitFields("", f, records) + if err != nil { + return nil, errors.Wrapf(err, "visiting fields failed") + } + } } + + sort.Slice(records, func(i, j int) bool { + return sort.StringsAreSorted([]string{records[i].name, records[j].name}) + }) + return records, nil +} + +func visitFields(namePrefix string, f mapStr, records []fieldsTableRecord) ([]fieldsTableRecord, error) { + nameVal, err := f.getValue("name") if err != nil { - return nil, errors.Wrapf(err, "parsing template failed (path: %s)", readmePath) + return nil, errors.Wrapf(err, "retrieving field 'name' failed") + } + name := nameVal.(string) + + fieldsVal, err := f.getValue("fields") + if err == errKeyNotFound { + // name + name = namePrefix + name + + // description + var description string + descriptionVal, err := f.getValue("description") + if err != nil && err != errKeyNotFound { + return nil, errors.Wrapf(err, "retrieving field 'description' failed (namePrefix: %s)", namePrefix) + } + if err != errKeyNotFound { + description = descriptionVal.(string) + description = strings.TrimSpace(strings.ReplaceAll(description, "\n", " ")) + } + + // type + aType := "keyword" // default "type" iif there is no type defined + typeVal, err := f.getValue("type") + if err != nil && err != errKeyNotFound { + return nil, errors.Wrapf(err, "retrieving field 'type' failed (namePrefix: %s)", namePrefix) + } + if err != errKeyNotFound { + aType = typeVal.(string) + } + + if description == "" && aType == "alias" { + pathVal, err := f.getValue("path") + if err != nil { + return nil, errors.Wrapf(err, "retrieving field 'path' failed") + } + path := pathVal.(string) + description = fmt.Sprintf(`Alias for field "%s"`, path) + } + + records = append(records, fieldsTableRecord{ + name: name, + description: description, + aType: aType, + }) + return records, nil + } + if err != nil { + return nil, errors.Wrapf(err, "retrieving field 'fields' failed (namePrefix: %s)", namePrefix) + } + + if _, ok := fieldsVal.([]interface{}); !ok { + return records, nil + } + + for _, fieldsEntryVal := range fieldsVal.([]interface{}) { + fieldsEntry, err := toMapStr(fieldsEntryVal) + if err != nil { + return nil, errors.Wrapf(err, "mapping fields entry failed (namePrefix: %s)", namePrefix) + } + + records, err = visitFields(namePrefix + name + ".", fieldsEntry, records) + if err != nil { + return nil, errors.Wrapf(err, "recursive visiting fields failed (namePrefix: %s)", namePrefix) + } } - return t, nil + return records, nil } diff --git a/dev/import-beats/packages.go b/dev/import-beats/packages.go index ba8cda39c..85e01e249 100644 --- a/dev/import-beats/packages.go +++ b/dev/import-beats/packages.go @@ -13,6 +13,7 @@ import ( "path" "path/filepath" "strings" + "text/template" "github.com/pkg/errors" "gopkg.in/yaml.v2" @@ -357,23 +358,48 @@ func (r *packageRepository) save(outputDir string) error { } for _, doc := range content.docs { - log.Printf("\twrite '%s' file\n", doc.fileName) - - docFilePath := filepath.Join(docsPath, doc.fileName) - f, err := os.OpenFile(docFilePath, os.O_RDWR|os.O_CREATE|os.O_TRUNC, 0644) - if err != nil { - return errors.Wrapf(err, "opening doc file failed (path: %s)", docFilePath) - } - err = doc.body.Execute(f, nil) + err = writeDoc(docsPath, doc, content) if err != nil { - return errors.Wrapf(err, "rendering doc file failed (path: %s)", docFilePath) + return errors.Wrapf(err, "cannot write docs (docsPath: %s, fileName: %s)", docsPath, + doc.fileName) } + } } } return nil } +func writeDoc(docsPath string, doc docContent, aPackage packageContent) error { + log.Printf("\twrite '%s' file\n", doc.fileName) + + docFilePath := filepath.Join(docsPath, doc.fileName) + f, err := os.OpenFile(docFilePath, os.O_RDWR|os.O_CREATE|os.O_TRUNC, 0644) + defer f.Close() + + if err != nil { + return errors.Wrapf(err, "opening doc file failed (path: %s)", docFilePath) + } + t := template.New(doc.fileName) + if doc.templatePath == "" { + t = template.Must(t.Parse("TODO")) + } else { + t, err = t.Funcs(template.FuncMap{ + "fields": func(dataset string) (string, error) { + return renderExportedFields(dataset, aPackage.datasets) + }, + }).ParseFiles(doc.templatePath) + if err != nil { + return errors.Wrapf(err, "parsing doc template failed (path: %s)", doc.templatePath) + } + } + err = t.Execute(f, nil) + if err != nil { + return errors.Wrapf(err, "rendering doc file failed (path: %s)", docFilePath) + } + return nil +} + func copyFile(src, dstDir string) error { i := strings.LastIndex(src, "/") sourceFileName := src[i:] diff --git a/dev/packages/beats/activemq-0.0.1/manifest.yml b/dev/packages/beats/activemq-0.0.1/manifest.yml index 0dacc7a2a..ba171bb4a 100644 --- a/dev/packages/beats/activemq-0.0.1/manifest.yml +++ b/dev/packages/beats/activemq-0.0.1/manifest.yml @@ -10,7 +10,8 @@ categories: - metrics release: ga requirement: - kibana: {} + kibana: + versions: '>=7.4.0 <8.0.0' elasticsearch: versions: '>7.0.1' screenshots: diff --git a/dev/packages/beats/aerospike-0.0.1/manifest.yml b/dev/packages/beats/aerospike-0.0.1/manifest.yml index 23936ce5b..3ab883ed5 100644 --- a/dev/packages/beats/aerospike-0.0.1/manifest.yml +++ b/dev/packages/beats/aerospike-0.0.1/manifest.yml @@ -9,7 +9,8 @@ categories: - metrics release: ga requirement: - kibana: {} + kibana: + versions: '>=7.3.0 <8.0.0' elasticsearch: {} screenshots: - src: /img/metricbeat-aerospike-overview.png diff --git a/dev/packages/beats/apache-0.0.1/manifest.yml b/dev/packages/beats/apache-0.0.1/manifest.yml index 1e6f8c4b2..fb7400ca7 100644 --- a/dev/packages/beats/apache-0.0.1/manifest.yml +++ b/dev/packages/beats/apache-0.0.1/manifest.yml @@ -10,7 +10,8 @@ categories: - metrics release: ga requirement: - kibana: {} + kibana: + versions: '>=7.3.0 <8.0.0' elasticsearch: versions: '>7.0.1' screenshots: diff --git a/dev/packages/beats/auditd-0.0.1/manifest.yml b/dev/packages/beats/auditd-0.0.1/manifest.yml index aa533cd50..c42ba4bde 100644 --- a/dev/packages/beats/auditd-0.0.1/manifest.yml +++ b/dev/packages/beats/auditd-0.0.1/manifest.yml @@ -9,7 +9,8 @@ categories: - logs release: ga requirement: - kibana: {} + kibana: + versions: '>=7.3.0 <8.0.0' elasticsearch: versions: '>7.0.1' screenshots: diff --git a/dev/packages/beats/aws-0.0.1/manifest.yml b/dev/packages/beats/aws-0.0.1/manifest.yml index c64514b4d..015a99008 100644 --- a/dev/packages/beats/aws-0.0.1/manifest.yml +++ b/dev/packages/beats/aws-0.0.1/manifest.yml @@ -10,7 +10,8 @@ categories: - metrics release: ga requirement: - kibana: {} + kibana: + versions: '>=7.6.1 <8.0.0' elasticsearch: versions: '>7.0.1' screenshots: diff --git a/dev/packages/beats/azure-0.0.1/manifest.yml b/dev/packages/beats/azure-0.0.1/manifest.yml index f71adc5e4..afe3fcc11 100644 --- a/dev/packages/beats/azure-0.0.1/manifest.yml +++ b/dev/packages/beats/azure-0.0.1/manifest.yml @@ -10,7 +10,8 @@ categories: - metrics release: beta requirement: - kibana: {} + kibana: + versions: '>=7.6.0 <8.0.0' elasticsearch: versions: '>7.0.1' screenshots: diff --git a/dev/packages/beats/cef-0.0.1/manifest.yml b/dev/packages/beats/cef-0.0.1/manifest.yml index ade850200..d22c20886 100644 --- a/dev/packages/beats/cef-0.0.1/manifest.yml +++ b/dev/packages/beats/cef-0.0.1/manifest.yml @@ -9,7 +9,8 @@ categories: - logs release: ga requirement: - kibana: {} + kibana: + versions: '>=7.3.0 <8.0.0' elasticsearch: versions: '>7.0.1' datasources: diff --git a/dev/packages/beats/ceph-0.0.1/manifest.yml b/dev/packages/beats/ceph-0.0.1/manifest.yml index 3936d7fa5..18c4d73a2 100644 --- a/dev/packages/beats/ceph-0.0.1/manifest.yml +++ b/dev/packages/beats/ceph-0.0.1/manifest.yml @@ -9,7 +9,8 @@ categories: - metrics release: ga requirement: - kibana: {} + kibana: + versions: '>=7.3.0 <8.0.0' elasticsearch: {} screenshots: - src: /img/ceph-overview-dashboard.png diff --git a/dev/packages/beats/cisco-0.0.1/manifest.yml b/dev/packages/beats/cisco-0.0.1/manifest.yml index 6757afa2c..cd3c60161 100644 --- a/dev/packages/beats/cisco-0.0.1/manifest.yml +++ b/dev/packages/beats/cisco-0.0.1/manifest.yml @@ -9,7 +9,8 @@ categories: - logs release: ga requirement: - kibana: {} + kibana: + versions: '>=7.0.0-SNAPSHOT <8.0.0' elasticsearch: versions: '>7.0.1' screenshots: diff --git a/dev/packages/beats/cockroachdb-0.0.1/manifest.yml b/dev/packages/beats/cockroachdb-0.0.1/manifest.yml index f84b0c392..c3d3ebc6d 100644 --- a/dev/packages/beats/cockroachdb-0.0.1/manifest.yml +++ b/dev/packages/beats/cockroachdb-0.0.1/manifest.yml @@ -9,7 +9,8 @@ categories: - metrics release: beta requirement: - kibana: {} + kibana: + versions: '>=7.3.0 <8.0.0' elasticsearch: {} screenshots: - src: /img/metricbeat-cockroachdb-overview.png diff --git a/dev/packages/beats/consul-0.0.1/manifest.yml b/dev/packages/beats/consul-0.0.1/manifest.yml index ec71ca92a..58daf11fc 100644 --- a/dev/packages/beats/consul-0.0.1/manifest.yml +++ b/dev/packages/beats/consul-0.0.1/manifest.yml @@ -9,7 +9,8 @@ categories: - metrics release: beta requirement: - kibana: {} + kibana: + versions: '>=7.0.0-SNAPSHOT <8.0.0' elasticsearch: {} screenshots: - src: /img/metricbeat-consul.png diff --git a/dev/packages/beats/coredns-0.0.1/manifest.yml b/dev/packages/beats/coredns-0.0.1/manifest.yml index c8d322fb4..f2abc5f61 100644 --- a/dev/packages/beats/coredns-0.0.1/manifest.yml +++ b/dev/packages/beats/coredns-0.0.1/manifest.yml @@ -10,7 +10,8 @@ categories: - metrics release: ga requirement: - kibana: {} + kibana: + versions: '>=8.0.0-SNAPSHOT <8.0.0' elasticsearch: {} screenshots: - src: /img/kibana-coredns.jpg diff --git a/dev/packages/beats/couchbase-0.0.1/manifest.yml b/dev/packages/beats/couchbase-0.0.1/manifest.yml index 38af1f204..917b432f7 100644 --- a/dev/packages/beats/couchbase-0.0.1/manifest.yml +++ b/dev/packages/beats/couchbase-0.0.1/manifest.yml @@ -9,7 +9,8 @@ categories: - metrics release: ga requirement: - kibana: {} + kibana: + versions: '>=7.3.0 <8.0.0' elasticsearch: {} screenshots: - src: /img/metricbeat-couchbase-overview.png diff --git a/dev/packages/beats/couchdb-0.0.1/manifest.yml b/dev/packages/beats/couchdb-0.0.1/manifest.yml index 9ccf867f8..418328f89 100644 --- a/dev/packages/beats/couchdb-0.0.1/manifest.yml +++ b/dev/packages/beats/couchdb-0.0.1/manifest.yml @@ -9,7 +9,8 @@ categories: - metrics release: ga requirement: - kibana: {} + kibana: + versions: '>=7.3.0 <8.0.0' elasticsearch: {} screenshots: - src: /img/metricbeat-couchdb-overview.png diff --git a/dev/packages/beats/docker-0.0.1/manifest.yml b/dev/packages/beats/docker-0.0.1/manifest.yml index 947f4c95a..39db97bff 100644 --- a/dev/packages/beats/docker-0.0.1/manifest.yml +++ b/dev/packages/beats/docker-0.0.1/manifest.yml @@ -9,7 +9,8 @@ categories: - metrics release: ga requirement: - kibana: {} + kibana: + versions: '>=7.3.0 <8.0.0' elasticsearch: {} icons: - src: /img/logo_docker.svg diff --git a/dev/packages/beats/envoyproxy-0.0.1/manifest.yml b/dev/packages/beats/envoyproxy-0.0.1/manifest.yml index 4851a393d..0fc007345 100644 --- a/dev/packages/beats/envoyproxy-0.0.1/manifest.yml +++ b/dev/packages/beats/envoyproxy-0.0.1/manifest.yml @@ -10,7 +10,8 @@ categories: - metrics release: ga requirement: - kibana: {} + kibana: + versions: '>=8.0.0-SNAPSHOT <8.0.0' elasticsearch: {} screenshots: - src: /img/kibana-envoyproxy.jpg diff --git a/dev/packages/beats/golang-0.0.1/manifest.yml b/dev/packages/beats/golang-0.0.1/manifest.yml index 2936d1fdc..95a051b68 100644 --- a/dev/packages/beats/golang-0.0.1/manifest.yml +++ b/dev/packages/beats/golang-0.0.1/manifest.yml @@ -9,7 +9,8 @@ categories: - metrics release: ga requirement: - kibana: {} + kibana: + versions: '>=7.3.0 <8.0.0' elasticsearch: {} icons: - src: /img/logo_golang.svg diff --git a/dev/packages/beats/googlecloud-0.0.1/manifest.yml b/dev/packages/beats/googlecloud-0.0.1/manifest.yml index f0cc05f21..31dd15ff0 100644 --- a/dev/packages/beats/googlecloud-0.0.1/manifest.yml +++ b/dev/packages/beats/googlecloud-0.0.1/manifest.yml @@ -10,7 +10,8 @@ categories: - metrics release: ga requirement: - kibana: {} + kibana: + versions: '>=7.6.1 <8.0.0' elasticsearch: versions: '>7.0.1' screenshots: diff --git a/dev/packages/beats/haproxy-0.0.1/manifest.yml b/dev/packages/beats/haproxy-0.0.1/manifest.yml index 6f68fcaed..734f8b580 100644 --- a/dev/packages/beats/haproxy-0.0.1/manifest.yml +++ b/dev/packages/beats/haproxy-0.0.1/manifest.yml @@ -10,7 +10,8 @@ categories: - metrics release: ga requirement: - kibana: {} + kibana: + versions: '>=7.3.0 <8.0.0' elasticsearch: versions: '>7.0.1' screenshots: diff --git a/dev/packages/beats/ibmmq-0.0.1/manifest.yml b/dev/packages/beats/ibmmq-0.0.1/manifest.yml index 63aa16d54..9a9c35e94 100644 --- a/dev/packages/beats/ibmmq-0.0.1/manifest.yml +++ b/dev/packages/beats/ibmmq-0.0.1/manifest.yml @@ -10,7 +10,8 @@ categories: - metrics release: ga requirement: - kibana: {} + kibana: + versions: '>=7.4.0 <8.0.0' elasticsearch: versions: '>7.0.1' screenshots: diff --git a/dev/packages/beats/icinga-0.0.1/manifest.yml b/dev/packages/beats/icinga-0.0.1/manifest.yml index 24416ef5a..ff1bcb553 100644 --- a/dev/packages/beats/icinga-0.0.1/manifest.yml +++ b/dev/packages/beats/icinga-0.0.1/manifest.yml @@ -9,7 +9,8 @@ categories: - logs release: ga requirement: - kibana: {} + kibana: + versions: '>=7.3.0 <8.0.0' elasticsearch: versions: '>7.0.1' screenshots: diff --git a/dev/packages/beats/iis-0.0.1/manifest.yml b/dev/packages/beats/iis-0.0.1/manifest.yml index 18560d22c..27147bbd9 100644 --- a/dev/packages/beats/iis-0.0.1/manifest.yml +++ b/dev/packages/beats/iis-0.0.1/manifest.yml @@ -10,7 +10,8 @@ categories: - metrics release: ga requirement: - kibana: {} + kibana: + versions: '>=7.3.0 <8.0.0' elasticsearch: versions: '>7.0.1' screenshots: diff --git a/dev/packages/beats/iptables-0.0.1/manifest.yml b/dev/packages/beats/iptables-0.0.1/manifest.yml index 8b57b8a9a..fb61ca555 100644 --- a/dev/packages/beats/iptables-0.0.1/manifest.yml +++ b/dev/packages/beats/iptables-0.0.1/manifest.yml @@ -9,7 +9,8 @@ categories: - logs release: ga requirement: - kibana: {} + kibana: + versions: '>=7.3.0 <8.0.0' elasticsearch: versions: '>7.0.1' screenshots: diff --git a/dev/packages/beats/kafka-0.0.1/manifest.yml b/dev/packages/beats/kafka-0.0.1/manifest.yml index 71e5e22f4..53a378d92 100644 --- a/dev/packages/beats/kafka-0.0.1/manifest.yml +++ b/dev/packages/beats/kafka-0.0.1/manifest.yml @@ -10,7 +10,8 @@ categories: - metrics release: ga requirement: - kibana: {} + kibana: + versions: '>=7.3.0 <8.0.0' elasticsearch: versions: '>7.0.1' screenshots: diff --git a/dev/packages/beats/kubernetes-0.0.1/manifest.yml b/dev/packages/beats/kubernetes-0.0.1/manifest.yml index 7b8ca2d37..5d54e8250 100644 --- a/dev/packages/beats/kubernetes-0.0.1/manifest.yml +++ b/dev/packages/beats/kubernetes-0.0.1/manifest.yml @@ -9,7 +9,8 @@ categories: - metrics release: ga requirement: - kibana: {} + kibana: + versions: '>=7.3.0 <8.0.0' elasticsearch: {} screenshots: - src: /img/metricbeat-kubernetes-controllermanager.png diff --git a/dev/packages/beats/logstash-0.0.1/manifest.yml b/dev/packages/beats/logstash-0.0.1/manifest.yml index f595838bd..a8dda03c8 100644 --- a/dev/packages/beats/logstash-0.0.1/manifest.yml +++ b/dev/packages/beats/logstash-0.0.1/manifest.yml @@ -10,7 +10,8 @@ categories: - metrics release: ga requirement: - kibana: {} + kibana: + versions: '>=7.3.0 <8.0.0' elasticsearch: versions: '>7.0.1' screenshots: diff --git a/dev/packages/beats/misp-0.0.1/manifest.yml b/dev/packages/beats/misp-0.0.1/manifest.yml index 9f0a761a2..b3b2b2448 100644 --- a/dev/packages/beats/misp-0.0.1/manifest.yml +++ b/dev/packages/beats/misp-0.0.1/manifest.yml @@ -9,7 +9,8 @@ categories: - logs release: ga requirement: - kibana: {} + kibana: + versions: '>=8.0.0-SNAPSHOT <8.0.0' elasticsearch: versions: '>7.0.1' screenshots: diff --git a/dev/packages/beats/mongodb-0.0.1/manifest.yml b/dev/packages/beats/mongodb-0.0.1/manifest.yml index fcf242d1b..b4f90a182 100644 --- a/dev/packages/beats/mongodb-0.0.1/manifest.yml +++ b/dev/packages/beats/mongodb-0.0.1/manifest.yml @@ -10,7 +10,8 @@ categories: - metrics release: ga requirement: - kibana: {} + kibana: + versions: '>=7.3.0 <8.0.0' elasticsearch: versions: '>7.0.1' screenshots: diff --git a/dev/packages/beats/mssql-0.0.1/manifest.yml b/dev/packages/beats/mssql-0.0.1/manifest.yml index 09bfa6dda..7f4fecfa2 100644 --- a/dev/packages/beats/mssql-0.0.1/manifest.yml +++ b/dev/packages/beats/mssql-0.0.1/manifest.yml @@ -10,7 +10,8 @@ categories: - metrics release: ga requirement: - kibana: {} + kibana: + versions: '>=7.0.0-alpha2 <8.0.0' elasticsearch: versions: '>7.0.1' datasources: diff --git a/dev/packages/beats/mysql-0.0.1/docs/README.md b/dev/packages/beats/mysql-0.0.1/docs/README.md index ef6f0012b..029efb7f6 100644 --- a/dev/packages/beats/mysql-0.0.1/docs/README.md +++ b/dev/packages/beats/mysql-0.0.1/docs/README.md @@ -17,9 +17,12 @@ The `error` dataset collects the MySQL error logs. **Exported fields** -| Field | Description | Type | -|----------------------------- |-------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- |------ | -| nginx.access.remote_ip_list | An array of remote IP addresses. It is a list because it is common to include, besides the client IP address, IP addresses from headers like X-Forwarded-For. Real source IP is restored to source.ip. | ip | +| Field | Description | Type | +|---|---|---| +| mysql.error.level | Alias for field "log.level" | alias | +| mysql.error.message | Alias for field "message" | alias | +| mysql.error.thread_id | Alias for field "mysql.thread_id" | alias | +| mysql.thread_id | The connection or thread ID for the query. | long | ### slowlog @@ -28,9 +31,57 @@ The `slowlog` dataset collects the MySQL slow logs. **Exported fields** -| Field | Description | Type | -|--------------------------- |-------------------------------------------------------------------------------- |------ | -| nginx.error.connection_id | Connection identifier. | ip | +| Field | Description | Type | +|---|---|---| +| mysql.slowlog.bytes_received | The number of bytes received from client. | long | +| mysql.slowlog.bytes_sent | The number of bytes sent to client. | long | +| mysql.slowlog.current_user | Current authenticated user, used to determine access privileges. Can differ from the value for user. | keyword | +| mysql.slowlog.filesort | Whether filesort optimization was used. | boolean | +| mysql.slowlog.filesort_on_disk | Whether filesort optimization was used and it needed temporary tables on disk. | boolean | +| mysql.slowlog.full_join | Whether a full join was needed for the slow query (no indexes were used for joins). | boolean | +| mysql.slowlog.full_scan | Whether a full table scan was needed for the slow query. | boolean | +| mysql.slowlog.host | Alias for field "source.domain" | alias | +| mysql.slowlog.id | Alias for field "mysql.thread_id" | alias | +| mysql.slowlog.innodb.io_r_bytes | Bytes read during page read operations. | long | +| mysql.slowlog.innodb.io_r_ops | Number of page read operations. | long | +| mysql.slowlog.innodb.io_r_wait.sec | How long it took to read all needed data from storage. | long | +| mysql.slowlog.innodb.pages_distinct | Approximated count of pages accessed to execute the query. | long | +| mysql.slowlog.innodb.queue_wait.sec | How long the query waited to enter the InnoDB queue and to be executed once in the queue. | long | +| mysql.slowlog.innodb.rec_lock_wait.sec | How long the query waited for locks. | long | +| mysql.slowlog.innodb.trx_id | Transaction ID | keyword | +| mysql.slowlog.ip | Alias for field "source.ip" | alias | +| mysql.slowlog.killed | Code of the reason if the query was killed. | keyword | +| mysql.slowlog.last_errno | Last SQL error seen. | keyword | +| mysql.slowlog.lock_time.sec | The amount of time the query waited for the lock to be available. The value is in seconds, as a floating point number. | float | +| mysql.slowlog.log_slow_rate_limit | Slow log rate limit, a value of 100 means that one in a hundred queries or sessions are being logged. | keyword | +| mysql.slowlog.log_slow_rate_type | Type of slow log rate limit, it can be `session` if the rate limit is applied per session, or `query` if it applies per query. | keyword | +| mysql.slowlog.merge_passes | Number of merge passes executed for the query. | long | +| mysql.slowlog.priority_queue | Whether a priority queue was used for filesort. | boolean | +| mysql.slowlog.query | The slow query. | keyword | +| mysql.slowlog.query_cache_hit | Whether the query cache was hit. | boolean | +| mysql.slowlog.read_first | The number of times the first entry in an index was read. | long | +| mysql.slowlog.read_key | The number of requests to read a row based on a key. | long | +| mysql.slowlog.read_last | The number of times the last key in an index was read. | long | +| mysql.slowlog.read_next | The number of requests to read the next row in key order. | long | +| mysql.slowlog.read_prev | The number of requests to read the previous row in key order. | long | +| mysql.slowlog.read_rnd | The number of requests to read a row based on a fixed position. | long | +| mysql.slowlog.read_rnd_next | The number of requests to read the next row in the data file. | long | +| mysql.slowlog.rows_affected | The number of rows modified by the query. | long | +| mysql.slowlog.rows_examined | The number of rows scanned by the query. | long | +| mysql.slowlog.rows_sent | The number of rows returned by the query. | long | +| mysql.slowlog.schema | The schema where the slow query was executed. | keyword | +| mysql.slowlog.sort_merge_passes | Number of merge passes that the sort algorithm has had to do. | long | +| mysql.slowlog.sort_range_count | Number of sorts that were done using ranges. | long | +| mysql.slowlog.sort_rows | Number of sorted rows. | long | +| mysql.slowlog.sort_scan_count | Number of sorts that were done by scanning the table. | long | +| mysql.slowlog.tmp_disk_tables | Number of temporary tables created on disk for this query. | long | +| mysql.slowlog.tmp_table | Whether a temporary table was used to resolve the query. | boolean | +| mysql.slowlog.tmp_table_on_disk | Whether the query needed temporary tables on disk. | boolean | +| mysql.slowlog.tmp_table_sizes | Size of temporary tables created for this query. | long | +| mysql.slowlog.tmp_tables | Number of temporary tables created for this query | long | +| mysql.slowlog.user | Alias for field "user.name" | alias | +| mysql.thread_id | The connection or thread ID for the query. | long | + ## Metrics @@ -126,9 +177,52 @@ An example event for `galera_status` looks as following: The fields reported are: -| Field | Description | Type | -|--------------------------- |-------------------------------------------------------------------------------- |--------- | -| nginx.stubstatus.hostname | Nginx hostname. | keyword | +**Exported fields** + +| Field | Description | Type | +|---|---|---| +| mysql.galera_status.apply.oooe | How often applier started write-set applying out-of-order (parallelization efficiency). | double | +| mysql.galera_status.apply.oool | How often write-set was so slow to apply that write-set with higher seqno's were applied earlier. Values closer to 0 refer to a greater gap between slow and fast write-sets. | double | +| mysql.galera_status.apply.window | Average distance between highest and lowest concurrently applied seqno. | double | +| mysql.galera_status.cert.deps_distance | Average distance between highest and lowest seqno value that can be possibly applied in parallel (potential degree of parallelization). | double | +| mysql.galera_status.cert.index_size | The number of entries in the certification index. | long | +| mysql.galera_status.cert.interval | Average number of transactions received while a transaction replicates. | double | +| mysql.galera_status.cluster.conf_id | Total number of cluster membership changes happened. | long | +| mysql.galera_status.cluster.size | Current number of members in the cluster. | long | +| mysql.galera_status.cluster.status | Status of this cluster component. That is, whether the node is part of a PRIMARY or NON_PRIMARY component. | keyword | +| mysql.galera_status.commit.oooe | How often a transaction was committed out of order. | double | +| mysql.galera_status.commit.window | Average distance between highest and lowest concurrently committed seqno. | long | +| mysql.galera_status.connected | If the value is OFF, the node has not yet connected to any of the cluster components. This may be due to misconfiguration. Check the error log for proper diagnostics. | keyword | +| mysql.galera_status.evs.evict | Lists the UUID's of all nodes evicted from the cluster. Evicted nodes cannot rejoin the cluster until you restart their mysqld processes. | keyword | +| mysql.galera_status.evs.state | Shows the internal state of the EVS Protocol. | keyword | +| mysql.galera_status.flow_ctl.paused | The fraction of time since the last FLUSH STATUS command that replication was paused due to flow control. In other words, how much the slave lag is slowing down the cluster. | double | +| mysql.galera_status.flow_ctl.paused_ns | The total time spent in a paused state measured in nanoseconds. | long | +| mysql.galera_status.flow_ctl.recv | Returns the number of FC_PAUSE events the node has received, including those the node has sent. Unlike most status variables, the counter for this one does not reset every time you run the query. | long | +| mysql.galera_status.flow_ctl.sent | Returns the number of FC_PAUSE events the node has sent. Unlike most status variables, the counter for this one does not reset every time you run the query. | long | +| mysql.galera_status.last_committed | The sequence number, or seqno, of the last committed transaction. | long | +| mysql.galera_status.local.bf_aborts | Total number of local transactions that were aborted by slave transactions while in execution. | long | +| mysql.galera_status.local.cert_failures | Total number of local transactions that failed certification test. | long | +| mysql.galera_status.local.commits | Total number of local transactions committed. | long | +| mysql.galera_status.local.recv.queue | Current (instantaneous) length of the recv queue. | long | +| mysql.galera_status.local.recv.queue_avg | Recv queue length averaged over interval since the last FLUSH STATUS command. Values considerably larger than 0.0 mean that the node cannot apply write-sets as fast as they are received and will generate a lot of replication throttling. | double | +| mysql.galera_status.local.recv.queue_max | The maximum length of the recv queue since the last FLUSH STATUS command. | long | +| mysql.galera_status.local.recv.queue_min | The minimum length of the recv queue since the last FLUSH STATUS command. | long | +| mysql.galera_status.local.replays | Total number of transaction replays due to asymmetric lock granularity. | long | +| mysql.galera_status.local.send.queue | Current (instantaneous) length of the send queue. | long | +| mysql.galera_status.local.send.queue_avg | Send queue length averaged over time since the last FLUSH STATUS command. Values considerably larger than 0.0 indicate replication throttling or network throughput issue. | double | +| mysql.galera_status.local.send.queue_max | The maximum length of the send queue since the last FLUSH STATUS command. | long | +| mysql.galera_status.local.send.queue_min | The minimum length of the send queue since the last FLUSH STATUS command. | long | +| mysql.galera_status.local.state | Internal Galera Cluster FSM state number. | keyword | +| mysql.galera_status.ready | Whether the server is ready to accept queries. | keyword | +| mysql.galera_status.received.bytes | Total size of write-sets received from other nodes. | long | +| mysql.galera_status.received.count | Total number of write-sets received from other nodes. | long | +| mysql.galera_status.repl.bytes | Total size of write-sets replicated. | long | +| mysql.galera_status.repl.count | Total number of write-sets replicated (sent to other nodes). | long | +| mysql.galera_status.repl.data_bytes | Total size of data replicated. | long | +| mysql.galera_status.repl.keys | Total number of keys replicated. | long | +| mysql.galera_status.repl.keys_bytes | Total size of keys replicated. | long | +| mysql.galera_status.repl.other_bytes | Total size of other bits replicated. | long | + ### status @@ -256,6 +350,73 @@ An example event for `status` looks as following: The fields reported are: -| Field | Description | Type | -|--------------------------- |-------------------------------------------------------------------------------- |--------- | -| nginx.stubstatus.hostname | Nginx hostname. | keyword | +**Exported fields** + +| Field | Description | Type | +|---|---|---| +| mysql.status.aborted.clients | The number of connections that were aborted because the client died without closing the connection properly. | long | +| mysql.status.aborted.connects | The number of failed attempts to connect to the MySQL server. | long | +| mysql.status.binlog.cache.disk_use | | long | +| mysql.status.binlog.cache.use | | long | +| mysql.status.bytes.received | The number of bytes received from all clients. | long | +| mysql.status.bytes.sent | The number of bytes sent to all clients. | long | +| mysql.status.command.delete | The number of DELETE queries since startup. | long | +| mysql.status.command.insert | The number of INSERT queries since startup. | long | +| mysql.status.command.select | The number of SELECT queries since startup. | long | +| mysql.status.command.update | The number of UPDATE queries since startup. | long | +| mysql.status.connections | | long | +| mysql.status.created.tmp.disk_tables | | long | +| mysql.status.created.tmp.files | | long | +| mysql.status.created.tmp.tables | | long | +| mysql.status.delayed.errors | | long | +| mysql.status.delayed.insert_threads | | long | +| mysql.status.delayed.writes | | long | +| mysql.status.flush_commands | | long | +| mysql.status.handler.commit | The number of internal COMMIT statements. | long | +| mysql.status.handler.delete | The number of times that rows have been deleted from tables. | long | +| mysql.status.handler.external_lock | The server increments this variable for each call to its external_lock() function, which generally occurs at the beginning and end of access to a table instance. | long | +| mysql.status.handler.mrr_init | The number of times the server uses a storage engine's own Multi-Range Read implementation for table access. | long | +| mysql.status.handler.prepare | A counter for the prepare phase of two-phase commit operations. | long | +| mysql.status.handler.read.first | The number of times the first entry in an index was read. | long | +| mysql.status.handler.read.key | The number of requests to read a row based on a key. | long | +| mysql.status.handler.read.last | The number of requests to read the last key in an index. | long | +| mysql.status.handler.read.next | The number of requests to read the next row in key order. | long | +| mysql.status.handler.read.prev | The number of requests to read the previous row in key order. | long | +| mysql.status.handler.read.rnd | The number of requests to read a row based on a fixed position. | long | +| mysql.status.handler.read.rnd_next | The number of requests to read the next row in the data file. | long | +| mysql.status.handler.rollback | The number of requests for a storage engine to perform a rollback operation. | long | +| mysql.status.handler.savepoint | The number of requests for a storage engine to place a savepoint. | long | +| mysql.status.handler.savepoint_rollback | The number of requests for a storage engine to roll back to a savepoint. | long | +| mysql.status.handler.update | The number of requests to update a row in a table. | long | +| mysql.status.handler.write | The number of requests to insert a row in a table. | long | +| mysql.status.innodb.buffer_pool.bytes.data | The total number of bytes in the InnoDB buffer pool containing data. | long | +| mysql.status.innodb.buffer_pool.bytes.dirty | The total current number of bytes held in dirty pages in the InnoDB buffer pool. | long | +| mysql.status.innodb.buffer_pool.dump_status | The progress of an operation to record the pages held in the InnoDB buffer pool, triggered by the setting of innodb_buffer_pool_dump_at_shutdown or innodb_buffer_pool_dump_now. | long | +| mysql.status.innodb.buffer_pool.load_status | The progress of an operation to warm up the InnoDB buffer pool by reading in a set of pages corresponding to an earlier point in time, triggered by the setting of innodb_buffer_pool_load_at_startup or innodb_buffer_pool_load_now. | long | +| mysql.status.innodb.buffer_pool.pages.data | he number of pages in the InnoDB buffer pool containing data. | long | +| mysql.status.innodb.buffer_pool.pages.dirty | The current number of dirty pages in the InnoDB buffer pool. | long | +| mysql.status.innodb.buffer_pool.pages.flushed | The number of requests to flush pages from the InnoDB buffer pool. | long | +| mysql.status.innodb.buffer_pool.pages.free | The number of free pages in the InnoDB buffer pool. | long | +| mysql.status.innodb.buffer_pool.pages.latched | The number of latched pages in the InnoDB buffer pool. | long | +| mysql.status.innodb.buffer_pool.pages.misc | The number of pages in the InnoDB buffer pool that are busy because they have been allocated for administrative overhead, such as row locks or the adaptive hash index. | long | +| mysql.status.innodb.buffer_pool.pages.total | The total size of the InnoDB buffer pool, in pages. | long | +| mysql.status.innodb.buffer_pool.pool.reads | The number of logical reads that InnoDB could not satisfy from the buffer pool, and had to read directly from disk. | long | +| mysql.status.innodb.buffer_pool.pool.resize_status | The status of an operation to resize the InnoDB buffer pool dynamically, triggered by setting the innodb_buffer_pool_size parameter dynamically. | long | +| mysql.status.innodb.buffer_pool.pool.wait_free | Normally, writes to the InnoDB buffer pool happen in the background. When InnoDB needs to read or create a page and no clean pages are available, InnoDB flushes some dirty pages first and waits for that operation to finish. This counter counts instances of these waits. | long | +| mysql.status.innodb.buffer_pool.read.ahead | The number of pages read into the InnoDB buffer pool by the read-ahead background thread. | long | +| mysql.status.innodb.buffer_pool.read.ahead_evicted | The number of pages read into the InnoDB buffer pool by the read-ahead background thread that were subsequently evicted without having been accessed by queries. | long | +| mysql.status.innodb.buffer_pool.read.ahead_rnd | The number of "random" read-aheads initiated by InnoDB. | long | +| mysql.status.innodb.buffer_pool.read.requests | The number of logical read requests. | long | +| mysql.status.innodb.buffer_pool.write_requests | The number of writes done to the InnoDB buffer pool. | long | +| mysql.status.max_used_connections | | long | +| mysql.status.open.files | | long | +| mysql.status.open.streams | | long | +| mysql.status.open.tables | | long | +| mysql.status.opened_tables | | long | +| mysql.status.queries | The number of statements executed by the server. This variable includes statements executed within stored programs, unlike the Questions variable. It does not count COM_PING or COM_STATISTICS commands. | long | +| mysql.status.questions | The number of statements executed by the server. This includes only statements sent to the server by clients and not statements executed within stored programs, unlike the Queries variable. This variable does not count COM_PING, COM_STATISTICS, COM_STMT_PREPARE, COM_STMT_CLOSE, or COM_STMT_RESET commands. | long | +| mysql.status.threads.cached | The number of cached threads. | long | +| mysql.status.threads.connected | The number of connected threads. | long | +| mysql.status.threads.created | The number of created threads. | long | +| mysql.status.threads.running | The number of running threads. | long | + diff --git a/dev/packages/beats/mysql-0.0.1/manifest.yml b/dev/packages/beats/mysql-0.0.1/manifest.yml index ec46daf3e..08ad76052 100644 --- a/dev/packages/beats/mysql-0.0.1/manifest.yml +++ b/dev/packages/beats/mysql-0.0.1/manifest.yml @@ -10,7 +10,8 @@ categories: - metrics release: ga requirement: - kibana: {} + kibana: + versions: '>=7.3.1 <8.0.0' elasticsearch: versions: '>7.0.1' screenshots: diff --git a/dev/packages/beats/nats-0.0.1/manifest.yml b/dev/packages/beats/nats-0.0.1/manifest.yml index 74908b067..ce33f54b9 100644 --- a/dev/packages/beats/nats-0.0.1/manifest.yml +++ b/dev/packages/beats/nats-0.0.1/manifest.yml @@ -10,7 +10,8 @@ categories: - metrics release: ga requirement: - kibana: {} + kibana: + versions: '>=7.3.0 <8.0.0' elasticsearch: versions: '>7.0.1' screenshots: diff --git a/dev/packages/beats/netflow-0.0.1/manifest.yml b/dev/packages/beats/netflow-0.0.1/manifest.yml index 4f2589199..a2742b811 100644 --- a/dev/packages/beats/netflow-0.0.1/manifest.yml +++ b/dev/packages/beats/netflow-0.0.1/manifest.yml @@ -9,7 +9,8 @@ categories: - logs release: ga requirement: - kibana: {} + kibana: + versions: '>=7.3.0 <8.0.0' elasticsearch: {} datasources: - name: netflow diff --git a/dev/packages/beats/nginx-0.0.1/docs/README.md b/dev/packages/beats/nginx-0.0.1/docs/README.md index f95a6d6af..c7544845e 100644 --- a/dev/packages/beats/nginx-0.0.1/docs/README.md +++ b/dev/packages/beats/nginx-0.0.1/docs/README.md @@ -25,13 +25,29 @@ Access logs collects the nginx access logs. **Exported fields** -| Field | Description | Type | -|----------------------------- |-------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- |------ | -| nginx.access.remote_ip_list | An array of remote IP addresses. It is a list because it is common to include, besides the client IP address, IP addresses from headers like X-Forwarded-For. Real source IP is restored to source.ip. | ip | -| nginx.stubstatus.active | The current number of active client connections including Waiting connections. | long | -| nginx.stubstatus.accepts | The total number of accepted client connections. | long | -| nginx.stubstatus.handled | The total number of handled client connections. | long | -| nginx.stubstatus.dropped | The total number of dropped client connections. | long | +| Field | Description | Type | +|---|---|---| +| nginx.access.agent | Alias for field "user_agent.original" | alias | +| nginx.access.body_sent.bytes | Alias for field "http.response.body.bytes" | alias | +| nginx.access.geoip.city_name | Alias for field "source.geo.city_name" | alias | +| nginx.access.geoip.continent_name | Alias for field "source.geo.continent_name" | alias | +| nginx.access.geoip.country_iso_code | Alias for field "source.geo.country_iso_code" | alias | +| nginx.access.geoip.location | Alias for field "source.geo.location" | alias | +| nginx.access.geoip.region_iso_code | Alias for field "source.geo.region_iso_code" | alias | +| nginx.access.geoip.region_name | Alias for field "source.geo.region_name" | alias | +| nginx.access.http_version | Alias for field "http.version" | alias | +| nginx.access.method | Alias for field "http.request.method" | alias | +| nginx.access.referrer | Alias for field "http.request.referrer" | alias | +| nginx.access.remote_ip_list | An array of remote IP addresses. It is a list because it is common to include, besides the client IP address, IP addresses from headers like `X-Forwarded-For`. Real source IP is restored to `source.ip`. | array | +| nginx.access.response_code | Alias for field "http.response.status_code" | alias | +| nginx.access.url | Alias for field "url.original" | alias | +| nginx.access.user_agent.device | Alias for field "user_agent.device.name" | alias | +| nginx.access.user_agent.name | Alias for field "user_agent.name" | alias | +| nginx.access.user_agent.original | Alias for field "user_agent.original" | alias | +| nginx.access.user_agent.os | Alias for field "user_agent.os.full_name" | alias | +| nginx.access.user_agent.os_name | Alias for field "user_agent.os.name" | alias | +| nginx.access.user_name | Alias for field "user.name" | alias | + ### Error Logs @@ -39,13 +55,14 @@ Error logs collects the nginx error logs. **Exported fields** -| Field | Description | Type | -|--------------------------- |-------------------------------------------------------------------------------- |------ | -| nginx.error.connection_id | Connection identifier. | ip | -| nginx.stubstatus.active | The current number of active client connections including Waiting connections. | long | -| nginx.stubstatus.accepts | The total number of accepted client connections. | long | -| nginx.stubstatus.handled | The total number of handled client connections. | long | -| nginx.stubstatus.dropped | The total number of dropped client connections. | long | +| Field | Description | Type | +|---|---|---| +| nginx.error.connection_id | Connection identifier. | long | +| nginx.error.level | Alias for field "log.level" | alias | +| nginx.error.message | Alias for field "message" | alias | +| nginx.error.pid | Alias for field "process.pid" | alias | +| nginx.error.tid | Alias for field "process.thread.id" | alias | + ## Metrics @@ -93,12 +110,18 @@ An example event for nginx looks as following: } ``` -The fields reported are: +**Exported fields** + +| Field | Description | Type | +|---|---|---| +| nginx.stubstatus.accepts | The total number of accepted client connections. | long | +| nginx.stubstatus.active | The current number of active client connections including Waiting connections. | long | +| nginx.stubstatus.current | The current number of client requests. | long | +| nginx.stubstatus.dropped | The total number of dropped client connections. | long | +| nginx.stubstatus.handled | The total number of handled client connections. | long | +| nginx.stubstatus.hostname | Nginx hostname. | keyword | +| nginx.stubstatus.reading | The current number of connections where Nginx is reading the request header. | long | +| nginx.stubstatus.requests | The total number of client requests. | long | +| nginx.stubstatus.waiting | The current number of idle client connections waiting for a request. | long | +| nginx.stubstatus.writing | The current number of connections where Nginx is writing the response back to the client. | long | -| Field | Description | Type | -|--------------------------- |-------------------------------------------------------------------------------- |--------- | -| nginx.stubstatus.hostname | Nginx hostname. | keyword | -| nginx.stubstatus.active | The current number of active client connections including Waiting connections. | long | -| nginx.stubstatus.accepts | The total number of accepted client connections. | long | -| nginx.stubstatus.handled | The total number of handled client connections. | long | -| nginx.stubstatus.dropped | The total number of dropped client connections. | long | diff --git a/dev/packages/beats/nginx-0.0.1/manifest.yml b/dev/packages/beats/nginx-0.0.1/manifest.yml index abf4f000f..f7d226a5e 100644 --- a/dev/packages/beats/nginx-0.0.1/manifest.yml +++ b/dev/packages/beats/nginx-0.0.1/manifest.yml @@ -10,7 +10,8 @@ categories: - metrics release: ga requirement: - kibana: {} + kibana: + versions: '>=7.3.0 <8.0.0' elasticsearch: versions: '>7.0.1' screenshots: diff --git a/dev/packages/beats/o365-0.0.1/manifest.yml b/dev/packages/beats/o365-0.0.1/manifest.yml index d9ccf3dac..be8684665 100644 --- a/dev/packages/beats/o365-0.0.1/manifest.yml +++ b/dev/packages/beats/o365-0.0.1/manifest.yml @@ -9,7 +9,8 @@ categories: - logs release: ga requirement: - kibana: {} + kibana: + versions: '>=7.6.0 <8.0.0' elasticsearch: versions: '>7.0.1' screenshots: diff --git a/dev/packages/beats/okta-0.0.1/manifest.yml b/dev/packages/beats/okta-0.0.1/manifest.yml index 7d83386cd..4692350d5 100644 --- a/dev/packages/beats/okta-0.0.1/manifest.yml +++ b/dev/packages/beats/okta-0.0.1/manifest.yml @@ -9,7 +9,8 @@ categories: - logs release: ga requirement: - kibana: {} + kibana: + versions: '>=8.0.0-SNAPSHOT <8.0.0' elasticsearch: versions: '>7.0.1' screenshots: diff --git a/dev/packages/beats/oracle-0.0.1/manifest.yml b/dev/packages/beats/oracle-0.0.1/manifest.yml index d3d9b46df..85117f0bd 100644 --- a/dev/packages/beats/oracle-0.0.1/manifest.yml +++ b/dev/packages/beats/oracle-0.0.1/manifest.yml @@ -9,7 +9,8 @@ categories: - metrics release: ga requirement: - kibana: {} + kibana: + versions: '>=8.0.0-SNAPSHOT <8.0.0' elasticsearch: {} screenshots: - src: /img/metricbeat-oracle-overview.png diff --git a/dev/packages/beats/osquery-0.0.1/manifest.yml b/dev/packages/beats/osquery-0.0.1/manifest.yml index 51469d580..53a992729 100644 --- a/dev/packages/beats/osquery-0.0.1/manifest.yml +++ b/dev/packages/beats/osquery-0.0.1/manifest.yml @@ -9,7 +9,8 @@ categories: - logs release: ga requirement: - kibana: {} + kibana: + versions: '>=7.3.0 <8.0.0' elasticsearch: versions: '>7.0.1' screenshots: diff --git a/dev/packages/beats/panw-0.0.1/manifest.yml b/dev/packages/beats/panw-0.0.1/manifest.yml index 7160a0058..5373c85a6 100644 --- a/dev/packages/beats/panw-0.0.1/manifest.yml +++ b/dev/packages/beats/panw-0.0.1/manifest.yml @@ -9,7 +9,8 @@ categories: - logs release: ga requirement: - kibana: {} + kibana: + versions: '>=7.3.0 <8.0.0' elasticsearch: versions: '>7.0.1' screenshots: diff --git a/dev/packages/beats/postgresql-0.0.1/manifest.yml b/dev/packages/beats/postgresql-0.0.1/manifest.yml index 82569d470..43f9a1c6d 100644 --- a/dev/packages/beats/postgresql-0.0.1/manifest.yml +++ b/dev/packages/beats/postgresql-0.0.1/manifest.yml @@ -10,7 +10,8 @@ categories: - metrics release: ga requirement: - kibana: {} + kibana: + versions: '>=7.3.1 <8.0.0' elasticsearch: versions: '>7.0.1' screenshots: diff --git a/dev/packages/beats/prometheus-0.0.1/manifest.yml b/dev/packages/beats/prometheus-0.0.1/manifest.yml index bd87701ec..f96f8efe2 100644 --- a/dev/packages/beats/prometheus-0.0.1/manifest.yml +++ b/dev/packages/beats/prometheus-0.0.1/manifest.yml @@ -10,7 +10,8 @@ categories: - metrics release: ga requirement: - kibana: {} + kibana: + versions: '>=7.3.0 <8.0.0' elasticsearch: {} screenshots: - src: /img/metricbeat-prometheus-overview.png diff --git a/dev/packages/beats/rabbitmq-0.0.1/manifest.yml b/dev/packages/beats/rabbitmq-0.0.1/manifest.yml index 28b23fdc6..ef04ac473 100644 --- a/dev/packages/beats/rabbitmq-0.0.1/manifest.yml +++ b/dev/packages/beats/rabbitmq-0.0.1/manifest.yml @@ -10,7 +10,8 @@ categories: - metrics release: ga requirement: - kibana: {} + kibana: + versions: '>=7.3.0 <8.0.0' elasticsearch: versions: '>7.0.1' icons: diff --git a/dev/packages/beats/redis-0.0.1/manifest.yml b/dev/packages/beats/redis-0.0.1/manifest.yml index 7c28324cd..9ef6f14c8 100644 --- a/dev/packages/beats/redis-0.0.1/manifest.yml +++ b/dev/packages/beats/redis-0.0.1/manifest.yml @@ -10,7 +10,8 @@ categories: - metrics release: ga requirement: - kibana: {} + kibana: + versions: '>=7.3.0 <8.0.0' elasticsearch: versions: '>7.0.1' screenshots: diff --git a/dev/packages/beats/redisenterprise-0.0.1/manifest.yml b/dev/packages/beats/redisenterprise-0.0.1/manifest.yml index d0d98264b..90c44e241 100644 --- a/dev/packages/beats/redisenterprise-0.0.1/manifest.yml +++ b/dev/packages/beats/redisenterprise-0.0.1/manifest.yml @@ -9,7 +9,8 @@ categories: - metrics release: beta requirement: - kibana: {} + kibana: + versions: '>=7.1.0 <8.0.0' elasticsearch: {} screenshots: - src: /img/metricbeat-redisenterprise-overview.png diff --git a/dev/packages/beats/santa-0.0.1/manifest.yml b/dev/packages/beats/santa-0.0.1/manifest.yml index 627651cfd..0611324b4 100644 --- a/dev/packages/beats/santa-0.0.1/manifest.yml +++ b/dev/packages/beats/santa-0.0.1/manifest.yml @@ -9,7 +9,8 @@ categories: - logs release: ga requirement: - kibana: {} + kibana: + versions: '>=7.0.0-alpha1-SNAPSHOT <8.0.0' elasticsearch: versions: '>7.0.1' screenshots: diff --git a/dev/packages/beats/stan-0.0.1/manifest.yml b/dev/packages/beats/stan-0.0.1/manifest.yml index 6e97e67a6..75b7d9e7d 100644 --- a/dev/packages/beats/stan-0.0.1/manifest.yml +++ b/dev/packages/beats/stan-0.0.1/manifest.yml @@ -9,7 +9,8 @@ categories: - metrics release: ga requirement: - kibana: {} + kibana: + versions: '>=7.5.2 <8.0.0' elasticsearch: {} screenshots: - src: /img/metricbeat-stan-overview.png diff --git a/dev/packages/beats/suricata-0.0.1/manifest.yml b/dev/packages/beats/suricata-0.0.1/manifest.yml index 6a8ec4a13..87f3860a5 100644 --- a/dev/packages/beats/suricata-0.0.1/manifest.yml +++ b/dev/packages/beats/suricata-0.0.1/manifest.yml @@ -9,7 +9,8 @@ categories: - logs release: ga requirement: - kibana: {} + kibana: + versions: '>=7.3.0 <8.0.0' elasticsearch: versions: '>7.0.1' screenshots: diff --git a/dev/packages/beats/system-0.0.1/manifest.yml b/dev/packages/beats/system-0.0.1/manifest.yml index 646509ed7..3a42b6ef2 100644 --- a/dev/packages/beats/system-0.0.1/manifest.yml +++ b/dev/packages/beats/system-0.0.1/manifest.yml @@ -10,7 +10,8 @@ categories: - metrics release: ga requirement: - kibana: {} + kibana: + versions: '>=7.6.0 <8.0.0' elasticsearch: versions: '>7.0.1' screenshots: diff --git a/dev/packages/beats/tomcat-0.0.1/manifest.yml b/dev/packages/beats/tomcat-0.0.1/manifest.yml index fdbdc12bb..2236bbc2b 100644 --- a/dev/packages/beats/tomcat-0.0.1/manifest.yml +++ b/dev/packages/beats/tomcat-0.0.1/manifest.yml @@ -9,7 +9,8 @@ categories: - metrics release: beta requirement: - kibana: {} + kibana: + versions: '>=8.0.0-SNAPSHOT <8.0.0' elasticsearch: {} screenshots: - src: /img/metricbeat-tomcat-overview.png diff --git a/dev/packages/beats/traefik-0.0.1/manifest.yml b/dev/packages/beats/traefik-0.0.1/manifest.yml index bbe473cf1..3a536a1fd 100644 --- a/dev/packages/beats/traefik-0.0.1/manifest.yml +++ b/dev/packages/beats/traefik-0.0.1/manifest.yml @@ -10,7 +10,8 @@ categories: - metrics release: ga requirement: - kibana: {} + kibana: + versions: '>=7.3.0 <8.0.0' elasticsearch: versions: '>7.0.1' screenshots: diff --git a/dev/packages/beats/uwsgi-0.0.1/manifest.yml b/dev/packages/beats/uwsgi-0.0.1/manifest.yml index bb3ec45b3..91ea5d15b 100644 --- a/dev/packages/beats/uwsgi-0.0.1/manifest.yml +++ b/dev/packages/beats/uwsgi-0.0.1/manifest.yml @@ -9,7 +9,8 @@ categories: - metrics release: ga requirement: - kibana: {} + kibana: + versions: '>=7.3.0 <8.0.0' elasticsearch: {} screenshots: - src: /img/uwsgi_dashboard.png diff --git a/dev/packages/beats/vsphere-0.0.1/manifest.yml b/dev/packages/beats/vsphere-0.0.1/manifest.yml index 70a4322ac..5f103abb6 100644 --- a/dev/packages/beats/vsphere-0.0.1/manifest.yml +++ b/dev/packages/beats/vsphere-0.0.1/manifest.yml @@ -9,7 +9,8 @@ categories: - metrics release: ga requirement: - kibana: {} + kibana: + versions: '>=7.4.0 <8.0.0' elasticsearch: {} screenshots: - src: /img/metricbeat_vsphere_dashboard.png diff --git a/dev/packages/beats/windows-0.0.1/manifest.yml b/dev/packages/beats/windows-0.0.1/manifest.yml index 3f53b9ea2..a48119064 100644 --- a/dev/packages/beats/windows-0.0.1/manifest.yml +++ b/dev/packages/beats/windows-0.0.1/manifest.yml @@ -9,7 +9,8 @@ categories: - metrics release: ga requirement: - kibana: {} + kibana: + versions: '>=7.3.0 <8.0.0' elasticsearch: {} screenshots: - src: /img/metricbeat-windows-service.png diff --git a/dev/packages/beats/zeek-0.0.1/manifest.yml b/dev/packages/beats/zeek-0.0.1/manifest.yml index 07efeb061..ccdeb43d2 100644 --- a/dev/packages/beats/zeek-0.0.1/manifest.yml +++ b/dev/packages/beats/zeek-0.0.1/manifest.yml @@ -9,7 +9,8 @@ categories: - logs release: ga requirement: - kibana: {} + kibana: + versions: '>=7.0.0-beta1 <8.0.0' elasticsearch: versions: '>7.0.1' screenshots: diff --git a/dev/packages/beats/zookeeper-0.0.1/manifest.yml b/dev/packages/beats/zookeeper-0.0.1/manifest.yml index 5cb38e6a0..60f423c80 100644 --- a/dev/packages/beats/zookeeper-0.0.1/manifest.yml +++ b/dev/packages/beats/zookeeper-0.0.1/manifest.yml @@ -9,7 +9,8 @@ categories: - metrics release: ga requirement: - kibana: {} + kibana: + versions: '>=7.0.0-alpha2 <8.0.0' elasticsearch: {} screenshots: - src: /img/metricbeat-zookeeper.png From 17b29de212dae79240d4dd3455924d5be1a1c222 Mon Sep 17 00:00:00 2001 From: Marcin Tojek Date: Tue, 31 Mar 2020 13:11:01 +0200 Subject: [PATCH 3/4] Fix: mage check --- dev/import-beats/docs.go | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) diff --git a/dev/import-beats/docs.go b/dev/import-beats/docs.go index 693f790ac..b43f6f397 100644 --- a/dev/import-beats/docs.go +++ b/dev/import-beats/docs.go @@ -6,25 +6,26 @@ package main import ( "fmt" - "github.com/pkg/errors" - "gopkg.in/yaml.v2" "os" "path/filepath" "sort" "strings" "text/template" + + "github.com/pkg/errors" + "gopkg.in/yaml.v2" ) var emptyReadmeTemplate = template.Must(template.New("README.md").Parse("TODO")) type fieldsTableRecord struct { - name string + name string description string - aType string + aType string } type docContent struct { - fileName string + fileName string templatePath string } @@ -135,9 +136,9 @@ func visitFields(namePrefix string, f mapStr, records []fieldsTableRecord) ([]fi } records = append(records, fieldsTableRecord{ - name: name, + name: name, description: description, - aType: aType, + aType: aType, }) return records, nil } @@ -155,7 +156,7 @@ func visitFields(namePrefix string, f mapStr, records []fieldsTableRecord) ([]fi return nil, errors.Wrapf(err, "mapping fields entry failed (namePrefix: %s)", namePrefix) } - records, err = visitFields(namePrefix + name + ".", fieldsEntry, records) + records, err = visitFields(namePrefix+name+".", fieldsEntry, records) if err != nil { return nil, errors.Wrapf(err, "recursive visiting fields failed (namePrefix: %s)", namePrefix) } From f374e969f122a23e7685373c1592a9360a3f7795 Mon Sep 17 00:00:00 2001 From: Marcin Tojek Date: Tue, 31 Mar 2020 14:24:42 +0200 Subject: [PATCH 4/4] Remove all aliases if migration=true --- dev/import-beats/docs.go | 13 +++++++++++ dev/packages/beats/mysql-0.0.1/docs/README.md | 7 ------ dev/packages/beats/nginx-0.0.1/docs/README.md | 23 ------------------- 3 files changed, 13 insertions(+), 30 deletions(-) diff --git a/dev/import-beats/docs.go b/dev/import-beats/docs.go index b43f6f397..877fb4416 100644 --- a/dev/import-beats/docs.go +++ b/dev/import-beats/docs.go @@ -127,6 +127,19 @@ func visitFields(namePrefix string, f mapStr, records []fieldsTableRecord) ([]fi } if description == "" && aType == "alias" { + var migration bool + migrationVal, err := f.getValue("migration") + if err != nil && err != errKeyNotFound { + return nil, errors.Wrapf(err, "retrieving field 'migration' failed") + } + if err == nil { + migration = migrationVal.(bool) + } + + if migration { + return records, nil // skip the field due to migration + } + pathVal, err := f.getValue("path") if err != nil { return nil, errors.Wrapf(err, "retrieving field 'path' failed") diff --git a/dev/packages/beats/mysql-0.0.1/docs/README.md b/dev/packages/beats/mysql-0.0.1/docs/README.md index 029efb7f6..9f1a99038 100644 --- a/dev/packages/beats/mysql-0.0.1/docs/README.md +++ b/dev/packages/beats/mysql-0.0.1/docs/README.md @@ -19,9 +19,6 @@ The `error` dataset collects the MySQL error logs. | Field | Description | Type | |---|---|---| -| mysql.error.level | Alias for field "log.level" | alias | -| mysql.error.message | Alias for field "message" | alias | -| mysql.error.thread_id | Alias for field "mysql.thread_id" | alias | | mysql.thread_id | The connection or thread ID for the query. | long | @@ -40,8 +37,6 @@ The `slowlog` dataset collects the MySQL slow logs. | mysql.slowlog.filesort_on_disk | Whether filesort optimization was used and it needed temporary tables on disk. | boolean | | mysql.slowlog.full_join | Whether a full join was needed for the slow query (no indexes were used for joins). | boolean | | mysql.slowlog.full_scan | Whether a full table scan was needed for the slow query. | boolean | -| mysql.slowlog.host | Alias for field "source.domain" | alias | -| mysql.slowlog.id | Alias for field "mysql.thread_id" | alias | | mysql.slowlog.innodb.io_r_bytes | Bytes read during page read operations. | long | | mysql.slowlog.innodb.io_r_ops | Number of page read operations. | long | | mysql.slowlog.innodb.io_r_wait.sec | How long it took to read all needed data from storage. | long | @@ -49,7 +44,6 @@ The `slowlog` dataset collects the MySQL slow logs. | mysql.slowlog.innodb.queue_wait.sec | How long the query waited to enter the InnoDB queue and to be executed once in the queue. | long | | mysql.slowlog.innodb.rec_lock_wait.sec | How long the query waited for locks. | long | | mysql.slowlog.innodb.trx_id | Transaction ID | keyword | -| mysql.slowlog.ip | Alias for field "source.ip" | alias | | mysql.slowlog.killed | Code of the reason if the query was killed. | keyword | | mysql.slowlog.last_errno | Last SQL error seen. | keyword | | mysql.slowlog.lock_time.sec | The amount of time the query waited for the lock to be available. The value is in seconds, as a floating point number. | float | @@ -79,7 +73,6 @@ The `slowlog` dataset collects the MySQL slow logs. | mysql.slowlog.tmp_table_on_disk | Whether the query needed temporary tables on disk. | boolean | | mysql.slowlog.tmp_table_sizes | Size of temporary tables created for this query. | long | | mysql.slowlog.tmp_tables | Number of temporary tables created for this query | long | -| mysql.slowlog.user | Alias for field "user.name" | alias | | mysql.thread_id | The connection or thread ID for the query. | long | diff --git a/dev/packages/beats/nginx-0.0.1/docs/README.md b/dev/packages/beats/nginx-0.0.1/docs/README.md index c7544845e..8d30530cd 100644 --- a/dev/packages/beats/nginx-0.0.1/docs/README.md +++ b/dev/packages/beats/nginx-0.0.1/docs/README.md @@ -27,26 +27,7 @@ Access logs collects the nginx access logs. | Field | Description | Type | |---|---|---| -| nginx.access.agent | Alias for field "user_agent.original" | alias | -| nginx.access.body_sent.bytes | Alias for field "http.response.body.bytes" | alias | -| nginx.access.geoip.city_name | Alias for field "source.geo.city_name" | alias | -| nginx.access.geoip.continent_name | Alias for field "source.geo.continent_name" | alias | -| nginx.access.geoip.country_iso_code | Alias for field "source.geo.country_iso_code" | alias | -| nginx.access.geoip.location | Alias for field "source.geo.location" | alias | -| nginx.access.geoip.region_iso_code | Alias for field "source.geo.region_iso_code" | alias | -| nginx.access.geoip.region_name | Alias for field "source.geo.region_name" | alias | -| nginx.access.http_version | Alias for field "http.version" | alias | -| nginx.access.method | Alias for field "http.request.method" | alias | -| nginx.access.referrer | Alias for field "http.request.referrer" | alias | | nginx.access.remote_ip_list | An array of remote IP addresses. It is a list because it is common to include, besides the client IP address, IP addresses from headers like `X-Forwarded-For`. Real source IP is restored to `source.ip`. | array | -| nginx.access.response_code | Alias for field "http.response.status_code" | alias | -| nginx.access.url | Alias for field "url.original" | alias | -| nginx.access.user_agent.device | Alias for field "user_agent.device.name" | alias | -| nginx.access.user_agent.name | Alias for field "user_agent.name" | alias | -| nginx.access.user_agent.original | Alias for field "user_agent.original" | alias | -| nginx.access.user_agent.os | Alias for field "user_agent.os.full_name" | alias | -| nginx.access.user_agent.os_name | Alias for field "user_agent.os.name" | alias | -| nginx.access.user_name | Alias for field "user.name" | alias | ### Error Logs @@ -58,10 +39,6 @@ Error logs collects the nginx error logs. | Field | Description | Type | |---|---|---| | nginx.error.connection_id | Connection identifier. | long | -| nginx.error.level | Alias for field "log.level" | alias | -| nginx.error.message | Alias for field "message" | alias | -| nginx.error.pid | Alias for field "process.pid" | alias | -| nginx.error.tid | Alias for field "process.thread.id" | alias | ## Metrics