Merge branch 'master' into lynettemiles/sc-135377/set-amspelling-vale-test-to-error-for-fluent

Signed-off-by: Lynette  Miles <[email protected]>

Author: esmerel

CONTRIBUTING.md

@@ -129,6 +129,9 @@ at the `suggestion` level and won't block merging.
 The following tests are at a `error` level and will prevent merging:
 
 - [AmSpelling](https://developers.google.com/style/word-list)
+- [Emdash](https://github.com/errata-ai/Google/blob/master/Google/EmDash.yml)
+- [Endash](https://github.com/errata-ai/Google/blob/master/Google/EmDash.yml)
+- [Exclamation](https://github.com/errata-ai/Google/blob/master/Google/Exclamation.yml)
 - [NonStandardQuotes](https://github.com/fluent/fluent-bit-docs/blob/master/vale-styles/FluentBit/NonStandardQuotes.yml):
   [Use standard quotes](https://developers.google.com/style/quotation-marks#straight-and-curly-quotation-marks).
   By default, Google Docs and Microsoft Word turn standard straight quotes into "smart"
@@ -139,3 +142,7 @@ The following tests are at a `error` level and will prevent merging:
   to prevent this problem.
 - [Repetition](https://github.com/errata-ai/vale/blob/v3/testdata/styles/Markup/Repetition.yml):
   Checks for the same word used twice in succession.
+
+The following tests are at a `warning` level and won't prevent merging:
+
+- [Ampersand](https://developers.google.com/style/word-list#ampersand)

SUMMARY.md

@@ -6,7 +6,7 @@
 
 * [What is Fluent Bit?](about/what-is-fluent-bit.md)
 * [A Brief History of Fluent Bit](about/history.md)
-* [Fluentd & Fluent Bit](about/fluentd-and-fluent-bit.md)
+* [Fluentd and Fluent Bit](about/fluentd-and-fluent-bit.md)
 * [License](about/license.md)
 * [Sandbox and Lab Resources](about/sandbox-and-lab-resources.md)
 
@@ -69,7 +69,7 @@
   * [Unit Sizes](administration/configuring-fluent-bit/unit-sizes.md)
   * [Multiline Parsing](administration/configuring-fluent-bit/multiline-parsing.md)
 * [Transport Security](administration/transport-security.md)
-* [Buffering & Storage](administration/buffering-and-storage.md)
+* [Buffering and Storage](administration/buffering-and-storage.md)
 * [Backpressure](administration/backpressure.md)
 * [Scheduling and Retries](administration/scheduling-and-retries.md)
 * [Networking](administration/networking.md)
@@ -217,7 +217,7 @@
   * [Stackdriver](pipeline/outputs/stackdriver.md)
   * [Standard Output](pipeline/outputs/standard-output.md)
   * [Syslog](pipeline/outputs/syslog.md)
-  * [TCP & TLS](pipeline/outputs/tcp-and-tls.md)
+  * [TCP and TLS](pipeline/outputs/tcp-and-tls.md)
   * [Treasure Data](pipeline/outputs/treasure-data.md)
   * [Vivo Exporter](pipeline/outputs/vivo-exporter.md)
   * [WebSocket](pipeline/outputs/websocket.md)
@@ -230,7 +230,7 @@
 * [Getting Started](stream-processing/getting-started/README.md)
   * [Fluent Bit + SQL](stream-processing/getting-started/fluent-bit-sql.md)
   * [Check Keys and NULL values](stream-processing/getting-started/check-keys-null-values.md)
-  * [Hands On! 101](stream-processing/getting-started/hands-on.md)
+  * [Hands On 101](stream-processing/getting-started/hands-on.md)
 
 ## Fluent Bit for Developers <a href="#development" id="development"></a>
 

administration/buffering-and-storage.md

@@ -1,4 +1,4 @@
-# Buffering & Storage
+# Buffering and Storage
 
 <img referrerpolicy="no-referrer-when-downgrade" src="https://static.scarf.sh/a.png?x-pxid=cde12327-09ed-409c-ac02-7c0afa5eff51" />
 

pipeline/filters/kubernetes.md

@@ -405,8 +405,6 @@ spec:
 
 The key point is to set `hostNetwork` to `true` and `dnsPolicy` to `ClusterFirstWithHostNet` that fluent bit DaemonSet could call Kubelet locally. Otherwise it could not resolve the dns for kubelet.
 
-Now you are good to use this new feature!
-
 ### Verify that the Use\_Kubelet option is working
 
 Basically you should see no difference about your experience for enriching your log files with Kubernetes metadata.

pipeline/inputs/cpu-metrics.md

@@ -57,7 +57,7 @@ As described above, the CPU input plugin gathers the overall usage every one sec
 
 ### Configuration File
 
-In your main configuration file append the following _Input_ & _Output_ sections:
+In your main configuration file append the following _Input_ and _Output_ sections:
 
 {% tabs %}
 {% tab title="fluent-bit.conf" %}

vale-styles/FluentBit/Ampersand.yml

@@ -1,9 +1,11 @@
----
 extends: existence
-message: "Don't use an ampersand in place of the word 'and'. Always write out 'and' unless the ampersand is part of a proper name."
+message: 'Use "and" instead of "&" in content.'
+level: warning
+scope: text
 nonword: true
-ignorecase: false
-level: suggestion
-scope: sentence
 tokens:
-  - '[^\*{2}].*.&.*[^\*{2}]\n'
+  - '\s&\s'
+  - '^&\s'
+  - '\s&$'
+  - '\s&[^\w]'
+  - '[^\w]&\s'

vale-styles/FluentBit/Exclamation.yml

@@ -2,6 +2,6 @@ extends: existence
 message: "Don't use exclamation points in text."
 link: 'https://developers.google.com/style/exclamation-points'
 nonword: true
-level: suggestion
+level: error
 tokens:
   - '\w!(?:\s|$)'