Update apache_http, tomcat, nginx plugins (#221)

Co-authored-by: Eric Holt <[email protected]>

CHANGELOG.md

@@ -5,6 +5,12 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 ## [0.0.45] - Unreleased
 ### Changed
+- Update plugins ([PR221](https://github.com/observIQ/stanza-plugins/pull/221))
+  - `tomcat` and `nginx`
+    - Update `log_format` description
+    - Add `cluster_name` Parameter
+  - `apache_http`
+    - Update `log_format` description
 ## [0.0.44] - 2021-02-04
 ### Changed
 - Update plugins ([PR219](https://github.com/observIQ/stanza-plugins/pull/219))

plugins/apache_http.yaml

@@ -1,10 +1,10 @@
-version: 0.0.7
+version: 0.0.8
 title: Apache HTTP Server
 description: Log parser for Apache HTTP Server
 parameters:
   - name: log_format
     label: Log Format
-    description: When choosing the 'default' option, the agent will expect and parse logs in a format that matches the default logging configuration. When choosing the 'observIQ' option, the agent will expect and parse logs in an optimized JSON format that adheres to the observIQ specification, requiring an update to the apache2.conf file. See the <a href="https://docs.observiq.com/docs/apache-http-server">Apache HTTP Server source page</a> for more information.
+    description: When choosing the 'default' option, the agent will expect and parse logs in a format that matches the default logging configuration. When choosing the 'observIQ' option, the agent will expect and parse logs in an optimized JSON format that adheres to the observIQ specification, requiring an update to the apache2.conf file. See the Apache HTTP Server source page for more information.
     type: enum
     valid_values:
       - default

plugins/nginx.yaml

@@ -1,4 +1,4 @@
-version: 0.0.12
+version: 0.0.13
 title: Nginx
 description: Log parser for Nginx
 min_stanza_version: 0.13.12
@@ -18,12 +18,20 @@ parameters:
     default: file
   - name: log_format
     label: Log Format
-    description:  When choosing the 'default' option, the agent will expect and parse logs in a format that matches the default logging configuration. When choosing the 'observIQ' option, the agent will expect and parse logs in an optimized JSON format that adheres to the observIQ specification, requiring an update to the nginx.conf file. See the <a href="https://docs.observiq.com/docs/nginx">NGINX source page</a> for more information.
+    description:  When choosing the 'default' option, the agent will expect and parse logs in a format that matches the default logging configuration. When choosing the 'observIQ' option, the agent will expect and parse logs in an optimized JSON format that adheres to the observIQ specification, requiring an update to the nginx.conf file. See the NGINX source page for more information.
     type: enum
     valid_values:
       - default
       - observiq
     default: default
+  - name: cluster_name
+    label: Cluster Name
+    description: 'Cluster Name to be added to a resource label'
+    type: string
+    default: ""
+    relevant_if:
+      source:
+        equals: kubernetes
   - name: pod_name
     label: Pod Name
     description: The pod name (without the unique identifier on the end)
@@ -82,14 +90,15 @@ parameters:
 
 # Set Defaults
 # {{$source := default "file" .source}}
+# {{$log_format := default "default" .log_format}}
+# {{$cluster_name := default "" .cluster_name}}
+# {{$pod_name := default "nginx-*" .pod_name}}
+# {{$container_name := default "*" .container_name}}
 # {{$enable_access_log := default true .enable_access_log}}
 # {{$access_log_path := default "/var/log/nginx/access.log*" .access_log_path}}
 # {{$enable_error_log := default true .enable_error_log}}
 # {{$error_log_path := default "/var/log/nginx/error.log*" .error_log_path}}
 # {{$start_at := default "end" .start_at}}
-# {{$pod_name := default "nginx-*" .pod_name}}
-# {{$container_name := default "*" .container_name}}
-# {{$log_format := default "default" .log_format}}
 
 # Pipeline Template
 pipeline:
@@ -98,6 +107,7 @@ pipeline:
     type: kubernetes_container
     pod_name: '{{ $pod_name }}'
     container_name: '{{ $container_name }}'
+    cluster_name: '{{ $cluster_name }}'
     start_at: '{{ $start_at }}'
     enable_nested_json_parser: false
 

plugins/tomcat.yaml

@@ -1,4 +1,4 @@
-version: 0.0.11
+version: 0.0.12
 title: Apache Tomcat
 description: Log parser for Apache Tomcat
 min_stanza_version: 0.13.12
@@ -18,12 +18,20 @@ parameters:
     default: file
   - name: log_format
     label: Log Format
-    description: When choosing the 'default' option, the agent will expect and parse logs in a format that matches the default logging configuration. When choosing the 'observIQ' option, the agent will expect and parse logs in an optimized JSON format that adheres to the observIQ specification, requiring an update to the server.xml file. See the <a href="https://docs.observiq.com/docs/apache-tomcat">Apache Tomcat source page</a> for more information.
+    description: When choosing the 'default' option, the agent will expect and parse logs in a format that matches the default logging configuration. When choosing the 'observIQ' option, the agent will expect and parse logs in an optimized JSON format that adheres to the observIQ specification, requiring an update to the server.xml file. See the Apache Tomcat source page for more information.
     type: enum
     valid_values:
       - default
       - observiq
     default: default
+  - name: cluster_name
+    label: Cluster Name
+    description: 'Cluster Name to be added to a resource label'
+    type: string
+    default: ""
+    relevant_if:
+      source:
+        equals: kubernetes
   - name: pod_name
     label: Pod Name
     description: The pod name (without the unique identifier on the end)
@@ -81,14 +89,15 @@ parameters:
     default: end
 # Set Defaults
 # {{$source := default "file" .source}}
+# {{$log_format := default "default" .log_format}}
+# {{$cluster_name := default "" .cluster_name}}
 # {{$pod_name := default "tomcat-*" .pod_name}}
 # {{$container_name := default "*" .container_name}}
 # {{$enable_access_log := default true .enable_access_log}}
 # {{$access_log_path := default "/usr/local/tomcat/logs/localhost_access_log.*.txt" .access_log_path}}
 # {{$enable_catalina_log := default true .enable_catalina_log}}
 # {{$catalina_log_path := default "/usr/local/tomcat/logs/catalina.out" .catalina_log_path}}
 # {{$start_at := default "end" .start_at}}
-# {{$log_format := default "default" .log_format}}
 
 # Pipeline Template
 pipeline:
@@ -97,6 +106,7 @@ pipeline:
     type: kubernetes_container
     pod_name: '{{ $pod_name }}'
     container_name: '{{ $container_name }}'
+    cluster_name: '{{ $cluster_name }}'
     start_at: '{{ $start_at }}'
     enable_nested_json_parser: false