Checkmk git commits May 2015

checkmk-commits@lists.checkmk.com

7 participants
200 discussions

Check_MK Git: check_mk: updated werk description

by Andreas Boesl

Module: check_mk Branch: master Commit: 84bc89f39532ba4344d99aeff0f63cac979e3847 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=84bc89f39532ba… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Tue May 19 17:41:22 2015 +0200 updated werk description --- .werks/2275 | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.werks/2275 b/.werks/2275 index 554ce13..13400b1 100644 --- a/.werks/2275 +++ b/.werks/2275 @@ -10,8 +10,8 @@ The windows agent now comes with the following folders <table> <tr><th>Folder</th><th>Description</th></tr> -<tr><td>local</td>local scripts<td></td></tr> -<tr><td>plugins</td>plugin scripts<td></td></tr> +<tr><td>local</td><td>local scripts</td></tr> +<tr><td>plugins</td><td>plugin scripts</td></tr> <tr><td>config</td><td>configuration files for scripts</td></tr> <tr><td>state</td><td>state files for scripts and the agent, e.g. logwatch state</td></tr> <tr><td>spool</td><td>spoolfiles from other applications</td>/tr>

9 years, 1 month

Check_MK Git: check_mk: updated werk description

by Andreas Boesl

Module: check_mk Branch: master Commit: a1697dd1dfaf09912380607a60f38a000539d334 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=a1697dd1dfaf09… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Tue May 19 17:40:27 2015 +0200 updated werk description --- .werks/2275 | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.werks/2275 b/.werks/2275 index cba4ab7..554ce13 100644 --- a/.werks/2275 +++ b/.werks/2275 @@ -15,8 +15,8 @@ The windows agent now comes with the following folders <tr><td>config</td><td>configuration files for scripts</td></tr> <tr><td>state</td><td>state files for scripts and the agent, e.g. logwatch state</td></tr> <tr><td>spool</td><td>spoolfiles from other applications</td>/tr> -<tr><td>log</td>logfiles from scripts and the agent<td></td></tr> -<tr><td>temp</td>working directory for scripts<td></td></tr> +<tr><td>log</td><td>logfiles from scripts and the agent</td></tr> +<tr><td>temp</td><td>working directory for scripts</td></tr> </table> When you update the agent to a newer version, the content of this folders will not get deleted.

9 years, 1 month

Check_MK Git: check_mk: #2276 mk_inventory.ps1: now uses directory ./ state for its statefiles

by Andreas Boesl

Module: check_mk Branch: master Commit: 46fe9362f092ce2e82ab021380d9da0008dc8b7b URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=46fe9362f092ce… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Tue May 19 17:30:41 2015 +0200 #2276 mk_inventory.ps1: now uses directory ./state for its statefiles --- .werks/2276 | 9 +++++++++ ChangeLog | 1 + agents/windows/plugins/mk_inventory.ps1 | 10 +++++----- 3 files changed, 15 insertions(+), 5 deletions(-) diff --git a/.werks/2276 b/.werks/2276 new file mode 100644 index 0000000..c682af3 --- /dev/null +++ b/.werks/2276 @@ -0,0 +1,9 @@ +Title: mk_inventory.ps1: now uses directory ./state for its statefiles +Level: 1 +Component: checks +Compatible: compat +Version: 1.2.7i1 +Date: 1432049391 +Class: feature + + diff --git a/ChangeLog b/ChangeLog index 18afc18..33f487c 100644 --- a/ChangeLog +++ b/ChangeLog @@ -181,6 +181,7 @@ * 2274 windows agent: "check_mk_agent.exe test" now also outputs stderr of plugins... * 2275 windows agent: new subfolders, improved folder cleanup during uninstall... NOTE: Please refer to the migration notes! + * 2276 mk_inventory.ps1: now uses directory ./state for its statefiles * 1457 FIX: logins: new check renamed from "users" check... NOTE: Please refer to the migration notes! * 1762 FIX: lnx_thermal: Now ignoring trip points with level 0... diff --git a/agents/windows/plugins/mk_inventory.ps1 b/agents/windows/plugins/mk_inventory.ps1 index 3f0f0c7..a9b1b64 100644 --- a/agents/windows/plugins/mk_inventory.ps1 +++ b/agents/windows/plugins/mk_inventory.ps1 @@ -10,14 +10,14 @@ $name = (Get-Item env:\Computername).Value $separator = "|" # filename for timestamp $remote_host = $env:REMOTE_HOST -$agent_dir = $env:MK_CONFDIR +$state_dir = $env:MK_STATEDIR -# Fallback if the (old) agent does not provide the MK_CONFDIR -if (!$agent_dir) { - $agent_dir = "c:\Program Files (x86)\check_mk" +# Fallback if the (old) agent does not provide the MK_STATEDIR +if (!$state_dir) { + $state_dir = "c:\Program Files (x86)\check_mk\state" } -$timestamp = $agent_dir + "\timestamp."+ $remote_host +$timestamp = $state_dir + "\timestamp."+ $remote_host # does $timestamp exist? If (Test-Path $timestamp){

