-
Notifications
You must be signed in to change notification settings - Fork 174
custom_query perfdata multi-row output improvements #122
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
Open
swanson8r
wants to merge
3
commits into
bucardo:master
Choose a base branch
from
swanson8r: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
Changes from 1 commit
Commits
Show all changes
3 commits
Select commit
Hold shift + click to select a range
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Next
Next commit
custom_query perfdata multi-row variable names
Allow custom_query checks with multiple rows of output to populate the second returned column as the perfdata variable name. Pass the result value as the perfdata value. Helpful for count(*) GROUP BY queries.
- Loading branch information
commit 4dd5aa252b718b4492fa1c8d055b76c56986b5b8
There are no files selected for viewing
This file contains hidden or 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
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -4398,9 +4398,13 @@ sub check_custom_query { | |
|
||
my $goodrow = 0; | ||
|
||
## The other column tells it the name to use as the perfdata value | ||
## If there is a single row and at least 2 columns, | ||
## the other column tells it the name to use as the perfdata value | ||
## If there are multiple rows and at least 2 columns, | ||
## use the second column value as the perfdata name, | ||
## use the result value as the perfdata value. | ||
my $perfname; | ||
|
||
my $grandtotal = @{$db->{slurp}}; | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. check the number of rows returned by the custom query There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Get the returned custom query row count |
||
for my $r (@{$db->{slurp}}) { | ||
my $result = $r->{result}; | ||
if (! defined $perfname) { | ||
|
@@ -4413,8 +4417,13 @@ sub check_custom_query { | |
} | ||
$goodrow++; | ||
if ($perfname) { | ||
$db->{perf} .= sprintf ' %s=%s;%s;%s', | ||
perfname($perfname), $r->{$perfname}, $warning, $critical; | ||
if ($grandtotal > 1) { | ||
$db->{perf} = sprintf ' %s=%s;%s;%s', | ||
perfname($r->{$perfname}), $result, $warning, $critical; | ||
} else { | ||
$db->{perf} .= sprintf ' %s=%s;%s;%s', | ||
perfname($perfname), $r->{$perfname}, $warning, $critical; | ||
} | ||
} | ||
my $gotmatch = 0; | ||
if (! defined $result) { | ||
|
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.
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.
Added comments to explain exactly how the query results are processed into performance data