fluent-plugin-systemd 1.0.0.rc1 → 1.0.0.rc2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 13f78fa020542fb3c022c6d0870ecf1ec2d307ae
-  data.tar.gz: 5cac751f2b33bc5783bf3a721999890e9f2c51ba
+  metadata.gz: 698b184013d7951b6323e6ee2267407c1ba7a2fd
+  data.tar.gz: 91cb4508dfc5a60cd5ca421959cb710bcaabcd3c
 SHA512:
-  metadata.gz: 89677dd5dbf1c6648e37ec969590392cf54a929ae15d30a64824df1b3a93f1a7ea54f71c83839f484bcc914f5ffbaf8b2b32c05320e1dc45084ea30ec48afdae
-  data.tar.gz: dcd1c5f2eaac7c766344bbbae29d7fc8fb10cc951cc7dfbb07982ae5946dc8eef6ec26593b8ade6bac1c8fe981b78bb5f291982b9941a6ef02a85801919893c8
+  metadata.gz: 000a8444497e8a5b3555179f0b182a0144ffdf27f6ee9c540c676e6aad73c911546ce79812c3e289548af26fd7d4e3ae403ca488c7699d14d4bbb79d207f0f28
+  data.tar.gz: 615a1b8451be729f01d3e7a991d1d1130624bca527acc3461ebf67ec5a2724114f35c007eb97faf2f02bd5a34e38ea392bd7487ffbb65d558b95bedc55a7d533

data/README.md

@@ -23,6 +23,7 @@ Join the #plugin-systemd channel on the [Fluentd Slack](http://slack.fluentd.org
 
 * The 0.x.x series is developed from this branch (master)
 * The 0.0.x series (compatible with fluentd v0.12, and td-agent 2) is developed on the [0.0.x branch](https://github.com/reevoo/fluent-plugin-systemd/tree/0.0.x)
+* The next version is currently under development on the [1.0.0 branch](https://github.com/reevoo/fluent-plugin-systemd/tree/1.0.0) it's progress is tracked [here](https://github.com/reevoo/fluent-plugin-systemd/issues/53)
 
 ## Installation
 
@@ -40,7 +41,7 @@ or
       @type systemd
       tag kube-proxy
       path /var/log/journal
-      filters [{ "_SYSTEMD_UNIT": "kube-proxy.service" }]
+      matches [{ "_SYSTEMD_UNIT": "kube-proxy.service" }]
       read_from_head true
       <storage>
         @type local
@@ -64,8 +65,16 @@ Path to the systemd journal, defaults to `/var/log/journal`
 
 **`filters`**
 
-Array of filters, see [here](http://www.rubydoc.info/gems/systemd-journal/Systemd%2FJournal%2FFilterable%3Afilter) for further
-documentation, defaults to no filtering.
+_This parameter name is deprecated and should be renamed to `matches`_
+
+**`matches`**
+
+Expects an array of hashes defining desired matches to filter the log
+messages with. When this property is not specified, this plugin will default to
+reading all logs from the journal.
+
+See [matching details](docs/Matching-Details.md) for a more exhaustive
+description of this property and how to use it.
 
 **`pos_file`**
 
@@ -218,3 +227,4 @@ Many thanks to our fantastic contributors
 * [Jesus Rafael Carrillo](https://github.com/jescarri)
 * [John Thomas Wile II](https://github.com/jtwile2)
 * [Kazuhiro Suzuki](https://github.com/ksauzz)
+* [Joel Gerber](https://github.com/Jitsusama)

data/lib/fluent/plugin/in_systemd.rb

@@ -15,7 +15,8 @@ module Fluent
       DEFAULT_STORAGE_TYPE = 'local'
 
       config_param :path, :string, default: '/var/log/journal'
-      config_param :filters, :array, default: []
+      config_param :filters, :array, default: [], deprecated: 'filters has been renamed as matches'
+      config_param :matches, :array, default: nil
       config_param :read_from_head, :bool, default: false
       config_param :tag, :string
 
@@ -54,7 +55,7 @@ module Fluent
         # make sure initial call to wait doesn't return :invalidate
         # see https://github.com/ledbettj/systemd-journal/issues/70
         @journal.wait(0)
-        @journal.filter(*@filters)
+        @journal.filter(*(@matches || @filters))
         seek
         true
       rescue Systemd::JournalError => e

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fluent-plugin-systemd
 version: !ruby/object:Gem::Version
-  version: 1.0.0.rc1
+  version: 1.0.0.rc2
 platform: ruby
 authors:
 - Ed Robinson
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-03-19 00:00:00.000000000 Z
+date: 2018-04-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler