diff --git a/.github/workflows/publish-version-4.4.yaml b/.github/workflows/publish-version-4.4.yaml
new file mode 100644
index 000000000..3cd290497
--- /dev/null
+++ b/.github/workflows/publish-version-4.4.yaml
@@ -0,0 +1,86 @@
+name: Publish version 4.4
+
+env:
+  doc_versionnumber: "4.4"
+
+on:
+  push:
+    branches:
+      - release-4.4
+  workflow_dispatch:
+
+jobs:
+  build:
+    name: Build
+    runs-on: ubuntu-latest
+
+    permissions:
+      contents: write
+      pages: write
+      id-token: write
+    
+    concurrency:
+      group: "pages"
+      cancel-in-progress: false
+    
+    environment:
+      name: github-pages-test
+      url: ${{ steps.deployment.outputs.page_url }}
+    
+    steps:
+      - name: Checkout code
+        uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1
+        with:
+          ref: release-4.4
+          submodules: 'recursive'
+
+      - name: Set up Pages
+        id: pages
+        uses: actions/configure-pages@1f0c5cde4bc74cd7e1254d0cb4de8d49e9068c7d # v4.0.0
+
+      - name: Set up Hugo
+        uses: peaceiris/actions-hugo@16361eb4acea8698b220b76c0d4e84e1fd22c61d # v2.6.0
+        with:
+          hugo-version: '0.110.0'
+          extended: true
+
+      - name: Set up Node
+        uses: actions/setup-node@5e21ff4d9bc1a8cf6de233a3057d20ec6b3fb69d # v3.8.1
+        with:
+          node-version: 16
+
+      - name: Install dependencies
+        run: |
+          cd themes/docsy
+          npm install
+
+      - name: Set up PostCSS
+        run: npm install --save-dev autoprefixer postcss-cli postcss
+
+      - name: Build
+        run: hugo --environment production --baseURL ${{ steps.pages.outputs.base_url }}/${{ env.doc_versionnumber }}/
+
+      # - name: Upload artifact
+      #   uses: actions/upload-pages-artifact@64bcae551a7b18bcb9a09042ddf1960979799187 # v1.0.8
+      #   with:
+      #     path: ./public/
+
+      - name: Checkout code to update
+        uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1
+        with:
+          ref: 'gh-pages-test'
+          path: 'tmp/gh-pages'
+      # - name: Display file structure
+      #   run: ls -R
+      - name: Copy built site to GH pages
+        run: |
+          rm -rf tmp/gh-pages/${{ env.doc_versionnumber }}
+          mkdir -p tmp/gh-pages/${{ env.doc_versionnumber }}
+          mv public/* tmp/gh-pages/${{ env.doc_versionnumber }}
+      - name: Commit & Push changes
+        uses: actions-js/push@master
+        with:
+          github_token: ${{ secrets.GITHUB_TOKEN }}
+          message: 'Publish updated docs for ${{ env.doc_versionnumber }}, ${{ github.event.repository.pushed_at}}'
+          branch: 'gh-pages-test'
+          directory: 'tmp/gh-pages'
diff --git a/.htmltest.yml b/.htmltest.yml
new file mode 100644
index 000000000..05704fb05
--- /dev/null
+++ b/.htmltest.yml
@@ -0,0 +1,8 @@
+DirectoryPath: public/docs/install
+CheckDoctype: false # Sadly, this is false only because of `static/google*.html`
+IgnoreAltMissing: true # FIXME
+IgnoreDirectoryMissingTrailingSlash: true # FIXME
+IgnoreDirs: [_print] # FIXME
+IgnoreEmptyHref: true # FIXME
+IgnoreInternalEmptyHash: true # FIXME
+IgnoreURLs: [http://localhost, https://https://github.com/kube-logging/kube-logging.github.io/new/*, _print/]
diff --git a/config/_default/config.toml b/config/_default/config.toml
index 5d4423ac8..305a05ad2 100644
--- a/config/_default/config.toml
+++ b/config/_default/config.toml
@@ -69,7 +69,7 @@ twitter = "calisti12"
   # Used in the "version-banner" partial to display a version number for the 
   # current doc set.
 
-  version = "4.4.0"
+  version = "4.5.0"
   version_menu = "Releases"
   version_menu_canonicallinks = true
   version_menu_pagelinks = true
@@ -169,9 +169,13 @@ twitter = "calisti12"
 #######################
 # Add your release versions here
 [[params.versions]]
-  version = "latest (4.4.0)"
+  version = "latest (4.5.0)"
   githubbranch = "master"
   url = ""
+[[params.versions]]
+  version = "4.4"
+  githubbranch = "release-4.4"
+  url = "/4.4/"
 [[params.versions]]
   version = "4.3"
   githubbranch = "release-4.3"
@@ -188,7 +192,7 @@ twitter = "calisti12"
 # Cascade version number to every doc page (needed to create sections for pagefind search)
 # Update this parameter when creating a new version
 [[cascade]]
-body_attribute = 'data-pagefind-filter="section:4.4"'
+body_attribute = 'data-pagefind-filter="section:4.5"'
 [cascade._target]
   path = '/docs/**'
 
diff --git a/content/docs/configuration/crds/extensions/eventtailer_types.md b/content/docs/configuration/crds/extensions/eventtailer_types.md
index d3653a1ca..994b512ca 100644
--- a/content/docs/configuration/crds/extensions/eventtailer_types.md
+++ b/content/docs/configuration/crds/extensions/eventtailer_types.md
@@ -8,41 +8,35 @@ generated_file: true
 
 EventTailerSpec defines the desired state of EventTailer
 
+### containerOverrides (*types.ContainerBase, optional) {#eventtailerspec-containeroverrides}
+
+Override container fields for the given statefulset 
+
+
 ### controlNamespace (string, required) {#eventtailerspec-controlnamespace}
 
 The resources of EventTailer will be placed into this namespace 
 
-Default: -
 
-### positionVolume (volume.KubernetesVolume, optional) {#eventtailerspec-positionvolume}
+### image (*tailer.ImageSpec, optional) {#eventtailerspec-image}
 
-Volume definition for tracking fluentbit file positions (optional) 
+Override image related fields for the given statefulset, highest precedence 
 
-Default: -
 
-### workloadMetaOverrides (*types.MetaBase, optional) {#eventtailerspec-workloadmetaoverrides}
+### positionVolume (volume.KubernetesVolume, optional) {#eventtailerspec-positionvolume}
 
-Override metadata of the created resources 
+Volume definition for tracking fluentbit file positions (optional) 
 
-Default: -
 
 ### workloadOverrides (*types.PodSpecBase, optional) {#eventtailerspec-workloadoverrides}
 
 Override podSpec fields for the given statefulset 
 
-Default: -
-
-### containerOverrides (*types.ContainerBase, optional) {#eventtailerspec-containeroverrides}
-
-Override container fields for the given statefulset 
 
-Default: -
-
-### image (*tailer.ImageSpec, optional) {#eventtailerspec-image}
+### workloadMetaOverrides (*types.MetaBase, optional) {#eventtailerspec-workloadmetaoverrides}
 
-Override image related fields for the given statefulset, highest precedence 
+Override metadata of the created resources 
 
-Default: -
 
 
 ## EventTailerStatus
@@ -56,19 +50,15 @@ EventTailer is the Schema for the eventtailers API
 
 ###  (metav1.TypeMeta, required) {#eventtailer-}
 
-Default: -
 
 ### metadata (metav1.ObjectMeta, optional) {#eventtailer-metadata}
 
-Default: -
 
 ### spec (EventTailerSpec, optional) {#eventtailer-spec}
 
-Default: -
 
 ### status (EventTailerStatus, optional) {#eventtailer-status}
 
-Default: -
 
 
 ## EventTailerList
@@ -77,14 +67,11 @@ EventTailerList contains a list of EventTailer
 
 ###  (metav1.TypeMeta, required) {#eventtailerlist-}
 
-Default: -
 
 ### metadata (metav1.ListMeta, optional) {#eventtailerlist-metadata}
 
-Default: -
 
 ### items ([]EventTailer, required) {#eventtailerlist-items}
 
-Default: -
 
 
diff --git a/content/docs/configuration/crds/extensions/hosttailer_types.md b/content/docs/configuration/crds/extensions/hosttailer_types.md
index 9a61caa27..c408742ff 100644
--- a/content/docs/configuration/crds/extensions/hosttailer_types.md
+++ b/content/docs/configuration/crds/extensions/hosttailer_types.md
@@ -8,39 +8,33 @@ generated_file: true
 
 HostTailerSpec defines the desired state of HostTailer
 
-### fileTailers ([]FileTailer, optional) {#hosttailerspec-filetailers}
-
-List of [file tailers](#filetailer).
+### enableRecreateWorkloadOnImmutableFieldChange (bool, optional) {#hosttailerspec-enablerecreateworkloadonimmutablefieldchange}
 
-Default: -
+EnableRecreateWorkloadOnImmutableFieldChange enables the operator to recreate the daemonset (and possibly other resource in the future) in case there is a change in an immutable field that otherwise couldn't be managed with a simple update. 
 
-### systemdTailers ([]SystemdTailer, optional) {#hosttailerspec-systemdtailers}
 
-List of [systemd tailers](#systemdtailer).
+### fileTailers ([]FileTailer, optional) {#hosttailerspec-filetailers}
 
-Default: -
+List of [file tailers](#filetailer).
 
-### enableRecreateWorkloadOnImmutableFieldChange (bool, optional) {#hosttailerspec-enablerecreateworkloadonimmutablefieldchange}
 
-EnableRecreateWorkloadOnImmutableFieldChange enables the operator to recreate the daemonset (and possibly other resource in the future) in case there is a change in an immutable field that otherwise couldn't be managed with a simple update. 
+### image (tailer.ImageSpec, optional) {#hosttailerspec-image}
 
-Default: -
 
-### workloadMetaOverrides (*types.MetaBase, optional) {#hosttailerspec-workloadmetaoverrides}
+### systemdTailers ([]SystemdTailer, optional) {#hosttailerspec-systemdtailers}
 
-Override metadata of the created resources 
+List of [systemd tailers](#systemdtailer).
 
-Default: -
 
 ### workloadOverrides (*types.PodSpecBase, optional) {#hosttailerspec-workloadoverrides}
 
 Override podSpec fields for the given daemonset 
 
-Default: -
 
-### image (tailer.ImageSpec, optional) {#hosttailerspec-image}
+### workloadMetaOverrides (*types.MetaBase, optional) {#hosttailerspec-workloadmetaoverrides}
+
+Override metadata of the created resources 
 
-Default: -
 
 
 ## HostTailerStatus
@@ -54,19 +48,15 @@ HostTailer is the Schema for the hosttailers API
 
 ###  (metav1.TypeMeta, required) {#hosttailer-}
 
-Default: -
 
 ### metadata (metav1.ObjectMeta, optional) {#hosttailer-metadata}
 
-Default: -
 
 ### spec (HostTailerSpec, optional) {#hosttailer-spec}
 
-Default: -
 
 ### status (HostTailerStatus, optional) {#hosttailer-status}
 
-Default: -
 
 
 ## HostTailerList
@@ -75,132 +65,101 @@ HostTailerList contains a list of [HostTailers](#hosttailer).
 
 ###  (metav1.TypeMeta, required) {#hosttailerlist-}
 
-Default: -
 
 ### metadata (metav1.ListMeta, optional) {#hosttailerlist-metadata}
 
-Default: -
 
 ### items ([]HostTailer, required) {#hosttailerlist-items}
 
-Default: -
 
 
 ## FileTailer
 
 FileTailer configuration options
 
-### name (string, required) {#filetailer-name}
+### buffer_chunk_size (string, optional) {#filetailer-buffer_chunk_size}
 
-Name for the tailer 
+Set the buffer chunk size per active filetailer 
 
-Default: -
 
-### path (string, optional) {#filetailer-path}
+### buffer_max_size (string, optional) {#filetailer-buffer_max_size}
 
-Path to the loggable file 
+Set the limit of the buffer size per active filetailer 
+
+
+### containerOverrides (*types.ContainerBase, optional) {#filetailer-containeroverrides}
+
+Override container fields for the given tailer 
 
-Default: -
 
 ### disabled (bool, optional) {#filetailer-disabled}
 
 Disable tailing the file 
 
-Default: -
 
-### buffer_max_size (string, optional) {#filetailer-buffer_max_size}
+### image (*tailer.ImageSpec, optional) {#filetailer-image}
 
-Set the limit of the buffer size per active filetailer 
+Override image field for the given trailer 
 
-Default: -
 
-### buffer_chunk_size (string, optional) {#filetailer-buffer_chunk_size}
+### name (string, required) {#filetailer-name}
 
-Set the buffer chunk size per active filetailer 
+Name for the tailer 
 
-Default: -
 
-### skip_long_lines (string, optional) {#filetailer-skip_long_lines}
+### path (string, optional) {#filetailer-path}
 
-Skip long line when exceeding Buffer_Max_Size 
+Path to the loggable file 
 
-Default: -
 
 ### read_from_head (bool, optional) {#filetailer-read_from_head}
 
 Start reading from the head of new log files 
 
-Default: -
 
-### buffer_max_size (string, optional) {#filetailer-buffer_max_size}
+### skip_long_lines (string, optional) {#filetailer-skip_long_lines}
 
-Set the limit of the buffer size per active filetailer 
+Skip long line when exceeding Buffer_Max_Size 
 
-Default: -
 
-### buffer_chunk_size (string, optional) {#filetailer-buffer_chunk_size}
 
-Set the buffer chunk size per active filetailer 
+## SystemdTailer
 
-Default: -
+SystemdTailer configuration options
 
-### skip_long_lines (string, optional) {#filetailer-skip_long_lines}
+### containerOverrides (*types.ContainerBase, optional) {#systemdtailer-containeroverrides}
 
-Skip long line when exceeding Buffer_Max_Size 
+Override container fields for the given tailer 
 
-Default: -
 
-### read_from_head (bool, optional) {#filetailer-read_from_head}
+### disabled (bool, optional) {#systemdtailer-disabled}
 
-Start reading from the head of new log files 
+Disable component 
 
-Default: -
 
-### containerOverrides (*types.ContainerBase, optional) {#filetailer-containeroverrides}
+### image (*tailer.ImageSpec, optional) {#systemdtailer-image}
 
-Override container fields for the given tailer 
+Override image field for the given trailer 
 
-Default: -
 
+### maxEntries (int, optional) {#systemdtailer-maxentries}
 
-## SystemdTailer
+Maximum entries to read when starting to tail logs to avoid high pressure 
 
-SystemdTailer configuration options
 
 ### name (string, required) {#systemdtailer-name}
 
 Name for the tailer 
 
-Default: -
 
 ### path (string, optional) {#systemdtailer-path}
 
 Override systemd log path 
 
-Default: -
-
-### disabled (bool, optional) {#systemdtailer-disabled}
-
-Disable component 
-
-Default: -
 
 ### systemdFilter (string, optional) {#systemdtailer-systemdfilter}
 
 Filter to select systemd unit example: kubelet.service 
 
-Default: -
-
-### maxEntries (int, optional) {#systemdtailer-maxentries}
-
-Maximum entries to read when starting to tail logs to avoid high pressure 
-
-Default: -
-
-### containerOverrides (*types.ContainerBase, optional) {#systemdtailer-containeroverrides}
-
-Override container fields for the given tailer 
-
-Default: -
 
 
diff --git a/content/docs/configuration/crds/v1beta1/_index.md b/content/docs/configuration/crds/v1beta1/_index.md
index 20c9b9355..2962cb163 100644
--- a/content/docs/configuration/crds/v1beta1/_index.md
+++ b/content/docs/configuration/crds/v1beta1/_index.md
@@ -15,7 +15,7 @@ For more information please click on the name
 | **[Common](common_types/)** | ImageSpec Metrics Security | v1beta1 |
 | **[FlowSpec](flow_types/)** | FlowSpec is the Kubernetes spec for Flows | v1beta1 |
 | **[FluentbitSpec](fluentbit_types/)** | FluentbitSpec defines the desired state of FluentbitAgent | v1beta1 |
-| **[FluentdSpec](fluentd_types/)** | FluentdSpec defines the desired state of Fluentd | v1beta1 |
+| **[Fluent](fluentd_types/)** | FluentdConfig is a reference to the desired Fluentd state | v1beta1 |
 | **[Logging](logging_types/)** | Logging system configuration | v1beta1 |
 | **[LoggingRouteSpec](loggingroute_types/)** | LoggingRouteSpec defines the desired state of LoggingRoute | v1beta1 |
 | **[NodeAgent](node_agent_types/)** |  | v1beta1 |
@@ -24,6 +24,6 @@ For more information please click on the name
 | **[SyslogNGClusterOutput](syslogng_clusteroutput_types/)** | SyslogNGClusterOutput is the Schema for the syslog-ng clusteroutputs API | v1beta1 |
 | **[SyslogNGFlowSpec](syslogng_flow_types/)** | SyslogNGFlowSpec is the Kubernetes spec for SyslogNGFlows | v1beta1 |
 | **[SyslogNGOutputSpec](syslogng_output_types/)** | SyslogNGOutputSpec defines the desired state of SyslogNGOutput | v1beta1 |
-| **[SyslogNGSpec](syslogng_types/)** | SyslogNGSpec defines the desired state of SyslogNG | v1beta1 |
+| **[SyslogNG](syslogng_types/)** | SyslogNG is a reference to the desired SyslogNG state | v1beta1 |
 </center>
 
diff --git a/content/docs/configuration/crds/v1beta1/clusterflow_types.md b/content/docs/configuration/crds/v1beta1/clusterflow_types.md
index 0c454e762..77f9dc90f 100644
--- a/content/docs/configuration/crds/v1beta1/clusterflow_types.md
+++ b/content/docs/configuration/crds/v1beta1/clusterflow_types.md
@@ -10,111 +10,89 @@ ClusterFlow is the Schema for the clusterflows API
 
 ###  (metav1.TypeMeta, required) {#clusterflow-}
 
-Default: -
 
 ### metadata (metav1.ObjectMeta, optional) {#clusterflow-metadata}
 
-Default: -
 
 ### spec (ClusterFlowSpec, optional) {#clusterflow-spec}
 
 Name of the logging cluster to be attached 
 
-Default: -
 
 ### status (FlowStatus, optional) {#clusterflow-status}
 
-Default: -
 
 
 ## ClusterMatch
 
 ### select (*ClusterSelect, optional) {#clustermatch-select}
 
-Default: -
 
 ### exclude (*ClusterExclude, optional) {#clustermatch-exclude}
 
-Default: -
 
 
 ## ClusterSelect
 
-### namespaces ([]string, optional) {#clusterselect-namespaces}
+### container_names ([]string, optional) {#clusterselect-container_names}
 
-Default: -
 
-### labels (map[string]string, optional) {#clusterselect-labels}
+### hosts ([]string, optional) {#clusterselect-hosts}
 
-Default: -
 
-### hosts ([]string, optional) {#clusterselect-hosts}
+### labels (map[string]string, optional) {#clusterselect-labels}
 
-Default: -
 
-### container_names ([]string, optional) {#clusterselect-container_names}
+### namespaces ([]string, optional) {#clusterselect-namespaces}
 
-Default: -
 
 
 ## ClusterExclude
 
-### namespaces ([]string, optional) {#clusterexclude-namespaces}
+### container_names ([]string, optional) {#clusterexclude-container_names}
 
-Default: -
 
-### labels (map[string]string, optional) {#clusterexclude-labels}
+### hosts ([]string, optional) {#clusterexclude-hosts}
 
-Default: -
 
-### hosts ([]string, optional) {#clusterexclude-hosts}
+### labels (map[string]string, optional) {#clusterexclude-labels}
 
-Default: -
 
-### container_names ([]string, optional) {#clusterexclude-container_names}
+### namespaces ([]string, optional) {#clusterexclude-namespaces}
 
-Default: -
 
 
 ## ClusterFlowSpec
 
 ClusterFlowSpec is the Kubernetes spec for ClusterFlows
 
-### selectors (map[string]string, optional) {#clusterflowspec-selectors}
+### filters ([]Filter, optional) {#clusterflowspec-filters}
 
-Deprecated 
 
-Default: -
+### flowLabel (string, optional) {#clusterflowspec-flowlabel}
 
-### match ([]ClusterMatch, optional) {#clusterflowspec-match}
 
-Default: -
+### globalOutputRefs ([]string, optional) {#clusterflowspec-globaloutputrefs}
 
-### filters ([]Filter, optional) {#clusterflowspec-filters}
 
-Default: -
+### includeLabelInRouter (*bool, optional) {#clusterflowspec-includelabelinrouter}
 
-### loggingRef (string, optional) {#clusterflowspec-loggingref}
 
-Default: -
+### loggingRef (string, optional) {#clusterflowspec-loggingref}
 
-### outputRefs ([]string, optional) {#clusterflowspec-outputrefs}
 
-Deprecated 
+### match ([]ClusterMatch, optional) {#clusterflowspec-match}
 
-Default: -
 
-### globalOutputRefs ([]string, optional) {#clusterflowspec-globaloutputrefs}
+### outputRefs ([]string, optional) {#clusterflowspec-outputrefs}
 
-Default: -
+Deprecated 
 
-### flowLabel (string, optional) {#clusterflowspec-flowlabel}
 
-Default: -
+### selectors (map[string]string, optional) {#clusterflowspec-selectors}
 
-### includeLabelInRouter (*bool, optional) {#clusterflowspec-includelabelinrouter}
+Deprecated 
 
-Default: -
 
 
 ## ClusterFlowList
@@ -123,14 +101,11 @@ ClusterFlowList contains a list of ClusterFlow
 
 ###  (metav1.TypeMeta, required) {#clusterflowlist-}
 
-Default: -
 
 ### metadata (metav1.ListMeta, optional) {#clusterflowlist-metadata}
 
-Default: -
 
 ### items ([]ClusterFlow, required) {#clusterflowlist-items}
 
-Default: -
 
 
diff --git a/content/docs/configuration/crds/v1beta1/clusteroutput_types.md b/content/docs/configuration/crds/v1beta1/clusteroutput_types.md
index 13000a4f8..7f2991cf4 100644
--- a/content/docs/configuration/crds/v1beta1/clusteroutput_types.md
+++ b/content/docs/configuration/crds/v1beta1/clusteroutput_types.md
@@ -10,19 +10,15 @@ ClusterOutput is the Schema for the clusteroutputs API
 
 ###  (metav1.TypeMeta, required) {#clusteroutput-}
 
-Default: -
 
 ### metadata (metav1.ObjectMeta, optional) {#clusteroutput-metadata}
 
-Default: -
 
 ### spec (ClusterOutputSpec, required) {#clusteroutput-spec}
 
-Default: -
 
 ### status (OutputStatus, optional) {#clusteroutput-status}
 
-Default: -
 
 
 ## ClusterOutputSpec
@@ -31,11 +27,9 @@ ClusterOutputSpec contains Kubernetes spec for ClusterOutput
 
 ###  (OutputSpec, required) {#clusteroutputspec-}
 
-Default: -
 
 ### enabledNamespaces ([]string, optional) {#clusteroutputspec-enablednamespaces}
 
-Default: -
 
 
 ## ClusterOutputList
@@ -44,14 +38,11 @@ ClusterOutputList contains a list of ClusterOutput
 
 ###  (metav1.TypeMeta, required) {#clusteroutputlist-}
 
-Default: -
 
 ### metadata (metav1.ListMeta, optional) {#clusteroutputlist-metadata}
 
-Default: -
 
 ### items ([]ClusterOutput, required) {#clusteroutputlist-items}
 
-Default: -
 
 
diff --git a/content/docs/configuration/crds/v1beta1/common_types.md b/content/docs/configuration/crds/v1beta1/common_types.md
index 8f656258f..e5b479732 100644
--- a/content/docs/configuration/crds/v1beta1/common_types.md
+++ b/content/docs/configuration/crds/v1beta1/common_types.md
@@ -8,21 +8,17 @@ generated_file: true
 
 ImageSpec struct hold information about image specification
 
-### repository (string, optional) {#imagespec-repository}
+### imagePullSecrets ([]corev1.LocalObjectReference, optional) {#imagespec-imagepullsecrets}
 
-Default: -
 
-### tag (string, optional) {#imagespec-tag}
+### pullPolicy (string, optional) {#imagespec-pullpolicy}
 
-Default: -
 
-### pullPolicy (string, optional) {#imagespec-pullpolicy}
+### repository (string, optional) {#imagespec-repository}
 
-Default: -
 
-### imagePullSecrets ([]corev1.LocalObjectReference, optional) {#imagespec-imagepullsecrets}
+### tag (string, optional) {#imagespec-tag}
 
-Default: -
 
 
 ## Metrics
@@ -31,35 +27,27 @@ Metrics defines the service monitor endpoints
 
 ### interval (string, optional) {#metrics-interval}
 
-Default: -
 
-### timeout (string, optional) {#metrics-timeout}
+### path (string, optional) {#metrics-path}
 
-Default: -
 
 ### port (int32, optional) {#metrics-port}
 
-Default: -
 
-### path (string, optional) {#metrics-path}
+### prometheusAnnotations (bool, optional) {#metrics-prometheusannotations}
 
-Default: -
 
-### serviceMonitor (bool, optional) {#metrics-servicemonitor}
+### prometheusRules (bool, optional) {#metrics-prometheusrules}
 
-Default: -
 
-### serviceMonitorConfig (ServiceMonitorConfig, optional) {#metrics-servicemonitorconfig}
+### serviceMonitor (bool, optional) {#metrics-servicemonitor}
 
-Default: -
 
-### prometheusAnnotations (bool, optional) {#metrics-prometheusannotations}
+### serviceMonitorConfig (ServiceMonitorConfig, optional) {#metrics-servicemonitorconfig}
 
-Default: -
 
-### prometheusRules (bool, optional) {#metrics-prometheusrules}
+### timeout (string, optional) {#metrics-timeout}
 
-Default: -
 
 
 ## BufferMetrics
@@ -68,11 +56,9 @@ BufferMetrics defines the service monitor endpoints
 
 ###  (Metrics, required) {#buffermetrics-}
 
-Default: -
 
 ### mount_name (string, optional) {#buffermetrics-mount_name}
 
-Default: -
 
 
 ## ServiceMonitorConfig
@@ -81,94 +67,74 @@ ServiceMonitorConfig defines the ServiceMonitor properties
 
 ### additionalLabels (map[string]string, optional) {#servicemonitorconfig-additionallabels}
 
-Default: -
 
 ### honorLabels (bool, optional) {#servicemonitorconfig-honorlabels}
 
-Default: -
 
-### relabelings ([]*v1.RelabelConfig, optional) {#servicemonitorconfig-relabelings}
+### metricRelabelings ([]*v1.RelabelConfig, optional) {#servicemonitorconfig-metricrelabelings}
 
-Default: -
 
-### metricRelabelings ([]*v1.RelabelConfig, optional) {#servicemonitorconfig-metricrelabelings}
+### relabelings ([]*v1.RelabelConfig, optional) {#servicemonitorconfig-relabelings}
 
-Default: -
 
 ### scheme (string, optional) {#servicemonitorconfig-scheme}
 
-Default: -
 
 ### tlsConfig (*v1.TLSConfig, optional) {#servicemonitorconfig-tlsconfig}
 
-Default: -
 
 
 ## Security
 
 Security defines Fluentd, FluentbitAgent deployment security properties
 
-### serviceAccount (string, optional) {#security-serviceaccount}
+### podSecurityContext (*corev1.PodSecurityContext, optional) {#security-podsecuritycontext}
 
-Default: -
 
-### roleBasedAccessControlCreate (*bool, optional) {#security-rolebasedaccesscontrolcreate}
+### podSecurityPolicyCreate (bool, optional) {#security-podsecuritypolicycreate}
 
-Default: -
 
-### podSecurityPolicyCreate (bool, optional) {#security-podsecuritypolicycreate}
+### roleBasedAccessControlCreate (*bool, optional) {#security-rolebasedaccesscontrolcreate}
 
-Default: -
 
 ### securityContext (*corev1.SecurityContext, optional) {#security-securitycontext}
 
-Default: -
 
-### podSecurityContext (*corev1.PodSecurityContext, optional) {#security-podsecuritycontext}
+### serviceAccount (string, optional) {#security-serviceaccount}
 
-Default: -
 
 
 ## ReadinessDefaultCheck
 
 ReadinessDefaultCheck Enable default readiness checks
 
-### bufferFreeSpace (bool, optional) {#readinessdefaultcheck-bufferfreespace}
+### bufferFileNumber (bool, optional) {#readinessdefaultcheck-bufferfilenumber}
 
-Enable default Readiness check it'll fail if the buffer volume free space exceeds the `readinessDefaultThreshold` percentage (90%). 
 
-Default: -
+### bufferFileNumberMax (int32, optional) {#readinessdefaultcheck-bufferfilenumbermax}
 
-### bufferFreeSpaceThreshold (int32, optional) {#readinessdefaultcheck-bufferfreespacethreshold}
 
-Default: -
+### bufferFreeSpace (bool, optional) {#readinessdefaultcheck-bufferfreespace}
 
-### bufferFileNumber (bool, optional) {#readinessdefaultcheck-bufferfilenumber}
+Enable default Readiness check it'll fail if the buffer volume free space exceeds the `readinessDefaultThreshold` percentage (90%). 
 
-Default: -
 
-### bufferFileNumberMax (int32, optional) {#readinessdefaultcheck-bufferfilenumbermax}
+### bufferFreeSpaceThreshold (int32, optional) {#readinessdefaultcheck-bufferfreespacethreshold}
 
-Default: -
 
-### initialDelaySeconds (int32, optional) {#readinessdefaultcheck-initialdelayseconds}
+### failureThreshold (int32, optional) {#readinessdefaultcheck-failurethreshold}
 
-Default: -
 
-### timeoutSeconds (int32, optional) {#readinessdefaultcheck-timeoutseconds}
+### initialDelaySeconds (int32, optional) {#readinessdefaultcheck-initialdelayseconds}
 
-Default: -
 
 ### periodSeconds (int32, optional) {#readinessdefaultcheck-periodseconds}
 
-Default: -
 
 ### successThreshold (int32, optional) {#readinessdefaultcheck-successthreshold}
 
-Default: -
 
-### failureThreshold (int32, optional) {#readinessdefaultcheck-failurethreshold}
+### timeoutSeconds (int32, optional) {#readinessdefaultcheck-timeoutseconds}
 
-Default: -
 
 
diff --git a/content/docs/configuration/crds/v1beta1/flow_types.md b/content/docs/configuration/crds/v1beta1/flow_types.md
index d19bff90e..315742ed2 100644
--- a/content/docs/configuration/crds/v1beta1/flow_types.md
+++ b/content/docs/configuration/crds/v1beta1/flow_types.md
@@ -8,155 +8,125 @@ generated_file: true
 
 FlowSpec is the Kubernetes spec for Flows
 
-### selectors (map[string]string, optional) {#flowspec-selectors}
+### filters ([]Filter, optional) {#flowspec-filters}
 
-Deprecated 
 
-Default: -
+### flowLabel (string, optional) {#flowspec-flowlabel}
 
-### match ([]Match, optional) {#flowspec-match}
 
-Default: -
+### globalOutputRefs ([]string, optional) {#flowspec-globaloutputrefs}
 
-### filters ([]Filter, optional) {#flowspec-filters}
 
-Default: -
+### includeLabelInRouter (*bool, optional) {#flowspec-includelabelinrouter}
 
-### loggingRef (string, optional) {#flowspec-loggingref}
 
-Default: -
+### localOutputRefs ([]string, optional) {#flowspec-localoutputrefs}
 
-### outputRefs ([]string, optional) {#flowspec-outputrefs}
 
-Deprecated 
+### loggingRef (string, optional) {#flowspec-loggingref}
 
-Default: -
 
-### globalOutputRefs ([]string, optional) {#flowspec-globaloutputrefs}
+### match ([]Match, optional) {#flowspec-match}
 
-Default: -
 
-### localOutputRefs ([]string, optional) {#flowspec-localoutputrefs}
+### outputRefs ([]string, optional) {#flowspec-outputrefs}
 
-Default: -
+Deprecated 
 
-### flowLabel (string, optional) {#flowspec-flowlabel}
 
-Default: -
+### selectors (map[string]string, optional) {#flowspec-selectors}
 
-### includeLabelInRouter (*bool, optional) {#flowspec-includelabelinrouter}
+Deprecated 
 
-Default: -
 
 
 ## Match
 
 ### select (*Select, optional) {#match-select}
 
-Default: -
 
 ### exclude (*Exclude, optional) {#match-exclude}
 
-Default: -
 
 
 ## Select
 
-### labels (map[string]string, optional) {#select-labels}
+### container_names ([]string, optional) {#select-container_names}
 
-Default: -
 
 ### hosts ([]string, optional) {#select-hosts}
 
-Default: -
 
-### container_names ([]string, optional) {#select-container_names}
+### labels (map[string]string, optional) {#select-labels}
 
-Default: -
 
 
 ## Exclude
 
-### labels (map[string]string, optional) {#exclude-labels}
+### container_names ([]string, optional) {#exclude-container_names}
 
-Default: -
 
 ### hosts ([]string, optional) {#exclude-hosts}
 
-Default: -
 
-### container_names ([]string, optional) {#exclude-container_names}
+### labels (map[string]string, optional) {#exclude-labels}
 
-Default: -
 
 
 ## Filter
 
 Filter definition for FlowSpec
 
-### stdout (*filter.StdOutFilterConfig, optional) {#filter-stdout}
+### concat (*filter.Concat, optional) {#filter-concat}
 
-Default: -
 
-### parser (*filter.ParserConfig, optional) {#filter-parser}
+### dedot (*filter.DedotFilterConfig, optional) {#filter-dedot}
 
-Default: -
 
-### tag_normaliser (*filter.TagNormaliser, optional) {#filter-tag_normaliser}
+### detectExceptions (*filter.DetectExceptions, optional) {#filter-detectexceptions}
 
-Default: -
 
-### dedot (*filter.DedotFilterConfig, optional) {#filter-dedot}
+### elasticsearch_genid (*filter.ElasticsearchGenId, optional) {#filter-elasticsearch_genid}
 
-Default: -
 
-### elasticsearch_genid (*filter.ElasticsearchGenId, optional) {#filter-elasticsearch_genid}
+### enhanceK8s (*filter.EnhanceK8s, optional) {#filter-enhancek8s}
 
-Default: -
 
-### record_transformer (*filter.RecordTransformer, optional) {#filter-record_transformer}
+### geoip (*filter.GeoIP, optional) {#filter-geoip}
 
-Default: -
 
-### record_modifier (*filter.RecordModifier, optional) {#filter-record_modifier}
+### grep (*filter.GrepConfig, optional) {#filter-grep}
 
-Default: -
 
-### geoip (*filter.GeoIP, optional) {#filter-geoip}
+### kube_events_timestamp (*filter.KubeEventsTimestampConfig, optional) {#filter-kube_events_timestamp}
 
-Default: -
 
-### concat (*filter.Concat, optional) {#filter-concat}
+### parser (*filter.ParserConfig, optional) {#filter-parser}
 
-Default: -
 
-### detectExceptions (*filter.DetectExceptions, optional) {#filter-detectexceptions}
+### prometheus (*filter.PrometheusConfig, optional) {#filter-prometheus}
 
-Default: -
 
-### grep (*filter.GrepConfig, optional) {#filter-grep}
+### record_modifier (*filter.RecordModifier, optional) {#filter-record_modifier}
 
-Default: -
 
-### prometheus (*filter.PrometheusConfig, optional) {#filter-prometheus}
+### record_transformer (*filter.RecordTransformer, optional) {#filter-record_transformer}
 
-Default: -
 
-### throttle (*filter.Throttle, optional) {#filter-throttle}
+### stdout (*filter.StdOutFilterConfig, optional) {#filter-stdout}
 
-Default: -
 
 ### sumologic (*filter.SumoLogic, optional) {#filter-sumologic}
 
-Default: -
 
-### enhanceK8s (*filter.EnhanceK8s, optional) {#filter-enhancek8s}
+### tag_normaliser (*filter.TagNormaliser, optional) {#filter-tag_normaliser}
 
-Default: -
 
-### kube_events_timestamp (*filter.KubeEventsTimestampConfig, optional) {#filter-kube_events_timestamp}
+### throttle (*filter.Throttle, optional) {#filter-throttle}
+
+
+### useragent (*filter.UserAgent, optional) {#filter-useragent}
 
-Default: -
 
 
 ## FlowStatus
@@ -165,15 +135,12 @@ FlowStatus defines the observed state of Flow
 
 ### active (*bool, optional) {#flowstatus-active}
 
-Default: -
 
 ### problems ([]string, optional) {#flowstatus-problems}
 
-Default: -
 
 ### problemsCount (int, optional) {#flowstatus-problemscount}
 
-Default: -
 
 
 ## Flow
@@ -182,19 +149,15 @@ Flow Kubernetes object
 
 ###  (metav1.TypeMeta, required) {#flow-}
 
-Default: -
 
 ### metadata (metav1.ObjectMeta, optional) {#flow-metadata}
 
-Default: -
 
 ### spec (FlowSpec, optional) {#flow-spec}
 
-Default: -
 
 ### status (FlowStatus, optional) {#flow-status}
 
-Default: -
 
 
 ## FlowList
@@ -203,14 +166,11 @@ FlowList contains a list of Flow
 
 ###  (metav1.TypeMeta, required) {#flowlist-}
 
-Default: -
 
 ### metadata (metav1.ListMeta, optional) {#flowlist-metadata}
 
-Default: -
 
 ### items ([]Flow, required) {#flowlist-items}
 
-Default: -
 
 
diff --git a/content/docs/configuration/crds/v1beta1/fluentbit_types.md b/content/docs/configuration/crds/v1beta1/fluentbit_types.md
index b37c6044a..da188bf65 100644
--- a/content/docs/configuration/crds/v1beta1/fluentbit_types.md
+++ b/content/docs/configuration/crds/v1beta1/fluentbit_types.md
@@ -10,19 +10,15 @@ FluentbitAgent is the Schema for the loggings API
 
 ###  (metav1.TypeMeta, required) {#fluentbitagent-}
 
-Default: -
 
 ### metadata (metav1.ObjectMeta, optional) {#fluentbitagent-metadata}
 
-Default: -
 
 ### spec (FluentbitSpec, optional) {#fluentbitagent-spec}
 
-Default: -
 
 ### status (FluentbitStatus, optional) {#fluentbitagent-status}
 
-Default: -
 
 
 ## FluentbitAgentList
@@ -31,277 +27,225 @@ FluentbitAgentList contains a list of FluentbitAgent
 
 ###  (metav1.TypeMeta, required) {#fluentbitagentlist-}
 
-Default: -
 
 ### metadata (metav1.ListMeta, optional) {#fluentbitagentlist-metadata}
 
-Default: -
 
 ### items ([]FluentbitAgent, required) {#fluentbitagentlist-items}
 
-Default: -
 
 
 ## FluentbitSpec
 
 FluentbitSpec defines the desired state of FluentbitAgent
 
-### loggingRef (string, optional) {#fluentbitspec-loggingref}
-
-Default: -
-
-### daemonsetAnnotations (map[string]string, optional) {#fluentbitspec-daemonsetannotations}
+### affinity (*corev1.Affinity, optional) {#fluentbitspec-affinity}
 
-Default: -
 
 ### annotations (map[string]string, optional) {#fluentbitspec-annotations}
 
-Default: -
 
-### labels (map[string]string, optional) {#fluentbitspec-labels}
+### bufferStorage (BufferStorage, optional) {#fluentbitspec-bufferstorage}
 
-Default: -
 
-### envVars ([]corev1.EnvVar, optional) {#fluentbitspec-envvars}
+### bufferStorageVolume (volume.KubernetesVolume, optional) {#fluentbitspec-bufferstoragevolume}
 
-Default: -
+[volume.KubernetesVolume](https://github.com/cisco-open/operator-tools/tree/master/docs/types) 
 
-### image (ImageSpec, optional) {#fluentbitspec-image}
 
-Default: -
+### bufferVolumeArgs ([]string, optional) {#fluentbitspec-buffervolumeargs}
 
-### tls (*FluentbitTLS, optional) {#fluentbitspec-tls}
 
-Default: -
+### bufferVolumeImage (ImageSpec, optional) {#fluentbitspec-buffervolumeimage}
 
-### targetHost (string, optional) {#fluentbitspec-targethost}
 
-Default: -
+### bufferVolumeMetrics (*Metrics, optional) {#fluentbitspec-buffervolumemetrics}
 
-### targetPort (int32, optional) {#fluentbitspec-targetport}
 
-Default: -
+### bufferVolumeResources (corev1.ResourceRequirements, optional) {#fluentbitspec-buffervolumeresources}
 
-### flush (int32, optional) {#fluentbitspec-flush}
 
-Set the flush time in seconds.nanoseconds. The engine loop uses a Flush timeout to define when is required to flush the records ingested by input plugins through the defined output plugins. (default: 1) 
+### coroStackSize (int32, optional) {#fluentbitspec-corostacksize}
 
-Default: 1
+Set the coroutines stack size in bytes. The value must be greater than the page size of the running system. Don't set too small value (say 4096), or coroutine threads can overrun the stack buffer. Do not change the default value of this parameter unless you know what you are doing. (default: 24576) 
 
-### grace (int32, optional) {#fluentbitspec-grace}
+Default: 24576
 
-Set the grace time in seconds as Integer value. The engine loop uses a Grace timeout to define wait time on exit (default: 5) 
+### customConfigSecret (string, optional) {#fluentbitspec-customconfigsecret}
 
-Default: 5
 
-### logLevel (string, optional) {#fluentbitspec-loglevel}
+### customParsers (string, optional) {#fluentbitspec-customparsers}
 
-Set the logging verbosity level. Allowed values are: error, warn, info, debug and trace. Values are accumulative, e.g: if 'debug' is set, it will include error, warning, info and debug.  Note that trace mode is only available if Fluent Bit was built with the WITH_TRACE option enabled. (default: info) 
+Available in Logging operator version 4.2 and later. Specify a custom parser file to load in addition to the default parsers file. It must be a valid key in the configmap specified by customConfig.
 
-Default: info
+The following example defines a [Fluentd parser]({{< relref "/docs/configuration/plugins/filters/parser.md" >}}) that places the parsed containerd log messages into the `log` field instead of the `message` field.
 
-### coroStackSize (int32, optional) {#fluentbitspec-corostacksize}
+```yaml
+apiVersion: logging.banzaicloud.io/v1beta1
+kind: FluentbitAgent
+metadata:
+  name: containerd
+spec:
+  inputTail:
+    Parser: cri-log-key
+  # Parser that populates `log` instead of `message` to enable the Kubernetes filter's Merge_Log feature to work
+  # Mind the indentation, otherwise Fluent Bit will parse the whole message into the `log` key
+  customParsers: |
+                  [PARSER]
+                      Name cri-log-key
+                      Format regex
+                      Regex ^(?<time>[^ ]+) (?<stream>stdout|stderr) (?<logtag>[^ ]*) (?<log>.*)$
+                      Time_Key    time
+                      Time_Format %Y-%m-%dT%H:%M:%S.%L%z
+  # Required key remap if one wants to rely on the existing auto-detected log key in the fluentd parser and concat filter otherwise should be omitted
+  filterModify:
+    - rules:
+      - Rename:
+          key: log
+          value: message
+```
 
-Set the coroutines stack size in bytes. The value must be greater than the page size of the running system. Don't set too small value (say 4096), or coroutine threads can overrun the stack buffer. Do not change the default value of this parameter unless you know what you are doing. (default: 24576) 
+### dnsConfig (*corev1.PodDNSConfig, optional) {#fluentbitspec-dnsconfig}
 
-Default: 24576
 
-### resources (corev1.ResourceRequirements, optional) {#fluentbitspec-resources}
+### dnsPolicy (corev1.DNSPolicy, optional) {#fluentbitspec-dnspolicy}
 
-Default: -
 
-### tolerations ([]corev1.Toleration, optional) {#fluentbitspec-tolerations}
+### daemonsetAnnotations (map[string]string, optional) {#fluentbitspec-daemonsetannotations}
 
-Default: -
 
-### nodeSelector (map[string]string, optional) {#fluentbitspec-nodeselector}
+### disableKubernetesFilter (*bool, optional) {#fluentbitspec-disablekubernetesfilter}
 
-Default: -
+Disable Kubernetes metadata filter 
 
-### affinity (*corev1.Affinity, optional) {#fluentbitspec-affinity}
 
-Default: -
+### enableUpstream (bool, optional) {#fluentbitspec-enableupstream}
 
-### metrics (*Metrics, optional) {#fluentbitspec-metrics}
 
-Default: -
+### envVars ([]corev1.EnvVar, optional) {#fluentbitspec-envvars}
 
-### security (*Security, optional) {#fluentbitspec-security}
 
-Default: -
+### extraVolumeMounts ([]*VolumeMount, optional) {#fluentbitspec-extravolumemounts}
 
-### positiondb (volume.KubernetesVolume, optional) {#fluentbitspec-positiondb}
 
-[volume.KubernetesVolume](https://github.com/cisco-open/operator-tools/tree/master/docs/types) 
+### filterAws (*FilterAws, optional) {#fluentbitspec-filteraws}
 
-Default: -
 
-### position_db (*volume.KubernetesVolume, optional) {#fluentbitspec-position_db}
+### filterKubernetes (FilterKubernetes, optional) {#fluentbitspec-filterkubernetes}
 
-Deprecated, use positiondb 
+Parameters for Kubernetes metadata filter 
 
-Default: -
 
-### mountPath (string, optional) {#fluentbitspec-mountpath}
+### filterModify ([]FilterModify, optional) {#fluentbitspec-filtermodify}
 
-Default: -
 
-### extraVolumeMounts ([]*VolumeMount, optional) {#fluentbitspec-extravolumemounts}
+### flush (int32, optional) {#fluentbitspec-flush}
 
-Default: -
+Set the flush time in seconds.nanoseconds. The engine loop uses a Flush timeout to define when is required to flush the records ingested by input plugins through the defined output plugins. (default: 1) 
 
-### inputTail (InputTail, optional) {#fluentbitspec-inputtail}
+Default: 1
 
-Default: -
+### forwardOptions (*ForwardOptions, optional) {#fluentbitspec-forwardoptions}
 
-### filterAws (*FilterAws, optional) {#fluentbitspec-filteraws}
 
-Default: -
+### grace (int32, optional) {#fluentbitspec-grace}
 
-### filterModify ([]FilterModify, optional) {#fluentbitspec-filtermodify}
+Set the grace time in seconds as Integer value. The engine loop uses a Grace timeout to define wait time on exit.
 
-Default: -
+Default: 5
 
-### parser (string, optional) {#fluentbitspec-parser}
+### healthCheck (*HealthCheck, optional) {#fluentbitspec-healthcheck}
 
-Deprecated, use inputTail.parser 
+Available in Logging operator version 4.4 and later.
 
-Default: -
 
-### filterKubernetes (FilterKubernetes, optional) {#fluentbitspec-filterkubernetes}
+### HostNetwork (bool, optional) {#fluentbitspec-hostnetwork}
 
-Parameters for Kubernetes metadata filter 
 
-Default: -
+### image (ImageSpec, optional) {#fluentbitspec-image}
 
-### disableKubernetesFilter (*bool, optional) {#fluentbitspec-disablekubernetesfilter}
 
-Disable Kubernetes metadata filter 
+### inputTail (InputTail, optional) {#fluentbitspec-inputtail}
 
-Default: -
 
-### bufferStorage (BufferStorage, optional) {#fluentbitspec-bufferstorage}
+### labels (map[string]string, optional) {#fluentbitspec-labels}
 
-Default: -
 
-### bufferStorageVolume (volume.KubernetesVolume, optional) {#fluentbitspec-bufferstoragevolume}
+### livenessDefaultCheck (bool, optional) {#fluentbitspec-livenessdefaultcheck}
 
-[volume.KubernetesVolume](https://github.com/cisco-open/operator-tools/tree/master/docs/types) 
 
-Default: -
+### livenessProbe (*corev1.Probe, optional) {#fluentbitspec-livenessprobe}
 
-### bufferVolumeMetrics (*Metrics, optional) {#fluentbitspec-buffervolumemetrics}
 
-Default: -
+### logLevel (string, optional) {#fluentbitspec-loglevel}
 
-### bufferVolumeImage (ImageSpec, optional) {#fluentbitspec-buffervolumeimage}
+Set the logging verbosity level. Allowed values are: error, warn, info, debug and trace. Values are accumulative, e.g: if 'debug' is set, it will include error, warning, info and debug.  Note that trace mode is only available if Fluent Bit was built with the WITH_TRACE option enabled. (default: info) 
 
-Default: -
+Default: info
 
-### bufferVolumeArgs ([]string, optional) {#fluentbitspec-buffervolumeargs}
+### loggingRef (string, optional) {#fluentbitspec-loggingref}
 
-Default: -
 
-### bufferVolumeResources (corev1.ResourceRequirements, optional) {#fluentbitspec-buffervolumeresources}
+### metrics (*Metrics, optional) {#fluentbitspec-metrics}
 
-Default: -
 
-### customConfigSecret (string, optional) {#fluentbitspec-customconfigsecret}
+### mountPath (string, optional) {#fluentbitspec-mountpath}
 
-Default: -
 
-### podPriorityClassName (string, optional) {#fluentbitspec-podpriorityclassname}
+### network (*FluentbitNetwork, optional) {#fluentbitspec-network}
 
-Default: -
 
-### livenessProbe (*corev1.Probe, optional) {#fluentbitspec-livenessprobe}
+### nodeSelector (map[string]string, optional) {#fluentbitspec-nodeselector}
 
-Default: -
 
-### livenessDefaultCheck (bool, optional) {#fluentbitspec-livenessdefaultcheck}
+### parser (string, optional) {#fluentbitspec-parser}
 
-Default: -
+Deprecated, use inputTail.parser 
 
-### readinessProbe (*corev1.Probe, optional) {#fluentbitspec-readinessprobe}
 
-Default: -
+### podPriorityClassName (string, optional) {#fluentbitspec-podpriorityclassname}
 
-### network (*FluentbitNetwork, optional) {#fluentbitspec-network}
 
-Default: -
+### position_db (*volume.KubernetesVolume, optional) {#fluentbitspec-position_db}
 
-### forwardOptions (*ForwardOptions, optional) {#fluentbitspec-forwardoptions}
+Deprecated, use positiondb 
 
-Default: -
 
-### enableUpstream (bool, optional) {#fluentbitspec-enableupstream}
+### positiondb (volume.KubernetesVolume, optional) {#fluentbitspec-positiondb}
 
-Default: -
+[volume.KubernetesVolume](https://github.com/cisco-open/operator-tools/tree/master/docs/types)
 
-### serviceAccount (*typeoverride.ServiceAccount, optional) {#fluentbitspec-serviceaccount}
 
-Default: -
+### readinessProbe (*corev1.Probe, optional) {#fluentbitspec-readinessprobe}
 
-### dnsPolicy (corev1.DNSPolicy, optional) {#fluentbitspec-dnspolicy}
 
-Default: -
+### resources (corev1.ResourceRequirements, optional) {#fluentbitspec-resources}
 
-### dnsConfig (*corev1.PodDNSConfig, optional) {#fluentbitspec-dnsconfig}
 
-Default: -
+### security (*Security, optional) {#fluentbitspec-security}
 
-### HostNetwork (bool, optional) {#fluentbitspec-hostnetwork}
 
-Default: -
+### serviceAccount (*typeoverride.ServiceAccount, optional) {#fluentbitspec-serviceaccount}
+
 
 ### syslogng_output (*FluentbitTCPOutput, optional) {#fluentbitspec-syslogng_output}
 
-Default: -
 
-### updateStrategy (appsv1.DaemonSetUpdateStrategy, optional) {#fluentbitspec-updatestrategy}
+### tls (*FluentbitTLS, optional) {#fluentbitspec-tls}
 
-Default: -
 
-### customParsers (string, optional) {#fluentbitspec-customparsers}
+### targetHost (string, optional) {#fluentbitspec-targethost}
 
-Available in Logging operator version 4.2 and later.
 
-Specify a custom parser file to load in addition to the default parsers file. It must be a valid key in the configmap specified by customConfig.
+### targetPort (int32, optional) {#fluentbitspec-targetport}
 
-Default: -
 
-The following example defines a [Fluentd parser]({{< relref "/docs/configuration/plugins/filters/parser.md" >}}) that places the parsed containerd log messages into the `log` field instead of the `message` field.
+### tolerations ([]corev1.Toleration, optional) {#fluentbitspec-tolerations}
 
-```yaml
-apiVersion: logging.banzaicloud.io/v1beta1
-kind: FluentbitAgent
-metadata:
-  name: containerd
-spec:
-  inputTail:
-    Parser: cri-log-key
-  # Parser that populates `log` instead of `message` to enable the Kubernetes filter's Merge_Log feature to work
-  # Mind the indentation, otherwise Fluent Bit will parse the whole message into the `log` key
-  customParsers: |
-                  [PARSER]
-                      Name cri-log-key
-                      Format regex
-                      Regex ^(?<time>[^ ]+) (?<stream>stdout|stderr) (?<logtag>[^ ]*) (?<log>.*)$
-                      Time_Key    time
-                      Time_Format %Y-%m-%dT%H:%M:%S.%L%z
-  # Required key remap if one wants to rely on the existing auto-detected log key in the fluentd parser and concat filter otherwise should be omitted
-  filterModify:
-    - rules:
-      - Rename:
-          key: log
-          value: message
-```
 
-### healthCheck (*HealthCheck, optional) {#fluentbitspec-healthcheck}
+### updateStrategy (appsv1.DaemonSetUpdateStrategy, optional) {#fluentbitspec-updatestrategy}
 
-Available in Logging operator version 4.4 and later.
 
-Default: -
 
 ## FluentbitStatus
 
@@ -314,34 +258,30 @@ FluentbitTLS defines the TLS configs
 
 ### enabled (*bool, required) {#fluentbittls-enabled}
 
-Default: -
 
 ### secretName (string, optional) {#fluentbittls-secretname}
 
-Default: -
 
 ### sharedKey (string, optional) {#fluentbittls-sharedkey}
 
-Default: -
 
 
 ## FluentbitTCPOutput
 
 FluentbitTCPOutput defines the TLS configs
 
-### json_date_key (string, optional) {#fluentbittcpoutput-json_date_key}
-
-Default: ts
-
 ### json_date_format (string, optional) {#fluentbittcpoutput-json_date_format}
 
 Default: iso8601
 
+### json_date_key (string, optional) {#fluentbittcpoutput-json_date_key}
+
+Default: ts
+
 ### Workers (*int, optional) {#fluentbittcpoutput-workers}
 
 Available in Logging operator version 4.4 and later.
 
-Default: -
 
 
 ## FluentbitNetwork
@@ -407,17 +347,11 @@ Default:  disabled
 
 BufferStorage is the Service Section Configuration of fluent-bit
 
-### storage.path (string, optional) {#bufferstorage-storage.path}
-
-Set an optional location in the file system to store streams and chunks of data. If this parameter is not set, Input plugins can only use in-memory buffering. 
-
-Default: -
-
-### storage.sync (string, optional) {#bufferstorage-storage.sync}
+### storage.backlog.mem_limit (string, optional) {#bufferstorage-storage.backlog.mem_limit}
 
-Configure the synchronization mode used to store the data into the file system. It can take the values normal or full.  
+If storage.path is set, Fluent Bit will look for data chunks that were not delivered and are still in the storage layer, these are called backlog data. This option configure a hint of maximum value of memory to use when processing these records.  
 
-Default: normal
+Default: 5M
 
 ### storage.checksum (string, optional) {#bufferstorage-storage.checksum}
 
@@ -425,26 +359,27 @@ Enable the data integrity check when writing and reading data from the filesyste
 
 Default: Off
 
-### storage.backlog.mem_limit (string, optional) {#bufferstorage-storage.backlog.mem_limit}
+### storage.metrics (string, optional) {#bufferstorage-storage.metrics}
 
-If storage.path is set, Fluent Bit will look for data chunks that were not delivered and are still in the storage layer, these are called backlog data. This option configure a hint of maximum value of memory to use when processing these records.  
+Available in Logging operator version 4.4 and later. If the `http_server` option has been enabled in the main Service configuration section, this option registers a new endpoint where internal metrics of the storage layer can be consumed.
 
-Default: 5M
+Default: Off
 
-### storage.metrics (string, optional) {#bufferstorage-storage.metrics}
+### storage.path (string, optional) {#bufferstorage-storage.path}
 
-Available in Logging operator version 4.4 and later.
+Set an optional location in the file system to store streams and chunks of data. If this parameter is not set, Input plugins can only use in-memory buffering. 
 
-If the `http_server` option has been enabled in the main Service configuration section, this option registers a new endpoint where internal metrics of the storage layer can be consumed.
 
-Default: Off
+### storage.sync (string, optional) {#bufferstorage-storage.sync}
 
+Configure the synchronization mode used to store the data into the file system. It can take the values normal or full.  
 
-## HealthCheck
+Default: normal
 
-Available in Logging operator version 4.4 and later.
 
-HealthCheck configuration
+## HealthCheck
+
+HealthCheck configuration. Available in Logging operator version 4.4 and later.
 
 ### hcErrorsCount (int, optional) {#healthcheck-hcerrorscount}
 
@@ -452,28 +387,22 @@ The error count to meet the unhealthy requirement, this is a sum for all output
 
 Default: 5
 
-### hcRetryFailureCount (int, optional) {#healthcheck-hcretryfailurecount}
-
-The retry failure count to meet the unhealthy requirement, this is a sum for all output plugins in a defined HC_Period
-
-Default: 5
-
 ### hcPeriod (int, optional) {#healthcheck-hcperiod}
 
-The time period (in seconds) to count the error and retry failure data point
+The time period (in seconds) to count the error and retry failure data point.
 
 Default: 60
 
+### hcRetryFailureCount (int, optional) {#healthcheck-hcretryfailurecount}
 
-## InputTail
+The retry failure count to meet the unhealthy requirement, this is a sum for all output plugins in a defined HC_Period
 
-InputTail defines FluentbitAgent tail input configuration The tail input plugin allows to monitor one or several text files. It has a similar behavior like tail -f shell command.
+Default: 5
 
-### storage.type (string, optional) {#inputtail-storage.type}
 
-Specify the buffering mechanism to use. It can be memory or filesystem.  
+## InputTail
 
-Default: memory
+InputTail defines FluentbitAgent tail input configuration The tail input plugin allows to monitor one or several text files. It has a similar behavior like tail -f shell command.
 
 ### Buffer_Chunk_Size (string, optional) {#inputtail-buffer_chunk_size}
 
@@ -487,166 +416,159 @@ Set the limit of the buffer size per monitored file. When a buffer needs to be i
 
 Default: Buffer_Chunk_Size
 
-### Path (string, optional) {#inputtail-path}
+### DB (*string, optional) {#inputtail-db}
 
-Pattern specifying a specific log files or multiple ones through the use of common wildcards. 
+Specify the database file to keep track of monitored files and offsets. 
 
-Default: -
 
-### Path_Key (string, optional) {#inputtail-path_key}
+### DB.journal_mode (string, optional) {#inputtail-db.journal_mode}
 
-If enabled, it appends the name of the monitored file as part of the record. The value assigned becomes the key in the map. 
+sets the journal mode for databases (WAL). Enabling WAL provides higher performance. Note that WAL is not compatible with shared network file systems.  
 
-Default: -
+Default:  WAL
 
-### Exclude_Path (string, optional) {#inputtail-exclude_path}
+### DB.locking (*bool, optional) {#inputtail-db.locking}
 
-Set one or multiple shell patterns separated by commas to exclude files matching a certain criteria, e.g: exclude_path=*.gz,*.zip 
+Specify that the database will be accessed only by Fluent Bit. Enabling this feature helps to increase performance when accessing the database but it restrict any external tool to query the content.  
 
-Default: -
+Default:  true
 
-### Read_From_Head (bool, optional) {#inputtail-read_from_head}
+### DB_Sync (string, optional) {#inputtail-db_sync}
 
-For new discovered files on start (without a database offset/position), read the content from the head of the file, not tail. 
+Set a default synchronization (I/O) method. Values: Extra, Full, Normal, Off. This flag affects how the internal SQLite engine do synchronization to disk, for more details about each option please refer to this section.  
 
-Default: -
+Default: Full
 
-### Refresh_Interval (string, optional) {#inputtail-refresh_interval}
+### Docker_Mode (string, optional) {#inputtail-docker_mode}
 
-The interval of refreshing the list of watched files in seconds.  
+If enabled, the plugin will recombine split Docker log lines before passing them to any parser as configured above. This mode cannot be used at the same time as Multiline.  
 
-Default: 60
+Default: Off
 
-### Rotate_Wait (string, optional) {#inputtail-rotate_wait}
+### Docker_Mode_Flush (string, optional) {#inputtail-docker_mode_flush}
 
-Specify the number of extra time in seconds to monitor a file once is rotated in case some pending data is flushed.  
+Wait period time in seconds to flush queued unfinished split lines.  
 
-Default: 5
+Default: 4
 
-### Ignore_Older (string, optional) {#inputtail-ignore_older}
+### Docker_Mode_Parser (string, optional) {#inputtail-docker_mode_parser}
 
-Ignores files that have been last modified before this time in seconds. Supports m,h,d (minutes, hours,days) syntax. Default behavior is to read all specified files. 
+Specify an optional parser for the first line of the docker multiline mode. 
 
-Default: -
 
-### Skip_Long_Lines (string, optional) {#inputtail-skip_long_lines}
+### Exclude_Path (string, optional) {#inputtail-exclude_path}
 
-When a monitored file reach it buffer capacity due to a very long line (Buffer_Max_Size), the default behavior is to stop monitoring that file. Skip_Long_Lines alter that behavior and instruct Fluent Bit to skip long lines and continue processing other lines that fits into the buffer size.  
+Set one or multiple shell patterns separated by commas to exclude files matching a certain criteria, e.g: exclude_path=*.gz,*.zip 
 
-Default: Off
 
-### DB (*string, optional) {#inputtail-db}
+### Ignore_Older (string, optional) {#inputtail-ignore_older}
 
-Specify the database file to keep track of monitored files and offsets. 
+Ignores files that have been last modified before this time in seconds. Supports m,h,d (minutes, hours,days) syntax. Default behavior is to read all specified files. 
 
-Default: -
 
-### DB_Sync (string, optional) {#inputtail-db_sync}
+### Key (string, optional) {#inputtail-key}
 
-Set a default synchronization (I/O) method. Values: Extra, Full, Normal, Off. This flag affects how the internal SQLite engine do synchronization to disk, for more details about each option please refer to this section.  
+When a message is unstructured (no parser applied), it's appended as a string under the key name log. This option allows to define an alternative name for that key.  
 
-Default: Full
+Default: log
 
-### DB.locking (*bool, optional) {#inputtail-db.locking}
+### Mem_Buf_Limit (string, optional) {#inputtail-mem_buf_limit}
 
-Specify that the database will be accessed only by Fluent Bit. Enabling this feature helps to increase performance when accessing the database but it restrict any external tool to query the content.  
+Set a limit of memory that Tail plugin can use when appending data to the Engine. If the limit is reach, it will be paused; when the data is flushed it resumes. 
 
-Default:  true
 
-### DB.journal_mode (string, optional) {#inputtail-db.journal_mode}
+### Multiline (string, optional) {#inputtail-multiline}
 
-sets the journal mode for databases (WAL). Enabling WAL provides higher performance. Note that WAL is not compatible with shared network file systems.  
+If enabled, the plugin will try to discover multiline messages and use the proper parsers to compose the outgoing messages. Note that when this option is enabled the Parser option is not used.  
 
-Default:  WAL
+Default: Off
 
-### Mem_Buf_Limit (string, optional) {#inputtail-mem_buf_limit}
+### Multiline_Flush (string, optional) {#inputtail-multiline_flush}
 
-Set a limit of memory that Tail plugin can use when appending data to the Engine. If the limit is reach, it will be paused; when the data is flushed it resumes. 
+Wait period time in seconds to process queued multiline messages  
 
-Default: -
+Default: 4
+
+### multiline.parser ([]string, optional) {#inputtail-multiline.parser}
+
+Specify one or multiple parser definitions to apply to the content. Part of the new Multiline Core support in 1.8  
+
+Default:  ""
 
 ### Parser (string, optional) {#inputtail-parser}
 
 Specify the name of a parser to interpret the entry as a structured message. 
 
-Default: -
 
-### Key (string, optional) {#inputtail-key}
+### Parser_Firstline (string, optional) {#inputtail-parser_firstline}
 
-When a message is unstructured (no parser applied), it's appended as a string under the key name log. This option allows to define an alternative name for that key.  
+Name of the parser that machs the beginning of a multiline message. Note that the regular expression defined in the parser must include a group name (named capture) 
 
-Default: log
 
-### Tag (string, optional) {#inputtail-tag}
+### Parser_N ([]string, optional) {#inputtail-parser_n}
 
-Set a tag (with regex-extract fields) that will be placed on lines read. 
+Optional-extra parser to interpret and structure multiline entries. This option can be used to define multiple parsers, e.g: Parser_1 ab1,  Parser_2 ab2, Parser_N abN. 
 
-Default: -
 
-### Tag_Regex (string, optional) {#inputtail-tag_regex}
+### Path (string, optional) {#inputtail-path}
 
-Set a regex to extract fields from the file. 
+Pattern specifying a specific log files or multiple ones through the use of common wildcards. 
 
-Default: -
 
-### Multiline (string, optional) {#inputtail-multiline}
+### Path_Key (string, optional) {#inputtail-path_key}
 
-If enabled, the plugin will try to discover multiline messages and use the proper parsers to compose the outgoing messages. Note that when this option is enabled the Parser option is not used.  
+If enabled, it appends the name of the monitored file as part of the record. The value assigned becomes the key in the map. 
 
-Default: Off
 
-### Multiline_Flush (string, optional) {#inputtail-multiline_flush}
+### Read_From_Head (bool, optional) {#inputtail-read_from_head}
 
-Wait period time in seconds to process queued multiline messages  
+For new discovered files on start (without a database offset/position), read the content from the head of the file, not tail. 
 
-Default: 4
 
-### Parser_Firstline (string, optional) {#inputtail-parser_firstline}
+### Refresh_Interval (string, optional) {#inputtail-refresh_interval}
 
-Name of the parser that machs the beginning of a multiline message. Note that the regular expression defined in the parser must include a group name (named capture) 
+The interval of refreshing the list of watched files in seconds.  
 
-Default: -
+Default: 60
 
-### Parser_N ([]string, optional) {#inputtail-parser_n}
+### Rotate_Wait (string, optional) {#inputtail-rotate_wait}
 
-Optional-extra parser to interpret and structure multiline entries. This option can be used to define multiple parsers, e.g: Parser_1 ab1,  Parser_2 ab2, Parser_N abN. 
+Specify the number of extra time in seconds to monitor a file once is rotated in case some pending data is flushed.  
 
-Default: -
+Default: 5
 
-### Docker_Mode (string, optional) {#inputtail-docker_mode}
+### Skip_Long_Lines (string, optional) {#inputtail-skip_long_lines}
 
-If enabled, the plugin will recombine split Docker log lines before passing them to any parser as configured above. This mode cannot be used at the same time as Multiline.  
+When a monitored file reach it buffer capacity due to a very long line (Buffer_Max_Size), the default behavior is to stop monitoring that file. Skip_Long_Lines alter that behavior and instruct Fluent Bit to skip long lines and continue processing other lines that fits into the buffer size.  
 
 Default: Off
 
-### Docker_Mode_Parser (string, optional) {#inputtail-docker_mode_parser}
+### storage.type (string, optional) {#inputtail-storage.type}
 
-Specify an optional parser for the first line of the docker multiline mode. 
+Specify the buffering mechanism to use. It can be memory or filesystem.
 
-Default: -
+Default: memory
 
-### Docker_Mode_Flush (string, optional) {#inputtail-docker_mode_flush}
+### Tag (string, optional) {#inputtail-tag}
 
-Wait period time in seconds to flush queued unfinished split lines.  
+Set a tag (with regex-extract fields) that will be placed on lines read. 
 
-Default: 4
 
-### multiline.parser ([]string, optional) {#inputtail-multiline.parser}
+### Tag_Regex (string, optional) {#inputtail-tag_regex}
 
-Specify one or multiple parser definitions to apply to the content. Part of the new Multiline Core support in 1.8  
+Set a regex to extract fields from the file. 
 
-Default:  ""
 
 
 ## FilterKubernetes
 
 FilterKubernetes Fluent Bit Kubernetes Filter allows to enrich your log files with Kubernetes metadata.
 
-### Match (string, optional) {#filterkubernetes-match}
+### Annotations (string, optional) {#filterkubernetes-annotations}
 
-Match filtered records (default:kube.*) 
+Include Kubernetes resource annotations in the extra metadata.  
 
-Default: kubernetes.*
+Default: On
 
 ### Buffer_Size (string, optional) {#filterkubernetes-buffer_size}
 
@@ -654,185 +576,186 @@ Set the buffer size for HTTP client when reading responses from Kubernetes API s
 
 Default: "0"
 
-### Kube_URL (string, optional) {#filterkubernetes-kube_url}
+### Cache_Use_Docker_Id (string, optional) {#filterkubernetes-cache_use_docker_id}
 
-API Server end-point.
+When enabled, metadata will be fetched from K8s when docker_id is changed.  
 
-Default: `https://kubernetes.default.svc:443`
+Default: Off
 
-### Kube_CA_File (string, optional) {#filterkubernetes-kube_ca_file}
+### DNS_Retries (string, optional) {#filterkubernetes-dns_retries}
 
-CA certificate file (default:/var/run/secrets/kubernetes.io/serviceaccount/ca.crt) 
+DNS lookup retries N times until the network start working  
 
-Default: /var/run/secrets/kubernetes.io/serviceaccount/ca.crt
+Default: 6
 
-### Kube_CA_Path (string, optional) {#filterkubernetes-kube_ca_path}
+### DNS_Wait_Time (string, optional) {#filterkubernetes-dns_wait_time}
 
-Absolute path to scan for certificate files 
+DNS lookup interval between network status checks  
 
-Default: -
+Default: 30
 
-### Kube_Token_File (string, optional) {#filterkubernetes-kube_token_file}
+### Dummy_Meta (string, optional) {#filterkubernetes-dummy_meta}
 
-Token file  (default:/var/run/secrets/kubernetes.io/serviceaccount/token) 
+If set, use dummy-meta data (for test/dev purposes)  
 
-Default: /var/run/secrets/kubernetes.io/serviceaccount/token
+Default: Off
 
-### Kube_Token_TTL (string, optional) {#filterkubernetes-kube_token_ttl}
+### K8S-Logging.Exclude (string, optional) {#filterkubernetes-k8s-logging.exclude}
 
-Token TTL configurable 'time to live' for the K8s token. By default, it is set to 600 seconds. After this time, the token is reloaded from Kube_Token_File or the Kube_Token_Command.  (default:"600") 
+Allow Kubernetes Pods to exclude their logs from the log processor (read more about it in Kubernetes Annotations section).  
 
-Default: 600
+Default: On
 
-### Kube_Tag_Prefix (string, optional) {#filterkubernetes-kube_tag_prefix}
+### K8S-Logging.Parser (string, optional) {#filterkubernetes-k8s-logging.parser}
 
-When the source records comes from Tail input plugin, this option allows to specify what's the prefix used in Tail configuration. (default:kube.var.log.containers.) 
+Allow Kubernetes Pods to suggest a pre-defined Parser (read more about it in Kubernetes Annotations section)  
 
-Default: kubernetes.var.log.containers
+Default: Off
 
-### Merge_Log (string, optional) {#filterkubernetes-merge_log}
+### Keep_Log (string, optional) {#filterkubernetes-keep_log}
 
-When enabled, it checks if the log field content is a JSON string map, if so, it append the map fields as part of the log structure. (default:Off) 
+When Keep_Log is disabled, the log field is removed from the incoming message once it has been successfully merged (Merge_Log must be enabled as well).  
 
 Default: On
 
-### Merge_Log_Key (string, optional) {#filterkubernetes-merge_log_key}
+### Kube_CA_File (string, optional) {#filterkubernetes-kube_ca_file}
 
-When Merge_Log is enabled, the filter tries to assume the log field from the incoming message is a JSON string message and make a structured representation of it at the same level of the log field in the map. Now if Merge_Log_Key is set (a string name), all the new structured fields taken from the original log content are inserted under the new key. 
+CA certificate file (default:/var/run/secrets/kubernetes.io/serviceaccount/ca.crt) 
 
-Default: -
+Default: /var/run/secrets/kubernetes.io/serviceaccount/ca.crt
 
-### Merge_Log_Trim (string, optional) {#filterkubernetes-merge_log_trim}
+### Kube_CA_Path (string, optional) {#filterkubernetes-kube_ca_path}
 
-When Merge_Log is enabled, trim (remove possible \n or \r) field values.   
+Absolute path to scan for certificate files 
 
-Default: On
 
-### Merge_Parser (string, optional) {#filterkubernetes-merge_parser}
+### Kube_Meta_Cache_TTL (string, optional) {#filterkubernetes-kube_meta_cache_ttl}
 
-Optional parser name to specify how to parse the data contained in the log key. Recommended use is for developers or testing only. 
+Configurable TTL for K8s cached metadata. By default, it is set to 0 which means TTL for cache entries is disabled and cache entries are evicted at random when capacity is reached. In order to enable this option, you should set the number to a time interval. For example, set this value to 60 or 60s and cache entries which have been created more than 60s will be evicted.  
 
-Default: -
+Default: 0
 
-### Keep_Log (string, optional) {#filterkubernetes-keep_log}
+### Kube_meta_preload_cache_dir (string, optional) {#filterkubernetes-kube_meta_preload_cache_dir}
 
-When Keep_Log is disabled, the log field is removed from the incoming message once it has been successfully merged (Merge_Log must be enabled as well).  
+If set, Kubernetes meta-data can be cached/pre-loaded from files in JSON format in this directory, named as namespace-pod.meta 
 
-Default: On
 
-### tls.debug (string, optional) {#filterkubernetes-tls.debug}
+### Kube_Tag_Prefix (string, optional) {#filterkubernetes-kube_tag_prefix}
 
-Debug level between 0 (nothing) and 4 (every detail).  
+When the source records comes from Tail input plugin, this option allows to specify what's the prefix used in Tail configuration. (default:kube.var.log.containers.) 
 
-Default: -1
+Default: kubernetes.var.log.containers
 
-### tls.verify (string, optional) {#filterkubernetes-tls.verify}
+### Kube_Token_File (string, optional) {#filterkubernetes-kube_token_file}
 
-When enabled, turns on certificate validation when connecting to the Kubernetes API server.  
+Token file  (default:/var/run/secrets/kubernetes.io/serviceaccount/token) 
 
-Default: On
+Default: /var/run/secrets/kubernetes.io/serviceaccount/token
 
-### Use_Journal (string, optional) {#filterkubernetes-use_journal}
+### Kube_Token_TTL (string, optional) {#filterkubernetes-kube_token_ttl}
 
-When enabled, the filter reads logs coming in Journald format.  
+Token TTL configurable 'time to live' for the K8s token. By default, it is set to 600 seconds. After this time, the token is reloaded from Kube_Token_File or the Kube_Token_Command.  (default:"600") 
 
-Default: Off
+Default: 600
 
-### Cache_Use_Docker_Id (string, optional) {#filterkubernetes-cache_use_docker_id}
+### Kube_URL (string, optional) {#filterkubernetes-kube_url}
 
-When enabled, metadata will be fetched from K8s when docker_id is changed.  
+API Server end-point.
 
-Default: Off
+Default: `https://kubernetes.default.svc:443`
 
-### Regex_Parser (string, optional) {#filterkubernetes-regex_parser}
+### Kubelet_Port (string, optional) {#filterkubernetes-kubelet_port}
 
-Set an alternative Parser to process record Tag and extract pod_name, namespace_name, container_name and docker_id. The parser must be registered in a parsers file (refer to parser filter-kube-test as an example). 
+kubelet port using for HTTP request, this only works when Use_Kubelet  set to On  
 
-Default: -
+Default: 10250
 
-### K8S-Logging.Parser (string, optional) {#filterkubernetes-k8s-logging.parser}
+### Labels (string, optional) {#filterkubernetes-labels}
 
-Allow Kubernetes Pods to suggest a pre-defined Parser (read more about it in Kubernetes Annotations section)  
+Include Kubernetes resource labels in the extra metadata.  
 
-Default: Off
+Default: On
 
-### K8S-Logging.Exclude (string, optional) {#filterkubernetes-k8s-logging.exclude}
+### Match (string, optional) {#filterkubernetes-match}
 
-Allow Kubernetes Pods to exclude their logs from the log processor (read more about it in Kubernetes Annotations section).  
+Match filtered records (default:kube.*) 
 
-Default: On
+Default: kubernetes.*
 
-### Labels (string, optional) {#filterkubernetes-labels}
+### Merge_Log (string, optional) {#filterkubernetes-merge_log}
 
-Include Kubernetes resource labels in the extra metadata.  
+When enabled, it checks if the log field content is a JSON string map, if so, it append the map fields as part of the log structure. (default:Off) 
 
 Default: On
 
-### Annotations (string, optional) {#filterkubernetes-annotations}
+### Merge_Log_Key (string, optional) {#filterkubernetes-merge_log_key}
 
-Include Kubernetes resource annotations in the extra metadata.  
+When Merge_Log is enabled, the filter tries to assume the log field from the incoming message is a JSON string message and make a structured representation of it at the same level of the log field in the map. Now if Merge_Log_Key is set (a string name), all the new structured fields taken from the original log content are inserted under the new key. 
 
-Default: On
 
-### Kube_meta_preload_cache_dir (string, optional) {#filterkubernetes-kube_meta_preload_cache_dir}
+### Merge_Log_Trim (string, optional) {#filterkubernetes-merge_log_trim}
 
-If set, Kubernetes meta-data can be cached/pre-loaded from files in JSON format in this directory, named as namespace-pod.meta 
+When Merge_Log is enabled, trim (remove possible \n or \r) field values.   
 
-Default: -
+Default: On
 
-### Dummy_Meta (string, optional) {#filterkubernetes-dummy_meta}
+### Merge_Parser (string, optional) {#filterkubernetes-merge_parser}
 
-If set, use dummy-meta data (for test/dev purposes)  
+Optional parser name to specify how to parse the data contained in the log key. Recommended use is for developers or testing only. 
 
-Default: Off
 
-### DNS_Retries (string, optional) {#filterkubernetes-dns_retries}
+### Regex_Parser (string, optional) {#filterkubernetes-regex_parser}
 
-DNS lookup retries N times until the network start working  
+Set an alternative Parser to process record Tag and extract pod_name, namespace_name, container_name and docker_id. The parser must be registered in a parsers file (refer to parser filter-kube-test as an example). 
 
-Default: 6
 
-### DNS_Wait_Time (string, optional) {#filterkubernetes-dns_wait_time}
+### tls.debug (string, optional) {#filterkubernetes-tls.debug}
 
-DNS lookup interval between network status checks  
+Debug level between 0 (nothing) and 4 (every detail).  
 
-Default: 30
+Default: -1
 
-### Use_Kubelet (string, optional) {#filterkubernetes-use_kubelet}
+### tls.verify (string, optional) {#filterkubernetes-tls.verify}
 
-This is an optional feature flag to get metadata information from kubelet instead of calling Kube Server API to enhance the log.  
+When enabled, turns on certificate validation when connecting to the Kubernetes API server.  
 
-Default: Off
+Default: On
 
-### Kubelet_Port (string, optional) {#filterkubernetes-kubelet_port}
+### Use_Journal (string, optional) {#filterkubernetes-use_journal}
 
-kubelet port using for HTTP request, this only works when Use_Kubelet  set to On  
+When enabled, the filter reads logs coming in Journald format.  
 
-Default: 10250
+Default: Off
 
-### Kube_Meta_Cache_TTL (string, optional) {#filterkubernetes-kube_meta_cache_ttl}
+### Use_Kubelet (string, optional) {#filterkubernetes-use_kubelet}
 
-Configurable TTL for K8s cached metadata. By default, it is set to 0 which means TTL for cache entries is disabled and cache entries are evicted at random when capacity is reached. In order to enable this option, you should set the number to a time interval. For example, set this value to 60 or 60s and cache entries which have been created more than 60s will be evicted.  
+This is an optional feature flag to get metadata information from kubelet instead of calling Kube Server API to enhance the log.  
 
-Default: 0
+Default: Off
 
 
 ## FilterAws
 
 FilterAws The AWS Filter Enriches logs with AWS Metadata.
 
-### imds_version (string, optional) {#filteraws-imds_version}
-
-Specify which version of the instance metadata service to use. Valid values are 'v1' or 'v2' (default). 
-
-Default: v2
-
 ### az (*bool, optional) {#filteraws-az}
 
 The availability zone (default:true). 
 
 Default: true
 
+### account_id (*bool, optional) {#filteraws-account_id}
+
+The account ID for current EC2 instance. (default:false) 
+
+Default: false
+
+### ami_id (*bool, optional) {#filteraws-ami_id}
+
+The EC2 instance image id. (default:false) 
+
+Default: false
+
 ### ec2_instance_id (*bool, optional) {#filteraws-ec2_instance_id}
 
 The EC2 instance ID. (default:true) 
@@ -845,27 +768,27 @@ The EC2 instance type. (default:false)
 
 Default: false
 
-### private_ip (*bool, optional) {#filteraws-private_ip}
+### hostname (*bool, optional) {#filteraws-hostname}
 
-The EC2 instance private ip. (default:false) 
+The hostname for current EC2 instance. (default:false) 
 
 Default: false
 
-### ami_id (*bool, optional) {#filteraws-ami_id}
+### imds_version (string, optional) {#filteraws-imds_version}
 
-The EC2 instance image id. (default:false) 
+Specify which version of the instance metadata service to use. Valid values are 'v1' or 'v2' (default). 
 
-Default: false
+Default: v2
 
-### account_id (*bool, optional) {#filteraws-account_id}
+### Match (string, optional) {#filteraws-match}
 
-The account ID for current EC2 instance. (default:false) 
+Match filtered records (default:*) 
 
-Default: false
+Default: *
 
-### hostname (*bool, optional) {#filteraws-hostname}
+### private_ip (*bool, optional) {#filteraws-private_ip}
 
-The hostname for current EC2 instance. (default:false) 
+The EC2 instance private ip. (default:false) 
 
 Default: false
 
@@ -875,247 +798,203 @@ The VPC ID for current EC2 instance. (default:false)
 
 Default: false
 
-### Match (string, optional) {#filteraws-match}
-
-Match filtered records (default:*) 
-
-Default: *
-
 
 ## FilterModify
 
 FilterModify The Modify Filter plugin allows you to change records using rules and conditions.
 
-### rules ([]FilterModifyRule, optional) {#filtermodify-rules}
+### conditions ([]FilterModifyCondition, optional) {#filtermodify-conditions}
 
-FluentbitAgent Filter Modification Rule 
+FluentbitAgent Filter Modification Condition 
 
-Default: -
 
-### conditions ([]FilterModifyCondition, optional) {#filtermodify-conditions}
+### rules ([]FilterModifyRule, optional) {#filtermodify-rules}
 
-FluentbitAgent Filter Modification Condition 
+FluentbitAgent Filter Modification Rule 
 
-Default: -
 
 
 ## FilterModifyRule
 
 FilterModifyRule The Modify Filter plugin allows you to change records using rules and conditions.
 
-### Set (*FilterKeyValue, optional) {#filtermodifyrule-set}
+### Add (*FilterKeyValue, optional) {#filtermodifyrule-add}
 
-Add a key/value pair with key KEY and value VALUE. If KEY already exists, this field is overwritten 
+Add a key/value pair with key KEY and value VALUE if KEY does not exist 
 
-Default: -
 
-### Add (*FilterKeyValue, optional) {#filtermodifyrule-add}
+### Copy (*FilterKeyValue, optional) {#filtermodifyrule-copy}
 
-Add a key/value pair with key KEY and value VALUE if KEY does not exist 
+Copy a key/value pair with key KEY to COPIED_KEY if KEY exists AND COPIED_KEY does not exist 
 
-Default: -
 
-### Remove (*FilterKey, optional) {#filtermodifyrule-remove}
+### Hard_copy (*FilterKeyValue, optional) {#filtermodifyrule-hard_copy}
 
-Remove a key/value pair with key KEY if it exists 
+Copy a key/value pair with key KEY to COPIED_KEY if KEY exists. If COPIED_KEY already exists, this field is overwritten 
 
-Default: -
 
-### Remove_wildcard (*FilterKey, optional) {#filtermodifyrule-remove_wildcard}
+### Hard_rename (*FilterKeyValue, optional) {#filtermodifyrule-hard_rename}
 
-Remove all key/value pairs with key matching wildcard KEY 
+Rename a key/value pair with key KEY to RENAMED_KEY if KEY exists. If RENAMED_KEY already exists, this field is overwritten 
 
-Default: -
 
-### Remove_regex (*FilterKey, optional) {#filtermodifyrule-remove_regex}
+### Remove (*FilterKey, optional) {#filtermodifyrule-remove}
 
-Remove all key/value pairs with key matching regexp KEY 
+Remove a key/value pair with key KEY if it exists 
 
-Default: -
 
-### Rename (*FilterKeyValue, optional) {#filtermodifyrule-rename}
+### Remove_regex (*FilterKey, optional) {#filtermodifyrule-remove_regex}
 
-Rename a key/value pair with key KEY to RENAMED_KEY if KEY exists AND RENAMED_KEY does not exist 
+Remove all key/value pairs with key matching regexp KEY 
 
-Default: -
 
-### Hard_rename (*FilterKeyValue, optional) {#filtermodifyrule-hard_rename}
+### Remove_wildcard (*FilterKey, optional) {#filtermodifyrule-remove_wildcard}
 
-Rename a key/value pair with key KEY to RENAMED_KEY if KEY exists. If RENAMED_KEY already exists, this field is overwritten 
+Remove all key/value pairs with key matching wildcard KEY 
 
-Default: -
 
-### Copy (*FilterKeyValue, optional) {#filtermodifyrule-copy}
+### Rename (*FilterKeyValue, optional) {#filtermodifyrule-rename}
 
-Copy a key/value pair with key KEY to COPIED_KEY if KEY exists AND COPIED_KEY does not exist 
+Rename a key/value pair with key KEY to RENAMED_KEY if KEY exists AND RENAMED_KEY does not exist 
 
-Default: -
 
-### Hard_copy (*FilterKeyValue, optional) {#filtermodifyrule-hard_copy}
+### Set (*FilterKeyValue, optional) {#filtermodifyrule-set}
 
-Copy a key/value pair with key KEY to COPIED_KEY if KEY exists. If COPIED_KEY already exists, this field is overwritten 
+Add a key/value pair with key KEY and value VALUE. If KEY already exists, this field is overwritten 
 
-Default: -
 
 
 ## FilterModifyCondition
 
 FilterModifyCondition The Modify Filter plugin allows you to change records using rules and conditions.
 
-### Key_exists (*FilterKey, optional) {#filtermodifycondition-key_exists}
+### A_key_matches (*FilterKey, optional) {#filtermodifycondition-a_key_matches}
 
-Is true if KEY exists 
+Is true if a key matches regex KEY 
 
-Default: -
 
 ### Key_does_not_exist (*FilterKeyValue, optional) {#filtermodifycondition-key_does_not_exist}
 
 Is true if KEY does not exist 
 
-Default: -
 
-### A_key_matches (*FilterKey, optional) {#filtermodifycondition-a_key_matches}
+### Key_exists (*FilterKey, optional) {#filtermodifycondition-key_exists}
 
-Is true if a key matches regex KEY 
+Is true if KEY exists 
 
-Default: -
 
-### No_key_matches (*FilterKey, optional) {#filtermodifycondition-no_key_matches}
+### Key_value_does_not_equal (*FilterKeyValue, optional) {#filtermodifycondition-key_value_does_not_equal}
 
-Is true if no key matches regex KEY 
+Is true if KEY exists and its value is not VALUE 
 
-Default: -
 
-### Key_value_equals (*FilterKeyValue, optional) {#filtermodifycondition-key_value_equals}
+### Key_value_does_not_match (*FilterKeyValue, optional) {#filtermodifycondition-key_value_does_not_match}
 
-Is true if KEY exists and its value is VALUE 
+Is true if key KEY exists and its value does not match VALUE 
 
-Default: -
 
-### Key_value_does_not_equal (*FilterKeyValue, optional) {#filtermodifycondition-key_value_does_not_equal}
+### Key_value_equals (*FilterKeyValue, optional) {#filtermodifycondition-key_value_equals}
 
-Is true if KEY exists and its value is not VALUE 
+Is true if KEY exists and its value is VALUE 
 
-Default: -
 
 ### Key_value_matches (*FilterKeyValue, optional) {#filtermodifycondition-key_value_matches}
 
 Is true if key KEY exists and its value matches VALUE 
 
-Default: -
 
-### Key_value_does_not_match (*FilterKeyValue, optional) {#filtermodifycondition-key_value_does_not_match}
+### Matching_keys_do_not_have_matching_values (*FilterKeyValue, optional) {#filtermodifycondition-matching_keys_do_not_have_matching_values}
 
-Is true if key KEY exists and its value does not match VALUE 
+Is true if all keys matching KEY have values that do not match VALUE 
 
-Default: -
 
 ### Matching_keys_have_matching_values (*FilterKeyValue, optional) {#filtermodifycondition-matching_keys_have_matching_values}
 
 Is true if all keys matching KEY have values that match VALUE 
 
-Default: -
 
-### Matching_keys_do_not_have_matching_values (*FilterKeyValue, optional) {#filtermodifycondition-matching_keys_do_not_have_matching_values}
+### No_key_matches (*FilterKey, optional) {#filtermodifycondition-no_key_matches}
 
-Is true if all keys matching KEY have values that do not match VALUE 
+Is true if no key matches regex KEY 
 
-Default: -
 
 
 ## Operation
 
 Operation Doc stub
 
-### Op (string, optional) {#operation-op}
+### Key (string, optional) {#operation-key}
 
-Default: -
 
-### Key (string, optional) {#operation-key}
+### Op (string, optional) {#operation-op}
 
-Default: -
 
 ### Value (string, optional) {#operation-value}
 
-Default: -
 
 
 ## FilterKey
 
 ### key (string, optional) {#filterkey-key}
 
-Default: -
 
 
 ## FilterKeyValue
 
 ### key (string, optional) {#filterkeyvalue-key}
 
-Default: -
 
 ### value (string, optional) {#filterkeyvalue-value}
 
-Default: -
 
 
 ## VolumeMount
 
 VolumeMount defines source and destination folders of a hostPath type pod mount
 
-### source (string, required) {#volumemount-source}
-
-Source folder 
-
-Default: -
-
 ### destination (string, required) {#volumemount-destination}
 
 Destination Folder 
 
-Default: -
 
 ### readOnly (*bool, optional) {#volumemount-readonly}
 
 Mount Mode 
 
-Default: -
-
 
-## ForwardOptions
+### source (string, required) {#volumemount-source}
 
-ForwardOptions defines custom forward output plugin options, see https://docs.fluentbit.io/manual/pipeline/outputs/forward
+Source folder
 
-### Time_as_Integer (bool, optional) {#forwardoptions-time_as_integer}
 
-Default: -
 
-### Send_options (bool, optional) {#forwardoptions-send_options}
+## ForwardOptions
 
-Default: -
+ForwardOptions defines custom forward output plugin options, see https://docs.fluentbit.io/manual/pipeline/outputs/forward
 
 ### Require_ack_response (bool, optional) {#forwardoptions-require_ack_response}
 
-Default: -
 
-### Tag (string, optional) {#forwardoptions-tag}
+### Retry_Limit (string, optional) {#forwardoptions-retry_limit}
 
-Default: -
 
-### Retry_Limit (string, optional) {#forwardoptions-retry_limit}
+### Send_options (bool, optional) {#forwardoptions-send_options}
 
-Default: -
 
 ### storage.total_limit_size (string, optional) {#forwardoptions-storage.total_limit_size}
 
 `storage.total_limit_size` Limit the maximum number of Chunks in the filesystem for the current output logical destination. 
 
-Default: -
+
+### Tag (string, optional) {#forwardoptions-tag}
+
+
+### Time_as_Integer (bool, optional) {#forwardoptions-time_as_integer}
+
 
 ### Workers (*int, optional) {#forwardoptions-workers}
 
-Available in Logging operator version 4.4 and later.
+Available in Logging operator version 4.4 and later. Enables dedicated thread(s) for this output. Default value (2) is set since version 1.8.13. For previous versions is 0. 
 
-Enables dedicated thread(s) for this output. Default value (2) is set since version 1.8.13. For previous versions is 0. 
 
-Default: -
 
diff --git a/content/docs/configuration/crds/v1beta1/fluentd_types.md b/content/docs/configuration/crds/v1beta1/fluentd_types.md
index 386d8c6aa..376d51d62 100644
--- a/content/docs/configuration/crds/v1beta1/fluentd_types.md
+++ b/content/docs/configuration/crds/v1beta1/fluentd_types.md
@@ -8,268 +8,218 @@ generated_file: true
 
 FluentdSpec defines the desired state of Fluentd
 
-### statefulsetAnnotations (map[string]string, optional) {#fluentdspec-statefulsetannotations}
+### affinity (*corev1.Affinity, optional) {#fluentdspec-affinity}
 
-Default: -
 
 ### annotations (map[string]string, optional) {#fluentdspec-annotations}
 
-Default: -
 
-### configCheckAnnotations (map[string]string, optional) {#fluentdspec-configcheckannotations}
+### bufferStorageVolume (volume.KubernetesVolume, optional) {#fluentdspec-bufferstoragevolume}
 
-Default: -
+BufferStorageVolume is by default configured as PVC using FluentdPvcSpec [volume.KubernetesVolume](https://github.com/cisco-open/operator-tools/tree/master/docs/types) 
 
-### labels (map[string]string, optional) {#fluentdspec-labels}
 
-Default: -
+### bufferVolumeArgs ([]string, optional) {#fluentdspec-buffervolumeargs}
 
-### envVars ([]corev1.EnvVar, optional) {#fluentdspec-envvars}
 
-Default: -
+### bufferVolumeImage (ImageSpec, optional) {#fluentdspec-buffervolumeimage}
 
-### tls (FluentdTLS, optional) {#fluentdspec-tls}
 
-Default: -
+### bufferVolumeMetrics (*Metrics, optional) {#fluentdspec-buffervolumemetrics}
 
-### image (ImageSpec, optional) {#fluentdspec-image}
 
-Default: -
+### bufferVolumeResources (corev1.ResourceRequirements, optional) {#fluentdspec-buffervolumeresources}
 
-### disablePvc (bool, optional) {#fluentdspec-disablepvc}
 
-Default: -
+### compressConfigFile (bool, optional) {#fluentdspec-compressconfigfile}
 
-### bufferStorageVolume (volume.KubernetesVolume, optional) {#fluentdspec-bufferstoragevolume}
 
-BufferStorageVolume is by default configured as PVC using FluentdPvcSpec [volume.KubernetesVolume](https://github.com/cisco-open/operator-tools/tree/master/docs/types) 
+### configCheckAnnotations (map[string]string, optional) {#fluentdspec-configcheckannotations}
 
-Default: -
 
-### extraVolumes ([]ExtraVolume, optional) {#fluentdspec-extravolumes}
+### configCheckResources (corev1.ResourceRequirements, optional) {#fluentdspec-configcheckresources}
 
-Default: -
 
-### fluentdPvcSpec (*volume.KubernetesVolume, optional) {#fluentdspec-fluentdpvcspec}
+### configReloaderImage (ImageSpec, optional) {#fluentdspec-configreloaderimage}
 
-Deprecated, use bufferStorageVolume 
 
-Default: -
+### configReloaderResources (corev1.ResourceRequirements, optional) {#fluentdspec-configreloaderresources}
 
-### volumeMountChmod (bool, optional) {#fluentdspec-volumemountchmod}
 
-Default: -
+### dnsConfig (*corev1.PodDNSConfig, optional) {#fluentdspec-dnsconfig}
 
-### volumeModImage (ImageSpec, optional) {#fluentdspec-volumemodimage}
 
-Default: -
+### dnsPolicy (corev1.DNSPolicy, optional) {#fluentdspec-dnspolicy}
 
-### configReloaderImage (ImageSpec, optional) {#fluentdspec-configreloaderimage}
 
-Default: -
+### disablePvc (bool, optional) {#fluentdspec-disablepvc}
 
-### resources (corev1.ResourceRequirements, optional) {#fluentdspec-resources}
 
-Default: -
+### enableMsgpackTimeSupport (bool, optional) {#fluentdspec-enablemsgpacktimesupport}
 
-### configCheckResources (corev1.ResourceRequirements, optional) {#fluentdspec-configcheckresources}
+Allows Time object in buffer's MessagePack serde [more info]( https://docs.fluentd.org/deployment/system-config#enable_msgpack_time_support) 
 
-Default: -
 
-### configReloaderResources (corev1.ResourceRequirements, optional) {#fluentdspec-configreloaderresources}
+### envVars ([]corev1.EnvVar, optional) {#fluentdspec-envvars}
 
-Default: -
 
-### livenessProbe (*corev1.Probe, optional) {#fluentdspec-livenessprobe}
+### extraArgs ([]string, optional) {#fluentdspec-extraargs}
 
-Default: -
 
-### livenessDefaultCheck (bool, optional) {#fluentdspec-livenessdefaultcheck}
+### extraVolumes ([]ExtraVolume, optional) {#fluentdspec-extravolumes}
 
-Default: -
 
-### readinessProbe (*corev1.Probe, optional) {#fluentdspec-readinessprobe}
+### fluentLogDestination (string, optional) {#fluentdspec-fluentlogdestination}
 
-Default: -
 
-### readinessDefaultCheck (ReadinessDefaultCheck, optional) {#fluentdspec-readinessdefaultcheck}
+### fluentOutLogrotate (*FluentOutLogrotate, optional) {#fluentdspec-fluentoutlogrotate}
 
-Default: -
+FluentOutLogrotate sends fluent's stdout to file and rotates it 
 
-### port (int32, optional) {#fluentdspec-port}
 
-Fluentd port inside the container (24240 by default). The headless service port is controlled by this field as well. Note that the default ClusterIP service port is always 24240, regardless of this field.
+### fluentdPvcSpec (*volume.KubernetesVolume, optional) {#fluentdspec-fluentdpvcspec}
 
-Default: 24240
+Deprecated, use bufferStorageVolume 
 
-### tolerations ([]corev1.Toleration, optional) {#fluentdspec-tolerations}
 
-Default: -
+### forwardInputConfig (*input.ForwardInputConfig, optional) {#fluentdspec-forwardinputconfig}
 
-### nodeSelector (map[string]string, optional) {#fluentdspec-nodeselector}
 
-Default: -
+### ignoreRepeatedLogInterval (string, optional) {#fluentdspec-ignorerepeatedloginterval}
 
-### affinity (*corev1.Affinity, optional) {#fluentdspec-affinity}
+Ignore repeated log lines [more info]( https://docs.fluentd.org/deployment/logging#ignore_repeated_log_interval) 
 
-Default: -
 
-### topologySpreadConstraints ([]corev1.TopologySpreadConstraint, optional) {#fluentdspec-topologyspreadconstraints}
+### ignoreSameLogInterval (string, optional) {#fluentdspec-ignoresameloginterval}
 
-Default: -
+Ignore same log lines [more info]( https://docs.fluentd.org/deployment/logging#ignore_same_log_interval) 
 
-### metrics (*Metrics, optional) {#fluentdspec-metrics}
 
-Default: -
+### image (ImageSpec, optional) {#fluentdspec-image}
 
-### bufferVolumeMetrics (*Metrics, optional) {#fluentdspec-buffervolumemetrics}
 
-Default: -
+### labels (map[string]string, optional) {#fluentdspec-labels}
 
-### bufferVolumeImage (ImageSpec, optional) {#fluentdspec-buffervolumeimage}
 
-Default: -
+### livenessDefaultCheck (bool, optional) {#fluentdspec-livenessdefaultcheck}
 
-### bufferVolumeArgs ([]string, optional) {#fluentdspec-buffervolumeargs}
 
-Default: -
+### livenessProbe (*corev1.Probe, optional) {#fluentdspec-livenessprobe}
 
-### bufferVolumeResources (corev1.ResourceRequirements, optional) {#fluentdspec-buffervolumeresources}
 
-Default: -
+### logLevel (string, optional) {#fluentdspec-loglevel}
 
-### security (*Security, optional) {#fluentdspec-security}
 
-Default: -
+### metrics (*Metrics, optional) {#fluentdspec-metrics}
 
-### scaling (*FluentdScaling, optional) {#fluentdspec-scaling}
 
-Default: -
+### nodeSelector (map[string]string, optional) {#fluentdspec-nodeselector}
 
-### workers (int32, optional) {#fluentdspec-workers}
 
-Default: -
+### podPriorityClassName (string, optional) {#fluentdspec-podpriorityclassname}
 
-### rootDir (string, optional) {#fluentdspec-rootdir}
 
-Default: -
+### port (int32, optional) {#fluentdspec-port}
 
-### logLevel (string, optional) {#fluentdspec-loglevel}
+Fluentd port inside the container (24240 by default). The headless service port is controlled by this field as well. Note that the default ClusterIP service port is always 24240, regardless of this field.
 
-Default: -
 
-### ignoreSameLogInterval (string, optional) {#fluentdspec-ignoresameloginterval}
+### readinessDefaultCheck (ReadinessDefaultCheck, optional) {#fluentdspec-readinessdefaultcheck}
 
-Ignore same log lines [more info]( https://docs.fluentd.org/deployment/logging#ignore_same_log_interval) 
 
-Default: -
+### readinessProbe (*corev1.Probe, optional) {#fluentdspec-readinessprobe}
 
-### ignoreRepeatedLogInterval (string, optional) {#fluentdspec-ignorerepeatedloginterval}
 
-Ignore repeated log lines [more info]( https://docs.fluentd.org/deployment/logging#ignore_repeated_log_interval) 
+### resources (corev1.ResourceRequirements, optional) {#fluentdspec-resources}
 
-Default: -
 
-### enableMsgpackTimeSupport (bool, optional) {#fluentdspec-enablemsgpacktimesupport}
+### rootDir (string, optional) {#fluentdspec-rootdir}
 
-Allows Time object in buffer's MessagePack serde [more info]( https://docs.fluentd.org/deployment/system-config#enable_msgpack_time_support) 
 
-Default: -
+### scaling (*FluentdScaling, optional) {#fluentdspec-scaling}
 
-### podPriorityClassName (string, optional) {#fluentdspec-podpriorityclassname}
 
-Default: -
+### security (*Security, optional) {#fluentdspec-security}
 
-### fluentLogDestination (string, optional) {#fluentdspec-fluentlogdestination}
 
-Default: -
+### serviceAccount (*typeoverride.ServiceAccount, optional) {#fluentdspec-serviceaccount}
 
-### fluentOutLogrotate (*FluentOutLogrotate, optional) {#fluentdspec-fluentoutlogrotate}
 
-FluentOutLogrotate sends fluent's stdout to file and rotates it 
+### sidecarContainers ([]corev1.Container, optional) {#fluentdspec-sidecarcontainers}
 
-Default: -
+Available in Logging operator version 4.5 and later. Configure sidecar container in Fluentd pods, for example: [https://github.com/kube-logging/logging-operator/config/samples/logging_logging_fluentd_sidecars.yaml](https://github.com/kube-logging/logging-operator/config/samples/logging_logging_fluentd_sidecars.yaml). 
 
-### forwardInputConfig (*input.ForwardInputConfig, optional) {#fluentdspec-forwardinputconfig}
 
-Default: -
+### statefulsetAnnotations (map[string]string, optional) {#fluentdspec-statefulsetannotations}
 
-### serviceAccount (*typeoverride.ServiceAccount, optional) {#fluentdspec-serviceaccount}
 
-Default: -
+### tls (FluentdTLS, optional) {#fluentdspec-tls}
 
-### dnsPolicy (corev1.DNSPolicy, optional) {#fluentdspec-dnspolicy}
 
-Default: -
+### tolerations ([]corev1.Toleration, optional) {#fluentdspec-tolerations}
 
-### dnsConfig (*corev1.PodDNSConfig, optional) {#fluentdspec-dnsconfig}
 
-Default: -
+### topologySpreadConstraints ([]corev1.TopologySpreadConstraint, optional) {#fluentdspec-topologyspreadconstraints}
 
-### extraArgs ([]string, optional) {#fluentdspec-extraargs}
 
-Default: -
+### volumeModImage (ImageSpec, optional) {#fluentdspec-volumemodimage}
 
-### compressConfigFile (bool, optional) {#fluentdspec-compressconfigfile}
 
-Default: -
+### volumeMountChmod (bool, optional) {#fluentdspec-volumemountchmod}
 
 
-## FluentOutLogrotate
+### workers (int32, optional) {#fluentdspec-workers}
+
 
-### enabled (bool, required) {#fluentoutlogrotate-enabled}
 
-Default: -
 
-### path (string, optional) {#fluentoutlogrotate-path}
 
-Default: -
+
+
+## FluentOutLogrotate
 
 ### age (string, optional) {#fluentoutlogrotate-age}
 
-Default: -
+
+### enabled (bool, required) {#fluentoutlogrotate-enabled}
+
+
+### path (string, optional) {#fluentoutlogrotate-path}
+
 
 ### size (string, optional) {#fluentoutlogrotate-size}
 
-Default: -
 
 
 ## ExtraVolume
 
 ExtraVolume defines the fluentd extra volumes
 
-### volumeName (string, optional) {#extravolume-volumename}
+### containerName (string, optional) {#extravolume-containername}
 
-Default: -
 
 ### path (string, optional) {#extravolume-path}
 
-Default: -
 
-### containerName (string, optional) {#extravolume-containername}
+### volume (*volume.KubernetesVolume, optional) {#extravolume-volume}
 
-Default: -
 
-### volume (*volume.KubernetesVolume, optional) {#extravolume-volume}
+### volumeName (string, optional) {#extravolume-volumename}
 
-Default: -
 
 
 ## FluentdScaling
 
 FluentdScaling enables configuring the scaling behaviour of the fluentd statefulset
 
-### replicas (int, optional) {#fluentdscaling-replicas}
+### drain (FluentdDrainConfig, optional) {#fluentdscaling-drain}
 
-Default: -
 
 ### podManagementPolicy (string, optional) {#fluentdscaling-podmanagementpolicy}
 
-Default: -
 
-### drain (FluentdDrainConfig, optional) {#fluentdscaling-drain}
+### replicas (int, optional) {#fluentdscaling-replicas}
 
-Default: -
 
 
 ## FluentdTLS
@@ -278,69 +228,54 @@ FluentdTLS defines the TLS configs
 
 ### enabled (bool, required) {#fluentdtls-enabled}
 
-Default: -
 
 ### secretName (string, optional) {#fluentdtls-secretname}
 
-Default: -
 
 ### sharedKey (string, optional) {#fluentdtls-sharedkey}
 
-Default: -
 
 
 ## FluentdDrainConfig
 
 FluentdDrainConfig enables configuring the drain behavior when scaling down the fluentd statefulset
 
-### enabled (bool, optional) {#fluentddrainconfig-enabled}
-
-Should buffers on persistent volumes left after scaling down the statefulset be drained 
-
-Default: -
-
 ### annotations (map[string]string, optional) {#fluentddrainconfig-annotations}
 
 Annotations to use for the drain watch sidecar 
 
-Default: -
 
-### labels (map[string]string, optional) {#fluentddrainconfig-labels}
+### deleteVolume (bool, optional) {#fluentddrainconfig-deletevolume}
 
-Labels to use for the drain watch sidecar on top of labels added by the operator by default. Default values can be overwritten. 
+Should persistent volume claims be deleted after draining is done 
 
-Default: -
 
-### deleteVolume (bool, optional) {#fluentddrainconfig-deletevolume}
+### enabled (bool, optional) {#fluentddrainconfig-enabled}
 
-Should persistent volume claims be deleted after draining is done 
+Should buffers on persistent volumes left after scaling down the statefulset be drained 
 
-Default: -
 
 ### image (ImageSpec, optional) {#fluentddrainconfig-image}
 
-Default: -
+
+### labels (map[string]string, optional) {#fluentddrainconfig-labels}
+
+Labels to use for the drain watch sidecar on top of labels added by the operator by default. Default values can be overwritten. 
+
 
 ### pauseImage (ImageSpec, optional) {#fluentddrainconfig-pauseimage}
 
 Container image to use for the fluentd placeholder pod 
 
-Default: -
 
 ### resources (*corev1.ResourceRequirements, optional) {#fluentddrainconfig-resources}
 
-Available in Logging operator version 4.4 and later.
+Available in Logging operator version 4.4 and later. Configurable resource requirements for the drainer sidecar container. Default 20m cpu request, 20M memory limit 
 
-Configurable resource requirements for the drainer sidecar container. Default 20m cpu request, 20M memory limit 
-
-Default: -
 
 ### securityContext (*corev1.SecurityContext, optional) {#fluentddrainconfig-securitycontext}
 
-Available in Logging operator version 4.4 and later.
-
-Configurable security context, uses fluentd pods' security context by default 
+Available in Logging operator version 4.4 and later. Configurable security context, uses fluentd pods' security context by default 
 
-Default: -
 
 
diff --git a/content/docs/configuration/crds/v1beta1/logging_types.md b/content/docs/configuration/crds/v1beta1/logging_types.md
index 8c9048083..4c615bdda 100644
--- a/content/docs/configuration/crds/v1beta1/logging_types.md
+++ b/content/docs/configuration/crds/v1beta1/logging_types.md
@@ -8,134 +8,113 @@ generated_file: true
 
 LoggingSpec defines the desired state of Logging
 
-### loggingRef (string, optional) {#loggingspec-loggingref}
+### allowClusterResourcesFromAllNamespaces (bool, optional) {#loggingspec-allowclusterresourcesfromallnamespaces}
 
-Reference to the logging system. Each of the `loggingRef`s can manage a fluentbit daemonset and a fluentd statefulset. 
+Allow configuration of cluster resources from any namespace. Mutually exclusive with ControlNamespace restriction of Cluster resources 
 
-Default: -
 
-### flowConfigCheckDisabled (bool, optional) {#loggingspec-flowconfigcheckdisabled}
+### clusterDomain (*string, optional) {#loggingspec-clusterdomain}
 
-Disable configuration check before applying new fluentd configuration. 
+Cluster domain name to be used when templating URLs to services . 
 
-Default: -
+Default:  "cluster.local."
 
-### skipInvalidResources (bool, optional) {#loggingspec-skipinvalidresources}
+### configCheck (ConfigCheck, optional) {#loggingspec-configcheck}
 
-Whether to skip invalid Flow and ClusterFlow resources 
+ConfigCheck settings that apply to both fluentd and syslog-ng 
 
-Default: -
 
-### flowConfigOverride (string, optional) {#loggingspec-flowconfigoverride}
+### controlNamespace (string, required) {#loggingspec-controlnamespace}
 
-Override generated config. This is a *raw* configuration string for troubleshooting purposes. 
+Namespace for cluster wide configuration resources like ClusterFlow and ClusterOutput. This should be a protected namespace from regular users. Resources like fluentbit and fluentd will run in this namespace as well. 
 
-Default: -
 
-### configCheck (ConfigCheck, optional) {#loggingspec-configcheck}
+### defaultFlow (*DefaultFlowSpec, optional) {#loggingspec-defaultflow}
 
-ConfigCheck settings that apply to both fluentd and syslog-ng 
+Default flow for unmatched logs. This Flow configuration collects all logs that didn't matched any other Flow. 
 
-Default: -
 
-### fluentbit (*FluentbitSpec, optional) {#loggingspec-fluentbit}
+### enableRecreateWorkloadOnImmutableFieldChange (bool, optional) {#loggingspec-enablerecreateworkloadonimmutablefieldchange}
 
-FluentbitAgent daemonset configuration. Deprecated, will be removed with next major version Migrate to the standalone NodeAgent resource 
+EnableRecreateWorkloadOnImmutableFieldChange enables the operator to recreate the fluentbit daemonset and the fluentd statefulset (and possibly other resource in the future) in case there is a change in an immutable field that otherwise couldn't be managed with a simple update. 
 
-Default: -
 
-### fluentd (*FluentdSpec, optional) {#loggingspec-fluentd}
+### errorOutputRef (string, optional) {#loggingspec-erroroutputref}
 
-Fluentd statefulset configuration 
+GlobalOutput name to flush ERROR events to 
 
-Default: -
 
-### syslogNG (*SyslogNGSpec, optional) {#loggingspec-syslogng}
+### flowConfigCheckDisabled (bool, optional) {#loggingspec-flowconfigcheckdisabled}
 
-Syslog-NG statefulset configuration 
+Disable configuration check before applying new fluentd configuration. 
 
-Default: -
 
-### defaultFlow (*DefaultFlowSpec, optional) {#loggingspec-defaultflow}
+### flowConfigOverride (string, optional) {#loggingspec-flowconfigoverride}
 
-Default flow for unmatched logs. This Flow configuration collects all logs that didn't matched any other Flow. 
+Override generated config. This is a *raw* configuration string for troubleshooting purposes. 
 
-Default: -
 
-### errorOutputRef (string, optional) {#loggingspec-erroroutputref}
+### fluentbit (*FluentbitSpec, optional) {#loggingspec-fluentbit}
 
-GlobalOutput name to flush ERROR events to 
+FluentbitAgent daemonset configuration. Deprecated, will be removed with next major version Migrate to the standalone NodeAgent resource 
+
+
+### fluentd (*FluentdSpec, optional) {#loggingspec-fluentd}
 
-Default: -
+Fluentd statefulset configuration. For details, see the [Fluentd configuration reference]({{< relref "/docs/configuration/crds/v1beta1/fluentd_types.md" >}}).
 
 ### globalFilters ([]Filter, optional) {#loggingspec-globalfilters}
 
 Global filters to apply on logs before any match or filter mechanism. 
 
-Default: -
 
-### watchNamespaces ([]string, optional) {#loggingspec-watchnamespaces}
+### loggingRef (string, optional) {#loggingspec-loggingref}
 
-Limit namespaces to watch Flow and Output custom resources. 
+Reference to the logging system. Each of the `loggingRef`s can manage a fluentbit daemonset and a fluentd statefulset. 
 
-Default: -
 
-### watchNamespaceSelector (*metav1.LabelSelector, optional) {#loggingspec-watchnamespaceselector}
+### nodeAgents ([]*InlineNodeAgent, optional) {#loggingspec-nodeagents}
 
-WatchNamespaceSelector is a LabelSelector to find matching namespaces to watch as in WatchNamespaces 
+InlineNodeAgent Configuration Deprecated, will be removed with next major version 
 
-Default: -
 
-### clusterDomain (*string, optional) {#loggingspec-clusterdomain}
+### skipInvalidResources (bool, optional) {#loggingspec-skipinvalidresources}
 
-Cluster domain name to be used when templating URLs to services . 
+Whether to skip invalid Flow and ClusterFlow resources 
 
-Default:  "cluster.local."
 
-### controlNamespace (string, required) {#loggingspec-controlnamespace}
+### syslogNG (*SyslogNGSpec, optional) {#loggingspec-syslogng}
 
-Namespace for cluster wide configuration resources like ClusterFlow and ClusterOutput. This should be a protected namespace from regular users. Resources like fluentbit and fluentd will run in this namespace as well. 
+Syslog-NG statefulset configuration. For details, see the [syslogNG configuration reference]({{< relref "/docs/configuration/crds/v1beta1/syslogng_types.md" >}}).
 
-Default: -
 
-### allowClusterResourcesFromAllNamespaces (bool, optional) {#loggingspec-allowclusterresourcesfromallnamespaces}
+### watchNamespaceSelector (*metav1.LabelSelector, optional) {#loggingspec-watchnamespaceselector}
 
-Allow configuration of cluster resources from any namespace. Mutually exclusive with ControlNamespace restriction of Cluster resources 
+WatchNamespaceSelector is a LabelSelector to find matching namespaces to watch as in WatchNamespaces 
 
-Default: -
 
-### nodeAgents ([]*InlineNodeAgent, optional) {#loggingspec-nodeagents}
+### watchNamespaces ([]string, optional) {#loggingspec-watchnamespaces}
 
-InlineNodeAgent Configuration Deprecated, will be removed with next major version 
+Limit namespaces to watch Flow and Output custom resources. 
 
-Default: -
 
-### enableRecreateWorkloadOnImmutableFieldChange (bool, optional) {#loggingspec-enablerecreateworkloadonimmutablefieldchange}
 
-EnableRecreateWorkloadOnImmutableFieldChange enables the operator to recreate the fluentbit daemonset and the fluentd statefulset (and possibly other resource in the future) in case there is a change in an immutable field that otherwise couldn't be managed with a simple update. 
+## ConfigCheck
 
-Default: -
+### labels (map[string]string, optional) {#configcheck-labels}
 
+Labels to use for the configcheck pods on top of labels added by the operator by default. Default values can be overwritten. 
 
-## ConfigCheck
 
 ### strategy (ConfigCheckStrategy, optional) {#configcheck-strategy}
 
-Select the config check strategy to use. `DryRun`: parse and validate configuration `StartWithTimeout`: start with given configuration and exit after specified timeout.
+Select the config check strategy to use. `DryRun`: Parse and validate configuration. `StartWithTimeout`: Start with given configuration and exit after specified timeout. Default: `DryRun` 
 
-Default: `DryRun` 
 
 ### timeoutSeconds (int, optional) {#configcheck-timeoutseconds}
 
 Configure timeout in seconds if strategy is StartWithTimeout 
 
-Default: -
-
-### labels (map[string]string, optional) {#configcheck-labels}
-
-Labels to use for the configcheck pods on top of labels added by the operator by default. Default values can be overwritten. 
-
-Default: -
 
 
 ## LoggingStatus
@@ -146,25 +125,31 @@ LoggingStatus defines the observed state of Logging
 
 Result of the config check. Under normal conditions there is a single item in the map with a bool value. 
 
-Default: -
+
+### fluentdConfigName (string, optional) {#loggingstatus-fluentdconfigname}
+
+Available in Logging operator version 4.5 and later. Name of the matched detached fluentd configuration object.
+
 
 ### problems ([]string, optional) {#loggingstatus-problems}
 
 Problems with the logging resource 
 
-Default: -
 
 ### problemsCount (int, optional) {#loggingstatus-problemscount}
 
 Count of problems for printcolumn 
 
-Default: -
+
+### syslogNGConfigName (string, optional) {#loggingstatus-syslogngconfigname}
+
+Available in Logging operator version 4.5 and later. Name of the matched detached SyslogNG configuration object.
+
 
 ### watchNamespaces ([]string, optional) {#loggingstatus-watchnamespaces}
 
 List of namespaces that watchNamespaces + watchNamespaceSelector is resolving to. Not set means all namespaces. 
 
-Default: -
 
 
 ## Logging
@@ -173,19 +158,15 @@ Logging is the Schema for the loggings API
 
 ###  (metav1.TypeMeta, required) {#logging-}
 
-Default: -
 
 ### metadata (metav1.ObjectMeta, optional) {#logging-metadata}
 
-Default: -
 
 ### spec (LoggingSpec, optional) {#logging-spec}
 
-Default: -
 
 ### status (LoggingStatus, optional) {#logging-status}
 
-Default: -
 
 
 ## LoggingList
@@ -194,15 +175,12 @@ LoggingList contains a list of Logging
 
 ###  (metav1.TypeMeta, required) {#logginglist-}
 
-Default: -
 
 ### metadata (metav1.ListMeta, optional) {#logginglist-metadata}
 
-Default: -
 
 ### items ([]Logging, required) {#logginglist-items}
 
-Default: -
 
 
 ## DefaultFlowSpec
@@ -211,24 +189,19 @@ DefaultFlowSpec is a Flow for logs that did not match any other Flow
 
 ### filters ([]Filter, optional) {#defaultflowspec-filters}
 
-Default: -
-
-### outputRefs ([]string, optional) {#defaultflowspec-outputrefs}
 
-Deprecated 
+### flowLabel (string, optional) {#defaultflowspec-flowlabel}
 
-Default: -
 
 ### globalOutputRefs ([]string, optional) {#defaultflowspec-globaloutputrefs}
 
-Default: -
 
-### flowLabel (string, optional) {#defaultflowspec-flowlabel}
+### includeLabelInRouter (*bool, optional) {#defaultflowspec-includelabelinrouter}
 
-Default: -
 
-### includeLabelInRouter (*bool, optional) {#defaultflowspec-includelabelinrouter}
+### outputRefs ([]string, optional) {#defaultflowspec-outputrefs}
+
+Deprecated 
 
-Default: -
 
 
diff --git a/content/docs/configuration/crds/v1beta1/loggingroute_types.md b/content/docs/configuration/crds/v1beta1/loggingroute_types.md
index a2d865c01..f7343af71 100644
--- a/content/docs/configuration/crds/v1beta1/loggingroute_types.md
+++ b/content/docs/configuration/crds/v1beta1/loggingroute_types.md
@@ -12,59 +12,50 @@ LoggingRouteSpec defines the desired state of LoggingRoute
 
 Source identifies the logging that this policy applies to 
 
-Default: -
 
 ### targets (metav1.LabelSelector, required) {#loggingroutespec-targets}
 
-Targets refers to the list of logging resources specified by a label selector to forward logs to. Filtering of namespaces will happen based on the watchNamespaces and watchNamespaceSelector fields of the target logging resource 
+Targets refers to the list of logging resources specified by a label selector to forward logs to. Filtering of namespaces will happen based on the watchNamespaces and watchNamespaceSelector fields of the target logging resource. 
 
-Default: -
 
 
 ## LoggingRouteStatus
 
 LoggingRouteStatus defines the actual state of the LoggingRoute
 
-### tenants ([]Tenant, optional) {#loggingroutestatus-tenants}
+### notices ([]string, optional) {#loggingroutestatus-notices}
 
-Enumerate all loggings with all the destination namespaces expanded 
+Enumerate non-blocker issues the user should pay attention to 
+
+
+### noticesCount (int, optional) {#loggingroutestatus-noticescount}
+
+Summarize the number of notices for the CLI output 
 
-Default: -
 
 ### problems ([]string, optional) {#loggingroutestatus-problems}
 
 Enumerate problems that prohibits this route to take effect and populate the tenants field 
 
-Default: -
 
 ### problemsCount (int, optional) {#loggingroutestatus-problemscount}
 
 Summarize the number of problems for the CLI output 
 
-Default: -
 
-### notices ([]string, optional) {#loggingroutestatus-notices}
-
-Enumerate non-blocker issues the user should pay attention to 
-
-Default: -
-
-### noticesCount (int, optional) {#loggingroutestatus-noticescount}
+### tenants ([]Tenant, optional) {#loggingroutestatus-tenants}
 
-Summarize the number of notices for the CLI output 
+Enumerate all loggings with all the destination namespaces expanded 
 
-Default: -
 
 
 ## Tenant
 
 ### name (string, required) {#tenant-name}
 
-Default: -
 
 ### namespaces ([]string, optional) {#tenant-namespaces}
 
-Default: -
 
 
 ## LoggingRoute
@@ -74,33 +65,26 @@ Connects a log collector with log aggregators from other logging domains and rou
 
 ###  (metav1.TypeMeta, required) {#loggingroute-}
 
-Default: -
 
 ### metadata (metav1.ObjectMeta, optional) {#loggingroute-metadata}
 
-Default: -
 
 ### spec (LoggingRouteSpec, optional) {#loggingroute-spec}
 
-Default: -
 
 ### status (LoggingRouteStatus, optional) {#loggingroute-status}
 
-Default: -
 
 
 ## LoggingRouteList
 
 ###  (metav1.TypeMeta, required) {#loggingroutelist-}
 
-Default: -
 
 ### metadata (metav1.ListMeta, optional) {#loggingroutelist-metadata}
 
-Default: -
 
 ### items ([]LoggingRoute, required) {#loggingroutelist-items}
 
-Default: -
 
 
diff --git a/content/docs/configuration/crds/v1beta1/node_agent_types.md b/content/docs/configuration/crds/v1beta1/node_agent_types.md
index 3e2216c28..5ac60e70d 100644
--- a/content/docs/configuration/crds/v1beta1/node_agent_types.md
+++ b/content/docs/configuration/crds/v1beta1/node_agent_types.md
@@ -10,49 +10,40 @@ NodeAgent
 
 ###  (metav1.TypeMeta, required) {#nodeagent-}
 
-Default: -
 
 ### metadata (metav1.ObjectMeta, optional) {#nodeagent-metadata}
 
-Default: -
 
 ### spec (NodeAgentSpec, optional) {#nodeagent-spec}
 
-Default: -
 
 ### status (NodeAgentStatus, optional) {#nodeagent-status}
 
-Default: -
 
 
 ## NodeAgentSpec
 
 NodeAgentSpec
 
-### loggingRef (string, optional) {#nodeagentspec-loggingref}
-
-Default: -
-
 ###  (NodeAgentConfig, required) {#nodeagentspec-}
 
 InlineNodeAgent 
 
-Default: -
+
+### loggingRef (string, optional) {#nodeagentspec-loggingref}
+
 
 
 ## NodeAgentConfig
 
-### profile (string, optional) {#nodeagentconfig-profile}
+### nodeAgentFluentbit (*NodeAgentFluentbit, optional) {#nodeagentconfig-nodeagentfluentbit}
 
-Default: -
 
 ### metadata (types.MetaBase, optional) {#nodeagentconfig-metadata}
 
-Default: -
 
-### nodeAgentFluentbit (*NodeAgentFluentbit, optional) {#nodeagentconfig-nodeagentfluentbit}
+### profile (string, optional) {#nodeagentconfig-profile}
 
-Default: -
 
 
 ## NodeAgentStatus
@@ -66,15 +57,12 @@ NodeAgentList
 
 ###  (metav1.TypeMeta, required) {#nodeagentlist-}
 
-Default: -
 
 ### metadata (metav1.ListMeta, optional) {#nodeagentlist-metadata}
 
-Default: -
 
 ### items ([]NodeAgent, required) {#nodeagentlist-items}
 
-Default: -
 
 
 ## InlineNodeAgent
@@ -82,145 +70,119 @@ Default: -
 InlineNodeAgent
 @deprecated, replaced by NodeAgent
 
-### name (string, optional) {#inlinenodeagent-name}
+###  (NodeAgentConfig, required) {#inlinenodeagent-}
 
-InlineNodeAgent unique name. 
 
-Default: -
+### name (string, optional) {#inlinenodeagent-name}
 
-###  (NodeAgentConfig, required) {#inlinenodeagent-}
+InlineNodeAgent unique name. 
 
-Default: -
 
 
 ## NodeAgentFluentbit
 
-### enabled (*bool, optional) {#nodeagentfluentbit-enabled}
+### bufferStorage (BufferStorage, optional) {#nodeagentfluentbit-bufferstorage}
 
-Default: -
 
-### daemonSet (*typeoverride.DaemonSet, optional) {#nodeagentfluentbit-daemonset}
+### bufferStorageVolume (volume.KubernetesVolume, optional) {#nodeagentfluentbit-bufferstoragevolume}
 
-Default: -
+[volume.KubernetesVolume](https://github.com/cisco-open/operator-tools/tree/master/docs/types) 
 
-### serviceAccount (*typeoverride.ServiceAccount, optional) {#nodeagentfluentbit-serviceaccount}
 
-Default: -
+### containersPath (string, optional) {#nodeagentfluentbit-containerspath}
 
-### tls (*FluentbitTLS, optional) {#nodeagentfluentbit-tls}
 
-Default: -
+### coroStackSize (int32, optional) {#nodeagentfluentbit-corostacksize}
 
-### targetHost (string, optional) {#nodeagentfluentbit-targethost}
+Set the coroutines stack size in bytes. The value must be greater than the page size of the running system. Don't set too small value (say 4096), or coroutine threads can overrun the stack buffer. Do not change the default value of this parameter unless you know what you are doing. (default: 24576) 
 
-Default: -
+Default: 24576
 
-### targetPort (int32, optional) {#nodeagentfluentbit-targetport}
+### customConfigSecret (string, optional) {#nodeagentfluentbit-customconfigsecret}
 
-Default: -
 
-### flush (int32, optional) {#nodeagentfluentbit-flush}
+### daemonSet (*typeoverride.DaemonSet, optional) {#nodeagentfluentbit-daemonset}
 
-Set the flush time in seconds.nanoseconds. The engine loop uses a Flush timeout to define when is required to flush the records ingested by input plugins through the defined output plugins. (default: 1) 
 
-Default: 1
+### disableKubernetesFilter (*bool, optional) {#nodeagentfluentbit-disablekubernetesfilter}
 
-### grace (int32, optional) {#nodeagentfluentbit-grace}
 
-Set the grace time in seconds as Integer value. The engine loop uses a Grace timeout to define wait time on exit (default: 5) 
+### enableUpstream (*bool, optional) {#nodeagentfluentbit-enableupstream}
 
-Default: 5
 
-### logLevel (string, optional) {#nodeagentfluentbit-loglevel}
+### enabled (*bool, optional) {#nodeagentfluentbit-enabled}
 
-Set the logging verbosity level. Allowed values are: error, warn, info, debug and trace. Values are accumulative, e.g: if 'debug' is set, it will include error, warning, info and debug.  Note that trace mode is only available if Fluent Bit was built with the WITH_TRACE option enabled. (default: info) 
 
-Default: info
+### extraVolumeMounts ([]*VolumeMount, optional) {#nodeagentfluentbit-extravolumemounts}
 
-### coroStackSize (int32, optional) {#nodeagentfluentbit-corostacksize}
 
-Set the coroutines stack size in bytes. The value must be greater than the page size of the running system. Don't set too small value (say 4096), or coroutine threads can overrun the stack buffer. Do not change the default value of this parameter unless you know what you are doing. (default: 24576) 
+### filterAws (*FilterAws, optional) {#nodeagentfluentbit-filteraws}
 
-Default: 24576
 
-### metrics (*Metrics, optional) {#nodeagentfluentbit-metrics}
+### filterKubernetes (FilterKubernetes, optional) {#nodeagentfluentbit-filterkubernetes}
 
-Default: -
 
-### metricsService (*typeoverride.Service, optional) {#nodeagentfluentbit-metricsservice}
+### flush (int32, optional) {#nodeagentfluentbit-flush}
 
-Default: -
+Set the flush time in seconds.nanoseconds. The engine loop uses a Flush timeout to define when is required to flush the records ingested by input plugins through the defined output plugins. (default: 1) 
 
-### security (*Security, optional) {#nodeagentfluentbit-security}
+Default: 1
 
-Default: -
+### forwardOptions (*ForwardOptions, optional) {#nodeagentfluentbit-forwardoptions}
 
-### positiondb (volume.KubernetesVolume, optional) {#nodeagentfluentbit-positiondb}
 
-[volume.KubernetesVolume](https://github.com/cisco-open/operator-tools/tree/master/docs/types) 
+### grace (int32, optional) {#nodeagentfluentbit-grace}
 
-Default: -
+Set the grace time in seconds as Integer value. The engine loop uses a Grace timeout to define wait time on exit (default: 5) 
 
-### containersPath (string, optional) {#nodeagentfluentbit-containerspath}
+Default: 5
 
-Default: -
+### inputTail (InputTail, optional) {#nodeagentfluentbit-inputtail}
 
-### varLogsPath (string, optional) {#nodeagentfluentbit-varlogspath}
 
-Default: -
+### livenessDefaultCheck (*bool, optional) {#nodeagentfluentbit-livenessdefaultcheck}
 
-### extraVolumeMounts ([]*VolumeMount, optional) {#nodeagentfluentbit-extravolumemounts}
+Default: true
 
-Default: -
+### logLevel (string, optional) {#nodeagentfluentbit-loglevel}
 
-### inputTail (InputTail, optional) {#nodeagentfluentbit-inputtail}
+Set the logging verbosity level. Allowed values are: error, warn, info, debug and trace. Values are accumulative, e.g: if 'debug' is set, it will include error, warning, info and debug.  Note that trace mode is only available if Fluent Bit was built with the WITH_TRACE option enabled. (default: info) 
 
-Default: -
+Default: info
 
-### filterAws (*FilterAws, optional) {#nodeagentfluentbit-filteraws}
+### metrics (*Metrics, optional) {#nodeagentfluentbit-metrics}
 
-Default: -
 
-### filterKubernetes (FilterKubernetes, optional) {#nodeagentfluentbit-filterkubernetes}
+### metricsService (*typeoverride.Service, optional) {#nodeagentfluentbit-metricsservice}
 
-Default: -
 
-### disableKubernetesFilter (*bool, optional) {#nodeagentfluentbit-disablekubernetesfilter}
+### network (*FluentbitNetwork, optional) {#nodeagentfluentbit-network}
 
-Default: -
 
-### bufferStorage (BufferStorage, optional) {#nodeagentfluentbit-bufferstorage}
+### podPriorityClassName (string, optional) {#nodeagentfluentbit-podpriorityclassname}
 
-Default: -
 
-### bufferStorageVolume (volume.KubernetesVolume, optional) {#nodeagentfluentbit-bufferstoragevolume}
+### positiondb (volume.KubernetesVolume, optional) {#nodeagentfluentbit-positiondb}
 
 [volume.KubernetesVolume](https://github.com/cisco-open/operator-tools/tree/master/docs/types) 
 
-Default: -
 
-### customConfigSecret (string, optional) {#nodeagentfluentbit-customconfigsecret}
+### security (*Security, optional) {#nodeagentfluentbit-security}
 
-Default: -
 
-### podPriorityClassName (string, optional) {#nodeagentfluentbit-podpriorityclassname}
+### serviceAccount (*typeoverride.ServiceAccount, optional) {#nodeagentfluentbit-serviceaccount}
 
-Default: -
 
-### livenessDefaultCheck (*bool, optional) {#nodeagentfluentbit-livenessdefaultcheck}
+### tls (*FluentbitTLS, optional) {#nodeagentfluentbit-tls}
 
-Default: true
 
-### network (*FluentbitNetwork, optional) {#nodeagentfluentbit-network}
+### targetHost (string, optional) {#nodeagentfluentbit-targethost}
 
-Default: -
 
-### forwardOptions (*ForwardOptions, optional) {#nodeagentfluentbit-forwardoptions}
+### targetPort (int32, optional) {#nodeagentfluentbit-targetport}
 
-Default: -
 
-### enableUpstream (*bool, optional) {#nodeagentfluentbit-enableupstream}
+### varLogsPath (string, optional) {#nodeagentfluentbit-varlogspath}
 
-Default: -
 
 
diff --git a/content/docs/configuration/crds/v1beta1/output_types.md b/content/docs/configuration/crds/v1beta1/output_types.md
index be033bae9..40b55136b 100644
--- a/content/docs/configuration/crds/v1beta1/output_types.md
+++ b/content/docs/configuration/crds/v1beta1/output_types.md
@@ -8,121 +8,92 @@ generated_file: true
 
 OutputSpec defines the desired state of Output
 
-### loggingRef (string, optional) {#outputspec-loggingref}
-
-Default: -
-
-### s3 (*output.S3OutputConfig, optional) {#outputspec-s3}
+### awsElasticsearch (*output.AwsElasticsearchOutputConfig, optional) {#outputspec-awselasticsearch}
 
-Default: -
 
 ### azurestorage (*output.AzureStorage, optional) {#outputspec-azurestorage}
 
-Default: -
 
-### gcs (*output.GCSOutput, optional) {#outputspec-gcs}
+### cloudwatch (*output.CloudWatchOutput, optional) {#outputspec-cloudwatch}
 
-Default: -
 
-### oss (*output.OSSOutput, optional) {#outputspec-oss}
+### datadog (*output.DatadogOutput, optional) {#outputspec-datadog}
 
-Default: -
 
 ### elasticsearch (*output.ElasticsearchOutput, optional) {#outputspec-elasticsearch}
 
-Default: -
 
-### opensearch (*output.OpenSearchOutput, optional) {#outputspec-opensearch}
+### file (*output.FileOutputConfig, optional) {#outputspec-file}
 
-Default: -
 
-### logz (*output.LogZOutput, optional) {#outputspec-logz}
+### forward (*output.ForwardOutput, optional) {#outputspec-forward}
 
-Default: -
 
-### loki (*output.LokiOutput, optional) {#outputspec-loki}
+### gcs (*output.GCSOutput, optional) {#outputspec-gcs}
 
-Default: -
 
-### sumologic (*output.SumologicOutput, optional) {#outputspec-sumologic}
+### gelf (*output.GELFOutputConfig, optional) {#outputspec-gelf}
 
-Default: -
 
-### datadog (*output.DatadogOutput, optional) {#outputspec-datadog}
+### http (*output.HTTPOutputConfig, optional) {#outputspec-http}
 
-Default: -
 
-### forward (*output.ForwardOutput, optional) {#outputspec-forward}
+### kafka (*output.KafkaOutputConfig, optional) {#outputspec-kafka}
 
-Default: -
 
-### file (*output.FileOutputConfig, optional) {#outputspec-file}
+### kinesisFirehose (*output.KinesisFirehoseOutputConfig, optional) {#outputspec-kinesisfirehose}
 
-Default: -
 
-### nullout (*output.NullOutputConfig, optional) {#outputspec-nullout}
+### kinesisStream (*output.KinesisStreamOutputConfig, optional) {#outputspec-kinesisstream}
 
-Default: -
 
-### kafka (*output.KafkaOutputConfig, optional) {#outputspec-kafka}
+### logdna (*output.LogDNAOutput, optional) {#outputspec-logdna}
 
-Default: -
 
-### cloudwatch (*output.CloudWatchOutput, optional) {#outputspec-cloudwatch}
+### logz (*output.LogZOutput, optional) {#outputspec-logz}
 
-Default: -
 
-### kinesisFirehose (*output.KinesisFirehoseOutputConfig, optional) {#outputspec-kinesisfirehose}
+### loggingRef (string, optional) {#outputspec-loggingref}
 
-Default: -
 
-### kinesisStream (*output.KinesisStreamOutputConfig, optional) {#outputspec-kinesisstream}
+### loki (*output.LokiOutput, optional) {#outputspec-loki}
 
-Default: -
 
-### logdna (*output.LogDNAOutput, optional) {#outputspec-logdna}
+### mattermost (*output.MattermostOutputConfig, optional) {#outputspec-mattermost}
 
-Default: -
 
 ### newrelic (*output.NewRelicOutputConfig, optional) {#outputspec-newrelic}
 
-Default: -
 
-### splunkHec (*output.SplunkHecOutput, optional) {#outputspec-splunkhec}
+### nullout (*output.NullOutputConfig, optional) {#outputspec-nullout}
 
-Default: -
 
-### http (*output.HTTPOutputConfig, optional) {#outputspec-http}
+### oss (*output.OSSOutput, optional) {#outputspec-oss}
 
-Default: -
 
-### awsElasticsearch (*output.AwsElasticsearchOutputConfig, optional) {#outputspec-awselasticsearch}
+### opensearch (*output.OpenSearchOutput, optional) {#outputspec-opensearch}
 
-Default: -
 
 ### redis (*output.RedisOutputConfig, optional) {#outputspec-redis}
 
-Default: -
 
-### syslog (*output.SyslogOutputConfig, optional) {#outputspec-syslog}
+### relabel (*output.RelabelOutputConfig, optional) {#outputspec-relabel}
 
-Default: -
 
-### gelf (*output.GELFOutputConfig, optional) {#outputspec-gelf}
+### s3 (*output.S3OutputConfig, optional) {#outputspec-s3}
 
-Default: -
 
 ### sqs (*output.SQSOutputConfig, optional) {#outputspec-sqs}
 
-Default: -
 
-### mattermost (*output.MattermostOutputConfig, optional) {#outputspec-mattermost}
+### splunkHec (*output.SplunkHecOutput, optional) {#outputspec-splunkhec}
 
-Default: -
 
-### relabel (*output.RelabelOutputConfig, optional) {#outputspec-relabel}
+### sumologic (*output.SumologicOutput, optional) {#outputspec-sumologic}
+
+
+### syslog (*output.SyslogOutputConfig, optional) {#outputspec-syslog}
 
-Default: -
 
 
 ## OutputStatus
@@ -131,15 +102,12 @@ OutputStatus defines the observed state of Output
 
 ### active (*bool, optional) {#outputstatus-active}
 
-Default: -
 
 ### problems ([]string, optional) {#outputstatus-problems}
 
-Default: -
 
 ### problemsCount (int, optional) {#outputstatus-problemscount}
 
-Default: -
 
 
 ## Output
@@ -148,19 +116,15 @@ Output is the Schema for the outputs API
 
 ###  (metav1.TypeMeta, required) {#output-}
 
-Default: -
 
 ### metadata (metav1.ObjectMeta, optional) {#output-metadata}
 
-Default: -
 
 ### spec (OutputSpec, optional) {#output-spec}
 
-Default: -
 
 ### status (OutputStatus, optional) {#output-status}
 
-Default: -
 
 
 ## OutputList
@@ -169,14 +133,11 @@ OutputList contains a list of Output
 
 ###  (metav1.TypeMeta, required) {#outputlist-}
 
-Default: -
 
 ### metadata (metav1.ListMeta, optional) {#outputlist-metadata}
 
-Default: -
 
 ### items ([]Output, required) {#outputlist-items}
 
-Default: -
 
 
diff --git a/content/docs/configuration/crds/v1beta1/syslogng_clusterflow_types.md b/content/docs/configuration/crds/v1beta1/syslogng_clusterflow_types.md
index 95e189c6d..b772957d6 100644
--- a/content/docs/configuration/crds/v1beta1/syslogng_clusterflow_types.md
+++ b/content/docs/configuration/crds/v1beta1/syslogng_clusterflow_types.md
@@ -10,40 +10,37 @@ SyslogNGClusterFlow is the Schema for the syslog-ng clusterflows API
 
 ###  (metav1.TypeMeta, required) {#syslogngclusterflow-}
 
-Default: -
 
 ### metadata (metav1.ObjectMeta, optional) {#syslogngclusterflow-metadata}
 
-Default: -
 
 ### spec (SyslogNGClusterFlowSpec, optional) {#syslogngclusterflow-spec}
 
-Default: -
 
 ### status (SyslogNGFlowStatus, optional) {#syslogngclusterflow-status}
 
-Default: -
 
 
 ## SyslogNGClusterFlowSpec
 
 SyslogNGClusterFlowSpec is the Kubernetes spec for Flows
 
-### match (*SyslogNGMatch, optional) {#syslogngclusterflowspec-match}
+### filters ([]SyslogNGFilter, optional) {#syslogngclusterflowspec-filters}
 
-Default: -
 
-### filters ([]SyslogNGFilter, optional) {#syslogngclusterflowspec-filters}
+### globalOutputRefs ([]string, optional) {#syslogngclusterflowspec-globaloutputrefs}
 
-Default: -
 
 ### loggingRef (string, optional) {#syslogngclusterflowspec-loggingref}
 
-Default: -
 
-### globalOutputRefs ([]string, optional) {#syslogngclusterflowspec-globaloutputrefs}
+### match (*SyslogNGMatch, optional) {#syslogngclusterflowspec-match}
+
+
+### outputMetrics ([]filter.MetricsProbe, optional) {#syslogngclusterflowspec-outputmetrics}
+
+Output metrics are applied before the log reaches the destination and contain output metadata like: `name,` `namespace` and `scope`. Scope shows whether the output is a local or global one. Available in Logging operator version 4.5 and later.
 
-Default: -
 
 
 ## SyslogNGClusterFlowList
@@ -52,14 +49,11 @@ SyslogNGClusterFlowList contains a list of SyslogNGClusterFlow
 
 ###  (metav1.TypeMeta, required) {#syslogngclusterflowlist-}
 
-Default: -
 
 ### metadata (metav1.ListMeta, optional) {#syslogngclusterflowlist-metadata}
 
-Default: -
 
 ### items ([]SyslogNGClusterFlow, required) {#syslogngclusterflowlist-items}
 
-Default: -
 
 
diff --git a/content/docs/configuration/crds/v1beta1/syslogng_clusteroutput_types.md b/content/docs/configuration/crds/v1beta1/syslogng_clusteroutput_types.md
index 183f3291a..82dda1ee2 100644
--- a/content/docs/configuration/crds/v1beta1/syslogng_clusteroutput_types.md
+++ b/content/docs/configuration/crds/v1beta1/syslogng_clusteroutput_types.md
@@ -10,19 +10,15 @@ SyslogNGClusterOutput is the Schema for the syslog-ng clusteroutputs API
 
 ###  (metav1.TypeMeta, required) {#syslogngclusteroutput-}
 
-Default: -
 
 ### metadata (metav1.ObjectMeta, optional) {#syslogngclusteroutput-metadata}
 
-Default: -
 
 ### spec (SyslogNGClusterOutputSpec, required) {#syslogngclusteroutput-spec}
 
-Default: -
 
 ### status (SyslogNGOutputStatus, optional) {#syslogngclusteroutput-status}
 
-Default: -
 
 
 ## SyslogNGClusterOutputSpec
@@ -31,11 +27,9 @@ SyslogNGClusterOutputSpec contains Kubernetes spec for SyslogNGClusterOutput
 
 ###  (SyslogNGOutputSpec, required) {#syslogngclusteroutputspec-}
 
-Default: -
 
 ### enabledNamespaces ([]string, optional) {#syslogngclusteroutputspec-enablednamespaces}
 
-Default: -
 
 
 ## SyslogNGClusterOutputList
@@ -44,14 +38,11 @@ SyslogNGClusterOutputList contains a list of SyslogNGClusterOutput
 
 ###  (metav1.TypeMeta, required) {#syslogngclusteroutputlist-}
 
-Default: -
 
 ### metadata (metav1.ListMeta, optional) {#syslogngclusteroutputlist-metadata}
 
-Default: -
 
 ### items ([]SyslogNGClusterOutput, required) {#syslogngclusteroutputlist-items}
 
-Default: -
 
 
diff --git a/content/docs/configuration/crds/v1beta1/syslogng_flow_types.md b/content/docs/configuration/crds/v1beta1/syslogng_flow_types.md
index 6a8ff140f..75706803d 100644
--- a/content/docs/configuration/crds/v1beta1/syslogng_flow_types.md
+++ b/content/docs/configuration/crds/v1beta1/syslogng_flow_types.md
@@ -8,25 +8,25 @@ generated_file: true
 
 SyslogNGFlowSpec is the Kubernetes spec for SyslogNGFlows
 
-### match (*SyslogNGMatch, optional) {#syslogngflowspec-match}
+### filters ([]SyslogNGFilter, optional) {#syslogngflowspec-filters}
 
-Default: -
 
-### filters ([]SyslogNGFilter, optional) {#syslogngflowspec-filters}
+### globalOutputRefs ([]string, optional) {#syslogngflowspec-globaloutputrefs}
+
+
+### localOutputRefs ([]string, optional) {#syslogngflowspec-localoutputrefs}
 
-Default: -
 
 ### loggingRef (string, optional) {#syslogngflowspec-loggingref}
 
-Default: -
 
-### globalOutputRefs ([]string, optional) {#syslogngflowspec-globaloutputrefs}
+### match (*SyslogNGMatch, optional) {#syslogngflowspec-match}
 
-Default: -
 
-### localOutputRefs ([]string, optional) {#syslogngflowspec-localoutputrefs}
+### outputMetrics ([]filter.MetricsProbe, optional) {#syslogngflowspec-outputmetrics}
+
+Output metrics are applied before the log reaches the destination and contain output metadata like: `name,` `namespace` and `scope`. Scope shows whether the output is a local or global one. Available in Logging operator version 4.5 and later.
 
-Default: -
 
 
 ## SyslogNGFilter
@@ -35,19 +35,15 @@ Filter definition for SyslogNGFlowSpec
 
 ### id (string, optional) {#syslogngfilter-id}
 
-Default: -
 
 ### match (*filter.MatchConfig, optional) {#syslogngfilter-match}
 
-Default: -
 
-### rewrite ([]filter.RewriteConfig, optional) {#syslogngfilter-rewrite}
+### parser (*filter.ParserConfig, optional) {#syslogngfilter-parser}
 
-Default: -
 
-### parser (*filter.ParserConfig, optional) {#syslogngfilter-parser}
+### rewrite ([]filter.RewriteConfig, optional) {#syslogngfilter-rewrite}
 
-Default: -
 
 
 ## SyslogNGFlow
@@ -56,19 +52,15 @@ Flow Kubernetes object
 
 ###  (metav1.TypeMeta, required) {#syslogngflow-}
 
-Default: -
 
 ### metadata (metav1.ObjectMeta, optional) {#syslogngflow-metadata}
 
-Default: -
 
 ### spec (SyslogNGFlowSpec, optional) {#syslogngflow-spec}
 
-Default: -
 
 ### status (SyslogNGFlowStatus, optional) {#syslogngflow-status}
 
-Default: -
 
 
 ## SyslogNGFlowList
@@ -77,14 +69,11 @@ FlowList contains a list of Flow
 
 ###  (metav1.TypeMeta, required) {#syslogngflowlist-}
 
-Default: -
 
 ### metadata (metav1.ListMeta, optional) {#syslogngflowlist-metadata}
 
-Default: -
 
 ### items ([]SyslogNGFlow, required) {#syslogngflowlist-items}
 
-Default: -
 
 
diff --git a/content/docs/configuration/crds/v1beta1/syslogng_output_types.md b/content/docs/configuration/crds/v1beta1/syslogng_output_types.md
index 9e33b54ec..43048aad7 100644
--- a/content/docs/configuration/crds/v1beta1/syslogng_output_types.md
+++ b/content/docs/configuration/crds/v1beta1/syslogng_output_types.md
@@ -8,67 +8,59 @@ generated_file: true
 
 SyslogNGOutputSpec defines the desired state of SyslogNGOutput
 
-### loggingRef (string, optional) {#syslogngoutputspec-loggingref}
+### elasticsearch (*output.ElasticsearchOutput, optional) {#syslogngoutputspec-elasticsearch}
 
-Default: -
 
-### loggly (*output.Loggly, optional) {#syslogngoutputspec-loggly}
+### file (*output.FileOutput, optional) {#syslogngoutputspec-file}
 
-Default: -
 
-### syslog (*output.SyslogOutput, optional) {#syslogngoutputspec-syslog}
+### http (*output.HTTPOutput, optional) {#syslogngoutputspec-http}
 
-Default: -
 
-### file (*output.FileOutput, optional) {#syslogngoutputspec-file}
+### logscale (*output.LogScaleOutput, optional) {#syslogngoutputspec-logscale}
 
-Default: -
 
-### mqtt (*output.MQTT, optional) {#syslogngoutputspec-mqtt}
+### loggingRef (string, optional) {#syslogngoutputspec-loggingref}
 
-Default: -
 
-### redis (*output.RedisOutput, optional) {#syslogngoutputspec-redis}
+### loggly (*output.Loggly, optional) {#syslogngoutputspec-loggly}
 
-Default: -
 
-### mongodb (*output.MongoDB, optional) {#syslogngoutputspec-mongodb}
+### loki (*output.LokiOutput, optional) {#syslogngoutputspec-loki}
 
-Default: -
+Available in Logging operator version 4.4 and later. 
 
-### sumologic-http (*output.SumologicHTTPOutput, optional) {#syslogngoutputspec-sumologic-http}
 
-Default: -
+### mqtt (*output.MQTT, optional) {#syslogngoutputspec-mqtt}
 
-### sumologic-syslog (*output.SumologicSyslogOutput, optional) {#syslogngoutputspec-sumologic-syslog}
 
-Default: -
+### mongodb (*output.MongoDB, optional) {#syslogngoutputspec-mongodb}
 
-### http (*output.HTTPOutput, optional) {#syslogngoutputspec-http}
 
-Default: -
+### openobserve (*output.OpenobserveOutput, optional) {#syslogngoutputspec-openobserve}
 
-### elasticsearch (*output.ElasticsearchOutput, optional) {#syslogngoutputspec-elasticsearch}
+Available in Logging operator version 4.5 and later. 
 
-Default: -
 
-### logscale (*output.LogScaleOutput, optional) {#syslogngoutputspec-logscale}
+### redis (*output.RedisOutput, optional) {#syslogngoutputspec-redis}
+
+
+### s3 (*output.S3Output, optional) {#syslogngoutputspec-s3}
+
+Available in Logging operator version 4.4 and later.
 
-Default: -
 
 ### splunk_hec_event (*output.SplunkHECOutput, optional) {#syslogngoutputspec-splunk_hec_event}
 
-Default: -
 
-### loki (*output.LokiOutput, optional) {#syslogngoutputspec-loki}
+### sumologic-http (*output.SumologicHTTPOutput, optional) {#syslogngoutputspec-sumologic-http}
 
-Default: -
 
-### s3 (*output.S3Output, optional) {#syslogngoutputspec-s3}
+### sumologic-syslog (*output.SumologicSyslogOutput, optional) {#syslogngoutputspec-sumologic-syslog}
 
-Available in Logging operator version 4.4 and later.
 
-Default: -
+### syslog (*output.SyslogOutput, optional) {#syslogngoutputspec-syslog}
+
 
 
 ## SyslogNGOutput
@@ -77,19 +69,15 @@ SyslogNGOutput is the Schema for the syslog-ng outputs API
 
 ###  (metav1.TypeMeta, required) {#syslogngoutput-}
 
-Default: -
 
 ### metadata (metav1.ObjectMeta, optional) {#syslogngoutput-metadata}
 
-Default: -
 
 ### spec (SyslogNGOutputSpec, optional) {#syslogngoutput-spec}
 
-Default: -
 
 ### status (SyslogNGOutputStatus, optional) {#syslogngoutput-status}
 
-Default: -
 
 
 ## SyslogNGOutputList
@@ -98,14 +86,11 @@ SyslogNGOutputList contains a list of SyslogNGOutput
 
 ###  (metav1.TypeMeta, required) {#syslogngoutputlist-}
 
-Default: -
 
 ### metadata (metav1.ListMeta, optional) {#syslogngoutputlist-metadata}
 
-Default: -
 
 ### items ([]SyslogNGOutput, required) {#syslogngoutputlist-items}
 
-Default: -
 
 
diff --git a/content/docs/configuration/crds/v1beta1/syslogng_types.md b/content/docs/configuration/crds/v1beta1/syslogng_types.md
index 18a4b959b..dea5bab57 100644
--- a/content/docs/configuration/crds/v1beta1/syslogng_types.md
+++ b/content/docs/configuration/crds/v1beta1/syslogng_types.md
@@ -8,69 +8,86 @@ generated_file: true
 
 SyslogNGSpec defines the desired state of SyslogNG
 
-### tls (SyslogNGTLS, optional) {#syslogngspec-tls}
+### bufferVolumeMetrics (*BufferMetrics, optional) {#syslogngspec-buffervolumemetrics}
 
-Default: -
 
-### readinessDefaultCheck (ReadinessDefaultCheck, optional) {#syslogngspec-readinessdefaultcheck}
+### bufferVolumeMetricsService (*typeoverride.Service, optional) {#syslogngspec-buffervolumemetricsservice}
 
-Default: -
 
-### skipRBACCreate (bool, optional) {#syslogngspec-skiprbaccreate}
+### configCheckPod (*typeoverride.PodSpec, optional) {#syslogngspec-configcheckpod}
 
-Default: -
 
-### statefulSet (*typeoverride.StatefulSet, optional) {#syslogngspec-statefulset}
+### globalOptions (*GlobalOptions, optional) {#syslogngspec-globaloptions}
 
-Default: -
 
-### service (*typeoverride.Service, optional) {#syslogngspec-service}
+### jsonKeyDelim (string, optional) {#syslogngspec-jsonkeydelim}
 
-Default: -
 
-### serviceAccount (*typeoverride.ServiceAccount, optional) {#syslogngspec-serviceaccount}
+### jsonKeyPrefix (string, optional) {#syslogngspec-jsonkeyprefix}
 
-Default: -
 
-### configCheckPod (*typeoverride.PodSpec, optional) {#syslogngspec-configcheckpod}
+### logIWSize (int, optional) {#syslogngspec-logiwsize}
+
+
+### maxConnections (int, optional) {#syslogngspec-maxconnections}
+
+Available in Logging operator version 4.5 and later. Set the maximum number of connections for the source. For details, see [documentation of the AxoSyslog syslog-ng distribution](https://axoflow.com/docs/axosyslog-core/chapter-routing-filters/concepts-flow-control/configuring-flow-control/). 
 
-Default: -
 
 ### metrics (*Metrics, optional) {#syslogngspec-metrics}
 
-Default: -
 
 ### metricsService (*typeoverride.Service, optional) {#syslogngspec-metricsservice}
 
-Default: -
 
-### bufferVolumeMetrics (*BufferMetrics, optional) {#syslogngspec-buffervolumemetrics}
+### readinessDefaultCheck (ReadinessDefaultCheck, optional) {#syslogngspec-readinessdefaultcheck}
 
-Default: -
 
-### bufferVolumeMetricsService (*typeoverride.Service, optional) {#syslogngspec-buffervolumemetricsservice}
+### serviceAccount (*typeoverride.ServiceAccount, optional) {#syslogngspec-serviceaccount}
 
-Default: -
 
-### globalOptions (*GlobalOptions, optional) {#syslogngspec-globaloptions}
+### service (*typeoverride.Service, optional) {#syslogngspec-service}
 
-Default: -
 
-### jsonKeyPrefix (string, optional) {#syslogngspec-jsonkeyprefix}
+### skipRBACCreate (bool, optional) {#syslogngspec-skiprbaccreate}
 
-Default: -
 
-### jsonKeyDelim (string, optional) {#syslogngspec-jsonkeydelim}
+### sourceDateParser (*SourceDateParser, optional) {#syslogngspec-sourcedateparser}
 
-Default: -
+Available in Logging operator version 4.5 and later. Parses date automatically from the timestamp registered by the container runtime. Note: `jsonKeyPrefix` and `jsonKeyDelim` are respected. 
 
-### maxConnections (int, optional) {#syslogngspec-maxconnections}
 
-Default: -
+### sourceMetrics ([]filter.MetricsProbe, optional) {#syslogngspec-sourcemetrics}
+
+Available in Logging operator version 4.5 and later. Create [custom log metrics for sources and outputs]({{< relref "/docs/examples/custom-syslog-ng-metrics.md" >}}). 
 
-### logIWSize (int, optional) {#syslogngspec-logiwsize}
 
-Default: -
+### statefulSet (*typeoverride.StatefulSet, optional) {#syslogngspec-statefulset}
+
+
+### tls (SyslogNGTLS, optional) {#syslogngspec-tls}
+
+
+
+## SourceDateParser
+
+
+Available in Logging operator version 4.5 and later.
+
+Parses date automatically from the timestamp registered by the container runtime.
+Note: `jsonKeyPrefix` and `jsonKeyDelim` are respected.
+It is disabled by default, but if enabled, then the default settings parse the timestamp written by the container runtime and parsed by Fluent Bit using the `cri` or the `docker` parser.
+
+
+### format (*string, optional) {#sourcedateparser-format}
+
+Default: "%FT%T.%f%z" 
+
+
+### template (*string, optional) {#sourcedateparser-template}
+
+Default(depending on JSONKeyPrefix): "${json.time}" 
+
 
 
 ## SyslogNGTLS
@@ -79,52 +96,43 @@ SyslogNGTLS defines the TLS configs
 
 ### enabled (bool, required) {#syslogngtls-enabled}
 
-Default: -
 
 ### secretName (string, optional) {#syslogngtls-secretname}
 
-Default: -
 
 ### sharedKey (string, optional) {#syslogngtls-sharedkey}
 
-Default: -
 
 
 ## GlobalOptions
 
-### stats_level (*int, optional) {#globaloptions-stats_level}
+### log_level (*string, optional) {#globaloptions-log_level}
 
-Deprecated. Use stats/level from 4.1+ 
+See the [AxoSyslog Core documentation](https://axoflow.com/docs/axosyslog-core/chapter-global-options/reference-options/#global-options-log-level). 
 
-Default: -
 
-### stats_freq (*int, optional) {#globaloptions-stats_freq}
+### stats (*Stats, optional) {#globaloptions-stats}
 
-Deprecated. Use stats/freq from 4.1+ 
+See the [AxoSyslog Core documentation](https://axoflow.com/docs/axosyslog-core/chapter-global-options/reference-options/#global-option-stats). 
 
-Default: -
 
-### stats (*Stats, optional) {#globaloptions-stats}
+### stats_freq (*int, optional) {#globaloptions-stats_freq}
 
-See the [AxoSyslog Core documentation](https://axoflow.com/docs/axosyslog-core/chapter-global-options/reference-options/#global-option-stats)
+Deprecated. Use stats/freq from 4.1+ 
 
-Default: -
 
-### log_level (*string, optional) {#globaloptions-log_level}
+### stats_level (*int, optional) {#globaloptions-stats_level}
 
-See the [AxoSyslog Core documentation](https://axoflow.com/docs/axosyslog-core/chapter-global-options/reference-options/#global-options-log-level)
+Deprecated. Use stats/level from 4.1+ 
 
-Default: -
 
 
 ## Stats
 
-### level (*int, optional) {#stats-level}
+### freq (*int, optional) {#stats-freq}
 
-Default: -
 
-### freq (*int, optional) {#stats-freq}
+### level (*int, optional) {#stats-level}
 
-Default: -
 
 
diff --git a/content/docs/configuration/plugins/common/security.md b/content/docs/configuration/plugins/common/security.md
index 4d1600db6..c6959bb65 100644
--- a/content/docs/configuration/plugins/common/security.md
+++ b/content/docs/configuration/plugins/common/security.md
@@ -6,28 +6,24 @@ generated_file: true
 
 ## Security
 
+### allow_anonymous_source (bool, optional) {#security-allow_anonymous_source}
+
+Allow anonymous source. <client> sections are required if disabled. 
+
+
 ### self_hostname (string, required) {#security-self_hostname}
 
 Hostname 
 
-Default: -
 
 ### shared_key (string, required) {#security-shared_key}
 
 Shared key for authentication. 
 
-Default: -
 
 ### user_auth (bool, optional) {#security-user_auth}
 
 If true, use user based authentication. 
 
-Default: -
-
-### allow_anonymous_source (bool, optional) {#security-allow_anonymous_source}
-
-Allow anonymous source. <client> sections are required if disabled. 
-
-Default: -
 
 
diff --git a/content/docs/configuration/plugins/common/transport.md b/content/docs/configuration/plugins/common/transport.md
index 01b2bd504..46aaeb24c 100644
--- a/content/docs/configuration/plugins/common/transport.md
+++ b/content/docs/configuration/plugins/common/transport.md
@@ -6,76 +6,64 @@ generated_file: true
 
 ## Transport
 
-### protocol (string, optional) {#transport-protocol}
+### ca_cert_path (string, optional) {#transport-ca_cert_path}
 
-Protocol Default: :tcp 
+Specify private CA contained path 
 
-Default: -
 
-### version (string, optional) {#transport-version}
+### ca_path (string, optional) {#transport-ca_path}
 
-Version Default: 'TLSv1_2' 
+Specify path to CA certificate file 
 
-Default: -
 
-### ciphers (string, optional) {#transport-ciphers}
+### ca_private_key_passphrase (string, optional) {#transport-ca_private_key_passphrase}
 
-Ciphers Default: "ALL:!aNULL:!eNULL:!SSLv2" 
+private CA private key passphrase contained path 
 
-Default: -
 
-### insecure (bool, optional) {#transport-insecure}
+### ca_private_key_path (string, optional) {#transport-ca_private_key_path}
 
-Use secure connection when use tls) Default: false 
+private CA private key contained path 
 
-Default: -
 
-### ca_path (string, optional) {#transport-ca_path}
+### cert_path (string, optional) {#transport-cert_path}
 
-Specify path to CA certificate file 
+Specify path to Certificate file 
 
-Default: -
 
-### cert_path (string, optional) {#transport-cert_path}
+### ciphers (string, optional) {#transport-ciphers}
 
-Specify path to Certificate file 
+Ciphers Default: "ALL:!aNULL:!eNULL:!SSLv2" 
 
-Default: -
 
-### private_key_path (string, optional) {#transport-private_key_path}
+### client_cert_auth (bool, optional) {#transport-client_cert_auth}
 
-Specify path to private Key file 
+When this is set Fluentd will check all incoming HTTPS requests for a client certificate signed by the trusted CA, requests that don't supply a valid client certificate will fail. 
 
-Default: -
 
-### private_key_passphrase (string, optional) {#transport-private_key_passphrase}
+### insecure (bool, optional) {#transport-insecure}
 
-public CA private key passphrase contained path 
+Use secure connection when use tls) Default: false 
 
-Default: -
 
-### client_cert_auth (bool, optional) {#transport-client_cert_auth}
+### private_key_passphrase (string, optional) {#transport-private_key_passphrase}
 
-When this is set Fluentd will check all incoming HTTPS requests for a client certificate signed by the trusted CA, requests that don't supply a valid client certificate will fail. 
+public CA private key passphrase contained path 
 
-Default: -
 
-### ca_cert_path (string, optional) {#transport-ca_cert_path}
+### private_key_path (string, optional) {#transport-private_key_path}
 
-Specify private CA contained path 
+Specify path to private Key file 
 
-Default: -
 
-### ca_private_key_path (string, optional) {#transport-ca_private_key_path}
+### protocol (string, optional) {#transport-protocol}
 
-private CA private key contained path 
+Protocol Default: :tcp 
 
-Default: -
 
-### ca_private_key_passphrase (string, optional) {#transport-ca_private_key_passphrase}
+### version (string, optional) {#transport-version}
 
-private CA private key passphrase contained path 
+Version Default: 'TLSv1_2' 
 
-Default: -
 
 
diff --git a/content/docs/configuration/plugins/filters/concat.md b/content/docs/configuration/plugins/filters/concat.md
index fee9bc823..867b1625d 100644
--- a/content/docs/configuration/plugins/filters/concat.md
+++ b/content/docs/configuration/plugins/filters/concat.md
@@ -11,123 +11,109 @@ generated_file: true
 ## Configuration
 ## Concat
 
-### key (string, optional) {#concat-key}
+### continuous_line_regexp (string, optional) {#concat-continuous_line_regexp}
 
-Specify field name in the record to parse. If you leave empty the Container Runtime default will be used. 
+The regexp to match continuous lines. This is exclusive with n_lines. 
 
-Default: -
 
-### separator (*string, optional) {#concat-separator}
+### flush_interval (int, optional) {#concat-flush_interval}
 
-The separator of lines.  
+The number of seconds after which the last received event log is flushed. If set to 0, flushing is disabled (wait for next line forever). 
 
-Default:  "\n"
 
-### n_lines (int, optional) {#concat-n_lines}
+### keep_partial_key (bool, optional) {#concat-keep_partial_key}
 
-The number of lines. This is exclusive with multiline_start_regex. 
+If true, keep partial_key in concatenated records  
 
-Default: -
+Default: False
 
-### multiline_start_regexp (string, optional) {#concat-multiline_start_regexp}
+### keep_partial_metadata (string, optional) {#concat-keep_partial_metadata}
 
-The regexp to match beginning of multiline. This is exclusive with n_lines. 
+If true, keep partial metadata 
 
-Default: -
 
-### multiline_end_regexp (string, optional) {#concat-multiline_end_regexp}
+### key (string, optional) {#concat-key}
 
-The regexp to match ending of multiline. This is exclusive with n_lines. 
+Specify field name in the record to parse. If you leave empty the Container Runtime default will be used. 
 
-Default: -
 
-### continuous_line_regexp (string, optional) {#concat-continuous_line_regexp}
+### multiline_end_regexp (string, optional) {#concat-multiline_end_regexp}
 
-The regexp to match continuous lines. This is exclusive with n_lines. 
+The regexp to match ending of multiline. This is exclusive with n_lines. 
 
-Default: -
 
-### stream_identity_key (string, optional) {#concat-stream_identity_key}
+### multiline_start_regexp (string, optional) {#concat-multiline_start_regexp}
 
-The key to determine which stream an event belongs to. 
+The regexp to match beginning of multiline. This is exclusive with n_lines. 
 
-Default: -
 
-### flush_interval (int, optional) {#concat-flush_interval}
+### n_lines (int, optional) {#concat-n_lines}
 
-The number of seconds after which the last received event log will be flushed. If specified 0, wait for next line forever. 
+The number of lines. This is exclusive with multiline_start_regex. 
 
-Default: -
 
-### timeout_label (string, optional) {#concat-timeout_label}
+### partial_cri_logtag_key (string, optional) {#concat-partial_cri_logtag_key}
 
-The label name to handle events caused by timeout. 
+The key name that is referred to concatenate records on cri log 
 
-Default: -
 
-### use_first_timestamp (bool, optional) {#concat-use_first_timestamp}
+### partial_cri_stream_key (string, optional) {#concat-partial_cri_stream_key}
 
-Use timestamp of first record when buffer is flushed.  
+The key name that is referred to detect stream name on cri log
 
-Default:  False
+Default: stream
 
 ### partial_key (string, optional) {#concat-partial_key}
 
 The field name that is the reference to concatenate records 
 
-Default: -
+
+### partial_metadata_format (string, optional) {#concat-partial_metadata_format}
+
+Input format of the partial metadata (fluentd or journald docker log driver)( docker-fluentd, docker-journald, docker-journald-lowercase) 
+
 
 ### partial_value (string, optional) {#concat-partial_value}
 
 The value stored in the field specified by partial_key that represent partial log 
 
-Default: -
 
-### keep_partial_key (bool, optional) {#concat-keep_partial_key}
+### separator (*string, optional) {#concat-separator}
 
-If true, keep partial_key in concatenated records  
+The separator of lines. (default: "\n") 
 
-Default: False
 
-### use_partial_metadata (string, optional) {#concat-use_partial_metadata}
+### stream_identity_key (string, optional) {#concat-stream_identity_key}
 
-Use partial metadata to concatenate multiple records 
+The key to determine which stream an event belongs to. 
 
-Default: -
 
-### keep_partial_metadata (string, optional) {#concat-keep_partial_metadata}
+### timeout_label (string, optional) {#concat-timeout_label}
 
-If true, keep partial metadata 
+The label name to handle events caused by timeout. 
 
-Default: -
 
-### partial_metadata_format (string, optional) {#concat-partial_metadata_format}
+### use_first_timestamp (bool, optional) {#concat-use_first_timestamp}
 
-Input format of the partial metadata (fluentd or journald docker log driver)( docker-fluentd, docker-journald, docker-journald-lowercase) 
+Use timestamp of first record when buffer is flushed.  
 
-Default: -
+Default:  False
 
 ### use_partial_cri_logtag (bool, optional) {#concat-use_partial_cri_logtag}
 
 Use cri log tag to concatenate multiple records 
 
-Default: -
-
-### partial_cri_logtag_key (string, optional) {#concat-partial_cri_logtag_key}
 
-The key name that is referred to concatenate records on cri log 
+### use_partial_metadata (string, optional) {#concat-use_partial_metadata}
 
-Default: -
+Use partial metadata to concatenate multiple records 
 
-### partial_cri_stream_key (string, optional) {#concat-partial_cri_stream_key}
 
-The key name that is referred to detect stream name on cri log
 
-Default: stream
 
+## Example `Concat` filter configurations
 
- ## Example `Concat` filter configurations
- ```yaml
+{{< highlight yaml >}}
 apiVersion: logging.banzaicloud.io/v1beta1
 kind: Flow
 metadata:
@@ -141,10 +127,11 @@ spec:
   selectors: {}
   localOutputRefs:
     - demo-output
- ```
+{{</ highlight >}}
 
- #### Fluentd Config Result
- ```yaml
+Fluentd config result:
+
+{{< highlight xml >}}
 <filter **>
   @type concat
   @id test_concat
@@ -152,6 +139,7 @@ spec:
   n_lines 10
   partial_key partial_message
 </filter>
- ```
+{{</ highlight >}}
+
 
 ---
diff --git a/content/docs/configuration/plugins/filters/dedot.md b/content/docs/configuration/plugins/filters/dedot.md
index 628906ffc..f5fa597f3 100644
--- a/content/docs/configuration/plugins/filters/dedot.md
+++ b/content/docs/configuration/plugins/filters/dedot.md
@@ -13,7 +13,7 @@ generated_file: true
 
 ### de_dot_nested (bool, optional) {#dedotfilterconfig-de_dot_nested}
 
-Will cause the plugin to recurse through nested structures (hashes and arrays), and remove dots in those key-names too. 
+Will cause the plugin to recourse through nested structures (hashes and arrays), and remove dots in those key-names too.
 
 Default:  false
 
@@ -24,8 +24,10 @@ Separator
 Default: _
 
 
- ## Example `Dedot` filter configurations
- ```yaml
+
+## Example `Dedot` filter configurations
+
+{{< highlight yaml >}}
 apiVersion: logging.banzaicloud.io/v1beta1
 kind: Flow
 metadata:
@@ -38,16 +40,18 @@ spec:
   selectors: {}
   localOutputRefs:
     - demo-output
- ```
+{{</ highlight >}}
 
- #### Fluentd Config Result
- ```yaml
+Fluentd config result:
+
+{{< highlight xml >}}
 <filter **>
   @type dedot
   @id test_dedot
   de_dot_nested true
   de_dot_separator -
 </filter>
- ```
+{{</ highlight >}}
+
 
 ---
diff --git a/content/docs/configuration/plugins/filters/detect_exceptions.md b/content/docs/configuration/plugins/filters/detect_exceptions.md
index 54b771f59..d8e118c0f 100644
--- a/content/docs/configuration/plugins/filters/detect_exceptions.md
+++ b/content/docs/configuration/plugins/filters/detect_exceptions.md
@@ -6,45 +6,47 @@ generated_file: true
 
 # Exception Detector
 ## Overview
-This filter plugin consumes a log stream of JSON objects which contain single-line log messages. If a consecutive sequence of log messages form an exception stack trace, they forwarded as a single, combined JSON object. Otherwise, the input log data is forwarded as is.
-More info at https://github.com/GoogleCloudPlatform/fluent-plugin-detect-exceptions
+
+This filter plugin consumes a log stream of JSON objects which contain single-line log messages. If a consecutive sequence of log messages form an exception stack trace, they forwarded as a single, combined JSON object. Otherwise, the input log data is forwarded as is. More info at https://github.com/GoogleCloudPlatform/fluent-plugin-detect-exceptions
 
  > Note: As Tag management is not supported yet, this Plugin is **mutually exclusive** with [Tag normaliser](../tagnormaliser)
 
- ## Example output configurations
- ```yaml
+## Example output configurations
+
+```yaml
 filters:
   - detectExceptions:
-      languages: java, python
-      multiline_flush_interval: 0.1
- ```
+    languages: java, python
+    multiline_flush_interval: 0.1
+```
+
 
 ## Configuration
 ## DetectExceptions
 
-### message (string, optional) {#detectexceptions-message}
+### force_line_breaks (bool, optional) {#detectexceptions-force_line_breaks}
 
-The field which contains the raw message text in the input JSON data.  
+Force line breaks between each lines when comibining exception stacks.  
 
-Default:  ""
+Default:  false
 
-### remove_tag_prefix (string, optional) {#detectexceptions-remove_tag_prefix}
+### languages ([]string, optional) {#detectexceptions-languages}
 
-The prefix to be removed from the input tag when outputting a record.  
+Programming languages for which to detect exceptions.  
 
-Default:  kubernetes
+Default: `[]`
 
-### multiline_flush_interval (string, optional) {#detectexceptions-multiline_flush_interval}
+### match_tag (string, optional) {#detectexceptions-match_tag}
 
-The interval of flushing the buffer for multiline format.  
+Tag used in match directive.  
 
-Default:  nil
+Default: `kubernetes.**`
 
-### languages ([]string, optional) {#detectexceptions-languages}
+### max_bytes (int, optional) {#detectexceptions-max_bytes}
 
-Programming languages for which to detect exceptions.  
+Maximum number of bytes to flush (0 means no limit)  
 
-Default:  []
+Default:  0
 
 ### max_lines (int, optional) {#detectexceptions-max_lines}
 
@@ -52,33 +54,35 @@ Maximum number of lines to flush (0 means no limit)
 
 Default:  1000
 
-### max_bytes (int, optional) {#detectexceptions-max_bytes}
+### message (string, optional) {#detectexceptions-message}
 
-Maximum number of bytes to flush (0 means no limit)  
+The field which contains the raw message text in the input JSON data.  
 
-Default:  0
+Default:  ""
 
-### stream (string, optional) {#detectexceptions-stream}
+### multiline_flush_interval (string, optional) {#detectexceptions-multiline_flush_interval}
 
-Separate log streams by this field in the input JSON data.  
+The interval of flushing the buffer for multiline format.  
 
-Default:  ""
+Default:  nil
 
-### force_line_breaks (bool, optional) {#detectexceptions-force_line_breaks}
+### remove_tag_prefix (string, optional) {#detectexceptions-remove_tag_prefix}
 
-Force line breaks between each lines when comibining exception stacks.  
+The prefix to be removed from the input tag when outputting a record.  
 
-Default:  false
+Default:  kubernetes
 
-### match_tag (string, optional) {#detectexceptions-match_tag}
+### stream (string, optional) {#detectexceptions-stream}
 
-Tag used in match directive.  
+Separate log streams by this field in the input JSON data.  
+
+Default:  ""
 
-Default:  kubernetes.**
 
 
- ## Example `Exception Detector` filter configurations
- ```yaml
+## Example `Exception Detector` filter configurations
+
+{{< highlight yaml >}}
 apiVersion: logging.banzaicloud.io/v1beta1
 kind: Flow
 metadata:
@@ -93,10 +97,11 @@ spec:
   selectors: {}
   localOutputRefs:
     - demo-output
- ```
+{{</ highlight >}}
+
+Fluentd config result:
 
- #### Fluentd Config Result
- ```yaml
+{{< highlight xml >}}
 <match kubernetes.**>
   @type detect_exceptions
   @id test_detect_exceptions
@@ -104,6 +109,7 @@ spec:
   multiline_flush_interval 0.1
   remove_tag_prefix kubernetes
 </match>
- ```
+{{</ highlight >}}
+
 
 ---
diff --git a/content/docs/configuration/plugins/filters/elasticsearch_genid.md b/content/docs/configuration/plugins/filters/elasticsearch_genid.md
index 8d2e7a0dd..169ef1d78 100644
--- a/content/docs/configuration/plugins/filters/elasticsearch_genid.md
+++ b/content/docs/configuration/plugins/filters/elasticsearch_genid.md
@@ -1,56 +1,77 @@
 ---
-title: ElasticsearchGenId
+title: ElasticSearch GenId
 weight: 200
 generated_file: true
 ---
 ## ElasticsearchGenId
 
+## Example `Elasticsearch Genid` filter configurations
+
+{{< highlight yaml >}}
+apiVersion: logging.banzaicloud.io/v1beta1
+kind: Flow
+metadata:
+ name: demo-flow
+spec:
+ filters:
+   - elasticsearch_genid:
+       hash_id_key: gen_id
+ selectors: {}
+ localOutputRefs:
+   - demo-output
+{{</ highlight >}}
+
+Fluentd Config Result
+
+{{< highlight xml >}}
+<filter **>
+ @type elasticsearch_genid
+ @id test_elasticsearch_genid
+ hash_id_key gen_id
+</filter>
+{{</ highlight >}}
+
+
+## Configuration
+
 ### hash_id_key (string, optional) {#elasticsearchgenid-hash_id_key}
 
 You can specify generated hash storing key. 
 
-Default: -
+
+### hash_type (string, optional) {#elasticsearchgenid-hash_type}
+
+You can specify hash algorithm. Support algorithms md5, sha1, sha256, sha512. Default: sha1 
+
 
 ### include_tag_in_seed (bool, optional) {#elasticsearchgenid-include_tag_in_seed}
 
 You can specify to use tag for hash generation seed. 
 
-Default: -
 
 ### include_time_in_seed (bool, optional) {#elasticsearchgenid-include_time_in_seed}
 
 You can specify to use time for hash generation seed. 
 
-Default: -
-
-### use_record_as_seed (bool, optional) {#elasticsearchgenid-use_record_as_seed}
-
-You can specify to use record in events for hash generation seed. This parameter should be used with record_keys parameter in practice. 
-
-Default: -
 
 ### record_keys (string, optional) {#elasticsearchgenid-record_keys}
 
 You can specify keys which are record in events for hash generation seed. This parameter should be used with use_record_as_seed parameter in practice. 
 
-Default: -
 
-### use_entire_record (bool, optional) {#elasticsearchgenid-use_entire_record}
+### separator (string, optional) {#elasticsearchgenid-separator}
 
-You can specify to use entire record in events for hash generation seed. 
+You can specify separator charactor to creating seed for hash generation. 
 
-Default: -
 
-### separator (string, optional) {#elasticsearchgenid-separator}
+### use_entire_record (bool, optional) {#elasticsearchgenid-use_entire_record}
 
-You can specify separator charactor to creating seed for hash generation. 
+You can specify to use entire record in events for hash generation seed. 
 
-Default: -
 
-### hash_type (string, optional) {#elasticsearchgenid-hash_type}
+### use_record_as_seed (bool, optional) {#elasticsearchgenid-use_record_as_seed}
 
-You can specify hash algorithm. Support algorithms md5, sha1, sha256, sha512. Default: sha1 
+You can specify to use record in events for hash generation seed. This parameter should be used with record_keys parameter in practice. 
 
-Default: -
 
 
diff --git a/content/docs/configuration/plugins/filters/enhance_k8s.md b/content/docs/configuration/plugins/filters/enhance_k8s.md
index dad46236b..96e2d1626 100644
--- a/content/docs/configuration/plugins/filters/enhance_k8s.md
+++ b/content/docs/configuration/plugins/filters/enhance_k8s.md
@@ -11,65 +11,59 @@ generated_file: true
 ## Configuration
 ## EnhanceK8s
 
-### in_namespace_path ([]string, optional) {#enhancek8s-in_namespace_path}
-
-parameters for read/write record  
-
-Default:  ['$.namespace']
-
-### in_pod_path ([]string, optional) {#enhancek8s-in_pod_path}
+### api_groups ([]string, optional) {#enhancek8s-api_groups}
 
- 
+Kubernetes resources api groups  
 
-Default:  ['$.pod','$.pod_name']
+Default: `["apps/v1", "extensions/v1beta1"]`
 
-### data_type (string, optional) {#enhancek8s-data_type}
+### bearer_token_file (string, optional) {#enhancek8s-bearer_token_file}
 
-Sumologic data type  
+Bearer token path  
 
-Default:  metrics
+Default:  nil
 
-### kubernetes_url (string, optional) {#enhancek8s-kubernetes_url}
+### ca_file (secret.Secret, optional) {#enhancek8s-ca_file}
 
-Kubernetes API URL  
+Kubernetes API CA file  
 
 Default:  nil
 
-### client_cert (secret.Secret, optional) {#enhancek8s-client_cert}
+### cache_refresh (int, optional) {#enhancek8s-cache_refresh}
 
-Kubernetes API Client certificate  
+Cache refresh  
 
-Default:  nil
+Default:  60*60
 
-### client_key (secret.Secret, optional) {#enhancek8s-client_key}
+### cache_refresh_variation (int, optional) {#enhancek8s-cache_refresh_variation}
 
-// Kubernetes API Client certificate key  
+Cache refresh variation  
 
-Default:  nil
+Default:  60*15
 
-### ca_file (secret.Secret, optional) {#enhancek8s-ca_file}
+### cache_size (int, optional) {#enhancek8s-cache_size}
 
-Kubernetes API CA file  
+Cache size   
 
-Default:  nil
+Default:  1000
 
-### secret_dir (string, optional) {#enhancek8s-secret_dir}
+### cache_ttl (int, optional) {#enhancek8s-cache_ttl}
 
-Service account directory  
+Cache TTL  
 
-Default:  /var/run/secrets/kubernetes.io/serviceaccount
+Default:  60*60*2
 
-### bearer_token_file (string, optional) {#enhancek8s-bearer_token_file}
+### client_cert (secret.Secret, optional) {#enhancek8s-client_cert}
 
-Bearer token path  
+Kubernetes API Client certificate  
 
 Default:  nil
 
-### verify_ssl (*bool, optional) {#enhancek8s-verify_ssl}
+### client_key (secret.Secret, optional) {#enhancek8s-client_key}
 
-Verify SSL  
+// Kubernetes API Client certificate key  
 
-Default:  true
+Default:  nil
 
 ### core_api_versions ([]string, optional) {#enhancek8s-core_api_versions}
 
@@ -77,45 +71,51 @@ Kubernetes core API version (for different Kubernetes versions)
 
 Default:  ['v1']
 
-### api_groups ([]string, optional) {#enhancek8s-api_groups}
+### data_type (string, optional) {#enhancek8s-data_type}
 
-Kubernetes resources api groups  
+Sumologic data type  
 
-Default:  ["apps/v1", "extensions/v1beta1"]
+Default:  metrics
 
-### ssl_partial_chain (*bool, optional) {#enhancek8s-ssl_partial_chain}
+### in_namespace_path ([]string, optional) {#enhancek8s-in_namespace_path}
 
-if `ca_file` is for an intermediate CA, or otherwise we do not have the root CA and want to trust the intermediate CA certs we do have, set this to `true` - this corresponds to the openssl s_client -partial_chain flag and X509_V_FLAG_PARTIAL_CHAIN  
+parameters for read/write record  
 
-Default:  false
+Default: `['$.namespace']`
 
-### cache_size (int, optional) {#enhancek8s-cache_size}
+### in_pod_path ([]string, optional) {#enhancek8s-in_pod_path}
 
-Cache size   
+Default: `['$.pod','$.pod_name']`
 
-Default:  1000
+### kubernetes_url (string, optional) {#enhancek8s-kubernetes_url}
 
-### cache_ttl (int, optional) {#enhancek8s-cache_ttl}
+Kubernetes API URL  
 
-Cache TTL  
+Default:  nil
 
-Default:  60*60*2
+### ssl_partial_chain (*bool, optional) {#enhancek8s-ssl_partial_chain}
 
-### cache_refresh (int, optional) {#enhancek8s-cache_refresh}
+If `ca_file` is for an intermediate CA, or otherwise we do not have the root CA and want to trust the intermediate CA certs we do have, set this to `true` - this corresponds to the openssl s_client -partial_chain flag and X509_V_FLAG_PARTIAL_CHAIN
 
-Cache refresh  
+Default:  false
 
-Default:  60*60
+### secret_dir (string, optional) {#enhancek8s-secret_dir}
 
-### cache_refresh_variation (int, optional) {#enhancek8s-cache_refresh_variation}
+Service account directory  
 
-Cache refresh variation  
+Default:  /var/run/secrets/kubernetes.io/serviceaccount
 
-Default:  60*15
+### verify_ssl (*bool, optional) {#enhancek8s-verify_ssl}
 
+Verify SSL  
+
+Default:  true
 
- ## Example `EnhanceK8s` filter configurations
- ```yaml
+
+
+## Example `EnhanceK8s` filter configurations
+
+{{< highlight yaml >}}
 apiVersion: logging.banzaicloud.io/v1beta1
 kind: Logging
 metadata:
@@ -123,14 +123,16 @@ metadata:
 spec:
   globalFilters:
     - enhanceK8s: {}
- ```
+{{</ highlight >}}
 
- #### Fluentd Config Result
- ```yaml
+Fluentd config result:
+
+{{< highlight xml >}}
 <filter **>
   @type enhance_k8s_metadata
   @id test_enhanceK8s
 </filter>
- ```
+{{</ highlight >}}
+
 
 ---
diff --git a/content/docs/configuration/plugins/filters/geoip.md b/content/docs/configuration/plugins/filters/geoip.md
index a9ff220bb..23729fdc0 100644
--- a/content/docs/configuration/plugins/filters/geoip.md
+++ b/content/docs/configuration/plugins/filters/geoip.md
@@ -12,29 +12,31 @@ generated_file: true
 ## Configuration
 ## GeoIP
 
-### geoip_lookup_keys (string, optional) {#geoip-geoip_lookup_keys}
+### backend_library (string, optional) {#geoip-backend_library}
 
-Specify one or more geoip lookup field which has ip address  
+Specify backend library (geoip2_c, geoip, geoip2_compat) 
+
+
+### geoip2_database (string, optional) {#geoip-geoip2_database}
+
+Specify optional geoip2 database (using bundled GeoLite2-City.mmdb by default) 
 
-Default:  host
 
 ### geoip_database (string, optional) {#geoip-geoip_database}
 
 Specify optional geoip database (using bundled GeoLiteCity databse by default) 
 
-Default: -
 
-### geoip2_database (string, optional) {#geoip-geoip2_database}
+### geoip_lookup_keys (string, optional) {#geoip-geoip_lookup_keys}
 
-Specify optional geoip2 database (using bundled GeoLite2-City.mmdb by default) 
+Specify one or more geoip lookup field which has ip address  
 
-Default: -
+Default:  host
 
-### backend_library (string, optional) {#geoip-backend_library}
+### records ([]Record, optional) {#geoip-records}
 
-Specify backend library (geoip2_c, geoip, geoip2_compat) 
+Records are represented as maps: `key: value` 
 
-Default: -
 
 ### skip_adding_null_record (*bool, optional) {#geoip-skip_adding_null_record}
 
@@ -42,15 +44,11 @@ To avoid get stacktrace error with `[null, null]` array for elasticsearch.
 
 Default: true
 
-### records ([]Record, optional) {#geoip-records}
-
-Records are represented as maps: `key: value` 
 
-Default: -
 
+## Example `GeoIP` filter configurations
 
- ## Example `GeoIP` filter configurations
- ```yaml
+{{< highlight yaml >}}
 apiVersion: logging.banzaicloud.io/v1beta1
 kind: Flow
 metadata:
@@ -68,10 +66,11 @@ spec:
   selectors: {}
   localOutputRefs:
     - demo-output
- ```
+{{</ highlight >}}
+
+Fluentd config result:
 
- #### Fluentd Config Result
- ```yaml
+{{< highlight xml >}}
 <filter **>
   @type geoip
   @id test_geoip
@@ -85,6 +84,7 @@ spec:
     postal_code ${postal.code["remote_addr"]}
   </record>
 </filter>
- ```
+{{</ highlight >}}
+
 
 ---
diff --git a/content/docs/configuration/plugins/filters/grep.md b/content/docs/configuration/plugins/filters/grep.md
index d5bd1cfa2..105ab54e0 100644
--- a/content/docs/configuration/plugins/filters/grep.md
+++ b/content/docs/configuration/plugins/filters/grep.md
@@ -4,36 +4,34 @@ weight: 200
 generated_file: true
 ---
 
-# [Grep Filter](https://docs.fluentd.org/filter/grep)
 ## Overview
- The grep filter plugin "greps" events by the values of specified fields.
+
+[Grep Filter](https://docs.fluentd.org/filter/grep)
+
+The grep filter plugin "greps" events by the values of specified fields.
 
 ## Configuration
 ## GrepConfig
 
-### regexp ([]RegexpSection, optional) {#grepconfig-regexp}
+### and ([]AndSection, optional) {#grepconfig-and}
 
-[Regexp Directive](#grepconfig-regexp) 
+[And Directive](#grepconfig-and) 
 
-Default: -
 
 ### exclude ([]ExcludeSection, optional) {#grepconfig-exclude}
 
 [Exclude Directive](#grepconfig-exclude) 
 
-Default: -
 
 ### or ([]OrSection, optional) {#grepconfig-or}
 
 [Or Directive](#grepconfig-or) 
 
-Default: -
 
-### and ([]AndSection, optional) {#grepconfig-and}
+### regexp ([]RegexpSection, optional) {#grepconfig-regexp}
 
-[And Directive](#grepconfig-and) 
+[Regexp Directive](#grepconfig-regexp) 
 
-Default: -
 
 
 ## Regexp Directive {#Regexp-Directive}
@@ -44,17 +42,17 @@ Specify filtering rule (as described in the [Fluentd documentation](https://docs
 
 Specify field name in the record to parse. 
 
-Default: -
 
 ### pattern (string, required) {#regexp-directive-pattern}
 
 Pattern expression to evaluate 
 
-Default: -
 
 
- ## Example `Regexp` filter configurations
- ```yaml
+
+## Example `Regexp` filter configurations
+
+{{< highlight yaml >}}
 apiVersion: logging.banzaicloud.io/v1beta1
 kind: Flow
 metadata:
@@ -68,10 +66,11 @@ spec:
   selectors: {}
   localOutputRefs:
     - demo-output
- ```
+{{</ highlight >}}
+
+Fluentd config result:
 
- #### Fluentd Config Result
- ```yaml
+{{< highlight xml >}}
   <filter **>
     @type grep
     @id demo-flow_1_grep
@@ -80,7 +79,8 @@ spec:
       pattern /^5\d\d$/
     </regexp>
   </filter>
- ```
+{{</ highlight >}}
+
 
 ---
 ## Exclude Directive
@@ -91,17 +91,17 @@ Specify filtering rule to reject events (as described in the [Fluentd documentat
 
 Specify field name in the record to parse. 
 
-Default: -
 
 ### pattern (string, required) {#exclude-directive-pattern}
 
 Pattern expression to evaluate 
 
-Default: -
 
 
- ## Example `Exclude` filter configurations
- ```yaml
+
+## Example `Exclude` filter configurations
+
+{{< highlight yaml >}}
 apiVersion: logging.banzaicloud.io/v1beta1
 kind: Flow
 metadata:
@@ -115,10 +115,11 @@ spec:
   selectors: {}
   localOutputRefs:
     - demo-output
- ```
+{{</ highlight >}}
+
+Fluentd config result:
 
- #### Fluentd Config Result
- ```yaml
+{{< highlight xml >}}
   <filter **>
     @type grep
     @id demo-flow_0_grep
@@ -127,28 +128,29 @@ spec:
       pattern /^5\d\d$/
     </exclude>
   </filter>
- ```
+{{</ highlight >}}
+
 
 ---
 ## [Or Directive](https://docs.fluentd.org/filter/grep#less-than-or-greater-than-directive) {#Or-Directive}
 
 Specify filtering rule (as described in the [Fluentd documentation](https://docs.fluentd.org/filter/grep#less-than-or-greater-than-directive). This directive contains either `regexp` or `exclude` directive.
 
+### exclude ([]ExcludeSection, optional) {#or-directive-exclude}
+
+[Exclude Directive](https://docs.fluentd.org/filter/grep#less-than-or-greater-than-directive) 
+
+
 ### regexp ([]RegexpSection, optional) {#or-directive-regexp}
 
 [Regexp Directive](https://docs.fluentd.org/filter/grep#less-than-or-greater-than-directive) 
 
-Default: -
-
-### exclude ([]ExcludeSection, optional) {#or-directive-exclude}
 
-[Exclude Directive](https://docs.fluentd.org/filter/grep#less-than-or-greater-than-directive) 
 
-Default: -
 
+## Example `Or` filter configurations
 
- ## Example `Or` filter configurations
- ```yaml
+{{< highlight yaml >}}
 apiVersion: logging.banzaicloud.io/v1beta1
 kind: Flow
 metadata:
@@ -166,10 +168,11 @@ spec:
   selectors: {}
   localOutputRefs:
     - demo-output
-```
+{{</ highlight >}}
+
+Fluentd config result:
 
- #### Fluentd Config Result
- ```yaml
+{{< highlight xml >}}
     <or>
       <exclude>
         key first
@@ -180,28 +183,29 @@ spec:
         pattern /\.css$/
       </exclude>
     </or>
- ```
+{{</ highlight >}}
+
 
 ---
 ## [And Directive](https://docs.fluentd.org/filter/grep#less-than-and-greater-than-directive) {#And-Directive}
 
 Specify filtering rule (as described in the [Fluentd documentation](https://docs.fluentd.org/filter/grep#less-than-and-greater-than-directive). This directive contains either `regexp` or `exclude` directive.
 
+### exclude ([]ExcludeSection, optional) {#and-directive-exclude}
+
+[Exclude Directive](https://docs.fluentd.org/filter/grep#less-than-and-greater-than-directive) 
+
+
 ### regexp ([]RegexpSection, optional) {#and-directive-regexp}
 
 [Regexp Directive](https://docs.fluentd.org/filter/grep#less-than-and-greater-than-directive) 
 
-Default: -
 
-### exclude ([]ExcludeSection, optional) {#and-directive-exclude}
 
-[Exclude Directive](https://docs.fluentd.org/filter/grep#less-than-and-greater-than-directive) 
-
-Default: -
 
+## Example `And` filter configurations
 
- ## Example `And` filter configurations
- ```yaml
+{{< highlight yaml >}}
 apiVersion: logging.banzaicloud.io/v1beta1
 kind: Flow
 metadata:
@@ -219,10 +223,11 @@ spec:
   selectors: {}
   localOutputRefs:
     - demo-output
-```
+{{</ highlight >}}
 
- #### Fluentd Config Result
- ```yaml
+Fluentd config result:
+
+{{< highlight xml >}}
     <and>
       <regexp>
         key first
@@ -233,6 +238,7 @@ spec:
         pattern /\.css$/
       </regexp>
     </and>
- ```
+{{</ highlight >}}
+
 
 ---
diff --git a/content/docs/configuration/plugins/filters/kube_events_timestamp.md b/content/docs/configuration/plugins/filters/kube_events_timestamp.md
index 70483af42..656e62da7 100644
--- a/content/docs/configuration/plugins/filters/kube_events_timestamp.md
+++ b/content/docs/configuration/plugins/filters/kube_events_timestamp.md
@@ -11,21 +11,23 @@ generated_file: true
 ## Configuration
 ## KubeEventsTimestampConfig
 
+### mapped_time_key (string, optional) {#kubeeventstimestampconfig-mapped_time_key}
+
+Added time field name  
+
+Default:  triggerts
+
 ### timestamp_fields ([]string, optional) {#kubeeventstimestampconfig-timestamp_fields}
 
 Time field names in order of relevance  
 
 Default:  event.eventTime, event.lastTimestamp, event.firstTimestamp
 
-### mapped_time_key (string, optional) {#kubeeventstimestampconfig-mapped_time_key}
-
-Added time field name  
 
-Default:  triggerts
 
+## Example `Kubernetes Events Timestamp` filter configurations
 
- ## Example `Kubernetes Events Timestamp` filter configurations
- ```yaml
+{{< highlight yaml >}}
 apiVersion: logging.banzaicloud.io/v1beta1
 kind: Flow
 metadata:
@@ -41,16 +43,18 @@ spec:
   selectors: {}
   localOutputRefs:
     - es-output
- ```
+{{</ highlight >}}
+
+Fluentd config result:
 
- #### Fluentd Config Result
- ```yaml
+{{< highlight xml >}}
  <filter **>
  @type kube_events_timestamp
  @id test-kube-events-timestamp
  timestamp_fields ["event.eventTime","event.lastTimestamp","event.firstTimestamp"]
  mapped_time_key mytimefield
  </filter>
- ```
+{{</ highlight >}}
+
 
 ---
diff --git a/content/docs/configuration/plugins/filters/parser.md b/content/docs/configuration/plugins/filters/parser.md
index 7b35d5e4f..d01a51357 100644
--- a/content/docs/configuration/plugins/filters/parser.md
+++ b/content/docs/configuration/plugins/filters/parser.md
@@ -11,374 +11,327 @@ generated_file: true
 ## Configuration
 ## ParserConfig
 
+### emit_invalid_record_to_error (*bool, optional) {#parserconfig-emit_invalid_record_to_error}
+
+Emit invalid record to @ERROR label. Invalid cases are: key not exist, format is not matched, unexpected error 
+
+
+### hash_value_field (string, optional) {#parserconfig-hash_value_field}
+
+Store parsed values as a hash value in a field. 
+
+
+### inject_key_prefix (string, optional) {#parserconfig-inject_key_prefix}
+
+Store parsed values with specified key name prefix. 
+
+
 ### key_name (string, optional) {#parserconfig-key_name}
 
 Specify field name in the record to parse. If you leave empty the Container Runtime default will be used. 
 
-Default: -
 
-### reserve_time (bool, optional) {#parserconfig-reserve_time}
+### parse (ParseSection, optional) {#parserconfig-parse}
 
-Keep original event time in parsed result. 
+[Parse Section](#parse-section) 
 
-Default: -
 
-### reserve_data (bool, optional) {#parserconfig-reserve_data}
+### parsers ([]ParseSection, optional) {#parserconfig-parsers}
 
-Keep original key-value pair in parsed result. 
+Deprecated, use `parse` instead 
 
-Default: -
 
 ### remove_key_name_field (bool, optional) {#parserconfig-remove_key_name_field}
 
 Remove key_name field when parsing is succeeded 
 
-Default: -
 
 ### replace_invalid_sequence (bool, optional) {#parserconfig-replace_invalid_sequence}
 
 If true, invalid string is replaced with safe characters and re-parse it. 
 
-Default: -
 
-### inject_key_prefix (string, optional) {#parserconfig-inject_key_prefix}
+### reserve_data (bool, optional) {#parserconfig-reserve_data}
 
-Store parsed values with specified key name prefix. 
+Keep original key-value pair in parsed result. 
 
-Default: -
 
-### hash_value_field (string, optional) {#parserconfig-hash_value_field}
+### reserve_time (bool, optional) {#parserconfig-reserve_time}
 
-Store parsed values as a hash value in a field. 
+Keep original event time in parsed result. 
 
-Default: -
 
-### emit_invalid_record_to_error (*bool, optional) {#parserconfig-emit_invalid_record_to_error}
 
-Emit invalid record to @ERROR label. Invalid cases are: key not exist, format is not matched, unexpected error 
+## Parse Section
 
-Default: -
+### custom_pattern_path (*secret.Secret, optional) {#parse-section-custom_pattern_path}
 
-### parse (ParseSection, optional) {#parserconfig-parse}
+Only available when using type: grok, multiline_grok. File that includes custom grok patterns. 
 
-[Parse Section](#parse-section) 
 
-Default: -
+### delimiter (string, optional) {#parse-section-delimiter}
 
-### parsers ([]ParseSection, optional) {#parserconfig-parsers}
+Only available when using type: ltsv  
 
-Deprecated, use `parse` instead 
+Default:  "\t"
 
-Default: -
+### delimiter_pattern (string, optional) {#parse-section-delimiter_pattern}
 
+Only available when using type: ltsv 
 
-## Parse Section
 
-### type (string, optional) {#parse-section-type}
+### estimate_current_event (bool, optional) {#parse-section-estimate_current_event}
 
-Parse type: apache2, apache_error, nginx, syslog, csv, tsv, ltsv, json, multiline, none, logfmt, grok, multiline_grok 
+If true, use Fluent::EventTime.now(current time) as a timestamp when time_key is specified. 
 
-Default: -
 
 ### expression (string, optional) {#parse-section-expression}
 
 Regexp expression to evaluate 
 
-Default: -
 
-### time_key (string, optional) {#parse-section-time_key}
+### format (string, optional) {#parse-section-format}
 
-Specify time field for event time. If the event doesn't have this field, current time is used. 
+Only available when using type: multi_format 
 
-Default: -
 
-### keys (string, optional) {#parse-section-keys}
+### format_firstline (string, optional) {#parse-section-format_firstline}
 
-Names for fields on each line. (seperated by coma) 
+Only available when using type: multi_format 
 
-Default: -
 
-### null_value_pattern (string, optional) {#parse-section-null_value_pattern}
+### grok_failure_key (string, optional) {#parse-section-grok_failure_key}
 
-Specify null value pattern. 
+Only available when using type: grok, multiline_grok. The key has grok failure reason. 
 
-Default: -
 
-### null_empty_string (bool, optional) {#parse-section-null_empty_string}
+### grok_name_key (string, optional) {#parse-section-grok_name_key}
 
-If true, empty string field is replaced with nil 
+Only available when using type: grok, multiline_grok. The key name to store grok section's name. 
 
-Default: -
 
-### estimate_current_event (bool, optional) {#parse-section-estimate_current_event}
+### grok_pattern (string, optional) {#parse-section-grok_pattern}
 
-If true, use Fluent::EventTime.now(current time) as a timestamp when time_key is specified. 
+Only available when using type: grok, multiline_grok. The pattern of grok. You cannot specify multiple grok pattern with this. 
 
-Default: -
 
-### keep_time_key (bool, optional) {#parse-section-keep_time_key}
+### grok_patterns ([]GrokSection, optional) {#parse-section-grok_patterns}
 
-If true, keep time field in the record. 
+Only available when using type: grok, multiline_grok. [Grok Section](#grok-section) Specify grok pattern series set. 
 
-Default: -
 
-### types (string, optional) {#parse-section-types}
+### keep_time_key (bool, optional) {#parse-section-keep_time_key}
 
-Types casting the fields to proper types example: field1:type, field2:type 
+If true, keep time field in the record. 
 
-Default: -
 
-### time_format (string, optional) {#parse-section-time_format}
+### keys (string, optional) {#parse-section-keys}
 
-Process value using specified format. This is available only when time_type is string 
+Names for fields on each line. (seperated by coma) 
 
-Default: -
 
-### time_type (string, optional) {#parse-section-time_type}
+### label_delimiter (string, optional) {#parse-section-label_delimiter}
 
-Parse/format value according to this type available values: float, unixtime, string  
+Only available when using type: ltsv  
 
-Default:  string
+Default:  ":"
 
 ### local_time (bool, optional) {#parse-section-local_time}
 
-Ff true, use local time. Otherwise, UTC is used. This is exclusive with utc.  
+If true, use local time. Otherwise, UTC is used. This is exclusive with utc.  
 
 Default:  true
 
-### utc (bool, optional) {#parse-section-utc}
-
-If true, use UTC. Otherwise, local time is used. This is exclusive with localtime  
-
-Default:  false
-
-### timezone (string, optional) {#parse-section-timezone}
-
-Use specified timezone. one can parse/format the time value in the specified timezone.  
-
-Default:  nil
-
-### format (string, optional) {#parse-section-format}
+### multiline ([]string, optional) {#parse-section-multiline}
 
-Only available when using type: multi_format 
+The multiline parser plugin parses multiline logs. 
 
-Default: -
 
-### format_firstline (string, optional) {#parse-section-format_firstline}
+### multiline_start_regexp (string, optional) {#parse-section-multiline_start_regexp}
 
-Only available when using type: multi_format 
+Only available when using type: multiline_grok The regexp to match beginning of multiline. 
 
-Default: -
 
-### delimiter (string, optional) {#parse-section-delimiter}
+### null_empty_string (bool, optional) {#parse-section-null_empty_string}
 
-Only available when using type: ltsv  
+If true, empty string field is replaced with nil 
 
-Default:  "\t"
 
-### delimiter_pattern (string, optional) {#parse-section-delimiter_pattern}
+### null_value_pattern (string, optional) {#parse-section-null_value_pattern}
 
-Only available when using type: ltsv 
+Specify null value pattern. 
 
-Default: -
 
-### label_delimiter (string, optional) {#parse-section-label_delimiter}
+### patterns ([]SingleParseSection, optional) {#parse-section-patterns}
 
-Only available when using type: ltsv  
+Only available when using type: multi_format [Parse Section](#parse-section) 
 
-Default:  ":"
 
-### multiline ([]string, optional) {#parse-section-multiline}
+### time_format (string, optional) {#parse-section-time_format}
 
-The multiline parser plugin parses multiline logs. 
+Process value using specified format. This is available only when time_type is string 
 
-Default: -
 
-### patterns ([]SingleParseSection, optional) {#parse-section-patterns}
+### time_key (string, optional) {#parse-section-time_key}
 
-Only available when using type: multi_format [Parse Section](#parse-section) 
+Specify time field for event time. If the event doesn't have this field, current time is used. 
 
-Default: -
 
-### grok_pattern (string, optional) {#parse-section-grok_pattern}
+### time_type (string, optional) {#parse-section-time_type}
 
-Only available when using type: grok, multiline_grok. The pattern of grok. You cannot specify multiple grok pattern with this. 
+Parse/format value according to this type available values: float, unixtime, string  
 
-Default: -
+Default:  string
 
-### custom_pattern_path (*secret.Secret, optional) {#parse-section-custom_pattern_path}
+### timezone (string, optional) {#parse-section-timezone}
 
-Only available when using type: grok, multiline_grok. File that includes custom grok patterns. 
+Use specified timezone. one can parse/format the time value in the specified timezone.  
 
-Default: -
+Default:  nil
 
-### grok_failure_key (string, optional) {#parse-section-grok_failure_key}
+### type (string, optional) {#parse-section-type}
 
-Only available when using type: grok, multiline_grok. The key has grok failure reason. 
+Parse type: apache2, apache_error, nginx, syslog, csv, tsv, ltsv, json, multiline, none, logfmt, grok, multiline_grok 
 
-Default: -
 
-### grok_name_key (string, optional) {#parse-section-grok_name_key}
+### types (string, optional) {#parse-section-types}
 
-Only available when using type: grok, multiline_grok. The key name to store grok section's name. 
+Types casting the fields to proper types example: field1:type, field2:type 
 
-Default: -
 
-### multiline_start_regexp (string, optional) {#parse-section-multiline_start_regexp}
+### utc (bool, optional) {#parse-section-utc}
 
-Only available when using type: multiline_grok The regexp to match beginning of multiline. 
+If true, use UTC. Otherwise, local time is used. This is exclusive with localtime  
 
-Default: -
+Default:  false
 
-### grok_patterns ([]GrokSection, optional) {#parse-section-grok_patterns}
 
-Only available when using type: grok, multiline_grok. [Grok Section](#grok-section) Specify grok pattern series set. 
+## Parse Section (single)
 
-Default: -
+### custom_pattern_path (*secret.Secret, optional) {#parse-section-custom_pattern_path}
 
+Only available when using format: grok, multiline_grok. File that includes custom grok patterns. 
 
-## Parse Section (single)
 
-### type (string, optional) {#parse-section-type}
+### estimate_current_event (bool, optional) {#parse-section-estimate_current_event}
 
-Parse type: apache2, apache_error, nginx, syslog, csv, tsv, ltsv, json, multiline, none, logfmt, grok, multiline_grok 
+If true, use Fluent::EventTime.now(current time) as a timestamp when time_key is specified. 
 
-Default: -
 
 ### expression (string, optional) {#parse-section-expression}
 
 Regexp expression to evaluate 
 
-Default: -
+### format (string, optional) {#parse-section-format}
+
+Only available when using type: multi_format 
 
-### time_key (string, optional) {#parse-section-time_key}
 
-Specify time field for event time. If the event doesn't have this field, current time is used. 
+### grok_failure_key (string, optional) {#parse-section-grok_failure_key}
 
-Default: -
+Only available when using format: grok, multiline_grok. The key has grok failure reason. 
 
-### null_value_pattern (string, optional) {#parse-section-null_value_pattern}
 
-Specify null value pattern. 
+### grok_name_key (string, optional) {#parse-section-grok_name_key}
 
-Default: -
+Only available when using format: grok, multiline_grok. The key name to store grok section's name. 
 
-### null_empty_string (bool, optional) {#parse-section-null_empty_string}
 
-If true, empty string field is replaced with nil 
+### grok_pattern (string, optional) {#parse-section-grok_pattern}
 
-Default: -
+Only available when using format: grok, multiline_grok. The pattern of grok. You cannot specify multiple grok pattern with this. 
 
-### estimate_current_event (bool, optional) {#parse-section-estimate_current_event}
+### grok_patterns ([]GrokSection, optional) {#parse-section-grok_patterns}
 
-If true, use Fluent::EventTime.now(current time) as a timestamp when time_key is specified. 
+Only available when using format: grok, multiline_grok. [Grok Section](#grok-section) Specify grok pattern series set. 
 
-Default: -
 
 ### keep_time_key (bool, optional) {#parse-section-keep_time_key}
 
 If true, keep time field in the record. 
 
-Default: -
-
-### types (string, optional) {#parse-section-types}
-
-Types casting the fields to proper types example: field1:type, field2:type 
-
-Default: -
 
-### time_format (string, optional) {#parse-section-time_format}
+### local_time (bool, optional) {#parse-section-local_time}
 
-Process value using specified format. This is available only when time_type is string 
+If true, use local time. Otherwise, UTC is used. This is exclusive with utc.
 
-Default: -
+Default:  true
 
-### time_type (string, optional) {#parse-section-time_type}
+### multiline_start_regexp (string, optional) {#parse-section-multiline_start_regexp}
 
-Parse/format value according to this type available values: float, unixtime, string  
+Only available when using format: multiline_grok The regexp to match beginning of multiline. 
 
-Default:  string
 
-### local_time (bool, optional) {#parse-section-local_time}
+### null_empty_string (bool, optional) {#parse-section-null_empty_string}
 
-Ff true, use local time. Otherwise, UTC is used. This is exclusive with utc.  
+If true, empty string field is replaced with nil 
 
-Default:  true
 
-### utc (bool, optional) {#parse-section-utc}
+### null_value_pattern (string, optional) {#parse-section-null_value_pattern}
 
-If true, use UTC. Otherwise, local time is used. This is exclusive with localtime  
+Specify null value pattern. 
 
-Default:  false
 
-### timezone (string, optional) {#parse-section-timezone}
+### time_format (string, optional) {#parse-section-time_format}
 
-Use specified timezone. one can parse/format the time value in the specified timezone.  
+Process value using specified format. This is available only when time_type is string 
 
-Default:  nil
 
-### format (string, optional) {#parse-section-format}
+### time_key (string, optional) {#parse-section-time_key}
 
-Only available when using type: multi_format 
+Specify time field for event time. If the event doesn't have this field, current time is used. 
 
-Default: -
 
-### grok_pattern (string, optional) {#parse-section-grok_pattern}
+### time_type (string, optional) {#parse-section-time_type}
 
-Only available when using format: grok, multiline_grok. The pattern of grok. You cannot specify multiple grok pattern with this. 
+Parse/format value according to this type available values: float, unixtime, string  
 
-Default: -
+Default:  string
 
-### custom_pattern_path (*secret.Secret, optional) {#parse-section-custom_pattern_path}
+### timezone (string, optional) {#parse-section-timezone}
 
-Only available when using format: grok, multiline_grok. File that includes custom grok patterns. 
+Use specified timezone. one can parse/format the time value in the specified timezone.  
 
-Default: -
+Default:  nil
 
-### grok_failure_key (string, optional) {#parse-section-grok_failure_key}
+### type (string, optional) {#parse-section-type}
 
-Only available when using format: grok, multiline_grok. The key has grok failure reason. 
+Parse type: apache2, apache_error, nginx, syslog, csv, tsv, ltsv, json, multiline, none, logfmt, grok, multiline_grok 
 
-Default: -
 
-### grok_name_key (string, optional) {#parse-section-grok_name_key}
+### types (string, optional) {#parse-section-types}
 
-Only available when using format: grok, multiline_grok. The key name to store grok section's name. 
+Types casting the fields to proper types example: field1:type, field2:type 
 
-Default: -
 
-### multiline_start_regexp (string, optional) {#parse-section-multiline_start_regexp}
+### utc (bool, optional) {#parse-section-utc}
 
-Only available when using format: multiline_grok The regexp to match beginning of multiline. 
+If true, use UTC. Otherwise, local time is used. This is exclusive with localtime  
 
-Default: -
+Default:  false
 
-### grok_patterns ([]GrokSection, optional) {#parse-section-grok_patterns}
 
-Only available when using format: grok, multiline_grok. [Grok Section](#grok-section) Specify grok pattern series set. 
+## Grok Section
 
-Default: -
+### keep_time_key (bool, optional) {#grok-section-keep_time_key}
 
+If true, keep time field in the record. 
 
-## Grok Section
 
 ### name (string, optional) {#grok-section-name}
 
 The name of grok section. 
 
-Default: -
 
 ### pattern (string, required) {#grok-section-pattern}
 
 The pattern of grok. 
 
-Default: -
 
-### keep_time_key (bool, optional) {#grok-section-keep_time_key}
+### time_format (string, optional) {#grok-section-time_format}
 
-If true, keep time field in the record. 
+Process value using specified format. This is available only when time_type is string. 
 
-Default: -
 
 ### time_key (string, optional) {#grok-section-time_key}
 
@@ -386,21 +339,16 @@ Specify time field for event time. If the event doesn't have this field, current
 
 Default: time
 
-### time_format (string, optional) {#grok-section-time_format}
-
-Process value using specified format. This is available only when time_type is string. 
-
-Default: -
-
 ### timezone (string, optional) {#grok-section-timezone}
 
 Use specified timezone. one can parse/format the time value in the specified timezone. 
 
-Default: -
 
 
- ## Example `Parser` filter configurations
- ```yaml
+
+## Example `Parser` filter configurations
+
+{{< highlight yaml >}}
 apiVersion: logging.banzaicloud.io/v1beta1
 kind: Flow
 metadata:
@@ -420,10 +368,11 @@ spec:
   selectors: {}
   localOutputRefs:
     - demo-output
- ```
+{{</ highlight >}}
 
- #### Fluentd Config Result
- ```yaml
+Fluentd config result:
+
+{{< highlight yaml >}}
 <filter **>
   @type parser
   @id test_parser
@@ -444,6 +393,7 @@ spec:
     </pattern>
   </parse>
 </filter>
- ```
+{{</ highlight >}}
+
 
 ---
diff --git a/content/docs/configuration/plugins/filters/prometheus.md b/content/docs/configuration/plugins/filters/prometheus.md
index 91415ede9..60e7838b7 100644
--- a/content/docs/configuration/plugins/filters/prometheus.md
+++ b/content/docs/configuration/plugins/filters/prometheus.md
@@ -11,58 +11,51 @@ generated_file: true
 ## Configuration
 ## PrometheusConfig
 
-### metrics ([]MetricSection, optional) {#prometheusconfig-metrics}
-
-[Metrics Section](#metrics-section) 
-
-Default: -
-
 ### labels (Label, optional) {#prometheusconfig-labels}
 
-Default: -
 
+### metrics ([]MetricSection, optional) {#prometheusconfig-metrics}
 
-## Metrics Section
+[Metrics Section](#metrics-section) 
 
-### name (string, required) {#metrics-section-name}
 
-Metrics name 
 
-Default: -
+## Metrics Section
 
-### type (string, required) {#metrics-section-type}
+### buckets (string, optional) {#metrics-section-buckets}
 
-Metrics type [counter](https://github.com/fluent/fluent-plugin-prometheus#counter-type), [gauge](https://github.com/fluent/fluent-plugin-prometheus#gauge-type), [summary](https://github.com/fluent/fluent-plugin-prometheus#summary-type), [histogram](https://github.com/fluent/fluent-plugin-prometheus#histogram-type) 
+Buckets of record for instrumentation 
 
-Default: -
 
 ### desc (string, required) {#metrics-section-desc}
 
 Description of metric 
 
-Default: -
 
 ### key (string, optional) {#metrics-section-key}
 
 Key name of record for instrumentation. 
 
-Default: -
 
-### buckets (string, optional) {#metrics-section-buckets}
+### labels (Label, optional) {#metrics-section-labels}
 
-Buckets of record for instrumentation 
+Additional labels for this metric 
 
-Default: -
 
-### labels (Label, optional) {#metrics-section-labels}
+### name (string, required) {#metrics-section-name}
 
-Additional labels for this metric 
+Metrics name 
 
-Default: -
 
+### type (string, required) {#metrics-section-type}
 
- ## Example `Prometheus` filter configurations
- ```yaml
+Metrics type [counter](https://github.com/fluent/fluent-plugin-prometheus#counter-type), [gauge](https://github.com/fluent/fluent-plugin-prometheus#gauge-type), [summary](https://github.com/fluent/fluent-plugin-prometheus#summary-type), [histogram](https://github.com/fluent/fluent-plugin-prometheus#histogram-type) 
+
+
+
+## Example `Prometheus` filter configurations
+
+{{< highlight yaml >}}
 apiVersion: logging.banzaicloud.io/v1beta1
 kind: Flow
 metadata:
@@ -89,10 +82,11 @@ spec:
   selectors: {}
   localOutputRefs:
     - demo-output
- ```
+{{</ highlight >}}
+
+Fluentd config result:
 
- #### Fluentd Config Result
- ```
+{{< highlight xml>}}
   <filter **>
     @type prometheus
     @id logging-demo-flow_2_prometheus
@@ -110,6 +104,7 @@ spec:
       tag ${tag}
     </labels>
   </filter>
- ```
+{{</ highlight >}}
+
 
 ---
diff --git a/content/docs/configuration/plugins/filters/record_modifier.md b/content/docs/configuration/plugins/filters/record_modifier.md
index 00906d7aa..6a6cfe886 100644
--- a/content/docs/configuration/plugins/filters/record_modifier.md
+++ b/content/docs/configuration/plugins/filters/record_modifier.md
@@ -11,45 +11,41 @@ generated_file: true
 ## Configuration
 ## RecordModifier
 
-### prepare_value (string, optional) {#recordmodifier-prepare_value}
+### char_encoding (string, optional) {#recordmodifier-char_encoding}
 
-Prepare values for filtering in configure phase. Prepared values can be used in <record>. You can write any ruby code. 
+Fluentd including some plugins treats logs as a BINARY by default to forward. To overide that, use a target encoding or a from:to encoding here. 
 
-Default: -
 
-### char_encoding (string, optional) {#recordmodifier-char_encoding}
+### prepare_value (string, optional) {#recordmodifier-prepare_value}
 
-Fluentd including some plugins treats logs as a BINARY by default to forward. To overide that, use a target encoding or a from:to encoding here. 
+Prepare values for filtering in configure phase. Prepared values can be used in `<record>`. You can write any ruby code. 
 
-Default: -
 
-### remove_keys (string, optional) {#recordmodifier-remove_keys}
+### records ([]Record, optional) {#recordmodifier-records}
 
-A comma-delimited list of keys to delete 
+Add records docs at: https://github.com/repeatedly/fluent-plugin-record-modifier Records are represented as maps: `key: value` 
 
-Default: -
 
-### whitelist_keys (string, optional) {#recordmodifier-whitelist_keys}
+### remove_keys (string, optional) {#recordmodifier-remove_keys}
 
-This is exclusive with remove_keys 
+A comma-delimited list of keys to delete 
 
-Default: -
 
 ### replaces ([]Replace, optional) {#recordmodifier-replaces}
 
 Replace specific value for keys 
 
-Default: -
 
-### records ([]Record, optional) {#recordmodifier-records}
+### whitelist_keys (string, optional) {#recordmodifier-whitelist_keys}
+
+This is exclusive with remove_keys 
 
-Add records docs at: https://github.com/repeatedly/fluent-plugin-record-modifier Records are represented as maps: `key: value` 
 
-Default: -
 
 
- ## Example `Record Modifier` filter configurations
- ```yaml
+## Example `Record Modifier` filter configurations
+
+{{< highlight yaml >}}
 apiVersion: logging.banzaicloud.io/v1beta1
 kind: Flow
 metadata:
@@ -62,10 +58,11 @@ spec:
   selectors: {}
   localOutputRefs:
     - demo-output
- ```
+{{</ highlight >}}
+
+Fluentd config result:
 
- #### Fluentd Config Result
- ```yaml
+{{< highlight xml >}}
 <filter **>
   @type record_modifier
   @id test_record_modifier
@@ -73,29 +70,27 @@ spec:
     foo bar
   </record>
 </filter>
- ```
+{{</ highlight >}}
+
 
 ---
 ## [Replace Directive](https://github.com/repeatedly/fluent-plugin-record-modifier#replace_keys_value)
 
 Specify replace rule. This directive contains three parameters.
 
-### key (string, required) {#replace-directive-replace_keys_value-key}
+### expression (string, required) {#replace-directive-replace_keys_value-expression}
 
-Key to search for 
+Regular expression 
 
-Default: -
 
-### expression (string, required) {#replace-directive-replace_keys_value-expression}
+### key (string, required) {#replace-directive-replace_keys_value-key}
 
-Regular expression 
+Key to search for 
 
-Default: -
 
 ### replace (string, required) {#replace-directive-replace_keys_value-replace}
 
 Value to replace with 
 
-Default: -
 
 
diff --git a/content/docs/configuration/plugins/filters/record_transformer.md b/content/docs/configuration/plugins/filters/record_transformer.md
index a5c584f12..3c500052c 100644
--- a/content/docs/configuration/plugins/filters/record_transformer.md
+++ b/content/docs/configuration/plugins/filters/record_transformer.md
@@ -11,51 +11,49 @@ generated_file: true
 ## Configuration
 ## RecordTransformer
 
-### remove_keys (string, optional) {#recordtransformer-remove_keys}
+### auto_typecast (bool, optional) {#recordtransformer-auto_typecast}
 
-A comma-delimited list of keys to delete 
+Use original value type.  
 
-Default: -
+Default:  true
+
+### enable_ruby (bool, optional) {#recordtransformer-enable_ruby}
+
+When set to true, the full Ruby syntax is enabled in the `${...}` expression.
+
+Default:  false
 
 ### keep_keys (string, optional) {#recordtransformer-keep_keys}
 
 A comma-delimited list of keys to keep. 
 
-Default: -
 
-### renew_record (bool, optional) {#recordtransformer-renew_record}
+### records ([]Record, optional) {#recordtransformer-records}
 
-Create new Hash to transform incoming data  
+Add records docs at: https://docs.fluentd.org/filter/record_transformer Records are represented as maps: `key: value` 
 
-Default:  false
 
-### renew_time_key (string, optional) {#recordtransformer-renew_time_key}
+### remove_keys (string, optional) {#recordtransformer-remove_keys}
 
-Specify field name of the record to overwrite the time of events. Its value must be unix time. 
+A comma-delimited list of keys to delete 
 
-Default: -
 
-### enable_ruby (bool, optional) {#recordtransformer-enable_ruby}
+### renew_record (bool, optional) {#recordtransformer-renew_record}
 
-When set to true, the full Ruby syntax is enabled in the ${...} expression.  
+Create new Hash to transform incoming data  
 
 Default:  false
 
-### auto_typecast (bool, optional) {#recordtransformer-auto_typecast}
-
-Use original value type.  
+### renew_time_key (string, optional) {#recordtransformer-renew_time_key}
 
-Default:  true
+Specify field name of the record to overwrite the time of events. Its value must be unix time. 
 
-### records ([]Record, optional) {#recordtransformer-records}
 
-Add records docs at: https://docs.fluentd.org/filter/record_transformer Records are represented as maps: `key: value` 
 
-Default: -
 
+## Example `Record Transformer` filter configurations
 
- ## Example `Record Transformer` filter configurations
- ```yaml
+{{< highlight yaml >}}
 apiVersion: logging.banzaicloud.io/v1beta1
 kind: Flow
 metadata:
@@ -68,10 +66,13 @@ spec:
   selectors: {}
   localOutputRefs:
     - demo-output
- ```
+{{</ highlight >}}
 
- #### Fluentd Config Result
- ```yaml
+
+
+Fluentd config result:
+
+{{< highlight xml >}}
 <filter **>
   @type record_transformer
   @id test_record_transformer
@@ -79,6 +80,7 @@ spec:
     foo bar
   </record>
 </filter>
- ```
+{{</ highlight >}}
+
 
 ---
diff --git a/content/docs/configuration/plugins/filters/stdout.md b/content/docs/configuration/plugins/filters/stdout.md
index 46052dbdf..618f3cace 100644
--- a/content/docs/configuration/plugins/filters/stdout.md
+++ b/content/docs/configuration/plugins/filters/stdout.md
@@ -15,11 +15,12 @@ generated_file: true
 
 This is the option of stdout format. 
 
-Default: -
 
 
- ## Example `StdOut` filter configurations
- ```yaml
+
+## Example `StdOut` filter configurations
+
+{{< highlight yaml >}}
 apiVersion: logging.banzaicloud.io/v1beta1
 kind: Flow
 metadata:
@@ -31,15 +32,17 @@ spec:
   selectors: {}
   localOutputRefs:
     - demo-output
- ```
+{{</ highlight >}}
 
- #### Fluentd Config Result
- ```yaml
+Fluentd config result:
+
+{{< highlight yaml >}}
 <filter **>
   @type stdout
   @id test_stdout
   output_type json
 </filter>
- ```
+{{</ highlight >}}
+
 
 ---
diff --git a/content/docs/configuration/plugins/filters/sumologic.md b/content/docs/configuration/plugins/filters/sumologic.md
index df11df0f5..9f2803026 100644
--- a/content/docs/configuration/plugins/filters/sumologic.md
+++ b/content/docs/configuration/plugins/filters/sumologic.md
@@ -11,41 +11,17 @@ More info at https://github.com/SumoLogic/sumologic-kubernetes-collection
 ## Configuration
 ## SumoLogic
 
-### source_category (string, optional) {#sumologic-source_category}
-
-Source Category  
-
-Default:  "%{namespace}/%{pod_name}"
-
-### source_category_replace_dash (string, optional) {#sumologic-source_category_replace_dash}
-
-Source Category Replace Dash  
-
-Default:  "/"
-
-### source_category_prefix (string, optional) {#sumologic-source_category_prefix}
-
-Source Category Prefix  
-
-Default:  kubernetes/
-
-### source_name (string, optional) {#sumologic-source_name}
-
-Source Name  
-
-Default:  "%{namespace}.%{pod}.%{container}"
-
-### log_format (string, optional) {#sumologic-log_format}
+### collector_key_name (string, optional) {#sumologic-collector_key_name}
 
-Log Format  
+CollectorKey Name  
 
-Default:  json
+Default: `_collector`
 
-### source_host (string, optional) {#sumologic-source_host}
+### collector_value (string, optional) {#sumologic-collector_value}
 
-Source Host  
+Collector Value  
 
-Default:  ""
+Default:  "undefined"
 
 ### exclude_container_regex (string, optional) {#sumologic-exclude_container_regex}
 
@@ -89,87 +65,113 @@ Exclude Unit Regex
 
 Default:  ""
 
-### tracing_format (*bool, optional) {#sumologic-tracing_format}
+### log_format (string, optional) {#sumologic-log_format}
 
-Tracing Format  
+Log Format  
 
-Default:  false
+Default:  json
 
-### tracing_namespace (string, optional) {#sumologic-tracing_namespace}
+### source_category (string, optional) {#sumologic-source_category}
 
-Tracing Namespace  
+Source Category  
 
-Default:  "namespace"
+Default: `%{namespace}/%{pod_name}`
 
-### tracing_pod (string, optional) {#sumologic-tracing_pod}
+### source_category_key_name (string, optional) {#sumologic-source_category_key_name}
 
-Tracing Pod  
+Source CategoryKey Name  
 
-Default:  "pod"
+Default: `_sourceCategory`
 
-### tracing_pod_id (string, optional) {#sumologic-tracing_pod_id}
+### source_category_prefix (string, optional) {#sumologic-source_category_prefix}
 
-Tracing Pod ID  
+Source Category Prefix  
 
-Default:  "pod_id"
+Default:  kubernetes/
 
-### tracing_container_name (string, optional) {#sumologic-tracing_container_name}
+### source_category_replace_dash (string, optional) {#sumologic-source_category_replace_dash}
 
-Tracing Container Name  
+Source Category Replace Dash  
 
-Default:  "container_name"
+Default:  "/"
 
-### tracing_host (string, optional) {#sumologic-tracing_host}
+### source_host (string, optional) {#sumologic-source_host}
 
-Tracing Host  
+Source Host  
 
-Default:  "hostname"
+Default:  ""
 
-### tracing_label_prefix (string, optional) {#sumologic-tracing_label_prefix}
+### source_host_key_name (string, optional) {#sumologic-source_host_key_name}
 
-Tracing Label Prefix  
+Source HostKey Name  
+
+Default: `_sourceHost`
+
+### source_name (string, optional) {#sumologic-source_name}
+
+Source Name  
 
-Default:  "pod_label_"
+Default: `%{namespace}.%{pod}.%{container}`
+
+### source_name_key_name (string, optional) {#sumologic-source_name_key_name}
+
+Source NameKey Name  
+
+Default: `_sourceName`
 
 ### tracing_annotation_prefix (string, optional) {#sumologic-tracing_annotation_prefix}
 
 Tracing Annotation Prefix  
 
-Default:  "pod_annotation_"
+Default: `pod_annotation_`
 
-### source_host_key_name (string, optional) {#sumologic-source_host_key_name}
+### tracing_container_name (string, optional) {#sumologic-tracing_container_name}
 
-Source HostKey Name  
+Tracing Container Name  
 
-Default:  "_sourceHost"
+Default:  "container_name"
 
-### source_category_key_name (string, optional) {#sumologic-source_category_key_name}
+### tracing_format (*bool, optional) {#sumologic-tracing_format}
 
-Source CategoryKey Name  
+Tracing Format  
 
-Default:  "_sourceCategory"
+Default:  false
 
-### source_name_key_name (string, optional) {#sumologic-source_name_key_name}
+### tracing_host (string, optional) {#sumologic-tracing_host}
 
-Source NameKey Name  
+Tracing Host  
 
-Default:  "_sourceName"
+Default:  "hostname"
 
-### collector_key_name (string, optional) {#sumologic-collector_key_name}
+### tracing_label_prefix (string, optional) {#sumologic-tracing_label_prefix}
 
-CollectorKey Name  
+Tracing Label Prefix  
 
-Default:  "_collector"
+Default: `pod_label_`
 
-### collector_value (string, optional) {#sumologic-collector_value}
+### tracing_namespace (string, optional) {#sumologic-tracing_namespace}
 
-Collector Value  
+Tracing Namespace  
 
-Default:  "undefined"
+Default:  "namespace"
+
+### tracing_pod (string, optional) {#sumologic-tracing_pod}
+
+Tracing Pod  
+
+Default:  "pod"
+
+### tracing_pod_id (string, optional) {#sumologic-tracing_pod_id}
 
+Tracing Pod ID  
 
- ## Example `Parser` filter configurations
- ```yaml
+Default:  "pod_id"
+
+
+
+## Example `Parser` filter configurations
+
+{{< highlight yaml >}}
 apiVersion: logging.banzaicloud.io/v1beta1
 kind: Flow
 metadata:
@@ -181,15 +183,17 @@ spec:
   selectors: {}
   localOutputRefs:
     - demo-output
- ```
+{{</ highlight >}}
+
+Fluentd config result:
 
- #### Fluentd Config Result
- ```yaml
+{{< highlight xml >}}
 <filter **>
   @type kubernetes_sumologic
   @id test_sumologic
   source_name elso
 </filter>
- ```
+{{</ highlight >}}
+
 
 ---
diff --git a/content/docs/configuration/plugins/filters/tagnormaliser.md b/content/docs/configuration/plugins/filters/tagnormaliser.md
index bd8ab5858..897c117f7 100644
--- a/content/docs/configuration/plugins/filters/tagnormaliser.md
+++ b/content/docs/configuration/plugins/filters/tagnormaliser.md
@@ -6,17 +6,19 @@ generated_file: true
 
 Fluentd Plugin to re-tag based on log metadata. More info at https://github.com/kube-logging/fluent-plugin-tag-normaliser
 
-Available kubernetes metadata
+## Available Kubernetes metadata
 
 | Parameter | Description | Example |
 |-----------|-------------|---------|
-| ${pod_name} | Pod name | understood-butterfly-logging-demo-7dcdcfdcd7-h7p9n |
-| ${container_name} | Container name inside the Pod | logging-demo |
-| ${namespace_name} | Namespace name | default |
-| ${pod_id} | Kubernetes UUID for Pod | 1f50d309-45a6-11e9-b795-025000000001  |
-| ${labels} | Kubernetes Pod labels. This is a nested map. You can access nested attributes via `.`  | {"app":"logging-demo", "pod-template-hash":"7dcdcfdcd7" }  |
-| ${host} | Node hostname the Pod runs on | docker-desktop |
-| ${docker_id} | Docker UUID of the container | 3a38148aa37aa3... |
+| `${pod_name}` | Pod name | understood-butterfly-logging-demo-7dcdcfdcd7-h7p9n |
+| `${container_name}` | Container name inside the Pod | logging-demo |
+| `${namespace_name}` | Namespace name | default |
+| `${pod_id}` | Kubernetes UUID for Pod | 1f50d309-45a6-11e9-b795-025000000001  |
+| `${labels}` | Kubernetes Pod labels. This is a nested map. You can access nested attributes via `.`  | `{"app":"logging-demo", "pod-template-hash":"7dcdcfdcd7" }`  |
+| `${host}` | Node hostname the Pod runs on | docker-desktop |
+| `${docker_id}` | Docker UUID of the container | 3a38148aa37aa3... |
+
+
 
 ## Configuration
 ## Tag Normaliser parameters
@@ -31,11 +33,13 @@ Default: ${namespace_name}.${pod_name}.${container_name}
 
 Tag used in match directive.  
 
-Default:  kubernetes.**
+Default: `kubernetes.**`
+
 
 
- ## Example `Parser` filter configurations
- ```yaml
+## Example `Parser` filter configurations
+
+{{< highlight yaml >}}
 apiVersion: logging.banzaicloud.io/v1beta1
 kind: Flow
 metadata:
@@ -47,15 +51,17 @@ spec:
   selectors: {}
   localOutputRefs:
     - demo-output
- ```
+{{</ highlight >}}
+
+Fluentd config result:
 
- #### Fluentd Config Result
- ```yaml
+{{< highlight xml >}}
 <match kubernetes.**>
   @type tag_normaliser
   @id test_tag_normaliser
   format cluster1.${namespace_name}.${pod_name}.${labels.app}
 </match>
- ```
+{{</ highlight >}}
+
 
 ---
diff --git a/content/docs/configuration/plugins/filters/throttle.md b/content/docs/configuration/plugins/filters/throttle.md
index f4ba3f8eb..97a125376 100644
--- a/content/docs/configuration/plugins/filters/throttle.md
+++ b/content/docs/configuration/plugins/filters/throttle.md
@@ -11,11 +11,11 @@ generated_file: true
 ## Configuration
 ## Throttle
 
-### group_key (string, optional) {#throttle-group_key}
+### group_bucket_limit (int, optional) {#throttle-group_bucket_limit}
 
-Used to group logs. Groups are rate limited independently  
+Maximum number logs allowed per groups over the period of group_bucket_period_s  
 
-Default:  kubernetes.container_name
+Default:  6000
 
 ### group_bucket_period_s (int, optional) {#throttle-group_bucket_period_s}
 
@@ -23,18 +23,18 @@ This is the period of of time over which group_bucket_limit applies
 
 Default:  60
 
-### group_bucket_limit (int, optional) {#throttle-group_bucket_limit}
-
-Maximum number logs allowed per groups over the period of group_bucket_period_s  
-
-Default:  6000
-
 ### group_drop_logs (bool, optional) {#throttle-group_drop_logs}
 
 When a group reaches its limit, logs will be dropped from further processing if this value is true  
 
 Default:  true
 
+### group_key (string, optional) {#throttle-group_key}
+
+Used to group logs. Groups are rate limited independently  
+
+Default:  kubernetes.container_name
+
 ### group_reset_rate_s (int, optional) {#throttle-group_reset_rate_s}
 
 After a group has exceeded its bucket limit, logs are dropped until the rate per second falls below or equal to group_reset_rate_s.  
@@ -48,8 +48,10 @@ When a group reaches its limit and as long as it is not reset, a warning message
 Default:  10 seconds
 
 
- ## Example `Throttle` filter configurations
- ```yaml
+
+## Example `Throttle` filter configurations
+
+{{< highlight yaml >}}
 apiVersion: logging.banzaicloud.io/v1beta1
 kind: Flow
 metadata:
@@ -61,15 +63,17 @@ spec:
   selectors: {}
   localOutputRefs:
     - demo-output
- ```
+{{</ highlight >}}
 
- #### Fluentd Config Result
- ```yaml
+Fluentd config result:
+
+{{< highlight xml >}}
 <filter **>
   @type throttle
   @id test_throttle
   group_key $.kubernetes.container_name
 </filter>
- ```
+{{</ highlight >}}
+
 
 ---
diff --git a/content/docs/configuration/plugins/filters/useragent.md b/content/docs/configuration/plugins/filters/useragent.md
new file mode 100644
index 000000000..c1c25b9e9
--- /dev/null
+++ b/content/docs/configuration/plugins/filters/useragent.md
@@ -0,0 +1,74 @@
+---
+title: User Agent
+weight: 200
+generated_file: true
+---
+
+# Fluentd UserAgent filter
+## Overview
+ Fluentd Filter plugin to parse user-agent
+ More information at https://github.com/bungoume/fluent-plugin-ua-parser
+
+## Configuration
+## UserAgent
+
+### delete_key (bool, optional) {#useragent-delete_key}
+
+Delete input key
+
+Default: false
+
+### flatten (bool, optional) {#useragent-flatten}
+
+Join hashed data by '_'
+
+Default: false
+
+### key_name (string, optional) {#useragent-key_name}
+
+Target key name
+
+Default: user_agent
+
+### out_key (string, optional) {#useragent-out_key}
+
+Output prefix key name
+
+Default: ua
+
+
+
+## Example `UserAgent` filter configurations
+
+{{< highlight yaml >}}
+apiVersion: logging.banzaicloud.io/v1beta1
+kind: Flow
+metadata:
+  name: demo-flow
+spec:
+  filters:
+    - useragent:
+        key_name: my_agent
+        delete_key: true
+        out_key: ua_fields
+        flatten: true
+  selectors: {}
+  localOutputRefs:
+    - demo-output
+{{</ highlight >}}
+
+Fluentd config result:
+
+{{< highlight xml >}}
+<filter **>
+  @type ua_parser
+  @id test_useragent
+  key_name my_agent
+  delete_key true
+  out_key ua_fields
+  flatten true
+</filter>
+{{</ highlight >}}
+
+
+---
diff --git a/content/docs/configuration/plugins/outputs/aws_elasticsearch.md b/content/docs/configuration/plugins/outputs/aws_elasticsearch.md
index e52b21e98..42886c0df 100644
--- a/content/docs/configuration/plugins/outputs/aws_elasticsearch.md
+++ b/content/docs/configuration/plugins/outputs/aws_elasticsearch.md
@@ -6,7 +6,8 @@ generated_file: true
 
 # Amazon Elasticsearch output plugin for Fluentd
 ## Overview
-  More info at https://github.com/atomita/fluent-plugin-aws-elasticsearch-service
+
+For details, see https://github.com/atomita/fluent-plugin-aws-elasticsearch-service
 
 ## Example output configurations
 {{< highlight yaml >}}
@@ -25,98 +26,85 @@ spec:
         value: aws_secret
 {{</ highlight >}}
 
+
 ## Configuration
 ## Amazon Elasticsearch
 
 Send your logs to a Amazon Elasticsearch Service
 
-### flush_interval (string, optional) {#amazon-elasticsearch-flush_interval}
+###  (*ElasticsearchOutput, optional) {#amazon-elasticsearch-}
 
-flush_interval 
+ElasticSearch 
 
-Default: -
 
-### endpoint (*EndpointCredentials, optional) {#amazon-elasticsearch-endpoint}
+### buffer (*Buffer, optional) {#amazon-elasticsearch-buffer}
 
-AWS Endpoint Credentials 
+[Buffer](../buffer/) 
 
-Default: -
 
-### format (*Format, optional) {#amazon-elasticsearch-format}
+### endpoint (*EndpointCredentials, optional) {#amazon-elasticsearch-endpoint}
 
-[Format](../format/) 
+AWS Endpoint Credentials 
 
-Default: -
 
-### buffer (*Buffer, optional) {#amazon-elasticsearch-buffer}
+### flush_interval (string, optional) {#amazon-elasticsearch-flush_interval}
 
-[Buffer](../buffer/) 
+flush_interval 
 
-Default: -
 
-###  (*ElasticsearchOutput, optional) {#amazon-elasticsearch-}
+### format (*Format, optional) {#amazon-elasticsearch-format}
 
-ElasticSearch 
+[Format](../format/) 
 
-Default: -
 
 
 ## Endpoint Credentials
 
 endpoint
 
-### region (string, optional) {#endpoint-credentials-region}
-
-AWS region. It should be in form like us-east-1, us-west-2. Default nil, which means try to find from environment variable AWS_REGION. 
-
-Default: -
-
-### url (string, optional) {#endpoint-credentials-url}
+### access_key_id (*secret.Secret, optional) {#endpoint-credentials-access_key_id}
 
-AWS connection url. 
+AWS access key id. This parameter is required when your agent is not running on EC2 instance with an IAM Role. 
 
-Default: -
 
-### access_key_id (*secret.Secret, optional) {#endpoint-credentials-access_key_id}
+### assume_role_arn (*secret.Secret, optional) {#endpoint-credentials-assume_role_arn}
 
-AWS access key id. This parameter is required when your agent is not running on EC2 instance with an IAM Role. 
+Typically, you can use AssumeRole for cross-account access or federation. 
 
-Default: -
 
-### secret_access_key (*secret.Secret, optional) {#endpoint-credentials-secret_access_key}
+### assume_role_session_name (*secret.Secret, optional) {#endpoint-credentials-assume_role_session_name}
 
-AWS secret key. This parameter is required when your agent is not running on EC2 instance with an IAM Role. 
+AssumeRoleWithWebIdentity https://docs.aws.amazon.com/STS/latest/APIReference/API_AssumeRoleWithWebIdentity.html 
 
-Default: -
 
-### assume_role_arn (*secret.Secret, optional) {#endpoint-credentials-assume_role_arn}
+### assume_role_web_identity_token_file (*secret.Secret, optional) {#endpoint-credentials-assume_role_web_identity_token_file}
 
-Typically, you can use AssumeRole for cross-account access or federation. 
+AssumeRoleWithWebIdentity https://docs.aws.amazon.com/STS/latest/APIReference/API_AssumeRoleWithWebIdentity.html 
 
-Default: -
 
 ### ecs_container_credentials_relative_uri (*secret.Secret, optional) {#endpoint-credentials-ecs_container_credentials_relative_uri}
 
 Set with AWS_CONTAINER_CREDENTIALS_RELATIVE_URI environment variable value 
 
-Default: -
 
-### assume_role_session_name (*secret.Secret, optional) {#endpoint-credentials-assume_role_session_name}
+### region (string, optional) {#endpoint-credentials-region}
 
-AssumeRoleWithWebIdentity https://docs.aws.amazon.com/STS/latest/APIReference/API_AssumeRoleWithWebIdentity.html 
+AWS region. It should be in form like us-east-1, us-west-2. Default nil, which means try to find from environment variable AWS_REGION. 
 
-Default: -
 
-### assume_role_web_identity_token_file (*secret.Secret, optional) {#endpoint-credentials-assume_role_web_identity_token_file}
+### secret_access_key (*secret.Secret, optional) {#endpoint-credentials-secret_access_key}
 
-AssumeRoleWithWebIdentity https://docs.aws.amazon.com/STS/latest/APIReference/API_AssumeRoleWithWebIdentity.html 
+AWS secret key. This parameter is required when your agent is not running on EC2 instance with an IAM Role. 
 
-Default: -
 
 ### sts_credentials_region (*secret.Secret, optional) {#endpoint-credentials-sts_credentials_region}
 
 By default, the AWS Security Token Service (AWS STS) is available as a global service, and all AWS STS requests go to a single endpoint at https://sts.amazonaws.com. AWS recommends using Regional AWS STS endpoints instead of the global endpoint to reduce latency, build in redundancy, and increase session token validity. https://docs.aws.amazon.com/IAM/latest/UserGuide/id_credentials_temp_enable-regions.html 
 
-Default: -
+
+### url (string, optional) {#endpoint-credentials-url}
+
+AWS connection url. 
+
 
 
diff --git a/content/docs/configuration/plugins/outputs/azurestore.md b/content/docs/configuration/plugins/outputs/azurestore.md
index 32542ed30..37390f26a 100644
--- a/content/docs/configuration/plugins/outputs/azurestore.md
+++ b/content/docs/configuration/plugins/outputs/azurestore.md
@@ -12,41 +12,26 @@ More info at https://github.com/microsoft/fluent-plugin-azure-storage-append-blo
 ## Configuration
 ## Output Config
 
-### path (string, optional) {#output-config-path}
-
-Path prefix of the files on Azure 
-
-Default: -
-
-### azure_storage_account (*secret.Secret, required) {#output-config-azure_storage_account}
-
-Your azure storage account [Secret](../secret/) 
-
-Default: -
-
-### azure_storage_access_key (*secret.Secret, optional) {#output-config-azure_storage_access_key}
+### auto_create_container (bool, optional) {#output-config-auto_create_container}
 
-Your azure storage access key [Secret](../secret/) 
+Automatically create container if not exists 
 
-Default: -
+Default:  true
 
-### azure_storage_sas_token (*secret.Secret, optional) {#output-config-azure_storage_sas_token}
+### azure_cloud (string, optional) {#output-config-azure_cloud}
 
-Your azure storage sas token [Secret](../secret/) 
+Available in Logging operator version 4.5 and later. Azure Cloud to use, for example, AzurePublicCloud, AzureChinaCloud, AzureGermanCloud, AzureUSGovernmentCloud, AZURESTACKCLOUD (in uppercase) This field is supported only if the fluentd plugin honors it, for example, https://github.com/elsesiy/fluent-plugin-azure-storage-append-blob-lts 
 
-Default: -
 
 ### azure_container (string, required) {#output-config-azure_container}
 
 Your azure storage container 
 
-Default: -
 
 ### azure_imds_api_version (string, optional) {#output-config-azure_imds_api_version}
 
 Azure Instance Metadata Service API Version 
 
-Default: -
 
 ### azure_object_key_format (string, optional) {#output-config-azure_object_key_format}
 
@@ -54,11 +39,25 @@ Object key format
 
 Default:  %{path}%{time_slice}_%{index}.%{file_extension}
 
-### auto_create_container (bool, optional) {#output-config-auto_create_container}
+### azure_storage_access_key (*secret.Secret, optional) {#output-config-azure_storage_access_key}
 
-Automatically create container if not exists 
+Your azure storage access key [Secret](../secret/) 
+
+
+### azure_storage_account (*secret.Secret, required) {#output-config-azure_storage_account}
+
+Your azure storage account [Secret](../secret/) 
+
+
+### azure_storage_sas_token (*secret.Secret, optional) {#output-config-azure_storage_sas_token}
+
+Your azure storage sas token [Secret](../secret/) 
+
+
+### buffer (*Buffer, optional) {#output-config-buffer}
+
+[Buffer](../buffer/) 
 
-Default:  true
 
 ### format (string, optional) {#output-config-format}
 
@@ -66,16 +65,14 @@ Compat format type: out_file, json, ltsv (default: out_file)
 
 Default: json
 
-### buffer (*Buffer, optional) {#output-config-buffer}
+### path (string, optional) {#output-config-path}
 
-[Buffer](../buffer/) 
+Path prefix of the files on Azure 
 
-Default: -
 
 ### slow_flush_log_threshold (string, optional) {#output-config-slow_flush_log_threshold}
 
 The threshold for chunk flush performance check. Parameter type is float, not time, default: 20.0 (seconds) If chunk flush takes longer time than this threshold, fluentd logs warning message and increases metric fluentd_output_status_slow_flush_count. 
 
-Default: -
 
 
diff --git a/content/docs/configuration/plugins/outputs/buffer.md b/content/docs/configuration/plugins/outputs/buffer.md
index 7a7bed8fa..c05fe445a 100644
--- a/content/docs/configuration/plugins/outputs/buffer.md
+++ b/content/docs/configuration/plugins/outputs/buffer.md
@@ -6,29 +6,15 @@ generated_file: true
 
 ## Buffer
 
-### disabled (bool, optional) {#buffer-disabled}
-
-Disable buffer section (default: false) 
-
-Default: false,hidden
-
-### type (string, optional) {#buffer-type}
-
-Fluentd core bundles memory and file plugins. 3rd party plugins are also available when installed. 
-
-Default: -
-
-### tags (*string, optional) {#buffer-tags}
+### chunk_full_threshold (string, optional) {#buffer-chunk_full_threshold}
 
-When tag is specified as buffer chunk key, output plugin writes events into chunks separately per tags.  
+The percentage of chunk size threshold for flushing. output plugin will flush the chunk when actual size reaches chunk_limit_size * chunk_full_threshold (== 8MB * 0.95 in default) 
 
-Default:  tag,time
 
-### path (string, optional) {#buffer-path}
+### chunk_limit_records (int, optional) {#buffer-chunk_limit_records}
 
-The path where buffer chunks are stored. The '*' is replaced with random characters. It's highly recommended to leave this default.  
+The max number of events that each chunks can store in it 
 
-Default:  operator generated
 
 ### chunk_limit_size (string, optional) {#buffer-chunk_limit_size}
 
@@ -36,95 +22,82 @@ The max size of each chunks: events will be written into chunks until the size o
 
 Default: 8MB
 
-### chunk_limit_records (int, optional) {#buffer-chunk_limit_records}
-
-The max number of events that each chunks can store in it 
-
-Default: -
-
-### total_limit_size (string, optional) {#buffer-total_limit_size}
+### compress (string, optional) {#buffer-compress}
 
-The size limitation of this buffer plugin instance. Once the total size of stored buffer reached this threshold, all append operations will fail with error (and data will be lost) 
+If you set this option to gzip, you can get Fluentd to compress data records before writing to buffer chunks. 
 
-Default: -
 
-### queue_limit_length (int, optional) {#buffer-queue_limit_length}
+### delayed_commit_timeout (string, optional) {#buffer-delayed_commit_timeout}
 
-The queue length limitation of this buffer plugin instance 
+The timeout seconds until output plugin decides that async write operation fails 
 
-Default: -
 
-### chunk_full_threshold (string, optional) {#buffer-chunk_full_threshold}
+### disable_chunk_backup (bool, optional) {#buffer-disable_chunk_backup}
 
-The percentage of chunk size threshold for flushing. output plugin will flush the chunk when actual size reaches chunk_limit_size * chunk_full_threshold (== 8MB * 0.95 in default) 
+Instead of storing unrecoverable chunks in the backup directory, just discard them. This option is new in Fluentd v1.2.6. 
 
-Default: -
 
-### queued_chunks_limit_size (int, optional) {#buffer-queued_chunks_limit_size}
+### disabled (bool, optional) {#buffer-disabled}
 
-Limit the number of queued chunks. If you set smaller flush_interval, e.g. 1s, there are lots of small queued chunks in buffer. This is not good with file buffer because it consumes lots of fd resources when output destination has a problem. This parameter mitigates such situations. 
+Disable buffer section (default: false) 
 
-Default: -
+Default: false,hidden
 
-### compress (string, optional) {#buffer-compress}
+### flush_at_shutdown (bool, optional) {#buffer-flush_at_shutdown}
 
-If you set this option to gzip, you can get Fluentd to compress data records before writing to buffer chunks. 
+The value to specify to flush/write all buffer chunks at shutdown, or not 
 
-Default: -
 
-### flush_at_shutdown (bool, optional) {#buffer-flush_at_shutdown}
+### flush_interval (string, optional) {#buffer-flush_interval}
 
-The value to specify to flush/write all buffer chunks at shutdown, or not 
+Default: 60s 
 
-Default: -
 
 ### flush_mode (string, optional) {#buffer-flush_mode}
 
 Default: default (equals to lazy if time is specified as chunk key, interval otherwise) lazy: flush/write chunks once per timekey interval: flush/write chunks per specified time via flush_interval immediate: flush/write chunks immediately after events are appended into chunks 
 
-Default: -
 
-### flush_interval (string, optional) {#buffer-flush_interval}
+### flush_thread_burst_interval (string, optional) {#buffer-flush_thread_burst_interval}
 
-Default: 60s 
+The sleep interval seconds of threads between flushes when output plugin flushes waiting chunks next to next 
 
-Default: -
 
 ### flush_thread_count (int, optional) {#buffer-flush_thread_count}
 
 The number of threads of output plugins, which is used to write chunks in parallel 
 
-Default: -
 
 ### flush_thread_interval (string, optional) {#buffer-flush_thread_interval}
 
 The sleep interval seconds of threads to wait next flush trial (when no chunks are waiting) 
 
-Default: -
 
-### flush_thread_burst_interval (string, optional) {#buffer-flush_thread_burst_interval}
+### overflow_action (string, optional) {#buffer-overflow_action}
 
-The sleep interval seconds of threads between flushes when output plugin flushes waiting chunks next to next 
+How output plugin behaves when its buffer queue is full throw_exception: raise exception to show this error in log block: block processing of input plugin to emit events into that buffer drop_oldest_chunk: drop/purge oldest chunk to accept newly incoming chunk 
 
-Default: -
 
-### delayed_commit_timeout (string, optional) {#buffer-delayed_commit_timeout}
+### path (string, optional) {#buffer-path}
 
-The timeout seconds until output plugin decides that async write operation fails 
+The path where buffer chunks are stored. The '*' is replaced with random characters. It's highly recommended to leave this default.  
+
+Default:  operator generated
 
-Default: -
+### queue_limit_length (int, optional) {#buffer-queue_limit_length}
 
-### overflow_action (string, optional) {#buffer-overflow_action}
+The queue length limitation of this buffer plugin instance 
 
-How output plugin behaves when its buffer queue is full throw_exception: raise exception to show this error in log block: block processing of input plugin to emit events into that buffer drop_oldest_chunk: drop/purge oldest chunk to accept newly incoming chunk 
 
-Default: -
+### queued_chunks_limit_size (int, optional) {#buffer-queued_chunks_limit_size}
 
-### retry_timeout (string, optional) {#buffer-retry_timeout}
+Limit the number of queued chunks. If you set smaller flush_interval, e.g. 1s, there are lots of small queued chunks in buffer. This is not good with file buffer because it consumes lots of fd resources when output destination has a problem. This parameter mitigates such situations. 
 
-The maximum seconds to retry to flush while failing, until plugin discards buffer chunks 
 
-Default: -
+### retry_exponential_backoff_base (string, optional) {#buffer-retry_exponential_backoff_base}
+
+The base number of exponential backoff for retries 
+
 
 ### retry_forever (*bool, optional) {#buffer-retry_forever}
 
@@ -132,53 +105,46 @@ If true, plugin will ignore retry_timeout and retry_max_times options and retry
 
 Default: true
 
-### retry_max_times (int, optional) {#buffer-retry_max_times}
+### retry_max_interval (string, optional) {#buffer-retry_max_interval}
 
-The maximum number of times to retry to flush while failing 
+The maximum interval seconds for exponential backoff between retries while failing 
 
-Default: -
 
-### retry_secondary_threshold (string, optional) {#buffer-retry_secondary_threshold}
+### retry_max_times (int, optional) {#buffer-retry_max_times}
 
-The ratio of retry_timeout to switch to use secondary while failing (Maximum valid value is 1.0) 
+The maximum number of times to retry to flush while failing 
 
-Default: -
 
-### retry_type (string, optional) {#buffer-retry_type}
+### retry_randomize (bool, optional) {#buffer-retry_randomize}
 
-exponential_backoff: wait seconds will become large exponentially per failures periodic: output plugin will retry periodically with fixed intervals (configured via retry_wait) 
+If true, output plugin will retry after randomized interval not to do burst retries 
 
-Default: -
 
-### retry_wait (string, optional) {#buffer-retry_wait}
+### retry_secondary_threshold (string, optional) {#buffer-retry_secondary_threshold}
 
-Seconds to wait before next retry to flush, or constant factor of exponential backoff 
+The ratio of retry_timeout to switch to use secondary while failing (Maximum valid value is 1.0) 
 
-Default: -
 
-### retry_exponential_backoff_base (string, optional) {#buffer-retry_exponential_backoff_base}
+### retry_timeout (string, optional) {#buffer-retry_timeout}
 
-The base number of exponential backoff for retries 
+The maximum seconds to retry to flush while failing, until plugin discards buffer chunks 
 
-Default: -
 
-### retry_max_interval (string, optional) {#buffer-retry_max_interval}
+### retry_type (string, optional) {#buffer-retry_type}
 
-The maximum interval seconds for exponential backoff between retries while failing 
+exponential_backoff: wait seconds will become large exponentially per failures periodic: output plugin will retry periodically with fixed intervals (configured via retry_wait) 
 
-Default: -
 
-### retry_randomize (bool, optional) {#buffer-retry_randomize}
+### retry_wait (string, optional) {#buffer-retry_wait}
 
-If true, output plugin will retry after randomized interval not to do burst retries 
+Seconds to wait before next retry to flush, or constant factor of exponential backoff 
 
-Default: -
 
-### disable_chunk_backup (bool, optional) {#buffer-disable_chunk_backup}
+### tags (*string, optional) {#buffer-tags}
 
-Instead of storing unrecoverable chunks in the backup directory, just discard them. This option is new in Fluentd v1.2.6. 
+When tag is specified as buffer chunk key, output plugin writes events into chunks separately per tags.  
 
-Default: -
+Default:  tag,time
 
 ### timekey (string, required) {#buffer-timekey}
 
@@ -186,22 +152,30 @@ Output plugin will flush chunks per specified time (enabled when time is specifi
 
 Default: 10m
 
+### timekey_use_utc (bool, optional) {#buffer-timekey_use_utc}
+
+Output plugin decides to use UTC or not to format placeholders using timekey 
+
+
 ### timekey_wait (string, optional) {#buffer-timekey_wait}
 
 Output plugin writes chunks after timekey_wait seconds later after timekey expiration 
 
 Default: 1m
 
-### timekey_use_utc (bool, optional) {#buffer-timekey_use_utc}
+### timekey_zone (string, optional) {#buffer-timekey_zone}
 
-Output plugin decides to use UTC or not to format placeholders using timekey 
+The timezone (-0700 or Asia/Tokyo) string for formatting timekey placeholders 
 
-Default: -
 
-### timekey_zone (string, optional) {#buffer-timekey_zone}
+### total_limit_size (string, optional) {#buffer-total_limit_size}
 
-The timezone (-0700 or Asia/Tokyo) string for formatting timekey placeholders 
+The size limitation of this buffer plugin instance. Once the total size of stored buffer reached this threshold, all append operations will fail with error (and data will be lost) 
+
+
+### type (string, optional) {#buffer-type}
+
+Fluentd core bundles memory and file plugins. 3rd party plugins are also available when installed. 
 
-Default: -
 
 
diff --git a/content/docs/configuration/plugins/outputs/cloudwatch.md b/content/docs/configuration/plugins/outputs/cloudwatch.md
index 44879e06b..580d69cb7 100644
--- a/content/docs/configuration/plugins/outputs/cloudwatch.md
+++ b/content/docs/configuration/plugins/outputs/cloudwatch.md
@@ -6,32 +6,33 @@ generated_file: true
 
 # CloudWatch output plugin for Fluentd
 ## Overview
-This plugin has been designed to output logs or metrics to Amazon CloudWatch.
-More info at [https://github.com/fluent-plugins-nursery/fluent-plugin-cloudwatch-logs](https://github.com/fluent-plugins-nursery/fluent-plugin-cloudwatch-logs).
-
- ## Example output configurations
- ```yaml
- spec:
-  cloudwatch:
-    aws_key_id:
-      valueFrom:
-        secretKeyRef:
-          name: logging-s3
-          key: awsAccessKeyId
-    aws_sec_key:
-      valueFrom:
-        secretKeyRef:
-          name: logging-s3
-          key: awsSecretAccessKey
-    log_group_name: operator-log-group
-    log_stream_name: operator-log-stream
-    region: us-east-1
-    auto_create_stream true
-    buffer:
-      timekey: 30s
-      timekey_wait: 30s
-      timekey_use_utc: true
- ```
+
+This plugin outputs logs or metrics to Amazon CloudWatch. For details, see [https://github.com/fluent-plugins-nursery/fluent-plugin-cloudwatch-logs](https://github.com/fluent-plugins-nursery/fluent-plugin-cloudwatch-logs).
+
+## Example output configurations
+```yaml
+spec:
+cloudwatch:
+  aws_key_id:
+    valueFrom:
+      secretKeyRef:
+        name: logging-s3
+        key: awsAccessKeyId
+  aws_sec_key:
+    valueFrom:
+      secretKeyRef:
+        name: logging-s3
+        key: awsSecretAccessKey
+  log_group_name: operator-log-group
+  log_stream_name: operator-log-stream
+  region: us-east-1
+  auto_create_stream true
+  buffer:
+    timekey: 30s
+    timekey_wait: 30s
+    timekey_use_utc: true
+```
+
 
 ## Configuration
 ## Output Config
@@ -46,13 +47,6 @@ Default:  false
 
 AWS access key id [Secret](../secret/) 
 
-Default: -
-
-### aws_sec_key (*secret.Secret, optional) {#output-config-aws_sec_key}
-
-AWS secret key. [Secret](../secret/) 
-
-Default: -
 
 ### aws_instance_profile_credentials_retries (int, optional) {#output-config-aws_instance_profile_credentials_retries}
 
@@ -60,17 +54,15 @@ Instance Profile Credentials call retries
 
 Default:  nil
 
-### aws_use_sts (bool, optional) {#output-config-aws_use_sts}
+### aws_sec_key (*secret.Secret, optional) {#output-config-aws_sec_key}
 
-Enable AssumeRoleCredentials to authenticate, rather than the default credential hierarchy. See 'Cross-Account Operation' below for more detail. 
+AWS secret key. [Secret](../secret/) 
 
-Default: -
 
 ### aws_sts_role_arn (string, optional) {#output-config-aws_sts_role_arn}
 
 The role ARN to assume when using cross-account sts authentication 
 
-Default: -
 
 ### aws_sts_session_name (string, optional) {#output-config-aws_sts_session_name}
 
@@ -78,6 +70,16 @@ The session name to use with sts authentication
 
 Default:  'fluentd'
 
+### aws_use_sts (bool, optional) {#output-config-aws_use_sts}
+
+Enable AssumeRoleCredentials to authenticate, rather than the default credential hierarchy. See 'Cross-Account Operation' below for more detail. 
+
+
+### buffer (*Buffer, optional) {#output-config-buffer}
+
+[Buffer](../buffer/) 
+
+
 ### concurrency (int, optional) {#output-config-concurrency}
 
 Use to set the number of threads pushing data to CloudWatch.  
@@ -88,13 +90,16 @@ Default:  1
 
 Use this parameter to connect to the local API endpoint (for testing) 
 
-Default: -
+
+### format (*Format, optional) {#output-config-format}
+
+[Format](../format/) 
+
 
 ### http_proxy (string, optional) {#output-config-http_proxy}
 
 Use to set an optional HTTP proxy 
 
-Default: -
 
 ### include_time_key (bool, optional) {#output-config-include_time_key}
 
@@ -104,39 +109,33 @@ Default:  UTC
 
 ### json_handler (string, optional) {#output-config-json_handler}
 
-Name of the library to be used to handle JSON data. For now, supported libraries are json (default) and yajl 
+Name of the library to be used to handle JSON data. For now, supported libraries are json (default) and yaml 
 
-Default: -
 
 ### localtime (bool, optional) {#output-config-localtime}
 
 Use localtime timezone for include_time_key output (overrides UTC default) 
 
-Default: -
 
 ### log_group_aws_tags (string, optional) {#output-config-log_group_aws_tags}
 
 Set a hash with keys and values to tag the log group resource 
 
-Default: -
 
 ### log_group_aws_tags_key (string, optional) {#output-config-log_group_aws_tags_key}
 
 Specified field of records as AWS tags for the log group 
 
-Default: -
 
 ### log_group_name (string, optional) {#output-config-log_group_name}
 
 Name of log group to store logs 
 
-Default: -
 
 ### log_group_name_key (string, optional) {#output-config-log_group_name_key}
 
 Specified field of records as log group name 
 
-Default: -
 
 ### log_rejected_request (string, optional) {#output-config-log_rejected_request}
 
@@ -148,13 +147,11 @@ Default:  false
 
 Name of log stream to store logs 
 
-Default: -
 
 ### log_stream_name_key (string, optional) {#output-config-log_stream_name_key}
 
 Specified field of records as log stream name 
 
-Default: -
 
 ### max_events_per_batch (int, optional) {#output-config-max_events_per_batch}
 
@@ -166,102 +163,75 @@ Default:  10000
 
 Maximum length of the message 
 
-Default: -
 
 ### message_keys (string, optional) {#output-config-message_keys}
 
 Keys to send messages as events 
 
-Default: -
 
 ### put_log_events_disable_retry_limit (bool, optional) {#output-config-put_log_events_disable_retry_limit}
 
 If true, put_log_events_retry_limit will be ignored 
 
-Default: -
 
 ### put_log_events_retry_limit (int, optional) {#output-config-put_log_events_retry_limit}
 
 Maximum count of retry (if exceeding this, the events will be discarded) 
 
-Default: -
 
 ### put_log_events_retry_wait (string, optional) {#output-config-put_log_events_retry_wait}
 
 Time before retrying PutLogEvents (retry interval increases exponentially like put_log_events_retry_wait * (2 ^ retry_count)) 
 
-Default: -
 
 ### region (string, required) {#output-config-region}
 
 AWS Region 
 
-Default: -
 
 ### remove_log_group_aws_tags_key (string, optional) {#output-config-remove_log_group_aws_tags_key}
 
 Remove field specified by log_group_aws_tags_key 
 
-Default: -
 
 ### remove_log_group_name_key (string, optional) {#output-config-remove_log_group_name_key}
 
 Remove field specified by log_group_name_key 
 
-Default: -
 
 ### remove_log_stream_name_key (string, optional) {#output-config-remove_log_stream_name_key}
 
 Remove field specified by log_stream_name_key 
 
-Default: -
 
 ### remove_retention_in_days (string, optional) {#output-config-remove_retention_in_days}
 
 Remove field specified by retention_in_days 
 
-Default: -
 
 ### retention_in_days (string, optional) {#output-config-retention_in_days}
 
 Use to set the expiry time for log group when created with auto_create_stream. (default to no expiry) 
 
-Default: -
 
 ### retention_in_days_key (string, optional) {#output-config-retention_in_days_key}
 
 Use specified field of records as retention period 
 
-Default: -
+
+### slow_flush_log_threshold (string, optional) {#output-config-slow_flush_log_threshold}
+
+The threshold for chunk flush performance check. Parameter type is float, not time, default: 20.0 (seconds) If chunk flush takes longer time than this threshold, fluentd logs warning message and increases metric fluentd_output_status_slow_flush_count. 
+
 
 ### use_tag_as_group (bool, optional) {#output-config-use_tag_as_group}
 
 Use tag as a group name 
 
-Default: -
 
 ### use_tag_as_stream (bool, optional) {#output-config-use_tag_as_stream}
 
 Use tag as a stream name 
 
-Default: -
-
-### buffer (*Buffer, optional) {#output-config-buffer}
-
-[Buffer](../buffer/) 
-
-Default: -
-
-### slow_flush_log_threshold (string, optional) {#output-config-slow_flush_log_threshold}
-
-The threshold for chunk flush performance check. Parameter type is float, not time, default: 20.0 (seconds) If chunk flush takes longer time than this threshold, fluentd logs warning message and increases metric fluentd_output_status_slow_flush_count. 
-
-Default: -
-
-### format (*Format, optional) {#output-config-format}
-
-[Format](../format/) 
-
-Default: -
 
 
diff --git a/content/docs/configuration/plugins/outputs/datadog.md b/content/docs/configuration/plugins/outputs/datadog.md
index 252cf7309..033796903 100644
--- a/content/docs/configuration/plugins/outputs/datadog.md
+++ b/content/docs/configuration/plugins/outputs/datadog.md
@@ -6,20 +6,22 @@ generated_file: true
 
 # Datadog output plugin for Fluentd
 ## Overview
-It mainly contains a proper JSON formatter and a socket handler that streams logs directly to Datadog - so no need to use a log shipper if you don't wan't to.
-More info at [https://github.com/DataDog/fluent-plugin-datadog](https://github.com/DataDog/fluent-plugin-datadog).
+
+It mainly contains a proper JSON formatter and a socket handler that streams logs directly to Datadog - so no need to use a log shipper if you don't want to.
+For details, see [https://github.com/DataDog/fluent-plugin-datadog](https://github.com/DataDog/fluent-plugin-datadog).
 
 ## Example
 ```yaml
- spec:
+spec:
   datadog:
-	  api_key:
-	    value: '<YOUR_API_KEY>' # for referencing a secret see https://kube-logging.dev/docs/configuration/plugins/outputs/secret/
+    api_key:
+      value: '<YOUR_API_KEY>' # For referencing a secret, see https://kube-logging.dev/docs/configuration/plugins/outputs/secret/
     dd_source: '<INTEGRATION_NAME>'
     dd_tags: '<KEY1:VALUE1>,<KEY2:VALUE2>'
     dd_sourcecategory: '<YOUR_SOURCE_CATEGORY>'
 ```
 
+
 ## Configuration
 ## Output Config
 
@@ -29,53 +31,52 @@ This parameter is required in order to authenticate your fluent agent.  +docLink
 
 Default:  nil
 
-### use_json (bool, optional) {#output-config-use_json}
+### buffer (*Buffer, optional) {#output-config-buffer}
 
-Event format, if true, the event is sent in json format. Othwerwise, in plain text.   
+[Buffer](../buffer/) 
 
-Default:  true
 
-### include_tag_key (bool, optional) {#output-config-include_tag_key}
+### compression_level (string, optional) {#output-config-compression_level}
 
-Automatically include the Fluentd tag in the record.   
+Set the log compression level for HTTP (1 to 9, 9 being the best ratio)  
 
-Default:  false
+Default:  "6"
 
-### tag_key (string, optional) {#output-config-tag_key}
+### dd_hostname (string, optional) {#output-config-dd_hostname}
 
-Where to store the Fluentd tag.  
+Used by Datadog to identify the host submitting the logs.  
 
-Default:  "tag"
+Default:  "hostname -f"
 
-### timestamp_key (string, optional) {#output-config-timestamp_key}
+### dd_source (string, optional) {#output-config-dd_source}
 
-Name of the attribute which will contain timestamp of the log event. If nil, timestamp attribute is not added.  
+This tells Datadog what integration it is  
 
-Default:  "@timestamp"
+Default:  nil
 
-### use_ssl (bool, optional) {#output-config-use_ssl}
+### dd_sourcecategory (string, optional) {#output-config-dd_sourcecategory}
 
-If true, the agent initializes a secure connection to Datadog. In clear TCP otherwise.   
+Multiple value attribute. Can be used to refine the source attribute  
 
-Default:  true
+Default:  nil
 
-### no_ssl_validation (bool, optional) {#output-config-no_ssl_validation}
+### dd_tags (string, optional) {#output-config-dd_tags}
 
-Disable SSL validation (useful for proxy forwarding)   
+Custom tags with the following format "key1:value1, key2:value2"  
 
-Default:  false
+Default:  nil
 
-### ssl_port (string, optional) {#output-config-ssl_port}
+### host (string, optional) {#output-config-host}
 
-Port used to send logs over a SSL encrypted connection to Datadog. If use_http is disabled, use 10516 for the US region and 443 for the EU region.  
+Proxy endpoint when logs are not directly forwarded to Datadog	  
 
-Default:  "443"
+Default:  "http-intake.logs.datadoghq.com"
 
-### max_retries (string, optional) {#output-config-max_retries}
+### include_tag_key (bool, optional) {#output-config-include_tag_key}
 
-The number of retries before the output plugin stops. Set to -1 for unlimited retries  
+Automatically include the Fluentd tag in the record.   
 
-Default:  "-1"
+Default:  false
 
 ### max_backoff (string, optional) {#output-config-max_backoff}
 
@@ -83,76 +84,75 @@ The maximum time waited between each retry in seconds
 
 Default:  "30"
 
-### use_http (bool, optional) {#output-config-use_http}
+### max_retries (string, optional) {#output-config-max_retries}
 
-Enable HTTP forwarding. If you disable it, make sure to change the port to 10514 or ssl_port to 10516   
+The number of retries before the output plugin stops. Set to -1 for unlimited retries  
 
-Default:  true
+Default:  "-1"
 
-### use_compression (bool, optional) {#output-config-use_compression}
+### no_ssl_validation (bool, optional) {#output-config-no_ssl_validation}
 
-Enable log compression for HTTP   
+Disable SSL validation (useful for proxy forwarding)   
 
-Default:  true
+Default:  false
 
-### compression_level (string, optional) {#output-config-compression_level}
+### port (string, optional) {#output-config-port}
 
-Set the log compression level for HTTP (1 to 9, 9 being the best ratio)  
+Proxy port when logs are not directly forwarded to Datadog and ssl is not used  
 
-Default:  "6"
+Default:  "80"
 
-### dd_source (string, optional) {#output-config-dd_source}
+### service (string, optional) {#output-config-service}
 
-This tells Datadog what integration it is  
+Used by Datadog to correlate between logs, traces and metrics.  
 
 Default:  nil
 
-### dd_sourcecategory (string, optional) {#output-config-dd_sourcecategory}
+### slow_flush_log_threshold (string, optional) {#output-config-slow_flush_log_threshold}
 
-Multiple value attribute. Can be used to refine the source attribute  
+The threshold for chunk flush performance check. Parameter type is float, not time, default: 20.0 (seconds) If chunk flush takes longer time than this threshold, fluentd logs warning message and increases metric fluentd_output_status_slow_flush_count. 
 
-Default:  nil
 
-### dd_tags (string, optional) {#output-config-dd_tags}
+### ssl_port (string, optional) {#output-config-ssl_port}
 
-Custom tags with the following format "key1:value1, key2:value2"  
+Port used to send logs over a SSL encrypted connection to Datadog. If use_http is disabled, use 10516 for the US region and 443 for the EU region.  
 
-Default:  nil
+Default:  "443"
 
-### dd_hostname (string, optional) {#output-config-dd_hostname}
+### tag_key (string, optional) {#output-config-tag_key}
 
-Used by Datadog to identify the host submitting the logs.  
+Where to store the Fluentd tag.  
 
-Default:  "hostname -f"
+Default:  "tag"
 
-### service (string, optional) {#output-config-service}
+### timestamp_key (string, optional) {#output-config-timestamp_key}
 
-Used by Datadog to correlate between logs, traces and metrics.  
+Name of the attribute which will contain timestamp of the log event. If nil, timestamp attribute is not added.  
 
-Default:  nil
+Default:  "@timestamp"
 
-### port (string, optional) {#output-config-port}
+### use_compression (bool, optional) {#output-config-use_compression}
 
-Proxy port when logs are not directly forwarded to Datadog and ssl is not used  
+Enable log compression for HTTP   
 
-Default:  "80"
+Default:  true
 
-### host (string, optional) {#output-config-host}
+### use_http (bool, optional) {#output-config-use_http}
 
-Proxy endpoint when logs are not directly forwarded to Datadog	  
+Enable HTTP forwarding. If you disable it, make sure to change the port to 10514 or ssl_port to 10516   
 
-Default:  "http-intake.logs.datadoghq.com"
+Default:  true
 
-### buffer (*Buffer, optional) {#output-config-buffer}
+### use_json (bool, optional) {#output-config-use_json}
 
-[Buffer](../buffer/) 
+Event format, if true, the event is sent in json format. Othwerwise, in plain text.   
 
-Default: -
+Default:  true
 
-### slow_flush_log_threshold (string, optional) {#output-config-slow_flush_log_threshold}
+### use_ssl (bool, optional) {#output-config-use_ssl}
 
-The threshold for chunk flush performance check. Parameter type is float, not time, default: 20.0 (seconds) If chunk flush takes longer time than this threshold, fluentd logs warning message and increases metric fluentd_output_status_slow_flush_count. 
+If true, the agent initializes a secure connection to Datadog. In clear TCP otherwise.   
 
-Default: -
+Default:  true
 
 
diff --git a/content/docs/configuration/plugins/outputs/elasticsearch.md b/content/docs/configuration/plugins/outputs/elasticsearch.md
index 535d766b5..3ec9692ad 100644
--- a/content/docs/configuration/plugins/outputs/elasticsearch.md
+++ b/content/docs/configuration/plugins/outputs/elasticsearch.md
@@ -6,10 +6,12 @@ generated_file: true
 
 # Elasticsearch output plugin for Fluentd
 ## Overview
-More info at https://github.com/uken/fluent-plugin-elasticsearch
->Example Deployment: [Save all logs to ElasticSearch](../../../../quickstarts/es-nginx/)
+ For details, see [https://github.com/uken/fluent-plugin-elasticsearch](https://github.com/uken/fluent-plugin-elasticsearch).
+
+Example Deployment: [Save all logs to Elasticsearch](../../../../quickstarts/es-nginx/)
 
  ## Example output configurations
+
  ```yaml
  spec:
    elasticsearch:
@@ -24,216 +26,199 @@ More info at https://github.com/uken/fluent-plugin-elasticsearch
        timekey_use_utc: true
  ```
 
+
 ## Configuration
 ## Elasticsearch
 
 Send your logs to Elasticsearch
 
-### host (string, optional) {#elasticsearch-host}
+### api_key (*secret.Secret, optional) {#elasticsearch-api_key}
 
-You can specify Elasticsearch host by this parameter.  
+api_key parameter adds authentication header. 
 
-Default: localhost
 
-### port (int, optional) {#elasticsearch-port}
+### application_name (*string, optional) {#elasticsearch-application_name}
 
-You can specify Elasticsearch port by this parameter. 
+Specify the application name for the rollover index to be created. 
 
-Default:  9200
+Default:  default
 
-### hosts (string, optional) {#elasticsearch-hosts}
+### buffer (*Buffer, optional) {#elasticsearch-buffer}
 
-You can specify multiple Elasticsearch hosts with separator ",". If you specify hosts option, host and port options are ignored. 
+[Buffer](../buffer/) 
 
-Default: -
 
-### user (string, optional) {#elasticsearch-user}
+### bulk_message_request_threshold (string, optional) {#elasticsearch-bulk_message_request_threshold}
 
-User for HTTP Basic authentication. This plugin will escape required URL encoded characters within %{} placeholders. e.g. %{demo+} 
+Configure bulk_message request splitting threshold size. Default value is 20MB. (20 * 1024 * 1024) If you specify this size as negative number, bulk_message request splitting feature will be disabled.  
 
-Default: -
+Default:  20MB
 
-### password (*secret.Secret, optional) {#elasticsearch-password}
+### ca_file (*secret.Secret, optional) {#elasticsearch-ca_file}
 
-Password for HTTP Basic authentication. [Secret](../secret/) 
+CA certificate 
 
-Default: -
+### client_cert (*secret.Secret, optional) {#elasticsearch-client_cert}
 
-### path (string, optional) {#elasticsearch-path}
+Client certificate 
 
-Path for HTTP Basic authentication. 
+### client_key (*secret.Secret, optional) {#elasticsearch-client_key}
 
-Default: -
+Client certificate key 
 
-### scheme (string, optional) {#elasticsearch-scheme}
+### client_key_pass (*secret.Secret, optional) {#elasticsearch-client_key_pass}
 
-Connection scheme  
+Client key password 
 
-Default:  http
+### content_type (string, optional) {#elasticsearch-content_type}
 
-### ssl_verify (*bool, optional) {#elasticsearch-ssl_verify}
+With content_type application/x-ndjson, elasticsearch plugin adds application/x-ndjson as Content-Profile in payload.  
 
-Skip ssl verification (default: true) 
+Default:  application/json
 
-Default: true
+### custom_headers (string, optional) {#elasticsearch-custom_headers}
 
-### ssl_version (string, optional) {#elasticsearch-ssl_version}
+This parameter adds additional headers to request. Example: {"token":"secret"}  
 
-If you want to configure SSL/TLS version, you can specify ssl_version parameter. [SSLv23, TLSv1, TLSv1_1, TLSv1_2] 
+Default:  {}
 
-Default: -
+### customize_template (string, optional) {#elasticsearch-customize_template}
 
-### ssl_max_version (string, optional) {#elasticsearch-ssl_max_version}
+Specify the string and its value to be replaced in form of hash. Can contain multiple key value pair that would be replaced in the specified template_file. This setting only creates template and to add rollover index please check the rollover_index configuration. 
 
-Specify min/max SSL/TLS version 
 
-Default: -
+### data_stream_enable (*bool, optional) {#elasticsearch-data_stream_enable}
 
-### ssl_min_version (string, optional) {#elasticsearch-ssl_min_version}
+Use @type elasticsearch_data_stream 
 
-Default: -
 
-### ca_file (*secret.Secret, optional) {#elasticsearch-ca_file}
+### data_stream_ilm_name (string, optional) {#elasticsearch-data_stream_ilm_name}
 
-CA certificate 
+Specify an existing ILM policy to be applied to the data stream. If not present, either the specified template's or a new ILM default policy is applied.  Further details here https://github.com/uken/fluent-plugin-elasticsearch#configuration---elasticsearch-output-data-stream 
 
-Default: -
+Default:  data_stream_name
 
-### client_cert (*secret.Secret, optional) {#elasticsearch-client_cert}
+### data_stream_ilm_policy (string, optional) {#elasticsearch-data_stream_ilm_policy}
 
-Client certificate 
+Specify data stream ILM policy contents as Hash. 
 
-Default: -
 
-### client_key (*secret.Secret, optional) {#elasticsearch-client_key}
+### data_stream_ilm_policy_overwrite (bool, optional) {#elasticsearch-data_stream_ilm_policy_overwrite}
 
-Client certificate key 
+Specify whether overwriting data stream ilm policy or not. 
 
-Default: -
 
-### client_key_pass (*secret.Secret, optional) {#elasticsearch-client_key_pass}
+### data_stream_name (string, optional) {#elasticsearch-data_stream_name}
 
-Client key password 
+You can specify Elasticsearch data stream name by this parameter. This parameter is mandatory for elasticsearch_data_stream. There are some limitations about naming rule. For more details https://www.elastic.co/guide/en/elasticsearch/reference/master/indices-create-data-stream.html#indices-create-data-stream-api-path-params 
 
-Default: -
 
-### logstash_format (bool, optional) {#elasticsearch-logstash_format}
+### data_stream_template_name (string, optional) {#elasticsearch-data_stream_template_name}
 
-Enable Logstash log format. 
+Specify an existing index template for the data stream. If not present, a new template is created and named after the data stream.  Further details here https://github.com/uken/fluent-plugin-elasticsearch#configuration---elasticsearch-output-data-stream 
 
-Default:  false
+Default:  data_stream_name
 
-### include_timestamp (bool, optional) {#elasticsearch-include_timestamp}
+### default_elasticsearch_version (string, optional) {#elasticsearch-default_elasticsearch_version}
 
-Adds a @timestamp field to the log, following all settings logstash_format does, except without the restrictions on index_name. This allows one to log to an alias in Elasticsearch and utilize the rollover API. 
+This parameter changes that ES plugin assumes default Elasticsearch version. 
 
-Default:  false
+Default:  5
 
-### logstash_prefix (string, optional) {#elasticsearch-logstash_prefix}
+### deflector_alias (string, optional) {#elasticsearch-deflector_alias}
 
-Set the Logstash prefix. 
+Specify the deflector alias which would be assigned to the rollover index created. This is useful in case of using the Elasticsearch rollover API 
 
-Default:  logstash
 
-### logstash_prefix_separator (string, optional) {#elasticsearch-logstash_prefix_separator}
+### enable_ilm (bool, optional) {#elasticsearch-enable_ilm}
 
-Set the Logstash prefix separator. 
+Enable Index Lifecycle Management (ILM). 
 
-Default:  -
 
-### logstash_dateformat (string, optional) {#elasticsearch-logstash_dateformat}
+### exception_backup (*bool, optional) {#elasticsearch-exception_backup}
 
-Set the Logstash date format. 
+Indicates whether to backup chunk when ignore exception occurs. (default: true) 
 
-Default:  %Y.%m.%d
+Default: true
 
-### index_name (string, optional) {#elasticsearch-index_name}
+### fail_on_detecting_es_version_retry_exceed (*bool, optional) {#elasticsearch-fail_on_detecting_es_version_retry_exceed}
 
-The index name to write events to  
+fail_on_detecting_es_version_retry_exceed (default: true) 
 
-Default:  fluentd
+Default: true
 
-### type_name (string, optional) {#elasticsearch-type_name}
+### fail_on_putting_template_retry_exceed (*bool, optional) {#elasticsearch-fail_on_putting_template_retry_exceed}
 
-Set the index type for elasticsearch. This is the fallback if `target_type_key` is missing.  
+Indicates whether to fail when max_retry_putting_template is exceeded. If you have multiple output plugin, you could use this property to do not fail on fluentd statup.(default: true) 
 
-Default:  fluentd
+Default: true
 
-### pipeline (string, optional) {#elasticsearch-pipeline}
+### flatten_hashes (bool, optional) {#elasticsearch-flatten_hashes}
 
-This param is to set a pipeline id of your elasticsearch to be added into the request, you can configure ingest node. 
+Elasticsearch will complain if you send object and concrete values to the same field. For example, you might have logs that look this, from different places: {"people" => 100} {"people" => {"some" => "thing"}} The second log line will be rejected by the Elasticsearch parser because objects and concrete values can't live in the same field. To combat this, you can enable hash flattening. 
 
-Default: -
 
-### time_key_format (string, optional) {#elasticsearch-time_key_format}
+### flatten_hashes_separator (string, optional) {#elasticsearch-flatten_hashes_separator}
 
-The format of the time stamp field (@timestamp or what you specify with time_key). This parameter only has an effect when logstash_format is true as it only affects the name of the index we write to. 
+Flatten separator 
 
-Default: -
 
-### time_precision (string, optional) {#elasticsearch-time_precision}
+### host (string, optional) {#elasticsearch-host}
 
-Should the record not include a time_key, define the degree of sub-second time precision to preserve from the time portion of the routed event. 
+You can specify the Elasticsearch host using this parameter.
 
-Default: -
+Default: localhost
 
-### time_key (string, optional) {#elasticsearch-time_key}
+### hosts (string, optional) {#elasticsearch-hosts}
 
-By default, when inserting records in Logstash format, @timestamp is dynamically created with the time at log ingestion. If you'd like to use a custom time, include an @timestamp with your record. 
+You can specify multiple Elasticsearch hosts with separator ",". If you specify the `hosts` option, the `host` and `port` options are ignored. 
 
-Default: -
 
-### utc_index (*bool, optional) {#elasticsearch-utc_index}
+### http_backend (string, optional) {#elasticsearch-http_backend}
 
-By default, the records inserted into index logstash-YYMMDD with UTC (Coordinated Universal Time). This option allows to use local time if you describe utc_index to false.(default: true) 
+With http_backend typhoeus, elasticsearch plugin uses typhoeus faraday http backend. Typhoeus can handle HTTP keepalive.  
 
-Default: true
+Default:  excon
 
-### suppress_type_name (*bool, optional) {#elasticsearch-suppress_type_name}
+### id_key (string, optional) {#elasticsearch-id_key}
 
-Suppress type name to avoid warnings in Elasticsearch 7.x 
+https://github.com/uken/fluent-plugin-elasticsearch#id_key 
 
-Default: -
 
-### target_index_key (string, optional) {#elasticsearch-target_index_key}
+### ignore_exceptions (string, optional) {#elasticsearch-ignore_exceptions}
 
-Tell this plugin to find the index name to write to in the record under this key in preference to other mechanisms. Key can be specified as path to nested record using dot ('.') as a separator. https://github.com/uken/fluent-plugin-elasticsearch#target_index_key 
+A list of exception that will be ignored - when the exception occurs the chunk will be discarded and the buffer retry mechanism won't be called. It is possible also to specify classes at higher level in the hierarchy. For example `ignore_exceptions ["Elasticsearch::Transport::Transport::ServerError"]` will match all subclasses of ServerError - Elasticsearch::Transport::Transport::Errors::BadRequest, Elasticsearch::Transport::Transport::Errors::ServiceUnavailable, etc. 
 
-Default: -
 
-### target_type_key (string, optional) {#elasticsearch-target_type_key}
+### ilm_policy (string, optional) {#elasticsearch-ilm_policy}
 
-Similar to target_index_key config, find the type name to write to in the record under this key (or nested record). If key not found in record - fallback to type_name. 
+Specify ILM policy contents as Hash. 
 
-Default:  fluentd
 
-### template_name (string, optional) {#elasticsearch-template_name}
+### ilm_policy_id (string, optional) {#elasticsearch-ilm_policy_id}
 
-The name of the template to define. If a template by the name given is already present, it will be left unchanged, unless template_overwrite is set, in which case the template will be updated. 
+Specify ILM policy id. 
 
-Default: -
 
-### template_file (*secret.Secret, optional) {#elasticsearch-template_file}
+### ilm_policy_overwrite (bool, optional) {#elasticsearch-ilm_policy_overwrite}
 
-The path to the file containing the template to install. [Secret](../secret/) 
+Specify whether overwriting ilm policy or not. 
 
-Default: -
 
-### templates (string, optional) {#elasticsearch-templates}
+### include_index_in_url (bool, optional) {#elasticsearch-include_index_in_url}
 
-Specify index templates in form of hash. Can contain multiple templates. 
+With this option set to true, Fluentd manifests the index name in the request URL (rather than in the request body). You can use this option to enforce an URL-based access control. 
 
-Default: -
 
-### customize_template (string, optional) {#elasticsearch-customize_template}
+### include_tag_key (bool, optional) {#elasticsearch-include_tag_key}
 
-Specify the string and its value to be replaced in form of hash. Can contain multiple key value pair that would be replaced in the specified template_file. This setting only creates template and to add rollover index please check the rollover_index configuration. 
+This will add the Fluentd tag in the JSON record. 
 
-Default: -
+Default:  false
 
-### rollover_index (bool, optional) {#elasticsearch-rollover_index}
+### include_timestamp (bool, optional) {#elasticsearch-include_timestamp}
 
-Specify this as true when an index with rollover capability needs to be created. https://github.com/uken/fluent-plugin-elasticsearch#rollover_index 
+Adds a @timestamp field to the log, following all settings logstash_format does, except without the restrictions on index_name. This allows one to log to an alias in Elasticsearch and utilize the rollover API. 
 
 Default:  false
 
@@ -243,11 +228,11 @@ Specify this to override the index date pattern for creating a rollover index.
 
 Default:  now/d
 
-### deflector_alias (string, optional) {#elasticsearch-deflector_alias}
+### index_name (string, optional) {#elasticsearch-index_name}
 
-Specify the deflector alias which would be assigned to the rollover index created. This is useful in case of using the Elasticsearch rollover API 
+The index name to write events to  
 
-Default: -
+Default: fluentd
 
 ### index_prefix (string, optional) {#elasticsearch-index_prefix}
 
@@ -255,327 +240,293 @@ Specify the index prefix for the rollover index to be created.
 
 Default:  logstash
 
-### application_name (*string, optional) {#elasticsearch-application_name}
+### log_es_400_reason (bool, optional) {#elasticsearch-log_es_400_reason}
 
-Specify the application name for the rollover index to be created. 
+By default, the error logger won't record the reason for a 400 error from the Elasticsearch API unless you set log_level to debug. However, this results in a lot of log spam, which isn't desirable if all you want is the 400 error reasons. You can set this true to capture the 400 error reasons without all the other debug logs.  
 
-Default:  default
+Default:  false
 
-### template_overwrite (bool, optional) {#elasticsearch-template_overwrite}
+### logstash_dateformat (string, optional) {#elasticsearch-logstash_dateformat}
 
-Always update the template, even if it already exists. 
+Set the Logstash date format. 
 
-Default:  false
+Default:  %Y.%m.%d
 
-### max_retry_putting_template (string, optional) {#elasticsearch-max_retry_putting_template}
+### logstash_format (bool, optional) {#elasticsearch-logstash_format}
 
-You can specify times of retry putting template. 
+Enable Logstash log format. 
 
-Default:  10
+Default:  false
 
-### fail_on_putting_template_retry_exceed (*bool, optional) {#elasticsearch-fail_on_putting_template_retry_exceed}
+### logstash_prefix (string, optional) {#elasticsearch-logstash_prefix}
 
-Indicates whether to fail when max_retry_putting_template is exceeded. If you have multiple output plugin, you could use this property to do not fail on fluentd statup.(default: true) 
+Set the Logstash prefix. 
 
-Default: true
+Default:  logstash
 
-### fail_on_detecting_es_version_retry_exceed (*bool, optional) {#elasticsearch-fail_on_detecting_es_version_retry_exceed}
+### logstash_prefix_separator (string, optional) {#elasticsearch-logstash_prefix_separator}
 
-fail_on_detecting_es_version_retry_exceed (default: true) 
+Set the Logstash prefix separator. 
 
-Default: true
+Default:  -
 
 ### max_retry_get_es_version (string, optional) {#elasticsearch-max_retry_get_es_version}
 
-You can specify times of retry obtaining Elasticsearch version. 
+You can specify the number of times to retry fetching the Elasticsearch version.(default: 15)
 
 Default:  15
 
-### request_timeout (string, optional) {#elasticsearch-request_timeout}
+### max_retry_putting_template (string, optional) {#elasticsearch-max_retry_putting_template}
 
-You can specify HTTP request timeout. 
+You can specify times of retry putting template. 
 
-Default:  5s
+Default:  10
 
-### reload_connections (*bool, optional) {#elasticsearch-reload_connections}
+### password (*secret.Secret, optional) {#elasticsearch-password}
 
-You can tune how the elasticsearch-transport host reloading feature works.(default: true) 
+Password for HTTP Basic authentication. [Secret](../secret/) 
 
-Default: true
 
-### reload_on_failure (bool, optional) {#elasticsearch-reload_on_failure}
+### path (string, optional) {#elasticsearch-path}
 
-Indicates that the elasticsearch-transport will try to reload the nodes addresses if there is a failure while making the request, this can be useful to quickly remove a dead node from the list of addresses. 
+Path for HTTP Basic authentication. 
 
-Default:  false
 
-### reload_after (string, optional) {#elasticsearch-reload_after}
+### pipeline (string, optional) {#elasticsearch-pipeline}
 
-When reload_connections true, this is the integer number of operations after which the plugin will reload the connections. The default value is 10000. 
+This param is to set a pipeline id of your elasticsearch to be added into the request, you can configure ingest node. 
 
-Default: -
 
-### resurrect_after (string, optional) {#elasticsearch-resurrect_after}
+### port (int, optional) {#elasticsearch-port}
 
-You can set in the elasticsearch-transport how often dead connections from the elasticsearch-transport's pool will be resurrected. 
+You can specify the Elasticsearch port using this parameter.
 
-Default:  60s
+Default:  9200
 
-### include_tag_key (bool, optional) {#elasticsearch-include_tag_key}
+### prefer_oj_serializer (bool, optional) {#elasticsearch-prefer_oj_serializer}
 
-This will add the Fluentd tag in the JSON record. 
+With default behavior, Elasticsearch client uses Yajl as JSON encoder/decoder. Oj is the alternative high performance JSON encoder/decoder. When this parameter sets as true, Elasticsearch client uses Oj as JSON encoder/decoder.  
 
 Default:  false
 
-### tag_key (string, optional) {#elasticsearch-tag_key}
+### reconnect_on_error (bool, optional) {#elasticsearch-reconnect_on_error}
 
-This will add the Fluentd tag in the JSON record. 
+Indicates that the plugin should reset connection on any error (reconnect on next send). By default it will reconnect only on "host unreachable exceptions". We recommended to set this true in the presence of elasticsearch shield. 
 
-Default:  tag
+Default:  false
 
-### id_key (string, optional) {#elasticsearch-id_key}
+### reload_after (string, optional) {#elasticsearch-reload_after}
 
-https://github.com/uken/fluent-plugin-elasticsearch#id_key 
+When `reload_connections` is true, this is the integer number of operations after which the plugin will reload the connections. The default value is 10000. 
 
-Default: -
 
-### routing_key (string, optional) {#elasticsearch-routing_key}
+### reload_connections (*bool, optional) {#elasticsearch-reload_connections}
 
-Similar to parent_key config, will add _routing into elasticsearch command if routing_key is set and the field does exist in input event. 
+You can tune how the elasticsearch-transport host reloading feature works.(default: true) 
 
-Default: -
+Default: true
+
+### reload_on_failure (bool, optional) {#elasticsearch-reload_on_failure}
+
+Indicates that the elasticsearch-transport will try to reload the nodes addresses if there is a failure while making the request. This can be useful to quickly remove a dead node from the list of addresses.
+
+Default:  false
 
 ### remove_keys (string, optional) {#elasticsearch-remove_keys}
 
 https://github.com/uken/fluent-plugin-elasticsearch#remove_keys 
 
-Default: -
 
 ### remove_keys_on_update (string, optional) {#elasticsearch-remove_keys_on_update}
 
 Remove keys on update will not update the configured keys in elasticsearch when a record is being updated. This setting only has any effect if the write operation is update or upsert. 
 
-Default: -
 
 ### remove_keys_on_update_key (string, optional) {#elasticsearch-remove_keys_on_update_key}
 
 This setting allows remove_keys_on_update to be configured with a key in each record, in much the same way as target_index_key works. 
 
-Default: -
 
-### retry_tag (string, optional) {#elasticsearch-retry_tag}
+### request_timeout (string, optional) {#elasticsearch-request_timeout}
 
-This setting allows custom routing of messages in response to bulk request failures. The default behavior is to emit failed records using the same tag that was provided. 
+You can specify HTTP request timeout. 
 
-Default: -
+Default:  5s
 
-### write_operation (string, optional) {#elasticsearch-write_operation}
+### resurrect_after (string, optional) {#elasticsearch-resurrect_after}
 
-The write_operation can be any of: (index,create,update,upsert) 
+You can set in the elasticsearch-transport how often dead connections from the elasticsearch-transport's pool will be resurrected. 
 
-Default:  index
+Default:  60s
 
-### reconnect_on_error (bool, optional) {#elasticsearch-reconnect_on_error}
+### retry_tag (string, optional) {#elasticsearch-retry_tag}
 
-Indicates that the plugin should reset connection on any error (reconnect on next send). By default it will reconnect only on "host unreachable exceptions". We recommended to set this true in the presence of elasticsearch shield. 
+This setting allows custom routing of messages in response to bulk request failures. The default behavior is to emit failed records using the same tag that was provided. 
 
-Default:  false
 
-### with_transporter_log (bool, optional) {#elasticsearch-with_transporter_log}
+### rollover_index (bool, optional) {#elasticsearch-rollover_index}
 
-This is debugging purpose option to enable to obtain transporter layer log.  
+Specify this as true when an index with rollover capability needs to be created. https://github.com/uken/fluent-plugin-elasticsearch#rollover_index 
 
 Default:  false
 
-### content_type (string, optional) {#elasticsearch-content_type}
-
-With content_type application/x-ndjson, elasticsearch plugin adds application/x-ndjson as Content-Profile in payload.  
-
-Default:  application/json
-
-### include_index_in_url (bool, optional) {#elasticsearch-include_index_in_url}
-
-With this option set to true, Fluentd manifests the index name in the request URL (rather than in the request body). You can use this option to enforce an URL-based access control. 
-
-Default: -
-
-### time_parse_error_tag (string, optional) {#elasticsearch-time_parse_error_tag}
+### routing_key (string, optional) {#elasticsearch-routing_key}
 
-With logstash_format true, elasticsearch plugin parses timestamp field for generating index name. If the record has invalid timestamp value, this plugin emits an error event to @ERROR label with time_parse_error_tag configured tag. 
+Similar to parent_key config, will add _routing into elasticsearch command if routing_key is set and the field does exist in input event. 
 
-Default: -
 
-### http_backend (string, optional) {#elasticsearch-http_backend}
-
-With http_backend typhoeus, elasticsearch plugin uses typhoeus faraday http backend. Typhoeus can handle HTTP keepalive.  
+### scheme (string, optional) {#elasticsearch-scheme}
 
-Default:  excon
+Connection scheme  
 
-### prefer_oj_serializer (bool, optional) {#elasticsearch-prefer_oj_serializer}
+Default:  http
 
-With default behavior, Elasticsearch client uses Yajl as JSON encoder/decoder. Oj is the alternative high performance JSON encoder/decoder. When this parameter sets as true, Elasticsearch client uses Oj as JSON encoder/decoder.  
+### slow_flush_log_threshold (string, optional) {#elasticsearch-slow_flush_log_threshold}
 
-Default:  false
+The threshold for chunk flush performance check. Parameter type is float, not time, default: 20.0 (seconds) If chunk flush takes longer time than this threshold, fluentd logs warning message and increases metric fluentd_output_status_slow_flush_count. 
 
-### flatten_hashes (bool, optional) {#elasticsearch-flatten_hashes}
 
-Elasticsearch will complain if you send object and concrete values to the same field. For example, you might have logs that look this, from different places: {"people" => 100} {"people" => {"some" => "thing"}} The second log line will be rejected by the Elasticsearch parser because objects and concrete values can't live in the same field. To combat this, you can enable hash flattening. 
+### sniffer_class_name (string, optional) {#elasticsearch-sniffer_class_name}
 
-Default: -
+The default Sniffer used by the Elasticsearch::Transport class works well when Fluentd has a direct connection to all of the Elasticsearch servers and can make effective use of the _nodes API. This doesn't work well when Fluentd must connect through a load balancer or proxy. The parameter sniffer_class_name gives you the ability to provide your own Sniffer class to implement whatever connection reload logic you require. In addition, there is a new Fluent::Plugin::ElasticsearchSimpleSniffer class which reuses the hosts given in the configuration, which is typically the hostname of the load balancer or proxy. https://github.com/uken/fluent-plugin-elasticsearch#sniffer-class-name 
 
-### flatten_hashes_separator (string, optional) {#elasticsearch-flatten_hashes_separator}
 
-Flatten separator 
+### ssl_max_version (string, optional) {#elasticsearch-ssl_max_version}
 
-Default: -
+Specify min/max SSL/TLS version 
 
-### validate_client_version (bool, optional) {#elasticsearch-validate_client_version}
 
-When you use mismatched Elasticsearch server and client libraries, fluent-plugin-elasticsearch cannot send data into Elasticsearch.  
+### ssl_min_version (string, optional) {#elasticsearch-ssl_min_version}
 
-Default:  false
 
-### unrecoverable_error_types (string, optional) {#elasticsearch-unrecoverable_error_types}
+### ssl_verify (*bool, optional) {#elasticsearch-ssl_verify}
 
-Default unrecoverable_error_types parameter is set up strictly. Because es_rejected_execution_exception is caused by exceeding Elasticsearch's thread pool capacity. Advanced users can increase its capacity, but normal users should follow default behavior. If you want to increase it and forcibly retrying bulk request, please consider to change unrecoverable_error_types parameter from default value. Change default value of thread_pool.bulk.queue_size in elasticsearch.yml) 
+Skip ssl verification (default: true) 
 
-Default: -
+Default: true
 
-### verify_es_version_at_startup (*bool, optional) {#elasticsearch-verify_es_version_at_startup}
+### ssl_version (string, optional) {#elasticsearch-ssl_version}
 
-Because Elasticsearch plugin should change behavior each of Elasticsearch major versions. For example, Elasticsearch 6 starts to prohibit multiple type_names in one index, and Elasticsearch 7 will handle only _doc type_name in index. If you want to disable to verify Elasticsearch version at start up, set it as false. When using the following configuration, ES plugin intends to communicate into Elasticsearch 6. (default: true) 
+If you want to configure SSL/TLS version, you can specify ssl_version parameter. [SSLv23, TLSv1, TLSv1_1, TLSv1_2] 
 
-Default: true
 
-### default_elasticsearch_version (string, optional) {#elasticsearch-default_elasticsearch_version}
+### suppress_doc_wrap (bool, optional) {#elasticsearch-suppress_doc_wrap}
 
-This parameter changes that ES plugin assumes default Elasticsearch version. 
+By default, record body is wrapped by 'doc'. This behavior can not handle update script requests. You can set this to suppress doc wrapping and allow record body to be untouched.  
 
-Default:  5
+Default:  false
 
-### custom_headers (string, optional) {#elasticsearch-custom_headers}
+### suppress_type_name (*bool, optional) {#elasticsearch-suppress_type_name}
 
-This parameter adds additional headers to request. Example: {"token":"secret"}  
+Suppress type name to avoid warnings in Elasticsearch 7.x 
 
-Default:  {}
 
-### api_key (*secret.Secret, optional) {#elasticsearch-api_key}
+### tag_key (string, optional) {#elasticsearch-tag_key}
 
-api_key parameter adds authentication header. 
+This will add the Fluentd tag in the JSON record. 
 
-Default: -
+Default:  tag
 
-### log_es_400_reason (bool, optional) {#elasticsearch-log_es_400_reason}
+### target_index_key (string, optional) {#elasticsearch-target_index_key}
 
-By default, the error logger won't record the reason for a 400 error from the Elasticsearch API unless you set log_level to debug. However, this results in a lot of log spam, which isn't desirable if all you want is the 400 error reasons. You can set this true to capture the 400 error reasons without all the other debug logs.  
+Tell this plugin to find the index name to write to in the record under this key in preference to other mechanisms. Key can be specified as path to nested record using dot ('.') as a separator. https://github.com/uken/fluent-plugin-elasticsearch#target_index_key 
 
-Default:  false
 
-### suppress_doc_wrap (bool, optional) {#elasticsearch-suppress_doc_wrap}
+### target_type_key (string, optional) {#elasticsearch-target_type_key}
 
-By default, record body is wrapped by 'doc'. This behavior can not handle update script requests. You can set this to suppress doc wrapping and allow record body to be untouched.  
+Similar to target_index_key config, find the type name to write to in the record under this key (or nested record). If key not found in record - fallback to type_name. 
 
-Default:  false
+Default:  fluentd
 
-### ignore_exceptions (string, optional) {#elasticsearch-ignore_exceptions}
+### template_file (*secret.Secret, optional) {#elasticsearch-template_file}
 
-A list of exception that will be ignored - when the exception occurs the chunk will be discarded and the buffer retry mechanism won't be called. It is possible also to specify classes at higher level in the hierarchy. For example `ignore_exceptions ["Elasticsearch::Transport::Transport::ServerError"]` will match all subclasses of ServerError - Elasticsearch::Transport::Transport::Errors::BadRequest, Elasticsearch::Transport::Transport::Errors::ServiceUnavailable, etc. 
+The path to the file containing the template to install. [Secret](../secret/) 
 
-Default: -
 
-### exception_backup (*bool, optional) {#elasticsearch-exception_backup}
+### template_name (string, optional) {#elasticsearch-template_name}
 
-Indicates whether to backup chunk when ignore exception occurs. (default: true) 
+The name of the template to define. If a template by the name given is already present, it will be left unchanged, unless template_overwrite is set, in which case the template will be updated. 
 
-Default: true
 
-### bulk_message_request_threshold (string, optional) {#elasticsearch-bulk_message_request_threshold}
+### template_overwrite (bool, optional) {#elasticsearch-template_overwrite}
 
-Configure bulk_message request splitting threshold size. Default value is 20MB. (20 * 1024 * 1024) If you specify this size as negative number, bulk_message request splitting feature will be disabled.  
+Always update the template, even if it already exists. 
 
-Default:  20MB
+Default:  false
 
-### sniffer_class_name (string, optional) {#elasticsearch-sniffer_class_name}
+### templates (string, optional) {#elasticsearch-templates}
 
-The default Sniffer used by the Elasticsearch::Transport class works well when Fluentd has a direct connection to all of the Elasticsearch servers and can make effective use of the _nodes API. This doesn't work well when Fluentd must connect through a load balancer or proxy. The parameter sniffer_class_name gives you the ability to provide your own Sniffer class to implement whatever connection reload logic you require. In addition, there is a new Fluent::Plugin::ElasticsearchSimpleSniffer class which reuses the hosts given in the configuration, which is typically the hostname of the load balancer or proxy. https://github.com/uken/fluent-plugin-elasticsearch#sniffer-class-name 
+Specify index templates in form of hash. Can contain multiple templates. 
 
-Default: -
 
-### buffer (*Buffer, optional) {#elasticsearch-buffer}
+### time_key (string, optional) {#elasticsearch-time_key}
 
-[Buffer](../buffer/) 
+By default, when inserting records in Logstash format, @timestamp is dynamically created with the time at log ingestion. If you'd like to use a custom time, include an @timestamp with your record. 
 
-Default: -
 
-### slow_flush_log_threshold (string, optional) {#elasticsearch-slow_flush_log_threshold}
+### time_key_format (string, optional) {#elasticsearch-time_key_format}
 
-The threshold for chunk flush performance check. Parameter type is float, not time, default: 20.0 (seconds) If chunk flush takes longer time than this threshold, fluentd logs warning message and increases metric fluentd_output_status_slow_flush_count. 
+The format of the time stamp field (@timestamp or what you specify with time_key). This parameter only has an effect when logstash_format is true as it only affects the name of the index we write to. 
 
-Default: -
 
-### enable_ilm (bool, optional) {#elasticsearch-enable_ilm}
+### time_parse_error_tag (string, optional) {#elasticsearch-time_parse_error_tag}
 
-Enable Index Lifecycle Management (ILM). 
+With logstash_format true, elasticsearch plugin parses timestamp field for generating index name. If the record has invalid timestamp value, this plugin emits an error event to @ERROR label with time_parse_error_tag configured tag. 
 
-Default: -
 
-### ilm_policy_id (string, optional) {#elasticsearch-ilm_policy_id}
+### time_precision (string, optional) {#elasticsearch-time_precision}
 
-Specify ILM policy id. 
+Should the record not include a time_key, define the degree of sub-second time precision to preserve from the time portion of the routed event. 
 
-Default: -
 
-### ilm_policy (string, optional) {#elasticsearch-ilm_policy}
+### type_name (string, optional) {#elasticsearch-type_name}
 
-Specify ILM policy contents as Hash. 
+Set the index type for elasticsearch. This is the fallback if `target_type_key` is missing.  
 
-Default: -
+Default:  fluentd
 
-### ilm_policy_overwrite (bool, optional) {#elasticsearch-ilm_policy_overwrite}
+### unrecoverable_error_types (string, optional) {#elasticsearch-unrecoverable_error_types}
 
-Specify whether overwriting ilm policy or not. 
+Default unrecoverable_error_types parameter is set up strictly. Because es_rejected_execution_exception is caused by exceeding Elasticsearch's thread pool capacity. Advanced users can increase its capacity, but normal users should follow default behavior. If you want to increase it and forcibly retrying bulk request, please consider to change unrecoverable_error_types parameter from default value. Change default value of thread_pool.bulk.queue_size in elasticsearch.yml) 
 
-Default: -
 
-### data_stream_enable (*bool, optional) {#elasticsearch-data_stream_enable}
+### use_legacy_template (*bool, optional) {#elasticsearch-use_legacy_template}
 
-Use @type elasticsearch_data_stream 
+If set to true, the output uses the [legacy index template format](https://www.elastic.co/guide/en/elasticsearch/reference/7.13/indices-templates-v1.html). Otherwise, it uses the [composable index template](https://www.elastic.co/guide/en/elasticsearch/reference/7.13/index-templates.html) format. (default: true)
 
-Default: -
+### user (string, optional) {#elasticsearch-user}
 
-### data_stream_name (string, optional) {#elasticsearch-data_stream_name}
+User for HTTP Basic authentication. This plugin will escape required URL encoded characters within `%{}` placeholders, for example, `%{demo+}` 
 
-You can specify Elasticsearch data stream name by this parameter. This parameter is mandatory for elasticsearch_data_stream. There are some limitations about naming rule. For more details https://www.elastic.co/guide/en/elasticsearch/reference/master/indices-create-data-stream.html#indices-create-data-stream-api-path-params 
 
-Default: -
+### utc_index (*bool, optional) {#elasticsearch-utc_index}
 
-### data_stream_template_name (string, optional) {#elasticsearch-data_stream_template_name}
+By default, the records inserted into index logstash-YYMMDD with UTC (Coordinated Universal Time). This option allows to use local time if you describe utc_index to false.(default: true) 
 
-Specify an existing index template for the data stream. If not present, a new template is created and named after the data stream.  Further details here https://github.com/uken/fluent-plugin-elasticsearch#configuration---elasticsearch-output-data-stream 
+Default: true
 
-Default:  data_stream_name
+### validate_client_version (bool, optional) {#elasticsearch-validate_client_version}
 
-### data_stream_ilm_name (string, optional) {#elasticsearch-data_stream_ilm_name}
+When you use mismatched Elasticsearch server and client libraries, fluent-plugin-elasticsearch cannot send data into Elasticsearch.  
 
-Specify an existing ILM policy to be applied to the data stream. If not present, either the specified template's or a new ILM default policy is applied.  Further details here https://github.com/uken/fluent-plugin-elasticsearch#configuration---elasticsearch-output-data-stream 
+Default:  false
 
-Default:  data_stream_name
+### verify_es_version_at_startup (*bool, optional) {#elasticsearch-verify_es_version_at_startup}
 
-### data_stream_ilm_policy (string, optional) {#elasticsearch-data_stream_ilm_policy}
+Because Elasticsearch plugin should change behavior each of Elasticsearch major versions. For example, Elasticsearch 6 starts to prohibit multiple type_names in one index, and Elasticsearch 7 will handle only _doc type_name in index. If you want to disable to verify Elasticsearch version at start up, set it as false. When using the following configuration, ES plugin intends to communicate into Elasticsearch 6. (default: true) 
 
-Specify data stream ILM policy contents as Hash. 
+Default: true
 
-Default: -
+### with_transporter_log (bool, optional) {#elasticsearch-with_transporter_log}
 
-### data_stream_ilm_policy_overwrite (bool, optional) {#elasticsearch-data_stream_ilm_policy_overwrite}
+This is debugging purpose option to enable to obtain transporter layer log.  
 
-Specify whether overwriting data stream ilm policy or not. 
+Default:  false
 
-Default: -
+### write_operation (string, optional) {#elasticsearch-write_operation}
 
-### use_legacy_template (*bool, optional) {#elasticsearch-use_legacy_template}
+The write_operation can be any of: (index,create,update,upsert) 
 
-If set to true, the output uses the [legacy index template format](https://www.elastic.co/guide/en/elasticsearch/reference/7.13/indices-templates-v1.html). Otherwise, it uses the [composable index template](https://www.elastic.co/guide/en/elasticsearch/reference/7.13/index-templates.html) format.
+Default:  index
 
-Default:  true
 
diff --git a/content/docs/configuration/plugins/outputs/file.md b/content/docs/configuration/plugins/outputs/file.md
index 03140eadf..bf8d7aa8a 100644
--- a/content/docs/configuration/plugins/outputs/file.md
+++ b/content/docs/configuration/plugins/outputs/file.md
@@ -11,41 +11,42 @@ generated_file: true
 ## Configuration
 ## FileOutputConfig
 
-### path (string, required) {#fileoutputconfig-path}
+### add_path_suffix (*bool, optional) {#fileoutputconfig-add_path_suffix}
 
-The Path of the file. The actual path is path + time + ".log" by default. 
+Add path suffix(default: true) 
 
-Default: -
+Default: true
 
 ### append (bool, optional) {#fileoutputconfig-append}
 
 The flushed chunk is appended to existence file or not. The default is not appended. 
 
-Default: -
 
-### add_path_suffix (*bool, optional) {#fileoutputconfig-add_path_suffix}
+### buffer (*Buffer, optional) {#fileoutputconfig-buffer}
 
-Add path suffix(default: true) 
+[Buffer](../buffer/) 
 
-Default: true
 
-### path_suffix (string, optional) {#fileoutputconfig-path_suffix}
+### compress (string, optional) {#fileoutputconfig-compress}
 
-The suffix of output result. 
+Compresses flushed files using gzip. No compression is performed by default. 
 
-Default:  ".log"
 
-### symlink_path (bool, optional) {#fileoutputconfig-symlink_path}
+### format (*Format, optional) {#fileoutputconfig-format}
 
-Create symlink to temporary buffered file when buffer_type is file. This is useful for tailing file content to check logs. 
+[Format](../format/) 
 
-Default:  false
 
-### compress (string, optional) {#fileoutputconfig-compress}
+### path (string, required) {#fileoutputconfig-path}
 
-Compresses flushed files using gzip. No compression is performed by default. 
+The Path of the file. The actual path is path + time + ".log" by default. 
+
+
+### path_suffix (string, optional) {#fileoutputconfig-path_suffix}
 
-Default: -
+The suffix of output result. 
+
+Default:  ".log"
 
 ### recompress (bool, optional) {#fileoutputconfig-recompress}
 
@@ -53,31 +54,27 @@ Performs compression again even if the buffer chunk is already compressed.
 
 Default:  false
 
-### format (*Format, optional) {#fileoutputconfig-format}
-
-[Format](../format/) 
+### slow_flush_log_threshold (string, optional) {#fileoutputconfig-slow_flush_log_threshold}
 
-Default: -
+The threshold for chunk flush performance check. Parameter type is float, not time, default: 20.0 (seconds) If chunk flush takes longer time than this threshold, fluentd logs warning message and increases metric fluentd_output_status_slow_flush_count. 
 
-### buffer (*Buffer, optional) {#fileoutputconfig-buffer}
 
-[Buffer](../buffer/) 
+### symlink_path (bool, optional) {#fileoutputconfig-symlink_path}
 
-Default: -
+Create symlink to temporary buffered file when buffer_type is file. This is useful for tailing file content to check logs. 
 
-### slow_flush_log_threshold (string, optional) {#fileoutputconfig-slow_flush_log_threshold}
+Default:  false
 
-The threshold for chunk flush performance check. Parameter type is float, not time, default: 20.0 (seconds) If chunk flush takes longer time than this threshold, fluentd logs warning message and increases metric fluentd_output_status_slow_flush_count. 
 
-Default: -
+## Example `File` output configurations
 
 
- ## Example `File` output configurations
- ```yaml
+{{< highlight yaml >}}
 apiVersion: logging.banzaicloud.io/v1beta1
 kind: Output
 metadata:
   name: demo-output
+
 spec:
   file:
     path: /tmp/logs/${tag}/%Y/%m/%d.%H.%M
@@ -86,10 +83,11 @@ spec:
       timekey: 1m
       timekey_wait: 10s
       timekey_use_utc: true
- ```
+{{</ highlight >}}
 
- #### Fluentd Config Result
- ```
+Fluentd config result:
+
+{{< highlight xml >}}
   <match **>
 	@type file
 	@id test_file
@@ -105,6 +103,7 @@ spec:
 	  timekey_wait 30s
 	</buffer>
   </match>
- ```
+{{</ highlight >}}
+
 
 ---
diff --git a/content/docs/configuration/plugins/outputs/format.md b/content/docs/configuration/plugins/outputs/format.md
index 7ae661219..ce6ae5a0f 100644
--- a/content/docs/configuration/plugins/outputs/format.md
+++ b/content/docs/configuration/plugins/outputs/format.md
@@ -6,9 +6,11 @@ generated_file: true
 
 # Format output records
 ## Overview
+
  Specify how to format output records. For details, see [https://docs.fluentd.org/configuration/format-section](https://docs.fluentd.org/configuration/format-section).
 
 ## Example
+
 ```yaml
  spec:
   format:
@@ -19,15 +21,10 @@ generated_file: true
       message_key: msg
 ```
 
+
 ## Configuration
 ## Format
 
-### type (string, optional) {#format-type}
-
-Output line formatting: out_file,json,ltsv,csv,msgpack,hash,single_value  
-
-Default:  json
-
 ### add_newline (*bool, optional) {#format-add_newline}
 
 When type is single_value add '\n' to the end of the message  
@@ -38,6 +35,11 @@ Default:  true
 
 When type is single_value specify the key holding information 
 
-Default: -
+
+### type (string, optional) {#format-type}
+
+Output line formatting: out_file,json,ltsv,csv,msgpack,hash,single_value  
+
+Default:  json
 
 
diff --git a/content/docs/configuration/plugins/outputs/format_rfc5424.md b/content/docs/configuration/plugins/outputs/format_rfc5424.md
index ecde246b8..5874bc4c6 100644
--- a/content/docs/configuration/plugins/outputs/format_rfc5424.md
+++ b/content/docs/configuration/plugins/outputs/format_rfc5424.md
@@ -6,17 +6,11 @@ generated_file: true
 
 ## FormatRfc5424
 
-### type (string, optional) {#formatrfc5424-type}
-
-Output line formatting: out_file,json,ltsv,csv,msgpack,hash,single_value  
-
-Default:  json
-
-### rfc6587_message_size (*bool, optional) {#formatrfc5424-rfc6587_message_size}
+### app_name_field (string, optional) {#formatrfc5424-app_name_field}
 
-Prepends message length for syslog transmission  
+Sets app name in syslog from field in fluentd, delimited by '.'  
 
-Default:  true
+Default:  app_name
 
 ### hostname_field (string, optional) {#formatrfc5424-hostname_field}
 
@@ -24,11 +18,17 @@ Sets host name in syslog from field in fluentd, delimited by '.'
 
 Default:  hostname
 
-### app_name_field (string, optional) {#formatrfc5424-app_name_field}
+### log_field (string, optional) {#formatrfc5424-log_field}
 
-Sets app name in syslog from field in fluentd, delimited by '.'  
+Sets log in syslog from field in fluentd, delimited by '.'  
 
-Default:  app_name
+Default:  log
+
+### message_id_field (string, optional) {#formatrfc5424-message_id_field}
+
+Sets msg id in syslog from field in fluentd, delimited by '.'  
+
+Default:  message_id
 
 ### proc_id_field (string, optional) {#formatrfc5424-proc_id_field}
 
@@ -36,22 +36,21 @@ Sets proc id in syslog from field in fluentd, delimited by '.'
 
 Default:  proc_id
 
-### message_id_field (string, optional) {#formatrfc5424-message_id_field}
+### rfc6587_message_size (*bool, optional) {#formatrfc5424-rfc6587_message_size}
 
-Sets msg id in syslog from field in fluentd, delimited by '.'  
+Prepends message length for syslog transmission  
 
-Default:  message_id
+Default:  true
 
 ### structured_data_field (string, optional) {#formatrfc5424-structured_data_field}
 
 Sets structured data in syslog from field in fluentd, delimited by '.' (default structured_data) 
 
-Default: -
 
-### log_field (string, optional) {#formatrfc5424-log_field}
+### type (string, optional) {#formatrfc5424-type}
 
-Sets log in syslog from field in fluentd, delimited by '.'  
+Output line formatting: out_file,json,ltsv,csv,msgpack,hash,single_value  
 
-Default:  log
+Default:  json
 
 
diff --git a/content/docs/configuration/plugins/outputs/forward.md b/content/docs/configuration/plugins/outputs/forward.md
index 788603a82..10a1d7ebe 100644
--- a/content/docs/configuration/plugins/outputs/forward.md
+++ b/content/docs/configuration/plugins/outputs/forward.md
@@ -6,59 +6,66 @@ generated_file: true
 
 ## ForwardOutput
 
-### servers ([]FluentdServer, required) {#forwardoutput-servers}
+### ack_response_timeout (int, optional) {#forwardoutput-ack_response_timeout}
 
-Server definitions at least one is required [Server](#fluentd-server) 
+This option is used when require_ack_response is true. This default value is based on popular tcp_syn_retries.  
 
-Default: -
+Default:  190
 
-### transport (string, optional) {#forwardoutput-transport}
+### buffer (*Buffer, optional) {#forwardoutput-buffer}
 
-The transport protocol to use [ tcp, tls ] 
+[Buffer](../buffer/) 
 
-Default: -
 
-### require_ack_response (bool, optional) {#forwardoutput-require_ack_response}
+### connect_timeout (int, optional) {#forwardoutput-connect_timeout}
 
-Change the protocol to at-least-once. The plugin waits the ack from destination's in_forward plugin. 
+The timeout time for socket connect. When the connection timed out during establishment, Errno::ETIMEDOUT is raised. 
 
-Default: -
 
-### ack_response_timeout (int, optional) {#forwardoutput-ack_response_timeout}
+### dns_round_robin (bool, optional) {#forwardoutput-dns_round_robin}
 
-This option is used when require_ack_response is true. This default value is based on popular tcp_syn_retries.  
+Enable client-side DNS round robin. Uniform randomly pick an IP address to send data when a hostname has several IP addresses. `heartbeat_type udp` is not available with `dns_round_robin true`. Use `heartbeat_type tcp` or `heartbeat_type none`. 
 
-Default:  190
 
-### send_timeout (int, optional) {#forwardoutput-send_timeout}
+### expire_dns_cache (int, optional) {#forwardoutput-expire_dns_cache}
 
-The timeout time when sending event logs.  
+Set TTL to expire DNS cache in seconds. Set 0 not to use DNS Cache.  
 
-Default:  60
+Default:  0
 
-### connect_timeout (int, optional) {#forwardoutput-connect_timeout}
+### hard_timeout (int, optional) {#forwardoutput-hard_timeout}
 
-The timeout time for socket connect. When the connection timed out during establishment, Errno::ETIMEDOUT is raised. 
+The hard timeout used to detect server failure. The default value is equal to the send_timeout parameter.  
 
-Default: -
+Default:  60
 
-### recover_wait (int, optional) {#forwardoutput-recover_wait}
+### heartbeat_interval (int, optional) {#forwardoutput-heartbeat_interval}
 
-The wait time before accepting a server fault recovery.  
+The interval of the heartbeat packer.  
 
-Default:  10
+Default:  1
 
 ### heartbeat_type (string, optional) {#forwardoutput-heartbeat_type}
 
 The transport protocol to use for heartbeats. Set "none" to disable heartbeat. [transport, tcp, udp, none] 
 
-Default: -
 
-### heartbeat_interval (int, optional) {#forwardoutput-heartbeat_interval}
+### ignore_network_errors_at_startup (bool, optional) {#forwardoutput-ignore_network_errors_at_startup}
 
-The interval of the heartbeat packer.  
+Ignore DNS resolution and errors at startup time. 
 
-Default:  1
+
+### keepalive (bool, optional) {#forwardoutput-keepalive}
+
+Enable keepalive connection.  
+
+Default:  false
+
+### keepalive_timeout (int, optional) {#forwardoutput-keepalive_timeout}
+
+Expired time of keepalive. Default value is nil, which means to keep connection as long as possible.  
+
+Default:  0
 
 ### phi_failure_detector (bool, optional) {#forwardoutput-phi_failure_detector}
 
@@ -72,47 +79,37 @@ The threshold parameter used to detect server faults.  `phi_threshold` is deeply
 
 Default:  16
 
-### hard_timeout (int, optional) {#forwardoutput-hard_timeout}
-
-The hard timeout used to detect server failure. The default value is equal to the send_timeout parameter.  
-
-Default:  60
-
-### expire_dns_cache (int, optional) {#forwardoutput-expire_dns_cache}
+### recover_wait (int, optional) {#forwardoutput-recover_wait}
 
-Set TTL to expire DNS cache in seconds. Set 0 not to use DNS Cache.  
+The wait time before accepting a server fault recovery.  
 
-Default:  0
+Default:  10
 
-### dns_round_robin (bool, optional) {#forwardoutput-dns_round_robin}
+### require_ack_response (bool, optional) {#forwardoutput-require_ack_response}
 
-Enable client-side DNS round robin. Uniform randomly pick an IP address to send data when a hostname has several IP addresses. `heartbeat_type udp` is not available with `dns_round_robin true`. Use `heartbeat_type tcp` or `heartbeat_type none`. 
+Change the protocol to at-least-once. The plugin waits the ack from destination's in_forward plugin. 
 
-Default: -
 
-### ignore_network_errors_at_startup (bool, optional) {#forwardoutput-ignore_network_errors_at_startup}
+### security (*common.Security, optional) {#forwardoutput-security}
 
-Ignore DNS resolution and errors at startup time. 
+[Security](../../common/security/) 
 
-Default: -
 
-### tls_version (string, optional) {#forwardoutput-tls_version}
+### send_timeout (int, optional) {#forwardoutput-send_timeout}
 
-The default version of TLS transport. [TLSv1_1, TLSv1_2]  
+The timeout time when sending event logs.  
 
-Default:  TLSv1_2
+Default:  60
 
-### tls_ciphers (string, optional) {#forwardoutput-tls_ciphers}
 
-The cipher configuration of TLS transport.  
+### servers ([]FluentdServer, required) {#forwardoutput-servers}
 
-Default:  ALL:!aNULL:!eNULL:!SSLv2
+Server definitions at least one is required [Server](#fluentd-server) 
 
-### tls_insecure_mode (bool, optional) {#forwardoutput-tls_insecure_mode}
+### slow_flush_log_threshold (string, optional) {#forwardoutput-slow_flush_log_threshold}
 
-Skip all verification of certificates or not.  
+The threshold for chunk flush performance check. Parameter type is float, not time, default: 20.0 (seconds) If chunk flush takes longer time than this threshold, fluentd logs warning message and increases metric fluentd_output_status_slow_flush_count. 
 
-Default:  false
 
 ### tls_allow_self_signed_cert (bool, optional) {#forwardoutput-tls_allow_self_signed_cert}
 
@@ -120,89 +117,75 @@ Allow self signed certificates or not.
 
 Default:  false
 
-### tls_verify_hostname (bool, optional) {#forwardoutput-tls_verify_hostname}
+### tls_cert_logical_store_name (string, optional) {#forwardoutput-tls_cert_logical_store_name}
 
-Verify hostname of servers and certificates or not in TLS transport.  
+The certificate logical store name on Windows system certstore. This parameter is for Windows only. 
 
-Default:  true
 
 ### tls_cert_path (*secret.Secret, optional) {#forwardoutput-tls_cert_path}
 
 The additional CA certificate path for TLS. 
 
-Default: -
 
-### tls_client_cert_path (*secret.Secret, optional) {#forwardoutput-tls_client_cert_path}
+### tls_cert_thumbprint (string, optional) {#forwardoutput-tls_cert_thumbprint}
 
-The client certificate path for TLS 
+The certificate thumbprint for searching from Windows system certstore This parameter is for Windows only. 
 
-Default: -
 
-### tls_client_private_key_path (*secret.Secret, optional) {#forwardoutput-tls_client_private_key_path}
+### tls_cert_use_enterprise_store (bool, optional) {#forwardoutput-tls_cert_use_enterprise_store}
 
-The client private key path for TLS. 
+Enable to use certificate enterprise store on Windows system certstore. This parameter is for Windows only. 
 
-Default: -
 
-### tls_client_private_key_passphrase (*secret.Secret, optional) {#forwardoutput-tls_client_private_key_passphrase}
+### tls_ciphers (string, optional) {#forwardoutput-tls_ciphers}
 
-The client private key passphrase for TLS. 
+The cipher configuration of TLS transport.  
 
-Default: -
+Default:  ALL:!aNULL:!eNULL:!SSLv2
 
-### tls_cert_thumbprint (string, optional) {#forwardoutput-tls_cert_thumbprint}
+### tls_client_cert_path (*secret.Secret, optional) {#forwardoutput-tls_client_cert_path}
 
-The certificate thumbprint for searching from Windows system certstore This parameter is for Windows only. 
+The client certificate path for TLS 
 
-Default: -
 
-### tls_cert_logical_store_name (string, optional) {#forwardoutput-tls_cert_logical_store_name}
+### tls_client_private_key_passphrase (*secret.Secret, optional) {#forwardoutput-tls_client_private_key_passphrase}
 
-The certificate logical store name on Windows system certstore. This parameter is for Windows only. 
+The client private key passphrase for TLS. 
 
-Default: -
 
-### tls_cert_use_enterprise_store (bool, optional) {#forwardoutput-tls_cert_use_enterprise_store}
+### tls_client_private_key_path (*secret.Secret, optional) {#forwardoutput-tls_client_private_key_path}
 
-Enable to use certificate enterprise store on Windows system certstore. This parameter is for Windows only. 
+The client private key path for TLS. 
 
-Default: -
 
-### keepalive (bool, optional) {#forwardoutput-keepalive}
+### tls_insecure_mode (bool, optional) {#forwardoutput-tls_insecure_mode}
 
-Enable keepalive connection.  
+Skip all verification of certificates or not.  
 
 Default:  false
 
-### keepalive_timeout (int, optional) {#forwardoutput-keepalive_timeout}
-
-Expired time of keepalive. Default value is nil, which means to keep connection as long as possible.  
-
-Default:  0
-
-### security (*common.Security, optional) {#forwardoutput-security}
+### tls_verify_hostname (bool, optional) {#forwardoutput-tls_verify_hostname}
 
-[Security](../../common/security/) 
+Verify hostname of servers and certificates or not in TLS transport.  
 
-Default: -
+Default:  true
 
-### verify_connection_at_startup (bool, optional) {#forwardoutput-verify_connection_at_startup}
+### tls_version (string, optional) {#forwardoutput-tls_version}
 
-Verify that a connection can be made with one of out_forward nodes at the time of startup.  
+The default version of TLS transport. [TLSv1_1, TLSv1_2]  
 
-Default:  false
+Default:  TLSv1_2
 
-### buffer (*Buffer, optional) {#forwardoutput-buffer}
+### transport (string, optional) {#forwardoutput-transport}
 
-[Buffer](../buffer/) 
+The transport protocol to use [ tcp, tls ] 
 
-Default: -
 
-### slow_flush_log_threshold (string, optional) {#forwardoutput-slow_flush_log_threshold}
+### verify_connection_at_startup (bool, optional) {#forwardoutput-verify_connection_at_startup}
 
-The threshold for chunk flush performance check. Parameter type is float, not time, default: 20.0 (seconds) If chunk flush takes longer time than this threshold, fluentd logs warning message and increases metric fluentd_output_status_slow_flush_count. 
+Verify that a connection can be made with one of out_forward nodes at the time of startup.  
 
-Default: -
+Default:  false
 
 
 ## Fluentd Server
@@ -213,13 +196,16 @@ server
 
 The IP address or host name of the server. 
 
-Default: -
 
 ### name (string, optional) {#fluentd-server-name}
 
 The name of the server. Used for logging and certificate verification in TLS transport (when host is address). 
 
-Default: -
+
+### password (*secret.Secret, optional) {#fluentd-server-password}
+
+The password for authentication. 
+
 
 ### port (int, optional) {#fluentd-server-port}
 
@@ -231,25 +217,16 @@ Default:  24224
 
 The shared key per server. 
 
-Default: -
-
-### username (*secret.Secret, optional) {#fluentd-server-username}
-
-The username for authentication. 
-
-Default: -
 
-### password (*secret.Secret, optional) {#fluentd-server-password}
+### standby (bool, optional) {#fluentd-server-standby}
 
-The password for authentication. 
+Marks a node as the standby node for an Active-Standby model between Fluentd nodes. When an active node goes down, the standby node is promoted to an active node. The standby node is not used by the out_forward plugin until then. 
 
-Default: -
 
-### standby (bool, optional) {#fluentd-server-standby}
+### username (*secret.Secret, optional) {#fluentd-server-username}
 
-Marks a node as the standby node for an Active-Standby model between Fluentd nodes. When an active node goes down, the standby node is promoted to an active node. The standby node is not used by the out_forward plugin until then. 
+The username for authentication. 
 
-Default: -
 
 ### weight (int, optional) {#fluentd-server-weight}
 
diff --git a/content/docs/configuration/plugins/outputs/gcs.md b/content/docs/configuration/plugins/outputs/gcs.md
index efe4346f5..7a098e5dc 100644
--- a/content/docs/configuration/plugins/outputs/gcs.md
+++ b/content/docs/configuration/plugins/outputs/gcs.md
@@ -4,11 +4,12 @@ weight: 200
 generated_file: true
 ---
 
-# Google Cloud Storage
 ## Overview
- Store logs in Google Cloud Storage. For details, see [https://github.com/kube-logging/fluent-plugin-gcs](https://github.com/kube-logging/fluent-plugin-gcs).
+
+Store logs in Google Cloud Storage. For details, see [https://github.com/kube-logging/fluent-plugin-gcs](https://github.com/kube-logging/fluent-plugin-gcs).
 
 ## Example
+
 ```yaml
  spec:
   gcs:
@@ -17,80 +18,77 @@ generated_file: true
     path: logs/${tag}/%Y/%m/%d/
 ```
 
+
 ## Configuration
 ## GCSOutput
 
-### project (string, required) {#gcsoutput-project}
+### acl (string, optional) {#gcsoutput-acl}
 
-Project identifier for GCS 
+Permission for the object in GCS: `auth_read` `owner_full` `owner_read` `private` `project_private` `public_read` 
 
-Default: -
 
-### keyfile (string, optional) {#gcsoutput-keyfile}
+### auto_create_bucket (bool, optional) {#gcsoutput-auto_create_bucket}
 
-Path of GCS service account credentials JSON file 
+Create GCS bucket if it does not exists  
 
-Default: -
+Default:  true
 
-### credentials_json (*secret.Secret, optional) {#gcsoutput-credentials_json}
+### bucket (string, required) {#gcsoutput-bucket}
 
-GCS service account credentials in JSON format [Secret](../secret/) 
+Name of a GCS bucket 
+
+
+### buffer (*Buffer, optional) {#gcsoutput-buffer}
+
+[Buffer](../buffer/) 
 
-Default: -
 
 ### client_retries (int, optional) {#gcsoutput-client_retries}
 
 Number of times to retry requests on server error 
 
-Default: -
 
 ### client_timeout (int, optional) {#gcsoutput-client_timeout}
 
 Default timeout to use in requests 
 
-Default: -
 
-### bucket (string, required) {#gcsoutput-bucket}
+### credentials_json (*secret.Secret, optional) {#gcsoutput-credentials_json}
 
-Name of a GCS bucket 
+GCS service account credentials in JSON format [Secret](../secret/) 
 
-Default: -
 
-### object_key_format (string, optional) {#gcsoutput-object_key_format}
+### encryption_key (string, optional) {#gcsoutput-encryption_key}
 
-Format of GCS object keys  
+Customer-supplied, AES-256 encryption key 
 
-Default:  %{path}%{time_slice}_%{index}.%{file_extension}
 
-### path (string, optional) {#gcsoutput-path}
+### format (*Format, optional) {#gcsoutput-format}
 
-Path prefix of the files on GCS 
+[Format](../format/) 
 
-Default: -
 
-### store_as (string, optional) {#gcsoutput-store_as}
+### hex_random_length (int, optional) {#gcsoutput-hex_random_length}
 
-Archive format on GCS: gzip json text  
+Max length of `%{hex_random}` placeholder(4-16)  
 
-Default:  gzip
+Default:  4
 
-### transcoding (bool, optional) {#gcsoutput-transcoding}
+### keyfile (string, optional) {#gcsoutput-keyfile}
 
-Enable the decompressive form of transcoding 
+Path of GCS service account credentials JSON file 
 
-Default: -
 
-### auto_create_bucket (bool, optional) {#gcsoutput-auto_create_bucket}
+### object_key_format (string, optional) {#gcsoutput-object_key_format}
 
-Create GCS bucket if it does not exists  
+Format of GCS object keys  
 
-Default:  true
+Default: `%{path}%{time_slice}_%{index}.%{file_extension}`
 
-### hex_random_length (int, optional) {#gcsoutput-hex_random_length}
+### object_metadata ([]ObjectMetadata, optional) {#gcsoutput-object_metadata}
 
-Max length of `%{hex_random}` placeholder(4-16)  
+User provided web-safe keys and arbitrary string values that will returned with requests for the file as "x-goog-meta-" response headers. [Object Metadata](#objectmetadata) 
 
-Default:  4
 
 ### overwrite (bool, optional) {#gcsoutput-overwrite}
 
@@ -98,47 +96,36 @@ Overwrite already existing path
 
 Default:  false
 
-### acl (string, optional) {#gcsoutput-acl}
-
-Permission for the object in GCS: auth_read owner_full owner_read private project_private public_read 
-
-Default: -
-
-### storage_class (string, optional) {#gcsoutput-storage_class}
+### path (string, optional) {#gcsoutput-path}
 
-Storage class of the file: dra nearline coldline multi_regional regional standard 
+Path prefix of the files on GCS 
 
-Default: -
 
-### encryption_key (string, optional) {#gcsoutput-encryption_key}
+### project (string, required) {#gcsoutput-project}
 
-Customer-supplied, AES-256 encryption key 
+Project identifier for GCS 
 
-Default: -
 
-### object_metadata ([]ObjectMetadata, optional) {#gcsoutput-object_metadata}
+### slow_flush_log_threshold (string, optional) {#gcsoutput-slow_flush_log_threshold}
 
-User provided web-safe keys and arbitrary string values that will returned with requests for the file as "x-goog-meta-" response headers. [Object Metadata](#objectmetadata) 
+The threshold for chunk flush performance check. Parameter type is float, not time, default: 20.0 (seconds) If chunk flush takes longer time than this threshold, fluentd logs warning message and increases metric fluentd_output_status_slow_flush_count. 
 
-Default: -
 
-### format (*Format, optional) {#gcsoutput-format}
+### storage_class (string, optional) {#gcsoutput-storage_class}
 
-[Format](../format/) 
+Storage class of the file: `dra` `nearline` `coldline` `multi_regional` `regional` `standard` 
 
-Default: -
 
-### buffer (*Buffer, optional) {#gcsoutput-buffer}
+### store_as (string, optional) {#gcsoutput-store_as}
 
-[Buffer](../buffer/) 
+Archive format on GCS: gzip json text  
 
-Default: -
+Default:  gzip
 
-### slow_flush_log_threshold (string, optional) {#gcsoutput-slow_flush_log_threshold}
+### transcoding (bool, optional) {#gcsoutput-transcoding}
 
-The threshold for chunk flush performance check. Parameter type is float, not time, default: 20.0 (seconds) If chunk flush takes longer time than this threshold, fluentd logs warning message and increases metric fluentd_output_status_slow_flush_count. 
+Enable the decompressive form of transcoding 
 
-Default: -
 
 
 ## ObjectMetadata
@@ -147,12 +134,10 @@ Default: -
 
 Key 
 
-Default: -
 
 ### value (string, required) {#objectmetadata-value}
 
 Value 
 
-Default: -
 
 
diff --git a/content/docs/configuration/plugins/outputs/gelf.md b/content/docs/configuration/plugins/outputs/gelf.md
index f91ef752d..9cd3ea26b 100644
--- a/content/docs/configuration/plugins/outputs/gelf.md
+++ b/content/docs/configuration/plugins/outputs/gelf.md
@@ -15,13 +15,11 @@ generated_file: true
 
 Destination host 
 
-Default: -
 
 ### port (int, required) {#output-config-port}
 
 Destination host port 
 
-Default: -
 
 ### protocol (string, optional) {#output-config-protocol}
 
@@ -37,13 +35,12 @@ Default:  false
 
 ### tls_options (map[string]string, optional) {#output-config-tls_options}
 
-TLS Options  - for options see https://github.com/graylog-labs/gelf-rb/blob/72916932b789f7a6768c3cdd6ab69a3c942dbcef/lib/gelf/transport/tcp_tls.rb#L7-L12 
+TLS options (default: {}). For details, see [https://github.com/graylog-labs/gelf-rb/blob/72916932b789f7a6768c3cdd6ab69a3c942dbcef/lib/gelf/transport/tcp_tls.rb#L7-L12](https://github.com/graylog-labs/gelf-rb/blob/72916932b789f7a6768c3cdd6ab69a3c942dbcef/lib/gelf/transport/tcp_tls.rb#L7-L12).
 
-Default:  {}
 
+## Example `GELF` output configurations
 
- ## Example `GELF` output configurations
- ```yaml
+{{< highlight yaml >}}
 apiVersion: logging.banzaicloud.io/v1beta1
 kind: Output
 metadata:
@@ -52,16 +49,18 @@ spec:
   gelf:
     host: gelf-host
     port: 12201
- ```
+{{</ highlight >}}
 
- ## Fluentd Config Result
- ```
+Fluentd config result:
+
+{{< highlight xml >}}
   <match **>
 	@type gelf
 	@id test_gelf
 	host gelf-host
 	port 12201
   </match>
- ```
+{{</ highlight >}}
+
 
 ---
diff --git a/content/docs/configuration/plugins/outputs/http.md b/content/docs/configuration/plugins/outputs/http.md
index 6e8bd5035..2a9d4ef7a 100644
--- a/content/docs/configuration/plugins/outputs/http.md
+++ b/content/docs/configuration/plugins/outputs/http.md
@@ -6,117 +6,120 @@ generated_file: true
 
 # Http plugin for Fluentd
 ## Overview
- Sends logs to HTTP/HTTPS endpoints.
- More info at https://docs.fluentd.org/output/http.
-
- ## Example output configurations
- ```yaml
- spec:
-   http:
-     endpoint: http://logserver.com:9000/api
-     buffer:
-       tags: "[]"
-       flush_interval: 10s
- ```
 
-## Configuration
-## Output Config
+Sends logs to HTTP/HTTPS endpoints. For details, see [https://docs.fluentd.org/output/http](https://docs.fluentd.org/output/http).
 
-### endpoint (string, required) {#output-config-endpoint}
+## Example output configurations
 
-Endpoint for HTTP request. 
+```yaml
+spec:
+  http:
+    endpoint: http://logserver.com:9000/api
+    buffer:
+      tags: "[]"
+      flush_interval: 10s
+```
 
-Default: -
 
-### http_method (string, optional) {#output-config-http_method}
+## Configuration
+## Output Config
 
-Method for HTTP request. [post, put]  
+### auth (*HTTPAuth, optional) {#output-config-auth}
 
-Default:  post
+[HTTP auth](#http-auth-config) 
 
-### proxy (string, optional) {#output-config-proxy}
 
-Proxy for HTTP request. 
+### buffer (*Buffer, optional) {#output-config-buffer}
+
+[Buffer](../buffer/) 
 
-Default: -
 
 ### content_type (string, optional) {#output-config-content_type}
 
 Content-Profile for HTTP request. 
 
-Default: -
 
-### json_array (bool, optional) {#output-config-json_array}
+### endpoint (string, required) {#output-config-endpoint}
 
-Using array format of JSON. This parameter is used and valid only for json format. When json_array as true, Content-Profile should be application/json and be able to use JSON data for the HTTP request body.   
+Endpoint for HTTP request. 
 
-Default:  false
+
+### error_response_as_unrecoverable (*bool, optional) {#output-config-error_response_as_unrecoverable}
+
+Raise UnrecoverableError when the response code is non success, 1xx/3xx/4xx/5xx. If false, the plugin logs error message instead of raising UnrecoverableError.  
+
+Default:  true
 
 ### format (*Format, optional) {#output-config-format}
 
 [Format](../format/) 
 
-Default: -
 
 ### headers (map[string]string, optional) {#output-config-headers}
 
 Additional headers for HTTP request. 
 
-Default: -
+
+### json_array (bool, optional) {#output-config-json_array}
+
+Using array format of JSON. This parameter is used and valid only for json format. When json_array as true, Content-Profile should be application/json and be able to use JSON data for the HTTP request body.   
+
+Default:  false
 
 ### open_timeout (int, optional) {#output-config-open_timeout}
 
 Connection open timeout in seconds. 
 
-Default: -
+
+### proxy (string, optional) {#output-config-proxy}
+
+Proxy for HTTP request. 
+
 
 ### read_timeout (int, optional) {#output-config-read_timeout}
 
 Read timeout in seconds. 
 
-Default: -
 
-### ssl_timeout (int, optional) {#output-config-ssl_timeout}
+### retryable_response_codes ([]int, optional) {#output-config-retryable_response_codes}
 
-TLS timeout in seconds. 
+List of retryable response codes. If the response code is included in this list, the plugin retries the buffer flush. Since Fluentd v2 the Status code 503 is going to be removed from default.  
 
-Default: -
+Default:  [503]
 
-### tls_version (string, optional) {#output-config-tls_version}
+### ssl_timeout (int, optional) {#output-config-ssl_timeout}
 
-The default version of TLS transport. [TLSv1_1, TLSv1_2]  
+TLS timeout in seconds. 
 
-Default:  TLSv1_2
 
-### tls_ciphers (string, optional) {#output-config-tls_ciphers}
+### slow_flush_log_threshold (string, optional) {#output-config-slow_flush_log_threshold}
 
-The cipher configuration of TLS transport.  
+The threshold for chunk flush performance check. Parameter type is float, not time, default: 20.0 (seconds) If chunk flush takes longer time than this threshold, fluentd logs warning message and increases metric fluentd_output_status_slow_flush_count. 
 
-Default:  ALL:!aNULL:!eNULL:!SSLv2
 
 ### tls_ca_cert_path (*secret.Secret, optional) {#output-config-tls_ca_cert_path}
 
 The CA certificate path for TLS. 
 
-Default: -
-
-### tls_client_cert_path (*secret.Secret, optional) {#output-config-tls_client_cert_path}
+### tls_ciphers (string, optional) {#output-config-tls_ciphers}
 
-The client certificate path for TLS. 
+The cipher configuration of TLS transport.  
 
-Default: -
+Default:  ALL:!aNULL:!eNULL:!SSLv2
 
-### tls_private_key_path (*secret.Secret, optional) {#output-config-tls_private_key_path}
+### tls_client_cert_path (*secret.Secret, optional) {#output-config-tls_client_cert_path}
 
-The client private key path for TLS. 
+The client certificate path for TLS. 
 
-Default: -
 
 ### tls_private_key_passphrase (*secret.Secret, optional) {#output-config-tls_private_key_passphrase}
 
 The client private key passphrase for TLS. 
 
-Default: -
+### tls_private_key_path (*secret.Secret, optional) {#output-config-tls_private_key_path}
+
+The client private key path for TLS. 
+
 
 ### tls_verify_mode (string, optional) {#output-config-tls_verify_mode}
 
@@ -124,51 +127,25 @@ The verify mode of TLS. [peer, none]
 
 Default:  peer
 
-### error_response_as_unrecoverable (*bool, optional) {#output-config-error_response_as_unrecoverable}
-
-Raise UnrecoverableError when the response code is non success, 1xx/3xx/4xx/5xx. If false, the plugin logs error message instead of raising UnrecoverableError.  
-
-Default:  true
-
-### retryable_response_codes ([]int, optional) {#output-config-retryable_response_codes}
-
-List of retryable response codes. If the response code is included in this list, the plugin retries the buffer flush. Since Fluentd v2 the Status code 503 is going to be removed from default.  
-
-Default:  [503]
-
-### auth (*HTTPAuth, optional) {#output-config-auth}
-
-[HTTP auth](#http-auth-config) 
-
-Default: -
-
-### buffer (*Buffer, optional) {#output-config-buffer}
-
-[Buffer](../buffer/) 
-
-Default: -
-
-### slow_flush_log_threshold (string, optional) {#output-config-slow_flush_log_threshold}
+### tls_version (string, optional) {#output-config-tls_version}
 
-The threshold for chunk flush performance check. Parameter type is float, not time, default: 20.0 (seconds) If chunk flush takes longer time than this threshold, fluentd logs warning message and increases metric fluentd_output_status_slow_flush_count. 
+The default version of TLS transport. [TLSv1_1, TLSv1_2]  
 
-Default: -
+Default:  TLSv1_2
 
 
 ## HTTP auth config
 
 http_auth
 
-### username (*secret.Secret, required) {#http auth-config-username}
+### password (*secret.Secret, required) {#http auth-config-password}
 
-Username for basic authentication. [Secret](../secret/) 
+Password for basic authentication. [Secret](../secret/) 
 
-Default: -
 
-### password (*secret.Secret, required) {#http auth-config-password}
+### username (*secret.Secret, required) {#http auth-config-username}
 
-Password for basic authentication. [Secret](../secret/) 
+Username for basic authentication. [Secret](../secret/) 
 
-Default: -
 
 
diff --git a/content/docs/configuration/plugins/outputs/kafka.md b/content/docs/configuration/plugins/outputs/kafka.md
index fd65f7342..11260c77d 100644
--- a/content/docs/configuration/plugins/outputs/kafka.md
+++ b/content/docs/configuration/plugins/outputs/kafka.md
@@ -6,59 +6,50 @@ generated_file: true
 
 # Kafka output plugin for Fluentd
 ## Overview
-  More info at https://github.com/fluent/fluent-plugin-kafka
->Example Deployment: [Transport Nginx Access Logs into Kafka with Logging Operator](../../../../examples/kafka-nginx/)
-
- ## Example output configurations
- ```yaml
- spec:
-   kafka:
-     brokers: kafka-headless.kafka.svc.cluster.local:29092
-     default_topic: topic
-     sasl_over_ssl: false
-     format:
-       type: json
-     buffer:
-       tags: topic
-       timekey: 1m
-       timekey_wait: 30s
-       timekey_use_utc: true
- ```
 
-## Configuration
-## Kafka
 
-Send your logs to Kafka
+For details, see [https://github.com/fluent/fluent-plugin-kafka](https://github.com/fluent/fluent-plugin-kafka).
 
-### brokers (string, required) {#kafka-brokers}
+For an example deployment, see [Transport Nginx Access Logs into Kafka with Logging Operator](../../../../quickstarts/kafka-nginx/).
 
-The list of all seed brokers, with their host and port information. 
+## Example output configurations
 
-Default: -
+```yaml
+spec:
+  kafka:
+    brokers: kafka-headless.kafka.svc.cluster.local:29092
+    default_topic: topic
+    sasl_over_ssl: false
+    format:
+      type: json
+    buffer:
+      tags: topic
+      timekey: 1m
+      timekey_wait: 30s
+      timekey_use_utc: true
+```
 
-### topic_key (string, optional) {#kafka-topic_key}
 
-Topic Key  
+## Configuration
+## Kafka
 
-Default:  "topic"
+Send your logs to Kafka
 
-### partition_key (string, optional) {#kafka-partition_key}
+### ack_timeout (int, optional) {#kafka-ack_timeout}
 
-Partition  
+How long the producer waits for acks. The unit is seconds  
 
-Default:  "partition"
+Default:  nil => Uses default of ruby-kafka library
 
-### partition_key_key (string, optional) {#kafka-partition_key_key}
+### brokers (string, required) {#kafka-brokers}
 
-Partition Key  
+The list of all seed brokers, with their host and port information. 
 
-Default:  "partition_key"
 
-### message_key_key (string, optional) {#kafka-message_key_key}
+### buffer (*Buffer, optional) {#kafka-buffer}
 
-Message Key  
+[Buffer](../buffer/) 
 
-Default:  "message_key"
 
 ### client_id (string, optional) {#kafka-client_id}
 
@@ -66,9 +57,15 @@ Client ID
 
 Default:  "kafka"
 
-### default_topic (string, optional) {#kafka-default_topic}
+### compression_codec (string, optional) {#kafka-compression_codec}
 
-The name of default topic . 
+The codec the producer uses to compress messages . The available options are gzip and snappy. 
+
+Default:  nil
+
+### default_message_key (string, optional) {#kafka-default_message_key}
+
+The name of default message key . 
 
 Default:  nil
 
@@ -78,15 +75,15 @@ The name of default partition key .
 
 Default:  nil
 
-### default_message_key (string, optional) {#kafka-default_message_key}
+### default_topic (string, optional) {#kafka-default_topic}
 
-The name of default message key . 
+The name of default topic . 
 
 Default:  nil
 
-### exclude_topic_key (bool, optional) {#kafka-exclude_topic_key}
+### discard_kafka_delivery_failed (bool, optional) {#kafka-discard_kafka_delivery_failed}
 
-Exclude Topic key  
+Discard the record where Kafka DeliveryFailed occurred  
 
 Default:  false
 
@@ -96,6 +93,17 @@ Exclude Partition key
 
 Default:  false
 
+### exclude_topic_key (bool, optional) {#kafka-exclude_topic_key}
+
+Exclude Topic key  
+
+Default:  false
+
+### format (*Format, required) {#kafka-format}
+
+[Format](../format/) 
+
+
 ### get_kafka_client_log (bool, optional) {#kafka-get_kafka_client_log}
 
 Get Kafka Client log  
@@ -114,91 +122,79 @@ Headers from Record
 
 Default:  {}
 
-### use_default_for_unknown_topic (bool, optional) {#kafka-use_default_for_unknown_topic}
-
-Use default for unknown topics  
-
-Default:  false
-
 ### idempotent (bool, optional) {#kafka-idempotent}
 
 Idempotent  
 
 Default:  false
 
-### sasl_over_ssl (bool, required) {#kafka-sasl_over_ssl}
-
-SASL over SSL  
+### kafka_agg_max_bytes (int, optional) {#kafka-kafka_agg_max_bytes}
 
-Default:  true
+Maximum value of total message size to be included in one batch transmission. . 
 
-### principal (string, optional) {#kafka-principal}
+Default:  4096
 
-Default: -
+### kafka_agg_max_messages (int, optional) {#kafka-kafka_agg_max_messages}
 
-### keytab (*secret.Secret, optional) {#kafka-keytab}
+Maximum number of messages to include in one batch transmission. . 
 
-Default: -
+Default:  nil
 
-### username (*secret.Secret, optional) {#kafka-username}
+### keytab (*secret.Secret, optional) {#kafka-keytab}
 
-Username when using PLAIN/SCRAM SASL authentication 
 
-Default: -
+### max_send_retries (int, optional) {#kafka-max_send_retries}
 
-### password (*secret.Secret, optional) {#kafka-password}
+Number of times to retry sending of messages to a leader  
 
-Password when using PLAIN/SCRAM SASL authentication 
+Default:  1
 
-Default: -
+### message_key_key (string, optional) {#kafka-message_key_key}
 
-### scram_mechanism (string, optional) {#kafka-scram_mechanism}
+Message Key  
 
-If set, use SCRAM authentication with specified mechanism. When unset, default to PLAIN authentication 
+Default:  "message_key"
 
-Default: -
+### partition_key (string, optional) {#kafka-partition_key}
 
-### max_send_retries (int, optional) {#kafka-max_send_retries}
+Partition  
 
-Number of times to retry sending of messages to a leader  
+Default:  "partition"
 
-Default:  1
+### partition_key_key (string, optional) {#kafka-partition_key_key}
 
-### required_acks (int, optional) {#kafka-required_acks}
+Partition Key  
 
-The number of acks required per request . 
+Default:  "partition_key"
 
-Default:  -1
+### password (*secret.Secret, optional) {#kafka-password}
 
-### ack_timeout (int, optional) {#kafka-ack_timeout}
+Password when using PLAIN/SCRAM SASL authentication 
 
-How long the producer waits for acks. The unit is seconds  
 
-Default:  nil => Uses default of ruby-kafka library
+### principal (string, optional) {#kafka-principal}
 
-### compression_codec (string, optional) {#kafka-compression_codec}
 
-The codec the producer uses to compress messages . The available options are gzip and snappy. 
+### required_acks (int, optional) {#kafka-required_acks}
 
-Default:  nil
+The number of acks required per request . 
 
-### kafka_agg_max_bytes (int, optional) {#kafka-kafka_agg_max_bytes}
+Default:  -1
 
-Maximum value of total message size to be included in one batch transmission. . 
+### sasl_over_ssl (bool, required) {#kafka-sasl_over_ssl}
 
-Default:  4096
+SASL over SSL  
 
-### kafka_agg_max_messages (int, optional) {#kafka-kafka_agg_max_messages}
+Default:  true
 
-Maximum number of messages to include in one batch transmission. . 
+### scram_mechanism (string, optional) {#kafka-scram_mechanism}
 
-Default:  nil
+If set, use SCRAM authentication with specified mechanism. When unset, default to PLAIN authentication 
 
-### discard_kafka_delivery_failed (bool, optional) {#kafka-discard_kafka_delivery_failed}
+### ssl_ca_cert (*secret.Secret, optional) {#kafka-ssl_ca_cert}
 
-Discard the record where Kafka DeliveryFailed occurred  
+CA certificate 
 
-Default:  false
 
 ### ssl_ca_certs_from_system (*bool, optional) {#kafka-ssl_ca_certs_from_system}
 
@@ -206,52 +202,46 @@ System's CA cert store
 
 Default:  false
 
-### ssl_ca_cert (*secret.Secret, optional) {#kafka-ssl_ca_cert}
-
-CA certificate 
-
-Default: -
-
 ### ssl_client_cert (*secret.Secret, optional) {#kafka-ssl_client_cert}
 
 Client certificate 
 
-Default: -
 
 ### ssl_client_cert_chain (*secret.Secret, optional) {#kafka-ssl_client_cert_chain}
 
 Client certificate chain 
 
-Default: -
 
 ### ssl_client_cert_key (*secret.Secret, optional) {#kafka-ssl_client_cert_key}
 
 Client certificate key 
 
-Default: -
 
 ### ssl_verify_hostname (*bool, optional) {#kafka-ssl_verify_hostname}
 
 Verify certificate hostname 
 
-Default: -
 
-### format (*Format, required) {#kafka-format}
+### slow_flush_log_threshold (string, optional) {#kafka-slow_flush_log_threshold}
 
-[Format](../format/) 
+The threshold for chunk flush performance check. Parameter type is float, not time, default: 20.0 (seconds) If chunk flush takes longer time than this threshold, Fluentd logs a warning message and increases the  `fluentd_output_status_slow_flush_count` metric. 
 
-Default: -
 
-### buffer (*Buffer, optional) {#kafka-buffer}
+### topic_key (string, optional) {#kafka-topic_key}
 
-[Buffer](../buffer/) 
+Topic Key
 
-Default: -
+Default: "topic"
 
-### slow_flush_log_threshold (string, optional) {#kafka-slow_flush_log_threshold}
+### use_default_for_unknown_topic (bool, optional) {#kafka-use_default_for_unknown_topic}
 
-The threshold for chunk flush performance check. Parameter type is float, not time, default: 20.0 (seconds) If chunk flush takes longer time than this threshold, fluentd logs warning message and increases metric fluentd_output_status_slow_flush_count. 
+Use default for unknown topics  
+
+Default:  false
+
+### username (*secret.Secret, optional) {#kafka-username}
+
+Username when using PLAIN/SCRAM SASL authentication 
 
-Default: -
 
 
diff --git a/content/docs/configuration/plugins/outputs/kinesis_firehose.md b/content/docs/configuration/plugins/outputs/kinesis_firehose.md
index 2cfc9b78a..09d990657 100644
--- a/content/docs/configuration/plugins/outputs/kinesis_firehose.md
+++ b/content/docs/configuration/plugins/outputs/kinesis_firehose.md
@@ -6,9 +6,12 @@ generated_file: true
 
 # Kinesis Firehose output plugin for Fluentd
 ## Overview
-  More info at https://github.com/awslabs/aws-fluent-plugin-kinesis#configuration-kinesis_firehose
+
+
+For details, see [https://github.com/awslabs/aws-fluent-plugin-kinesis#configuration-kinesis_firehose](https://github.com/awslabs/aws-fluent-plugin-kinesis#configuration-kinesis_firehose).
 
  ## Example output configurations
+
  ```yaml
  spec:
    kinesisFirehose:
@@ -18,141 +21,121 @@ generated_file: true
        type: json
  ```
 
+
 ## Configuration
 ## KinesisFirehose
 
 Send your logs to a Kinesis Firehose
 
-### delivery_stream_name (string, required) {#kinesisfirehose-delivery_stream_name}
-
-Name of the delivery stream to put data. 
-
-Default: -
-
-### append_new_line (*bool, optional) {#kinesisfirehose-append_new_line}
+### aws_iam_retries (int, optional) {#kinesisfirehose-aws_iam_retries}
 
-If it is enabled, the plugin adds new line character (\n) to each serialized record. Before appending \n, plugin calls chomp and removes separator from the end of each record as chomp_record is true. Therefore, you don't need to enable chomp_record option when you use kinesis_firehose output with default configuration (append_new_line is true). If you want to set append_new_line false, you can choose chomp_record false (default) or true (compatible format with plugin v2). (Default:true) 
+The number of attempts to make (with exponential backoff) when loading instance profile credentials from the EC2 metadata service using an IAM role. Defaults to 5 retries. 
 
-Default: -
 
 ### aws_key_id (*secret.Secret, optional) {#kinesisfirehose-aws_key_id}
 
 AWS access key id. This parameter is required when your agent is not running on EC2 instance with an IAM Role. 
 
-Default: -
 
 ### aws_sec_key (*secret.Secret, optional) {#kinesisfirehose-aws_sec_key}
 
 AWS secret key. This parameter is required when your agent is not running on EC2 instance with an IAM Role. 
 
-Default: -
 
 ### aws_ses_token (*secret.Secret, optional) {#kinesisfirehose-aws_ses_token}
 
 AWS session token. This parameter is optional, but can be provided if using MFA or temporary credentials when your agent is not running on EC2 instance with an IAM Role. 
 
-Default: -
 
-### aws_iam_retries (int, optional) {#kinesisfirehose-aws_iam_retries}
+### append_new_line (*bool, optional) {#kinesisfirehose-append_new_line}
 
-The number of attempts to make (with exponential backoff) when loading instance profile credentials from the EC2 metadata service using an IAM role. Defaults to 5 retries. 
+If it is enabled, the plugin adds new line character (\n) to each serialized record. Before appending \n, plugin calls chomp and removes separator from the end of each record as chomp_record is true. Therefore, you don't need to enable chomp_record option when you use kinesis_firehose output with default configuration (append_new_line is true). If you want to set append_new_line false, you can choose chomp_record false (default) or true (compatible format with plugin v2). (Default:true) 
 
-Default: -
 
 ### assume_role_credentials (*KinesisFirehoseAssumeRoleCredentials, optional) {#kinesisfirehose-assume_role_credentials}
 
 Typically, you can use AssumeRole for cross-account access or federation. 
 
-Default: -
 
-### process_credentials (*KinesisFirehoseProcessCredentials, optional) {#kinesisfirehose-process_credentials}
+### batch_request_max_count (int, optional) {#kinesisfirehose-batch_request_max_count}
 
-This loads AWS access credentials from an external process. 
+Integer, default 500. The number of max count of making batch request from record chunk. It can't exceed the default value because it's API limit. 
 
-Default: -
 
-### region (string, optional) {#kinesisfirehose-region}
+### batch_request_max_size (int, optional) {#kinesisfirehose-batch_request_max_size}
 
-AWS region of your stream. It should be in form like us-east-1, us-west-2. Default nil, which means try to find from environment variable AWS_REGION. 
+Integer. The number of max size of making batch request from record chunk. It can't exceed the default value because it's API limit. 
 
-Default: -
 
-### retries_on_batch_request (int, optional) {#kinesisfirehose-retries_on_batch_request}
+### buffer (*Buffer, optional) {#kinesisfirehose-buffer}
 
-The plugin will put multiple records to Amazon Kinesis Data Streams in batches using PutRecords. A set of records in a batch may fail for reasons documented in the Kinesis Service API Reference for PutRecords. Failed records will be retried retries_on_batch_request times 
+[Buffer](../buffer/) 
 
-Default: -
 
-### reset_backoff_if_success (bool, optional) {#kinesisfirehose-reset_backoff_if_success}
+### delivery_stream_name (string, required) {#kinesisfirehose-delivery_stream_name}
 
-Boolean, default true. If enabled, when after retrying, the next retrying checks the number of succeeded records on the former batch request and reset exponential backoff if there is any success. Because batch request could be composed by requests across shards, simple exponential backoff for the batch request wouldn't work some cases. 
+Name of the delivery stream to put data. 
 
-Default: -
 
-### batch_request_max_count (int, optional) {#kinesisfirehose-batch_request_max_count}
+### format (*Format, optional) {#kinesisfirehose-format}
 
-Integer, default 500. The number of max count of making batch request from record chunk. It can't exceed the default value because it's API limit. 
+[Format](../format/) 
 
-Default: -
 
-### batch_request_max_size (int, optional) {#kinesisfirehose-batch_request_max_size}
+### process_credentials (*KinesisFirehoseProcessCredentials, optional) {#kinesisfirehose-process_credentials}
 
-Integer. The number of max size of making batch request from record chunk. It can't exceed the default value because it's API limit. 
+This loads AWS access credentials from an external process. 
 
-Default: -
 
-### format (*Format, optional) {#kinesisfirehose-format}
+### region (string, optional) {#kinesisfirehose-region}
 
-[Format](../format/) 
+AWS region of your stream. It should be in form like us-east-1, us-west-2. Default nil, which means try to find from environment variable AWS_REGION. 
 
-Default: -
 
-### buffer (*Buffer, optional) {#kinesisfirehose-buffer}
+### reset_backoff_if_success (bool, optional) {#kinesisfirehose-reset_backoff_if_success}
 
-[Buffer](../buffer/) 
+Boolean, default true. If enabled, when after retrying, the next retrying checks the number of succeeded records on the former batch request and reset exponential backoff if there is any success. Because batch request could be composed by requests across shards, simple exponential backoff for the batch request wouldn't work some cases. 
+
+
+### retries_on_batch_request (int, optional) {#kinesisfirehose-retries_on_batch_request}
+
+The plugin will put multiple records to Amazon Kinesis Data Streams in batches using PutRecords. A set of records in a batch may fail for reasons documented in the Kinesis Service API Reference for PutRecords. Failed records will be retried retries_on_batch_request times 
 
-Default: -
 
 ### slow_flush_log_threshold (string, optional) {#kinesisfirehose-slow_flush_log_threshold}
 
 The threshold for chunk flush performance check. Parameter type is float, not time, default: 20.0 (seconds) If chunk flush takes longer time than this threshold, fluentd logs warning message and increases metric fluentd_output_status_slow_flush_count. 
 
-Default: -
 
 
 ## Assume Role Credentials
 
 assume_role_credentials
 
-### role_arn (string, required) {#assume role credentials-role_arn}
+### duration_seconds (string, optional) {#assume-role-credentials-duration_seconds}
 
-The Amazon Resource Name (ARN) of the role to assume 
+The duration, in seconds, of the role session (900-3600) 
 
-Default: -
 
-### role_session_name (string, required) {#assume-role-credentials-role_session_name}
+### external_id (string, optional) {#assume-role-credentials-external_id}
 
-An identifier for the assumed role session 
+A unique identifier that is used by third parties when assuming roles in their customers' accounts. 
 
-Default: -
 
 ### policy (string, optional) {#assume-role-credentials-policy}
 
 An IAM policy in JSON format 
 
-Default: -
 
-### duration_seconds (string, optional) {#assume-role-credentials-duration_seconds}
+### role_arn (string, required) {#assume role credentials-role_arn}
 
-The duration, in seconds, of the role session (900-3600) 
+The Amazon Resource Name (ARN) of the role to assume 
 
-Default: -
 
-### external_id (string, optional) {#assume-role-credentials-external_id}
+### role_session_name (string, required) {#assume-role-credentials-role_session_name}
 
-A unique identifier that is used by third parties when assuming roles in their customers' accounts. 
+An identifier for the assumed role session 
 
-Default: -
 
 
 ## Process Credentials
@@ -163,6 +146,5 @@ process_credentials
 
 Command more info: https://docs.aws.amazon.com/sdk-for-ruby/v3/api/Aws/ProcessCredentials.html 
 
-Default: -
 
 
diff --git a/content/docs/configuration/plugins/outputs/kinesis_stream.md b/content/docs/configuration/plugins/outputs/kinesis_stream.md
index 13cd91956..980162cc0 100644
--- a/content/docs/configuration/plugins/outputs/kinesis_stream.md
+++ b/content/docs/configuration/plugins/outputs/kinesis_stream.md
@@ -6,153 +6,135 @@ generated_file: true
 
 # Kinesis Stream output plugin for Fluentd
 ## Overview
-  More info at https://github.com/awslabs/aws-fluent-plugin-kinesis#configuration-kinesis_streams
-
- ## Example output configurations
- ```yaml
- spec:
-   kinesisStream:
-     stream_name: example-stream-name
-     region: us-east-1
-     format:
-       type: json
- ```
 
-## Configuration
-## KinesisStream
 
-Send your logs to a Kinesis Stream
+For details, see [https://github.com/awslabs/aws-fluent-plugin-kinesis#configuration-kinesis_streams](https://github.com/awslabs/aws-fluent-plugin-kinesis#configuration-kinesis_streams).
 
-### stream_name (string, required) {#kinesisstream-stream_name}
+## Example output configurations
 
-Name of the stream to put data. 
+```yaml
+spec:
+  kinesisStream:
+    stream_name: example-stream-name
+    region: us-east-1
+    format:
+      type: json
+```
 
-Default: -
 
-### partition_key (string, optional) {#kinesisstream-partition_key}
+## Configuration
+## KinesisStream
 
-A key to extract partition key from JSON object. Default nil, which means partition key will be generated randomly. 
+Send your logs to a Kinesis Stream
+
+### aws_iam_retries (int, optional) {#kinesisstream-aws_iam_retries}
+
+The number of attempts to make (with exponential backoff) when loading instance profile credentials from the EC2 metadata service using an IAM role. Defaults to 5 retries. 
 
-Default: -
 
 ### aws_key_id (*secret.Secret, optional) {#kinesisstream-aws_key_id}
 
 AWS access key id. This parameter is required when your agent is not running on EC2 instance with an IAM Role. 
 
-Default: -
 
 ### aws_sec_key (*secret.Secret, optional) {#kinesisstream-aws_sec_key}
 
 AWS secret key. This parameter is required when your agent is not running on EC2 instance with an IAM Role. 
 
-Default: -
 
 ### aws_ses_token (*secret.Secret, optional) {#kinesisstream-aws_ses_token}
 
 AWS session token. This parameter is optional, but can be provided if using MFA or temporary credentials when your agent is not running on EC2 instance with an IAM Role. 
 
-Default: -
 
-### aws_iam_retries (int, optional) {#kinesisstream-aws_iam_retries}
+### assume_role_credentials (*KinesisStreamAssumeRoleCredentials, optional) {#kinesisstream-assume_role_credentials}
 
-The number of attempts to make (with exponential backoff) when loading instance profile credentials from the EC2 metadata service using an IAM role. Defaults to 5 retries. 
+Typically, you can use AssumeRole for cross-account access or federation. 
 
-Default: -
 
-### assume_role_credentials (*KinesisStreamAssumeRoleCredentials, optional) {#kinesisstream-assume_role_credentials}
+### batch_request_max_count (int, optional) {#kinesisstream-batch_request_max_count}
 
-Typically, you can use AssumeRole for cross-account access or federation. 
+Integer, default 500. The number of max count of making batch request from record chunk. It can't exceed the default value because it's API limit. 
 
-Default: -
 
-### process_credentials (*KinesisStreamProcessCredentials, optional) {#kinesisstream-process_credentials}
+### batch_request_max_size (int, optional) {#kinesisstream-batch_request_max_size}
 
-This loads AWS access credentials from an external process. 
+Integer. The number of max size of making batch request from record chunk. It can't exceed the default value because it's API limit. 
 
-Default: -
 
-### region (string, optional) {#kinesisstream-region}
+### buffer (*Buffer, optional) {#kinesisstream-buffer}
 
-AWS region of your stream. It should be in form like us-east-1, us-west-2. Default nil, which means try to find from environment variable AWS_REGION. 
+[Buffer](../buffer/) 
 
-Default: -
 
-### retries_on_batch_request (int, optional) {#kinesisstream-retries_on_batch_request}
+### format (*Format, optional) {#kinesisstream-format}
 
-The plugin will put multiple records to Amazon Kinesis Data Streams in batches using PutRecords. A set of records in a batch may fail for reasons documented in the Kinesis Service API Reference for PutRecords. Failed records will be retried retries_on_batch_request times 
+[Format](../format/) 
 
-Default: -
 
-### reset_backoff_if_success (bool, optional) {#kinesisstream-reset_backoff_if_success}
+### partition_key (string, optional) {#kinesisstream-partition_key}
 
-Boolean, default true. If enabled, when after retrying, the next retrying checks the number of succeeded records on the former batch request and reset exponential backoff if there is any success. Because batch request could be composed by requests across shards, simple exponential backoff for the batch request wouldn't work some cases. 
+A key to extract partition key from JSON object. Default nil, which means partition key will be generated randomly. 
 
-Default: -
 
-### batch_request_max_count (int, optional) {#kinesisstream-batch_request_max_count}
+### process_credentials (*KinesisStreamProcessCredentials, optional) {#kinesisstream-process_credentials}
 
-Integer, default 500. The number of max count of making batch request from record chunk. It can't exceed the default value because it's API limit. 
+This loads AWS access credentials from an external process. 
 
-Default: -
 
-### batch_request_max_size (int, optional) {#kinesisstream-batch_request_max_size}
+### region (string, optional) {#kinesisstream-region}
 
-Integer. The number of max size of making batch request from record chunk. It can't exceed the default value because it's API limit. 
+AWS region of your stream. It should be in form like us-east-1, us-west-2. Default nil, which means try to find from environment variable AWS_REGION. 
 
-Default: -
 
-### format (*Format, optional) {#kinesisstream-format}
+### reset_backoff_if_success (bool, optional) {#kinesisstream-reset_backoff_if_success}
 
-[Format](../format/) 
+Boolean, default true. If enabled, when after retrying, the next retrying checks the number of succeeded records on the former batch request and reset exponential backoff if there is any success. Because batch request could be composed by requests across shards, simple exponential backoff for the batch request wouldn't work some cases. 
 
-Default: -
 
-### buffer (*Buffer, optional) {#kinesisstream-buffer}
+### retries_on_batch_request (int, optional) {#kinesisstream-retries_on_batch_request}
 
-[Buffer](../buffer/) 
+The plugin will put multiple records to Amazon Kinesis Data Streams in batches using PutRecords. A set of records in a batch may fail for reasons documented in the Kinesis Service API Reference for PutRecords. Failed records will be retried retries_on_batch_request times 
 
-Default: -
 
 ### slow_flush_log_threshold (string, optional) {#kinesisstream-slow_flush_log_threshold}
 
 The threshold for chunk flush performance check. Parameter type is float, not time, default: 20.0 (seconds) If chunk flush takes longer time than this threshold, fluentd logs warning message and increases metric fluentd_output_status_slow_flush_count. 
 
-Default: -
+
+### stream_name (string, required) {#kinesisstream-stream_name}
+
+Name of the stream to put data. 
+
 
 
 ## Assume Role Credentials
 
 assume_role_credentials
 
-### role_arn (string, required) {#assume-role-credentials-role_arn}
-
-The Amazon Resource Name (ARN) of the role to assume 
+### duration_seconds (string, optional) {#assume-role-credentials-duration_seconds}
 
-Default: -
+The duration, in seconds, of the role session (900-3600) 
 
-### role_session_name (string, required) {#assume-role-credentials-role_session_name}
 
-An identifier for the assumed role session 
+### external_id (string, optional) {#assume-role-credentials-external_id}
 
-Default: -
+A unique identifier that is used by third parties when assuming roles in their customers' accounts. 
 
 ### policy (string, optional) {#assume-role-credentials-policy}
 
 An IAM policy in JSON format 
 
-Default: -
 
-### duration_seconds (string, optional) {#assume-role-credentials-duration_seconds}
+### role_arn (string, required) {#assume-role-credentials-role_arn}
 
-The duration, in seconds, of the role session (900-3600) 
+The Amazon Resource Name (ARN) of the role to assume 
 
-Default: -
 
-### external_id (string, optional) {#assume-role-credentials-external_id}
+### role_session_name (string, required) {#assume-role-credentials-role_session_name}
 
-A unique identifier that is used by third parties when assuming roles in their customers' accounts. 
+An identifier for the assumed role session 
 
-Default: -
 
 
 ## Process Credentials
@@ -163,6 +145,5 @@ process_credentials
 
 Command more info: https://docs.aws.amazon.com/sdk-for-ruby/v3/api/Aws/ProcessCredentials.html 
 
-Default: -
 
 
diff --git a/content/docs/configuration/plugins/outputs/logdna.md b/content/docs/configuration/plugins/outputs/logdna.md
index db9b37a8d..f07b70e9e 100644
--- a/content/docs/configuration/plugins/outputs/logdna.md
+++ b/content/docs/configuration/plugins/outputs/logdna.md
@@ -6,7 +6,7 @@ generated_file: true
 
 # [LogDNA Output](https://github.com/logdna/fluent-plugin-logdna)
 ## Overview
- This plugin has been designed to output logs to LogDNA. Example Deployment: [Transport Nginx Access Logs into LogDNA with Logging Operator](https://raw.githubusercontent.com/banzaicloud/logging-operator/master/docs/examples/logging_output_logdna.yaml)
+ This plugin has been designed to output logs to LogDNA.
 
 ## Configuration
 ## LogDNA
@@ -17,31 +17,21 @@ Send your logs to LogDNA
 
 LogDNA Api key 
 
-Default: -
-
-### hostname (string, required) {#logdna-hostname}
-
-Hostname 
-
-Default: -
 
 ### app (string, optional) {#logdna-app}
 
 Application name 
 
-Default: -
 
-### tags (string, optional) {#logdna-tags}
+### buffer (*Buffer, optional) {#logdna-buffer}
 
-Comma-Separated List of Tags, Optional 
+[Buffer](../buffer/) 
 
-Default: -
 
-### request_timeout (string, optional) {#logdna-request_timeout}
+### hostname (string, required) {#logdna-hostname}
 
-HTTPS POST Request Timeout, Optional. Supports s and ms Suffices  
+Hostname 
 
-Default:  30 s
 
 ### ingester_domain (string, optional) {#logdna-ingester_domain}
 
@@ -55,44 +45,53 @@ Custom Ingester Endpoint, Optional
 
 Default:  /logs/ingest
 
-### buffer (*Buffer, optional) {#logdna-buffer}
+### request_timeout (string, optional) {#logdna-request_timeout}
 
-[Buffer](../buffer/) 
+HTTPS POST Request Timeout, Optional. Supports s and ms Suffices  
 
-Default: -
+Default:  30 s
 
 ### slow_flush_log_threshold (string, optional) {#logdna-slow_flush_log_threshold}
 
-The threshold for chunk flush performance check. Parameter type is float, not time, default: 20.0 (seconds) If chunk flush takes longer time than this threshold, fluentd logs warning message and increases metric fluentd_output_status_slow_flush_count. 
-
-Default: -
-
-
- ## Example `LogDNA` filter configurations
- ```yaml
- apiVersion: logging.banzaicloud.io/v1beta1
- kind: Output
- metadata:
-   name: logdna-output-sample
- spec:
-   logdna:
-     api_key: xxxxxxxxxxxxxxxxxxxxxxxxxxx
-     hostname: logging-operator
-     app: my-app
-     tags: web,dev
-     ingester_domain https://logs.logdna.com
-     ingester_endpoint /logs/ingest
- ```
-
- #### Fluentd Config Result
- ```
+The threshold for chunk flush performance check. Parameter type is float, not time, default: 20.0 (seconds) If chunk flush takes longer time than this threshold, Fluentd logs a warning message and increases the `fluentd_output_status_slow_flush_count` metric. 
+
+
+### tags (string, optional) {#logdna-tags}
+
+Comma-Separated List of Tags, Optional 
+
+
+
+## Example `LogDNA` filter configurations
+
+{{< highlight yaml >}}
+apiVersion: logging.banzaicloud.io/v1beta1
+kind: Output
+metadata:
+  name: logdna-output-sample
+spec:
+  logdna:
+    api_key: xxxxxxxxxxxxxxxxxxxxxxxxxxx
+    hostname: logging-operator
+    app: my-app
+    tags: web,dev
+    ingester_domain https://logs.logdna.com
+    ingester_endpoint /logs/ingest
+{{</ highlight >}}
+
+Fluentd config result:
+
+{{< highlight yaml >}}
 <match **>
+
 	@type logdna
 	@id test_logdna
 	api_key xxxxxxxxxxxxxxxxxxxxxxxxxxy
 	app my-app
 	hostname logging-operator
+
 </match>
- ```
+{{</ highlight >}}
+
 
 ---
diff --git a/content/docs/configuration/plugins/outputs/logz.md b/content/docs/configuration/plugins/outputs/logz.md
index 896892f2a..6f34a3494 100644
--- a/content/docs/configuration/plugins/outputs/logz.md
+++ b/content/docs/configuration/plugins/outputs/logz.md
@@ -6,113 +6,99 @@ generated_file: true
 
 # LogZ output plugin for Fluentd
 ## Overview
-More info at https://github.com/tarokkk/fluent-plugin-logzio
-
- ## Example output configurations
- ```yaml
- spec:
-   logz:
-     endpoint:
-       url: https://listener.logz.io
-       port: 8071
-       token:
-         valueFrom:
-          secretKeyRef:
-      	  name: logz-token
-            key: token
-     output_include_tags: true
-     output_include_time: true
-     buffer:
-       type: file
-       flush_mode: interval
-       flush_thread_count: 4
-       flush_interval: 5s
-       chunk_limit_size: 16m
-       queue_limit_length: 4096
- ```
+
+For details, see [https://github.com/tarokkk/fluent-plugin-logzio](https://github.com/tarokkk/fluent-plugin-logzio).
+
+## Example output configurations
+
+```yaml
+spec:
+  logz:
+    endpoint:
+      url: https://listener.logz.io
+      port: 8071
+      token:
+        valueFrom:
+         secretKeyRef:
+           name: logz-token
+           key: token
+    output_include_tags: true
+    output_include_time: true
+    buffer:
+      type: file
+      flush_mode: interval
+      flush_thread_count: 4
+      flush_interval: 5s
+      chunk_limit_size: 16m
+      queue_limit_length: 4096
+```
+
 
 ## Configuration
 ## Logzio
 
 LogZ Send your logs to LogZ.io
 
-### endpoint (*Endpoint, required) {#logzio-endpoint}
+### buffer (*Buffer, optional) {#logzio-buffer}
 
-Define LogZ endpoint URL 
+[Buffer](../buffer/) 
 
-Default: -
 
-### output_include_time (bool, optional) {#logzio-output_include_time}
+### bulk_limit (int, optional) {#logzio-bulk_limit}
 
-Should the appender add a timestamp to your logs on their process time (recommended). 
+Limit to the size of the Logz.io upload bulk. Defaults to 1000000 bytes leaving about 24kB for overhead. 
 
-Default: -
 
-### output_include_tags (bool, optional) {#logzio-output_include_tags}
+### bulk_limit_warning_limit (int, optional) {#logzio-bulk_limit_warning_limit}
 
-Should the appender add the fluentd tag to the document, called "fluentd_tag" 
+Limit to the size of the Logz.io warning message when a record exceeds bulk_limit to prevent a recursion when Fluent warnings are sent to the Logz.io output. 
 
-Default: -
 
-### http_idle_timeout (int, optional) {#logzio-http_idle_timeout}
+### endpoint (*Endpoint, required) {#logzio-endpoint}
 
-Timeout in seconds that the http persistent connection will stay open without traffic. 
+Define LogZ endpoint URL 
 
-Default: -
 
-### retry_count (int, optional) {#logzio-retry_count}
+### gzip (bool, optional) {#logzio-gzip}
 
-How many times to resend failed bulks. 
+Should the plugin ship the logs in gzip compression. Default is false. 
 
-Default: -
 
-### retry_sleep (int, optional) {#logzio-retry_sleep}
+### http_idle_timeout (int, optional) {#logzio-http_idle_timeout}
 
-How long to sleep initially between retries, exponential step-off. 
+Timeout in seconds that the http persistent connection will stay open without traffic. 
 
-Default: -
 
-### bulk_limit (int, optional) {#logzio-bulk_limit}
+### output_include_tags (bool, optional) {#logzio-output_include_tags}
 
-Limit to the size of the Logz.io upload bulk. Defaults to 1000000 bytes leaving about 24kB for overhead. 
+Should the appender add the fluentd tag to the document, called "fluentd_tag" 
 
-Default: -
 
-### bulk_limit_warning_limit (int, optional) {#logzio-bulk_limit_warning_limit}
+### output_include_time (bool, optional) {#logzio-output_include_time}
 
-Limit to the size of the Logz.io warning message when a record exceeds bulk_limit to prevent a recursion when Fluent warnings are sent to the Logz.io output. 
+Should the appender add a timestamp to your logs on their process time (recommended). 
 
-Default: -
 
-### gzip (bool, optional) {#logzio-gzip}
+### retry_count (int, optional) {#logzio-retry_count}
 
-Should the plugin ship the logs in gzip compression. Default is false. 
+How many times to resend failed bulks. 
 
-Default: -
 
-### buffer (*Buffer, optional) {#logzio-buffer}
+### retry_sleep (int, optional) {#logzio-retry_sleep}
 
-[Buffer](../buffer/) 
+How long to sleep initially between retries, exponential step-off. 
 
-Default: -
 
 ### slow_flush_log_threshold (string, optional) {#logzio-slow_flush_log_threshold}
 
-The threshold for chunk flush performance check. Parameter type is float, not time, default: 20.0 (seconds) If chunk flush takes longer time than this threshold, fluentd logs warning message and increases metric fluentd_output_status_slow_flush_count. 
+The threshold for chunk flush performance check. Parameter type is float, not time, default: 20.0 (seconds) If chunk flush takes longer time than this threshold, Fluentd logs a warning message and increases the `fluentd_output_status_slow_flush_count` metric. 
 
-Default: -
 
 
 ## Endpoint
 
 Endpoint defines connection details for LogZ.io.
 
-### url (string, optional) {#endpoint-url}
-
-LogZ URL. 
-
-Default: `https://listener.logz.io`
-
 ### port (int, optional) {#endpoint-port}
 
 Port over which to connect to LogZ URL. 
@@ -123,6 +109,11 @@ Default: 8071
 
 LogZ API Token. [Secret](../secret/) 
 
-Default: -
+
+### url (string, optional) {#endpoint-url}
+
+LogZ URL. 
+
+Default: https://listener.logz.io
 
 
diff --git a/content/docs/configuration/plugins/outputs/loki.md b/content/docs/configuration/plugins/outputs/loki.md
index 937b84fe6..f6171b571 100644
--- a/content/docs/configuration/plugins/outputs/loki.md
+++ b/content/docs/configuration/plugins/outputs/loki.md
@@ -6,60 +6,69 @@ generated_file: true
 
 # Loki output plugin 
 ## Overview
-Fluentd output plugin to ship logs to a Loki server.
-More info at https://grafana.com/docs/loki/latest/clients/fluentd/
-
->Example: [Store Nginx Access Logs in Grafana Loki with Logging Operator](../../../../examples/loki-nginx/)
-
- ## Example output configurations
- ```yaml
- spec:
-   loki:
-     url: http://loki:3100
-     buffer:
-       timekey: 1m
-       timekey_wait: 30s
-       timekey_use_utc: true
- ```
 
-## Configuration
-## Output Config
+Fluentd output plugin to ship logs to a Loki server. For details, see [https://grafana.com/docs/loki/latest/clients/fluentd/](https://grafana.com/docs/loki/latest/clients/fluentd/).
 
-### url (string, optional) {#output-config-url}
+For a detailed example, see [Store Nginx Access Logs in Grafana Loki with Logging Operator](../../../../quickstarts/loki-nginx/).
 
-The url of the Loki server to send logs to.  
+## Example output configurations
 
-Default: `https://logs-us-west1.grafana.net`
+```yaml
+spec:
+  loki:
+    url: http://loki:3100
+    buffer:
+      timekey: 1m
+      timekey_wait: 30s
+      timekey_use_utc: true
+```
 
-### username (*secret.Secret, optional) {#output-config-username}
 
-Specify a username if the Loki server requires authentication. [Secret](../secret/) 
+## Configuration
+## Output Config
 
-Default: -
+### buffer (*Buffer, optional) {#output-config-buffer}
 
-### password (*secret.Secret, optional) {#output-config-password}
+[Buffer](../buffer/) 
 
-Specify password if the Loki server requires authentication. [Secret](../secret/) 
 
-Default: -
+### ca_cert (*secret.Secret, optional) {#output-config-ca_cert}
+
+TLS: CA certificate file for server certificate verification [Secret](../secret/) 
+
 
 ### cert (*secret.Secret, optional) {#output-config-cert}
 
 TLS: parameters for presenting a client certificate [Secret](../secret/) 
 
-Default: -
 
-### key (*secret.Secret, optional) {#output-config-key}
+### configure_kubernetes_labels (*bool, optional) {#output-config-configure_kubernetes_labels}
 
-TLS: parameters for presenting a client certificate [Secret](../secret/) 
+Configure Kubernetes metadata in a Prometheus like format  
 
-Default: -
+Default:  false
 
-### ca_cert (*secret.Secret, optional) {#output-config-ca_cert}
+### drop_single_key (*bool, optional) {#output-config-drop_single_key}
 
-TLS: CA certificate file for server certificate verification [Secret](../secret/) 
+If a record only has 1 key, then just set the log line to the value and discard the key.  
+
+Default:  false
+
+### extra_labels (map[string]string, optional) {#output-config-extra_labels}
+
+Set of extra labels to include with every Loki stream. 
+
+### extract_kubernetes_labels (*bool, optional) {#output-config-extract_kubernetes_labels}
+
+Extract kubernetes labels as loki labels  
 
-Default: -
+Default:  false
+
+### include_thread_label (*bool, optional) {#output-config-include_thread_label}
+
+whether to include the fluentd_thread label when multiple threads are used for flushing.  
+
+Default:  true
 
 ### insecure_tls (*bool, optional) {#output-config-insecure_tls}
 
@@ -67,23 +76,15 @@ TLS: disable server certificate verification
 
 Default:  false
 
-### tenant (string, optional) {#output-config-tenant}
+### key (*secret.Secret, optional) {#output-config-key}
 
-Loki is a multi-tenant log storage platform and all requests sent must include a tenant. 
+TLS: parameters for presenting a client certificate [Secret](../secret/) 
 
-Default: -
 
 ### labels (Label, optional) {#output-config-labels}
 
 Set of labels to include with every Loki stream. 
 
-Default: -
-
-### extra_labels (map[string]string, optional) {#output-config-extra_labels}
-
-Set of extra labels to include with every Loki stream. 
-
-Default: -
 
 ### line_format (string, optional) {#output-config-line_format}
 
@@ -91,11 +92,10 @@ Format to use when flattening the record to a log line: json, key_value (default
 
 Default: json
 
-### extract_kubernetes_labels (*bool, optional) {#output-config-extract_kubernetes_labels}
+### password (*secret.Secret, optional) {#output-config-password}
 
-Extract kubernetes labels as loki labels  
+Specify password if the Loki server requires authentication. [Secret](../secret/) 
 
-Default:  false
 
 ### remove_keys ([]string, optional) {#output-config-remove_keys}
 
@@ -103,34 +103,24 @@ Comma separated list of needless record keys to remove
 
 Default:  []
 
-### drop_single_key (*bool, optional) {#output-config-drop_single_key}
-
-If a record only has 1 key, then just set the log line to the value and discard the key.  
-
-Default:  false
-
-### configure_kubernetes_labels (*bool, optional) {#output-config-configure_kubernetes_labels}
-
-Configure Kubernetes metadata in a Prometheus like format  
+### slow_flush_log_threshold (string, optional) {#output-config-slow_flush_log_threshold}
 
-Default:  false
+The threshold for chunk flush performance check. Parameter type is float, not time, default: 20.0 (seconds) If chunk flush takes longer time than this threshold, Fluentd logs a warning message and increases the `fluentd_output_status_slow_flush_count` metric. 
 
-### include_thread_label (*bool, optional) {#output-config-include_thread_label}
+### tenant (string, optional) {#output-config-tenant}
 
-whether to include the fluentd_thread label when multiple threads are used for flushing.  
+Loki is a multi-tenant log storage platform and all requests sent must include a tenant. 
 
-Default:  true
 
-### buffer (*Buffer, optional) {#output-config-buffer}
+### url (string, optional) {#output-config-url}
 
-[Buffer](../buffer/) 
+The url of the Loki server to send logs to.  
 
-Default: -
+Default: `https://logs-us-west1.grafana.net`
 
-### slow_flush_log_threshold (string, optional) {#output-config-slow_flush_log_threshold}
+### username (*secret.Secret, optional) {#output-config-username}
 
-The threshold for chunk flush performance check. Parameter type is float, not time, default: 20.0 (seconds) If chunk flush takes longer time than this threshold, fluentd logs warning message and increases metric fluentd_output_status_slow_flush_count. 
+Specify a username if the Loki server requires authentication. [Secret](../secret/) 
 
-Default: -
 
 
diff --git a/content/docs/configuration/plugins/outputs/mattermost.md b/content/docs/configuration/plugins/outputs/mattermost.md
index b6032546e..5420a117c 100644
--- a/content/docs/configuration/plugins/outputs/mattermost.md
+++ b/content/docs/configuration/plugins/outputs/mattermost.md
@@ -6,64 +6,61 @@ generated_file: true
 
 # Mattermost plugin for Fluentd
 ## Overview
- Sends logs to Mattermost via webhooks.
- More info at https://github.com/levigo-systems/fluent-plugin-mattermost
 
- ## Example output configurations
- ```yaml
- spec:
+Sends logs to Mattermost via webhooks.
+For details, see [https://github.com/levigo-systems/fluent-plugin-mattermost](https://github.com/levigo-systems/fluent-plugin-mattermost).
 
-	mattermost:
-	  webhook_url: https://xxx.xx/hooks/xxxxxxxxxxxxxxx
-	  channel_id: xxxxxxxxxxxxxxx
-	  message_color: "#FFA500"
-	  enable_tls: false
+## Example output configurations
+
+```yaml
+spec:
+  mattermost:
+    webhook_url: https://xxx.xx/hooks/xxxxxxxxxxxxxxx
+    channel_id: xxxxxxxxxxxxxxx
+    message_color: "#FFA500"
+    enable_tls: false
+```
 
- ```
 
 ## Configuration
 ## Output Config
 
-### webhook_url (*secret.Secret, required) {#output-config-webhook_url}
+### ca_path (*secret.Secret, optional) {#output-config-ca_path}
 
-webhook_url Incoming Webhook URI (Required for Incoming Webhook mode). 
+The path of the CA certificates. 
 
-Default: -
 
 ### channel_id (string, optional) {#output-config-channel_id}
 
-channel_id the id of the channel where you want to receive the information. 
+The ID of the channel where you want to receive the information. 
 
-Default: -
 
-### message_color (string, optional) {#output-config-message_color}
+### enable_tls (*bool, optional) {#output-config-enable_tls}
 
-message_color color of the message you are sending, the format is hex code.  
+You can set the communication channel if it uses TLS.
 
-Default:  #A9A9A9
+Default:  true
 
-### message_title (string, optional) {#output-config-message_title}
+### message (string, optional) {#output-config-message}
 
-message_title title you want to add to the message.  
+The message you want to send. It can be a static message, which you add at this point, or you can receive the Fluentd infos with the %s 
 
-Default:  fluent_title_default
 
-### message (string, optional) {#output-config-message}
+### message_color (string, optional) {#output-config-message_color}
 
-message The message you want to send, can be a static message, which you add at this point, or you can receive the fluent infos with the %s 
+Color of the message you are sending, in hexadecimal format.
 
-Default: -
+Default:  #A9A9A9
 
-### enable_tls (*bool, optional) {#output-config-enable_tls}
+### message_title (string, optional) {#output-config-message_title}
 
-enable_tls you can set the communication channel if it uses tls.  
+The title you want to add to the message.
 
-Default:  true
+Default:  fluent_title_default
 
-### ca_path (*secret.Secret, optional) {#output-config-ca_path}
+### webhook_url (*secret.Secret, required) {#output-config-webhook_url}
 
-ca_path you can set the path of the certificates. 
+Incoming Webhook URI (Required for Incoming Webhook mode). 
 
-Default: -
 
 
diff --git a/content/docs/configuration/plugins/outputs/newrelic.md b/content/docs/configuration/plugins/outputs/newrelic.md
index 6827dd762..b5b0f5ccd 100644
--- a/content/docs/configuration/plugins/outputs/newrelic.md
+++ b/content/docs/configuration/plugins/outputs/newrelic.md
@@ -6,18 +6,21 @@ generated_file: true
 
 # New Relic Logs plugin for Fluentd
 ## Overview
-**newrelic** output plugin send log data to New Relic Logs
-
- ## Example output configurations
- ```yaml
- spec:
-   newrelic:
-     license_key:
-       valueFrom:
-         secretKeyRef:
-           name: logging-newrelic
-           key: licenseKey
- ```
+
+Output plugin send log data to New Relic Logs
+
+## Example output configurations
+
+```yaml
+spec:
+  newrelic:
+    license_key:
+      valueFrom:
+        secretKeyRef:
+          name: logging-newrelic
+          key: licenseKey
+```
+
 
 ## Configuration
 ## Output Config
@@ -26,13 +29,6 @@ generated_file: true
 
 New Relic API Insert key [Secret](../secret/) 
 
-Default: -
-
-### license_key (*secret.Secret, optional) {#output-config-license_key}
-
-New Relic License Key (recommended) [Secret](../secret/" LicenseKey *secret.Secret `json:"license_key)` 
-
-Default: -
 
 ### base_uri (string, optional) {#output-config-base_uri}
 
@@ -40,16 +36,19 @@ New Relic ingestion endpoint [Secret](../secret/)
 
 Default: `https://log-api.newrelic.com/log/v1`
 
+### buffer (*Buffer, optional) {#output-config-buffer}
+
+[Buffer](../buffer/) 
+
+
 ### format (*Format, optional) {#output-config-format}
 
 [Format](../format/) 
 
-Default: -
 
-### buffer (*Buffer, optional) {#output-config-buffer}
+### license_key (*secret.Secret, optional) {#output-config-license_key}
 
-[Buffer](../buffer/) 
+New Relic License Key (recommended) [Secret](../secret/" LicenseKey *secret.Secret `json:"license_key)` 
 
-Default: -
 
 
diff --git a/content/docs/configuration/plugins/outputs/opensearch.md b/content/docs/configuration/plugins/outputs/opensearch.md
index c4ee0408e..da5de1a41 100644
--- a/content/docs/configuration/plugins/outputs/opensearch.md
+++ b/content/docs/configuration/plugins/outputs/opensearch.md
@@ -6,502 +6,473 @@ generated_file: true
 
 # OpenSearch output plugin for Fluentd
 ## Overview
-More info at https://github.com/fluent/fluent-plugin-opensearch
->Example Deployment: [Save all logs to OpenSearch](../../../../quickstarts/es-nginx/)
-
- ## Example output configurations
- ```yaml
- spec:
-   opensearch:
-     host: opensearch-cluster.default.svc.cluster.local
-     port: 9200
-     scheme: https
-     ssl_verify: false
-     ssl_version: TLSv1_2
-     buffer:
-       timekey: 1m
-       timekey_wait: 30s
-       timekey_use_utc: true
- ```
+
+For details, see [https://github.com/fluent/fluent-plugin-opensearch](https://github.com/fluent/fluent-plugin-opensearch).
+
+For an example deployment, see [Save all logs to OpenSearch](../../../../quickstarts/es-nginx/).
+
+## Example output configurations
+
+```yaml
+spec:
+  opensearch:
+    host: opensearch-cluster.default.svc.cluster.local
+    port: 9200
+    scheme: https
+    ssl_verify: false
+    ssl_version: TLSv1_2
+    buffer:
+      timekey: 1m
+      timekey_wait: 30s
+      timekey_use_utc: true
+```
+
 
 ## Configuration
 ## OpenSearch
 
 Send your logs to OpenSearch
 
-### host (string, optional) {#opensearch-host}
+### application_name (*string, optional) {#opensearch-application_name}
 
-You can specify OpenSearch host by this parameter.  
+Specify the application name for the rollover index to be created. 
 
-Default: localhost
+Default:  default
 
-### port (int, optional) {#opensearch-port}
+### buffer (*Buffer, optional) {#opensearch-buffer}
 
-You can specify OpenSearch port by this parameter. 
 
-Default:  9200
+### bulk_message_request_threshold (string, optional) {#opensearch-bulk_message_request_threshold}
 
-### user (string, optional) {#opensearch-user}
+Configure bulk_message request splitting threshold size. Default value is 20MB. (20 * 1024 * 1024) If you specify this size as negative number, bulk_message request splitting feature will be disabled.  
 
-User for HTTP Basic authentication. This plugin will escape required URL encoded characters within %{} placeholders. e.g. %{demo+} 
+Default:  20MB
 
-Default: -
+### ca_file (*secret.Secret, optional) {#opensearch-ca_file}
 
-### password (*secret.Secret, optional) {#opensearch-password}
+CA certificate 
 
-Password for HTTP Basic authentication. [Secret](../secret/) 
+### catch_transport_exception_on_retry (*bool, optional) {#opensearch-catch_transport_exception_on_retry}
 
-Default: -
+catch_transport_exception_on_retry (default: true) 
 
-### path (string, optional) {#opensearch-path}
+Default: true
 
-Path for HTTP Basic authentication. 
+### client_cert (*secret.Secret, optional) {#opensearch-client_cert}
 
-Default: -
+Client certificate 
 
-### scheme (string, optional) {#opensearch-scheme}
 
-Connection scheme  
+### client_key (*secret.Secret, optional) {#opensearch-client_key}
 
-Default:  http
+Client certificate key 
 
-### hosts (string, optional) {#opensearch-hosts}
 
-You can specify multiple OpenSearch hosts with separator ",". If you specify hosts option, host and port options are ignored. 
+### client_key_pass (*secret.Secret, optional) {#opensearch-client_key_pass}
 
-Default: -
+Client key password 
 
-### target_index_key (string, optional) {#opensearch-target_index_key}
 
-Tell this plugin to find the index name to write to in the record under this key in preference to other mechanisms. Key can be specified as path to nested record using dot ('.') as a separator. 
+### compression_level (string, optional) {#opensearch-compression_level}
 
-Default: -
+compression_level 
 
-### time_key_format (string, optional) {#opensearch-time_key_format}
 
-The format of the time stamp field (@timestamp or what you specify with time_key). This parameter only has an effect when logstash_format is true as it only affects the name of the index we write to. 
+### custom_headers (string, optional) {#opensearch-custom_headers}
 
-Default: -
+This parameter adds additional headers to request. Example: `{"token":"secret"}`
 
-### time_precision (string, optional) {#opensearch-time_precision}
+Default:  {}
 
-Should the record not include a time_key, define the degree of sub-second time precision to preserve from the time portion of the routed event. 
+### customize_template (string, optional) {#opensearch-customize_template}
 
-Default: -
+Specify the string and its value to be replaced in form of hash. Can contain multiple key value pair that would be replaced in the specified template_file. This setting only creates template and to add rollover index please check the rollover_index configuration. 
 
-### include_timestamp (bool, optional) {#opensearch-include_timestamp}
 
-Adds a @timestamp field to the log, following all settings logstash_format does, except without the restrictions on index_name. This allows one to log to an alias in OpenSearch and utilize the rollover API. 
+### data_stream_enable (*bool, optional) {#opensearch-data_stream_enable}
 
-Default:  false
+Use @type opensearch_data_stream 
 
-### logstash_format (bool, optional) {#opensearch-logstash_format}
 
-Enable Logstash log format. 
+### data_stream_name (string, optional) {#opensearch-data_stream_name}
 
-Default:  false
+You can specify Opensearch data stream name by this parameter. This parameter is mandatory for opensearch_data_stream. 
 
-### logstash_prefix (string, optional) {#opensearch-logstash_prefix}
 
-Set the Logstash prefix. 
+### data_stream_template_name (string, optional) {#opensearch-data_stream_template_name}
 
-Default:  logstash
+Specify an existing index template for the data stream. If not present, a new template is created and named after the data stream.  
 
-### logstash_prefix_separator (string, optional) {#opensearch-logstash_prefix_separator}
+Default:  data_stream_name
 
-Set the Logstash prefix separator. 
+### default_opensearch_version (int, optional) {#opensearch-default_opensearch_version}
 
-Default:  -
+max_retry_get_os_version  
 
-### logstash_dateformat (string, optional) {#opensearch-logstash_dateformat}
+Default:  1
 
-Set the Logstash date format. 
+### emit_error_for_missing_id (bool, optional) {#opensearch-emit_error_for_missing_id}
 
-Default:  %Y.%m.%d
+emit_error_for_missing_id  
 
-### utc_index (*bool, optional) {#opensearch-utc_index}
+Default:  false
+
+### emit_error_label_event (*bool, optional) {#opensearch-emit_error_label_event}
 
-By default, the records inserted into index logstash-YYMMDD with UTC (Coordinated Universal Time). This option allows to use local time if you describe utc_index to false.(default: true) 
+emit_error_label_event (default: true) 
 
 Default: true
 
-### suppress_type_name (*bool, optional) {#opensearch-suppress_type_name}
+### endpoint (*OpenSearchEndpointCredentials, optional) {#opensearch-endpoint}
 
-Suppress type name to avoid warnings in OpenSearch 
+AWS Endpoint Credentials 
 
-Default: -
 
-### index_name (string, optional) {#opensearch-index_name}
+### exception_backup (*bool, optional) {#opensearch-exception_backup}
 
-The index name to write events to  
+Indicates whether to backup chunk when ignore exception occurs.
 
-Default:  fluentd
+Default: true
 
-### id_key (string, optional) {#opensearch-id_key}
+### fail_on_detecting_os_version_retry_exceed (*bool, optional) {#opensearch-fail_on_detecting_os_version_retry_exceed}
 
-Field on your data to identify the data uniquely 
+fail_on_detecting_os_version_retry_exceed (default: true) 
 
-Default: -
+Default: true
 
-### write_operation (string, optional) {#opensearch-write_operation}
+### fail_on_putting_template_retry_exceed (*bool, optional) {#opensearch-fail_on_putting_template_retry_exceed}
 
-The write_operation can be any of: (index,create,update,upsert) 
+Indicates whether to fail when max_retry_putting_template is exceeded. If you have multiple output plugin, you could use this property to do not fail on Fluentd statup.(default: true) 
 
-Default:  index
+Default: true
 
-### parent_key (string, optional) {#opensearch-parent_key}
+### flatten_hashes (bool, optional) {#opensearch-flatten_hashes}
 
-parent_key 
+[https://github.com/fluent/fluent-plugin-opensearch#hash-flattening](https://github.com/fluent/fluent-plugin-opensearch#hash-flattening) 
 
-Default: -
 
-### routing_key (string, optional) {#opensearch-routing_key}
+### flatten_hashes_separator (string, optional) {#opensearch-flatten_hashes_separator}
 
-routing_key 
+Flatten separator 
 
-Default: -
 
-### request_timeout (string, optional) {#opensearch-request_timeout}
+### host (string, optional) {#opensearch-host}
 
-You can specify HTTP request timeout. 
+You can specify OpenSearch host by this parameter.  
 
-Default:  5s
+Default: localhost
 
-### reload_connections (*bool, optional) {#opensearch-reload_connections}
+### hosts (string, optional) {#opensearch-hosts}
 
-You can tune how the OpenSearch-transport host reloading feature works.(default: true) 
+You can specify multiple OpenSearch hosts with separator ",". If you specify hosts option, host and port options are ignored. 
 
-Default: true
 
-### reload_on_failure (bool, optional) {#opensearch-reload_on_failure}
+### http_backend (string, optional) {#opensearch-http_backend}
 
-Indicates that the OpenSearch-transport will try to reload the nodes addresses if there is a failure while making the request, this can be useful to quickly remove a dead node from the list of addresses. 
+With http_backend typhoeus, the opensearch plugin uses typhoeus faraday http backend. Typhoeus can handle HTTP keepalive.
 
-Default:  false
+Default:  excon
 
-### retry_tag (string, optional) {#opensearch-retry_tag}
+### http_backend_excon_nonblock (*bool, optional) {#opensearch-http_backend_excon_nonblock}
 
-This setting allows custom routing of messages in response to bulk request failures. The default behavior is to emit failed records using the same tag that was provided. 
+http_backend_excon_nonblock
 
-Default: -
+Default: true
 
-### resurrect_after (string, optional) {#opensearch-resurrect_after}
+### id_key (string, optional) {#opensearch-id_key}
 
-You can set in the OpenSearch-transport how often dead connections from the OpenSearch-transport's pool will be resurrected. 
+Field on your data to identify the data uniquely 
 
-Default:  60s
 
-### time_key (string, optional) {#opensearch-time_key}
+### ignore_exceptions (string, optional) {#opensearch-ignore_exceptions}
 
-By default, when inserting records in Logstash format, @timestamp is dynamically created with the time at log ingestion. If you'd like to use a custom time, include an @timestamp with your record. 
+A list of exception that will be ignored - when the exception occurs the chunk will be discarded and the buffer retry mechanism won't be called. It is possible also to specify classes at higher level in the hierarchy. 
 
-Default: -
 
-### time_key_exclude_timestamp (bool, optional) {#opensearch-time_key_exclude_timestamp}
+### include_index_in_url (bool, optional) {#opensearch-include_index_in_url}
 
-time_key_exclude_timestamp  
+With this option set to true, Fluentd manifests the index name in the request URL (rather than in the request body). You can use this option to enforce an URL-based access control. 
 
-Default:  false
 
-### ssl_verify (*bool, optional) {#opensearch-ssl_verify}
+### include_tag_key (bool, optional) {#opensearch-include_tag_key}
 
-Skip ssl verification (default: true) 
+This will add the Fluentd tag in the JSON record. 
 
-Default: true
+Default:  false
 
-### client_key (*secret.Secret, optional) {#opensearch-client_key}
+### include_timestamp (bool, optional) {#opensearch-include_timestamp}
 
-Client certificate key 
+Adds a @timestamp field to the log, following all settings logstash_format does, except without the restrictions on index_name. This allows one to log to an alias in OpenSearch and utilize the rollover API. 
 
-Default: -
+Default:  false
 
-### client_cert (*secret.Secret, optional) {#opensearch-client_cert}
+### index_date_pattern (*string, optional) {#opensearch-index_date_pattern}
 
-Client certificate 
+Specify this to override the index date pattern for creating a rollover index. 
 
-Default: -
+Default:  now/d
 
-### client_key_pass (*secret.Secret, optional) {#opensearch-client_key_pass}
+### index_name (string, optional) {#opensearch-index_name}
 
-Client key password 
+The index name to write events to  
 
-Default: -
+Default:  fluentd
 
-### ca_file (*secret.Secret, optional) {#opensearch-ca_file}
+### index_separator (string, optional) {#opensearch-index_separator}
 
-CA certificate 
+index_separator  
 
 Default: -
 
-### ssl_version (string, optional) {#opensearch-ssl_version}
+### log_os_400_reason (bool, optional) {#opensearch-log_os_400_reason}
 
-If you want to configure SSL/TLS version, you can specify ssl_version parameter. [SSLv23, TLSv1, TLSv1_1, TLSv1_2] 
+log_os_400_reason  
 
-Default: -
+Default:  false
 
-### remove_keys_on_update (string, optional) {#opensearch-remove_keys_on_update}
+### logstash_dateformat (string, optional) {#opensearch-logstash_dateformat}
 
-If you want to configure SSL/TLS version, you can specify ssl_version parameter. [SSLv23, TLSv1, TLSv1_1, TLSv1_2] Remove keys on update will not update the configured keys in OpenSearch when a record is being updated. This setting only has any effect if the write operation is update or upsert. 
+Set the Logstash date format. 
 
-Default: -
+Default:  %Y.%m.%d
 
-### remove_keys_on_update_key (string, optional) {#opensearch-remove_keys_on_update_key}
+### logstash_format (bool, optional) {#opensearch-logstash_format}
 
-This setting allows remove_keys_on_update to be configured with a key in each record, in much the same way as target_index_key works. 
+Enable Logstash log format. 
 
-Default: -
+Default:  false
 
-### flatten_hashes (bool, optional) {#opensearch-flatten_hashes}
+### logstash_prefix (string, optional) {#opensearch-logstash_prefix}
 
-https://github.com/fluent/fluent-plugin-opensearch#hash-flattening 
+Set the Logstash prefix. 
 
-Default: -
+Default:  logstash
 
-### flatten_hashes_separator (string, optional) {#opensearch-flatten_hashes_separator}
+### logstash_prefix_separator (string, optional) {#opensearch-logstash_prefix_separator}
 
-Flatten separator 
+Set the Logstash prefix separator. 
 
-Default: -
+Default:  -
 
-### template_name (string, optional) {#opensearch-template_name}
+### max_retry_get_os_version (int, optional) {#opensearch-max_retry_get_os_version}
 
-The name of the template to define. If a template by the name given is already present, it will be left unchanged, unless template_overwrite is set, in which case the template will be updated. 
+max_retry_get_os_version  
 
-Default: -
+Default:  15
 
-### template_file (*secret.Secret, optional) {#opensearch-template_file}
+### max_retry_putting_template (string, optional) {#opensearch-max_retry_putting_template}
 
-The path to the file containing the template to install. [Secret](../secret/) 
+You can specify times of retry putting template. 
 
-Default: -
+Default:  10
 
-### template_overwrite (bool, optional) {#opensearch-template_overwrite}
+### parent_key (string, optional) {#opensearch-parent_key}
 
-Always update the template, even if it already exists. 
+parent_key 
 
-Default:  false
 
-### customize_template (string, optional) {#opensearch-customize_template}
+### password (*secret.Secret, optional) {#opensearch-password}
 
-Specify the string and its value to be replaced in form of hash. Can contain multiple key value pair that would be replaced in the specified template_file. This setting only creates template and to add rollover index please check the rollover_index configuration. 
+Password for HTTP Basic authentication. [Secret](../secret/) 
 
-Default: -
 
-### index_date_pattern (*string, optional) {#opensearch-index_date_pattern}
+### path (string, optional) {#opensearch-path}
 
-Specify this to override the index date pattern for creating a rollover index. 
+Path for HTTP Basic authentication. 
 
-Default:  now/d
 
-### index_separator (string, optional) {#opensearch-index_separator}
+### pipeline (string, optional) {#opensearch-pipeline}
 
-index_separator  
+This param is to set a pipeline ID of your OpenSearch to be added into the request, you can configure ingest node. 
 
-Default:  -
 
-### application_name (*string, optional) {#opensearch-application_name}
+### port (int, optional) {#opensearch-port}
 
-Specify the application name for the rollover index to be created. 
+You can specify OpenSearch port by this parameter. 
 
-Default:  default
+Default:  9200
 
-### templates (string, optional) {#opensearch-templates}
+### prefer_oj_serializer (bool, optional) {#opensearch-prefer_oj_serializer}
 
-Specify index templates in form of hash. Can contain multiple templates. 
+With default behavior, OpenSearch client uses Yajl as JSON encoder/decoder. Oj is the alternative high performance JSON encoder/decoder. When this parameter sets as true, OpenSearch client uses Oj as JSON encoder/decoder.  
 
-Default: -
+Default:  false
 
-### max_retry_putting_template (string, optional) {#opensearch-max_retry_putting_template}
+### reconnect_on_error (bool, optional) {#opensearch-reconnect_on_error}
 
-You can specify times of retry putting template. 
+Indicates that the plugin should reset connection on any error (reconnect on next send). By default it will reconnect only on "host unreachable exceptions". We recommended to set this true in the presence of OpenSearch shield. 
 
-Default:  10
+Default:  false
 
-### fail_on_putting_template_retry_exceed (*bool, optional) {#opensearch-fail_on_putting_template_retry_exceed}
+### reload_after (string, optional) {#opensearch-reload_after}
 
-Indicates whether to fail when max_retry_putting_template is exceeded. If you have multiple output plugin, you could use this property to do not fail on fluentd statup.(default: true) 
+When reload_connections true, this is the integer number of operations after which the plugin will reload the connections. The default value is 10000. 
 
-Default: true
 
-### fail_on_detecting_os_version_retry_exceed (*bool, optional) {#opensearch-fail_on_detecting_os_version_retry_exceed}
+### reload_connections (*bool, optional) {#opensearch-reload_connections}
 
-fail_on_detecting_os_version_retry_exceed (default: true) 
+You can tune how the OpenSearch-transport host reloading feature works.(default: true) 
 
 Default: true
 
-### max_retry_get_os_version (int, optional) {#opensearch-max_retry_get_os_version}
-
-max_retry_get_os_version  
-
-Default:  15
-
-### include_tag_key (bool, optional) {#opensearch-include_tag_key}
+### reload_on_failure (bool, optional) {#opensearch-reload_on_failure}
 
-This will add the Fluentd tag in the JSON record. 
+Indicates that the OpenSearch-transport will try to reload the nodes addresses if there is a failure while making the request, this can be useful to quickly remove a dead node from the list of addresses. 
 
 Default:  false
 
-### tag_key (string, optional) {#opensearch-tag_key}
+### remove_keys_on_update (string, optional) {#opensearch-remove_keys_on_update}
 
-This will add the Fluentd tag in the JSON record. 
+Remove keys on update will not update the configured keys in OpenSearch when a record is being updated. This setting only has any effect if the write operation is update or upsert. 
 
-Default:  tag
 
-### time_parse_error_tag (string, optional) {#opensearch-time_parse_error_tag}
-
-With logstash_format true, OpenSearch plugin parses timestamp field for generating index name. If the record has invalid timestamp value, this plugin emits an error event to @ERROR label with time_parse_error_tag configured tag. 
+### remove_keys_on_update_key (string, optional) {#opensearch-remove_keys_on_update_key}
 
-Default: -
+This setting allows remove_keys_on_update to be configured with a key in each record, in much the same way as target_index_key works. 
 
-### reconnect_on_error (bool, optional) {#opensearch-reconnect_on_error}
 
-Indicates that the plugin should reset connection on any error (reconnect on next send). By default it will reconnect only on "host unreachable exceptions". We recommended to set this true in the presence of OpenSearch shield. 
+### request_timeout (string, optional) {#opensearch-request_timeout}
 
-Default:  false
+You can specify HTTP request timeout. 
 
-### pipeline (string, optional) {#opensearch-pipeline}
+Default:  5s
 
-This param is to set a pipeline id of your OpenSearch to be added into the request, you can configure ingest node. 
+### resurrect_after (string, optional) {#opensearch-resurrect_after}
 
-Default: -
+You can set in the OpenSearch-transport how often dead connections from the OpenSearch-transport's pool will be resurrected. 
 
-### with_transporter_log (bool, optional) {#opensearch-with_transporter_log}
+Default:  60s
 
-This is debugging purpose option to enable to obtain transporter layer log.  
+### retry_tag (string, optional) {#opensearch-retry_tag}
 
-Default:  false
+This setting allows custom routing of messages in response to bulk request failures. The default behavior is to emit failed records using the same tag that was provided. 
 
-### emit_error_for_missing_id (bool, optional) {#opensearch-emit_error_for_missing_id}
 
-emit_error_for_missing_id  
+### routing_key (string, optional) {#opensearch-routing_key}
 
-Default:  false
+routing_key 
 
-### sniffer_class_name (string, optional) {#opensearch-sniffer_class_name}
+### scheme (string, optional) {#opensearch-scheme}
 
-TThe default Sniffer used by the OpenSearch::Transport class works well when Fluentd has a direct connection to all of the OpenSearch servers and can make effective use of the _nodes API. This doesn't work well when Fluentd must connect through a load balancer or proxy. The parameter sniffer_class_name gives you the ability to provide your own Sniffer class to implement whatever connection reload logic you require. In addition, there is a new Fluent::Plugin::OpenSearchSimpleSniffer class which reuses the hosts given in the configuration, which is typically the hostname of the load balancer or proxy. For example, a configuration like this would cause connections to logging-os to reload every 100 operations: https://github.com/fluent/fluent-plugin-opensearch#sniffer-class-name 
+Connection scheme  
 
-Default: -
+Default:  http
 
 ### selector_class_name (string, optional) {#opensearch-selector_class_name}
 
 selector_class_name 
 
-Default: -
 
-### reload_after (string, optional) {#opensearch-reload_after}
+### slow_flush_log_threshold (string, optional) {#opensearch-slow_flush_log_threshold}
 
-When reload_connections true, this is the integer number of operations after which the plugin will reload the connections. The default value is 10000. 
+The threshold for chunk flush performance check. Parameter type is float, not time, default: 20.0 (seconds) If chunk flush takes longer time than this threshold, Fluentd logs a warning message and increases the  `fluentd_output_status_slow_flush_count` metric. 
 
-Default: -
 
-### include_index_in_url (bool, optional) {#opensearch-include_index_in_url}
+### sniffer_class_name (string, optional) {#opensearch-sniffer_class_name}
 
-With this option set to true, Fluentd manifests the index name in the request URL (rather than in the request body). You can use this option to enforce an URL-based access control. 
+The default Sniffer used by the OpenSearch::Transport class works well when Fluentd has a direct connection to all of the OpenSearch servers and can make effective use of the _nodes API. This doesn't work well when Fluentd must connect through a load balancer or proxy. The `sniffer_class_name` parameter gives you the ability to provide your own Sniffer class to implement whatever connection reload logic you require. In addition, there is a new Fluent::Plugin::OpenSearchSimpleSniffer class which reuses the hosts given in the configuration, which is typically the hostname of the load balancer or proxy. For example, a configuration like this would cause connections to logging-os to reload every 100 operations: [https://github.com/fluent/fluent-plugin-opensearch#sniffer-class-name](https://github.com/fluent/fluent-plugin-opensearch#sniffer-class-name). 
 
-Default: -
 
-### http_backend (string, optional) {#opensearch-http_backend}
+### ssl_verify (*bool, optional) {#opensearch-ssl_verify}
 
-With http_backend typhoeus, opensearch plugin uses typhoeus faraday http backend. Typhoeus can handle HTTP keepalive.  
+Skip ssl verification (default: true) 
 
-Default:  excon
+Default: true
 
-### http_backend_excon_nonblock (*bool, optional) {#opensearch-http_backend_excon_nonblock}
+### ssl_version (string, optional) {#opensearch-ssl_version}
 
-http_backend_excon_nonblock (default: true) 
+If you want to configure SSL/TLS version, you can specify ssl_version parameter. [SSLv23, TLSv1, TLSv1_1, TLSv1_2] 
 
-Default: true
 
-### validate_client_version (bool, optional) {#opensearch-validate_client_version}
+### suppress_doc_wrap (bool, optional) {#opensearch-suppress_doc_wrap}
 
-When you use mismatched OpenSearch server and client libraries, fluent-plugin-opensearch cannot send data into OpenSearch.   
+By default, record body is wrapped by 'doc'. This behavior can not handle update script requests. You can set this to suppress doc wrapping and allow record body to be untouched.  
 
 Default:  false
 
-### prefer_oj_serializer (bool, optional) {#opensearch-prefer_oj_serializer}
+### suppress_type_name (*bool, optional) {#opensearch-suppress_type_name}
 
-With default behavior, OpenSearch client uses Yajl as JSON encoder/decoder. Oj is the alternative high performance JSON encoder/decoder. When this parameter sets as true, OpenSearch client uses Oj as JSON encoder/decoder.  
+Suppress type name to avoid warnings in OpenSearch 
 
-Default:  false
 
-### unrecoverable_error_types (string, optional) {#opensearch-unrecoverable_error_types}
+### tag_key (string, optional) {#opensearch-tag_key}
 
-Default unrecoverable_error_types parameter is set up strictly. Because rejected_execution_exception is caused by exceeding OpenSearch's thread pool capacity. Advanced users can increase its capacity, but normal users should follow default behavior. 
+This will add the Fluentd tag in the JSON record. 
 
-Default: -
+Default:  tag
 
-### unrecoverable_record_types (string, optional) {#opensearch-unrecoverable_record_types}
+### target_index_affinity (bool, optional) {#opensearch-target_index_affinity}
 
-unrecoverable_record_types 
+target_index_affinity  
 
-Default: -
+Default:  false
 
-### emit_error_label_event (*bool, optional) {#opensearch-emit_error_label_event}
+### target_index_key (string, optional) {#opensearch-target_index_key}
 
-emit_error_label_event (default: true) 
+Tell this plugin to find the index name to write to in the record under this key in preference to other mechanisms. Key can be specified as path to nested record using dot ('.') as a separator. 
 
-Default: true
 
-### verify_os_version_at_startup (*bool, optional) {#opensearch-verify_os_version_at_startup}
+### template_file (*secret.Secret, optional) {#opensearch-template_file}
 
-verify_os_version_at_startup (default: true) 
+The path to the file containing the template to install. [Secret](../secret/) 
 
-Default: true
 
-### default_opensearch_version (int, optional) {#opensearch-default_opensearch_version}
+### template_name (string, optional) {#opensearch-template_name}
 
-max_retry_get_os_version  
+The name of the template to define. If a template by the name given is already present, it will be left unchanged, unless template_overwrite is set, in which case the template will be updated. 
 
-Default:  1
 
-### log_os_400_reason (bool, optional) {#opensearch-log_os_400_reason}
+### template_overwrite (bool, optional) {#opensearch-template_overwrite}
 
-log_os_400_reason  
+Always update the template, even if it already exists. 
 
 Default:  false
 
-### custom_headers (string, optional) {#opensearch-custom_headers}
+### templates (string, optional) {#opensearch-templates}
 
-This parameter adds additional headers to request. Example: {"token":"secret"}  
+Specify index templates in form of hash. Can contain multiple templates. 
 
-Default:  {}
 
-### suppress_doc_wrap (bool, optional) {#opensearch-suppress_doc_wrap}
+### time_key (string, optional) {#opensearch-time_key}
 
-By default, record body is wrapped by 'doc'. This behavior can not handle update script requests. You can set this to suppress doc wrapping and allow record body to be untouched.  
+By default, when inserting records in Logstash format, @timestamp is dynamically created with the time at log ingestion. If you'd like to use a custom time, include an @timestamp with your record. 
 
-Default:  false
 
-### ignore_exceptions (string, optional) {#opensearch-ignore_exceptions}
+### time_key_exclude_timestamp (bool, optional) {#opensearch-time_key_exclude_timestamp}
 
-A list of exception that will be ignored - when the exception occurs the chunk will be discarded and the buffer retry mechanism won't be called. It is possible also to specify classes at higher level in the hierarchy. 
+time_key_exclude_timestamp  
 
-Default: -
+Default:  false
 
-### exception_backup (*bool, optional) {#opensearch-exception_backup}
+### time_key_format (string, optional) {#opensearch-time_key_format}
 
-Indicates whether to backup chunk when ignore exception occurs. (default: true) 
+The format of the time stamp field (@timestamp or what you specify with `time_key`). This parameter only has an effect when logstash_format is true as it only affects the name of the index we write to. 
 
-Default: true
 
-### bulk_message_request_threshold (string, optional) {#opensearch-bulk_message_request_threshold}
+### time_parse_error_tag (string, optional) {#opensearch-time_parse_error_tag}
 
-Configure bulk_message request splitting threshold size. Default value is 20MB. (20 * 1024 * 1024) If you specify this size as negative number, bulk_message request splitting feature will be disabled.  
+With logstash_format true, OpenSearch plugin parses timestamp field for generating index name. If the record has invalid timestamp value, this plugin emits an error event to @ERROR label with `time_parse_error_tag` configured tag. 
 
-Default:  20MB
 
-### compression_level (string, optional) {#opensearch-compression_level}
+### time_precision (string, optional) {#opensearch-time_precision}
 
-compression_level 
+Should the record not include a time_key, define the degree of sub-second time precision to preserve from the time portion of the routed event. 
 
-Default: -
 
 ### truncate_caches_interval (string, optional) {#opensearch-truncate_caches_interval}
 
 truncate_caches_interval 
 
-Default: -
+
+### unrecoverable_error_types (string, optional) {#opensearch-unrecoverable_error_types}
+
+Default unrecoverable_error_types parameter is set up strictly. Because rejected_execution_exception is caused by exceeding OpenSearch's thread pool capacity. Advanced users can increase its capacity, but normal users should follow default behavior. 
+
+
+### unrecoverable_record_types (string, optional) {#opensearch-unrecoverable_record_types}
+
+unrecoverable_record_types 
+
 
 ### use_legacy_template (*bool, optional) {#opensearch-use_legacy_template}
 
@@ -509,44 +480,87 @@ Specify wether to use legacy template or not.
 
 Default: true
 
-### catch_transport_exception_on_retry (*bool, optional) {#opensearch-catch_transport_exception_on_retry}
+### user (string, optional) {#opensearch-user}
 
-catch_transport_exception_on_retry (default: true) 
+User for HTTP Basic authentication. This plugin will escape required URL encoded characters within %{} placeholders. e.g. `%{demo+}` 
+
+
+### utc_index (*bool, optional) {#opensearch-utc_index}
+
+By default, the records inserted into index logstash-YYMMDD with UTC (Coordinated Universal Time). This option allows to use local time if you describe `utc_index` to false.
 
 Default: true
 
-### target_index_affinity (bool, optional) {#opensearch-target_index_affinity}
+### validate_client_version (bool, optional) {#opensearch-validate_client_version}
 
-target_index_affinity  
+When you use mismatched OpenSearch server and client libraries, fluent-plugin-opensearch cannot send data into OpenSearch.   
 
 Default:  false
 
-### buffer (*Buffer, optional) {#opensearch-buffer}
+### verify_os_version_at_startup (*bool, optional) {#opensearch-verify_os_version_at_startup}
 
-Default: -
+verify_os_version_at_startup (default: true) 
 
-### slow_flush_log_threshold (string, optional) {#opensearch-slow_flush_log_threshold}
+Default: true
 
-The threshold for chunk flush performance check. Parameter type is float, not time, default: 20.0 (seconds) If chunk flush takes longer time than this threshold, fluentd logs warning message and increases metric fluentd_output_status_slow_flush_count. 
+### with_transporter_log (bool, optional) {#opensearch-with_transporter_log}
 
-Default: -
+This is debugging purpose option to enable to obtain transporter layer log.  
 
-### data_stream_enable (*bool, optional) {#opensearch-data_stream_enable}
+Default:  false
 
-Use @type opensearch_data_stream 
+### write_operation (string, optional) {#opensearch-write_operation}
 
-Default: -
+The write_operation can be any of: (index,create,update,upsert) 
 
-### data_stream_name (string, optional) {#opensearch-data_stream_name}
+Default:  index
 
-You can specify Opensearch data stream name by this parameter. This parameter is mandatory for opensearch_data_stream. 
 
-Default: -
+## OpenSearchEndpointCredentials
 
-### data_stream_template_name (string, optional) {#opensearch-data_stream_template_name}
+### access_key_id (*secret.Secret, optional) {#opensearchendpointcredentials-access_key_id}
 
-Specify an existing index template for the data stream. If not present, a new template is created and named after the data stream.  
+AWS access key id. This parameter is required when your agent is not running on EC2 instance with an IAM Role. 
+
+
+### assume_role_arn (*secret.Secret, optional) {#opensearchendpointcredentials-assume_role_arn}
+
+Typically, you can use AssumeRole for cross-account access or federation. 
+
+
+### assume_role_session_name (*secret.Secret, optional) {#opensearchendpointcredentials-assume_role_session_name}
+
+[AssumeRoleWithWebIdentity](https://docs.aws.amazon.com/STS/latest/APIReference/API_AssumeRoleWithWebIdentity.html) 
+
+
+### assume_role_web_identity_token_file (*secret.Secret, optional) {#opensearchendpointcredentials-assume_role_web_identity_token_file}
+
+[AssumeRoleWithWebIdentity](https://docs.aws.amazon.com/STS/latest/APIReference/API_AssumeRoleWithWebIdentity.html) 
+
+
+### ecs_container_credentials_relative_uri (*secret.Secret, optional) {#opensearchendpointcredentials-ecs_container_credentials_relative_uri}
+
+Set with AWS_CONTAINER_CREDENTIALS_RELATIVE_URI environment variable value 
+
+
+### region (string, optional) {#opensearchendpointcredentials-region}
+
+AWS region. It should be in form like us-east-1, us-west-2. Default nil, which means try to find from environment variable AWS_REGION. 
+
+
+### secret_access_key (*secret.Secret, optional) {#opensearchendpointcredentials-secret_access_key}
+
+AWS secret key. This parameter is required when your agent is not running on EC2 instance with an IAM Role. 
+
+
+### sts_credentials_region (*secret.Secret, optional) {#opensearchendpointcredentials-sts_credentials_region}
+
+By default, the AWS Security Token Service (AWS STS) is available as a global service, and all AWS STS requests go to a single endpoint at https://sts.amazonaws.com. AWS recommends using Regional AWS STS endpoints instead of the global endpoint to reduce latency, build in redundancy, and increase session token validity. https://docs.aws.amazon.com/IAM/latest/UserGuide/id_credentials_temp_enable-regions.html 
+
+
+### url (string, required) {#opensearchendpointcredentials-url}
+
+AWS connection url. 
 
-Default:  data_stream_name
 
 
diff --git a/content/docs/configuration/plugins/outputs/oss.md b/content/docs/configuration/plugins/outputs/oss.md
index 79c3cfa98..1ae3e92ad 100644
--- a/content/docs/configuration/plugins/outputs/oss.md
+++ b/content/docs/configuration/plugins/outputs/oss.md
@@ -6,6 +6,7 @@ generated_file: true
 
 # Aliyun OSS plugin for Fluentd
 ## Overview
+
 **Fluent OSS output plugin** buffers event logs in local files and uploads them to OSS periodically in background threads.
 
 This plugin splits events by using the timestamp of event logs. For example,  a log '2019-04-09 message Hello' is reached, and then another log '2019-04-10 message World' is reached in this order, the former is stored in "20190409.gz" file, and latter in "20190410.gz" file.
@@ -16,45 +17,47 @@ This plugin uses MNS on the same region of the OSS bucket. We must setup MNS and
 
 [This document](https://help.aliyun.com/document_detail/52656.html) shows how to setup MNS and OSS event notification.
 
-This plugin will poll events from MNS queue and extract object keys from these events, and then will read those objects from OSS.
-More info at https://github.com/aliyun/fluent-plugin-oss
+This plugin will poll events from MNS queue and extract object keys from these events, and then will read those objects from OSS. For details, see [https://github.com/aliyun/fluent-plugin-oss](https://github.com/aliyun/fluent-plugin-oss).
+
 
 ## Configuration
 ## Output Config
 
-### endpoint (string, required) {#output-config-endpoint}
+### access_key_id (*secret.Secret, required) {#output-config-access_key_id}
 
-OSS endpoint to connect to' 
+Your access key id [Secret](../secret/) 
 
-Default: -
 
-### bucket (string, required) {#output-config-bucket}
+### access_key_secret (*secret.Secret, required) {#output-config-aaccess_key_secret}
 
-Your bucket name 
+Your access secret key [Secret](../secret/) 
 
-Default: -
 
-### access_key_id (*secret.Secret, required) {#output-config-access_key_id}
+### auto_create_bucket (bool, optional) {#output-config-auto_create_bucket}
 
-Your access key id [Secret](../secret/) 
+desc 'Create OSS bucket if it does not exists  
 
-Default: -
+Default:  false
 
-### aaccess_key_secret (*secret.Secret, required) {#output-config-aaccess_key_secret}
+### bucket (string, required) {#output-config-bucket}
 
-Your access secret key [Secret](../secret/) 
+Your bucket name 
 
-Default: -
 
-### path (string, optional) {#output-config-path}
+### buffer (*Buffer, optional) {#output-config-buffer}
 
-Path prefix of the files on OSS  
+[Buffer](../buffer/) 
 
-Default:  fluent/logs
 
-### upload_crc_enable (bool, optional) {#output-config-upload_crc_enable}
+### check_bucket (bool, optional) {#output-config-check_bucket}
 
-Upload crc enabled  
+Check bucket if exists or not  
+
+Default:  true
+
+### check_object (bool, optional) {#output-config-check_object}
+
+Check object before creation  
 
 Default:  true
 
@@ -64,41 +67,45 @@ Download crc enabled
 
 Default:  true
 
-### open_timeout (int, optional) {#output-config-open_timeout}
+### endpoint (string, required) {#output-config-endpoint}
 
-Timeout for open connections  
+OSS endpoint to connect to' 
 
-Default:  10
 
-### read_timeout (int, optional) {#output-config-read_timeout}
+### format (*Format, optional) {#output-config-format}
 
-Timeout for read response  
+[Format](../format/) 
 
-Default:  120
 
-### oss_sdk_log_dir (string, optional) {#output-config-oss_sdk_log_dir}
+### hex_random_length (int, optional) {#output-config-hex_random_length}
 
-OSS SDK log directory  
+The length of `%{hex_random}` placeholder(4-16)  
 
-Default:  /var/log/td-agent
+Default:  4
+
+### index_format (string, optional) {#output-config-index_format}
+
+`sprintf` format for `%{index}`  
+
+Default:  %d
 
 ### key_format (string, optional) {#output-config-key_format}
 
 The format of OSS object keys  
 
-Default:  %{path}/%{time_slice}_%{index}_%{thread_id}.%{file_extension}
+Default: `%{path}/%{time_slice}_%{index}_%{thread_id}.%{file_extension}`
 
-### store_as (string, optional) {#output-config-store_as}
+### open_timeout (int, optional) {#output-config-open_timeout}
 
-Archive format on OSS: gzip, json, text, lzo, lzma2  
+Timeout for open connections  
 
-Default:  gzip
+Default:  10
 
-### auto_create_bucket (bool, optional) {#output-config-auto_create_bucket}
+### oss_sdk_log_dir (string, optional) {#output-config-oss_sdk_log_dir}
 
-desc 'Create OSS bucket if it does not exists  
+OSS SDK log directory  
 
-Default:  false
+Default:  /var/log/td-agent
 
 ### overwrite (bool, optional) {#output-config-overwrite}
 
@@ -106,52 +113,38 @@ Overwrite already existing path
 
 Default:  false
 
-### check_bucket (bool, optional) {#output-config-check_bucket}
-
-Check bucket if exists or not  
-
-Default:  true
-
-### check_object (bool, optional) {#output-config-check_object}
-
-Check object before creation  
-
-Default:  true
-
-### hex_random_length (int, optional) {#output-config-hex_random_length}
+### path (string, optional) {#output-config-path}
 
-The length of `%{hex_random}` placeholder(4-16)  
+Path prefix of the files on OSS  
 
-Default:  4
+Default:  fluent/logs
 
-### index_format (string, optional) {#output-config-index_format}
+### read_timeout (int, optional) {#output-config-read_timeout}
 
-`sprintf` format for `%{index}`  
+Timeout for read response  
 
-Default:  %d
+Default:  120
 
-### warn_for_delay (string, optional) {#output-config-warn_for_delay}
+### slow_flush_log_threshold (string, optional) {#output-config-slow_flush_log_threshold}
 
-Given a threshold to treat events as delay, output warning logs if delayed events were put into OSS 
+The threshold for chunk flush performance check. Parameter type is float, not time, default: 20.0 (seconds) If chunk flush takes longer time than this threshold, Fluentd logs a warning message and increases the `fluentd_output_status_slow_flush_count` metric. 
 
-Default: -
 
-### format (*Format, optional) {#output-config-format}
+### store_as (string, optional) {#output-config-store_as}
 
-[Format](../format/) 
+Archive format on OSS: gzip, json, text, lzo, lzma2  
 
-Default: -
+Default:  gzip
 
-### buffer (*Buffer, optional) {#output-config-buffer}
+### upload_crc_enable (bool, optional) {#output-config-upload_crc_enable}
 
-[Buffer](../buffer/) 
+Upload crc enabled  
 
-Default: -
+Default:  true
 
-### slow_flush_log_threshold (string, optional) {#output-config-slow_flush_log_threshold}
+### warn_for_delay (string, optional) {#output-config-warn_for_delay}
 
-The threshold for chunk flush performance check. Parameter type is float, not time, default: 20.0 (seconds) If chunk flush takes longer time than this threshold, fluentd logs warning message and increases metric fluentd_output_status_slow_flush_count. 
+Given a threshold to treat events as delay, output warning logs if delayed events were put into OSS 
 
-Default: -
 
 
diff --git a/content/docs/configuration/plugins/outputs/redis.md b/content/docs/configuration/plugins/outputs/redis.md
index 4a6e24444..4000ddc60 100644
--- a/content/docs/configuration/plugins/outputs/redis.md
+++ b/content/docs/configuration/plugins/outputs/redis.md
@@ -6,33 +6,34 @@ generated_file: true
 
 # Redis plugin for Fluentd
 ## Overview
- Sends logs to Redis endpoints.
- More info at https://github.com/fluent-plugins-nursery/fluent-plugin-redis
-
- ## Example output configurations
- ```yaml
- spec:
-   redis:
-     host: redis-master.prod.svc.cluster.local
-     buffer:
-       tags: "[]"
-       flush_interval: 10s
- ```
+
+Sends logs to Redis endpoints. For details, see [https://github.com/fluent-plugins-nursery/fluent-plugin-redis](https://github.com/fluent-plugins-nursery/fluent-plugin-redis).
+
+## Example output configurations
+
+```yaml
+spec:
+  redis:
+    host: redis-master.prod.svc.cluster.local
+    buffer:
+      tags: "[]"
+      flush_interval: 10s
+```
+
 
 ## Configuration
 ## Output Config
 
-### host (string, optional) {#output-config-host}
+### allow_duplicate_key (bool, optional) {#output-config-allow_duplicate_key}
 
-Host Redis endpoint  
+Allow inserting key duplicate. It will work as update values.
 
-Default:  localhost
+Default:  false
 
-### port (int, optional) {#output-config-port}
+### buffer (*Buffer, optional) {#output-config-buffer}
 
-Port of the Redis server  
+[Buffer](../buffer/) 
 
-Default:  6379
 
 ### db_number (int, optional) {#output-config-db_number}
 
@@ -40,52 +41,48 @@ DbNumber database number is optional.
 
 Default:  0
 
-### password (*secret.Secret, optional) {#output-config-password}
+### format (*Format, optional) {#output-config-format}
 
-Redis Server password 
+[Format](../format/) 
 
-Default: -
 
-### insert_key_prefix (string, optional) {#output-config-insert_key_prefix}
+### host (string, optional) {#output-config-host}
 
-insert_key_prefix  
+Host Redis endpoint  
 
-Default:  "${tag}"
+Default:  localhost
 
-### strftime_format (string, optional) {#output-config-strftime_format}
+### insert_key_prefix (string, optional) {#output-config-insert_key_prefix}
 
-strftime_format Users can set strftime format.  
+insert_key_prefix  
 
-Default:  "%s"
+Default:  "${tag}"
 
-### allow_duplicate_key (bool, optional) {#output-config-allow_duplicate_key}
+### password (*secret.Secret, optional) {#output-config-password}
 
-allow_duplicate_key Allow insert key duplicate. It will work as update values.  
+Redis Server password 
 
-Default:  false
 
-### ttl (int, optional) {#output-config-ttl}
+### port (int, optional) {#output-config-port}
 
-ttl If 0 or negative value is set, ttl is not set in each key. 
+Port of the Redis server  
 
-Default: -
+Default:  6379
 
-### format (*Format, optional) {#output-config-format}
+### slow_flush_log_threshold (string, optional) {#output-config-slow_flush_log_threshold}
 
-[Format](../format/) 
+The threshold for chunk flush performance check. Parameter type is float, not time, default: 20.0 (seconds) If chunk flush takes longer time than this threshold, Fluentd logs a warning message and increases the `fluentd_output_status_slow_flush_count` metric. 
 
-Default: -
 
-### buffer (*Buffer, optional) {#output-config-buffer}
+### strftime_format (string, optional) {#output-config-strftime_format}
 
-[Buffer](../buffer/) 
+Users can set strftime format.
 
-Default: -
+Default:  "%s"
 
-### slow_flush_log_threshold (string, optional) {#output-config-slow_flush_log_threshold}
+### ttl (int, optional) {#output-config-ttl}
 
-The threshold for chunk flush performance check. Parameter type is float, not time, default: 20.0 (seconds) If chunk flush takes longer time than this threshold, fluentd logs warning message and increases metric fluentd_output_status_slow_flush_count. 
+If 0 or negative value is set, ttl is not set in each key. 
 
-Default: -
 
 
diff --git a/content/docs/configuration/plugins/outputs/relabel.md b/content/docs/configuration/plugins/outputs/relabel.md
index 139ea7675..39fcbbd6d 100644
--- a/content/docs/configuration/plugins/outputs/relabel.md
+++ b/content/docs/configuration/plugins/outputs/relabel.md
@@ -69,6 +69,5 @@ Using the relabel output also makes it possible to pass the messages emitted by
 
 Specifies new label for events 
 
-Default: -
 
 
diff --git a/content/docs/configuration/plugins/outputs/s3.md b/content/docs/configuration/plugins/outputs/s3.md
index 386e945a8..cc5d53d32 100644
--- a/content/docs/configuration/plugins/outputs/s3.md
+++ b/content/docs/configuration/plugins/outputs/s3.md
@@ -6,12 +6,15 @@ generated_file: true
 
 # Amazon S3 plugin for Fluentd
 ## Overview
-**s3** output plugin buffers event logs in local file and upload it to S3 periodically. This plugin splits files exactly by using the time of event logs (not the time when the logs are received). For example, a log '2011-01-02 message B' is reached, and then another log '2011-01-03 message B' is reached in this order, the former one is stored in "20110102.gz" file, and latter one in "20110103.gz" file.
->Example: [S3 Output Deployment](../../../../quickstarts/example-s3/)
 
- ## Example output configurations
- ```yaml
- spec:
+The **s3** output plugin buffers event logs in local file and upload it to S3 periodically. This plugin splits files exactly by using the time of event logs (not the time when the logs are received). For example, a log '2011-01-02 message B' is reached, and then another log '2011-01-03 message B' is reached in this order, the former one is stored in "20110102.gz" file, and latter one in "20110103.gz" file.
+
+For a detailed example, see [S3 Output Deployment](../../../../quickstarts/example-s3/).
+
+## Example output configurations
+
+```yaml
+spec:
   s3:
     aws_key_id:
       valueFrom:
@@ -30,320 +33,284 @@ generated_file: true
       timekey: 10m
       timekey_wait: 30s
       timekey_use_utc: true
- ```
+```
+
 
 ## Configuration
 ## Output Config
 
-### aws_key_id (*secret.Secret, optional) {#output-config-aws_key_id}
+### acl (string, optional) {#output-config-acl}
 
-AWS access key id [Secret](../secret/) 
+Permission for the object in S3 
 
-Default: -
 
-### aws_sec_key (*secret.Secret, optional) {#output-config-aws_sec_key}
+### assume_role_credentials (*S3AssumeRoleCredentials, optional) {#output-config-assume_role_credentials}
 
-AWS secret key. [Secret](../secret/) 
+[Assume Role Credentials](#assume-role-credentials) 
 
-Default: -
 
-### check_apikey_on_start (string, optional) {#output-config-check_apikey_on_start}
+### auto_create_bucket (string, optional) {#output-config-auto_create_bucket}
 
-Check AWS key on start 
+Create S3 bucket if it does not exists 
 
-Default: -
 
-### grant_read (string, optional) {#output-config-grant_read}
+### aws_iam_retries (string, optional) {#output-config-aws_iam_retries}
 
-Allows grantee to read the object data and its metadata 
+The number of attempts to load instance profile credentials from the EC2 metadata service using IAM role 
 
-Default: -
 
-### overwrite (string, optional) {#output-config-overwrite}
+### aws_key_id (*secret.Secret, optional) {#output-config-aws_key_id}
 
-Overwrite already existing path 
+AWS access key id [Secret](../secret/) 
 
-Default: -
 
-### path (string, optional) {#output-config-path}
+### aws_sec_key (*secret.Secret, optional) {#output-config-aws_sec_key}
 
-Path prefix of the files on S3 
+AWS secret key. [Secret](../secret/) 
 
-Default: -
 
-### grant_write_acp (string, optional) {#output-config-grant_write_acp}
+### buffer (*Buffer, optional) {#output-config-buffer}
 
-Allows grantee to write the ACL for the applicable object 
+[Buffer](../buffer/) 
+
+
+### check_apikey_on_start (string, optional) {#output-config-check_apikey_on_start}
+
+Check AWS key on start 
 
-Default: -
 
 ### check_bucket (string, optional) {#output-config-check_bucket}
 
 Check bucket if exists or not 
 
-Default: -
 
-### sse_customer_key (string, optional) {#output-config-sse_customer_key}
+### check_object (string, optional) {#output-config-check_object}
 
-Specifies the customer-provided encryption key for Amazon S3 to use in encrypting data 
+Check object before creation 
 
-Default: -
 
-### sse_customer_key_md5 (string, optional) {#output-config-sse_customer_key_md5}
+### clustername (string, optional) {#output-config-clustername}
 
-Specifies the 128-bit MD5 digest of the encryption key according to RFC 1321 
+Custom cluster name  
+
+Default: one-eye
+
+### compress (*Compress, optional) {#output-config-compress}
+
+Parquet compressor 
 
-Default: -
 
 ### compute_checksums (string, optional) {#output-config-compute_checksums}
 
 AWS SDK uses MD5 for API request/response by default 
 
-Default: -
 
-### warn_for_delay (string, optional) {#output-config-warn_for_delay}
+### enable_transfer_acceleration (string, optional) {#output-config-enable_transfer_acceleration}
 
-Given a threshold to treat events as delay, output warning logs if delayed events were put into s3 
+If true, S3 Transfer Acceleration will be enabled for uploads. IMPORTANT: You must first enable this feature on your destination S3 bucket 
 
-Default: -
 
-### use_bundled_cert (string, optional) {#output-config-use_bundled_cert}
+### force_path_style (string, optional) {#output-config-force_path_style}
 
-Use aws-sdk-ruby bundled cert 
+If true, the bucket name is always left in the request URI and never moved to the host as a sub-domain 
 
-Default: -
 
-### s3_endpoint (string, optional) {#output-config-s3_endpoint}
+### format (*Format, optional) {#output-config-format}
 
-Custom S3 endpoint (like minio) 
+[Format](../format/) 
 
-Default: -
 
-### ssekms_key_id (string, optional) {#output-config-ssekms_key_id}
+### grant_full_control (string, optional) {#output-config-grant_full_control}
 
-Specifies the AWS KMS key ID to use for object encryption 
+Allows grantee READ, READ_ACP, and WRITE_ACP permissions on the object 
 
-Default: -
 
-### s3_metadata (string, optional) {#output-config-s3_metadata}
+### grant_read (string, optional) {#output-config-grant_read}
 
-Arbitrary S3 metadata headers to set for the object 
+Allows grantee to read the object data and its metadata 
 
-Default: -
 
-### force_path_style (string, optional) {#output-config-force_path_style}
+### grant_read_acp (string, optional) {#output-config-grant_read_acp}
 
-If true, the bucket name is always left in the request URI and never moved to the host as a sub-domain 
+Allows grantee to read the object ACL 
 
-Default: -
 
-### auto_create_bucket (string, optional) {#output-config-auto_create_bucket}
+### grant_write_acp (string, optional) {#output-config-grant_write_acp}
 
-Create S3 bucket if it does not exists 
+Allows grantee to write the ACL for the applicable object 
+
+
+### hex_random_length (string, optional) {#output-config-hex_random_length}
+
+The length of `%{hex_random}` placeholder(4-16) 
 
-Default: -
 
 ### index_format (string, optional) {#output-config-index_format}
 
 `sprintf` format for `%{index}` 
 
-Default: -
 
-### signature_version (string, optional) {#output-config-signature_version}
+### instance_profile_credentials (*S3InstanceProfileCredentials, optional) {#output-config-instance_profile_credentials}
 
-Signature version for API Request (s3,v4) 
+[Instance Profile Credentials](#instance-profile-credentials) 
 
-Default: -
 
-### enable_transfer_acceleration (string, optional) {#output-config-enable_transfer_acceleration}
+### oneeye_format (bool, optional) {#output-config-oneeye_format}
 
-If true, S3 Transfer Acceleration will be enabled for uploads. IMPORTANT: You must first enable this feature on your destination S3 bucket 
+One-eye format trigger  
+
+Default: false
 
-Default: -
+### overwrite (string, optional) {#output-config-overwrite}
 
-### ssl_verify_peer (string, optional) {#output-config-ssl_verify_peer}
+Overwrite already existing path 
 
-If false, the certificate of endpoint will not be verified 
 
-Default: -
+### path (string, optional) {#output-config-path}
+
+Path prefix of the files on S3 
+
 
 ### proxy_uri (string, optional) {#output-config-proxy_uri}
 
 URI of proxy environment 
 
-Default: -
 
-### grant_read_acp (string, optional) {#output-config-grant_read_acp}
+### s3_bucket (string, required) {#output-config-s3_bucket}
 
-Allows grantee to read the object ACL 
+S3 bucket name 
 
-Default: -
 
-### check_object (string, optional) {#output-config-check_object}
+### s3_endpoint (string, optional) {#output-config-s3_endpoint}
 
-Check object before creation 
+Custom S3 endpoint (like minio) 
 
-Default: -
 
-### sse_customer_algorithm (string, optional) {#output-config-sse_customer_algorithm}
+### s3_metadata (string, optional) {#output-config-s3_metadata}
 
-Specifies the algorithm to use to when encrypting the object 
+Arbitrary S3 metadata headers to set for the object 
 
-Default: -
 
-### use_server_side_encryption (string, optional) {#output-config-use_server_side_encryption}
+### s3_object_key_format (string, optional) {#output-config-s3_object_key_format}
 
-The Server-side encryption algorithm used when storing this object in S3 (AES256, aws:kms) 
+The format of S3 object keys (default: `%{path}%{time_slice}_%{uuid_hash}_%{index}.%{file_extension}`) 
 
-Default: -
+Default: %{path}%{time_slice}_%{uuid_hash}_%{index}.%{file_extension}
 
 ### s3_region (string, optional) {#output-config-s3_region}
 
 S3 region name 
 
-Default: -
-
-### acl (string, optional) {#output-config-acl}
-
-Permission for the object in S3 
 
-Default: -
+### shared_credentials (*S3SharedCredentials, optional) {#output-config-shared_credentials}
 
-### grant_full_control (string, optional) {#output-config-grant_full_control}
+[Shared Credentials](#shared-credentials) 
 
-Allows grantee READ, READ_ACP, and WRITE_ACP permissions on the object 
 
-Default: -
+### signature_version (string, optional) {#output-config-signature_version}
 
-### hex_random_length (string, optional) {#output-config-hex_random_length}
+Signature version for API Request (s3,v4) 
 
-The length of `%{hex_random}` placeholder(4-16) 
 
-Default: -
+### slow_flush_log_threshold (string, optional) {#output-config-slow_flush_log_threshold}
 
-### s3_object_key_format (string, optional) {#output-config-s3_object_key_format}
+The threshold for chunk flush performance check. Parameter type is float, not time, default: 20.0 (seconds) If chunk flush takes longer time than this threshold, fluentd logs warning message and increases metric fluentd_output_status_slow_flush_count. 
 
-The format of S3 object keys (default: %{path}%{time_slice}_%{uuid_hash}_%{index}.%{file_extension}) 
 
-Default: %{path}%{time_slice}_%{uuid_hash}_%{index}.%{file_extension}
+### sse_customer_algorithm (string, optional) {#output-config-sse_customer_algorithm}
 
-### s3_bucket (string, required) {#output-config-s3_bucket}
+Specifies the algorithm to use to when encrypting the object 
 
-S3 bucket name 
 
-Default: -
+### sse_customer_key (string, optional) {#output-config-sse_customer_key}
 
-### store_as (string, optional) {#output-config-store_as}
+Specifies the customer-provided encryption key for Amazon S3 to use in encrypting data 
 
-Archive format on S3 
 
-Default: -
+### sse_customer_key_md5 (string, optional) {#output-config-sse_customer_key_md5}
 
-### storage_class (string, optional) {#output-config-storage_class}
+Specifies the 128-bit MD5 digest of the encryption key according to RFC 1321 
 
-The type of storage to use for the object, for example STANDARD, REDUCED_REDUNDANCY, STANDARD_IA, ONEZONE_IA, INTELLIGENT_TIERING, GLACIER, DEEP_ARCHIVE, OUTPOSTS, GLACIER_IR For a complete list of possible values, see the [Amazon S3 API reference](https://docs.aws.amazon.com/AmazonS3/latest/API/API_PutObject.html#AmazonS3-PutObject-request-header-StorageClass). 
 
-Default: -
+### ssekms_key_id (string, optional) {#output config-ssekms_key_id}
 
-### aws_iam_retries (string, optional) {#output-config-aws_iam_retries}
+Specifies the AWS KMS key ID to use for object encryption 
 
-The number of attempts to load instance profile credentials from the EC2 metadata service using IAM role 
 
-Default: -
+### ssl_verify_peer (string, optional) {#output config-ssl_verify_peer}
 
-### buffer (*Buffer, optional) {#output-config-buffer}
-
-[Buffer](../buffer/) 
+If false, the certificate of endpoint will not be verified 
 
-Default: -
 
-### slow_flush_log_threshold (string, optional) {#output-config-slow_flush_log_threshold}
+### storage_class (string, optional) {#output-config-storage_class}
 
-The threshold for chunk flush performance check. Parameter type is float, not time, default: 20.0 (seconds) If chunk flush takes longer time than this threshold, fluentd logs warning message and increases metric fluentd_output_status_slow_flush_count. 
+The type of storage to use for the object, for example STANDARD, REDUCED_REDUNDANCY, STANDARD_IA, ONEZONE_IA, INTELLIGENT_TIERING, GLACIER, DEEP_ARCHIVE, OUTPOSTS, GLACIER_IR For a complete list of possible values, see the [Amazon S3 API reference](https://docs.aws.amazon.com/AmazonS3/latest/API/API_PutObject.html#AmazonS3-PutObject-request-header-StorageClass). 
 
-Default: -
 
-### format (*Format, optional) {#output-config-format}
+### store_as (string, optional) {#output-config-store_as}
 
-[Format](../format/) 
+Archive format on S3 
 
-Default: -
 
-### assume_role_credentials (*S3AssumeRoleCredentials, optional) {#output-config-assume_role_credentials}
+### use_bundled_cert (string, optional) {#output-config-use_bundled_cert}
 
-[Assume Role Credentials](#assume-role-credentials) 
+Use aws-sdk-ruby bundled cert 
 
-Default: -
 
-### instance_profile_credentials (*S3InstanceProfileCredentials, optional) {#output-config-instance_profile_credentials}
+### use_server_side_encryption (string, optional) {#output-config-use_server_side_encryption}
 
-[Instance Profile Credentials](#instance-profile-credentials) 
+The Server-side encryption algorithm used when storing this object in S3 (AES256, aws:kms) 
 
-Default: -
 
-### shared_credentials (*S3SharedCredentials, optional) {#output-config-shared_credentials}
+### warn_for_delay (string, optional) {#output-config-warn_for_delay}
 
-[Shared Credentials](#shared-credentials) 
+Given a threshold to treat events as delay, output warning logs if delayed events were put into s3 
 
-Default: -
 
-### compress (*Compress, optional) {#output-config-compress}
 
-Parquet compressor 
+## Assume Role Credentials
 
-Default: -
+assume_role_credentials
 
-### oneeye_format (bool, optional) {#output-config-oneeye_format}
+### duration_seconds (string, optional) {#assume role-credentials-duration_seconds}
 
-One-eye format trigger  
+The duration, in seconds, of the role session (900-3600) 
 
-Default: false
 
-### clustername (string, optional) {#output-config-clustername}
+### external_id (string, optional) {#assume role-credentials-external_id}
 
-Custom cluster name  
+A unique identifier that is used by third parties when assuming roles in their customers' accounts. 
 
-Default: one-eye
 
+### policy (string, optional) {#assume role-credentials-policy}
 
-## Assume Role Credentials
+An IAM policy in JSON format 
 
-assume_role_credentials
 
 ### role_arn (string, required) {#assume role-credentials-role_arn}
 
 The Amazon Resource Name (ARN) of the role to assume 
 
-Default: -
 
 ### role_session_name (string, required) {#assume role-credentials-role_session_name}
 
 An identifier for the assumed role session 
 
-Default: -
-
-### policy (string, optional) {#assume role-credentials-policy}
-
-An IAM policy in JSON format 
-
-Default: -
 
-### duration_seconds (string, optional) {#assume role-credentials-duration_seconds}
 
-The duration, in seconds, of the role session (900-3600) 
+## Instance Profile Credentials
 
-Default: -
+instance_profile_credentials
 
-### external_id (string, optional) {#assume role-credentials-external_id}
+### http_open_timeout (string, optional) {#instance profile-credentials-http_open_timeout}
 
-A unique identifier that is used by third parties when assuming roles in their customers' accounts. 
+Number of seconds to wait for the connection to open 
 
-Default: -
 
+### http_read_timeout (string, optional) {#instance profile-credentials-http_read_timeout}
 
-## Instance Profile Credentials
+Number of seconds to wait for one block to be read 
 
-instance_profile_credentials
 
 ### ip_address (string, optional) {#instance profile-credentials-ip_address}
 
@@ -357,41 +324,27 @@ Port number
 
 Default: 80
 
-### http_open_timeout (string, optional) {#instance profile-credentials-http_open_timeout}
-
-Number of seconds to wait for the connection to open 
-
-Default: -
-
-### http_read_timeout (string, optional) {#instance profile-credentials-http_read_timeout}
-
-Number of seconds to wait for one block to be read 
-
-Default: -
-
 ### retries (string, optional) {#instance profile-credentials-retries}
 
 Number of times to retry when retrieving credentials 
 
-Default: -
 
 
 ## Shared Credentials
 
 shared_credentials
 
-### profile_name (string, optional) {#shared-credentials-profile_name}
-
-Profile name. Default to 'default' or ENV['AWS_PROFILE'] 
-
-Default: -
-
 ### path (string, optional) {#shared-credentials-path}
 
 Path to the shared file.  
 
 Default:  $HOME/.aws/credentials
 
+### profile_name (string, optional) {#shared-credentials-profile_name}
+
+Profile name. Default to 'default' or ENV['AWS_PROFILE'] 
+
+
 
 ## Parquet compressor
 
@@ -421,16 +374,15 @@ Record data format type. (avro csv jsonl msgpack tsv msgpack json)
 
 Default:  msgpack
 
-### schema_type (string, optional) {#parquet-compressor-schema_type}
+### schema_file (string, optional) {#parquet-compressor-schema_file}
 
-Schema type. (avro, bigquery)  
+Path to schema file. 
 
-Default:  avro
 
-### schema_file (string, optional) {#parquet-compressor-schema_file}
+### schema_type (string, optional) {#parquet-compressor-schema_type}
 
-Path to schema file. 
+Schema type. (avro, bigquery)  
 
-Default: -
+Default:  avro
 
 
diff --git a/content/docs/configuration/plugins/outputs/splunk_hec.md b/content/docs/configuration/plugins/outputs/splunk_hec.md
index 82c0c444b..ae0c70046 100644
--- a/content/docs/configuration/plugins/outputs/splunk_hec.md
+++ b/content/docs/configuration/plugins/outputs/splunk_hec.md
@@ -6,212 +6,190 @@ generated_file: true
 
 # Splunk via Hec output plugin for Fluentd
 ## Overview
-More info at https://github.com/splunk/fluent-plugin-splunk-hec
 
- ## Example output configurations
- ```yaml
- spec:
-   splunkHec:
-     hec_host: splunk.default.svc.cluster.local
-     hec_port: 8088
-     protocol: http
- ```
+For details, see [https://github.com/splunk/fluent-plugin-splunk-hec](https://github.com/splunk/fluent-plugin-splunk-hec).
+
+
+## Example output configurations
+
+```yaml
+spec:
+  splunkHec:
+    hec_host: splunk.default.svc.cluster.local
+    hec_port: 8088
+    protocol: http
+```
+
 
 ## Configuration
 ## SplunkHecOutput
 
 SplunkHecOutput sends your logs to Splunk via Hec
 
-### data_type (string, optional) {#splunkhecoutput-data_type}
+### buffer (*Buffer, optional) {#splunkhecoutput-buffer}
 
-The type of data that will be sent to Sumo Logic, either event or metric  
+[Buffer](../buffer/) 
 
-Default:  event
 
-### hec_host (string, required) {#splunkhecoutput-hec_host}
+### ca_file (*secret.Secret, optional) {#splunkhecoutput-ca_file}
 
-You can specify SplunkHec host by this parameter. 
+The path to a file containing a PEM-format CA certificate. [Secret](../secret/) 
 
-Default: -
 
-### hec_port (int, optional) {#splunkhecoutput-hec_port}
+### ca_path (*secret.Secret, optional) {#splunkhecoutput-ca_path}
 
-The port number for the Hec token or the Hec load balancer.  
+The path to a directory containing CA certificates in PEM format. [Secret](../secret/) 
 
-Default:  8088
 
-### protocol (string, optional) {#splunkhecoutput-protocol}
+### client_cert (*secret.Secret, optional) {#splunkhecoutput-client_cert}
 
-This is the protocol to use for calling the Hec API. Available values are: http, https.  
+The path to a file containing a PEM-format CA certificate for this client. [Secret](../secret/) 
 
-Default:  https
 
-### hec_token (*secret.Secret, required) {#splunkhecoutput-hec_token}
+### client_key (*secret.Secret, optional) {#splunkhecoutput-client_key}
 
-Identifier for the Hec token. [Secret](../secret/) 
+The private key for this client.' [Secret](../secret/) 
 
-Default: -
 
-### metrics_from_event (*bool, optional) {#splunkhecoutput-metrics_from_event}
+### coerce_to_utf8 (*bool, optional) {#splunkhecoutput-coerce_to_utf8}
 
-When data_type is set to "metric", the ingest API will treat every key-value pair in the input event as a metric name-value pair. Set metrics_from_event to false to disable this behavior and use metric_name_key and metric_value_key to define metrics. (Default:true) 
+Indicates whether to allow non-UTF-8 characters in user logs. If set to true, any non-UTF-8 character is replaced by the string specified in non_utf8_replacement_string. If set to false, the Ingest API errors out any non-UTF-8 characters. . 
 
-Default: -
+Default:  true
 
-### metric_name_key (string, optional) {#splunkhecoutput-metric_name_key}
+### data_type (string, optional) {#splunkhecoutput-data_type}
 
-Field name that contains the metric name. This parameter only works in conjunction with the metrics_from_event parameter. When this prameter is set, the metrics_from_event parameter is automatically set to false.  
+The type of data that will be sent to Sumo Logic, either event or metric  
 
-Default:  true
+Default:  event
 
-### metric_value_key (string, optional) {#splunkhecoutput-metric_value_key}
+### fields (Fields, optional) {#splunkhecoutput-fields}
 
-Field name that contains the metric value, this parameter is required when metric_name_key is configured. 
+In this case, parameters inside `<fields>` are used as indexed fields and removed from the original input events 
 
-Default: -
 
-### coerce_to_utf8 (*bool, optional) {#splunkhecoutput-coerce_to_utf8}
+### format (*Format, optional) {#splunkhecoutput-format}
 
-Indicates whether to allow non-UTF-8 characters in user logs. If set to true, any non-UTF-8 character is replaced by the string specified in non_utf8_replacement_string. If set to false, the Ingest API errors out any non-UTF-8 characters. . 
+[Format](../format/) 
 
-Default:  true
 
-### non_utf8_replacement_string (string, optional) {#splunkhecoutput-non_utf8_replacement_string}
+### hec_host (string, required) {#splunkhecoutput-hec_host}
 
-If coerce_to_utf8 is set to true, any non-UTF-8 character is replaced by the string you specify in this parameter. . 
+You can specify SplunkHec host by this parameter. 
 
-Default:  ' '
 
-### index (string, optional) {#splunkhecoutput-index}
+### hec_port (int, optional) {#splunkhecoutput-hec_port}
 
-Identifier for the Splunk index to be used for indexing events. If this parameter is not set, the indexer is chosen by HEC. Cannot set both index and index_key parameters at the same time. 
+The port number for the Hec token or the Hec load balancer.  
 
-Default: -
+Default:  8088
 
-### index_key (string, optional) {#splunkhecoutput-index_key}
+### hec_token (*secret.Secret, required) {#splunkhecoutput-hec_token}
 
-The field name that contains the Splunk index name. Cannot set both index and index_key parameters at the same time. 
+Identifier for the Hec token. [Secret](../secret/) 
 
-Default: -
 
 ### host (string, optional) {#splunkhecoutput-host}
 
 The host location for events. Cannot set both host and host_key parameters at the same time. (Default:hostname) 
 
-Default: -
 
 ### host_key (string, optional) {#splunkhecoutput-host_key}
 
 Key for the host location. Cannot set both host and host_key parameters at the same time. 
 
-Default: -
 
-### source (string, optional) {#splunkhecoutput-source}
+### idle_timeout (int, optional) {#splunkhecoutput-idle_timeout}
 
-The source field for events. If this parameter is not set, the source will be decided by HEC. Cannot set both source and source_key parameters at the same time. 
+If a connection has not been used for this number of seconds it will automatically be reset upon the next use to avoid attempting to send to a closed connection. nil means no timeout. 
 
-Default: -
 
-### source_key (string, optional) {#splunkhecoutput-source_key}
+### index (string, optional) {#splunkhecoutput-index}
 
-Field name to contain source. Cannot set both source and source_key parameters at the same time. 
+Identifier for the Splunk index to be used for indexing events. If this parameter is not set, the indexer is chosen by HEC. Cannot set both index and index_key parameters at the same time. 
 
-Default: -
 
-### sourcetype (string, optional) {#splunkhecoutput-sourcetype}
+### index_key (string, optional) {#splunkhecoutput-index_key}
 
-The sourcetype field for events. When not set, the sourcetype is decided by HEC. Cannot set both source and source_key parameters at the same time. 
+The field name that contains the Splunk index name. Cannot set both index and index_key parameters at the same time. 
 
-Default: -
 
-### sourcetype_key (string, optional) {#splunkhecoutput-sourcetype_key}
+### insecure_ssl (*bool, optional) {#splunkhecoutput-insecure_ssl}
 
-Field name that contains the sourcetype. Cannot set both source and source_key parameters at the same time. 
+Indicates if insecure SSL connection is allowed  
 
-Default: -
+Default: false
 
 ### keep_keys (bool, optional) {#splunkhecoutput-keep_keys}
 
-By default, all the fields used by the *_key parameters are removed from the original input events. To change this behavior, set this parameter to true. This parameter is set to false by default. When set to true, all fields defined in index_key, host_key, source_key, sourcetype_key, metric_name_key, and metric_value_key are saved in the original event. 
+By default, all the fields used by the *_key parameters are removed from the original input events. To change this behavior, set this parameter to true. This parameter is set to false by default. When set to true, all fields defined in `index_key`, `host_key`, `source_key`, `sourcetype_key`, `metric_name_key`, and `metric_value_key` are saved in the original event. 
 
-Default: -
-
-### idle_timeout (int, optional) {#splunkhecoutput-idle_timeout}
 
-If a connection has not been used for this number of seconds it will automatically be reset upon the next use to avoid attempting to send to a closed connection. nil means no timeout. 
+### metric_name_key (string, optional) {#splunkhecoutput-metric_name_key}
 
-Default: -
+Field name that contains the metric name. This parameter only works in conjunction with the metrics_from_event parameter. When this prameter is set, the `metrics_from_event` parameter is automatically set to false.
 
-### read_timeout (int, optional) {#splunkhecoutput-read_timeout}
+Default:  true
 
-The amount of time allowed between reading two chunks from the socket. 
+### metric_value_key (string, optional) {#splunkhecoutput-metric_value_key}
 
-Default: -
+Field name that contains the metric value, this parameter is required when `metric_name_key` is configured. 
 
-### open_timeout (int, optional) {#splunkhecoutput-open_timeout}
 
-The amount of time to wait for a connection to be opened. 
+### metrics_from_event (*bool, optional) {#splunkhecoutput-metrics_from_event}
 
-Default: -
+When data_type is set to "metric", the ingest API will treat every key-value pair in the input event as a metric name-value pair. Set metrics_from_event to false to disable this behavior and use `metric_name_key` and `metric_value_key` to define metrics. (Default:true) 
 
-### client_cert (*secret.Secret, optional) {#splunkhecoutput-client_cert}
 
-The path to a file containing a PEM-format CA certificate for this client. [Secret](../secret/) 
+### non_utf8_replacement_string (string, optional) {#splunkhecoutput-non_utf8_replacement_string}
 
-Default: -
+If coerce_to_utf8 is set to true, any non-UTF-8 character is replaced by the string you specify in this parameter. . 
 
-### client_key (*secret.Secret, optional) {#splunkhecoutput-client_key}
+Default:  ' '
 
-The private key for this client.' [Secret](../secret/) 
+### open_timeout (int, optional) {#splunkhecoutput-open_timeout}
 
-Default: -
+The amount of time to wait for a connection to be opened. 
 
-### ca_file (*secret.Secret, optional) {#splunkhecoutput-ca_file}
 
-The path to a file containing a PEM-format CA certificate. [Secret](../secret/) 
+### protocol (string, optional) {#splunkhecoutput-protocol}
 
-Default: -
+This is the protocol to use for calling the Hec API. Available values are: http, https.  
 
-### ca_path (*secret.Secret, optional) {#splunkhecoutput-ca_path}
+Default:  https
 
-The path to a directory containing CA certificates in PEM format. [Secret](../secret/) 
+### read_timeout (int, optional) {#splunkhecoutput-read_timeout}
 
-Default: -
+The amount of time allowed between reading two chunks from the socket. 
 
-### ssl_ciphers (string, optional) {#splunkhecoutput-ssl_ciphers}
 
-List of SSL ciphers allowed. 
+### slow_flush_log_threshold (string, optional) {#splunkhecoutput-slow_flush_log_threshold}
 
-Default: -
+The threshold for chunk flush performance check. Parameter type is float, not time, default: 20.0 (seconds) If chunk flush takes longer time than this threshold, fluentd logs warning message and increases metric fluentd_output_status_slow_flush_count. 
 
-### insecure_ssl (*bool, optional) {#splunkhecoutput-insecure_ssl}
 
-Indicates if insecure SSL connection is allowed  
+### source (string, optional) {#splunkhecoutput-source}
 
-Default: false
+The source field for events. If this parameter is not set, the source will be decided by HEC. Cannot set both source and source_key parameters at the same time. 
 
-### fields (Fields, optional) {#splunkhecoutput-fields}
 
-In this case, parameters inside <fields> are used as indexed fields and removed from the original input events 
+### source_key (string, optional) {#splunkhecoutput-source_key}
 
-Default: -
+Field name to contain source. Cannot set both source and source_key parameters at the same time. 
 
-### format (*Format, optional) {#splunkhecoutput-format}
 
-[Format](../format/) 
+### sourcetype (string, optional) {#splunkhecoutput-sourcetype}
 
-Default: -
+The sourcetype field for events. When not set, the sourcetype is decided by HEC. Cannot set both source and `source_key` parameters at the same time. 
 
-### buffer (*Buffer, optional) {#splunkhecoutput-buffer}
 
-[Buffer](../buffer/) 
+### sourcetype_key (string, optional) {#splunkhecoutput-sourcetype_key}
 
-Default: -
+Field name that contains the sourcetype. Cannot set both source and source_key parameters at the same time. 
 
-### slow_flush_log_threshold (string, optional) {#splunkhecoutput-slow_flush_log_threshold}
+### ssl_ciphers (string, optional) {#splunkhecoutput-ssl_ciphers}
 
-The threshold for chunk flush performance check. Parameter type is float, not time, default: 20.0 (seconds) If chunk flush takes longer time than this threshold, fluentd logs warning message and increases metric fluentd_output_status_slow_flush_count. 
+List of SSL ciphers allowed. 
 
-Default: -
 
 
diff --git a/content/docs/configuration/plugins/outputs/sqs.md b/content/docs/configuration/plugins/outputs/sqs.md
index 9f169ce1b..8710c2b45 100644
--- a/content/docs/configuration/plugins/outputs/sqs.md
+++ b/content/docs/configuration/plugins/outputs/sqs.md
@@ -11,47 +11,26 @@ generated_file: true
 ## Configuration
 ## Output Config
 
-### sqs_url (string, optional) {#output-config-sqs_url}
-
-SQS queue url e.g. `https://sqs.us-west-2.amazonaws.com/123456789012/myqueue` 
-
-Default: -
-
-### queue_name (string, optional) {#output-config-queue_name}
-
-SQS queue name - required if sqs_url is not set 
-
-Default: -
-
 ### aws_key_id (*secret.Secret, optional) {#output-config-aws_key_id}
 
 AWS access key id 
 
-Default: -
 
 ### aws_sec_key (*secret.Secret, optional) {#output-config-aws_sec_key}
 
 AWS secret key 
 
-Default: -
-
-### create_queue (*bool, optional) {#output-config-create_queue}
-
-Create SQS queue  
-
-Default:  true
 
-### region (string, optional) {#output-config-region}
+### buffer (*Buffer, optional) {#output-config-buffer}
 
-AWS region  
+[Buffer](../buffer/) 
 
-Default:  ap-northeast-1
 
-### message_group_id (string, optional) {#output-config-message_group_id}
+### create_queue (*bool, optional) {#output-config-create_queue}
 
-Message group id for FIFO queue 
+Create SQS queue  
 
-Default: -
+Default:  true
 
 ### delay_seconds (int, optional) {#output-config-delay_seconds}
 
@@ -65,27 +44,42 @@ Include tag
 
 Default:  true
 
-### tag_property_name (string, optional) {#output-config-tag_property_name}
+### message_group_id (string, optional) {#output-config-message_group_id}
 
-Tags property name in json  
+Message group id for FIFO queue 
 
-Default:  '__tag'
+### queue_name (string, optional) {#output-config-queue_name}
 
-### buffer (*Buffer, optional) {#output-config-buffer}
+SQS queue name - required if sqs_url is not set 
 
-[Buffer](../buffer/) 
 
-Default: -
+### region (string, optional) {#output-config-region}
+
+AWS region  
+
+Default:  ap-northeast-1
 
 ### slow_flush_log_threshold (string, optional) {#output-config-slow_flush_log_threshold}
 
 The threshold for chunk flush performance check. Parameter type is float, not time, default: 20.0 (seconds) If chunk flush takes longer time than this threshold, fluentd logs warning message and increases metric fluentd_output_status_slow_flush_count. 
 
-Default: -
 
+### sqs_url (string, optional) {#output-config-sqs_url}
+
+SQS queue url e.g. `https://sqs.us-west-2.amazonaws.com/123456789012/myqueue` 
+
+
+### tag_property_name (string, optional) {#output-config-tag_property_name}
+
+Tags property name in json  
+
+Default:  '__tag'
+
+
+
+## Example `SQS` output configurations
 
- ## Example `SQS` output configurations
- ```yaml
+```yaml
 apiVersion: logging.banzaicloud.io/v1beta1
 kind: Output
 metadata:
@@ -95,17 +89,19 @@ spec:
     queue_name: some-aws-sqs-queue
     create_queue: false
     region: us-east-1
- ```
-
- #### Fluentd Config Result
- ```
-  <match **>
-      @type sqs
-      @id test_sqs
-      queue_name some-aws-sqs-queue
-      create_queue false
-      region us-east-1
-  </match>
- ```
+```
+
+Fluentd config result:
+
+```xml
+<match **>
+    @type sqs
+    @id test_sqs
+    queue_name some-aws-sqs-queue
+    create_queue false
+    region us-east-1
+</match>
+```
+
 
 ---
diff --git a/content/docs/configuration/plugins/outputs/sumologic.md b/content/docs/configuration/plugins/outputs/sumologic.md
index 1c019959b..ede59e3dc 100644
--- a/content/docs/configuration/plugins/outputs/sumologic.md
+++ b/content/docs/configuration/plugins/outputs/sumologic.md
@@ -6,17 +6,18 @@ generated_file: true
 
 # SumoLogic output plugin for Fluentd
 ## Overview
+
 This plugin has been designed to output logs or metrics to SumoLogic via a HTTP collector endpoint
-More info at https://github.com/SumoLogic/fluentd-output-sumologic
+For details, see [https://github.com/SumoLogic/fluentd-output-sumologic](https://github.com/SumoLogic/fluentd-output-sumologic).
 
-Example secret for HTTP input URL
+## Example secret for HTTP input URL:
 
 ```
-export URL='https://endpoint1.collection.eu.sumologic.com/receiver/v1/http/.......'
+export URL='https://endpoint1.collection.eu.sumologic.com/receiver/v1/http/'
 kubectl create secret generic sumo-output --from-literal "endpoint=$URL"
 ```
 
- Example ClusterOutput
+## Example ClusterOutput
 
 ```yaml
 apiVersion: logging.banzaicloud.io/v1beta1
@@ -37,145 +38,138 @@ spec:
     source_name: test1
 ```
 
+
 ## Configuration
 ## Output Config
 
-### data_type (string, optional) {#output-config-data_type}
-
-The type of data that will be sent to Sumo Logic, either logs or metrics  
+### add_timestamp (bool, optional) {#output-config-add_timestamp}
 
-Default:  logs
+Add timestamp (or timestamp_key) field to logs before sending to sumologic  
 
-### endpoint (*secret.Secret, required) {#output-config-endpoint}
+Default:  true
 
-SumoLogic HTTP Collector URL 
+### buffer (*Buffer, optional) {#output-config-buffer}
 
-Default: -
+[Buffer](../buffer/) 
 
-### verify_ssl (bool, optional) {#output-config-verify_ssl}
+### compress (*bool, optional) {#output-config-compress}
 
-Verify ssl certificate.  
+Compress payload  
 
-Default:  true
+Default:  false
 
-### metric_data_format (string, optional) {#output-config-metric_data_format}
+### compress_encoding (string, optional) {#output-config-compress_encoding}
 
-The format of metrics you will be sending, either graphite or carbon2 or prometheus  
+Encoding method of compression (either gzip or deflate)  
 
-Default:  graphite
+Default:  gzip
 
-### log_format (string, optional) {#output-config-log_format}
+### custom_dimensions (string, optional) {#output-config-custom_dimensions}
 
-Format to post logs into Sumo.  
+Dimensions string (eg "cluster=payment, service=credit_card") which is going to be added to every metric record. 
 
-Default:  json
 
-### log_key (string, optional) {#output-config-log_key}
+### custom_fields ([]string, optional) {#output-config-custom_fields}
 
-Used to specify the key when merging json or sending logs in text format  
+Comma-separated key=value list of fields to apply to every log. [More information](https://help.sumologic.com/Manage/Fields#http-source-fields) 
 
-Default:  message
 
-### source_category (string, optional) {#output-config-source_category}
+### data_type (string, optional) {#output-config-data_type}
 
-Set _sourceCategory metadata field within SumoLogic  
+The type of data that will be sent to Sumo Logic, either logs or metrics  
 
-Default:  nil
+Default:  logs
 
-### source_name (string, required) {#output-config-source_name}
+### delimiter (string, optional) {#output-config-delimiter}
 
-Set _sourceName metadata field within SumoLogic - overrides source_name_key (default is nil) 
+Delimiter
 
-Default: -
+Default: .
 
-### source_name_key (string, optional) {#output-config-source_name_key}
+### disable_cookies (bool, optional) {#output config-disable_cookies}
 
-Set as source::path_key's value so that the source_name can be extracted from Fluentd's buffer  
+Option to disable cookies on the HTTP Client.  
 
-Default:  source_name
+Default:  false
 
-### source_host (string, optional) {#output-config-source_host}
+### endpoint (*secret.Secret, required) {#output-config-endpoint}
 
-Set _sourceHost metadata field within SumoLogic  
+SumoLogic HTTP Collector URL 
 
-Default:  nil
 
-### open_timeout (int, optional) {#output-config-open_timeout}
+### log_format (string, optional) {#output-config-log_format}
 
-Set timeout seconds to wait until connection is opened.  
+Format to post logs into Sumo.  
 
-Default:  60
+Default:  json
 
-### add_timestamp (bool, optional) {#output-config-add_timestamp}
+### log_key (string, optional) {#output-config-log_key}
 
-Add timestamp (or timestamp_key) field to logs before sending to sumologic  
+Used to specify the key when merging json or sending logs in text format  
 
-Default:  true
+Default:  message
 
-### timestamp_key (string, optional) {#output-config-timestamp_key}
+### metric_data_format (string, optional) {#output-config-metric_data_format}
 
-Field name when add_timestamp is on  
+The format of metrics you will be sending, either graphite or carbon2 or prometheus  
 
-Default:  timestamp
+Default:  graphite
 
-### proxy_uri (string, optional) {#output-config-proxy_uri}
+### open_timeout (int, optional) {#output-config-open_timeout}
 
-Add the uri of the proxy environment if present. 
+Set timeout seconds to wait until connection is opened.  
 
-Default: -
+Default:  60
 
-### disable_cookies (bool, optional) {#output-config-disable_cookies}
+### proxy_uri (string, optional) {#output-config-proxy_uri}
 
-Option to disable cookies on the HTTP Client.  
+Add the uri of the proxy environment if present. 
 
-Default:  false
 
-### delimiter (string, optional) {#output-config-delimiter}
+### slow_flush_log_threshold (string, optional) {#output-config-slow_flush_log_threshold}
 
-Delimiter  
+The threshold for chunk flush performance check. Parameter type is float, not time, default: 20.0 (seconds) If chunk flush takes longer time than this threshold, fluentd logs warning message and increases metric fluentd_output_status_slow_flush_count. 
 
-Default:  .
 
-### custom_fields ([]string, optional) {#output-config-custom_fields}
+### source_category (string, optional) {#output-config-source_category}
 
-Comma-separated key=value list of fields to apply to every log. [more information](https://help.sumologic.com/Manage/Fields#http-source-fields) 
+Set _sourceCategory metadata field within SumoLogic  
 
-Default: -
+Default:  nil
 
-### sumo_client (string, optional) {#output-config-sumo_client}
+### source_host (string, optional) {#output-config-source_host}
 
-Name of sumo client which is send as X-Sumo-Client header  
+Set _sourceHost metadata field within SumoLogic  
 
-Default:  fluentd-output
+Default:  nil
 
-### compress (*bool, optional) {#output-config-compress}
+### source_name (string, required) {#output-config-source_name}
 
-Compress payload  
+Set _sourceName metadata field within SumoLogic - overrides source_name_key (default is nil) 
 
-Default:  false
 
-### compress_encoding (string, optional) {#output-config-compress_encoding}
+### source_name_key (string, optional) {#output-config-source_name_key}
 
-Encoding method of compression (either gzip or deflate)  
+Set as source::path_key's value so that the source_name can be extracted from Fluentd's buffer  
 
-Default:  gzip
+Default:  source_name
 
-### custom_dimensions (string, optional) {#output-config-custom_dimensions}
+### sumo_client (string, optional) {#output-config-sumo_client}
 
-Dimensions string (eg "cluster=payment, service=credit_card") which is going to be added to every metric record. 
+Name of sumo client which is send as X-Sumo-Client header  
 
-Default: -
+Default:  fluentd-output
 
-### buffer (*Buffer, optional) {#output-config-buffer}
+### timestamp_key (string, optional) {#output-config-timestamp_key}
 
-[Buffer](../buffer/) 
+Field name when add_timestamp is on  
 
-Default: -
+Default:  timestamp
 
-### slow_flush_log_threshold (string, optional) {#output-config-slow_flush_log_threshold}
+### verify_ssl (bool, optional) {#output-config-verify_ssl}
 
-The threshold for chunk flush performance check. Parameter type is float, not time, default: 20.0 (seconds) If chunk flush takes longer time than this threshold, fluentd logs warning message and increases metric fluentd_output_status_slow_flush_count. 
+Verify ssl certificate.  
 
-Default: -
+Default:  true
 
 
diff --git a/content/docs/configuration/plugins/outputs/syslog.md b/content/docs/configuration/plugins/outputs/syslog.md
index f8c14821e..8fee93d47 100644
--- a/content/docs/configuration/plugins/outputs/syslog.md
+++ b/content/docs/configuration/plugins/outputs/syslog.md
@@ -11,59 +11,54 @@ generated_file: true
 ## Configuration
 ## SyslogOutputConfig
 
-### host (string, required) {#syslogoutputconfig-host}
+### allow_self_signed_cert (*bool, optional) {#syslogoutputconfig-allow_self_signed_cert}
 
-Destination host address 
+allow_self_signed_cert for mutual tls  
 
-Default: -
+Default:  false
 
-### port (int, optional) {#syslogoutputconfig-port}
+### buffer (*Buffer, optional) {#syslogoutputconfig-buffer}
 
-Destination host port  
+[Buffer](../buffer/) 
 
-Default:  "514"
 
-### transport (string, optional) {#syslogoutputconfig-transport}
+### client_cert_path (*secret.Secret, optional) {#syslogoutputconfig-client_cert_path}
 
-Transport Protocol  
+file path for private_key_path 
 
-Default:  "tls"
 
-### insecure (*bool, optional) {#syslogoutputconfig-insecure}
+### enable_system_cert_store (*bool, optional) {#syslogoutputconfig-enable_system_cert_store}
 
-skip ssl validation  
+cert_store to set ca_certificate for ssl context 
 
-Default:  false
 
-### verify_fqdn (*bool, optional) {#syslogoutputconfig-verify_fqdn}
+### format (*FormatRfc5424, optional) {#syslogoutputconfig-format}
 
-verify_fqdn  
+[Format](../format_rfc5424/) 
 
-Default:  nil
 
-### enable_system_cert_store (*bool, optional) {#syslogoutputconfig-enable_system_cert_store}
+### fqdn (string, optional) {#syslogoutputconfig-fqdn}
 
-cert_store to set ca_certificate for ssl context 
+Fqdn  
 
-Default: -
+Default:  "nil"
 
-### trusted_ca_path (*secret.Secret, optional) {#syslogoutputconfig-trusted_ca_path}
+### host (string, required) {#syslogoutputconfig-host}
 
-file path to ca to trust 
+Destination host address 
 
-Default: -
 
-### client_cert_path (*secret.Secret, optional) {#syslogoutputconfig-client_cert_path}
+### insecure (*bool, optional) {#syslogoutputconfig-insecure}
 
-file path for private_key_path 
+skip ssl validation  
 
-Default: -
+Default:  false
 
-### private_key_path (*secret.Secret, optional) {#syslogoutputconfig-private_key_path}
+### port (int, optional) {#syslogoutputconfig-port}
 
-file path for private_key_path 
+Destination host port  
 
-Default: -
+Default:  "514"
 
 ### private_key_passphrase (*secret.Secret, optional) {#syslogoutputconfig-private_key_passphrase}
 
@@ -71,45 +66,44 @@ PrivateKeyPassphrase for private key
 
 Default:  "nil"
 
-### allow_self_signed_cert (*bool, optional) {#syslogoutputconfig-allow_self_signed_cert}
+### private_key_path (*secret.Secret, optional) {#syslogoutputconfig-private_key_path}
 
-allow_self_signed_cert for mutual tls  
+file path for private_key_path 
 
-Default:  false
 
-### fqdn (string, optional) {#syslogoutputconfig-fqdn}
+### slow_flush_log_threshold (string, optional) {#syslogoutputconfig-slow_flush_log_threshold}
 
-Fqdn  
+The threshold for chunk flush performance check. Parameter type is float, not time, default: 20.0 (seconds) If chunk flush takes longer time than this threshold, fluentd logs warning message and increases metric fluentd_output_status_slow_flush_count. 
 
-Default:  "nil"
 
-### version (string, optional) {#syslogoutputconfig-version}
+### transport (string, optional) {#syslogoutputconfig-transport}
 
-TLS Version   
+Transport Protocol  
 
-Default:  "TLSv1_2"
+Default:  "tls"
 
-### format (*FormatRfc5424, optional) {#syslogoutputconfig-format}
+### trusted_ca_path (*secret.Secret, optional) {#syslogoutputconfig-trusted_ca_path}
 
-[Format](../format_rfc5424/) 
+file path to ca to trust 
 
-Default: -
 
-### buffer (*Buffer, optional) {#syslogoutputconfig-buffer}
+### verify_fqdn (*bool, optional) {#syslogoutputconfig-verify_fqdn}
 
-[Buffer](../buffer/) 
+verify_fqdn  
 
-Default: -
+Default:  nil
 
-### slow_flush_log_threshold (string, optional) {#syslogoutputconfig-slow_flush_log_threshold}
+### version (string, optional) {#syslogoutputconfig-version}
 
-The threshold for chunk flush performance check. Parameter type is float, not time, default: 20.0 (seconds) If chunk flush takes longer time than this threshold, fluentd logs warning message and increases metric fluentd_output_status_slow_flush_count. 
+TLS Version   
 
-Default: -
+Default:  "TLSv1_2"
 
 
- ## Example `File` output configurations
- ```yaml
+## Example `File` output configurations
+
+
+{{< highlight yaml >}}
 apiVersion: logging.banzaicloud.io/v1beta1
 kind: Output
 metadata:
@@ -125,10 +119,11 @@ spec:
       timekey: 1m
       timekey_wait: 10s
       timekey_use_utc: true
- ```
+{{</ highlight >}}
 
- #### Fluentd Config Result
- ```
+Fluentd config result:
+
+{{< highlight xml >}}
   <match **>
 	@type syslog_rfc5424
 	@id test_syslog
@@ -148,6 +143,7 @@ spec:
 	  timekey_wait 30s
 	</buffer>
   </match>
- ```
+{{</ highlight >}}
+
 
 ---
diff --git a/content/docs/configuration/plugins/syslog-ng-filters/match.md b/content/docs/configuration/plugins/syslog-ng-filters/match.md
index 854d95d7d..e80761281 100644
--- a/content/docs/configuration/plugins/syslog-ng-filters/match.md
+++ b/content/docs/configuration/plugins/syslog-ng-filters/match.md
@@ -4,7 +4,7 @@ weight: 200
 generated_file: true
 ---
 
-Match filters can be used to select the log records to process. These filters have the same options and syntax as the [syslog-ng flow match expressions]({{< relref "/docs/configuration/plugins/syslog-ng-filters/match.md" >}}).
+Match filters can be used to select the log records to process. These filters have the same options and syntax as [syslog-ng flow match expressions]({{< relref "/docs/configuration/plugins/syslog-ng-filters/match.md" >}}).
 
 {{< highlight yaml >}}
   filters:
@@ -20,65 +20,61 @@ Match filters can be used to select the log records to process. These filters ha
           type: string
 {{</ highlight >}}
 
+
 ## Configuration
 ## MatchExpr
 
 ### and ([]MatchExpr, optional) {#matchexpr-and}
 
-Default: -
 
 ### not (*MatchExpr, optional) {#matchexpr-not}
 
-Default: -
 
-### regexp (*RegexpMatchExpr, optional) {#matchexpr-regexp}
+### or ([]MatchExpr, optional) {#matchexpr-or}
 
-[Regexp Directive](#Regexp-Directive) 
 
-Default: -
+### regexp (*RegexpMatchExpr, optional) {#matchexpr-regexp}
 
-### or ([]MatchExpr, optional) {#matchexpr-or}
+[Regexp Directive](#Regexp-Directive) 
 
-Default: -
 
 
 ## Regexp Directive {#Regexp-Directive}
 
+
 Specify filtering rule. For details, see the [AxoSyslog Core documentation](https://axoflow.com/docs/axosyslog-core/chapter-manipulating-messages/customizing-message-format/reference-template-functions/#template-function-list)
 
+
+### flags ([]string, optional) {#regexp-directive-flags}
+
+Pattern flags. For details, see the [AxoSyslog Core documentation](https://axoflow.com/docs/axosyslog-core/chapter-manipulating-messages/regular-expressions/reference-regexp-types/regexp-flags-options/) 
+
+
 ### pattern (string, required) {#regexp-directive-pattern}
 
 Pattern expression to evaluate 
 
-Default: -
 
 ### template (string, optional) {#regexp-directive-template}
 
 Specify a template of the record fields to match against. 
 
-Default: -
-
-### value (string, optional) {#regexp-directive-value}
 
-Specify a field name of the record to match against the value of. 
+### type (string, optional) {#regexp-directive-type}
 
-Default: -
+Pattern type. For details, see the [AxoSyslog Core documentation](https://axoflow.com/docs/axosyslog-core/chapter-manipulating-messages/regular-expressions/reference-regexp-types/regexp-type-options/) 
 
-### flags ([]string, optional) {#regexp-directive-flags}
 
-Pattern flags 
+### value (string, optional) {#regexp-directive-value}
 
-Default: -
+Specify a field name of the record to match against the value of. 
 
-### type (string, optional) {#regexp-directive-type}
 
-Pattern type 
 
-Default: -
 
+## Example `Regexp` filter configurations
 
- #### Example `Regexp` filter configurations
- ```yaml
+```yaml
 apiVersion: logging.banzaicloud.io/v1beta1
 kind: Flow
 metadata:
@@ -86,22 +82,24 @@ metadata:
 spec:
   filters:
     - match:
-        regexp:
+      regexp:
         - value: first
           pattern: ^5\d\d$
   match: {}
   localOutputRefs:
     - demo-output
- ```
+```
+syslog-ng config result:
 
- #### Syslog-NG Config Result
- ```
- log {
+```shell
+log {
     source(main_input);
     filter {
-        match("^5\d\d$" value("first"));
+      match("^5\d\d$" value("first"));
     };
     destination(output_default_demo-output);
- };
- ```
+};
+```
 
+
+---
diff --git a/content/docs/configuration/plugins/syslog-ng-filters/parser.md b/content/docs/configuration/plugins/syslog-ng-filters/parser.md
index 32d088a38..954c2d0f8 100644
--- a/content/docs/configuration/plugins/syslog-ng-filters/parser.md
+++ b/content/docs/configuration/plugins/syslog-ng-filters/parser.md
@@ -6,6 +6,7 @@ generated_file: true
 
 Parser filters can be used to extract key-value pairs from message data. Logging operator currently supports the following parsers:
 
+- [metrics-probe](#metricsprobe)
 - [regexp](#regexp)
 - [syslog-parser](#syslog)
 
@@ -34,57 +35,62 @@ The syslog parser can parse syslog messages. For details, see the [documentation
       syslog-parser: {}
 {{</ highlight >}}
 
+
 ## Configuration
 ## [Parser](https://axoflow.com/docs/axosyslog-core/chapter-parsers/)
 
-### regexp (*RegexpParser, optional) {#parser-regexp}
+### metrics-probe (*MetricsProbe, optional) {#parser-metrics-probe}
+
+Counts the messages that pass through the flow, and creates labeled stats counters based on the fields of the passing messages. For details, see the [documentation of the AxoSyslog syslog-ng distribution](https://axoflow.com/docs/axosyslog-core/chapter-parsers/metrics-probe/).
+
+
+### regexp ([]string, required) {#regexp-parser-patterns}
+
+The regular expression patterns that you want to find a match. `regexp-parser()` supports multiple patterns, and stops the processing at the first successful match. For details, see the [regexp-parser() documentation of the AxoSyslog syslog-ng distribution](https://axoflow.com/docs/axosyslog-core/chapter-parsers/parser-regexp/parser-regexp-options/#patterns).
 
-Default: -
 
 ### syslog-parser (*SyslogParser, optional) {#parser-syslog-parser}
 
-Default: -
+Parse message as a [syslog message](https://axoflow.com/docs/axosyslog-core/chapter-parsers/parser-syslog/). 
 
-### metrics-probe (*MetricsProbe, optional) {#parser-metrics-probe}
 
-Counts the messages that pass through the flow, and creates labeled stats counters based on the fields of the passing messages. For details, see the [documentation of the AxoSyslog syslog-ng distribution](https://axoflow.com/docs/axosyslog-core/chapter-parsers/metrics-probe/).
 
 ## [Regexp parser](https://axoflow.com/docs/axosyslog-core/chapter-parsers/parser-regexp/)
 
+### flags ([]string, optional) {#regexp-parser-flags}
+
+Flags to influence the behavior of the [regexp-parser()](https://axoflow.com/docs/axosyslog-core/chapter-parsers/parser-regexp/parser-regexp-options/). For details, see the [regexp-parser() documentation of the AxoSyslog syslog-ng distribution](https://axoflow.com/docs/axosyslog-core/chapter-parsers/parser-regexp/parser-regexp-options/#flags).
+
+
 ### patterns ([]string, required) {#regexp-parser-patterns}
 
-The regular expression patterns that you want to find a match. regexp-parser() supports multiple patterns, and stops the processing at the first successful match. For details, see the [regexp-parser() documentation of the AxoSyslog syslog-ng distribution](https://axoflow.com/docs/axosyslog-core/chapter-parsers/parser-regexp/parser-regexp-options/#patterns).
+The regular expression patterns that you want to find a match. `regexp-parser()` supports multiple patterns, and stops the processing at the first successful match. For details, see the [regexp-parser() documentation of the AxoSyslog syslog-ng distribution](https://axoflow.com/docs/axosyslog-core/chapter-parsers/parser-regexp/parser-regexp-options/#patterns). 
 
-Default: -
 
 ### prefix (string, optional) {#regexp-parser-prefix}
 
 Insert a prefix before the name part of the parsed name-value pairs to help further processing. For details, see the [regexp-parser() documentation of the AxoSyslog syslog-ng distribution](https://axoflow.com/docs/axosyslog-core/chapter-parsers/parser-regexp/parser-regexp-options/#prefix).
 
-Default: -
 
 ### template (string, optional) {#regexp-parser-template}
 
 Specify a template of the record fields to match against. For details, see the [regexp-parser() documentation of the AxoSyslog syslog-ng distribution](https://axoflow.com/docs/axosyslog-core/chapter-parsers/parser-regexp/parser-regexp-options/#template).
 
-Default: -
-
-### flags ([]string, optional) {#regexp-parser-flags}
 
-Flags to influence the behavior of the [regexp-parser()](https://axoflow.com/docs/axosyslog-core/chapter-parsers/parser-regexp/parser-regexp-options/). For details, see the [regexp-parser() documentation of the AxoSyslog syslog-ng distribution](https://axoflow.com/docs/axosyslog-core/chapter-parsers/parser-regexp/parser-regexp-options/#flags).
-
-Default: -
 
 ## SyslogParser
 
+Parse message as a [syslog message](https://axoflow.com/docs/axosyslog-core/chapter-parsers/parser-syslog/).
+
 ### flags ([]string, optional) {#syslogparser-flags}
 
 Flags to influence the behavior of the [syslog-parser()](https://axoflow.com/docs/axosyslog-core/chapter-parsers/parser-syslog/parser-syslog-options/). For details, see the [syslog-parser() documentation of the AxoSyslog syslog-ng distribution](https://axoflow.com/docs/axosyslog-core/chapter-parsers/parser-syslog/parser-syslog-options/#flags).
 
-Default: -
+
 
 ## MetricsProbe
 
+
 Counts the messages that pass through the flow, and creates labeled stats counters based on the fields of the passing messages. For details, see the [documentation of the AxoSyslog syslog-ng distribution](https://axoflow.com/docs/axosyslog-core/chapter-parsers/metrics-probe/).
 
 {{< highlight yaml>}}SyslogNGFlow
@@ -101,20 +107,23 @@ spec:
           labels:
             namespace: "${json.kubernetes.namespace_name}"{{< /highlight >}}
 
+
 ### key (string, optional) {#metricsprobe-key}
 
 The name of the counter to create. Note that the value of this option is always prefixed with `syslogng_`, so for example `key("my-custom-key")` becomes `syslogng_my-custom-key`.
 
-Default: -
 
 ### labels (ArrowMap, optional) {#metricsprobe-labels}
 
 The labels used to create separate counters, based on the fields of the messages processed by `metrics-probe()`. The keys of the map are the name of the label, and the values are syslog-ng templates. 
 
-Default: -
 
 ### level (int, optional) {#metricsprobe-level}
 
 Sets the stats level of the generated metrics (default 0). 
 
-Default: 0
+
+### - (struct{}, required) {#metricsprobe--}
+
+
+
diff --git a/content/docs/configuration/plugins/syslog-ng-filters/rewrite.md b/content/docs/configuration/plugins/syslog-ng-filters/rewrite.md
index d68e20e7a..3f6b54830 100644
--- a/content/docs/configuration/plugins/syslog-ng-filters/rewrite.md
+++ b/content/docs/configuration/plugins/syslog-ng-filters/rewrite.md
@@ -89,116 +89,96 @@ You can unset macros or fields of the message.
 
 For details, see the [documentation of the AxoSyslog syslog-ng distribution](https://axoflow.com/docs/axosyslog-core/chapter-manipulating-messages/modifying-messages/rewrite-unset/).
 
+
 ## Configuration
 ## RewriteConfig
 
 ### group_unset (*GroupUnsetConfig, optional) {#rewriteconfig-group_unset}
 
-Default: -
 
 ### rename (*RenameConfig, optional) {#rewriteconfig-rename}
 
-Default: -
 
 ### set (*SetConfig, optional) {#rewriteconfig-set}
 
-Default: -
 
 ### subst (*SubstituteConfig, optional) {#rewriteconfig-subst}
 
-Default: -
 
 ### unset (*UnsetConfig, optional) {#rewriteconfig-unset}
 
-Default: -
 
 
 ## RenameConfig
 
 For details, see the [documentation of the AxoSyslog syslog-ng distribution](https://axoflow.com/docs/axosyslog-core/chapter-manipulating-messages/modifying-messages/rewrite-rename/).
 
-### oldName (string, required) {#renameconfig-oldname}
+### condition (*MatchExpr, optional) {#renameconfig-condition}
 
-Default: -
 
 ### newName (string, required) {#renameconfig-newname}
 
-Default: -
 
-### condition (*MatchExpr, optional) {#renameconfig-condition}
+### oldName (string, required) {#renameconfig-oldname}
 
-Default: -
 
 
 ## SetConfig
 
 For details, see the [documentation of the AxoSyslog syslog-ng distribution](https://axoflow.com/docs/axosyslog-core/chapter-manipulating-messages/modifying-messages/rewrite-set/).
 
-### field (string, required) {#setconfig-field}
+### condition (*MatchExpr, optional) {#setconfig-condition}
 
-Default: -
 
-### value (string, required) {#setconfig-value}
+### field (string, required) {#setconfig-field}
 
-Default: -
 
-### condition (*MatchExpr, optional) {#setconfig-condition}
+### value (string, required) {#setconfig-value}
 
-Default: -
 
 
 ## SubstituteConfig
 
 For details, see the [documentation of the AxoSyslog syslog-ng distribution](https://axoflow.com/docs/axosyslog-core/chapter-manipulating-messages/modifying-messages/rewrite-set/).
 
-### pattern (string, required) {#substituteconfig-pattern}
-
-Default: -
-
-### replace (string, required) {#substituteconfig-replace}
+### condition (*MatchExpr, optional) {#substituteconfig-condition}
 
-Default: -
 
 ### field (string, required) {#substituteconfig-field}
 
-Default: -
 
 ### flags ([]string, optional) {#substituteconfig-flags}
 
-Default: -
 
-### type (string, optional) {#substituteconfig-type}
+### pattern (string, required) {#substituteconfig-pattern}
 
-Default: -
 
-### condition (*MatchExpr, optional) {#substituteconfig-condition}
+### replace (string, required) {#substituteconfig-replace}
+
+
+### type (string, optional) {#substituteconfig-type}
 
-Default: -
 
 
 ## UnsetConfig
 
 For details, see the [documentation of the AxoSyslog syslog-ng distribution](https://axoflow.com/docs/axosyslog-core/chapter-manipulating-messages/modifying-messages/rewrite-unset/).
 
-### field (string, required) {#unsetconfig-field}
+### condition (*MatchExpr, optional) {#unsetconfig-condition}
 
-Default: -
 
-### condition (*MatchExpr, optional) {#unsetconfig-condition}
+### field (string, required) {#unsetconfig-field}
 
-Default: -
 
 
 ## GroupUnsetConfig
 
 For details, see the [documentation of the AxoSyslog syslog-ng distribution](https://axoflow.com/docs/axosyslog-core/chapter-manipulating-messages/modifying-messages/rewrite-unset/).
 
-### pattern (string, required) {#groupunsetconfig-pattern}
+### condition (*MatchExpr, optional) {#groupunsetconfig-condition}
 
-Default: -
 
-### condition (*MatchExpr, optional) {#groupunsetconfig-condition}
+### pattern (string, required) {#groupunsetconfig-pattern}
 
-Default: -
 
 
diff --git a/content/docs/configuration/plugins/syslog-ng-outputs/auth.md b/content/docs/configuration/plugins/syslog-ng-outputs/auth.md
index ca81c1a4d..10b7e65a9 100644
--- a/content/docs/configuration/plugins/syslog-ng-outputs/auth.md
+++ b/content/docs/configuration/plugins/syslog-ng-outputs/auth.md
@@ -10,29 +10,25 @@ GRPC-based outputs use this configuration instead of the simple `tls` field foun
 ## Configuration
 ## Auth
 
-### alts (*ALTS, optional) {#auth-alts}
+### adc (*ADC, optional) {#auth-adc}
 
-Application Layer Transport Security (ALTS) is a simple to use authentication, only available within Google’s infrastructure. 
+Application Default Credentials (ADC). 
 
-Default: -
 
-### adc (*ADC, optional) {#auth-adc}
+### alts (*ALTS, optional) {#auth-alts}
 
-Application Default Credentials (ADC). 
+Application Layer Transport Security (ALTS) is a simple to use authentication, only available within Google’s infrastructure. 
 
-Default: -
 
 ### insecure (*Insecure, optional) {#auth-insecure}
 
 This is the default method, authentication is disabled (`auth(insecure())`). 
 
-Default: -
 
 ### tls (*TLS, optional) {#auth-tls}
 
-This option sets various options related to TLS encryption, for example, key/certificate files and trusted CA locations. TLS can be used only with tcp-based transport protocols. For details, see [TLS for syslog-ng outputs](../tls/) and the [syslog-ng documentation](https://axoflow.com/docs/axosyslog-core/chapter-encrypted-transport-tls/tlsoptions). 
+This option sets various options related to TLS encryption, for example, key/certificate files and trusted CA locations. TLS can be used only with tcp-based transport protocols. For details, see [TLS for syslog-ng outputs](../tls/) and the [documentation of the AxoSyslog syslog-ng distribution](https://axoflow.com/docs/axosyslog-core/chapter-encrypted-transport-tls/tlsoptions). 
 
-Default: -
 
 
 ## ADC
@@ -45,6 +41,5 @@ Default: -
 
 ### target-service-accounts ([]string, optional) {#alts-target-service-accounts}
 
-Default: -
 
 
diff --git a/content/docs/configuration/plugins/syslog-ng-outputs/disk_buffer.md b/content/docs/configuration/plugins/syslog-ng-outputs/disk_buffer.md
index aaad4794e..fa7ecb3c3 100644
--- a/content/docs/configuration/plugins/syslog-ng-outputs/disk_buffer.md
+++ b/content/docs/configuration/plugins/syslog-ng-outputs/disk_buffer.md
@@ -7,46 +7,39 @@ generated_file: true
 The parameters of the syslog-ng disk buffer. Using a disk buffer on the output helps avoid message loss in case of a system failure on the destination side.
 For details on how [syslog-ng disk buffers work, see the documentation of the AxoSyslog syslog-ng distribution](https://axoflow.com/docs/axosyslog-core/chapter-routing-filters/concepts-diskbuffer/).
 
-### disk_buf_size (int64, required) {#diskbuffer-disk_buf_size}
-
-This is a required option. The maximum size of the disk-buffer in bytes. The minimum value is 1048576 bytes. 
-
-Default: -
-
-### reliable (bool, required) {#diskbuffer-reliable}
-
-If set to yes, syslog-ng OSE cannot lose logs in case of reload/restart, unreachable destination or syslog-ng OSE crash. This solution provides a slower, but reliable disk-buffer option. 
-
-Default: -
-
 ### compaction (*bool, optional) {#diskbuffer-compaction}
 
 Prunes the unused space in the LogMessage representation 
 
-Default: -
 
 ### dir (string, optional) {#diskbuffer-dir}
 
 Description: Defines the folder where the disk-buffer files are stored. 
 
-Default: -
+
+### disk_buf_size (int64, required) {#diskbuffer-disk_buf_size}
+
+This is a required option. The maximum size of the disk-buffer in bytes. The minimum value is 1048576 bytes. 
+
 
 ### mem_buf_length (*int64, optional) {#diskbuffer-mem_buf_length}
 
 Use this option if the option reliable() is set to no. This option contains the number of messages stored in overflow queue. 
 
-Default: -
 
 ### mem_buf_size (*int64, optional) {#diskbuffer-mem_buf_size}
 
 Use this option if the option reliable() is set to yes. This option contains the size of the messages in bytes that is used in the memory part of the disk buffer. 
 
-Default: -
 
 ### q_out_size (*int64, optional) {#diskbuffer-q_out_size}
 
 The number of messages stored in the output buffer of the destination. 
 
-Default: -
+
+### reliable (bool, required) {#diskbuffer-reliable}
+
+If set to yes, syslog-ng OSE cannot lose logs in case of reload/restart, unreachable destination or syslog-ng OSE crash. This solution provides a slower, but reliable disk-buffer option. 
+
 
 
diff --git a/content/docs/configuration/plugins/syslog-ng-outputs/elasticsearch.md b/content/docs/configuration/plugins/syslog-ng-outputs/elasticsearch.md
index 26d5e3697..dadd4236c 100644
--- a/content/docs/configuration/plugins/syslog-ng-outputs/elasticsearch.md
+++ b/content/docs/configuration/plugins/syslog-ng-outputs/elasticsearch.md
@@ -28,44 +28,40 @@ spec:
           key: password
 {{</ highlight >}}
 
-## Configuration
-
-###  (HTTPOutput, required) {#elasticsearchoutput-}
 
-Default: -
+## Configuration
 
-### index (string, optional) {#elasticsearchoutput-index}
 
-Name of the data stream, index, or index alias to perform the action on. 
+###  (HTTPOutput, required) {#elasticsearchoutput-}
 
-Default: -
 
-### type (*string, optional) {#elasticsearchoutput-type}
+### custom_id (string, optional) {#elasticsearchoutput-custom_id}
 
-The document type associated with the operation. Elasticsearch indices now support a single document type: `_doc`
+The document ID. If no ID is specified, a document ID is automatically generated. 
 
-Default: -
 
-### custom_id (string, optional) {#elasticsearchoutput-custom_id}
+### index (string, optional) {#elasticsearchoutput-index}
 
-The document ID. If no ID is specified, a document ID is automatically generated. 
+Name of the data stream, index, or index alias to perform the action on. 
 
-Default: -
 
 ### logstash_prefix (string, optional) {#elasticsearchoutput-logstash_prefix}
 
 Set the prefix for logs in logstash format. If set, then Index field will be ignored. 
 
-Default: -
 
 ### logstash_prefix_separator (string, optional) {#elasticsearchoutput-logstash_prefix_separator}
 
-Set the separator between LogstashPrefix and LogStashDateformat.
+Set the separator between LogstashPrefix and LogStashDateformat. Default: "-" 
 
-Default: `-`
 
 ### logstash_suffix (string, optional) {#elasticsearchoutput-logstash_suffix}
 
 Set the suffix for logs in logstash format.
 
-Default: `${YEAR}.${MONTH}.${DAY}`
+Default: `${YEAR}.${MONTH}.${DAY}`### type (*string, optional) {#elasticsearchoutput-type}
+
+The document type associated with the operation. Elasticsearch indices now support a single document type: `_doc`
+
+
+
diff --git a/content/docs/configuration/plugins/syslog-ng-outputs/file.md b/content/docs/configuration/plugins/syslog-ng-outputs/file.md
index 3ea50b65d..9ee952462 100644
--- a/content/docs/configuration/plugins/syslog-ng-outputs/file.md
+++ b/content/docs/configuration/plugins/syslog-ng-outputs/file.md
@@ -15,15 +15,11 @@ The `file` output stores log records in a plain text file.
 
 For details on the available options of the output, see the [documentation of the AxoSyslog syslog-ng distribution](https://axoflow.com/docs/axosyslog-core/chapter-destinations/configuring-destinations-file/).
 
-For available macros like `${YEAR}/${MONTH}/${DAY}` see [documentation of the AxoSyslog syslog-ng distribution](https://axoflow.com/docs/axosyslog-core/chapter-manipulating-messages/customizing-message-format/reference-macros/).
+For available macros like `${YEAR}/${MONTH}/${DAY}` see the [documentation of the AxoSyslog syslog-ng distribution](https://axoflow.com/docs/axosyslog-core/chapter-manipulating-messages/customizing-message-format/reference-macros/).
 
-## Configuration
-
-### path (string, required) {#fileoutput-path}
 
-Store file path 
-
-Default: -
+## Configuration
+## FileOutput
 
 ### create_dirs (bool, optional) {#fileoutput-create_dirs}
 
@@ -33,19 +29,19 @@ Default:  false
 
 ### dir_group (string, optional) {#fileoutput-dir_group}
 
-The group of the directories created by syslog-ng. To preserve the original properties of an existing directory, use the option without specifying an attribute: dir-group().  
+The group of the directories created by syslog-ng. To preserve the original properties of an existing directory, use the option without specifying an attribute: `dir-group()`.
 
 Default:  Use the global settings
 
 ### dir_owner (string, optional) {#fileoutput-dir_owner}
 
-The owner of the directories created by syslog-ng. To preserve the original properties of an existing directory, use the option without specifying an attribute: dir-owner().  
+The owner of the directories created by syslog-ng. To preserve the original properties of an existing directory, use the option without specifying an attribute: `dir-owner()`.
 
 Default:  Use the global settings
 
 ### dir_perm (int, optional) {#fileoutput-dir_perm}
 
-The permission mask of directories created by syslog-ng. Log directories are only created if a file after macro expansion refers to a non-existing directory, and directory creation is enabled (see also the create-dirs() option). For octal numbers prefix the number with 0, for example use 0755 for rwxr-xr-x. 
+The permission mask of directories created by syslog-ng. Log directories are only created if a file after macro expansion refers to a non-existing directory, and directory creation is enabled (see also the `create-dirs()` option). For octal numbers prefix the number with 0, for example, use `0755` for `rwxr-xr-x`.
 
 Default:  Use the global settings
 
@@ -55,12 +51,15 @@ This option enables putting outgoing messages into the disk buffer of the destin
 
 Default:  false
 
-### template (string, optional) {#fileoutput-template}
+### path (string, required) {#fileoutput-path}
+
+Path where the file is stored. 
 
-Default: -
 
 ### persist_name (string, optional) {#fileoutput-persist_name}
 
-Default: -
+
+### template (string, optional) {#fileoutput-template}
+
 
 
diff --git a/content/docs/configuration/plugins/syslog-ng-outputs/http.md b/content/docs/configuration/plugins/syslog-ng-outputs/http.md
index 6a603d2a7..85f606bcf 100644
--- a/content/docs/configuration/plugins/syslog-ng-outputs/http.md
+++ b/content/docs/configuration/plugins/syslog-ng-outputs/http.md
@@ -56,14 +56,10 @@ spec:
     body: "${MESSAGE}"
 {{</ highlight >}}
 
+For details, see the [documentation of the AxoSyslog syslog-ng distribution](https://axoflow.com/docs/axosyslog-core/chapter-destinations/configuring-destinations-http-nonjava/).
 
-## Configuration
-
-### url (string, optional) {#httpoutput-url}
-
-Specifies the hostname or IP address and optionally the port number of the web service that can receive log data via HTTP. Use a colon (:) after the address to specify the port number of the server. For example: `http://127.0.0.1:8000` 
 
-Default: -
+## Configuration
 
 ### headers ([]string, optional) {#httpoutput-headers}
 
@@ -81,7 +77,6 @@ Default:  60
 
 This option sets various options related to TLS encryption, for example, key/certificate files and trusted CA locations. TLS can be used only with tcp-based transport protocols. For details, see [TLS for syslog-ng outputs](../tls/) and the [documentation of the AxoSyslog syslog-ng distribution](https://axoflow.com/docs/axosyslog-core/chapter-encrypted-transport-tls/tlsoptions/).
 
-Default: -
 
 ### disk_buffer (*DiskBuffer, optional) {#httpoutput-disk_buffer}
 
@@ -93,111 +88,109 @@ Default:  false
 
 Batching parameters 
 
-Default: -
 
 ### body (string, optional) {#httpoutput-body}
 
 The body of the HTTP request, for example, `body("${ISODATE} ${MESSAGE}")`. You can use strings, macros, and template functions in the body. If not set, it will contain the message received from the source by default. 
 
-Default: -
 
 ### body-prefix (string, optional) {#httpoutput-body-prefix}
 
 The string syslog-ng OSE puts at the beginning of the body of the HTTP request, before the log message. 
 
-Default: -
 
 ### body-suffix (string, optional) {#httpoutput-body-suffix}
 
 The string syslog-ng OSE puts to the end of the body of the HTTP request, after the log message. 
 
-Default: -
 
 ### delimiter (string, optional) {#httpoutput-delimiter}
 
 By default, syslog-ng OSE separates the log messages of the batch with a newline character. 
 
-Default: -
+
+### log-fifo-size (int, optional) {#httpoutput-log-fifo-size}
+
+The number of messages that the output queue can store. 
+
 
 ### method (string, optional) {#httpoutput-method}
 
 Specifies the HTTP method to use when sending the message to the server. `POST | PUT` 
 
-Default: -
 
-### retries (int, optional) {#httpoutput-retries}
+### password (secret.Secret, optional) {#httpoutput-password}
 
-The number of times syslog-ng OSE attempts to send a message to this destination. If syslog-ng OSE could not send a message, it will try again until the number of attempts reaches retries, then drops the message. 
+The password that syslog-ng OSE uses to authenticate on the server where it sends the messages. 
 
-Default: -
 
-### user (string, optional) {#httpoutput-user}
+### persist_name (string, optional) {#httpoutput-persist_name}
 
-The username that syslog-ng OSE uses to authenticate on the server where it sends the messages. 
+If you receive the following error message during syslog-ng startup, set the `persist-name()` option of the duplicate drivers: `Error checking the uniqueness of the persist names, please override it with persist-name option. Shutting down.` See the [documentation of the AxoSyslog syslog-ng distribution](https://axoflow.com/docs/axosyslog-core/chapter-destinations/configuring-destinations-http-nonjava/reference-destination-http-nonjava/#persist-name) for more information. 
 
-Default: -
 
-### password (secret.Secret, optional) {#httpoutput-password}
+### response-action (filter.RawArrowMap, optional) {#httpoutput-response-action}
 
-The password that syslog-ng OSE uses to authenticate on the server where it sends the messages. 
+Specifies what syslog-ng does with the log message, based on the response code received from the HTTP server. See the [documentation of the AxoSyslog syslog-ng distribution](https://axoflow.com/docs/axosyslog-core/chapter-destinations/configuring-destinations-http-nonjava/reference-destination-http-nonjava/#response-action) for more information. 
 
-Default: -
 
-### user-agent (string, optional) {#httpoutput-user-agent}
+### retries (int, optional) {#httpoutput-retries}
 
-The value of the USER-AGENT header in the messages sent to the server. 
+The number of times syslog-ng OSE attempts to send a message to this destination. If syslog-ng OSE could not send a message, it will try again until the number of attempts reaches `retries`, then drops the message. 
 
-Default: -
 
-### workers (int, optional) {#httpoutput-workers}
+### time_reopen (int, optional) {#httpoutput-time_reopen}
 
-Specifies the number of worker threads (at least 1) that syslog-ng OSE uses to send messages to the server. Increasing the number of worker threads can drastically improve the performance of the destination. 
+The time to wait in seconds before a dead connection is reestablished.
 
-Default: -
+Default: 60
 
-### persist_name (string, optional) {#httpoutput-persist_name}
+### timeout (int, optional) {#httpoutput-timeout}
 
-If you receive the following error message during AxoSyslog startup, set the `persist-name()` option of the duplicate drivers: `Error checking the uniqueness of the persist names, please override it with persist-name option. Shutting down.` See the [AxoSyslog Core documentation](https://axoflow.com/docs/axosyslog-core/chapter-destinations/configuring-destinations-http-nonjava/reference-destination-http-nonjava/#persist-name) for more information. 
+Sets the maximum number of messages sent to the destination per second. Use this output-rate-limiting functionality only when using disk-buffer as well to avoid the risk of losing messages. Specifying 0 or a lower value sets the output limit to unlimited. 
 
-Default: -
 
-### log-fifo-size (int, optional) {#httpoutput-log-fifo-size}
+### tls (*TLS, optional) {#httpoutput-tls}
 
-The number of messages that the output queue can store. 
+This option sets various options related to TLS encryption, for example, key/certificate files and trusted CA locations. TLS can be used only with tcp-based transport protocols. For details, see [TLS for syslog-ng outputs](../tls/) and the [documentation of the AxoSyslog syslog-ng distribution](https://axoflow.com/docs/axosyslog-core/chapter-encrypted-transport-tls/tlsoptions/). 
 
-Default: -
 
-### timeout (int, optional) {#httpoutput-timeout}
+### url (string, optional) {#httpoutput-url}
 
-Sets the maximum number of messages sent to the destination per second. Use this output-rate-limiting functionality only when using disk-buffer as well to avoid the risk of losing messages. Specifying 0 or a lower value sets the output limit to unlimited. 
+Specifies the hostname or IP address and optionally the port number of the web service that can receive log data via HTTP. Use a colon (:) after the address to specify the port number of the server. For example: `http://127.0.0.1:8000`
 
-Default: -
 
-### response-action (filter.RawArrowMap, optional) {#httpoutput-response-action}
+### user (string, optional) {#httpoutput-user}
 
-Specifies what AxoSyslog does with the log message, based on the response code received from the HTTP server. See the [AxoSyslog Core documentation](https://axoflow.com/docs/axosyslog-core/chapter-destinations/configuring-destinations-http-nonjava/reference-destination-http-nonjava/#response-action) for more information. 
+The username that syslog-ng OSE uses to authenticate on the server where it sends the messages. 
 
-Default: -
 
+### user-agent (string, optional) {#httpoutput-user-agent}
 
-## Batch
+The value of the USER-AGENT header in the messages sent to the server. 
 
-### batch-lines (int, optional) {#batch-batch-lines}
 
-Description: Specifies how many lines are flushed to a destination in one batch. The syslog-ng OSE application waits for this number of lines to accumulate and sends them off in a single batch. Increasing this number increases throughput as more messages are sent in a single batch, but also increases message latency. For example, if you set `batch-lines()` to 100, syslog-ng OSE waits for 100 messages. 
+### workers (int, optional) {#httpoutput-workers}
 
-Default: -
+Specifies the number of worker threads (at least 1) that syslog-ng OSE uses to send messages to the server. Increasing the number of worker threads can drastically improve the performance of the destination. 
+
+
+
+## Batch
 
 ### batch-bytes (int, optional) {#batch-batch-bytes}
 
 Description: Sets the maximum size of payload in a batch. If the size of the messages reaches this value, syslog-ng OSE sends the batch to the destination even if the number of messages is less than the value of the `batch-lines()` option. Note that if the `batch-timeout()` option is enabled and the queue becomes empty, syslog-ng OSE flushes the messages only if `batch-timeout()` expires, or the batch reaches the limit set in `batch-bytes()`. 
 
-Default: -
+
+### batch-lines (int, optional) {#batch-batch-lines}
+
+Description: Specifies how many lines are flushed to a destination in one batch. The syslog-ng OSE application waits for this number of lines to accumulate and sends them off in a single batch. Increasing this number increases throughput as more messages are sent in a single batch, but also increases message latency. For example, if you set `batch-lines()` to 100, syslog-ng OSE waits for 100 messages. 
+
 
 ### batch-timeout (int, optional) {#batch-batch-timeout}
 
 Description: Specifies the time syslog-ng OSE waits for lines to accumulate in the output buffer. The syslog-ng OSE application sends batches to the destinations evenly. The timer starts when the first message arrives to the buffer, so if only few messages arrive, syslog-ng OSE sends messages to the destination at most once every `batch-timeout()` milliseconds. 
 
-Default: -
 
 
diff --git a/content/docs/configuration/plugins/syslog-ng-outputs/loggly.md b/content/docs/configuration/plugins/syslog-ng-outputs/loggly.md
index f39a636d0..3aca3eafb 100644
--- a/content/docs/configuration/plugins/syslog-ng-outputs/loggly.md
+++ b/content/docs/configuration/plugins/syslog-ng-outputs/loggly.md
@@ -6,36 +6,36 @@ generated_file: true
 
 ## Overview
 
-The `loggly()` destination sends log messages to the [Loggly](https://www.loggly.com/) Logging-as-a-Service provider. You can send log messages over TCP, or encrypted with TLS. For details on the available options of the output, see the [documentation of the AxoSyslog syslog-ng distribution](https://axoflow.com/docs/axosyslog-core/chapter-destinations/configuring-destinations-loggly/).
+The `loggly()` destination sends log messages to the [Loggly](https://www.loggly.com/) Logging-as-a-Service provider.
+You can send log messages over TCP, or encrypted with [TLS for syslog-ng outputs](/docs/configuration/plugins/syslog-ng-outputs/tls/).
+
+For details on the available options of the output, see the [documentation of the AxoSyslog syslog-ng distribution](https://axoflow.com/docs/axosyslog-core/chapter-destinations/configuring-destinations-loggly/).
 
 ## Prerequisites
 
 You need a Loggly account and your user token to use this output.
 
+
 ## Configuration
 
-### host (string, optional) {#loggly-host}
+###  (SyslogOutput, required) {#loggly-}
 
-Address of the destination host 
+syslog output configuration 
 
-Default: -
 
-### tag (string, optional) {#loggly-tag}
+### host (string, optional) {#loggly-host}
 
-Event tag [more information](https://documentation.solarwinds.com/en/success_center/loggly/content/admin/tags.htm) 
+Address of the destination host. 
 
-Default: -
 
-### token (*secret.Secret, required) {#loggly-token}
+### tag (string, optional) {#loggly-tag}
 
-Your Customer Token that you received from Loggly. For details, see the [documentation of the AxoSyslog syslog-ng distribution](https://axoflow.com/docs/axosyslog-core/chapter-destinations/configuring-destinations-loggly/reference-destination-loggly/#loggly-option-token).
+Event tag. For details, see the [Loggy documentation](https://documentation.solarwinds.com/en/success_center/loggly/content/admin/tags.htm) 
 
-Default: -
 
-###  (SyslogOutput, required) {#loggly-}
+### token (*secret.Secret, required) {#loggly-token}
 
-syslog output configuration 
+Your Customer Token that you received from Loggly. For details, see the [documentation of the AxoSyslog syslog-ng distribution](https://axoflow.com/docs/axosyslog-core/chapter-destinations/configuring-destinations-loggly/) 
 
-Default: -
 
 
diff --git a/content/docs/configuration/plugins/syslog-ng-outputs/logscale.md b/content/docs/configuration/plugins/syslog-ng-outputs/logscale.md
index 9caba7233..49897b509 100644
--- a/content/docs/configuration/plugins/syslog-ng-outputs/logscale.md
+++ b/content/docs/configuration/plugins/syslog-ng-outputs/logscale.md
@@ -29,37 +29,38 @@ spec:
       reliable: true
 {{</ highlight >}}
 
+
 ## LogScaleOutput
 
-### url (*secret.Secret, optional) {#logscaleoutput-url}
+### attributes (string, optional) {#logscaleoutput-attributes}
 
-Ingester URL is the URL of the Humio cluster you want to send data to.  
+A JSON object representing key-value pairs for the Event. These key-value pairs adds structure to Events, making it easier to search. Attributes can be nested JSON objects, however, we recommend limiting the amount of nesting.  
 
-Default: `https://cloud.humio.com`
+Default: `"--scope rfc5424 --exclude MESSAGE --exclude DATE --leave-initial-dot"`
 
-### token (*secret.Secret, optional) {#logscaleoutput-token}
+### batch_bytes (int, optional) {#logscaleoutput-batch_bytes}
 
-An [Ingest Token](https://library.humio.com/data-analysis/ingesting-data-tokens.html) is a unique string that identifies a repository and allows you to send data to that repository.
 
-Default:  empty
+### batch_lines (int, optional) {#logscaleoutput-batch_lines}
 
-### rawstring (string, optional) {#logscaleoutput-rawstring}
 
-The raw string representing the Event. The default display for an Event in LogScale is the rawstring. If you do not provide the rawstring field, then the response defaults to a JSON representation of the attributes field.  
+### batch_timeout (int, optional) {#logscaleoutput-batch_timeout}
 
-Default:  empty
 
-### attributes (string, optional) {#logscaleoutput-attributes}
+### body (string, optional) {#logscaleoutput-body}
 
-A JSON object representing key-value pairs for the Event. These key-value pairs adds structure to Events, making it easier to search. Attributes can be nested JSON objects, however, we recommend limiting the amount of nesting.  
 
-Default:  "--scope rfc5424 --exclude MESSAGE --exclude DATE --leave-initial-dot"
+### content_type (string, optional) {#logscaleoutput-content_type}
 
-### timezone (string, optional) {#logscaleoutput-timezone}
+This field specifies the content type of the log records being sent to Falcon's LogScale.   
 
-The timezone is only required if you specify the timestamp in milliseconds. The timezone specifies the local timezone for the event. Note that you must still specify the timestamp in UTC time. 
+Default: `"application/json"`
+
+### disk_buffer (*DiskBuffer, optional) {#logscaleoutput-disk_buffer}
 
-Default: -
+This option enables putting outgoing messages into the disk buffer of the destination to avoid message loss in case of a system failure on the destination side. For details, see the [Syslog-ng DiskBuffer options](../disk_buffer/).  
+
+Default:  false
 
 ### extra_headers (string, optional) {#logscaleoutput-extra_headers}
 
@@ -67,36 +68,30 @@ This field represents additional headers that can be included in the HTTP reques
 
 Default:  empty
 
-### content_type (string, optional) {#logscaleoutput-content_type}
-
-This field specifies the content type of the log records being sent to Falcon's LogScale.   
-
-Default:  "application/json"
+### persist_name (string, optional) {#logscaleoutput-persist_name}
 
-### disk_buffer (*DiskBuffer, optional) {#logscaleoutput-disk_buffer}
 
-This option enables putting outgoing messages into the disk buffer of the destination to avoid message loss in case of a system failure on the destination side. For details, see the [Syslog-ng DiskBuffer options](../disk_buffer/).  
+### rawstring (string, optional) {#logscaleoutput-rawstring}
 
-Default:  false
+The raw string representing the Event. The default display for an Event in LogScale is the rawstring. If you do not provide the rawstring field, then the response defaults to a JSON representation of the attributes field.  
 
-### body (string, optional) {#logscaleoutput-body}
+Default:  empty
 
-Default: -
+### timezone (string, optional) {#logscaleoutput-timezone}
 
-### batch_lines (int, optional) {#logscaleoutput-batch_lines}
+The timezone is only required if you specify the timestamp in milliseconds. The timezone specifies the local timezone for the event. Note that you must still specify the timestamp in UTC time. 
 
-Default: -
 
-### batch_bytes (int, optional) {#logscaleoutput-batch_bytes}
+### token (*secret.Secret, optional) {#logscaleoutput-token}
 
-Default: -
+An [Ingest Token](https://library.humio.com/data-analysis/ingesting-data-tokens.html) is a unique string that identifies a repository and allows you to send data to that repository.
 
-### batch_timeout (int, optional) {#logscaleoutput-batch_timeout}
+Default:  empty
 
-Default: -
+### url (*secret.Secret, optional) {#logscaleoutput-url}
 
-### persist_name (string, optional) {#logscaleoutput-persist_name}
+Ingester URL is the URL of the Humio cluster you want to send data to.  
 
-Default: -
+Default: `https://cloud.humio.com`
 
 
diff --git a/content/docs/configuration/plugins/syslog-ng-outputs/loki.md b/content/docs/configuration/plugins/syslog-ng-outputs/loki.md
index 04cccb0cc..4380625c7 100644
--- a/content/docs/configuration/plugins/syslog-ng-outputs/loki.md
+++ b/content/docs/configuration/plugins/syslog-ng-outputs/loki.md
@@ -6,13 +6,15 @@ generated_file: true
 
 Sends messages to Grafana Loki over gRPC, based on the [Loki destination of AxoSyslog Core](https://axoflow.com/docs/axosyslog-core/chapter-destinations/syslog-ng-with-loki/).
 
+Available in Logging operator version 4.4 and later.
+
 ## Example
 
 {{< highlight yaml >}}
 apiVersion: logging.banzaicloud.io/v1beta1
 kind: SyslogNGOutput
 metadata:
-  name: loki
+  name: loki-output
 spec:
   loki:
     url: "loki.loki:8000"
@@ -29,27 +31,25 @@ spec:
       insecure: {}
 {{< /highlight >}}
 
-For available macros like `$PROGRAM` and `$HOST` see https://axoflow.com/docs/axosyslog-core/chapter-manipulating-messages/customizing-message-format/reference-macros/
+For details on the available options of the output, see the [documentation of the AxoSyslog syslog-ng distribution](https://axoflow.com/docs/axosyslog-core/chapter-destinations/destination-loki/). For available macros like `$PROGRAM` and `$HOST` see https://axoflow.com/docs/axosyslog-core/chapter-manipulating-messages/customizing-message-format/reference-macros/
+
 
 ## Configuration
 
-### labels (filter.ArrowMap, optional) {#lokioutput-labels}
+### auth (*Auth, optional) {#lokioutput-auth}
 
-Using the Labels map, Kubernetes label to Loki label mapping can be configured. Example: `{"app" : "$PROGRAM"}` 
+Authentication configuration, see the [documentation of the AxoSyslog syslog-ng distribution](https://axoflow.com/docs/axosyslog-core/chapter-destinations/destination-loki/#auth). 
 
-Default: -
 
-### url (string, optional) {#lokioutput-url}
+### batch-lines (int, optional) {#lokioutput-batch-lines}
 
-Specifies the hostname or IP address and optionally the port number of the  service that can receive log data via gRPC. Use a colon (:) after the address to specify the port number of the server. For example: `grpc://127.0.0.1:8000` 
+Description: Specifies how many lines are flushed to a destination in one batch. The syslog-ng OSE application waits for this number of lines to accumulate and sends them off in a single batch. Increasing this number increases throughput as more messages are sent in a single batch, but also increases message latency. For example, if you set batch-lines() to 100, syslog-ng OSE waits for 100 messages. 
 
-Default: -
 
-### time_reopen (int, optional) {#lokioutput-time_reopen}
+### batch-timeout (int, optional) {#lokioutput-batch-timeout}
 
-The time to wait in seconds before a dead connection is reestablished.  
+Description: Specifies the time syslog-ng OSE waits for lines to accumulate in the output buffer. The syslog-ng OSE application sends batches to the destinations evenly. The timer starts when the first message arrives to the buffer, so if only few messages arrive, syslog-ng OSE sends messages to the destination at most once every batch-timeout() milliseconds. 
 
-Default:  60
 
 ### disk_buffer (*DiskBuffer, optional) {#lokioutput-disk_buffer}
 
@@ -57,52 +57,50 @@ This option enables putting outgoing messages into the disk buffer of the destin
 
 Default:  false
 
-### batch-lines (int, optional) {#lokioutput-batch-lines}
+### labels (filter.ArrowMap, optional) {#lokioutput-labels}
 
-Description: Specifies how many lines are flushed to a destination in one batch. The syslog-ng OSE application waits for this number of lines to accumulate and sends them off in a single batch. Increasing this number increases throughput as more messages are sent in a single batch, but also increases message latency. For example, if you set batch-lines() to 100, syslog-ng OSE waits for 100 messages. 
+Using the Labels map, Kubernetes label to Loki label mapping can be configured. Example: `{"app" : "$PROGRAM"}` 
 
-Default: -
 
-### batch-timeout (int, optional) {#lokioutput-batch-timeout}
+### log-fifo-size (int, optional) {#lokioutput-log-fifo-size}
 
-Description: Specifies the time syslog-ng OSE waits for lines to accumulate in the output buffer. The syslog-ng OSE application sends batches to the destinations evenly. The timer starts when the first message arrives to the buffer, so if only few messages arrive, syslog-ng OSE sends messages to the destination at most once every batch-timeout() milliseconds. 
+The number of messages that the output queue can store. 
 
-Default: -
 
-### retries (int, optional) {#lokioutput-retries}
+### persist_name (string, optional) {#lokioutput-persist_name}
 
-The number of times syslog-ng OSE attempts to send a message to this destination. If syslog-ng OSE could not send a message, it will try again until the number of attempts reaches retries, then drops the message. 
+If you receive the following error message during AxoSyslog startup, set the persist-name() option of the duplicate drivers: `Error checking the uniqueness of the persist names, please override it with persist-name option. Shutting down.` See [syslog-ng docs](https://axoflow.com/docs/axosyslog-core/chapter-destinations/configuring-destinations-http-nonjava/reference-destination-http-nonjava/#persist-name) for more information. 
 
-Default: -
 
-### workers (int, optional) {#lokioutput-workers}
+### retries (int, optional) {#lokioutput-retries}
 
-Specifies the number of worker threads (at least 1) that syslog-ng OSE uses to send messages to the server. Increasing the number of worker threads can drastically improve the performance of the destination. 
+The number of times syslog-ng OSE attempts to send a message to this destination. If syslog-ng OSE could not send a message, it will try again until the number of attempts reaches retries, then drops the message. 
 
-Default: -
 
-### persist_name (string, optional) {#lokioutput-persist_name}
+### template (string, optional) {#lokioutput-template}
 
-If you receive the following error message during AxoSyslog startup, set the persist-name() option of the duplicate drivers: `Error checking the uniqueness of the persist names, please override it with persist-name option. Shutting down.` See [syslog-ng docs](https://axoflow.com/docs/axosyslog-core/chapter-destinations/configuring-destinations-http-nonjava/reference-destination-http-nonjava/#persist-name) for more information. 
+Template for customizing the log message format. 
 
-Default: -
 
-### log-fifo-size (int, optional) {#lokioutput-log-fifo-size}
+### time_reopen (int, optional) {#lokioutput-time_reopen}
 
-The number of messages that the output queue can store. 
+The time to wait in seconds before a dead connection is reestablished.  
 
-Default: -
+Default:  60
 
 ### timestamp (string, optional) {#lokioutput-timestamp}
 
 The timestamp that will be applied to the outgoing messages (possible values: current|received|msg default: current). Loki does not accept events, in which the timestamp is not monotonically increasing. 
 
-Default: -
 
-### template (string, optional) {#lokioutput-template}
+### url (string, optional) {#lokioutput-url}
 
-Template for customizing the log message format. 
+Specifies the hostname or IP address and optionally the port number of the  service that can receive log data via gRPC. Use a colon (:) after the address to specify the port number of the server. For example: `grpc://127.0.0.1:8000` 
+
+
+### workers (int, optional) {#lokioutput-workers}
+
+Specifies the number of worker threads (at least 1) that syslog-ng OSE uses to send messages to the server. Increasing the number of worker threads can drastically improve the performance of the destination. 
 
-Default: -
 
 
diff --git a/content/docs/configuration/plugins/syslog-ng-outputs/mongodb.md b/content/docs/configuration/plugins/syslog-ng-outputs/mongodb.md
index 74054d152..0319ed45b 100644
--- a/content/docs/configuration/plugins/syslog-ng-outputs/mongodb.md
+++ b/content/docs/configuration/plugins/syslog-ng-outputs/mongodb.md
@@ -4,7 +4,9 @@ weight: 200
 generated_file: true
 ---
 
-Based on the [MongoDB destination of AxoSyslog core](https://axoflow.com/docs/axosyslog-core/chapter-destinations/configuring-destinations-mongodb/).
+Based on the [MongoDB destination of the AxoSyslog syslog-ng distribution](https://axoflow.com/docs/axosyslog-core/chapter-destinations/configuring-destinations-mongodb/).
+
+Available in Logging operator version 4.4 and later.
 
 ## Example
 
@@ -21,67 +23,51 @@ spec:
     value_pairs: scope("selected-macros" "nv-pairs")
  {{</ highlight >}}
 
-## Configuration
+For more information, see the [documentation of the AxoSyslog syslog-ng distribution](https://axoflow.com/docs/axosyslog-core/chapter-destinations/configuring-destinations-mongodb/).
 
-### collection (string, required) {#mongodb-collection}
 
-The name of the MongoDB collection where the log messages are stored (collections are similar to SQL tables). Note that the name of the collection must not start with a dollar sign ($), and that it may contain dot (.) characters. 
-
-Default: -
-
-### dir (string, optional) {#mongodb-dir}
-
-Defines the folder where the disk-buffer files are stored. 
-
-Default: -
+## Configuration
 
-### disk_buffer (*DiskBuffer, optional) {#mongodb-disk_buffer}
+###  (Batch, required) {#mongodb-}
 
-This option enables putting outgoing messages into the disk buffer of the destination to avoid message loss in case of a system failure on the destination side. For details, see the [Syslog-ng DiskBuffer options](../disk_buffer/).  
+Batching parameters 
 
-Default:  false
 
-### uri (*secret.Secret, optional) {#mongodb-uri}
+###  (Bulk, required) {#mongodb-}
 
-Connection string used for authentication. See the [AxoSyslog Core documentation](https://axoflow.com/docs/axosyslog-core/chapter-destinations/configuring-destinations-mongodb/reference-destination-mongodb/#mongodb-option-uri) 
+Bulk operation related options 
 
-Default:  `mongodb://127.0.0.1:27017/syslog?wtimeoutMS=60000&socketTimeoutMS=60000&connectTimeoutMS=60000`
 
-### value_pairs (ValuePairs, optional) {#mongodb-value_pairs}
+### collection (string, required) {#mongodb-collection}
 
-Creates structured name-value pairs from the data and metadata of the log message.  
+The name of the MongoDB collection where the log messages are stored (collections are similar to SQL tables). Note that the name of the collection must not start with a dollar sign ($), and that it may contain dot (.) characters. 
 
-Default:  "scope("selected-macros" "nv-pairs")"
 
-###  (Batch, required) {#mongodb-}
+### dir (string, optional) {#mongodb-dir}
 
-Batching parameters 
+Defines the folder where the disk-buffer files are stored. 
 
-Default: -
 
-###  (Bulk, required) {#mongodb-}
+### disk_buffer (*DiskBuffer, optional) {#mongodb-disk_buffer}
 
-Bulk operation related options 
+This option enables putting outgoing messages into the disk buffer of the destination to avoid message loss in case of a system failure on the destination side. For details, see the [Syslog-ng DiskBuffer options](../disk_buffer/).  
 
-Default: -
+Default:  false
 
 ### log-fifo-size (int, optional) {#mongodb-log-fifo-size}
 
 The number of messages that the output queue can store. 
 
-Default: -
 
 ### persist_name (string, optional) {#mongodb-persist_name}
 
-If you receive the following error message during AxoSyslog startup, set the persist-name() option of the duplicate drivers: `Error checking the uniqueness of the persist names, please override it with persist-name option. Shutting down.` See [syslog-ng docs](https://axoflow.com/docs/axosyslog-core/chapter-destinations/configuring-destinations-http-nonjava/reference-destination-http-nonjava/#persist-name) for more information. 
+If you receive the following error message during syslog-ng startup, set the `persist-name()` option of the duplicate drivers: `Error checking the uniqueness of the persist names, please override it with persist-name option. Shutting down.` See the [documentation of the AxoSyslog syslog-ng distribution](https://axoflow.com/docs/axosyslog-core/chapter-destinations/configuring-destinations-http-nonjava/reference-destination-http-nonjava/#persist-name) for more information. 
 
-Default: -
 
 ### retries (int, optional) {#mongodb-retries}
 
 The number of times syslog-ng OSE attempts to send a message to this destination. If syslog-ng OSE could not send a message, it will try again until the number of attempts reaches retries, then drops the message. 
 
-Default: -
 
 ### time_reopen (int, optional) {#mongodb-time_reopen}
 
@@ -89,17 +75,27 @@ The time to wait in seconds before a dead connection is reestablished.
 
 Default:  60
 
+### uri (*secret.Secret, optional) {#mongodb-uri}
+
+Connection string used for authentication. See the [documentation of the AxoSyslog syslog-ng distribution](https://axoflow.com/docs/axosyslog-core/chapter-destinations/configuring-destinations-mongodb/reference-destination-mongodb/#mongodb-option-uri) 
+
+Default:  `mongodb://127.0.0.1:27017/syslog?wtimeoutMS=60000&socketTimeoutMS=60000&connectTimeoutMS=60000`
+
+### value_pairs (ValuePairs, optional) {#mongodb-value_pairs}
+
+Creates structured name-value pairs from the data and metadata of the log message.  
+
+Default: `"scope("selected-macros" "nv-pairs")"`
+
 ### write_concern (RawString, optional) {#mongodb-write_concern}
 
-Description: Sets the write concern mode of the MongoDB operations, for both bulk and single mode. See the [AxoSyslog Core documentation](https://axoflow.com/docs/axosyslog-core/chapter-destinations/configuring-destinations-mongodb/reference-destination-mongodb/#mongodb-option-write-concern)
+Description: Sets the write concern mode of the MongoDB operations, for both bulk and single mode. For details, see the [documentation of the AxoSyslog syslog-ng distribution](https://axoflow.com/docs/axosyslog-core/chapter-destinations/configuring-destinations-mongodb/reference-destination-mongodb/#mongodb-option-write-concern). 
 
-Default: -
 
 
 ## Bulk
 
-Bulk operation related options
-See [AxoSyslog Core documentation](https://axoflow.com/docs/axosyslog-core/chapter-destinations/configuring-destinations-mongodb/reference-destination-mongodb/#mongodb-option-bulk)
+Bulk operation related options. For details, see the [documentation of the AxoSyslog syslog-ng distribution](https://axoflow.com/docs/axosyslog-core/chapter-destinations/configuring-destinations-mongodb/reference-destination-mongodb/#mongodb-option-bulk).
 
 ### bulk (*bool, optional) {#bulk-bulk}
 
@@ -124,27 +120,16 @@ Default:  no
 
 TODO move this to a common module once it is used in more places
 
-### scope (RawString, optional) {#valuepairs-scope}
-
-Default: -
-
 ### exclude (RawString, optional) {#valuepairs-exclude}
 
-Default: -
 
 ### key (RawString, optional) {#valuepairs-key}
 
-Default: -
 
 ### pair (RawString, optional) {#valuepairs-pair}
 
-Default: -
 
+### scope (RawString, optional) {#valuepairs-scope}
 
-## RawString
-
-### raw_string (string, optional) {#rawstring-raw_string}
-
-Default: -
 
 
diff --git a/content/docs/configuration/plugins/syslog-ng-outputs/mqtt.md b/content/docs/configuration/plugins/syslog-ng-outputs/mqtt.md
index a4efba961..07f2a1914 100644
--- a/content/docs/configuration/plugins/syslog-ng-outputs/mqtt.md
+++ b/content/docs/configuration/plugins/syslog-ng-outputs/mqtt.md
@@ -4,32 +4,24 @@ weight: 200
 generated_file: true
 ---
 
-Sends messages from a local network to an MQTT broker. For details on the available options of the output, see the [documentation of the AxoSyslog syslog-ng distribution](https://axoflow.com/docs/axosyslog-core/chapter-destinations/destination-mqtt-intro/).
-
-
 ## Overview
 
- ## Prerequisites
-
- ## Example
-
- {{< highlight yaml >}}
- apiVersion: logging.banzaicloud.io/v1beta1
- kind: SyslogNGOutput
- metadata:
-
-	name: mqtt
-	namespace: default
+Sends messages from a local network to an MQTT broker. For details on the available options of the output, see the [documentation of the AxoSyslog syslog-ng distribution](https://axoflow.com/docs/axosyslog-core/chapter-destinations/destination-mqtt-intro/).
 
- spec:
+## Example
 
-	mqtt:
-	  address: tcp://mosquitto:1883
-	  template: |
-	    $(format-json --subkeys json~ --key-delimiter ~)
-	  topic: test/demo
+{{< highlight yaml >}}
+apiVersion: logging.banzaicloud.io/v1beta1
+kind: SyslogNGOutput
+metadata:
+  name: mqtt
+  namespace: default
+spec:
+  mqtt:
+    address: tcp://mosquitto:1883
+    topic: test/demo
+{{</ highlight >}}
 
- {{</ highlight >}}
 
 ## Configuration
 ## MQTT
@@ -38,30 +30,25 @@ Sends messages from a local network to an MQTT broker. For details on the availa
 
 Address of the destination host 
 
-Default: -
 
-### topic (string, optional) {#mqtt-topic}
+### fallback-topic (string, optional) {#mqtt-fallback-topic}
 
-Topic defines in which topic syslog-ng stores the log message. You can also use templates here, and use, for example, the $HOST macro in the topic name hierarchy. 
+fallback-topic is used when syslog-ng cannot post a message to the originally defined topic (which can include invalid characters coming from templates). 
 
-Default: -
 
-### fallback-topic (string, optional) {#mqtt-fallback-topic}
+### qos (int, optional) {#mqtt-qos}
 
-fallback-topic is used when syslog-ng cannot post a message to the originally defined topic (which can include invalid characters coming from templates). 
+qos stands for quality of service and can take three values in the MQTT world. Its default value is 0, where there is no guarantee that the message is ever delivered. 
 
-Default: -
 
 ### template (string, optional) {#mqtt-template}
 
-Template where you can configure the message template sent to the MQTT broker. By default, the template is: “$ISODATE $HOST $MSGHDR$MSG” 
+Template where you can configure the message template sent to the MQTT broker. By default, the template is: `$ISODATE $HOST $MSGHDR$MSG` 
 
-Default: -
 
-### qos (int, optional) {#mqtt-qos}
+### topic (string, optional) {#mqtt-topic}
 
-qos stands for quality of service and can take three values in the MQTT world. Its default value is 0, where there is no guarantee that the message is ever delivered. 
+Topic defines in which topic syslog-ng stores the log message. You can also use templates here, and use, for example, the $HOST macro in the topic name hierarchy. 
 
-Default: -
 
 
diff --git a/content/docs/configuration/plugins/syslog-ng-outputs/openobserve.md b/content/docs/configuration/plugins/syslog-ng-outputs/openobserve.md
new file mode 100644
index 000000000..18df6a3d7
--- /dev/null
+++ b/content/docs/configuration/plugins/syslog-ng-outputs/openobserve.md
@@ -0,0 +1,59 @@
+---
+title: Openobserve
+weight: 200
+generated_file: true
+---
+
+# Sending messages over Openobserve
+## Overview
+
+Send messages to [OpenObserve](https://openobserve.ai/docs/api/ingestion/logs/json/) using its [Logs Ingestion - JSON API](https://openobserve.ai/docs/api/ingestion/logs/json/). This API accepts multiple records in batch in JSON format.
+
+Available in Logging operator version 4.5 and later.
+
+## Example
+
+{{< highlight yaml >}}
+apiVersion: logging.banzaicloud.io/v1beta1
+kind: SyslogNGOutput
+metadata:
+  name: openobserve
+spec:
+  openobserve:
+    url: "https://some-openobserve-endpoint"
+    port: 5040
+    organization: "default"
+    stream: "default"
+    user: "username"
+    password:
+      valueFrom:
+        secretKeyRef:
+          name: openobserve
+          key: password
+{{</ highlight >}}
+
+For details on the available options of the output, see the [documentation of the AxoSyslog syslog-ng distribution](https://axoflow.com/docs/axosyslog-core/chapter-destinations/openobserve/).
+
+
+## Configuration
+## OpenobserveOutput
+
+###  (HTTPOutput, required) {#openobserveoutput-}
+
+
+### organization (string, optional) {#openobserveoutput-organization}
+
+Name of the organization in Openobserve. 
+
+
+### record (string, optional) {#openobserveoutput-record}
+
+Arguments to the `$format-json()` template function. Default: `"--scope rfc5424 --exclude DATE --key ISODATE @timestamp=${ISODATE}"` 
+
+
+### stream (string, optional) {#openobserveoutput-stream}
+
+Name of the stream in Openobserve. 
+
+
+
diff --git a/content/docs/configuration/plugins/syslog-ng-outputs/redis.md b/content/docs/configuration/plugins/syslog-ng-outputs/redis.md
index 2d8212b12..ebbcf3ac0 100644
--- a/content/docs/configuration/plugins/syslog-ng-outputs/redis.md
+++ b/content/docs/configuration/plugins/syslog-ng-outputs/redis.md
@@ -6,6 +6,8 @@ generated_file: true
 
 Based on the [Redis destination of AxoSyslog core](https://axoflow.com/docs/axosyslog-core/chapter-destinations/configuring-destinations-redis/).
 
+Available in Logging operator version 4.4 and later.
+
 ## Example
 
 {{< highlight yaml >}}
@@ -24,91 +26,87 @@ spec:
     workers: 1
  {{</ highlight >}}
 
+For details on the available options of the output, see the [documentation of the AxoSyslog syslog-ng distribution](https://axoflow.com/docs/axosyslog-core/chapter-destinations/configuring-destinations-redis/).
+
+
 ## Configuration
 
-### host (string, optional) {#redisoutput-host}
+###  (Batch, required) {#redisoutput-}
 
-The hostname or IP address of the Redis server.  
+Batching parameters 
 
-Default:  127.0.0.1
 
 ### auth (*secret.Secret, optional) {#redisoutput-auth}
 
 The password used for authentication on a password-protected Redis server. 
 
-Default: -
 
-### port (int, optional) {#redisoutput-port}
-
-The port number of the Redis server.  
+### command_and_arguments ([]string, optional) {#redisoutput-command_and_arguments}
 
-Default:  6379
+The Redis command to execute, for example, LPUSH, INCR, or HINCRBY. Using the HINCRBY command with an increment value of 1 allows you to create various statistics. For example, the `command("HINCRBY" "${HOST}/programs" "${PROGRAM}" "1")` command counts the number of log messages on each host for each program.
 
-### retries (int, optional) {#redisoutput-retries}
+Default:  ""
 
-If syslog-ng OSE cannot send a message, it will try again until the number of attempts reaches retries().  
+### command (StringList, optional) {#redisoutput-command}
 
-Default:  3
+Internal rendered form of the CommandAndArguments field 
 
-### throttle (int, optional) {#redisoutput-throttle}
+### disk_buffer (*DiskBuffer, optional) {#redisoutput-disk_buffer}
 
-Sets the maximum number of messages sent to the destination per second. Use this output-rate-limiting functionality only when using disk-buffer as well to avoid the risk of losing messages. Specifying 0 or a lower value sets the output limit to unlimited.  
+This option enables putting outgoing messages into the disk buffer of the destination to avoid message loss in case of a system failure on the destination side. For details, see the [syslog-ng DiskBuffer options](../disk_buffer/).  
 
-Default:  0
+Default:  false
 
-### time-reopen (int, optional) {#redisoutput-time-reopen}
+### host (string, optional) {#redisoutput-host}
 
-The time to wait in seconds before a dead connection is reestablished.  
+The hostname or IP address of the Redis server.  
 
-Default:  60
+Default:  127.0.0.1
 
-### workers (int, optional) {#redisoutput-workers}
+### log-fifo-size (int, optional) {#redisoutput-log-fifo-size}
 
-Specifies the number of worker threads (at least 1) that syslog-ng OSE uses to send messages to the server. Increasing the number of worker threads can drastically improve the performance of the destination.  
+The number of messages that the output queue can store. 
 
-Default:  1
 
-### command_and_arguments ([]string, optional) {#redisoutput-command_and_arguments}
+### persist_name (string, optional) {#redisoutput-persist_name}
 
-The Redis command to execute, for example, LPUSH, INCR, or HINCRBY. Using the HINCRBY command with an increment value of 1 allows you to create various statistics. For example, the command("HINCRBY" "${HOST}/programs" "${PROGRAM}" "1") command counts the number of log messages on each host for each program.  
+Persistname 
 
-Default:  ""
 
-### command (StringList, optional) {#redisoutput-command}
+### port (int, optional) {#redisoutput-port}
 
-Internal rendered form of the CommandAndArguments field 
+The port number of the Redis server.  
 
-Default: -
+Default:  6379
 
-###  (Batch, required) {#redisoutput-}
+### retries (int, optional) {#redisoutput-retries}
 
-Batching parameters 
+If syslog-ng OSE cannot send a message, it will try again until the number of attempts reaches `retries()`.
 
-Default: -
+Default:  3
 
-### log-fifo-size (int, optional) {#redisoutput-log-fifo-size}
+### throttle (int, optional) {#redisoutput-throttle}
 
-The number of messages that the output queue can store. 
+Sets the maximum number of messages sent to the destination per second. Use this output-rate-limiting functionality only when using disk-buffer as well to avoid the risk of losing messages. Specifying 0 or a lower value sets the output limit to unlimited.  
 
-Default: -
+Default:  0
 
-### disk_buffer (*DiskBuffer, optional) {#redisoutput-disk_buffer}
+### time-reopen (int, optional) {#redisoutput-time-reopen}
 
-This option enables putting outgoing messages into the disk buffer of the destination to avoid message loss in case of a system failure on the destination side. For details, see the [syslog-ng DiskBuffer options](../disk_buffer/).  
+The time to wait in seconds before a dead connection is reestablished.  
 
-Default:  false
+Default:  60
 
-### persist_name (string, optional) {#redisoutput-persist_name}
+### workers (int, optional) {#redisoutput-workers}
 
-Persistname 
+Specifies the number of worker threads (at least 1) that syslog-ng OSE uses to send messages to the server. Increasing the number of worker threads can drastically improve the performance of the destination.  
 
-Default: -
+Default:  1
 
 
 ## StringList
 
 ### string-list ([]string, optional) {#stringlist-string-list}
 
-Default: -
 
 
diff --git a/content/docs/configuration/plugins/syslog-ng-outputs/s3.md b/content/docs/configuration/plugins/syslog-ng-outputs/s3.md
index 2759d7030..64922904f 100644
--- a/content/docs/configuration/plugins/syslog-ng-outputs/s3.md
+++ b/content/docs/configuration/plugins/syslog-ng-outputs/s3.md
@@ -4,7 +4,9 @@ weight: 200
 generated_file: true
 ---
 
-Sends messages from a local network to a S3 (compatible) server. More information at: https://axoflow.com/docs/axosyslog-core/chapter-destinations/destination-s3/
+Sends messages from a local network to a S3 (compatible) server. For more information, see the [documentation of the AxoSyslog syslog-ng distribution](https://axoflow.com/docs/axosyslog-core/chapter-destinations/destination-s3/).
+
+Available in Logging operator version 4.4 and later.
 
 ## Example
 {{< highlight yaml >}}
@@ -26,54 +28,39 @@ spec:
         secretKeyRef:
           name: s3
           key: secret-key
-    object_key: "${HOST}/my-logs"
+    object_key: "path/to/my-logs/${HOST}"
 {{</ highlight >}}
 
-For available macros like `$PROGRAM` and `$HOST` see https://axoflow.com/docs/axosyslog-core/chapter-manipulating-messages/customizing-message-format/reference-macros/
+For available macros like `$PROGRAM` and `$HOST`,  see the [documentation of the AxoSyslog syslog-ng distribution](https://axoflow.com/docs/axosyslog-core/chapter-manipulating-messages/customizing-message-format/reference-macros/).
 
 ## S3Output
 
-### url (string, optional) {#s3output-url}
-
-The hostname or IP address of the S3 server. 
-
-Default: -
-
-### bucket (string, optional) {#s3output-bucket}
-
-The bucket name of the S3 server. 
-
-Default: -
-
 ### access_key (*secret.Secret, optional) {#s3output-access_key}
 
 The access_key for the S3 server. 
 
-Default: -
 
-### secret_key (*secret.Secret, optional) {#s3output-secret_key}
+### bucket (string, optional) {#s3output-bucket}
 
-The secret_key for the S3 server. 
+The bucket name of the S3 server. 
 
-Default: -
 
-### object_key (string, optional) {#s3output-object_key}
+### canned_acl (string, optional) {#s3output-canned_acl}
 
-The object_key for the S3 server. 
+Set the canned_acl option. 
 
-Default: -
 
-### object_key_timestamp (RawString, optional) {#s3output-object_key_timestamp}
+### chunk_size (int, optional) {#s3output-chunk_size}
 
-Set object_key_timestamp 
+Set the chunk size.  
 
-Default: -
+Default:  5MiB
 
-### template (RawString, optional) {#s3output-template}
+### compresslevel (int, optional) {#s3output-compresslevel}
 
-Template 
+Set the compression level (1-9).  
 
-Default: -
+Default:  9
 
 ### compression (*bool, optional) {#s3output-compression}
 
@@ -81,17 +68,16 @@ Enable or disable compression.
 
 Default:  false
 
-### compresslevel (int, optional) {#s3output-compresslevel}
+### flush_grace_period (int, optional) {#s3output-flush_grace_period}
 
-Set the compression level (1-9).  
+Set the number of seconds for flush period.  
 
-Default:  9
+Default:  60
 
-### chunk_size (int, optional) {#s3output-chunk_size}
+### log-fifo-size (int, optional) {#s3output-log-fifo-size}
 
-Set the chunk size.  
+The number of messages that the output queue can store. 
 
-Default:  5MiB
 
 ### max_object_size (int, optional) {#s3output-max_object_size}
 
@@ -99,59 +85,51 @@ Set the maximum object size size.
 
 Default:  5120GiB
 
-### upload_threads (int, optional) {#s3output-upload_threads}
-
-Set the number of upload threads.  
-
-Default:  8
-
 ### max_pending_uploads (int, optional) {#s3output-max_pending_uploads}
 
 Set the maximum number of pending uploads.  
 
 Default:  32
 
-### flush_grace_period (int, optional) {#s3output-flush_grace_period}
+### object_key (string, optional) {#s3output-object_key}
 
-Set the number of seconds for flush period.  
+The object_key for the S3 server. 
 
-Default:  60
 
-### region (string, optional) {#s3output-region}
+### object_key_timestamp (RawString, optional) {#s3output-object_key_timestamp}
 
-Set the region option. 
+Set object_key_timestamp 
 
-Default: -
 
-### storage_class (string, optional) {#s3output-storage_class}
+### persist_name (string, optional) {#s3output-persist_name}
 
-Set the storage_class option. 
+Persistname 
 
-Default: -
 
-### canned_acl (string, optional) {#s3output-canned_acl}
+### region (string, optional) {#s3output-region}
 
-Set the canned_acl option. 
+Set the region option. 
 
-Default: -
 
-### log-fifo-size (int, optional) {#s3output-log-fifo-size}
+### retries (int, optional) {#s3output-retries}
 
-The number of messages that the output queue can store. 
+The number of times syslog-ng OSE attempts to send a message to this destination. If syslog-ng OSE could not send a message, it will try again until the number of attempts reaches retries, then drops the message. 
 
-Default: -
 
-### persist_name (string, optional) {#s3output-persist_name}
+### secret_key (*secret.Secret, optional) {#s3output-secret_key}
 
-Persistname 
+The secret_key for the S3 server. 
 
-Default: -
 
-### retries (int, optional) {#s3output-retries}
+### storage_class (string, optional) {#s3output-storage_class}
 
-The number of times syslog-ng OSE attempts to send a message to this destination. If syslog-ng OSE could not send a message, it will try again until the number of attempts reaches retries, then drops the message. 
+Set the storage_class option. 
+
+
+### template (RawString, optional) {#s3output-template}
+
+Template 
 
-Default: -
 
 ### throttle (int, optional) {#s3output-throttle}
 
@@ -159,4 +137,15 @@ Sets the maximum number of messages sent to the destination per second. Use this
 
 Default:  0
 
+### upload_threads (int, optional) {#s3output-upload_threads}
+
+Set the number of upload threads.  
+
+Default:  8
+
+### url (string, optional) {#s3output-url}
+
+The hostname or IP address of the S3 server. 
+
+
 
diff --git a/content/docs/configuration/plugins/syslog-ng-outputs/splunk_hec.md b/content/docs/configuration/plugins/syslog-ng-outputs/splunk_hec.md
index 5252b55d5..432b98359 100644
--- a/content/docs/configuration/plugins/syslog-ng-outputs/splunk_hec.md
+++ b/content/docs/configuration/plugins/syslog-ng-outputs/splunk_hec.md
@@ -6,6 +6,8 @@ generated_file: true
 
 Based on the [Splunk destination of AxoSyslog core](https://axoflow.com/docs/axosyslog-core/chapter-destinations/syslog-ng-with-splunk/).
 
+Available in Logging operator version 4.4 and later.
+
 ## Example
 
 {{< highlight yaml >}}
@@ -23,94 +25,81 @@ spec:
             key: token
 {{</ highlight >}}
 
+
 ## Configuration
+## SplunkHECOutput
 
 ###  (HTTPOutput, required) {#splunkhecoutput-}
 
-Default: -
 
-### token (secret.Secret, optional) {#splunkhecoutput-token}
+### content_type (string, optional) {#splunkhecoutput-content_type}
 
-The token that syslog-ng OSE uses to authenticate on the event collector. 
+Additional HTTP request content-type option. 
 
-Default: -
 
-### event (string, optional) {#splunkhecoutput-event}
+### default_index (string, optional) {#splunkhecoutput-default_index}
 
-event() accepts a template, which declares the content of the log message sent to Splunk. Default value: ${MSG} 
+Fallback option for index field. For details, see the [documentation of the AxoSyslog syslog-ng distribution](https://axoflow.com/docs/axosyslog-core/chapter-destinations/syslog-ng-with-splunk/). 
 
-Default: -
 
-### index (string, optional) {#splunkhecoutput-index}
+### default_source (string, optional) {#splunkhecoutput-default_source}
 
-Splunk index where the messages will be stored. 
+Fallback option for source field. 
 
-Default: -
 
-### source (string, optional) {#splunkhecoutput-source}
+### default_sourcetype (string, optional) {#splunkhecoutput-default_sourcetype}
 
-Sets the source field. 
+Fallback option for sourcetype field. 
 
-Default: -
 
-### sourcetype (string, optional) {#splunkhecoutput-sourcetype}
+### event (string, optional) {#splunkhecoutput-event}
 
-Sets the sourcetype field. 
+event() accepts a template, which declares the content of the log message sent to Splunk. Default value: `${MSG}` 
 
-Default: -
 
-### host (string, optional) {#splunkhecoutput-host}
+### extra_headers ([]string, optional) {#splunkhecoutput-extra_headers}
 
-Sets the host field. 
+Additional HTTP request headers. 
 
-Default: -
 
-### time (string, optional) {#splunkhecoutput-time}
+### extra_queries ([]string, optional) {#splunkhecoutput-extra_queries}
 
-Sets the time field. 
+Additional HTTP request query options. 
 
-Default: -
 
-### default_index (string, optional) {#splunkhecoutput-default_index}
+### fields (string, optional) {#splunkhecoutput-fields}
 
-Fallback option for index field. See [syslog-ng docs](https://axoflow.com/docs/axosyslog-core/chapter-destinations/syslog-ng-with-splunk/) 
+Additional indexing metadata for Splunk. 
 
-Default: -
 
-### default_source (string, optional) {#splunkhecoutput-default_source}
+### host (string, optional) {#splunkhecoutput-host}
 
-Fallback option for source field. 
+Sets the host field. 
 
-Default: -
 
-### default_sourcetype (string, optional) {#splunkhecoutput-default_sourcetype}
+### index (string, optional) {#splunkhecoutput-index}
 
-Fallback option for sourcetype field. 
+Splunk index where the messages will be stored. 
 
-Default: -
 
-### fields (string, optional) {#splunkhecoutput-fields}
+### source (string, optional) {#splunkhecoutput-source}
 
-Additional indexing metadata for Splunk. 
+Sets the source field. 
 
-Default: -
 
-### extra_headers ([]string, optional) {#splunkhecoutput-extra_headers}
+### sourcetype (string, optional) {#splunkhecoutput-sourcetype}
 
-Additional HTTP request headers. 
+Sets the sourcetype field. 
 
-Default: -
 
-### extra_queries ([]string, optional) {#splunkhecoutput-extra_queries}
+### time (string, optional) {#splunkhecoutput-time}
 
-Additional HTTP request query options. 
+Sets the time field. 
 
-Default: -
 
-### content_type (string, optional) {#splunkhecoutput-content_type}
+### token (secret.Secret, optional) {#splunkhecoutput-token}
 
-Additional HTTP request content-type option. 
+The token that syslog-ng OSE uses to authenticate on the event collector. 
 
-Default: -
 
 
diff --git a/content/docs/configuration/plugins/syslog-ng-outputs/sumologic_http.md b/content/docs/configuration/plugins/syslog-ng-outputs/sumologic_http.md
index 2312555de..75220c80d 100644
--- a/content/docs/configuration/plugins/syslog-ng-outputs/sumologic_http.md
+++ b/content/docs/configuration/plugins/syslog-ng-outputs/sumologic_http.md
@@ -44,38 +44,35 @@ spec:
       use-system-cert-store: true
 {{</ highlight >}}
 
+For details on the available options of the output, see the [documentation of the AxoSyslog syslog-ng distribution](https://axoflow.com/docs/axosyslog-core/chapter-destinations/destination-sumologic-intro/destination-sumologic-http/).
+
+
 ## Configuration
 ## SumologicHTTPOutput
 
-### collector (*secret.Secret, optional) {#sumologichttpoutput-collector}
-
-The Cloud Syslog Cloud Token that you received from the Sumo Logic service while configuring your cloud syslog source.  
+### batch-bytes (int, optional) {#sumologichttpoutput-batch-bytes}
 
-Default:  empty
 
-### deployment (string, optional) {#sumologichttpoutput-deployment}
+### batch-lines (int, optional) {#sumologichttpoutput-batch-lines}
 
-This option specifies your Sumo Logic deployment.https://help.sumologic.com/APIs/General-API-Information/Sumo-Logic-Endpoints-by-Deployment-and-Firewall-Security   
 
-Default:  empty
+### batch-timeout (int, optional) {#sumologichttpoutput-batch-timeout}
 
-### headers ([]string, optional) {#sumologichttpoutput-headers}
 
-Custom HTTP headers to include in the request, for example, headers("HEADER1: header1", "HEADER2: header2").   
+### body (string, optional) {#sumologichttpoutput-body}
 
-Default:  empty
 
-### time_reopen (int, optional) {#sumologichttpoutput-time_reopen}
+### collector (*secret.Secret, optional) {#sumologichttpoutput-collector}
 
-The time to wait in seconds before a dead connection is reestablished.  
+The Cloud Syslog Cloud Token that you received from the Sumo Logic service while configuring your cloud syslog source.  
 
-Default:  60
+Default:  empty
 
-### tls (*TLS, optional) {#sumologichttpoutput-tls}
+### deployment (string, optional) {#sumologichttpoutput-deployment}
 
-This option sets various options related to TLS encryption, for example, key/certificate files and trusted CA locations. TLS can be used only with tcp-based transport protocols. For details, see [TLS for syslog-ng outputs](../tls/) and the [documentation of the AxoSyslog syslog-ng distribution](https://axoflow.com/docs/axosyslog-core/chapter-encrypted-transport-tls/tlsoptions/).
+This option specifies your Sumo Logic deployment.https://help.sumologic.com/APIs/General-API-Information/Sumo-Logic-Endpoints-by-Deployment-and-Firewall-Security   
 
-Default: -
+Default:  empty
 
 ### disk_buffer (*DiskBuffer, optional) {#sumologichttpoutput-disk_buffer}
 
@@ -83,28 +80,27 @@ This option enables putting outgoing messages into the disk buffer of the destin
 
 Default:  false
 
-### body (string, optional) {#sumologichttpoutput-body}
+### headers ([]string, optional) {#sumologichttpoutput-headers}
 
-Default: -
+Custom HTTP headers to include in the request, for example, `headers("HEADER1: header1", "HEADER2: header2")`.
 
-### url (*secret.Secret, optional) {#sumologichttpoutput-url}
+Default:  empty
 
-Default: -
+### persist_name (string, optional) {#sumologichttpoutput-persist_name}
 
-### batch-lines (int, optional) {#sumologichttpoutput-batch-lines}
+### time_reopen (int, optional) {#sumologichttpoutput-time_reopen}
 
-Default: -
+The time to wait in seconds before a dead connection is reestablished.  
 
-### batch-bytes (int, optional) {#sumologichttpoutput-batch-bytes}
+Default:  60
 
-Default: -
+### tls (*TLS, optional) {#sumologichttpoutput-tls}
 
-### batch-timeout (int, optional) {#sumologichttpoutput-batch-timeout}
+This option sets various options related to TLS encryption, for example, key/certificate files and trusted CA locations. TLS can be used only with tcp-based transport protocols. For details, see [TLS for syslog-ng outputs](../tls/) and the [documentation of the AxoSyslog syslog-ng distribution](https://axoflow.com/docs/axosyslog-core/chapter-encrypted-transport-tls/tlsoptions/).
 
 Default: -
 
-### persist_name (string, optional) {#sumologichttpoutput-persist_name}
+### url (*secret.Secret, optional) {#sumologichttpoutput-url}
 
-Default: -
 
 
diff --git a/content/docs/configuration/plugins/syslog-ng-outputs/sumologic_syslog.md b/content/docs/configuration/plugins/syslog-ng-outputs/sumologic_syslog.md
index 4f03b03ab..455fc635c 100644
--- a/content/docs/configuration/plugins/syslog-ng-outputs/sumologic_syslog.md
+++ b/content/docs/configuration/plugins/syslog-ng-outputs/sumologic_syslog.md
@@ -14,18 +14,27 @@ You need a Sumo Logic account to use this output. For details, see the [document
 ## Configuration
 ## SumologicSyslogOutput
 
-### port (int, optional) {#sumologicsyslogoutput-port}
-
-This option sets the port number of the Sumo Logic server to connect to.  
-
-Default:  6514
-
 ### deployment (string, optional) {#sumologicsyslogoutput-deployment}
 
 This option specifies your Sumo Logic deployment. https://help.sumologic.com/APIs/General-API-Information/Sumo-Logic-Endpoints-by-Deployment-and-Firewall-Security   
 
 Default:  empty
 
+### disk_buffer (*DiskBuffer, optional) {#sumologicsyslogoutput-disk_buffer}
+
+This option enables putting outgoing messages into the disk buffer of the destination to avoid message loss in case of a system failure on the destination side. For details, see the [Syslog-ng DiskBuffer options](../disk_buffer/).  
+
+Default:  false
+
+### persist_name (string, optional) {#sumologicsyslogoutput-persist_name}
+
+
+### port (int, optional) {#sumologicsyslogoutput-port}
+
+This option sets the port number of the Sumo Logic server to connect to.  
+
+Default:  6514
+
 ### tag (string, optional) {#sumologicsyslogoutput-tag}
 
 This option specifies the list of tags to add as the tags fields of Sumo Logic messages. If not specified, syslog-ng OSE automatically adds the tags already assigned to the message. If you set the tag() option, only the tags you specify will be added to the messages.  
@@ -36,21 +45,8 @@ Default:  tag
 
 The Cloud Syslog Cloud Token that you received from the Sumo Logic service while configuring your cloud syslog source. https://help.sumologic.com/03Send-Data/Sources/02Sources-for-Hosted-Collectors/Cloud-Syslog-Source#configure-a-cloud%C2%A0syslog%C2%A0source 
 
-Default: -
-
 ### tls (*TLS, optional) {#sumologicsyslogoutput-tls}
 
 This option sets various options related to TLS encryption, for example, key/certificate files and trusted CA locations. TLS can be used only with tcp-based transport protocols. For details, see [TLS for syslog-ng outputs](../tls/) and the [documentation of the AxoSyslog syslog-ng distribution](https://axoflow.com/docs/axosyslog-core/chapter-encrypted-transport-tls/tlsoptions/).
-Default: -
-
-### disk_buffer (*DiskBuffer, optional) {#sumologicsyslogoutput-disk_buffer}
-
-This option enables putting outgoing messages into the disk buffer of the destination to avoid message loss in case of a system failure on the destination side. For details, see the [Syslog-ng DiskBuffer options](../disk_buffer/).  
-
-Default:  false
-
-### persist_name (string, optional) {#sumologicsyslogoutput-persist_name}
-
-Default: -
 
 
diff --git a/content/docs/configuration/plugins/syslog-ng-outputs/syslog.md b/content/docs/configuration/plugins/syslog-ng-outputs/syslog.md
index 875d0ccda..91194a8df 100644
--- a/content/docs/configuration/plugins/syslog-ng-outputs/syslog.md
+++ b/content/docs/configuration/plugins/syslog-ng-outputs/syslog.md
@@ -4,7 +4,8 @@ weight: 200
 generated_file: true
 ---
 
-The `syslog` output sends log records over a socket using the Syslog protocol (RFC 5424). Based on https://axoflow.com/docs/axosyslog-core/chapter-destinations/configuring-destinations-syslog/
+The `syslog` output sends log records over a socket using the Syslog protocol (RFC 5424). Based on the [syslog destination of AxoSyslog core](https://axoflow.com/docs/axosyslog-core/chapter-destinations/configuring-destinations-syslog/).
+
 
 {{< highlight yaml >}}
 kind: SyslogNGOutput
@@ -74,55 +75,53 @@ spec:
 
 For details on the available options of the output, see the [documentation of the AxoSyslog syslog-ng distribution](https://axoflow.com/docs/axosyslog-core/chapter-destinations/configuring-destinations-syslog/).
 
+
 ## Configuration
 
-### host (string, required) {#syslogoutput-host}
+### close_on_input (*bool, optional) {#syslogoutput-close_on_input}
 
-Address of the destination host 
+By default, syslog-ng OSE closes destination sockets if it receives any input from the socket (for example, a reply). If this option is set to no, syslog-ng OSE just ignores the input, but does not close the socket. For details, see the [documentation of the AxoSyslog syslog-ng distribution](https://axoflow.com/docs/axosyslog-core/chapter-destinations/configuring-destinations-syslog/reference-destination-syslog-chapter/#close-on-input).
 
-Default: -
 
-### port (int, optional) {#syslogoutput-port}
+### disk_buffer (*DiskBuffer, optional) {#syslogoutput-disk_buffer}
 
-The port number to connect to. For details, see the [documentation of the AxoSyslog syslog-ng distribution](https://axoflow.com/docs/axosyslog-core/chapter-destinations/configuring-destinations-syslog/reference-destination-syslog-chapter/#port-or-destport).
+Enables putting outgoing messages into the disk buffer of the destination to avoid message loss in case of a system failure on the destination side. For details, see the [Syslog-ng DiskBuffer options](../disk_buffer/). 
 
-Default: -
 
-### transport (string, optional) {#syslogoutput-transport}
+### flags ([]string, optional) {#syslogoutput-flags}
 
-Specifies the protocol used to send messages to the destination server. For details, see the [documentation of the AxoSyslog syslog-ng distribution](https://axoflow.com/docs/axosyslog-core/chapter-destinations/configuring-destinations-syslog/reference-destination-syslog-chapter/#transport).
+Flags influence the behavior of the destination driver. For details, see the [documentation of the AxoSyslog syslog-ng distribution](https://axoflow.com/docs/axosyslog-core/chapter-destinations/configuring-destinations-syslog/reference-destination-syslog-chapter/#flags).
 
-Default: -
 
-### close_on_input (*bool, optional) {#syslogoutput-close_on_input}
+### flush_lines (int, optional) {#syslogoutput-flush_lines}
 
-By default, syslog-ng OSE closes destination sockets if it receives any input from the socket (for example, a reply). If this option is set to no, syslog-ng OSE just ignores the input, but does not close the socket. For details, see the [documentation of the AxoSyslog syslog-ng distribution](https://axoflow.com/docs/axosyslog-core/chapter-destinations/configuring-destinations-syslog/reference-destination-syslog-chapter/#close-on-input).
+Specifies how many lines are flushed to a destination at a time. For details, see the [documentation of the AxoSyslog syslog-ng distribution](https://axoflow.com/docs/axosyslog-core/chapter-destinations/configuring-destinations-syslog/reference-destination-syslog-chapter/#flush-lines).
 
-Default: -
 
-### flags ([]string, optional) {#syslogoutput-flags}
+### host (string, optional) {#syslogoutput-host}
 
-Flags influence the behavior of the destination driver. For details, see the [documentation of the AxoSyslog syslog-ng distribution](https://axoflow.com/docs/axosyslog-core/chapter-destinations/configuring-destinations-syslog/reference-destination-syslog-chapter/#flags).
+Address of the destination host 
 
-Default: -
 
-### flush_lines (int, optional) {#syslogoutput-flush_lines}
+### persist_name (string, optional) {#syslogoutput-persist_name}
+
+Unique name for the syslog-ng driver. If you receive the following error message during syslog-ng startup, set the `persist-name()` option of the duplicate drivers: `Error checking the uniqueness of the persist names, please override it with persist-name option. Shutting down.` See the [documentation of the AxoSyslog syslog-ng distribution](https://axoflow.com/docs/axosyslog-core/chapter-destinations/configuring-destinations-http-nonjava/reference-destination-http-nonjava/#persist-name) for more information. 
 
-Specifies how many lines are flushed to a destination at a time. For details, see the [documentation of the AxoSyslog syslog-ng distribution](https://axoflow.com/docs/axosyslog-core/chapter-destinations/configuring-destinations-syslog/reference-destination-syslog-chapter/#flush-lines).
 
-Default: -
+### port (int, optional) {#syslogoutput-port}
+
+The port number to connect to. For details, see the [documentation of the AxoSyslog syslog-ng distribution](https://axoflow.com/docs/axosyslog-core/chapter-destinations/configuring-destinations-syslog/reference-destination-syslog-chapter/#port-or-destport).
+
 
 ### so_keepalive (*bool, optional) {#syslogoutput-so_keepalive}
 
 Enables keep-alive messages, keeping the socket open. For details, see the [documentation of the AxoSyslog syslog-ng distribution](https://axoflow.com/docs/axosyslog-core/chapter-destinations/configuring-destinations-syslog/reference-destination-syslog-chapter/#so-keepalive).
 
-Default: -
 
 ### suppress (int, optional) {#syslogoutput-suppress}
 
 Specifies the number of seconds syslog-ng waits for identical messages. For details, see the [documentation of the AxoSyslog syslog-ng distribution](https://axoflow.com/docs/axosyslog-core/chapter-destinations/configuring-destinations-syslog/reference-destination-syslog-chapter/#suppress).
 
-Default: -
 
 ### template (string, optional) {#syslogoutput-template}
 
@@ -134,28 +133,20 @@ Default:  0
 
 Turns on escaping for the ', ", and backspace characters in templated output files. For details, see the [documentation of the AxoSyslog syslog-ng distribution](https://axoflow.com/docs/axosyslog-core/chapter-destinations/configuring-destinations-syslog/reference-destination-syslog-chapter/#template-escape).
 
-Default: -
 
 ### tls (*TLS, optional) {#syslogoutput-tls}
 
 Sets various options related to TLS encryption, for example, key/certificate files and trusted CA locations. For details, see the [documentation of the AxoSyslog syslog-ng distribution](https://axoflow.com/docs/axosyslog-core/chapter-destinations/configuring-destinations-syslog/reference-destination-syslog-chapter/#tls).
 
-Default: -
 
-### ts_format (string, optional) {#syslogoutput-ts_format}
-
-Override the global timestamp format (set in the global ts-format() parameter) for the specific destination. For details, see the [documentation of the AxoSyslog syslog-ng distribution](https://axoflow.com/docs/axosyslog-core/chapter-destinations/configuring-destinations-syslog/reference-destination-syslog-chapter/#ts-format).
+### transport (string, optional) {#syslogoutput-transport}
 
-Default: -
+Specifies the protocol used to send messages to the destination server. For details, see the [documentation of the AxoSyslog syslog-ng distribution](https://axoflow.com/docs/axosyslog-core/chapter-destinations/configuring-destinations-syslog/reference-destination-syslog-chapter/#transport).
 
-### disk_buffer (*DiskBuffer, optional) {#syslogoutput-disk_buffer}
 
-Enables putting outgoing messages into the disk buffer of the destination to avoid message loss in case of a system failure on the destination side. For details, see the [Syslog-ng DiskBuffer options](../disk_buffer/). 
+### ts_format (string, optional) {#syslogoutput-ts_format}
 
-Default: -
+Override the global timestamp format (set in the global ts-format() parameter) for the specific destination. For details, see the [documentation of the AxoSyslog syslog-ng distribution](https://axoflow.com/docs/axosyslog-core/chapter-destinations/configuring-destinations-syslog/reference-destination-syslog-chapter/#ts-format).
 
-### persist_name (string, optional) {#syslogoutput-persist_name}
 
-Unique name for the syslog-ng driver [more information](https://www.syslog-ng.com/technical-documents/doc/syslog-ng-open-source-edition/3.16/administration-guide/persist-name) 
 
-Default: -
diff --git a/content/docs/configuration/plugins/syslog-ng-outputs/tls.md b/content/docs/configuration/plugins/syslog-ng-outputs/tls.md
index 0fa62e7c5..10a8f001f 100644
--- a/content/docs/configuration/plugins/syslog-ng-outputs/tls.md
+++ b/content/docs/configuration/plugins/syslog-ng-outputs/tls.md
@@ -10,44 +10,42 @@ For details on how TLS configuration works in syslog-ng, see the [AxoSyslog Core
 
 ### ca_dir (*secret.Secret, optional) {#tls-ca_dir}
 
-The name of a directory that contains a set of trusted CA certificates in PEM format. For details, see the [AxoSyslog Core documentation](https://axoflow.com/docs/axosyslog-core/chapter-encrypted-transport-tls/tlsoptions/#ca-dir) 
+The name of a directory that contains a set of trusted CA certificates in PEM format. For details, see the [AxoSyslog Core documentation](https://axoflow.com/docs/axosyslog-core/chapter-encrypted-transport-tls/tlsoptions/#ca-dir). 
 
-Default: -
 
 ### ca_file (*secret.Secret, optional) {#tls-ca_file}
 
-The name of a file that contains a set of trusted CA certificates in PEM format. (Optional) For details, see the [AxoSyslog Core documentation](https://axoflow.com/docs/axosyslog-core/chapter-encrypted-transport-tls/tlsoptions/#ca-file) 
+The name of a file that contains a set of trusted CA certificates in PEM format. (Optional) For details, see the [AxoSyslog Core documentation](https://axoflow.com/docs/axosyslog-core/chapter-encrypted-transport-tls/tlsoptions/#ca-file). 
 
-Default: -
 
-### key_file (*secret.Secret, optional) {#tls-key_file}
+### cert_file (*secret.Secret, optional) {#tls-cert_file}
 
-The name of a file that contains an unencrypted private key in PEM format, suitable as a TLS key. For details, see the [AxoSyslog Core documentation](https://axoflow.com/docs/axosyslog-core/chapter-encrypted-transport-tls/tlsoptions/#key-file) 
+Name of a file, that contains an X.509 certificate (or a certificate chain) in PEM format, suitable as a TLS certificate, matching the private key set in the key-file() option. For details, see the [AxoSyslog Core documentation](https://axoflow.com/docs/axosyslog-core/chapter-encrypted-transport-tls/tlsoptions/#cert-file). 
 
-Default: -
 
-### cert_file (*secret.Secret, optional) {#tls-cert_file}
+### cipher-suite (string, optional) {#tls-cipher-suite}
+
+Description: Specifies the cipher, hash, and key-exchange algorithms used for the encryption, for example, ECDHE-ECDSA-AES256-SHA384. The list of available algorithms depends on the version of OpenSSL used to compile syslog-ng. 
 
-Name of a file, that contains an X.509 certificate (or a certificate chain) in PEM format, suitable as a TLS certificate, matching the private key set in the key-file() option. For details, see the [AxoSyslog Core documentation](https://axoflow.com/docs/axosyslog-core/chapter-encrypted-transport-tls/tlsoptions/#cert-file) 
 
-Default: -
+### key_file (*secret.Secret, optional) {#tls-key_file}
+
+The name of a file that contains an unencrypted private key in PEM format, suitable as a TLS key. For details, see the [AxoSyslog Core documentation](https://axoflow.com/docs/axosyslog-core/chapter-encrypted-transport-tls/tlsoptions/#key-file). 
+
 
 ### peer_verify (*bool, optional) {#tls-peer_verify}
 
-Verification method of the peer. For details, see the [AxoSyslog Core documentation](https://axoflow.com/docs/axosyslog-core/chapter-encrypted-transport-tls/tlsoptions/#tls-options-peer-verify) 
+Verification method of the peer. For details, see the [AxoSyslog Core documentation](https://axoflow.com/docs/axosyslog-core/chapter-encrypted-transport-tls/tlsoptions/#tls-options-peer-verify). 
 
-Default: -
 
-### use-system-cert-store (*bool, optional) {#tls-use-system-cert-store}
+### ssl_version (string, optional) {#tls-ssl_version}
 
-Use the certificate store of the system for verifying HTTPS certificates. For details, see the [AxoSyslog Core documentation](https://curl.se/docs/sslcerts.html) 
+Configure required TLS version. Accepted values: [sslv3, tlsv1, tlsv1_0, tlsv1_1, tlsv1_2, tlsv1_3] 
 
-Default: -
 
-### cipher-suite (string, optional) {#tls-cipher-suite}
+### use-system-cert-store (*bool, optional) {#tls-use-system-cert-store}
 
-Description: Specifies the cipher, hash, and key-exchange algorithms used for the encryption, for example, ECDHE-ECDSA-AES256-SHA384. The list of available algorithms depends on the version of OpenSSL used to compile syslog-ng OSE 
+Use the certificate store of the system for verifying HTTPS certificates. For details, see the [AxoSyslog Core documentation](https://curl.se/docs/sslcerts.html). 
 
-Default: -
 
 
diff --git a/content/docs/examples/custom-syslog-ng-metrics.md b/content/docs/examples/custom-syslog-ng-metrics.md
new file mode 100644
index 000000000..cefe47735
--- /dev/null
+++ b/content/docs/examples/custom-syslog-ng-metrics.md
@@ -0,0 +1,123 @@
+---
+title: Custom source and output metrics
+linktitle: Custom syslog-ng metrics
+weight: 1000
+---
+
+When using syslog-ng as the log aggregator, you can create custom log metrics for sources and outputs, based on the [metrics-probe() parser](https://axoflow.com/docs/axosyslog-core/chapter-parsers/metrics-probe/).
+
+Available in Logging operator version 4.5 and later.
+
+## Source metrics
+
+Custom source metrics are added to the messages after the JSON parsing is completed. The following example adds the key called `custom_input`:
+
+```yaml
+kind: Logging
+apiVersion: logging.banzaicloud.io/v1beta1
+metadata:
+  name: logging
+spec:
+  controlNamespace: default
+  fluentbit: {}
+  syslogNG:
+    metrics: {}
+    sourceMetrics:
+      - key: custom_input
+        labels:
+          test: my-label-value
+```
+
+This corresponds to the following syslog-ng configuration:
+
+```shell
+source "main_input" {
+    channel {
+        source {
+            network(flags("no-parse") port(601) transport("tcp") max-connections(100) log-iw-size(10000));
+        };
+        parser {
+            json-parser(prefix("json."));
+            metrics-probe(key("custom_input") labels(
+                "logging" => "logging"
+                "test" => "my-label-value"
+            ));
+        };
+    };
+};
+```
+
+And results in the following metrics:
+
+```shell
+curl logging-syslog-ng-0:9577/metrics  | grep custom_
+# TYPE syslogng_custom_input gauge
+syslogng_custom_input{logging="logging"} 154
+```
+
+## Output metrics
+
+Output metrics are added before the log reaches the destination, and is decorated with the output metadata like: `name`, `namespace`, and `scope`. `scope` stores whether the output is a local or global one. For example:
+
+```yaml
+apiVersion: logging.banzaicloud.io/v1beta1
+kind: SyslogNGFlow
+metadata:
+  name: all1
+spec:
+  match: {}
+  outputMetrics:
+    - key: custom_output
+      labels:
+        flow: all1
+  localOutputRefs:
+    - http
+  globalOutputRefs:
+    - http2
+```
+
+This corresponds to the following syslog-ng configuration:
+
+```shell
+filter "flow_default_all1_ns_filter" {
+    match("default" value("json.kubernetes.namespace_name") type("string"));
+};
+log {
+    source("main_input");
+    filter("flow_default_all1_ns_filter");
+    log {
+        parser {
+            metrics-probe(key("custom_output") labels(
+                "flow" => "all1"
+                "logging" => "logging"
+                "output_name" => "http2"
+                "output_namespace" => "default"
+                "output_scope" => "global"
+            ));
+        };
+        destination("clusteroutput_default_http2");
+    };
+    log {
+        parser {
+            metrics-probe(key("custom_output") labels(
+                "flow" => "all1"
+                "logging" => "logging"
+                "output_name" => "http"
+                "output_namespace" => "default"
+                "output_scope" => "local"
+            ));
+        };
+        destination("output_default_http");
+    };
+};
+```
+
+And results in the following metrics:
+
+```shell
+curl logging-syslog-ng-0:9577/metrics  | grep custom_
+# TYPE syslogng_custom_output gauge
+syslogng_custom_output{flow="all1",logging="logging",output_name="http2",output_namespace="default",output_scope="global"} 42
+syslogng_custom_output{flow="all1",logging="logging",output_name="http",output_namespace="default",output_scope="local"} 42
+syslogng_custom_output{flow="all2",logging="logging",output_name="http2",output_namespace="default",output_scope="global"} 154
+```
diff --git a/content/docs/examples/date-parser.md b/content/docs/examples/date-parser.md
new file mode 100644
index 000000000..b33cfd569
--- /dev/null
+++ b/content/docs/examples/date-parser.md
@@ -0,0 +1,32 @@
+---
+title: Parsing custom date formats
+weight: 80
+---
+
+By default, the syslog-ng aggregator uses the time when a message has been received on its input source as the timestamp. If you want to use the timestamp written in the message metadata, you can use a [date-parser](https://axoflow.com/docs/axosyslog-core/chapter-parsers/date-parser/date-parser-options/).
+
+Available in Logging operator version 4.5 and later.
+
+To use the timestamps written by the container runtime (_cri_ or _docker_) and parsed by Fluent Bit, define the `sourceDateParser` in the _syslog-ng_ spec.
+
+```yaml
+kind: Logging
+metadata:
+  name: example
+spec:
+  syslogNG:
+    sourceDateParser: {}
+```
+
+You can also define your own parser format and template. The following example shows the default values.
+
+```yaml
+kind: Logging
+metadata:
+  name: example
+spec:
+  syslogNG:
+    sourceDateParser:
+      format: "%FT%T.%f%z"
+      template: "${json.time}"
+```
diff --git a/content/docs/image-versions.md b/content/docs/image-versions.md
index 96e97949a..1b46ebf47 100644
--- a/content/docs/image-versions.md
+++ b/content/docs/image-versions.md
@@ -5,6 +5,22 @@ weight: 750
 
 Logging operator uses the following image versions.
 
+## Logging operator version 4.5
+
+| Image repository | GitHub repository | Version |
+| -------- | --- | -- |
+| ghcr.io/kube-logging/node-exporter | https://github.com/kube-logging/node-exporter-image | v0.7.1 |
+| ghcr.io/kube-logging/config-reloader | https://github.com/kube-logging/config-reloader | v0.0.5 |
+| ghcr.io/kube-logging/fluentd-drain-watch | https://github.com/kube-logging/fluentd-drain-watch | v0.2.1 |
+| k8s.gcr.io/pause |  | 3.2 |
+| docker.io/busybox | https://github.com/docker-library/busybox | latest |
+| ghcr.io/axoflow/axosyslog | https://github.com/axoflow/axosyslog-docker/ | 4.5.0 |
+| docker.io/fluent/fluent-bit | https://github.com/fluent/fluent-bit-docker-image | 2.1.8 |
+| ghcr.io/kube-logging/fluentd | https://github.com/kube-logging/fluentd-images | v1.16-full |
+| ghcr.io/axoflow/axosyslog-metrics-exporter | https://github.com/axoflow/axosyslog-metrics-exporter | 0.0.2 |
+| ghcr.io/kube-logging/syslogng-reload | https://github.com/kube-logging/syslogng-reload-image | v1.3.1 |
+| ghcr.io/kube-logging/eventrouter | https://github.com/kube-logging/eventrouter | v0.4.0 |
+
 ## Logging operator version 4.4
 
 | Image repository | GitHub repository | Version |
diff --git a/content/docs/logging-infrastructure/fluentbit.md b/content/docs/logging-infrastructure/fluentbit.md
index 26d6a06fd..804418568 100644
--- a/content/docs/logging-infrastructure/fluentbit.md
+++ b/content/docs/logging-infrastructure/fluentbit.md
@@ -20,6 +20,8 @@ There are three ways to configure the Fluent Bit daemonset:
 1. Using the standalone FluentbitAgent CRD. This method is only available in Logging operator version 4.2 and newer, and the specification of the CRD is compatible with the **spec.fluentbit** configuration method.
 1. Using the **spec.nodeagents** section of {{% xref "/docs/logging-infrastructure/logging.md" %}}. This method is deprecated and will be removed from the Logging operator. (Note that this configuration isn't compatible with the FluentbitAgent CRD.)
 
+For the detailed list of available parameters, see {{% xref "/docs/configuration/crds/v1beta1/fluentbit_types.md" %}}.
+
 ### Migrating from **spec.fluentbit** to FluentbitAgent {#migrating}
 
 The standalone FluentbitAgent CRD is only available in Logging operator version 4.2 and newer. Its specification and logic is identical with the **spec.fluentbit** configuration method. Using the FluentbitAgent CRD allows you to remove the **spec.fluentbit** section from the Logging CRD, which has the following benefits.
diff --git a/content/docs/logging-infrastructure/fluentd.md b/content/docs/logging-infrastructure/fluentd.md
index 77fa5fbf7..7e1f60fb2 100644
--- a/content/docs/logging-infrastructure/fluentd.md
+++ b/content/docs/logging-infrastructure/fluentd.md
@@ -6,7 +6,124 @@ aliases:
     - /docs/one-eye/logging-operator/configuration/fluentd/
 ---
 
-You can configure the deployment of the Fluentd log forwarder via the **fluentd** section of the {{% xref "/docs/logging-infrastructure/logging.md" %}}. This page shows some examples on configuring Fluentd. For the detailed list of available parameters, see {{% xref "/docs/configuration/crds/v1beta1/fluentd_types.md" %}}.
+This page shows some examples on configuring Fluentd.
+
+## Ways to configure Fluentd
+
+There are two ways to configure the Fluentd statefulset:
+
+1. Using the **spec.fluentd** section of {{% xref "/docs/logging-infrastructure/logging.md" %}}.
+1. Using the standalone FluentdConfig CRD. This method is only available in Logging operator version 4.5 and newer, and the specification of the CRD is compatible with the **spec.fluentd** configuration method. That way you can use a multi-tenant model, where tenant owners are responsible for operating their own aggregator, while the Logging resource is in control of the central operations team.
+
+    The standalone FluentdConfig is a namespaced resource that allows the configuration of the Fluentd aggregator in the control namespace, separately from the Logging resource. This allows you to use a multi-tenant model, where tenant owners are responsible for operating their own aggregator, while the Logging resource is in control of the central operations team. For more information about the multi-tenancy model where the collector is capable of routing logs based on namespaces to individual aggregators and where aggregators are fully isolated, see this blog post about [Multi-tenancy using Logging operator](https://axoflow.com/multi-tenancy-using-logging-operator/).
+
+For the detailed list of available parameters, see {{% xref "/docs/configuration/crds/v1beta1/fluentd_types.md" %}}.
+
+### Migrating from **spec.fluentd** to FluentdConfig {#migrating}
+
+The standalone FluentdConfig CRD is only available in Logging operator version 4.5 and newer. Its specification and logic is identical with the **spec.fluentd** configuration method. Using the FluentdConfig CRD allows you to remove the **spec.fluentd** section from the Logging CRD, which has the following benefits.
+
+- RBAC control over the FluentdConfig CRD, so you can have separate roles that can manage the Logging resource and the FluentdConfig resource (that is, the Fluentd deployment).
+- It reduces the size of the Logging resource, which can grow big enough to reach the annotation size limit in certain scenarios (e.g. when using `kubectl apply`).
+- You can use a multi-tenant model, where tenant owners are responsible for operating their own aggregator, while the Logging resource is in control of the central operations team.
+
+To migrate your **spec.fluentd** configuration from the Logging resource to a separate FluentdConfig CRD, complete the following steps.
+
+1. Open your Logging resource and find the **spec.fluentd** section. For example:
+
+    ```yaml
+    apiVersion: logging.banzaicloud.io/v1beta1
+    kind: Logging
+    metadata:
+      name: example-logging-resource
+    spec:
+      controlNamespace: logging
+      fluentd:
+        scaling:
+          replicas: 2
+    ```
+
+1. Create a new FluentdConfig CRD. For the value of **metadata.name**, use the name of the Logging resource, for example:
+
+    ```yaml
+    apiVersion: logging.banzaicloud.io/v1beta1
+    kind: FluentdConfig
+    metadata:
+      # Use the name of the logging resource
+      name: example-logging-resource
+      # Use the control namespace of the logging resource
+      namespace: logging
+    ```
+
+1. Copy the the **spec.fluentd** section from the Logging resource into the **spec** section of the FluentdConfig CRD, then fix the indentation. For example:
+
+    ```yaml
+    apiVersion: logging.banzaicloud.io/v1beta1
+    kind: FluentdConfig
+    metadata:
+      # Use the name of the logging resource
+      name: example-logging-resource
+      # Use the control namespace of the logging resource
+      namespace: logging
+    spec:
+      scaling:
+        replicas: 2
+    ```
+
+1. Delete the **spec.fluentd** section from the Logging resource, then apply the Logging and the FluentdConfig CRDs.
+
+## Using the standalone FluentdConfig resource
+
+The standalone FluentdConfig is a namespaced resource that allows the configuration of the Fluentd aggregator in the control namespace, separately from the Logging resource. This allows you to use a multi-tenant model, where tenant owners are responsible for operating their own aggregator, while the Logging resource is in control of the central operations team. For more information about the multi-tenancy model where the collector is capable of routing logs based on namespaces to individual aggregators and where aggregators are fully isolated, see this blog post about [Multi-tenancy using Logging operator](https://axoflow.com/multi-tenancy-using-logging-operator/).
+
+A `Logging` resource can have only one `FluentdConfig` at a time. The controller registers the active `FluentdConfig` resource into the `Logging` resource's status under `fluentdConfigName`, and also registers the `Logging` resource name under `logging` in the `FluentdConfig` resource's status, for example:
+
+```shell
+kubectl get logging example -o jsonpath='{.status}' | jq .
+{
+  "configCheckResults": {
+    "ac2d4553": true
+  },
+  "fluentdConfigName": "example"
+}
+```
+
+```shell
+kubectl get fluentdconfig example -o jsonpath='{.status}' | jq .
+{
+  "active": true,
+  "logging": "example"
+}
+```
+
+If there is a conflict, the controller adds a problem to both resources so that both the operations team and the tenant users can notice the problem. For example, if a `FluentdConfig` is already registered to a `Logging` resource and you create another `FluentdConfig` resource in the same namespace, then the first `FluentdConfig` is left intact, while the second one should have the following status:
+
+```shell
+kubectl get fluentdconfig example2 -o jsonpath='{.status}' | jq .
+{
+  "active": false,
+  "problems": [
+    "logging already has a detached fluentd configuration, remove excess configuration objects"
+  ],
+  "problemsCount": 1
+}
+```
+
+The `Logging` resource will also show the issue:
+
+```shell
+kubectl get logging example -o jsonpath='{.status}' | jq .
+{
+  "configCheckResults": {
+    "ac2d4553": true
+  },
+  "fluentdConfigName": "example",
+  "problems": [
+    "multiple fluentd configurations found, couldn't associate it with logging"
+  ],
+  "problemsCount": 1
+}
+```
 
 ## Custom pvc volume for Fluentd buffers
 
@@ -52,9 +169,10 @@ spec:
 
 The following snippet redirects Fluentd's stdout to a file and configures rotation settings.
 
-This mechanism was used prior to version 4.4 to avoid Fluent-bit rereading Fluentd's logs and causing an exponentially growing amount of redundant logs. 
+This mechanism was used prior to version 4.4 to avoid Fluent-bit rereading Fluentd's logs and causing an exponentially growing amount of redundant logs.
 
 Example configuration used by the operator in version 4.3 and earlier (keep 10 files, 10M each):
+
 ```yaml
 spec:
   fluentd:
diff --git a/content/docs/logging-infrastructure/syslog-ng.md b/content/docs/logging-infrastructure/syslog-ng.md
index 7ea0a2bdb..8cefa2cc9 100644
--- a/content/docs/logging-infrastructure/syslog-ng.md
+++ b/content/docs/logging-infrastructure/syslog-ng.md
@@ -6,7 +6,126 @@ weight: 300
 
 {{< include-headless "syslog-ng-minimum-version.md" >}}
 
-You can configure the deployment of the syslog-ng log forwarder via the **syslogNG** section of the {{% xref "/docs/logging-infrastructure/logging.md" %}}. For the detailed list of available parameters, see {{% xref "/docs/configuration/crds/v1beta1/syslogng_types.md" %}}.
+This page shows some examples on configuring syslog-ng.
+
+## Ways to configure syslog-ng
+
+There are two ways to configure the syslog-ng statefulset:
+
+1. Using the **spec.syslogNG** section of {{% xref "/docs/logging-infrastructure/logging.md" %}}.
+1. Using the standalone syslogNGConfig CRD. This method is only available in Logging operator version 4.5 and newer, and the specification of the CRD is compatible with the **spec.syslogNG** configuration method. That way you can use a multi-tenant model, where tenant owners are responsible for operating their own aggregator, while the Logging resource is in control of the central operations team.
+
+    The standalone syslogNGConfig is a namespaced resource that allows the configuration of the syslog-ng aggregator in the control namespace, separately from the Logging resource. This allows you to use a multi-tenant model, where tenant owners are responsible for operating their own aggregator, while the Logging resource is in control of the central operations team. For more information about the multi-tenancy model where the collector is capable of routing logs based on namespaces to individual aggregators and where aggregators are fully isolated, see this blog post about [Multi-tenancy using Logging operator](https://axoflow.com/multi-tenancy-using-logging-operator/).
+
+For the detailed list of available parameters, see {{% xref "/docs/configuration/crds/v1beta1/syslogng_types.md" %}}.
+
+### Migrating from **spec.syslogNG** to syslogNGConfig {#migrating}
+
+The standalone syslogNGConfig CRD is only available in Logging operator version 4.5 and newer. Its specification and logic is identical with the **spec.syslogNG** configuration method. Using the syslogNGConfig CRD allows you to remove the **spec.syslogNG** section from the Logging CRD, which has the following benefits.
+
+- RBAC control over the syslogNGConfig CRD, so you can have separate roles that can manage the Logging resource and the syslogNGConfig resource (that is, the syslog-ng deployment).
+- It reduces the size of the Logging resource, which can grow big enough to reach the annotation size limit in certain scenarios (e.g. when using `kubectl apply`).
+- You can use a multi-tenant model, where tenant owners are responsible for operating their own aggregator, while the Logging resource is in control of the central operations team.
+
+To migrate your **spec.syslogNG** configuration from the Logging resource to a separate syslogNGConfig CRD, complete the following steps.
+
+1. Open your Logging resource and find the **spec.syslogNG** section. For example:
+
+    ```yaml
+    apiVersion: logging.banzaicloud.io/v1beta1
+    kind: Logging
+    metadata:
+      name: example-logging-resource
+    spec:
+      controlNamespace: logging
+      syslogNG:
+        scaling:
+          replicas: 2
+    ```
+
+1. Create a new syslogNGConfig CRD. For the value of **metadata.name**, use the name of the Logging resource, for example:
+
+    ```yaml
+    apiVersion: logging.banzaicloud.io/v1beta1
+    kind: syslogNGConfig
+    metadata:
+      # Use the name of the logging resource
+      name: example-logging-resource
+      # Use the control namespace of the logging resource
+      namespace: logging
+    ```
+
+1. Copy the the **spec.syslogNG** section from the Logging resource into the **spec** section of the syslogNGConfig CRD, then fix the indentation. For example:
+
+    ```yaml
+    apiVersion: logging.banzaicloud.io/v1beta1
+    kind: syslogNGConfig
+    metadata:
+      # Use the name of the logging resource
+      name: example-logging-resource
+      # Use the control namespace of the logging resource
+      namespace: logging
+    spec:
+      scaling:
+        replicas: 2
+    ```
+
+1. Delete the **spec.syslogNG** section from the Logging resource, then apply the Logging and the syslogNGConfig CRDs.
+
+## Using the standalone syslogNGConfig resource
+
+The standalone syslogNGConfig is a namespaced resource that allows the configuration of the syslog-ng aggregator in the control namespace, separately from the Logging resource. This allows you to use a multi-tenant model, where tenant owners are responsible for operating their own aggregator, while the Logging resource is in control of the central operations team. For more information about the multi-tenancy model where the collector is capable of routing logs based on namespaces to individual aggregators and where aggregators are fully isolated, see this blog post about [Multi-tenancy using Logging operator](https://axoflow.com/multi-tenancy-using-logging-operator/).
+
+A `Logging` resource can have only one `syslogNGConfig` at a time. The controller registers the active `syslogNGConfig` resource into the `Logging` resource's status under `syslogNGConfigName`, and also registers the `Logging` resource name under `logging` in the `syslogNGConfig` resource's status, for example:
+
+```shell
+kubectl get logging example -o jsonpath='{.status}' | jq .
+{
+  "configCheckResults": {
+    "ac2d4553": true
+  },
+  "syslogNGConfigName": "example"
+}
+```
+
+```shell
+kubectl get syslogngconfig example -o jsonpath='{.status}' | jq .
+{
+  "active": true,
+  "logging": "example"
+}
+```
+
+If there is a conflict, the controller adds a problem to both resources so that both the operations team and the tenant users can notice the problem. For example, if a `syslogNGConfig` is already registered to a `Logging` resource and you create another `syslogNGConfig` resource in the same namespace, then the first `syslogNGConfig` is left intact, while the second one should have the following status:
+
+```shell
+kubectl get syslogngconfig example2 -o jsonpath='{.status}' | jq .
+{
+  "active": false,
+  "problems": [
+    "logging already has a detached syslog-ng configuration, remove excess configuration objects"
+  ],
+  "problemsCount": 1
+}
+```
+
+The `Logging` resource will also show the issue:
+
+```shell
+kubectl get logging example -o jsonpath='{.status}' | jq .
+{
+  "configCheckResults": {
+    "ac2d4553": true
+  },
+  "syslogNGConfigName": "example",
+  "problems": [
+    "multiple syslog-ng configurations found, couldn't associate it with logging"
+  ],
+  "problemsCount": 1
+}
+```
+
+## Volume mount for buffering
 
 The following example sets a volume mount that syslog-ng can use for buffering messages on the disk (if {{% xref "/docs/configuration/plugins/syslog-ng-outputs/disk_buffer.md" %}} is configured in the output).
 
diff --git a/content/docs/whats-new/_index.md b/content/docs/whats-new/_index.md
index ec1970b57..2d2b46a5a 100644
--- a/content/docs/whats-new/_index.md
+++ b/content/docs/whats-new/_index.md
@@ -3,6 +3,46 @@ title: What's new
 weight: 50
 ---
 
+## Version 4.5
+
+The following are the highlights and main changes of Logging operator 4.5. For a complete list of changes and bugfixes, see the [Logging operator 4.5 releases page](https://github.com/kube-logging/logging-operator/releases/tag/4.5.0).
+
+## Standalone FluentdConfig and SyslogNGConfig CRDs
+
+Starting with Logging operator version 4.5, you can either configure Fluentd in the `Logging` CR, or you can use a standalone `FluentdConfig` CR. Similarly, you can use a standalone `SyslogNGConfig` CRD to configure syslog-ng.
+
+These standalone CRDs are a namespaced resources that allow you to configure the Fluentd/syslog-ng aggregator in the control namespace, separately from the Logging resource. That way you can use a multi-tenant model, where tenant owners are responsible for operating their own aggregator, while the Logging resource is in control of the central operations team.
+
+For details, see {{% xref "/docs/logging-infrastructure/fluentd.md" %}} and {{% xref "/docs/logging-infrastructure/syslog-ng.md" %}}.
+
+### New syslog-ng features
+
+When using syslog-ng as the log aggregator, you can now:
+
+- Send data to [OpenObserve]({{< relref "/docs/configuration/plugins/syslog-ng-outputs/openobserve.md" >}})
+- Use a [custom date-parser]({{< relref "/docs/examples/date-parser.md" >}})
+- Create [custom log metrics for sources and outputs]({{< relref "/docs/examples/custom-syslog-ng-metrics.md" >}})
+- Set the permitted [SSL versions in HTTP based outputs]({{< relref "/docs/configuration/plugins/syslog-ng-outputs/tls.md#tls-ssl_version" >}})
+- Configure the [maxConnections parameter of the sources]({{< relref "/docs/configuration/crds/v1beta1/syslogng_types.md#syslogngspec-maxconnections" >}})
+
+### New Fluentd features
+
+When using Fluentd as the log aggregator, you can now:
+
+- Use the [useragent Fluent filter]({{< relref "/docs/configuration/plugins/filters/useragent.md" >}})
+- Configure [sidecar container in Fluentd pods]({{< relref "/docs/configuration/crds/v1beta1/fluentd_types.md#fluentdspec-sidecarcontainers" >}})
+- Configure the [security-context of every container]({{< relref "/docs/configuration/crds/v1beta1/fluentd_types.md#fluentdspec-sidecarcontainers#fluentddrainconfig-securitycontext" >}})
+- Set which [Azure Cloud to use]({{< relref "/docs/configuration/plugins/outputs/azurestore.md#output-config-azure_cloud" >}}) (for example, AzurePublicCloud), when using the Azure Storage output
+- Customize the `image` to use in [event and host tailers]({{< relref "/docs/configuration/crds/extensions/_index.md" >}})
+
+## Other changes
+
+- LoggingStatus now includes the number (problemsCount) and the related watchNamespaces to help troubleshooting
+
+### Image and dependency updates
+
+For the list of images used in Logging operator, see {{% xref "/docs/image-versions.md" %}}.
+
 ## Version 4.4
 
 The following are the highlights and main changes of Logging operator 4.4. For a complete list of changes and bugfixes, see the [Logging operator 4.4 releases page](https://github.com/kube-logging/logging-operator/releases/tag/4.4.0).
diff --git a/content/headless/component-overview.md b/content/headless/component-overview.md
index cac538f29..221c20729 100644
--- a/content/headless/component-overview.md
+++ b/content/headless/component-overview.md
@@ -2,13 +2,13 @@ The Logging operator manages the log collectors and log forwarders of your loggi
 
 The **log collectors** are endpoint agents that collect the logs of your Kubernetes nodes and send them to the log forwarders. Logging operator currently uses Fluent Bit as log collector agents.
 
-The **log forwarder** instance receives, filters, and transforms the incoming logs, and transfers them to one or more destination outputs. The Logging operator supports Fluentd and syslog-ng as log forwarders. Which log forwarder is best for you depends on your logging requirements. For tips, see {{% xref "/docs/configuration/fluentd-vs-syslog-ng.md" %}}.
+The **log forwarder** (also called **log aggregator**) instance receives, filters, and transforms the incoming logs, and transfers them to one or more destination outputs. The Logging operator supports Fluentd and syslog-ng as log forwarders. Which log forwarder is best for you depends on your logging requirements. For tips, see {{% xref "/docs/configuration/fluentd-vs-syslog-ng.md" %}}.
 
 You can filter and process the incoming log messages using the [**flow**]({{< relref "/docs/configuration/flow.md" >}}) custom resource of the log forwarder to route them to the appropriate [**output**]({{< relref "/docs/configuration/output.md" >}}). The outputs are the destinations where you want to send your log messages, for example, Elasticsearch, or an Amazon S3 bucket. You can also define cluster-wide outputs and flows, for example, to use a centralized output that namespaced users can reference but cannot modify. Note that flows and outputs are specific to the type of log forwarder you use (Fluentd or syslog-ng).
 
 You can configure the Logging operator using the following Custom Resource Definitions.
 
-- [logging]({{< relref "/docs/logging-infrastructure/logging.md" >}}) - The `logging` resource defines the logging infrastructure (the log collectors and forwarders) for your cluster that collects and transports your log messages. It also contains configurations for Fluent Bit, Fluentd, and syslog-ng.
+- [logging]({{< relref "/docs/logging-infrastructure/logging.md" >}}) - The `logging` resource defines the logging infrastructure (the log collectors and forwarders) for your cluster that collects and transports your log messages. It can also contain configurations for Fluent Bit, Fluentd, and syslog-ng. (Starting with Logging operator version 4.5, you can also configure [Fluent Bit]({{< relref "/docs/logging-infrastructure/fluentbit.md" >}}), [Fluentd]({{< relref "/docs/logging-infrastructure/fluentd.md" >}}), and [syslog-ng]({{< relref "/docs/logging-infrastructure/syslog-ng.md" >}}) as separate resources.)
 - CRDs for Fluentd:
     - [output]({{< relref "/docs/configuration/output.md" >}}) - Defines a Fluentd Output for a logging flow, where the log messages are sent using Fluentd. This is a namespaced resource. See also `clusteroutput`. To configure syslog-ng outputs, see `SyslogNGOutput`.
     - [flow]({{< relref "/docs/configuration/flow.md" >}}) - Defines a Fluentd logging flow using `filters` and `outputs`. Basically, the flow routes the selected log messages to the specified outputs. This is a namespaced resource. See also `clusterflow`. To configure syslog-ng flows, see `SyslogNGFlow`.