Adding upstream version 1.42.0.upstream/1.42.0

Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>

2 files changed, 132 insertions, 126 deletions

diff --git a/collectors/nfacct.plugin/metadata.yaml b/collectors/nfacct.plugin/metadata.yaml
index 2dbd31ec2..943471a37 100644
--- a/collectors/nfacct.plugin/metadata.yaml
+++ b/collectors/nfacct.plugin/metadata.yaml
@@ -1,119 +1,133 @@
-meta:
-  plugin_name: nfacct.plugin
-  module_name: nfacct.plugin
-  monitored_instance:
-    name: Netfilter
-    link: ''
-    categories:
-    - data-collection.networking-stack-and-network-interfaces
-    icon_filename: 'netfilter.png'
-  related_resources:
-    integrations:
-      list: []
-  info_provided_to_referring_integrations:
-    description: ''
-  keywords: []
-  most_popular: false
-overview:
-  data_collection:
-    metrics_description: 'Monitor Netfilter metrics for optimal packet filtering and manipulation. Keep tabs on packet counts, dropped packets, and error rates to secure network operations.'
-    method_description: ''
-  supported_platforms:
-    include: []
-    exclude: []
-  multi-instance: true
-  additional_permissions:
-    description: ''
-  default_behavior:
-    auto_detection:
-      description: ''
-    limits:
-      description: ''
-    performance_impact:
-      description: ''
-setup:
-  prerequisites:
-    list: []
-  configuration:
-    file:
-      name: ''
-      description: ''
-    options:
-      description: ''
-      folding:
-        title: ''
-        enabled: true
-      list: []
-    examples:
-      folding:
-        enabled: true
-        title: ''
-      list: []
-troubleshooting:
-  problems:
-    list: []
-alerts: []
-metrics:
-  folding:
-    title: Metrics
-    enabled: false
-  description: ""
-  availability: []
-  scopes:
-  - name: global
-    description: ""
-    labels: []
+plugin_name: nfacct.plugin
+modules:
+  - meta:
+      plugin_name: nfacct.plugin
+      module_name: nfacct.plugin
+      monitored_instance:
+        name: Netfilter
+        link: 'https://www.netfilter.org/'
+        categories:
+          - data-collection.linux-systems.firewall-metrics
+        icon_filename: 'netfilter.png'
+      related_resources:
+        integrations:
+          list: []
+      info_provided_to_referring_integrations:
+        description: ''
+      keywords: []
+      most_popular: false
+    overview:
+      data_collection:
+        metrics_description: 'Monitor Netfilter metrics for optimal packet filtering and manipulation. Keep tabs on packet counts, dropped packets, and error rates to secure network operations.'
+        method_description: 'Netdata uses libmnl (https://www.netfilter.org/projects/libmnl/index.html) to collect information.'
+      supported_platforms:
+        include: []
+        exclude: []
+      multi_instance: true
+      additional_permissions:
+        description: 'This plugin needs setuid.'
+      default_behavior:
+        auto_detection:
+          description: 'This plugin uses socket to connect with netfilter to collect data'
+        limits:
+          description: ''
+        performance_impact:
+          description: ''
+    setup:
+      prerequisites:
+        list:
+          - title: Install required packages
+            description: |
+              Install `libmnl-dev` and `libnetfilter-acct-dev` using the package manager of your system.
+      configuration:
+        file:
+          name: 'netdata.conf'
+          section_name: '[plugin:nfacct]'
+          description: 'This is netdata main configuration file'
+        options:
+          description: ''
+          folding:
+            title: 'Config options'
+            enabled: true
+          list:
+            - name: update every
+              description: Data collection frequency.
+              default_value: 1
+              required: false
+            - name: command options
+              description: Additinal parameters for collector
+              default_value: ""
+              required: false
+        examples:
+          folding:
+            enabled: true
+            title: ''
+          list: []
+    troubleshooting:
+      problems:
+        list: []
+    alerts: []
     metrics:
