-
Notifications
You must be signed in to change notification settings - Fork 62
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
Added escape of items with " #31
Open
rtshome
wants to merge
5
commits into
greatcare:master
Choose a base branch
from
rtshome:master
base: master
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Open
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
rkaw92
requested changes
Oct 15, 2018
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
A necessary change overall, but needs some minor tweaks:
- Avoid changing all tabs to spaces in the source please, leave them as they are - any editor/IDE should support this; otherwise we generate unnecessary line changes.
- See note about matching/escaping.
lib/PM2ZabbixMonitor.js
Outdated
@@ -72,7 +72,11 @@ PM2ZabbixMonitor.prototype._initListeners = function _initListeners() { | |||
* @returns {string} The item key to send the data to Zabbix with. | |||
*/ | |||
PM2ZabbixMonitor.prototype.getDataKey = function getDataKey(processID, processState, dataItem) { | |||
return 'pm2.processes["' + processID + '",' + dataItem + ']'; | |||
if (processID.match(/[\[\],]/)) { |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
- According to the
zabbix_sender
manpage, whitespace also needs quoting. - It may be cleaner to put the string escaping logic in a separate function, so that
getDataKey
only knows about the prefix and delegates the escaping of strings to somewhere else (after all, it may turn out thatdataItem
must be escaped in the same way).
…ng to zabbix_sender rules
@rkaw92 give a look at the latest commit and let me know if it's ok for you. |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
The pm2 processes that have a name with square brackets must be escaped.
I added a generic escape for all keys using double quotes as zabbix documentation states