9 years, 1 month

Check_MK Git: check_mk: #2277 mk_oracle.ps1: changed location of config file

by Andreas Boesl

Module: check_mk Branch: master Commit: 7c63f56b08bc2a3f8447540a799681e2516cb929 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=7c63f56b08bc2a… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Tue May 19 17:33:29 2015 +0200 #2277 mk_oracle.ps1: changed location of config file The config file mk_oracle_cfg.ps1 is now located in the agents subdirectory config. You need to manually move the configuration from the agents base dir into the config dir. --- .werks/2277 | 12 ++++++++++++ ChangeLog | 2 ++ agents/windows/plugins/mk_oracle.ps1 | 8 +++++++- 3 files changed, 21 insertions(+), 1 deletion(-) diff --git a/.werks/2277 b/.werks/2277 new file mode 100644 index 0000000..4ebe0a0 --- /dev/null +++ b/.werks/2277 @@ -0,0 +1,12 @@ +Title: mk_oracle.ps1: changed location of config file +Level: 1 +Component: checks +Compatible: incomp +Version: 1.2.7i1 +Date: 1432049452 +Class: feature + +The config file mk_oracle_cfg.ps1 is now located in the agents +subdirectory config. You need to manually move the configuration from +the agents base dir into the config dir. + diff --git a/ChangeLog b/ChangeLog index 33f487c..0457fa8 100644 --- a/ChangeLog +++ b/ChangeLog @@ -182,6 +182,8 @@ * 2275 windows agent: new subfolders, improved folder cleanup during uninstall... NOTE: Please refer to the migration notes! * 2276 mk_inventory.ps1: now uses directory ./state for its statefiles + * 2277 mk_oracle.ps1: changed location of config file... + NOTE: Please refer to the migration notes! * 1457 FIX: logins: new check renamed from "users" check... NOTE: Please refer to the migration notes! * 1762 FIX: lnx_thermal: Now ignoring trip points with level 0... diff --git a/agents/windows/plugins/mk_oracle.ps1 b/agents/windows/plugins/mk_oracle.ps1 index 52e4750..29bc33b 100644 --- a/agents/windows/plugins/mk_oracle.ps1 +++ b/agents/windows/plugins/mk_oracle.ps1 @@ -127,8 +127,14 @@ Param( } } +# filename for timestamp +$MK_CONFDIR = $env:MK_CONFDIR + +# Fallback if the (old) agent does not provide the MK_CONFDIR +if (!$MK_CONFDIR) { + $MK_CONFDIR= "c:\Program Files (x86)\check_mk\config" +} -$MK_CONFDIR="C:\Program Files (x86)\check_mk" # Source the optional configuration file for this agent plugin $CONFIG_FILE="${MK_CONFDIR}\mk_oracle_cfg.ps1" if (test-path -path "${CONFIG_FILE}" ) {