-    - name: netfilter.netlink_new
-      description: Connection Tracker New Connections
-      unit: "connections/s"
-      chart_type: line
-      dimensions:
-      - name: new
-      - name: ignore
-      - name: invalid
-    - name: netfilter.netlink_changes
-      description: Connection Tracker Changes
-      unit: "changes/s"
-      chart_type: line
-      dimensions:
-      - name: insert
-      - name: delete
-      - name: delete_list
-    - name: netfilter.netlink_search
-      description: Connection Tracker Searches
-      unit: "searches/s"
-      chart_type: line
-      dimensions:
-      - name: searched
-      - name: search_restart
-      - name: found
-    - name: netfilter.netlink_errors
-      description: Connection Tracker Errors
-      unit: "events/s"
-      chart_type: line
-      dimensions:
-      - name: icmp_error
-      - name: insert_failed
-      - name: drop
-      - name: early_drop
-    - name: netfilter.netlink_expect
-      description: Connection Tracker Expectations
-      unit: "expectations/s"
-      chart_type: line
-      dimensions:
-      - name: created
-      - name: deleted
-      - name: new
-    - name: netfilter.nfacct_packets
-      description: Netfilter Accounting Packets
-      unit: "packets/s"
-      chart_type: line
-      dimensions:
-      - name: a dimension per nfacct object
-    - name: netfilter.nfacct_bytes
-      description: Netfilter Accounting Bandwidth
-      unit: "kilobytes/s"
-      chart_type: line
-      dimensions:
-      - name: a dimension per nfacct object
+      folding:
+        title: Metrics
+        enabled: false
+      description: ""
+      availability: []
+      scopes:
+        - name: global
+          description: ""
+          labels: []
+          metrics:
+            - name: netfilter.netlink_new
+              description: Connection Tracker New Connections
+              unit: "connections/s"
+              chart_type: line
+              dimensions:
+                - name: new
+                - name: ignore
+                - name: invalid
+            - name: netfilter.netlink_changes
+              description: Connection Tracker Changes
+              unit: "changes/s"
+              chart_type: line
+              dimensions:
+                - name: insert
+                - name: delete
+                - name: delete_list
+            - name: netfilter.netlink_search
+              description: Connection Tracker Searches
+              unit: "searches/s"
+              chart_type: line
+              dimensions:
+                - name: searched
+                - name: search_restart
+                - name: found
+            - name: netfilter.netlink_errors
+              description: Connection Tracker Errors
+              unit: "events/s"
+              chart_type: line
+              dimensions:
+                - name: icmp_error
+                - name: insert_failed
+                - name: drop
+                - name: early_drop
+            - name: netfilter.netlink_expect
+              description: Connection Tracker Expectations
+              unit: "expectations/s"
+              chart_type: line
+              dimensions:
+                - name: created
+                - name: deleted
+                - name: new
+            - name: netfilter.nfacct_packets
+              description: Netfilter Accounting Packets
+              unit: "packets/s"
+              chart_type: line
+              dimensions:
+                - name: a dimension per nfacct object
+            - name: netfilter.nfacct_bytes
+              description: Netfilter Accounting Bandwidth
+              unit: "kilobytes/s"
+              chart_type: line
+              dimensions:
+                - name: a dimension per nfacct object
diff --git a/collectors/nfacct.plugin/metrics.csv b/collectors/nfacct.plugin/metrics.csv
deleted file mode 100644
index 7bd00d3f1..000000000
--- a/collectors/nfacct.plugin/metrics.csv
+++ /dev/null
@@ -1,8 +0,0 @@
-metric,scope,dimensions,unit,description,chart_type,labels,plugin,module
-netfilter.netlink_new,,"new, ignore, invalid",connections/s,"Connection Tracker New Connections",line,,nfacct.plugin,
-netfilter.netlink_changes,,"insert, delete, delete_list",changes/s,"Connection Tracker Changes",line,,nfacct.plugin,
-netfilter.netlink_search,,"searched, search_restart, found",searches/s,"Connection Tracker Searches",line,,nfacct.plugin,
-netfilter.netlink_errors,,"icmp_error, insert_failed, drop, early_drop",events/s,"Connection Tracker Errors",line,,nfacct.plugin,
-netfilter.netlink_expect,,"created, deleted, new",expectations/s,"Connection Tracker Expectations",line,,nfacct.plugin,
-netfilter.nfacct_packets,,a dimension per nfacct object,packets/s,"Netfilter Accounting Packets",line,,nfacct.plugin,
-netfilter.nfacct_bytes,,a dimension per nfacct object,kilobytes/s,"Netfilter Accounting Bandwidth",line,,nfacct.plugin,
\ No newline at end of file