Skip to content

Update regex file for es user agent node processor#59697

Merged
shahzad31 merged 4 commits intoelastic:masterfrom
shahzad31:update-user-agent-ingest-node-regex
Jul 17, 2020
Merged

Update regex file for es user agent node processor#59697
shahzad31 merged 4 commits intoelastic:masterfrom
shahzad31:update-user-agent-ingest-node-regex

Conversation

@shahzad31
Copy link
Copy Markdown
Contributor

@shahzad31 shahzad31 commented Jul 16, 2020

Fixes: #59694

This PR will update the regex file for es agent user agent processor.

Testing

Tested it locally with branch build and apm-server against data from issue and it identifies MAC devices properly now

image

@shahzad31 shahzad31 changed the title Update regex file for es user agent node Update regex file for es user agent node processor Jul 16, 2020
@danhermann danhermann self-requested a review July 16, 2020 13:40
@shahzad31 shahzad31 added v7.9.1 v8.0.0 v7.10.0 :Distributed/Ingest Node Execution or management of Ingest Pipelines labels Jul 16, 2020
@elasticmachine
Copy link
Copy Markdown
Collaborator

Pinging @elastic/es-core-features (:Core/Features/Ingest)

@elasticmachine elasticmachine added the Team:Data Management (obsolete) DO NOT USE. This team no longer exists. label Jul 16, 2020
@shahzad31 shahzad31 self-assigned this Jul 16, 2020
@shahzad31
Copy link
Copy Markdown
Contributor Author

@danhermann i fixed the related tests.

Copy link
Copy Markdown
Contributor

@danhermann danhermann left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM

@shahzad31 shahzad31 merged commit 24e5da7 into elastic:master Jul 17, 2020
@shahzad31 shahzad31 deleted the update-user-agent-ingest-node-regex branch July 17, 2020 14:54
@danhermann
Copy link
Copy Markdown
Contributor

@shahzad31, I'll take of the backports for this one.

@shahzad31
Copy link
Copy Markdown
Contributor Author

@shahzad31, I'll take of the backports for this one.

@danhermann Thank you

andrewkroh added a commit to elastic/beats that referenced this pull request Jul 22, 2020
The Elasticsearch user_agent processor was updated in elastic/elasticsearch#59697
axw added a commit to axw/apm-server that referenced this pull request Jul 23, 2020
Since the uap-core regexes were updated in
elastic/elasticsearch#59697,
MacOS user-agents are now parsed differently.
Update our test to match the change.
axw added a commit to elastic/apm-server that referenced this pull request Jul 23, 2020
Since the uap-core regexes were updated in
elastic/elasticsearch#59697,
MacOS user-agents are now parsed differently.
Update our test to match the change.
axw added a commit to axw/apm-server that referenced this pull request Jul 23, 2020
Since the uap-core regexes were updated in
elastic/elasticsearch#59697,
MacOS user-agents are now parsed differently.
Update our test to match the change.
axw added a commit to axw/apm-server that referenced this pull request Jul 23, 2020
Since the uap-core regexes were updated in
elastic/elasticsearch#59697,
MacOS user-agents are now parsed differently.
Update our test to match the change.
axw added a commit to elastic/apm-server that referenced this pull request Jul 23, 2020
Since the uap-core regexes were updated in
elastic/elasticsearch#59697,
MacOS user-agents are now parsed differently.
Update our test to match the change.
axw added a commit to elastic/apm-server that referenced this pull request Jul 23, 2020
Since the uap-core regexes were updated in
elastic/elasticsearch#59697,
MacOS user-agents are now parsed differently.
Update our test to match the change.
andrewkroh added a commit to andrewkroh/beats that referenced this pull request Jul 23, 2020
The Elasticsearch user_agent processor was updated in elastic/elasticsearch#59697

(cherry picked from commit 3238961)
andrewkroh added a commit to andrewkroh/beats that referenced this pull request Jul 23, 2020
The Elasticsearch user_agent processor was updated in elastic/elasticsearch#59697

(cherry picked from commit 3238961)
andrewkroh added a commit to elastic/beats that referenced this pull request Jul 23, 2020
The Elasticsearch user_agent processor was updated in elastic/elasticsearch#59697

(cherry picked from commit 3238961)
andrewkroh added a commit to elastic/beats that referenced this pull request Jul 23, 2020
The Elasticsearch user_agent processor was updated in elastic/elasticsearch#59697

(cherry picked from commit 3238961)
melchiormoulin pushed a commit to melchiormoulin/beats that referenced this pull request Oct 14, 2020
@joegallo
Copy link
Copy Markdown
Contributor

joegallo commented Apr 5, 2023

Note to myself from the future, the contents of regexes.yml on this PR is from https://github.com/ua-parser/uap-core/blob/e9fd8c682034c974d248d12e5c403bc82bef0548/regexes.yaml

joegallo@galactic:~/Code/elastic/elasticsearch/modules/ingest-user-agent/src/main/resources $ curl -s https://raw.githubusercontent.com/ua-parser/uap-core/e9fd8c682034c974d248d12e5c403bc82bef0548/regexes.yaml -o regexes.yml
joegallo@galactic:~/Code/elastic/elasticsearch/modules/ingest-user-agent/src/main/resources $ git diff
diff --git a/modules/ingest-user-agent/src/main/resources/regexes.yml b/modules/ingest-user-agent/src/main/resources/regexes.yml
index ac309ae7ab5..31a76724a01 100644
--- a/modules/ingest-user-agent/src/main/resources/regexes.yml
+++ b/modules/ingest-user-agent/src/main/resources/regexes.yml
@@ -1,20 +1,3 @@
-# Apache License, Version 2.0
-# ===========================
-#
-# Copyright 2009 Google Inc.
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
 user_agent_parsers:
   #### SPECIAL CASES TOP ####

@@ -58,7 +41,7 @@ user_agent_parsers:

   - regex: 'ArcGIS\.?(iOS|Android|NET|Qt)(?:-|\.)(\d+)\.(\d+)(?:\.(\d+)|)'
     family_replacement: 'ArcGIS Runtime SDK for $1'
-
+
   - regex: 'ArcGIS\.Runtime\.(Qt)\.(\d+)\.(\d+)(?:\.(\d+)|)'
     family_replacement: 'ArcGIS Runtime SDK for $1'

@@ -412,7 +395,7 @@ user_agent_parsers:
   - regex: '(SznProhlizec)/(\d+)\.(\d+)(?:\.(\d+)|)'
     family_replacement: 'Seznam prohlížeč'

-  # Coc Coc browser, based on Chrome (used in Vietnam)
+  # Coc Coc browser, based on Chrome (used in Vietnam)
   - regex: '(coc_coc_browser)/(\d+)\.(\d+)(?:\.(\d+)|)'
     family_replacement: 'Coc Coc'

Our copy has the license header, and also there are some very slight whitespace differences.

leweafan pushed a commit to leweafan/beats that referenced this pull request Apr 28, 2023
The Elasticsearch user_agent processor was updated in elastic/elasticsearch#59697

(cherry picked from commit 9271445)
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

:Distributed/Ingest Node Execution or management of Ingest Pipelines Team:Data Management (obsolete) DO NOT USE. This team no longer exists. v7.9.1 v7.10.0 v8.0.0-alpha1

Projects

None yet

Development

Successfully merging this pull request may close these issues.

Ingest node user agent processor regular expression file is outdated

5 participants