tyler.durden
/
icinga2
mirror of https://github.com/Icinga/icinga2.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #5805 from KAMI911/master 

Add support for LD_LIBRARY_PATH env variable in oracle_health ITL CheckCommand
This commit is contained in:
Michael Friedrich 2017-12-20 09:48:41 +01:00 committed by GitHub
parent ba70b3361e 709d00fbdb
commit 050794355f
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
doc/10-icinga-template-library.md
View File

@ -2306,8 +2306,9 @@ Environment Macros:
Name | Description Name | Description
--------------------|------------------------------------------------------------------------------------------------------------------------------------------ --------------------|------------------------------------------------------------------------------------------------------------------------------------------
ORACLE_HOME | **Required.** Specifies the location of the oracle instant client libraries. Defaults to "/usr/lib/oracle/11.2/client64/lib". Can be overridden by setting "oracle_home". ORACLE\_HOME | **Required.** Specifies the location of the oracle instant client libraries. Defaults to "/usr/lib/oracle/11.2/client64/lib". Can be overridden by setting the custom attribute `oracle_home`.
TNS_ADMIN | **Required.** Specifies the location of the tnsnames.ora including the database connection strings. Defaults to "/etc/icinga2/plugin-configs". Can be overridden by setting "oracle_tns_admin". LD\_LIBRARY\_PATH | **Required.** Specifies the location of the oracle instant client libraries for the run-time shared library loader. Defaults to "/usr/lib/oracle/11.2/client64/lib". Can be overridden by setting the custom attribute `oracle_ld_library_path`.
TNS\_ADMIN | **Required.** Specifies the location of the tnsnames.ora including the database connection strings. Defaults to "/etc/icinga2/plugin-configs". Can be overridden by setting the custom attribute `oracle_tns_admin`.
#### postgres <a id="plugin-contrib-command-postgres"></a> #### postgres <a id="plugin-contrib-command-postgres"></a>

2
itl/plugins-contrib.d/databases.conf
View File

@ -505,6 +505,7 @@ object CheckCommand "oracle_health" {
env = { env = {
"ORACLE_HOME" = "$oracle_home$" "ORACLE_HOME" = "$oracle_home$"
"LD_LIBRARY_PATH" = "$oracle_ld_library_path$"
"TNS_ADMIN" = "$oracle_tns_admin$" "TNS_ADMIN" = "$oracle_tns_admin$"
} }
@ -515,6 +516,7 @@ object CheckCommand "oracle_health" {
vars.oracle_health_report = "long" vars.oracle_health_report = "long"
vars.oracle_home = "/usr/lib/oracle/11.2/client64/lib" vars.oracle_home = "/usr/lib/oracle/11.2/client64/lib"
vars.oracle_ld_library_path = "/usr/lib/oracle/11.2/client64/lib"
vars.oracle_tns_admin = SysconfDir + "/icinga2/plugin-configs" vars.oracle_tns_admin = SysconfDir + "/icinga2/plugin-configs"
} }