From 2c47ac8d7e3af05dc84c19ae5ff81aeaf3cca875 Mon Sep 17 00:00:00 2001 From: Marcin Tojek Date: Wed, 15 Sep 2021 22:31:29 +0200 Subject: [PATCH] Docker: remove deprecated fields (#27933) * Docker: remove deprecated fields * Update docs/fields.asciidoc * Update CHANGELOG * Fix * Fix --- CHANGELOG.next.asciidoc | 1 + metricbeat/docs/fields.asciidoc | 137 ------------------ .../module/docker/diskio/_meta/fields.yml | 21 +-- metricbeat/module/docker/diskio/data.go | 3 - metricbeat/module/docker/fields.go | 2 +- .../module/docker/network/_meta/fields.yml | 46 ------ metricbeat/module/docker/network/data.go | 14 -- 7 files changed, 5 insertions(+), 219 deletions(-) diff --git a/CHANGELOG.next.asciidoc b/CHANGELOG.next.asciidoc index 786d73a0502..e57576aa204 100644 --- a/CHANGELOG.next.asciidoc +++ b/CHANGELOG.next.asciidoc @@ -112,6 +112,7 @@ https://github.com/elastic/beats/compare/v7.0.0-alpha2...master[Check the HEAD d - Add support for kube-state-metrics v2.0.0 {pull}27552[27552] - Add User-Agent header to HTTP requests. {issue}18160[18160] {pull}27509[27509] - Errors should be thrown as errors. Metricsets inside Metricbeat will now throw errors as the `error` log level. {pull}27804[27804] +- Remove deprecated fields in Docker module. {issue}11835[11835] {pull}27933[27933] *Packetbeat* diff --git a/metricbeat/docs/fields.asciidoc b/metricbeat/docs/fields.asciidoc index 0551dbbff8f..da9d67c3783 100644 --- a/metricbeat/docs/fields.asciidoc +++ b/metricbeat/docs/fields.asciidoc @@ -12029,19 +12029,6 @@ type: long -- -*`docker.diskio.reads`*:: -+ --- - -deprecated:[6.4] - -Number of current reads per second - - -type: scaled_float - --- - [float] === write @@ -12111,19 +12098,6 @@ type: long -- -*`docker.diskio.writes`*:: -+ --- - -deprecated:[6.4] - -Number of current writes per second - - -type: scaled_float - --- - [float] === summary @@ -12193,19 +12167,6 @@ type: long -- -*`docker.diskio.total`*:: -+ --- - -deprecated:[6.4] - -Number of reads and writes per second - - -type: scaled_float - --- - [float] === event @@ -12703,104 +12664,6 @@ type: keyword -- -[float] -=== in - -Incoming network stats per second. - - - -*`docker.network.in.bytes`*:: -+ --- -Total number of incoming bytes. - - -type: long - -format: bytes - --- - -*`docker.network.in.dropped`*:: -+ --- -Total number of dropped incoming packets. - - -type: scaled_float - --- - -*`docker.network.in.errors`*:: -+ --- -Total errors on incoming packets. - - -type: long - --- - -*`docker.network.in.packets`*:: -+ --- -Total number of incoming packets. - - -type: long - --- - -[float] -=== out - -Outgoing network stats per second. - - - -*`docker.network.out.bytes`*:: -+ --- -Total number of outgoing bytes. - - -type: long - -format: bytes - --- - -*`docker.network.out.dropped`*:: -+ --- -Total number of dropped outgoing packets. - - -type: scaled_float - --- - -*`docker.network.out.errors`*:: -+ --- -Total errors on outgoing packets. - - -type: long - --- - -*`docker.network.out.packets`*:: -+ --- -Total number of outgoing packets. - - -type: long - --- - [float] === inbound diff --git a/metricbeat/module/docker/diskio/_meta/fields.yml b/metricbeat/module/docker/diskio/_meta/fields.yml index 71f9e22859a..74532058ec3 100644 --- a/metricbeat/module/docker/diskio/_meta/fields.yml +++ b/metricbeat/module/docker/diskio/_meta/fields.yml @@ -28,17 +28,12 @@ Total time to service IO requests, in nanoseconds - name: wait_time type: long - description: > + description: > Total time requests spent waiting in queues for service, in nanoseconds - name: queued type: long description: > Total number of queued requests - - name: reads - type: scaled_float - deprecated: 6.4 - description: > - Number of current reads per second - name: write type: group description: > @@ -63,17 +58,12 @@ Total time to service IO requests, in nanoseconds - name: wait_time type: long - description: > + description: > Total time requests spent waiting in queues for service, in nanoseconds - name: queued type: long description: > Total number of queued requests - - name: writes - type: scaled_float - deprecated: 6.4 - description: > - Number of current writes per second - name: summary type: group description: > @@ -98,14 +88,9 @@ Total time to service IO requests, in nanoseconds - name: wait_time type: long - description: > + description: > Total time requests spent waiting in queues for service, in nanoseconds - name: queued type: long description: > Total number of queued requests - - name: total - type: scaled_float - deprecated: 6.4 - description: > - Number of reads and writes per second diff --git a/metricbeat/module/docker/diskio/data.go b/metricbeat/module/docker/diskio/data.go index 04665ca85cc..4d5ae9b0e5c 100644 --- a/metricbeat/module/docker/diskio/data.go +++ b/metricbeat/module/docker/diskio/data.go @@ -30,9 +30,6 @@ func eventsMapping(r mb.ReporterV2, blkioStatsList []BlkioStats) { func eventMapping(r mb.ReporterV2, stats *BlkioStats) { fields := common.MapStr{ - "reads": stats.reads, - "writes": stats.writes, - "total": stats.totals, "read": common.MapStr{ "ops": stats.serviced.reads, "bytes": stats.servicedBytes.reads, diff --git a/metricbeat/module/docker/fields.go b/metricbeat/module/docker/fields.go index 500a172a399..9c88da1e5b9 100644 --- a/metricbeat/module/docker/fields.go +++ b/metricbeat/module/docker/fields.go @@ -32,5 +32,5 @@ func init() { // AssetDocker returns asset data. // This is the base64 encoded zlib format compressed contents of module/docker. func AssetDocker() string { - return "eJzsXE1v4zjSvudXFPIeXqCR2NjFYA8+LDCb7kUHOz0ddCe7h8HAQ1Nlu9YSqSYpu92/fkFSkm2JkvwhO8kgPuQQWlVPfRfJkm9hgesRRJIvUF0BGDIxjuD6vfvH9RVAhJorSg1JMYK/XwEA+EXQhhkNXMYxcoMRTJVM8rXBFYDCGJnGEczYFYBGY0jM9Ah+u9Y6vv7d/m8ulRlzKaY0G8GUxRqvAKaEcaRHjtMtCJbgFj77MevUUlUyS/P/BDDaz72YSpUw+29gInKASRviGthEZiYn+/8aVCYEiRlwKQwjgUoPcirbaLYRld8sV0LAWsBtKbKkBQkaRbxkbj+7aiw+VVi70JKEiWhnrQC3wPVKqupaC0T7ufMEwcyZgRXTgN+RZ9bkJMDMsSbHIIxLITMYxhUxg4eBes8MwmqOHsFGhRZfzikMw3pBpvvUTsHaUw5zpXTMokih1hjmTemxbO8foCTdIDL9qGo37KuHiUs/MOSx0OCf24iUlGY8rWpiAyyWYhZY7MDmPo/SsNiDk1NgcewcZEox6sJfGxx1B+DqHNi+5qg2iFxMzdkSYYIoCs8FqYDPmZhhBJoER79AUoQNbNisR4++T9gMHc1BPe+l2SkZ70smDCUIdw9P/SS7BSqB8SDlJii/5izGaDyNJat+wdeGEaSoOIrqaoeKHvxDVk/WnFYkEjkY0CnjGDZUDldIlbxAzGBxsZh+YASTtfNSkSUTVPYBazIuVVOOySUzxBdhVwyETVeqeXgCR28/3eq1NvjsanXZxyP3CrZazKG1wX4JLtGC/RTXyCXs2zVyYI5smHGmUT23TnNNWihtzuugvgQfqOE9xfJOqrOlhC6dOn++uD4fyyjKNJu1QnsWe1fwnWJeuzR41yiBnPwXa0v+n+NL+vRuRiPtcbdJ1GqYFy3WTQ/2bA7YbtEPD+lfd9CVwR0wVHkaQHpB8qSNN+kF3A8/99ODKmThXe0R26ufOc+SLHabAEtXQ5QpEjNnyJim5fYhdADRBHQbrEzPsevaGPEo0Bt4k7WpbZA7ARZB1fTwHgL8wz7qwB+PXdUPMTqhH6RbnimFwuQ6Tm31Qy5rRz1bnReqJXEc2zRxBmS+lLgcZGTBDO4/g8JvGWqjb2wkCyakx1m3TQF0xcj0gBK6YBbAQKdWkZattTUJ+JZhhtq6UiHI3uDdo3Uj9KXfTfr2jEohGpNROHm3VKUIU4XcJp0R/G3w07EJfC//LE2uqBYuvaRNR/jV5c3jUL+UxGnRGxSvIHfmen5Lnm/JM6BJ5xzPnD3bPbT0zixJmFqfr+9k4rWmUtvYyxSVOzB/tSnV9aKFEV5Hbt1S+lt+fcuvdTDu2OuZ0mstqwVctMCJy92zmWNv9qt0Dj9b6Pu2+oNFFKJaXlT3ODjgmVHk7+nZklHMJjEG+U6VTHoXU2aKh9lZ2v2xe5yje9z6mT8OA0zITby4HF31gw0Oxi3N8yBp5Sqr9eKE1qFOrKsFqHlZl9h74CjEv39flMb9TLGjGGMUTbK2uh88A4XqOehJUvybKZKZtkSGSxZnuIVrV7Ybmx1RRFY6KYCM3vXsQq45stjM+Rz5ooe0tkWtfoK688DHrW9GzDBYURyDFPEaJrjJCH52LKqMEWmbNxRacXeI5t/74+OHn395/Hj38cPdv/4AEtqozEUTzJn24xSZxshW/0lGceTUlj9LSeVq5vDMPGUUk5hpo5AtgrFEwuCs1pd12J9LwTPXTVkGGEHVaOerDdvG8rSByyicP0NhdHQGccRyZR86SYQiGgemx6BttGwPSFV9oIjClLaMocwlkDhG7VhkZtIslKJ6yE3bUBr4lKb5TmZc86BtJOEIOU4pNXcta42N9R6ynqPTz41RQ5N1ROjYgueBxWxtUyZFKAxNqT7c1hVJ+S7uPG4DT4K+ZQXWDUiY0dIm6jSvXuE5t22YKTsjyvsNsLzOOsA3QFMgYz3abRxduVrNic/9Fjzf/3rhIlLITbx2DFFUU9oZx2HdkK7dSZZzsR5R90xsjwOifnrQzV96lzzUD5ekTFbbJkLf85e1FmAXhcJZFrNQaup5QtViYXEMnPE5Rh6WBqa15OSO44ysO1lDu1WAj9kE42Ov8E+YGfV8O8BdbliVxPSkMYF7MZVFwocJs82k7S6NSfVoOIwk1wPfTw64TIYoZiRwqHCKCgXHIUtp6NfHChNpcMxSGi//MvjrT8P/G0ak05itb/0Y2+2KIrylzRsLp74DUPTQfYX15yUq56Y74+4HB3fKbE9+hqiqHkd5RoE3OuqY8rc/LgCq+T2TOiptZJpeRFU5p71QhU7wzoHJVdo2VZ3jvCrvUYpdrtQm2E6Fcbi8HcRy+ExUozY8l3qmSzCRO5dBB+e6T45CP+2tzwzvjqw/AXVtrY8TlqYkZvmXr99dH6baL2yVayt/gc31cq7AOm3pfHVgV90GRU1ZwyEil0lCve2C7xw14+b23EGPgP+QiOSq6lVdOfaoGO3h3sp7bZhAmf/rhyWXgPaAbJGbq1PBJVRFS2ZwvJJqYR1Ooxk0X2AEsLfh7sCc84acN2g0nXinjOIBl1nDuUzrDUsrmH8ysnU/s7EQTsIxNcVBv2rJk5RjF0aidG8dz5evX3cyxaGtzvOGYY5coXYlzHqQ23K0bKyDp9qdzgOdU8174v7UgLig2jhM7+bY+7L6k/anPMfbPWHfn8Hqn9j3AnXgvQN4eXb2bx802RZeWiBVlFrrwAQam6xPacF+9SSO78HCjWmwhTmpTy6AlqQdq4b+PHy5GY7MEy767wWXiS2VuSHy7m5zyX9oGD/X9E+196dCMEezOUoi1b5f7AjtI5DlHDcIU8YXWE+YWzcCSsnakQT0tn305N1F6N6Q8i9cYEvbjmnr7uYyAfM5MzP5ZwwYWQj2YgOmRPhyAmZ/SJcLmHZMmwIzkVnDz50cc30RriP+Vxh2f2rE3cRWr1ReT5z0VVj6M/hbQTlPQek1QBrqxp8wQPoqJP0HyFsBObGAVHZt4/rbFOH4KPdhEzRsv11dM4vWCZH0kPPzrpr2UBzfNYxl8z65Pd51sMuiPtk9ve9mN47JYM88fyGD7YyJJ71a8e5Th6T2r/89jLThWuyIq6g5ul/rgofNXG2Z4W+AS6VQp9KPoBoJw1RJPvwtpej3ocDw+PEGZ68wNwCL0lQy8pOg+e8h7A1fOwn+FwAA//+qunky" + return "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" } diff --git a/metricbeat/module/docker/network/_meta/fields.yml b/metricbeat/module/docker/network/_meta/fields.yml index 035047eb091..68af440a9bf 100644 --- a/metricbeat/module/docker/network/_meta/fields.yml +++ b/metricbeat/module/docker/network/_meta/fields.yml @@ -9,52 +9,6 @@ type: keyword description: > Network interface name. - - name: in - type: group - deprecated: 6.4 - description: > - Incoming network stats per second. - fields: - - name: bytes - type: long - format: bytes - description: > - Total number of incoming bytes. - - name: dropped - type: scaled_float - description: > - Total number of dropped incoming packets. - - name: errors - type: long - description: > - Total errors on incoming packets. - - name: packets - type: long - description: > - Total number of incoming packets. - - name: out - type: group - deprecated: 6.4 - description: > - Outgoing network stats per second. - fields: - - name: bytes - type: long - format: bytes - description: > - Total number of outgoing bytes. - - name: dropped - type: scaled_float - description: > - Total number of dropped outgoing packets. - - name: errors - type: long - description: > - Total errors on outgoing packets. - - name: packets - type: long - description: > - Total number of outgoing packets. - name: inbound type: group description: > diff --git a/metricbeat/module/docker/network/data.go b/metricbeat/module/docker/network/data.go index b4a2b90c405..c537032abb1 100644 --- a/metricbeat/module/docker/network/data.go +++ b/metricbeat/module/docker/network/data.go @@ -33,20 +33,6 @@ func eventMapping(r mb.ReporterV2, stats *NetStats) { RootFields: stats.Container.ToMapStr(), MetricSetFields: common.MapStr{ "interface": stats.NameInterface, - // Deprecated - "in": common.MapStr{ - "bytes": stats.RxBytes, - "dropped": stats.RxDropped, - "errors": stats.RxErrors, - "packets": stats.RxPackets, - }, - // Deprecated - "out": common.MapStr{ - "bytes": stats.TxBytes, - "dropped": stats.TxDropped, - "errors": stats.TxErrors, - "packets": stats.TxPackets, - }, "inbound": common.MapStr{ "bytes": stats.Total.RxBytes, "dropped": stats.Total.RxDropped,