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 <ms(a)mathias-kettner.de>
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"
Module: check_mk
Branch: master
Commit: 40d69947837df6855e67415926f9cfee2e36cfee
URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=40d69947837df6…
Author: Marcel Schulte <ms(a)mathias-kettner.de>
Date: Mon Nov 28 09:40:14 2016 +0100
4106 mk_oracle.ps1: added Oracle wallet support to Windows plugin
The plugin for windows could be used with the Oracle wallet. The support is
limitted to all Instances except ASM. This function is only for
administrators who really knows how to use the wallet.
You have to add an entry with the name of the instance. Please check the
connection with SQLPlus before trying to use the plugin.
The plugin use the following connection:
sqlplus /@<ORACLE_SID>
You have to add a credential to the wallet with the ORACLE_SID as name for
the entry:
Example:
mkstore -wrl <Wallet Directory> createCredential „<ORACLE_SID>" <Username> <Password>
The wallet is only used, when username is set to '/'. Password,
hostname and listener-port is ignored, because the tnsnames.ora is used.
Please read the doumentation from Oracle for using the wallet. The
sqlnet.ora must be configured for your environment and the wallet must be
created before adding some entries. You could use TNS_ADMIN in
mk_oracle.cfg.txt for pointing to the sqlnet configuration for the plugin.
---
.werks/4106 | 1 -
ChangeLog | 1 +
agents/windows/plugins/mk_oracle.ps1 | 23 +++++++++++++++++------
3 files changed, 18 insertions(+), 7 deletions(-)
diff --git a/.werks/4106 b/.werks/4106
index 3534f67..4c67f5b 100644
--- a/.werks/4106
+++ b/.werks/4106
@@ -8,4 +8,3 @@ 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 e6878e9..70b7b23 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -11,6 +11,7 @@
* 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 bd212b9..0188ab1 100644
--- a/agents/windows/plugins/mk_oracle.ps1
+++ b/agents/windows/plugins/mk_oracle.ps1
@@ -123,7 +123,8 @@ Param(
)
# if debug=1 then output
if ($DEBUG -gt 0) {
- echo "DEBUG:${error_message}"
+ $MYTIME=Get-Date -Format o
+ echo "${MYTIME} DEBUG:${error_message}"
}
}
@@ -384,11 +385,17 @@ Param(
else {
$assysdbaconnect=""
}
- #$TNSALIAS="$the_host`:$the_port/$sqlsid"
$UPPER_SID=$sqlsid.toupper()
- $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"
+
+ # 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"
+ }
debug_echo "value of sql_connect in dbuser = $SQL_CONNECT"
} else {
debug_echo "DBUSER is not defined"
@@ -1269,7 +1276,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, 50)
+$Host.UI.RawUI.BufferSize = New-Object Management.Automation.Host.Size (512, 150)
# 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
@@ -1420,6 +1427,10 @@ 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"
Module: check_mk
Branch: master
Commit: 413dbeb2c40d39db049fab7b250ff7f410e19cb1
URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=413dbeb2c40d39…
Author: Lars Michelsen <lm(a)mathias-kettner.de>
Date: Mon Nov 28 09:36:58 2016 +0100
4075 Activate Changes has been reworked
The activate changes dialog of WATO has been reworked to improve several things:
<ul>
<li>It is now possible to add a comment during an activation. This optional comment
is written to the audit log and can be used to document the logical reason for
the changes you have made.</li>
<li>Several activations can now run in parallel while they not affect the same site.
This means that on each site one activation can be executed at the same time.</li>
<li>Pending changes are now correctly acknowledged. In previous version when you started
an activating, made a change during the run, the run acknowledged this just created
change even if it has not been activated by the just finished activation run.</li>
<li>Pending changes are now tracked for each site individually. Previous version only
knew whether or not a change has been activated on <i>all</i> sites.</li>
<li>Fixed locking problems during activation leading to possible issues when multiple
users execute activations in parallel.</li>
<li>You can now select a custom collection of sites and activate them in a bulk.</li>
</ul>
---
.werks/4075 | 25 +++++++++++++++++++++++++
ChangeLog | 1 +
2 files changed, 26 insertions(+)
diff --git a/.werks/4075 b/.werks/4075
new file mode 100644
index 0000000..1da3a63
--- /dev/null
+++ b/.werks/4075
@@ -0,0 +1,25 @@
+Title: Activate Changes has been reworked
+Level: 2
+Component: wato
+Compatible: compat
+Version: 1.4.0i3
+Date: 1480321696
+Class: feature
+
+The activate changes dialog of WATO has been reworked to improve several things:
+
+<ul>
+ <li>It is now possible to add a comment during an activation. This optional comment
+ is written to the audit log and can be used to document the logical reason for
+ the changes you have made.</li>
+ <li>Several activations can now run in parallel while they not affect the same site.
+ This means that on each site one activation can be executed at the same time.</li>
+ <li>Pending changes are now correctly acknowledged. In previous version when you started
+ an activating, made a change during the run, the run acknowledged this just created
+ change even if it has not been activated by the just finished activation run.</li>
+ <li>Pending changes are now tracked for each site individually. Previous version only
+ knew whether or not a change has been activated on <i>all</i> sites.</li>
+ <li>Fixed locking problems during activation leading to possible issues when multiple
+ users execute activations in parallel.</li>
+ <li>You can now select a custom collection of sites and activate them in a bulk.</li>
+</ul>
diff --git a/ChangeLog b/ChangeLog
index cb6ec53..5896fc2 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -47,6 +47,7 @@
WATO:
* 3984 Permissions can now be filtered by providing a search term on the "edit role" page...
* 4044 Display host/service notification delay with d/h/m/s, not with fractions of minute
+ * 4075 Activate Changes has been reworked...
* 4039 FIX: Fix UnicodeEncodeError exception in WATO folder display...
* 4041 FIX: Fix exception when editing global configuration settings...
* 3975 FIX: Improved error handling when trying to edit not existing global setting