9 years, 1 month

Check_MK Git: check_mk: WATO: Fix two exceptions in case of discovery errors

by Mathias Kettner

Module: check_mk Branch: master Commit: 14d71dfc115a44319a2d089520d185412cf4260e URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=14d71dfc115a44… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Tue May 19 17:28:21 2015 +0200 WATO: Fix two exceptions in case of discovery errors --- web/htdocs/wato.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/web/htdocs/wato.py b/web/htdocs/wato.py index a1b4bd9..41c7734 100644 --- a/web/htdocs/wato.py +++ b/web/htdocs/wato.py @@ -3744,7 +3744,7 @@ def mode_bulk_inventory(phase): host = folder[".hosts"][hostname] if hostname in failed_hosts: result_txt += _("Failed to inventorize %s: %s ") % (hostname, failed_hosts[hostname]) - if not host.get("inventory_failed") and not hosts.get(".folder", {}).get("_lock_hosts"): + if not host.get("inventory_failed") and not host.get(".folder", {}).get("_lock_hosts"): host["inventory_failed"] = True save_hosts(folder) else: @@ -3754,7 +3754,7 @@ def mode_bulk_inventory(phase): _("Inventorized host: %d added, %d removed, %d kept, %d total services") % tuple(counts[hostname])) - if "inventory_failed" in host and not hosts.get(".folder", {}).get("_lock_hosts"): + if "inventory_failed" in host and not host.get(".folder", {}).get("_lock_hosts"): del host["inventory_failed"] save_hosts(folder) # Could be optimized, but difficult here

9 years, 1 month

Check_MK Git: check_mk: Updated bug entries #2334

by Mathias Kettner

Module: check_mk Branch: master Commit: 54643c9de7a3d2df061d5537a7f07b00ec4e10c4 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=54643c9de7a3d2… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Tue May 19 17:21:27 2015 +0200 Updated bug entries #2334 --- .bugs/2334 | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/.bugs/2334 b/.bugs/2334 new file mode 100644 index 0000000..b8dd320 --- /dev/null +++ b/.bugs/2334 @@ -0,0 +1,13 @@ +Title: WATO check group cpu_load cannot parse default levels of cpu.loads checks +Component: checks +State: open +Date: 2015-05-19 17:20:10 +Targetversion: 1.2.6 +Class: bug + +If you enabled the display of the check parameters in the WATO services +view then an error is being displayed: + +Invalid check parameter: The data type of the value does not match any +of the allowed alternatives.! The parameter is: (5, 10) The varname is: +checkgroup_parameters:cpu_load

9 years, 1 month

Check_MK Git: check_mk: #2230 FIX Fix two exceptions in case of errors during bulk discovery

by Mathias Kettner

Module: check_mk Branch: master Commit: 3e0f3dbbff3adba05319994efcf115318afac18b URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=3e0f3dbbff3adb… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Tue May 19 17:29:09 2015 +0200 #2230 FIX Fix two exceptions in case of errors during bulk discovery --- .werks/2230 | 10 ++++++++++ ChangeLog | 1 + 2 files changed, 11 insertions(+) diff --git a/.werks/2230 b/.werks/2230 new file mode 100644 index 0000000..c8e7428 --- /dev/null +++ b/.werks/2230 @@ -0,0 +1,10 @@ +Title: Fix two exceptions in case of errors during bulk discovery +Level: 2 +Component: wato +Class: fix +Compatible: compat +State: unknown +Version: 1.2.7i1 +Date: 1432049324 + + diff --git a/ChangeLog b/ChangeLog index 10f0137..7b0d6ea 100644 --- a/ChangeLog +++ b/ChangeLog @@ -499,6 +499,7 @@ * 2244 FIX: Fixed sorting of host tag topics in dropdown selections * 2263 FIX: Bulk service discovery: Fixed error when doing bulk inventory on locked folders... * 2254 FIX: Fixed error message in parameter columns of discovered services... + * 2230 FIX: Fix two exceptions in case of errors during bulk discovery Notifications: * 1662 notification plugin spectrum: finalized script. now able to handle host notications

