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

Pretty mysql for alerts breaks regex rules #6614

Merged
merged 2 commits into from May 13, 2017

Conversation

Projects
None yet
8 participants
@XioNoX
Contributor

XioNoX commented May 9, 2017

Fixes: #6613

DO NOT DELETE THIS TEXT

Please note

Please read this information carefully. You can run ./scripts/pre-commit.php to check your code before submitting.

Testers

If you would like to test this pull request then please run: ./scripts/github-apply <pr_id>, i.e ./scripts/github-apply 5926

@mention-bot

This comment has been minimized.

Show comment
Hide comment
@mention-bot

mention-bot May 9, 2017

Thank you for submitting a PR @XioNoX! We have found the following @f0o, @murrant and @laf based on the history of these files to review this PR.

Thank you for submitting a PR @XioNoX! We have found the following @f0o, @murrant and @laf based on the history of these files to review this PR.

@CLAassistant

This comment has been minimized.

Show comment
Hide comment
@CLAassistant

CLAassistant May 9, 2017

CLA assistant check
All committers have signed the CLA.

CLAassistant commented May 9, 2017

CLA assistant check
All committers have signed the CLA.

@LibreNMS-CI

This comment has been minimized.

Show comment
Hide comment
Show outdated Hide outdated includes/alerts.inc.php
@@ -36,7 +36,7 @@ function GenSQL($rule)
return false;
}
//Pretty-print rule to dissect easier
$pretty = array('*' => '*', '(' => ' ( ', ')' => ' ) ', '/' => '/', '&&' => ' && ', '||' => ' || ', 'DATE_SUB ( NOW ( )' => 'DATE_SUB( NOW()');
$pretty = array('*' => '*', '(' => '(', ')' => ')', '/' => '/', '&&' => ' && ', '||' => ' || ', 'DATE_SUB ( NOW ( )' => 'DATE_SUB( NOW()');

This comment has been minimized.

@murrant

murrant May 9, 2017

Member

It looks like '&&' => ' && ' and '||' => ' || ' are the only two worthwhile mappings. Probably just remove the rest. It is interesting that this already contains two worthless replacements...

@murrant

murrant May 9, 2017

Member

It looks like '&&' => ' && ' and '||' => ' || ' are the only two worthwhile mappings. Probably just remove the rest. It is interesting that this already contains two worthless replacements...

This comment has been minimized.

@murrant

murrant May 9, 2017

Member

Or maybe the entire thing...

@murrant

murrant May 9, 2017

Member

Or maybe the entire thing...

@f0o

This comment has been minimized.

Show comment
Hide comment
@f0o

f0o May 9, 2017

Member
Member

f0o commented May 9, 2017

@LibreNMS-CI

This comment has been minimized.

Show comment
Hide comment
@scrutinizer-notifier

This comment has been minimized.

Show comment
Hide comment
@scrutinizer-notifier

scrutinizer-notifier May 13, 2017

The inspection completed: No new issues

The inspection completed: No new issues

@laf laf merged commit 073b444 into librenms:master May 13, 2017

3 checks passed

Auto-Deploy Build finished.
Details
continuous-integration/travis-ci/pr The Travis CI build passed
Details
license/cla Contributor License Agreement is signed.
Details
@lock

This comment has been minimized.

Show comment
Hide comment
@lock

lock bot May 18, 2018

This thread has been automatically locked since there has not been any recent activity after it was closed.

lock bot commented May 18, 2018

This thread has been automatically locked since there has not been any recent activity after it was closed.

@lock lock bot locked as resolved and limited conversation to collaborators May 18, 2018

Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.