From a2b3d3e317c21c6cfbbe92a4543d517196b64f0d Mon Sep 17 00:00:00 2001 From: Dan Kortschak Date: Tue, 8 Feb 2022 10:51:26 +1030 Subject: [PATCH 1/3] network_traffic: fix typo --- packages/network_traffic/changelog.yml | 5 +++++ .../network_traffic/data_stream/tls/fields/protocol.yml | 6 +++--- packages/network_traffic/manifest.yml | 2 +- 3 files changed, 9 insertions(+), 4 deletions(-) diff --git a/packages/network_traffic/changelog.yml b/packages/network_traffic/changelog.yml index d1efb8c9eec..4cadeaf76d5 100644 --- a/packages/network_traffic/changelog.yml +++ b/packages/network_traffic/changelog.yml @@ -1,4 +1,9 @@ # newer versions go on top +- version: "0.6.1" + changes: + - description: Fix typo + type: enhancement + link: https://github.com/elastic/integrations/pull/xxx - version: "0.6.0" changes: - description: Update to ECS 8.0 diff --git a/packages/network_traffic/data_stream/tls/fields/protocol.yml b/packages/network_traffic/data_stream/tls/fields/protocol.yml index 19500f116b2..3c5ec005271 100644 --- a/packages/network_traffic/data_stream/tls/fields/protocol.yml +++ b/packages/network_traffic/data_stream/tls/fields/protocol.yml @@ -7,7 +7,7 @@ fields: - name: x509 type: group - default_fields: false + default_field: false fields: - name: version type: keyword @@ -25,7 +25,7 @@ fields: - name: x509 type: group - default_fields: false + default_field: false fields: - name: version type: keyword @@ -39,7 +39,7 @@ description: Province or region within country. - name: detailed type: group - default_fields: false + default_field: false fields: - name: version type: keyword diff --git a/packages/network_traffic/manifest.yml b/packages/network_traffic/manifest.yml index beaee5ff0db..7f3397087a6 100644 --- a/packages/network_traffic/manifest.yml +++ b/packages/network_traffic/manifest.yml @@ -1,7 +1,7 @@ format_version: 1.0.0 name: network_traffic title: Network Packet Capture -version: 0.6.0 +version: 0.6.1 license: basic description: Capture and analyze network traffic from a host with Elastic Agent. type: integration From a27e776e1bb21d4db7e6fc64133490956f6cc7ec Mon Sep 17 00:00:00 2001 From: Dan Kortschak Date: Tue, 8 Feb 2022 14:23:13 +1030 Subject: [PATCH 2/3] network_traffic: remove unused field --- packages/network_traffic/changelog.yml | 4 ++-- packages/network_traffic/data_stream/amqp/fields/agent.yml | 2 -- .../network_traffic/data_stream/cassandra/fields/agent.yml | 2 -- packages/network_traffic/data_stream/dhcpv4/fields/agent.yml | 2 -- packages/network_traffic/data_stream/dns/fields/agent.yml | 2 -- packages/network_traffic/data_stream/flow/fields/agent.yml | 2 -- packages/network_traffic/data_stream/http/fields/agent.yml | 2 -- packages/network_traffic/data_stream/icmp/fields/agent.yml | 2 -- .../network_traffic/data_stream/memcached/fields/agent.yml | 2 -- packages/network_traffic/data_stream/mongodb/fields/agent.yml | 2 -- packages/network_traffic/data_stream/mysql/fields/agent.yml | 2 -- packages/network_traffic/data_stream/nfs/fields/agent.yml | 2 -- packages/network_traffic/data_stream/pgsql/fields/agent.yml | 2 -- packages/network_traffic/data_stream/redis/fields/agent.yml | 2 -- packages/network_traffic/data_stream/sip/fields/agent.yml | 2 -- packages/network_traffic/data_stream/thrift/fields/agent.yml | 2 -- packages/network_traffic/data_stream/tls/fields/agent.yml | 2 -- packages/network_traffic/data_stream/tls/fields/protocol.yml | 3 --- 18 files changed, 2 insertions(+), 37 deletions(-) diff --git a/packages/network_traffic/changelog.yml b/packages/network_traffic/changelog.yml index 4cadeaf76d5..232a763b6db 100644 --- a/packages/network_traffic/changelog.yml +++ b/packages/network_traffic/changelog.yml @@ -1,9 +1,9 @@ # newer versions go on top - version: "0.6.1" changes: - - description: Fix typo + - description: Remove unused field type: enhancement - link: https://github.com/elastic/integrations/pull/xxx + link: https://github.com/elastic/integrations/pull/2648 - version: "0.6.0" changes: - description: Update to ECS 8.0 diff --git a/packages/network_traffic/data_stream/amqp/fields/agent.yml b/packages/network_traffic/data_stream/amqp/fields/agent.yml index da4e652c53b..a55e9f71b3e 100644 --- a/packages/network_traffic/data_stream/amqp/fields/agent.yml +++ b/packages/network_traffic/data_stream/amqp/fields/agent.yml @@ -104,7 +104,6 @@ For example, on Windows this could be the host''s Active Directory domain or NetBIOS domain name. For Linux this could be the domain of the host''s LDAP provider.' example: CONTOSO - default_field: false - name: hostname level: core type: keyword @@ -157,7 +156,6 @@ - name: text type: text norms: false - default_field: false description: Operating system name, without the version. example: Mac OS X - name: os.platform diff --git a/packages/network_traffic/data_stream/cassandra/fields/agent.yml b/packages/network_traffic/data_stream/cassandra/fields/agent.yml index da4e652c53b..a55e9f71b3e 100644 --- a/packages/network_traffic/data_stream/cassandra/fields/agent.yml +++ b/packages/network_traffic/data_stream/cassandra/fields/agent.yml @@ -104,7 +104,6 @@ For example, on Windows this could be the host''s Active Directory domain or NetBIOS domain name. For Linux this could be the domain of the host''s LDAP provider.' example: CONTOSO - default_field: false - name: hostname level: core type: keyword @@ -157,7 +156,6 @@ - name: text type: text norms: false - default_field: false description: Operating system name, without the version. example: Mac OS X - name: os.platform diff --git a/packages/network_traffic/data_stream/dhcpv4/fields/agent.yml b/packages/network_traffic/data_stream/dhcpv4/fields/agent.yml index da4e652c53b..a55e9f71b3e 100644 --- a/packages/network_traffic/data_stream/dhcpv4/fields/agent.yml +++ b/packages/network_traffic/data_stream/dhcpv4/fields/agent.yml @@ -104,7 +104,6 @@ For example, on Windows this could be the host''s Active Directory domain or NetBIOS domain name. For Linux this could be the domain of the host''s LDAP provider.' example: CONTOSO - default_field: false - name: hostname level: core type: keyword @@ -157,7 +156,6 @@ - name: text type: text norms: false - default_field: false description: Operating system name, without the version. example: Mac OS X - name: os.platform diff --git a/packages/network_traffic/data_stream/dns/fields/agent.yml b/packages/network_traffic/data_stream/dns/fields/agent.yml index da4e652c53b..a55e9f71b3e 100644 --- a/packages/network_traffic/data_stream/dns/fields/agent.yml +++ b/packages/network_traffic/data_stream/dns/fields/agent.yml @@ -104,7 +104,6 @@ For example, on Windows this could be the host''s Active Directory domain or NetBIOS domain name. For Linux this could be the domain of the host''s LDAP provider.' example: CONTOSO - default_field: false - name: hostname level: core type: keyword @@ -157,7 +156,6 @@ - name: text type: text norms: false - default_field: false description: Operating system name, without the version. example: Mac OS X - name: os.platform diff --git a/packages/network_traffic/data_stream/flow/fields/agent.yml b/packages/network_traffic/data_stream/flow/fields/agent.yml index da4e652c53b..a55e9f71b3e 100644 --- a/packages/network_traffic/data_stream/flow/fields/agent.yml +++ b/packages/network_traffic/data_stream/flow/fields/agent.yml @@ -104,7 +104,6 @@ For example, on Windows this could be the host''s Active Directory domain or NetBIOS domain name. For Linux this could be the domain of the host''s LDAP provider.' example: CONTOSO - default_field: false - name: hostname level: core type: keyword @@ -157,7 +156,6 @@ - name: text type: text norms: false - default_field: false description: Operating system name, without the version. example: Mac OS X - name: os.platform diff --git a/packages/network_traffic/data_stream/http/fields/agent.yml b/packages/network_traffic/data_stream/http/fields/agent.yml index da4e652c53b..a55e9f71b3e 100644 --- a/packages/network_traffic/data_stream/http/fields/agent.yml +++ b/packages/network_traffic/data_stream/http/fields/agent.yml @@ -104,7 +104,6 @@ For example, on Windows this could be the host''s Active Directory domain or NetBIOS domain name. For Linux this could be the domain of the host''s LDAP provider.' example: CONTOSO - default_field: false - name: hostname level: core type: keyword @@ -157,7 +156,6 @@ - name: text type: text norms: false - default_field: false description: Operating system name, without the version. example: Mac OS X - name: os.platform diff --git a/packages/network_traffic/data_stream/icmp/fields/agent.yml b/packages/network_traffic/data_stream/icmp/fields/agent.yml index da4e652c53b..a55e9f71b3e 100644 --- a/packages/network_traffic/data_stream/icmp/fields/agent.yml +++ b/packages/network_traffic/data_stream/icmp/fields/agent.yml @@ -104,7 +104,6 @@ For example, on Windows this could be the host''s Active Directory domain or NetBIOS domain name. For Linux this could be the domain of the host''s LDAP provider.' example: CONTOSO - default_field: false - name: hostname level: core type: keyword @@ -157,7 +156,6 @@ - name: text type: text norms: false - default_field: false description: Operating system name, without the version. example: Mac OS X - name: os.platform diff --git a/packages/network_traffic/data_stream/memcached/fields/agent.yml b/packages/network_traffic/data_stream/memcached/fields/agent.yml index da4e652c53b..a55e9f71b3e 100644 --- a/packages/network_traffic/data_stream/memcached/fields/agent.yml +++ b/packages/network_traffic/data_stream/memcached/fields/agent.yml @@ -104,7 +104,6 @@ For example, on Windows this could be the host''s Active Directory domain or NetBIOS domain name. For Linux this could be the domain of the host''s LDAP provider.' example: CONTOSO - default_field: false - name: hostname level: core type: keyword @@ -157,7 +156,6 @@ - name: text type: text norms: false - default_field: false description: Operating system name, without the version. example: Mac OS X - name: os.platform diff --git a/packages/network_traffic/data_stream/mongodb/fields/agent.yml b/packages/network_traffic/data_stream/mongodb/fields/agent.yml index da4e652c53b..a55e9f71b3e 100644 --- a/packages/network_traffic/data_stream/mongodb/fields/agent.yml +++ b/packages/network_traffic/data_stream/mongodb/fields/agent.yml @@ -104,7 +104,6 @@ For example, on Windows this could be the host''s Active Directory domain or NetBIOS domain name. For Linux this could be the domain of the host''s LDAP provider.' example: CONTOSO - default_field: false - name: hostname level: core type: keyword @@ -157,7 +156,6 @@ - name: text type: text norms: false - default_field: false description: Operating system name, without the version. example: Mac OS X - name: os.platform diff --git a/packages/network_traffic/data_stream/mysql/fields/agent.yml b/packages/network_traffic/data_stream/mysql/fields/agent.yml index da4e652c53b..a55e9f71b3e 100644 --- a/packages/network_traffic/data_stream/mysql/fields/agent.yml +++ b/packages/network_traffic/data_stream/mysql/fields/agent.yml @@ -104,7 +104,6 @@ For example, on Windows this could be the host''s Active Directory domain or NetBIOS domain name. For Linux this could be the domain of the host''s LDAP provider.' example: CONTOSO - default_field: false - name: hostname level: core type: keyword @@ -157,7 +156,6 @@ - name: text type: text norms: false - default_field: false description: Operating system name, without the version. example: Mac OS X - name: os.platform diff --git a/packages/network_traffic/data_stream/nfs/fields/agent.yml b/packages/network_traffic/data_stream/nfs/fields/agent.yml index da4e652c53b..a55e9f71b3e 100644 --- a/packages/network_traffic/data_stream/nfs/fields/agent.yml +++ b/packages/network_traffic/data_stream/nfs/fields/agent.yml @@ -104,7 +104,6 @@ For example, on Windows this could be the host''s Active Directory domain or NetBIOS domain name. For Linux this could be the domain of the host''s LDAP provider.' example: CONTOSO - default_field: false - name: hostname level: core type: keyword @@ -157,7 +156,6 @@ - name: text type: text norms: false - default_field: false description: Operating system name, without the version. example: Mac OS X - name: os.platform diff --git a/packages/network_traffic/data_stream/pgsql/fields/agent.yml b/packages/network_traffic/data_stream/pgsql/fields/agent.yml index da4e652c53b..a55e9f71b3e 100644 --- a/packages/network_traffic/data_stream/pgsql/fields/agent.yml +++ b/packages/network_traffic/data_stream/pgsql/fields/agent.yml @@ -104,7 +104,6 @@ For example, on Windows this could be the host''s Active Directory domain or NetBIOS domain name. For Linux this could be the domain of the host''s LDAP provider.' example: CONTOSO - default_field: false - name: hostname level: core type: keyword @@ -157,7 +156,6 @@ - name: text type: text norms: false - default_field: false description: Operating system name, without the version. example: Mac OS X - name: os.platform diff --git a/packages/network_traffic/data_stream/redis/fields/agent.yml b/packages/network_traffic/data_stream/redis/fields/agent.yml index da4e652c53b..a55e9f71b3e 100644 --- a/packages/network_traffic/data_stream/redis/fields/agent.yml +++ b/packages/network_traffic/data_stream/redis/fields/agent.yml @@ -104,7 +104,6 @@ For example, on Windows this could be the host''s Active Directory domain or NetBIOS domain name. For Linux this could be the domain of the host''s LDAP provider.' example: CONTOSO - default_field: false - name: hostname level: core type: keyword @@ -157,7 +156,6 @@ - name: text type: text norms: false - default_field: false description: Operating system name, without the version. example: Mac OS X - name: os.platform diff --git a/packages/network_traffic/data_stream/sip/fields/agent.yml b/packages/network_traffic/data_stream/sip/fields/agent.yml index da4e652c53b..a55e9f71b3e 100644 --- a/packages/network_traffic/data_stream/sip/fields/agent.yml +++ b/packages/network_traffic/data_stream/sip/fields/agent.yml @@ -104,7 +104,6 @@ For example, on Windows this could be the host''s Active Directory domain or NetBIOS domain name. For Linux this could be the domain of the host''s LDAP provider.' example: CONTOSO - default_field: false - name: hostname level: core type: keyword @@ -157,7 +156,6 @@ - name: text type: text norms: false - default_field: false description: Operating system name, without the version. example: Mac OS X - name: os.platform diff --git a/packages/network_traffic/data_stream/thrift/fields/agent.yml b/packages/network_traffic/data_stream/thrift/fields/agent.yml index da4e652c53b..a55e9f71b3e 100644 --- a/packages/network_traffic/data_stream/thrift/fields/agent.yml +++ b/packages/network_traffic/data_stream/thrift/fields/agent.yml @@ -104,7 +104,6 @@ For example, on Windows this could be the host''s Active Directory domain or NetBIOS domain name. For Linux this could be the domain of the host''s LDAP provider.' example: CONTOSO - default_field: false - name: hostname level: core type: keyword @@ -157,7 +156,6 @@ - name: text type: text norms: false - default_field: false description: Operating system name, without the version. example: Mac OS X - name: os.platform diff --git a/packages/network_traffic/data_stream/tls/fields/agent.yml b/packages/network_traffic/data_stream/tls/fields/agent.yml index da4e652c53b..a55e9f71b3e 100644 --- a/packages/network_traffic/data_stream/tls/fields/agent.yml +++ b/packages/network_traffic/data_stream/tls/fields/agent.yml @@ -104,7 +104,6 @@ For example, on Windows this could be the host''s Active Directory domain or NetBIOS domain name. For Linux this could be the domain of the host''s LDAP provider.' example: CONTOSO - default_field: false - name: hostname level: core type: keyword @@ -157,7 +156,6 @@ - name: text type: text norms: false - default_field: false description: Operating system name, without the version. example: Mac OS X - name: os.platform diff --git a/packages/network_traffic/data_stream/tls/fields/protocol.yml b/packages/network_traffic/data_stream/tls/fields/protocol.yml index 3c5ec005271..bd207b73533 100644 --- a/packages/network_traffic/data_stream/tls/fields/protocol.yml +++ b/packages/network_traffic/data_stream/tls/fields/protocol.yml @@ -7,7 +7,6 @@ fields: - name: x509 type: group - default_field: false fields: - name: version type: keyword @@ -25,7 +24,6 @@ fields: - name: x509 type: group - default_field: false fields: - name: version type: keyword @@ -39,7 +37,6 @@ description: Province or region within country. - name: detailed type: group - default_field: false fields: - name: version type: keyword From e679e49aead20f043cd5d4591d6364b868a98d64 Mon Sep 17 00:00:00 2001 From: Dan Kortschak <90160302+efd6@users.noreply.github.com> Date: Wed, 9 Feb 2022 07:50:04 +1030 Subject: [PATCH 3/3] Update packages/network_traffic/changelog.yml Co-authored-by: Andrew Kroh --- packages/network_traffic/changelog.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/network_traffic/changelog.yml b/packages/network_traffic/changelog.yml index 232a763b6db..1b7df276e59 100644 --- a/packages/network_traffic/changelog.yml +++ b/packages/network_traffic/changelog.yml @@ -1,7 +1,7 @@ # newer versions go on top - version: "0.6.1" changes: - - description: Remove unused field + - description: Remove unused field metadata. type: enhancement link: https://github.com/elastic/integrations/pull/2648 - version: "0.6.0"