9 years, 1 month

Check_MK Git: check_mk: The windows agent now comes with the following folders

by Andreas Boesl

Module: check_mk Branch: master Commit: 146ceb2d3a5955042f28b021f5ad419cc94f2cc0 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=146ceb2d3a5955… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Tue May 19 16:03:34 2015 +0200 The windows agent now comes with the following folders <table> <tr><th>Folder</th><th>Description</th></tr> <tr><td>local</td>local scripts<td></td></tr> <tr><td>plugins</td>plugin scripts<td></td></tr> <tr><td>config</td><td>configuration files for scripts</td></tr> <tr><td>state</td><td>state files for scripts and the agent, e.g. logwatch state</td></tr> <tr><td>spool</td><td>spoolfiles from other applications</td>/tr> <tr><td>log</td>logfiles from scripts and the agent<td></td></tr> <tr><td>temp</td>working directory for scripts<td></td></tr> </table> When you update the agent to a newer version, the content of this folders will not get deleted. Only during the uninstall everything is cleaned up, with two exceptions. Self-written scripts in the local and plugin folders are not automatically deleted during uninstall. These files will linger around till you remove them manually. The incompatible part of this werk is the changed location of the state files for the logwatch and logfiles checks. These files were located in the agent directory, now they are located in the subdirectory state. As a result, if you start the new agent there will be no known last offsets of the logwatch and the eventlog monitoring. In this scenario the agent will start at the end. If you want to start at the old offsets, you need to copy the files logstate.txt and eventstate.txt into the state directory. --- .werks/2275 | 34 ++++++++++ ChangeLog | 2 + agents/windows/build_version | 2 +- agents/windows/check_mk_agent-64.exe | Bin 301056 -> 301568 bytes agents/windows/check_mk_agent-64.unversioned.exe | Bin 301056 -> 301568 bytes agents/windows/check_mk_agent.cc | 74 +++++++++++++++++----- agents/windows/check_mk_agent.exe | Bin 182784 -> 183808 bytes agents/windows/check_mk_agent.msi | Bin 732160 -> 734208 bytes agents/windows/check_mk_agent.unversioned.exe | Bin 182784 -> 183808 bytes agents/windows/install_agent-64.exe | Bin 178461 -> 178942 bytes agents/windows/install_agent.exe | Bin 159422 -> 159862 bytes agents/windows/msibuild/vanilla_container.msi | Bin 730624 -> 731136 bytes 12 files changed, 95 insertions(+), 17 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=146ceb2d3a…

9 years, 1 month

Check_MK Git: check_mk: Fixed order of matching criteria in notification rules

by Mathias Kettner

