Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Improved Regex #544

Merged
merged 1 commit into from
Dec 16, 2016
Merged

Improved Regex #544

merged 1 commit into from
Dec 16, 2016

Conversation

neha-viswanathan
Copy link
Contributor

Updated regex-lookup.yml by removing redundant characters in the regular expressions.

@@ -1,19 +1,19 @@
logs-all: ([a-zA-Z0-9\.\-:\"\s\_\t\n$&?/\[\]%><,;()+='*{}\\]*)
logs-metadata: (timestamp:"[A-Z0-9\.\-:\"]+\s+time_id:"[A-Z0-9\.\-:\"]+\s+service_id:"[a-z0-9$\"]+\s+service_name:"[a-z0-9\-$\"]+\s+message:"[a-zA-Z0-9\./\-:\s\_\"=\t\n\$\\&%?\[\]\%\>\<\,\;\+$\"]+\s+container_id:"[a-z0-9$\"]+\s+node_id:"[a-z0-9$\"]+\s+task_id:"[a-z0-9$\"]+\s+task_name:"[a-z0-9\.\-$\"]+)
logs-numbered: ([a-zA-Z0-9\.\-:\"\s\_\t\n\$&%?/\[\]\%\>\<\,\;]*){10}
docker-service-list: ID\s+NAME\s+REPLICAS\s+IMAGE\s+COMMAND\s*\n([a-zA-Z0-9\s\.\-:/]*){1,}
docker-service-list: ID\s+NAME\s+REPLICAS\s+IMAGE\s+COMMAND\s*([a-zA-Z0-9\s\.\-:/]*){1,}
Copy link
Contributor

Choose a reason for hiding this comment

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

Can you verify this is correct ("COMMAND")?

@subfuzion
Copy link
Contributor

Please resolve conflicts and double-check the regex for docker-service-list so I can merge. Thanks.

@neha-viswanathan
Copy link
Contributor Author

docker-service-list is not being used. So I've removed it.

@subfuzion
Copy link
Contributor

LGTM

@subfuzion subfuzion merged commit cdb8c47 into master Dec 16, 2016
@subfuzion subfuzion deleted the regex-refine branch December 16, 2016 17:53
@bquenin bquenin added this to the 0.4.0 milestone Jan 3, 2017
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants