evolix/evocheck
evolix/evocheck
21
2
Fork 2
Code Issues 48 Pull requests 5 Releases 37 Wiki Activity

fix check_mysqlnrpe #96

Merged
benpro merged 2 commits from fix-mysqlnrpe into master 2019-06-21 14:00:41 +02:00
Conversation 0 Commits 2 Files changed 1 +11 -6
1 changed files with 11 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
evocheck.sh
View file

@ -891,12 +891,17 @@ check_mysqlmunin() {
}
check_mysqlnrpe() {
if is_debian_stretch && is_installed mariadb-server; then
nagios_file="~nagios/.my.cnf"
benpro commented 2019-06-18 14:13:03 +02:00
Review
Copy link

It doesn't expands because you have put double quotes.

nagios_file=~nagios/.my.cnf

should works.

14:03:05 [bserie@huit:/tmp] % bash -c 'echo ~bserie'
/home/bserie
14:12:54 [bserie@huit:/tmp] % bash -c 'echo "~bserie"'
~bserie
14:12:59 [bserie@huit:/tmp] %
It doesn't expands because you have put double quotes. ~~~ nagios_file=~nagios/.my.cnf ~~~ should works. ~~~ 14:03:05 [bserie@huit:/tmp] % bash -c 'echo ~bserie' /home/bserie 14:12:54 [bserie@huit:/tmp] % bash -c 'echo "~bserie"' ~bserie 14:12:59 [bserie@huit:/tmp] % ~~~
benpro commented 2019-06-18 14:15:52 +02:00
Review
Copy link

I'm not fond of checking nagios_file_abs and nagios_file_sym. We should keep tilde expansion. (With no quotes of course).

I'm not fond of checking `nagios_file_abs` and `nagios_file_sym`. We should keep tilde expansion. (With no quotes of course).
jlecour commented 2019-06-18 16:33:12 +02:00
Review
Copy link

I understand, but without the quotes the variable holds the expanded value.
The nrpe check currently contains the non-expanded version so it's not easy to check without rewritting all nrpe configurations.

I understand, but without the quotes the variable holds the expanded value. The nrpe check currently contains the non-expanded version so it's not easy to check without rewritting all nrpe configurations.
jlecour commented 2019-06-18 16:34:26 +02:00
Review
Copy link

We can loosen the check a bit and only verify that a "check_mysql" is present and not the entire line.

We can loosen the check a bit and only verify that a "check_mysql" is present and not the entire line.
{ test -f $nagios_file \
benpro commented 2019-06-18 16:56:13 +02:00
Review
Copy link

Or you could add eval to evaluate the variable even if quoted.

16:53:11 [bserie@mikubook:~] 130 % nagios_file="~bserie"
16:53:22 [bserie@mikubook:~] % echo $nagios_file
~bserie
16:53:28 [bserie@mikubook:~] % eval echo $nagios_file
/home/bserie

This should works:

eval test -f $nagios_file
Or you could add eval to evaluate the variable even if quoted. ``` 16:53:11 [bserie@mikubook:~] 130 % nagios_file="~bserie" 16:53:22 [bserie@mikubook:~] % echo $nagios_file ~bserie 16:53:28 [bserie@mikubook:~] % eval echo $nagios_file /home/bserie ``` This should works: ~~~ eval test -f $nagios_file ~~~
jlecour commented 2019-06-18 17:36:43 +02:00
Review
Copy link

I think it's overcomplicated :/

I think it's overcomplicated :/
benpro commented 2019-06-18 17:38:47 +02:00
Review
Copy link

Huh? You take the actual check. You add eval and its done.

Huh? You take the actual check. You add `eval` and its done.
benpro commented 2019-06-21 11:23:15 +02:00
Review
Copy link

Any news? You don't agree?

@vlaborie what's your point of view?

Any news? You don't agree? @vlaborie what's your point of view?
jlecour commented 2019-06-21 11:30:37 +02:00
Review
Copy link

It's not that I disagree. I think adding an eval is technically correct but needlessly complicated.

I offered another solution : simplifying the NRPE check by not checking the exact command parameters (which we don't care about).
It verifies that there is an NRPE check for MySQL.

It's not that I disagree. I think adding an `eval` is technically correct but needlessly complicated. I offered another solution : simplifying the NRPE check by not checking the exact command parameters (which we don't care about). It verifies that there is an NRPE check for MySQL.
benpro commented 2019-06-21 11:34:12 +02:00
Review
Copy link

It verifies that there is an NRPE check for MySQL.

Ok go for it.

> It verifies that there is an NRPE check for MySQL. Ok go for it.
&& [ "$(stat -c %U $nagios_file)" = "nagios" ] \
&& [ "$(stat -c %a $nagios_file)" = "600" ] \
&& grep -q -F "command[check_mysql]=/usr/lib/nagios/plugins/check_mysql -H localhost -f $nagios_file";
} || failed "IS_MYSQLNRPE"
nagios_file=~nagios/.my.cnf
if ! test -f ${nagios_file}; then
failed "IS_MYSQLNRPE" "${nagios_file} is missing"
elif [ "$(stat -c %U ${nagios_file})" != "nagios" ] \
|| [ "$(stat -c %a ${nagios_file})" != "600" ]; then
failed "IS_MYSQLNRPE" "${nagios_file} has wrong permissions"
else
grep -q -F "command[check_mysql]=/usr/lib/nagios/plugins/check_mysql" /etc/nagios/nrpe.d/evolix.cfg \
|| failed "IS_MYSQLNRPE" "check_mysql is missing"
fi
fi
}
check_phpevolinuxconf() {