Module: check_mk Branch: master Commit: 43279ca606ebfeff1f3d9c8ef0dee8293fb9f775 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=43279ca606ebfe… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Tue May 19 15:37:59 2015 +0200 Fixed order of matching criteria in notification rules --- web/htdocs/wato.py | 76 +++++++++++++++++++++++++++------------------------- 1 file changed, 40 insertions(+), 36 deletions(-) diff --git a/web/htdocs/wato.py b/web/htdocs/wato.py index 2c223bc..0ed5f69 100644 --- a/web/htdocs/wato.py +++ b/web/htdocs/wato.py @@ -8339,7 +8339,7 @@ def vs_notification_rule(userid = None): ] return Dictionary( - title = _("Rule Properties"), + title = _("General Properties"), elements = rule_option_elements() + section_override + [ @@ -8378,6 +8378,13 @@ def vs_notification_rule(userid = None): orientation = "horizontal", ) ), + ( "match_servicegroups", + GroupChoice("service", + title = _("Match Service Groups"), + help = _("The service must be in one of the selected service groups"), + allow_empty = False, + ) + ), ( "match_services", ListOfStrings( title = _("Match only the following services"), @@ -8390,13 +8397,27 @@ def vs_notification_rule(userid = None): empty_text = _("Please specify at least one service regex. Disable the option if you want to allow all services."), ) ), - ( "match_servicegroups", - GroupChoice("service", - title = _("Match Service Groups"), - help = _("The service must be in one of the selected service groups"), - allow_empty = False, + ( "match_exclude_services", + ListOfStrings( + title = _("Exclude the following services"), + valuespec = TextUnicode(size = 32), + orientation = "horizontal", + ) + ), + ( "match_checktype", + CheckTypeSelection( + title = _("Match the following check types"), + help = _("Only apply the rule if the notification originates from certain types of check plugins. " + "Note: Host notifications never match this rule if this option is being used."), ) ), + ( "match_plugin_output", + RegExp( + title = _("Match the output of the check plugin"), + help = _("This text is a regular expression that is being searched in the output " + "of the check plugins that produced the alert. It is not a prefix but an infix match."), + ), + ), ( "match_contacts", ListOf( UserSelection(only_contacts = True), @@ -8409,33 +8430,12 @@ def vs_notification_rule(userid = None): ), ( "match_contactgroups", GroupChoice("contact", - title = _("Match Contact Groups (CMC only)"), + title = _("Match Contact Groups"), help = _("The host/service must be in one of the selected contact groups. This only works with Check_MK Micro Core. " \ "If you don't use the CMC that filter will not apply"), allow_empty = False, ) ), - ( "match_exclude_services", - ListOfStrings( - title = _("Do not match the following services"), - valuespec = TextUnicode(size = 32), - orientation = "horizontal", - ) - ), - ( "match_plugin_output", - RegExp( - title = _("Match the output of the check plugin"), - help = _("This text is a regular expression that is being searched in the output " - "of the check plugins that produced the alert. It is not a prefix but an infix match."), - ), - ), - ( "match_checktype", - CheckTypeSelection( - title = _("Match the following check types"), - help = _("Only apply the rule if the notification originates from certain types of check plugins. " - "Note: Host notifications never match this rule if this option is being used."), - ) - ), ( "match_timeperiod", TimeperiodSelection( title = _("Match only during timeperiod"), @@ -8689,20 +8689,24 @@ def vs_notification_rule(userid = None): ], optional_keys = [ "match_folder", "match_hosttags", "match_hostgroups", "match_hosts", "match_exclude_hosts", - "match_services", "match_servicegroups", "match_contacts", "match_contactgroups", - "match_exclude_services", "match_plugin_output", + "match_servicegroups", "match_services", "match_exclude_services", + "match_contacts", "match_contactgroups", + "match_plugin_output", "match_timeperiod", "match_escalation", "match_escalation_throttle", "match_sl", "match_host_event", "match_service_event", "match_ec", "match_notification_comment", "match_checktype", "bulk", "contact_users", "contact_groups", "contact_emails", "contact_match_macros" ], headers = [ - ( _("Rule Properties"), [ "description", "comment", "disabled", "docu_url", "allow_disable" ] ), + ( _("General Properties"), [ "description", "comment", "disabled", "docu_url", "allow_disable" ] ), ( _("Notification Method"), [ "notify_plugin", "notify_method", "bulk" ] ),] + contact_headers + [ - ( _("Conditions"), [ "match_folder", "match_hosttags", "match_hostgroups", "match_hosts", "match_exclude_hosts", - "match_services", "match_servicegroups", "match_contacts", "match_contactgroups", - "match_exclude_services", "match_plugin_output", - "match_checktype", "match_timeperiod", + ( _("Conditions"), [ "match_folder", "match_hosttags", "match_hostgroups", + "match_hosts", "match_exclude_hosts", + "match_servicegroups", "match_services", "match_exclude_services", + "match_checktype", + "match_contacts", "match_contactgroups", + "match_plugin_output", + "match_timeperiod", "match_escalation", "match_escalation_throttle", "match_sl", "match_host_event", "match_service_event", "match_ec", "match_notification_comment" ] ), ], @@ -17273,7 +17277,7 @@ def mode_bi_edit_rule(phase): )] + elements vs_rule = Dictionary( - title = _("Rule Properties"), + title = _("General Properties"), optional_keys = False, render = "form", elements = elements,

9 years, 1 month

Check_MK Git: check_mk: windows agent: updated msi templates for vanilla and baked container

by Andreas Boesl

Module: check_mk Branch: master Commit: 901b4bec2afea393104bdb4a814e30119d7da670 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=901b4bec2afea3… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Tue May 19 15:29:29 2015 +0200 windows agent: updated msi templates for vanilla and baked container --- doc/treasures/windows_msi/check_mk_agent_baked.wxs | 28 +++++++++++++++----- .../windows_msi/check_mk_agent_vanilla.wxs | 26 ++++++++++++++---- 2 files changed, 43 insertions(+), 11 deletions(-) diff --git a/doc/treasures/windows_msi/check_mk_agent_baked.wxs b/doc/treasures/windows_msi/check_mk_agent_baked.wxs index 5b7c47c..95c42d5 100644 --- a/doc/treasures/windows_msi/check_mk_agent_baked.wxs +++ b/doc/treasures/windows_msi/check_mk_agent_baked.wxs @@ -81,6 +81,20 @@ Impersonate="no" Return ="ignore"/> + <CustomAction Id="create_custom_folders" + Directory ="INSTALLDIR" + ExeCommand ='"[SystemFolder]\Cmd.exe" /c mkdir "[INSTALLDIR]state" "[INSTALLDIR]config" "[INSTALLDIR]log" "[INSTALLDIR]temp" "[INSTALLDIR]spool"' + Execute ="deferred" + Impersonate="no" + Return ="ignore"/> + + <CustomAction Id="remove_custom_folders" + Directory ="INSTALLDIR" + ExeCommand ='"[SystemFolder]\Cmd.exe" /c rmdir /s /q "[INSTALLDIR]state" "[INSTALLDIR]config" "[INSTALLDIR]log" "[INSTALLDIR]temp" "[INSTALLDIR]spool"' + Execute ="deferred" + Impersonate="no" + Return ="ignore"/> + <CustomAction Id="uninstall_plugins" Directory ="INSTALLDIR" ExeCommand ='[INSTALLDIR]uninstall_plugins.bat' @@ -103,15 +117,17 @@ Return ="ignore"/> <InstallExecuteSequence> - <Custom Action="unpack_plugins" Before="InstallFinalize">NOT REMOVE="ALL"</Custom> - <Custom Action="install_service" Before="InstallFinalize">NOT REMOVE="ALL" AND INSTALLSERVICE</Custom> - <Custom Action="start_service" Before="InstallFinalize">NOT REMOVE="ALL" AND INSTALLSERVICE</Custom> + <Custom Action="create_custom_folders" Sequence="6569" >NOT REMOVE="ALL"</Custom> + <Custom Action="unpack_plugins" Sequence="6579" >NOT REMOVE="ALL"</Custom> + <Custom Action="install_service" Sequence="6589" >NOT REMOVE="ALL" AND INSTALLSERVICE</Custom> + <Custom Action="start_service" Sequence="6599" >NOT REMOVE="ALL" AND INSTALLSERVICE</Custom> </InstallExecuteSequence> <InstallExecuteSequence> - <Custom Action="stop_service" After="InstallInitialize">REMOVE="ALL"</Custom> - <Custom Action='uninstall_service' After='InstallInitialize'>REMOVE="ALL"</Custom> - <Custom Action='uninstall_plugins' After='InstallInitialize'>REMOVE="ALL"</Custom> + <Custom Action="stop_service" Sequence="1501" >REMOVE="ALL"</Custom> + <Custom Action='uninstall_service' Sequence="1502" >REMOVE="ALL"</Custom> + <Custom Action='uninstall_plugins' Sequence="1503" >REMOVE="ALL"</Custom> + <Custom Action='remove_custom_folders' Sequence="1504" >(NOT UPGRADINGPRODUCTCODE) AND (REMOVE="ALL")</Custom> </InstallExecuteSequence> <DirectoryRef Id="INSTALLDIR"> diff --git a/doc/treasures/windows_msi/check_mk_agent_vanilla.wxs b/doc/treasures/windows_msi/check_mk_agent_vanilla.wxs index f67971f..e1b8972 100644 --- a/doc/treasures/windows_msi/check_mk_agent_vanilla.wxs +++ b/doc/treasures/windows_msi/check_mk_agent_vanilla.wxs @@ -74,6 +74,20 @@ Impersonate="no" Return ="ignore"/> + <CustomAction Id="create_custom_folders" + Directory ="INSTALLDIR" + ExeCommand ='"[SystemFolder]\Cmd.exe" /c mkdir "[INSTALLDIR]state" "[INSTALLDIR]config" "[INSTALLDIR]log" "[INSTALLDIR]temp" "[INSTALLDIR]spool"' + Execute ="deferred" + Impersonate="no" + Return ="ignore"/> + + <CustomAction Id="remove_custom_folders" + Directory ="INSTALLDIR" + ExeCommand ='"[SystemFolder]\Cmd.exe" /c rmdir /s /q "[INSTALLDIR]state" "[INSTALLDIR]config" "[INSTALLDIR]log" "[INSTALLDIR]temp" "[INSTALLDIR]spool"' + Execute ="deferred" + Impersonate="no" + Return ="ignore"/> + <CustomAction Id="uninstall_plugins" Directory ="INSTALLDIR" ExeCommand ='[INSTALLDIR]uninstall_plugins.bat' @@ -96,14 +110,16 @@ Return ="ignore"/> <InstallExecuteSequence> - <Custom Action="install_service" Before="InstallFinalize">NOT REMOVE="ALL" AND INSTALLSERVICE</Custom> - <Custom Action="start_service" Before="InstallFinalize">NOT REMOVE="ALL" AND INSTALLSERVICE</Custom> + <Custom Action="create_custom_folders" Sequence="6588" >NOT REMOVE="ALL"</Custom> + <Custom Action="install_service" Sequence="6589" >NOT REMOVE="ALL" AND INSTALLSERVICE</Custom> + <Custom Action="start_service" Sequence="6599" >NOT REMOVE="ALL" AND INSTALLSERVICE</Custom> </InstallExecuteSequence> <InstallExecuteSequence> - <Custom Action="stop_service" After="InstallInitialize">REMOVE="ALL"</Custom> - <Custom Action='uninstall_service' After='InstallInitialize'>REMOVE="ALL"</Custom> - <Custom Action='uninstall_plugins' After='InstallInitialize'>REMOVE="ALL"</Custom> + <Custom Action="stop_service" Sequence="1501" >REMOVE="ALL"</Custom> + <Custom Action='uninstall_service' Sequence="1502" >REMOVE="ALL"</Custom> + <Custom Action='uninstall_plugins' Sequence="1503" >REMOVE="ALL"</Custom> + <Custom Action='remove_custom_folders' Sequence="1504" >(NOT UPGRADINGPRODUCTCODE) AND (REMOVE="ALL")</Custom> </InstallExecuteSequence> <DirectoryRef Id="INSTALLDIR">

9 years, 1 month

← Newer
1
...
6
7
8
9
10
11
12
...
20
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits May 2015