Merge remote-tracking branch 'upstream/7.x' into backport/7.x/pr-19797

* upstream/7.x: Cherry-pick to 7.x: [CI] support windows-7 (elastic#19803) (elastic#22343) Update contributing content (elastic#22338) (elastic#22353) [DOCS] Warn about compression and Azure Event Hub for Kafka (elastic#21578) (elastic#22198) Typo (elastic#22272) (elastic#22274) Change to default analyzer (elastic#22300) (elastic#22333)
v1v · Nov 2, 2020 · 353dd2d · 353dd2d
2 parents 553cb59 + 3160b7e
commit 353dd2d
Show file tree

Hide file tree

Showing 18 changed files with 170 additions and 13 deletions.
diff --git a/auditbeat/Jenkinsfile.yml b/auditbeat/Jenkinsfile.yml
@@ -93,3 +93,14 @@ stages:
                 - "windows-8"
             branches: true     ## for all the branches
             tags: true         ## for all the tags
+    #windows-7:  See https://github.com/elastic/beats/issues/19831
+    #    mage: "mage build unitTest"
+    #    platforms:             ## override default labels in this specific stage.
+    #        - "windows-7"
+    #    when:                  ## Override the top-level when.
+    #        comments:
+    #            - "/test filebeat for windows-7"
+    #        labels:
+    #            - "windows-7"
+    #        branches: true     ## for all the branches
+    #        tags: true         ## for all the tags
diff --git a/docs/devguide/contributing.asciidoc b/docs/devguide/contributing.asciidoc
@@ -8,7 +8,9 @@ issues that you should know about before implementing the change.
 
 We enjoy working with contributors to get their code accepted. There are many
 approaches to fixing a problem and it is important to find the best approach
-before writing too much code.
+before writing too much code. After committing your code, check out the
+https://www.elastic.co/community/contributor[Elastic Contributor Program]
+where you can earn points and rewards for your contributions.
 
 The process for contributing to any of the Elastic repositories is similar.
 

diff --git a/filebeat/Jenkinsfile.yml b/filebeat/Jenkinsfile.yml
@@ -91,3 +91,14 @@ stages:
                 - "windows-7-32"
             branches: true     ## for all the branches
             tags: true         ## for all the tags
+    #windows-7:  See https://github.com/elastic/beats/issues/22317
+    #    mage: "mage build unitTest"
+    #    platforms:             ## override default labels in this specific stage.
+    #        - "windows-7"
+    #    when:                  ## Override the top-level when.
+    #        comments:
+    #            - "/test filebeat for windows-7"
+    #        labels:
+    #            - "windows-7"
+    #        branches: true     ## for all the branches
+    #        tags: true         ## for all the tags
diff --git a/heartbeat/Jenkinsfile.yml b/heartbeat/Jenkinsfile.yml
@@ -111,3 +111,14 @@ stages:
                 - "windows-7-32"
             branches: true     ## for all the branches
             tags: true         ## for all the tags
+    windows-7:
+        mage: "mage build unitTest"
+        platforms:             ## override default labels in this specific stage.
+            - "windows-7"
+        when:                  ## Override the top-level when.
+            comments:
+                - "/test heartbeat for windows-7"
+            labels:
+                - "windows-7"
+            branches: true     ## for all the branches
+            tags: true         ## for all the tags
diff --git a/libbeat/docs/template-config.asciidoc b/libbeat/docs/template-config.asciidoc
@@ -23,7 +23,7 @@ endif::[]
 You can adjust the following settings to load your own template or overwrite an
 existing one.
 
-*`setup.template.enabled`*:: Set to false to disable template loading. If set this to false,
+*`setup.template.enabled`*:: Set to false to disable template loading. If this is set to false,
 you must <<load-template-manually,load the template manually>>.
 
 *`setup.template.type`*:: The type of template to use. Available options: `legacy` (default), index templates

diff --git a/libbeat/outputs/kafka/docs/kafka.asciidoc b/libbeat/outputs/kafka/docs/kafka.asciidoc
@@ -244,6 +244,12 @@ The keep-alive period for an active network connection. If 0s, keep-alives are d
 
 Sets the output compression codec. Must be one of `none`, `snappy`, `lz4` and `gzip`. The default is `gzip`.
 
+[IMPORTANT]
+.Known issue with Azure Event Hub for Kafka
+====
+When targeting Azure Event Hub for Kafka, set `compression` to `none` as the provided codecs are not supported.
+====
+
 ===== `compression_level`
 
 Sets the compression level used by gzip. Setting this value to 0 disables compression.

diff --git a/metricbeat/Jenkinsfile.yml b/metricbeat/Jenkinsfile.yml
@@ -86,3 +86,14 @@ stages:
                 - "windows-8"
             branches: true     ## for all the branches
             tags: true         ## for all the tags
+    windows-7:
+        mage: "mage build unitTest"
+        platforms:             ## override default labels in this specific stage.
+            - "windows-7"
+        when:                  ## Override the top-level when.
+            comments:
+                - "/test metricbeat for windows-7"
+            labels:
+                - "windows-7"
+            branches: true     ## for all the branches
+            tags: true         ## for all the tags
diff --git a/packetbeat/Jenkinsfile.yml b/packetbeat/Jenkinsfile.yml
@@ -100,6 +100,7 @@ stages:
                 - "windows-8"
             branches: true     ## for all the branches
             tags: true         ## for all the tags
+<<<<<<< HEAD
     #windows-7-32:  See https://github.com/elastic/beats/issues/22303
     #    mage: "mage build unitTest"
     #    platforms:             ## override default labels in this specific stage.
@@ -111,3 +112,16 @@ stages:
     #            - "windows-7-32"
     #        branches: true     ## for all the branches
     #        tags: true         ## for all the tags
+=======
+    windows-7:
+        mage: "mage build unitTest"
+        platforms:             ## override default labels in this specific stage.
+            - "windows-7"
+        when:                  ## Override the top-level when.
+            comments:
+                - "/test packetbeat for windows-7"
+            labels:
+                - "windows-7"
+            branches: true     ## for all the branches
+            tags: true         ## for all the tags
+>>>>>>> upstream/7.x
diff --git a/packetbeat/protos/sip/_meta/fields.yml b/packetbeat/protos/sip/_meta/fields.yml
@@ -30,7 +30,7 @@
         multi_fields:
           - name: text
             type: text
-            analyzer: simple
+            norms: false
       - name: uri.scheme
         type: keyword
         description: The URI scheme.
@@ -66,14 +66,14 @@
         multi_fields:
           - name: text
             type: text
-            analyzer: simple
+            norms: false
       - name: private.uri.original
         type: keyword
         description: Private original URI.
         multi_fields:
           - name: text
             type: text
-            analyzer: simple
+            norms: false
       - name: private.uri.scheme
         type: keyword
         description: Private URI scheme.
@@ -98,7 +98,7 @@
         multi_fields:
           - name: text
             type: text
-            analyzer: simple
+            norms: false
       - name: to.display_info
         type: keyword
         description: "To display info"
@@ -108,7 +108,7 @@
         multi_fields:
           - name: text
             type: text
-            analyzer: simple
+            norms: false
       - name: to.uri.scheme
         type: keyword
         description: "To URI scheme"
@@ -133,7 +133,7 @@
         multi_fields:
           - name: text
             type: text
-            analyzer: simple
+            norms: false
       - name: from.uri.scheme
         type: keyword
         description: "From URI scheme"
@@ -158,7 +158,7 @@
         multi_fields:
           - name: text
             type: text
-            analyzer: simple
+            norms: false
       - name: contact.uri.scheme
         type: keyword
         description: "Contat URI scheme"
@@ -195,7 +195,7 @@
         multi_fields:
           - name: text
             type: text
-            analyzer: simple
+            norms: false
       - name: auth.uri.scheme
         type: keyword
         description: "Auth URI scheme"
@@ -235,4 +235,4 @@
         multi_fields:
           - name: text
             type: text
-            analyzer: simple
+            norms: false
diff --git a/packetbeat/protos/sip/fields.go b/packetbeat/protos/sip/fields.go
diff --git a/winlogbeat/Jenkinsfile.yml b/winlogbeat/Jenkinsfile.yml
@@ -75,3 +75,14 @@ stages:
                 - "windows-8"
             branches: true     ## for all the branches
             tags: true         ## for all the tags
+    #windows-7:  See https://github.com/elastic/beats/issues/22302
+    #    mage: "mage build unitTest"
+    #    platforms:             ## override default labels in this specific stage.
+    #        - "windows-7"
+    #    when:                  ## Override the top-level when.
+    #        comments:
+    #            - "/test winlogbeat for windows-7"
+    #        labels:
+    #            - "windows-7"
+    #        branches: true     ## for all the branches
+    #        tags: true         ## for all the tags	            tags: true         ## for all the tags
diff --git a/x-pack/auditbeat/Jenkinsfile.yml b/x-pack/auditbeat/Jenkinsfile.yml
@@ -63,7 +63,7 @@ stages:
             - "windows-2012-r2"
         when:                  ## Override the top-level when.
             comments:
-                - "/test auditbeat for windows-2012"
+                - "/test x-pack/auditbeat for windows-2012"
             labels:
                 - "windows-2012"
             branches: true     ## for all the branches
@@ -112,3 +112,14 @@ stages:
                 - "windows-7-32"
             branches: true     ## for all the branches
             tags: true         ## for all the tags
+    windows-7:
+        mage: "mage build unitTest"
+        platforms:             ## override default labels in this specific stage.
+            - "windows-7"
+        when:                  ## Override the top-level when.
+            comments:
+                - "/test x-pack/auditbeat for windows-7"
+            labels:
+                - "windows-7"
+            branches: true     ## for all the branches
+            tags: true         ## for all the tags
diff --git a/x-pack/elastic-agent/Jenkinsfile.yml b/x-pack/elastic-agent/Jenkinsfile.yml
@@ -100,6 +100,7 @@ stages:
                 - "windows-8"
             branches: true     ## for all the branches
             tags: true         ## for all the tags
+<<<<<<< HEAD
     #windows-7-32:  See https://github.com/elastic/beats/issues/22316
     #    mage: "mage build unitTest"
     #    platforms:             ## override default labels in this specific stage.
@@ -111,3 +112,16 @@ stages:
     #            - "windows-7-32"
     #        branches: true     ## for all the branches
     #        tags: true         ## for all the tags
+=======
+    windows-7:
+        mage: "mage build unitTest"
+        platforms:             ## override default labels in this specific stage.
+            - "windows-7"
+        when:                  ## Override the top-level when.
+            comments:
+                - "/test x-pack/elastic-agent for windows-7"
+            labels:
+                - "windows-7"
+            branches: true     ## for all the branches
+            tags: true         ## for all the tags
+>>>>>>> upstream/7.x
diff --git a/x-pack/filebeat/Jenkinsfile.yml b/x-pack/filebeat/Jenkinsfile.yml
@@ -112,3 +112,14 @@ stages:
     #            - "windows-7-32"
     #        branches: true     ## for all the branches
     #        tags: true         ## for all the tags
+    windows-7:
+        mage: "mage build unitTest"
+        platforms:             ## override default labels in this specific stage.
+            - "windows-7"
+        when:                  ## Override the top-level when.
+            comments:
+                - "/test x-pack/filebeat for windows-7"
+            labels:
+                - "windows-7"
+            branches: true     ## for all the branches
+            tags: true         ## for all the tags
diff --git a/x-pack/functionbeat/Jenkinsfile.yml b/x-pack/functionbeat/Jenkinsfile.yml
@@ -109,3 +109,14 @@ stages:
                 - "windows-7-32"
             branches: true     ## for all the branches
             tags: true         ## for all the tags
+    windows-7:
+        mage: "mage build unitTest"
+        platforms:             ## override default labels in this specific stage.
+            - "windows-7"
+        when:                  ## Override the top-level when.
+            comments:
+                - "/test x-pack/functionbeat for windows-7"
+            labels:
+                - "windows-7"
+            branches: true     ## for all the branches
+            tags: true         ## for all the tags
diff --git a/x-pack/metricbeat/Jenkinsfile.yml b/x-pack/metricbeat/Jenkinsfile.yml
@@ -91,3 +91,14 @@ stages:
                 - "windows-8"
             branches: true     ## for all the branches
             tags: true         ## for all the tags
+    windows-7:
+        mage: "mage build unitTest"
+        platforms:             ## override default labels in this specific stage.
+            - "windows-7"
+        when:                  ## Override the top-level when.
+            comments:
+                - "/test x-pack/metricbeat for windows-7"
+            labels:
+                - "windows-7"
+            branches: true     ## for all the branches
+            tags: true         ## for all the tags
diff --git a/x-pack/packetbeat/Jenkinsfile.yml b/x-pack/packetbeat/Jenkinsfile.yml
@@ -84,3 +84,14 @@ stages:
                 - "windows-7-32"
             branches: true     ## for all the branches
             tags: true         ## for all the tags
+    windows-7:
+        mage: "mage build unitTest"
+        platforms:             ## override default labels in this specific stage.
+            - "windows-7"
+        when:                  ## Override the top-level when.
+            comments:
+                - "/test x-pack/packetbeat for windows-7"
+            labels:
+                - "windows-7"
+            branches: true     ## for all the branches
+            tags: true         ## for all the tags
diff --git a/x-pack/winlogbeat/Jenkinsfile.yml b/x-pack/winlogbeat/Jenkinsfile.yml
@@ -84,3 +84,14 @@ stages:
     #            - "windows-7-32"
     #        branches: true     ## for all the branches
     #        tags: true         ## for all the tags
+    windows-7:
+        mage: "mage build unitTest"
+        platforms:             ## override default labels in this specific stage.
+            - "windows-7"
+        when:                  ## Override the top-level when.
+            comments:
+                - "/test x-pack/winlogbeat for windows-7"
+            labels:
+                - "windows-7"
+            branches: true     ## for all the branches
+            tags: true         ## for all the tags