diff --git a/check_mysqlserver b/check_mysqlserver index 3f1ac92d8aee27ef544134411aae22e67c8f2fd3..2cc6d4cecaf173a214638eb9c46b5bb77744bd96 100755 --- a/check_mysqlserver +++ b/check_mysqlserver @@ -21,11 +21,12 @@ # 2023-06-06 v0.3 <axel.hahn@unibe.ch> some shell fixes # 2023-07-28 v1.0 <axel.hahn@unibe.ch> update help page; fix [client]: command not found # 2023-08-30 v1.1 <axel.hahn@unibe.ch> reverse return code in ph.hasParamoption to unix like return codes: 0=true; <>0 = false +# 2024-12-09 v1.2 <axel.hahn@unibe.ch> fix showing help # ====================================================================== . $( dirname $0 )/inc_pluginfunctions -export self_APPVERSION=1.1 +export self_APPVERSION=1.2 # --- set HOME HOME=/etc/icingaclient @@ -200,7 +201,7 @@ ph.hasParamoption "u" "$@"; bOptUninstall=$? ph.hasParamoption "h" "$@"; bOptHelp=$? if [ $bOptHelp -eq 0 -o $# -lt 1 ]; then - echo "showHelp" + showHelp exit 0 fi diff --git a/docs/20_Checks/check_gitlab_tokens.md b/docs/20_Checks/check_gitlab_tokens.md index a5162e53ca1d38fdcb89058eafbc9e25a10dfdd8..8a4aac42c7b15498170ddac64fbd8da3b426a90b 100644 --- a/docs/20_Checks/check_gitlab_tokens.md +++ b/docs/20_Checks/check_gitlab_tokens.md @@ -19,7 +19,7 @@ The check returns * curl * Bash REST API client<br>A set of class like functions with a http. prefix. <br>📗 Docs: <https://os-docs.iml.unibe.ch/bash-rest-api-client/> -Extract or Git pull the Bash REST API client somewhere in your filesystem. eg. /opt/bash-api-client/. With the parameter `-r <FILE>` you point to the file `rest-api-client.sh`. +Extract or Git pull the Bash REST API client somewhere in your filesystem. eg. /opt/bash-api-client/. With the parameter `-r <FILE>` you point to the file `http.class.sh`. ## Standalone installation @@ -45,7 +45,7 @@ You can use another filename for this configuration - but then you need the para | -- | -- | -- | | GITLAB_API | string | target url to the gitlab api | | GITLAB_TOKEN | string | token of an admin user to read the api | -| REST_CLIENT | string | rest-api-client.sh as filename with full path or relative to the check_gitlab_tokens | +| REST_CLIENT | string | http.class.sh as filename with full path or relative to the check_gitlab_tokens | Example: @@ -55,7 +55,7 @@ GITLAB_API='https://gitlab.example.com/api/v4' GITLAB_TOKEN='glpat-1234567890' # Rest API client -# REST_CLIENT='/some/where/rest-api-client.sh' +# REST_CLIENT='/some/where/http.class.sh' ``` Hint: @@ -103,10 +103,10 @@ OPTIONS: GITLAB_API='https://gitlab.example.com/api/v4' GITLAB_CONFIG=<TOKEN> - REST_CLIENT="/opt/rest-api-client/rest-api-client.sh" + REST_CLIENT="/opt/rest-api-client/http.class.sh" -r FILE path to REST api client - default: /opt/rest-api-client/rest-api-client.sh + default: /opt/rest-api-client/http.class.sh The parameter overrides the variable REST_CLIENT. -s DAYS Number of days for max age of token; default: 395 diff --git a/docs/20_Checks/check_iml_backup_server.md b/docs/20_Checks/check_iml_backup_server.md index 7ae3e2dcd22124b4ec7e2e778f18ef3379415302..ae7b2392874199940b7835a7ff9d65a20a6c08a5 100644 --- a/docs/20_Checks/check_iml_backup_server.md +++ b/docs/20_Checks/check_iml_backup_server.md @@ -25,7 +25,6 @@ uid=1041(icingaclient) gid=1041(icingaclient) groups=1041(icingaclient),1031(iml From this repository ypu need next to this script: * `inc_pluginfunctions` shared function for all IML checks written in bash -* `inc_haproxy_cfg.sh` shared function to parse HA proxy configs ## Syntax diff --git a/docs/20_Checks/check_mysqlserver.md b/docs/20_Checks/check_mysqlserver.md index 4b9513fb3ea0a6b8a429d3110de8b4631530010f..c0c144aef913fc73f3048cf1570c02f349515ba9 100644 --- a/docs/20_Checks/check_mysqlserver.md +++ b/docs/20_Checks/check_mysqlserver.md @@ -12,7 +12,7 @@ The kind of check is defined by a parameter `-m METHOD`. ## Standalone installation -From this repository ypu need next to this script: +From this repository you need next to this script: * `inc_pluginfunctions` shared function for all IML checks written in bash @@ -24,7 +24,7 @@ From this repository ypu need next to this script: ______________________________________________________________________ CHECK_MYSQLSERVER -v1.0 +v1.2 (c) Institute for Medical Education - University of Bern Licence: GNU GPL 3