Use dots in field names and make filters pluggable

CHANGELOG.asciidoc

@@ -48,6 +48,8 @@ https://github.com/elastic/beats/compare/v5.0.0-alpha2...master[Check the HEAD d
 
 *Affecting all Beats*
 
+- Add conditions to generic filtering {pull}1623[1623]
+
 *Packetbeat*
 
 *Topbeat*

filebeat/filebeat.yml

@@ -453,3 +453,15 @@ logging.files:
 
   # Number of rotated log files to keep. Oldest files will be deleted first.
   #keepfiles: 7
+
+#================================ Filters =====================================
+
+# This section defines a list of filtering rules that are applied one by one starting with the
+# exported event:
+#   event -> filter1 -> event1 -> filter2 ->event2 ...
+# Supported actions: drop_fields, drop_event, include_fields
+#filters:
+#  - drop_fields:
+#      equals:
+#        status: OK
+#      fields: [ ]

filebeat/tests/system/config/filebeat.yml.j2

@@ -132,19 +132,29 @@ output:
     rotate_every_kb: 1000
     number_of_files: 2
 
-{% if filter_enabled %}
-
+############################# Filters #########################################
+{%- if drop_fields or drop_event or include_fields %}
 filters:
 
+    {%- if include_fields %}
+    - include_fields:
+        {{include_fields.condition | default()}}
+        fields: {{include_fields.fields | default([])}}
+    {%- endif %}
+
     {%- if drop_fields %}
     - drop_fields:
-        fields: {{drop_fields}}
+        {{drop_fields.condition | default()}}
+        fields: {{drop_fields.fields | default([])}}
     {%- endif %}
-    {%- if include_fields is not none %}
-    - include_fields:
-        fields: {{include_fields}}
+
+
+    {%- if drop_event %}
+    - drop_event:
+        {{ drop_event.condition | default()}}
     {%- endif %}
-{% endif %}
+
+{%- endif %}
 
 {% if path_data %}
 path:

filebeat/tests/system/test_filtering.py

@@ -13,9 +13,9 @@ def test_dropfields(self):
         """
         self.render_config_template(
             path=os.path.abspath(self.working_dir) + "/test.log",
-            filter_enabled=True,
-            drop_fields=["beat"],
-            include_fields=None,
+            drop_fields={
+                "fields": ["beat"],
+            },
         )
         with open(self.working_dir + "/test.log", "w") as f:
             f.write("test message\n")
@@ -36,8 +36,9 @@ def test_include_fields(self):
         """
         self.render_config_template(
             path=os.path.abspath(self.working_dir) + "/test.log",
-            filter_enabled=True,
-            include_fields=["source", "offset", "message"]
+            include_fields={
+                "fields": ["source", "offset", "message"],
+            },
         )
         with open(self.working_dir + "/test.log", "w") as f:
             f.write("test message\n")
@@ -51,3 +52,30 @@ def test_include_fields(self):
         )[0]
         assert "beat.name" not in output
         assert "message" in output
+
+    def test_drop_event(self):
+        """
+        Check drop_event filtering action
+        """
+        self.render_config_template(
+            path=os.path.abspath(self.working_dir) + "/test*.log",
+            drop_event={
+                "condition": "contains.source: test1",
+            },
+        )
+        with open(self.working_dir + "/test1.log", "w") as f:
+            f.write("test1 message\n")
+
+        with open(self.working_dir + "/test2.log", "w") as f:
+            f.write("test2 message\n")
+
+        filebeat = self.start_beat()
+        self.wait_until(lambda: self.output_has(lines=1))
+        filebeat.check_kill_and_wait()
+
+        output = self.read_output(
+            required_fields=["@timestamp", "type"],
+        )[0]
+        assert "beat.name" in output
+        assert "message" in output
+        assert "test" in output["message"]

filebeat/tests/system/test_json.py

@@ -257,9 +257,9 @@ def test_with_generic_filtering(self):
                 overwrite_keys=True,
                 add_error_key=True,
                 ),
-            filter_enabled=True,
-            drop_fields=["headers.request-id"],
-            include_fields=None,
+            drop_fields={
+                "fields": ["headers.request-id"],
+            },
         )
 
         os.mkdir(self.working_dir + "/log/")
@@ -297,9 +297,9 @@ def test_with_generic_filtering_remove_headers(self):
                 overwrite_keys=True,
                 add_error_key=True,
                 ),
-            filter_enabled=True,
-            drop_fields=["headers", "res"],
-            include_fields=None,
+            drop_fields={
+                "fields": ["headers", "res"],
+            },
         )
 
         os.mkdir(self.working_dir + "/log/")

libbeat/_beat/config.yml

@@ -250,3 +250,15 @@ logging.files:
 
   # Number of rotated log files to keep. Oldest files will be deleted first.
   #keepfiles: 7
+
+#================================ Filters =====================================
+
+# This section defines a list of filtering rules that are applied one by one starting with the
+# exported event:
+#   event -> filter1 -> event1 -> filter2 ->event2 ...
+# Supported actions: drop_fields, drop_event, include_fields
+#filters:
+#  - drop_fields:
+#      equals:
+#        status: OK
+#      fields: [ ]

libbeat/beat/beat.go

@@ -44,6 +44,7 @@ import (
 	"github.com/elastic/beats/libbeat/cfgfile"
 	"github.com/elastic/beats/libbeat/common"
 	"github.com/elastic/beats/libbeat/filter"
+	_ "github.com/elastic/beats/libbeat/filter/rules"
 	"github.com/elastic/beats/libbeat/logp"
 	"github.com/elastic/beats/libbeat/paths"
 	"github.com/elastic/beats/libbeat/publisher"
@@ -106,15 +107,15 @@ type Beat struct {
 	Config    BeatConfig           // Common Beat configuration data.
 	Publisher *publisher.Publisher // Publisher
 
-	filters *filter.FilterList // Filters
+	filters *filter.Filters // Filters
 }
 
 // BeatConfig struct contains the basic configuration of every beat
 type BeatConfig struct {
 	Shipper publisher.ShipperConfig   `config:",inline"`
 	Output  map[string]*common.Config `config:"output"`
 	Logging logp.Logging              `config:"logging"`
-	Filters []filter.FilterConfig     `config:"filters"`
+	Filters filter.FilterPluginConfig `config:"filters"`
 	Path    paths.Path                `config:"path"`
 }
 
@@ -226,7 +227,6 @@ func (bc *instance) config() error {
 	if err != nil {
 		return fmt.Errorf("error initializing filters: %v", err)
 	}
-	debugf("Filters: %+v", bc.data.filters)
 
 	if bc.data.Config.Shipper.MaxProcs != nil {
 		maxProcs := *bc.data.Config.Shipper.MaxProcs

libbeat/common/config.go

@@ -98,3 +98,6 @@ func fromConfig(in *ucfg.Config) *Config {
 func (c *Config) access() *ucfg.Config {
 	return (*ucfg.Config)(c)
 }
+func (c *Config) GetFields() []string {
+	return c.access().GetFields()
+}