Module: check_mk Branch: master Commit: cc265c5e46b2bd5926de6cd61d5752abe504d73f URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=cc265c5e46b2bd… Author: Marcel Schulte &lt;ms(a)mathias-kettner.de&gt; Date: Tue Nov 29 08:44:02 2016 +0100 Revert "4106 mk_oracle.ps1: added Oracle wallet support to Windows plugin" This reverts commit 40d69947837df6855e67415926f9cfee2e36cfee. --- .werks/4106 | 1 + ChangeLog | 1 - agents/windows/plugins/mk_oracle.ps1 | 23 ++++++----------------- 3 files changed, 7 insertions(+), 18 deletions(-) diff --git a/.werks/4106 b/.werks/4106 index 4c67f5b..3534f67 100644 --- a/.werks/4106 +++ b/.werks/4106 @@ -8,3 +8,4 @@ Class: feature Now you are able to filter by host- resp. service-service-level defined in global settings/notifications. + diff --git a/ChangeLog b/ChangeLog index 70b7b23..e6878e9 100644 --- a/ChangeLog +++ b/ChangeLog @@ -11,7 +11,6 @@ * 4094 apc_rackpdu_power: now detects all phases or banks connected to this pdu NOTE: Please refer to the migration notes! * 3993 Some minor performance improvements during config generation... - * 4106 mk_oracle.ps1: added Oracle wallet support to Windows plugin... * 3987 FIX: Check_MK Agent Access: Windows agent reported incorrect only from value * 3952 FIX: diskstat: fixed bug if multipath devices having an alias... * 3939 FIX: f5_bigip_conns: readded performance data and graphs... diff --git a/agents/windows/plugins/mk_oracle.ps1 b/agents/windows/plugins/mk_oracle.ps1 index 0188ab1..bd212b9 100644 --- a/agents/windows/plugins/mk_oracle.ps1 +++ b/agents/windows/plugins/mk_oracle.ps1 @@ -123,8 +123,7 @@ Param( ) # if debug=1 then output if ($DEBUG -gt 0) { - $MYTIME=Get-Date -Format o - echo "${MYTIME} DEBUG:${error_message}" + echo "DEBUG:${error_message}" } } @@ -385,17 +384,11 @@ Param( else { $assysdbaconnect="" } + #$TNSALIAS="$the_host`:$the_port/$sqlsid" $UPPER_SID=$sqlsid.toupper() - - # use oracle wallet if requested in cfg file - if ($the_user -like "/" ) { - $SQL_CONNECT="/@$UPPER_SID$assysdbaconnect" - } - else { - $TNSALIAS="(DESCRIPTION=(ADDRESS=(PROTOCOL=TCP)(HOST=$the_host)(PORT=$the_port))(CONNECT_DATA=(SID=$UPPER_SID)))" - # we presume we can use an EZconnect - $SQL_CONNECT="$the_user/$the_password@$TNSALIAS$assysdbaconnect" - } + $TNSALIAS="(DESCRIPTION=(ADDRESS=(PROTOCOL=TCP)(HOST=$the_host)(PORT=$the_port))(CONNECT_DATA=(SID=$UPPER_SID)))" + # we presume we can use an EZconnect + $SQL_CONNECT="$the_user/$the_password@$TNSALIAS$assysdbaconnect" debug_echo "value of sql_connect in dbuser = $SQL_CONNECT" } else { debug_echo "DBUSER is not defined" @@ -1276,7 +1269,7 @@ $list_inst=(get-service -Name "Oracle*Service*" -include "OracleService*", "Orac # the following line ensures that the output of the files generated by calling # Oracle SQLplus through Powershell are not limited to 80 character width. The # 80 character width limit is the default -$Host.UI.RawUI.BufferSize = New-Object Management.Automation.Host.Size (512, 150) +$Host.UI.RawUI.BufferSize = New-Object Management.Automation.Host.Size (512, 50) # We have to set some value for the ORACLE_SID, although here a nonsense value # This value is used when we want to simply list all the banners @@ -1427,10 +1420,6 @@ if ($the_count -gt 0) { } } } - # We need an line break after last output from sections - # otherwise the agent adds <<<local>>> as parameter to the last line of plugin - echo "" - } debug_echo "got to the end"