diff --git a/auditbeat/Jenkinsfile.yml b/auditbeat/Jenkinsfile.yml index 3ed44ddedf8..9d0e1ebec75 100644 --- 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 index 5f0166beb74..59e3c57f347 100644 --- 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 index 658e3d60dbd..431a5bc8db4 100644 --- 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 index d068a7798ad..69a282cd50c 100644 --- 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 index 9ac888503d1..023077417a5 100644 --- 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 <>. *`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 index 89e3df8de05..ca5d6577840 100644 --- 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 index 3d17e9c6ce2..3ff6f49f3d4 100644 --- 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 index a75bbd3bf60..fa31a50b595 100644 --- 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 index fcbb1349dd1..c14664122e3 100644 --- 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 index 87c93ab0cad..548e66661f1 100644 --- a/packetbeat/protos/sip/fields.go +++ b/packetbeat/protos/sip/fields.go @@ -32,5 +32,5 @@ func init() { // AssetSip returns asset data. // This is the base64 encoded gzipped contents of protos/sip. func AssetSip() string { - return "eJzEmcFy4jgQhu95ii7u8QNwm5rsVnHLhsxeKY3dxqqRJUdqQ9in35KxFGEkZqRUhZzAcX+/1Pz9ozKP8AtPazB8eAAgTgLXsNpunlcPAA2aWvOBuJJr2G6eH82ANW95DXhASdByFI2pHmB+tX4AAHgEyXp0SPtHpwHXsNdqdFcuyBvZKt0z+wbYTzWS1QLSrG15Xc0VocKHBvEeDbHecZ1Wwwh3kkll/D8uJF9dHRw5dWDvBIO1kg0MGmtuuJLVQqtWDS5kfuHpqHQT13hBMyhpEAwxGs1Uv2T2SJ1q8qhvIxqaK5e8s9RnVjl0mpmrdVpQDvUvTh1q0PNilX151lmSD6hts3Pg1h2DVqRqJVz9EjtqXinN91wykcN+7RBcHfx42VT+tn4UxHeXNrxoEb5TcNmpXV1mkonTf6jtgPSDwMjCTd1hn9Vvu+wfLxs4V8aaMRrU9l0J1dZOqBi4U4ZKoLYuxhuULuLZuiWP1TUOWbRvUwV0yBrUcGBivNo0E0Ids5i2AJt5ZM1VrjAhdjwrBL4zIWDzdJ1QklDSTqDcU7cACiX3ift/O90+rtj7rlX6yHSzDJkI3oyD/VAwa2tbV5RqlzXjju1R0p8O+BdN7qD5gRFWpdHzfK6/b/yEm8iPIbeFdBSF/JJIChWSsRSK5MZTKBCLqJCdG1UhOxZXtcG3KveYsbXfsbLG6PliIuYfMjwzfso4cPb5L9d/ObvM1y/zOKmq4WYQ7LTjslU5O1i9KphrwdaurtGl42/R4eiv7tCWsqm3K/+Y+ERLSobdgf2gJ9i5M+64ti6BzB1th7R1ESSxfS6N2H4JarXqy637t1b9TfNO+GL7Tvi7Gtivv8DC0+rTJvboIht7eNLInp9tZc+Omdljs+3ssTFDT9hcS0/EiKntIZTVVO7r72fATWs7kWJ3O5G7GjzcRYHHpz3QDZeH/CKjuy7d9Hqokm33UCHm+BCebfoQHvO9g5Nm0hTTfXUKL7gsa7stTEHxfeAasx4Nee5cm0K/FUH/WeLYSF2Jrb+N1CUMPSE1MtHnE6eyKLA4RCbuXRPEr7+0z+nw8Ojsmfbg2EB7bPa8eWxs1kwzVAWPHlfbp2f3yDGGVEeJuiw7LXkqTyfnh4JBY5eQ+dgo0JgBsHlKi5T256zw2y7x5UP74EIKev5dYsmbN1MV9dx1ItXwWkmJtS2oso8mlv9RHz2ZLCRY02g0eTG9UJkRMaGfqjmVRdf0EbjkspgviK7/AwAA///sesAq" + return "eJzEmcFy4jgQhu95ii7u8QNwm5rsVnHLhsxeKY3dxqqRJUdqQ3j7LRlLEUZiVkpNmBN46O9vN3//qJxH+IWnNRg+PAAQJ4FrWG03z6sHgAZNrflAXMk1bDfPj2bAmre8BjygJGg5isZUDzC/Wj8AADyCZD06pP1HpwHXsNdqdFcuyBvZKt0z+wbYTzWS1QLSrG15Xc0VocKHBvEeDbHecZ1Wwwh3kkll/H9cSL66Ojhy6sB+EgzWSjYwaKy54UpWC61aNbiQ+YWno9JNXOMFzaCkQTDEaDRT/ZLZI3WqyaO+jWhorlzyzlKf6XLoNDNXfVpQDvUvTh1q0HOzyr486yzJB9R22Dlw645BK1K1Eq5+iR01r5Tmey6ZyGG/dgiuDn68bCr/sX4UxHeXNrwYEb5TcNmpXV2WSvdmDS0TBiNNm7rDPmvWtuUfLxs4V8YGMRrU9l0J1dZOqBi4U4ZKoLYuxhuULuLZuiWP1TUOWbRvUwV0yBrUcGBivLppJoQ6ZjFtATbzupqrTGFC7HhWAHxnQsDm6TqdJKGknUC5p24BFEruE5//7Wb7qGLvu1bpI9PNMmAieDMO9kvBrFvbuqLUuKwZd2yPkv7vcn/B1g6aHxhhVRo5z+f6+8VOeAP58ePaT0dQyC+JolAhGUehSG4shQKxaArZuREVsmMxVRt8q3KPFlv7uyprjJ4pJmL+wcIz4yeLA2ef/0H9l7PLXP0Sf5OqGm4GwU47LluV0/3qVcFcC7Z2dY0uXXuLDld+9cUjKdt22/XHpifGUbLkDuwXPMHO3W3HtXUJZO5KO6StiyCJ7XNpxPZLUKtVX27bv7Xqbxp3whdbd8Lfzby+9wL7Tp2nDezRRRb28KSJPT/bxp4dM7LHZlvZY2NmnrC5dp6IEUPbAyerqdzT38+Am7Z2IsXOdiJ3M3d4BwX+nvqnGw4P+UUmdxO66fNQJdvqoULM7SE82/AhPOZ5ByfNpCmm++oUXnBZNnZbmILi+8A1Zj3+8dy5NoV+K4L+s8SxkboSW38bqUsYekJqZKLPJ05lUWBxgEzcu6WH7710xung8Ojsffbg2DJ7bPaueWxsz0wzVAWPFlfbp2f3SDGGVEeJuiw3LXkqT6fmh4JBY1vIfDQUaMwA2DylRUrnc1b47ZT48qF8cCEFPf/dYcmbb6YqmrmbRGrgtZISa1tQZR9JLP+jPnoiWUiwptFo8iJ6oTIjYkI/VXMqi63pK3CpZTF/OLb+CwAA///w07DE" } diff --git a/winlogbeat/Jenkinsfile.yml b/winlogbeat/Jenkinsfile.yml index b227ec104ad..ecbf64c5757 100644 --- 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 index 7e40a4047ad..bdc434e9a03 100644 --- 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 index 890a2cbb4c4..94749ee4e6a 100644 --- 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 index b3ef5fad8c3..66513f2d440 100644 --- 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 index 18451764289..9a01268d965 100644 --- 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 index 5fe7cff4134..52fa02def62 100644 --- 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 index 08f666bc43e..443567921a4 100644 --- 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 index 405ce1aa1d4..6da60bc1b47 100644 --- 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