Incorporate standard parsers. (#19)

Makefile

@@ -2,7 +2,7 @@
 
 BASE_PACKAGE_NAME=google-fluentd
 PACKAGE_NAME=${BASE_PACKAGE_NAME}-catch-all-config-structured
-PACKAGE_VERSION=0.7
+PACKAGE_VERSION=1.0
 BUILD_DESCRIPTION="Automated Build"
 
 BUILD_DIR=build

README.md

@@ -2,3 +2,12 @@ fluentd-catch-all-config
 ========================
 
 Collection of configuration files for the Fluentd log collection agent. Intended to enable the automagic collection of most logs generated by many of the most popular applications run in the cloud.
+
+**Major version updates may introduce changes that are not backwards compatible.**
+
+This package attempts to keep parity with the [Fluentd Parsers](https://docs.fluentd.org/articles/parser-plugin-overview) when providing structured logs. The parsers that this package currently uses are:
+
+* `apache2`
+* `apache_error`
+* `nginx`
+* `syslog`

configs/config.d/apache.conf

@@ -1,6 +1,6 @@
 <source>
   @type tail
-  format none
+  format apache2
   path /var/log/apache*/access.log,/var/log/apache*/access_log,/var/log/httpd/access.log,/var/log/httpd/access_log
   pos_file /var/lib/google-fluentd/pos/apache-access.pos
   read_from_head true
@@ -9,7 +9,7 @@
 
 <source>
   @type tail
-  format none
+  format apache_error
   path /var/log/apache*/error.log,/var/log/apache*/error_log,/var/log/httpd/error.log,/var/log/httpd/error_log
   pos_file /var/lib/google-fluentd/pos/apache-error.pos
   read_from_head true

configs/config.d/nginx.conf

@@ -1,6 +1,6 @@
 <source>
   @type tail
-  format none
+  format nginx
   path /var/log/nginx/access.log
   pos_file /var/lib/google-fluentd/pos/nginx-access.pos
   read_from_head true

configs/config.d/syslog.conf

@@ -2,7 +2,7 @@
   @type tail
 
   # Parse the timestamp, but still collect the entire line as 'message'
-  format /^(?<message>(?<time>[^ ]*\s*[^ ]* [^ ]*) .*)$/
+  format syslog
 
   path /var/log/syslog
   pos_file /var/lib/google-fluentd/pos/syslog.pos

pkg/deb/debian/changelog

@@ -1,43 +1,6 @@
-google-fluentd-catch-all-config (0.7) unstable; urgency=medium
-
-  * Update maintainer in debian package. (#18)
-  * Use unique pos file paths for Puppet Enterprise. (#20)
-
- -- Google Cloud Logging Team <[email protected]>  Wed, 21 Feb 2018 12:11:00 -0500
-
-google-fluentd-catch-all-config (0.6) unstable; urgency=medium
-
-  * Fix deprecated parameter name 'type' warnings in the log.
-
- -- Google Cloud Logging Team <[email protected]>  Tue, 25 Sep 2017 16:10:21 -0400
-
-google-fluentd-catch-all-config (0.5) unstable; urgency=medium
-
-  * Accept structured logs data over TCP by default.
-
- -- Google Cloud Logging Team <[email protected]>  Tue, 21 Jul 2015 18:21:44 -0400
-
-google-fluentd-catch-all-config (0.4) unstable; urgency=medium
-
-  * Fix apache/httpd log paths on Red Hat based systems.
-
- -- Google Cloud Logging Team <[email protected]>  Tue, 21 Jul 2015 18:21:44 -0400
-
-google-fluentd-catch-all-config (0.3) unstable; urgency=medium
-
-  * move pos_files to /var/lib/google-fluentd/pos
-
- -- Google Cloud Logging Team <[email protected]>  Mon, 15 Jun 2015 12:02:17 -0400
-
-google-fluentd-catch-all-config (0.2) unstable; urgency=medium
-
-  * Remove google-fluentd.conf so we don't have to worry about diversions.
-    This is now included in the base google-fluentd package (v1.3)
-
- -- Google Cloud Logging Team <[email protected]>  Fri, 13 Mar 2015 14:57:49 -0400
-
-google-fluentd-catch-all-config (0.1) unstable; urgency=medium
+google-fluentd-catch-all-config (1.0) unstable; urgency=medium
 
   * Initial release.
 
- -- Google Cloud Logging Team <[email protected]>  Tue, 03 Mar 2015 16:55:25 -0500
+ -- Stackdriver Agents <[email protected]>  Wed, 21 Mar 2018 11:30:00 -0500
+