Checkmk git commits September 2011

checkmk-commits@lists.checkmk.com

3 participants
125 discussions

Check_MK Git: check_mk: Merge branch 'master' of ssh://git.mathias-kettner. de/var/www/80/git.mathias-kettner.de/check_mk

by lm＠mathias-kettner.de

Module: check_mk Branch: master Commit: 7aa6dcac6749f2cf2cec20f031d816ced4a4c709 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=7aa6dcac6749f2… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Thu Sep 8 11:55:24 2011 +0200 Merge branch 'master' of ssh://git.mathias-kettner.de/var/www/80/git.mathias-kettner.de/check_mk ---

13 years

Check_MK Git: check_mk: Updated bug entries

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: f0665745bd7f8f77958dfabc707958e4d77754d0 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=f0665745bd7f8f… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Thu Sep 8 10:56:44 2011 +0200 Updated bug entries --- .bugs/368 | 13 +++++++++++++ 1 files changed, 13 insertions(+), 0 deletions(-) diff --git a/.bugs/368 b/.bugs/368 new file mode 100644 index 0000000..5ea3bfb --- /dev/null +++ b/.bugs/368 @@ -0,0 +1,13 @@ +Title: WATO: implement finer permissions +Component: wato +Benefit: 2 +State: open +Cost: 2 +Date: 2011-09-08 10:55:44 +Class: feature + +I think we need or finely granular permission +system, for example permissions for +- downloading backups +- restoring backups +- restarting nagios

13 years

Check_MK Git: check_mk: Minor fixes in WATO

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 6ddcff590fbb215de2f6cc97f995102aebed5a30 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=6ddcff590fbb21… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Thu Sep 8 11:05:48 2011 +0200 Minor fixes in WATO --- web/htdocs/wato.py | 22 +++++++++++++--------- 1 files changed, 13 insertions(+), 9 deletions(-) diff --git a/web/htdocs/wato.py b/web/htdocs/wato.py index d44c016..32b4de4 100644 --- a/web/htdocs/wato.py +++ b/web/htdocs/wato.py @@ -463,9 +463,12 @@ def mode_editfolder(phase, what, new): if new: attributes = { } parent = g_folder - else: + elif the_what == "folder": attributes = the_thing.get("attributes", {}) parent = g_folder.get(".parent") + else: # host list from current folder + attributes = the_thing.get("attributes", {}) + parent = g_folder configure_attributes({what: attributes}, "folder", parent, the_thing) @@ -979,13 +982,6 @@ def mode_snapshot(phase): snapshots.append(f) snapshots.sort(reverse=True) - html.write("<br>") - html.begin_form("upload_form", None, "POST") - html.upload_file("_upload_file") - html.button("upload_button", _("Restore from file"), "submit") - html.hidden_fields() - html.end_form() - if len(snapshots) == 0: html.write("<div class=info>" + _("There are no snapshots available.") + "</div>") else: @@ -1002,6 +998,14 @@ def mode_snapshot(phase): html.write('<a href="%s">%s</a>' % (make_action_link([("mode","snapshot"),("_download_file", name)]), name)) html.write('</table>') + html.write("<h3>" + _("Restore from uploaded file") + "</h3>") + html.begin_form("upload_form", None, "POST") + html.upload_file("_upload_file") + html.button("upload_button", _("Restore from file"), "submit") + html.hidden_fields() + html.end_form() + + def create_snapshot(): if not os.path.exists(snapshot_dir): os.mkdir(snapshot_dir) @@ -1015,7 +1019,7 @@ def create_snapshot(): tar.add(os.path.join(root,filename), os.path.join(root[len_abs:], filename)) tar.close() - log_pending(None, "snapshot-created", _("Created snapshot %s") % snapshot_name) + log_audit(None, "snapshot-created", _("Created snapshot %s") % snapshot_name) # Maintenance, remove old snapshots snapshots = []

13 years

Check_MK Git: check_mk: WATO: fix problem in import function

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 1d0d6cd5286027ff5876b5e539b7c7d2353be030 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=1d0d6cd5286027… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Thu Sep 8 11:07:11 2011 +0200 WATO: fix problem in import function --- web/htdocs/wato.py | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/web/htdocs/wato.py b/web/htdocs/wato.py index 32b4de4..16ba1e4 100644 --- a/web/htdocs/wato.py +++ b/web/htdocs/wato.py @@ -1270,7 +1270,7 @@ def create_target_file_from_aliaspath(aliaspath): # Now folder points to the folder the host needs to be created # in. In that folder we put the host into the host list "hosts.mk". - if "hosts" not in folder[".files"]: + if "hosts.mk" not in folder[".files"]: new_file = { ".name" : "hosts.mk", ".path" : folder[".path"] + ("hosts.mk",),

13 years

Check_MK Git: check_mk: Updated ChangeLog

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 425fb63284b9fc58f894b55676dfc0d5d21f18e1 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=425fb63284b9fc… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Thu Sep 8 10:49:58 2011 +0200 Updated ChangeLog --- ChangeLog | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/ChangeLog b/ChangeLog index f985438..46e674f 100644 --- a/ChangeLog +++ b/ChangeLog @@ -41,6 +41,7 @@ * Changed row selection in WATO to new row selection mechanism * Bulk action buttons are shown at the top of hostlists too when the lists have more than 10 list items + * New function for backup and restore of the configuration Livestatus: * FIX: fix compile error in TableLog.cc by including stddef.h

13 years

Check_MK Git: check_mk: Backup/Restore von wato snapshots

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: e1e46406d43d3ee8b7cfb6528f123e0801de0baf URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=e1e46406d43d3e… Author: Andreas Boesl <boesl(a)linux.fritz.box> Date: Thu Sep 8 09:17:04 2011 +0200 Backup/Restore von wato snapshots --- web/htdocs/config.py | 3 + web/htdocs/wato.py | 160 ++++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 163 insertions(+), 0 deletions(-) diff --git a/web/htdocs/config.py b/web/htdocs/config.py index 997c2b4..547b341 100644 --- a/web/htdocs/config.py +++ b/web/htdocs/config.py @@ -455,6 +455,9 @@ filter_columns = 2 # Default language for l10n default_language = None +# Default preserved snapshots +max_snapshots = 50 + # __ ___ _____ ___ # \ \ / / \|_ _/ _ \ # \ \ /\ / / _ \ | || | | | diff --git a/web/htdocs/wato.py b/web/htdocs/wato.py index 09342b9..0dd06ad 100644 --- a/web/htdocs/wato.py +++ b/web/htdocs/wato.py @@ -48,6 +48,7 @@ config.declare_permission("use_wato", [ "admin", "user" ]) conf_dir = defaults.var_dir + "/wato" +snapshot_dir = conf_dir + "/snapshots" g_root_folder = None # pointer to root folder g_folder = None # pointer to current folder @@ -195,6 +196,7 @@ def mode_folder(phase): html.context_button(_("Properties"), make_link_to([("mode", "editfolder")], g_folder[".path"]), "properties") html.context_button(_("New folder"), make_link([("mode", "newfolder")]), "newfolder") html.context_button(_("New host list"), make_link([("mode", "newfile")]), "new") + html.context_button(_("Backup/Restore"), make_link([("mode", "snapshot")])) changelog_button() search_button() @@ -547,6 +549,7 @@ def mode_file(phase): html.context_button(_("Back"), make_link_to([("mode", "folder")], g_folder[".path"]), "back") html.context_button(_("Properties"), make_link_to([("mode", "editfile")], g_folder[".path"], g_file[".name"]), "properties") html.context_button(_("New host"), make_link([("mode", "newhost")]), "new") + html.context_button(_("Backup/Restore"), make_link([("mode", "snapshot")])) changelog_button() search_button() @@ -891,6 +894,161 @@ def mode_inventory(phase, firsttime): show_service_table(hostname, firsttime) # +----------------------------------------------------------------------+ +# | ____ _ _ | +# | / ___| _ __ __ _ _ __ ___| |__ ___ | |_ | +# | \___ \| '_ \ / _` | '_ \/ __| '_ \ / _ \| __| | +# | ___) | | | | (_| | |_) \__ \ | | | (_) | |_ | +# | |____/|_| |_|\__,_| .__/|___/_| |_|\___/ \__| | +# | |_| | +# +----------------------------------------------------------------------+ +# | Dialog for backup/restore/creation of snapshotsp | +# +----------------------------------------------------------------------+ + + +def mode_snapshot(phase): + if phase == "title": + return _("Backup/Restore") + elif phase == "buttons": + html.context_button(_("Back"), make_link([("mode", "folder")]), "back") + html.context_button(_("Create Snapshot"), make_action_link([("mode", "snapshot"),("create_snapshot","Yes")])) + return + elif phase == "action": + if html.has_var("download_file"): + download_file = os.path.join(snapshot_dir, html.var("download_file")) + if os.path.exists(download_file): + html.req.headers_out['Content-Disposition'] = 'Attachment; filename=' + html.var("download_file") + html.req.headers_out['content_type'] = 'application/x-tar' + html.write(open(download_file).read()) + return False + # create snapshot + elif html.has_var("create_snapshot"): + if html.check_transaction(): + create_snapshot() + return None, _("Snapshot created.") + else: + return None + # upload snapshot + elif html.has_var("upload_file"): + if html.check_transaction(): + restore_snapshot(None, html.var('upload_file')) + return None, _("Successfully uploaded configuration.") + else: + return None + # delete file + elif html.has_var("delete_file"): + delete_file = html.var("delete_file") + c = wato_confirm(_("Confirm delete snapshot"), + _("Are you sure you want to delete the snapshot <br><br>%s?") % + delete_file + ) + if c: + os.remove(os.path.join(snapshot_dir, delete_file)) + return None, _("Snapshot deleted.") + elif c == False: # not yet confirmed + return "" + else: + return None # browser reload + # restore snapshot + elif html.has_var("restore_snapshot"): + snapshot_file = html.var("restore_snapshot") + c = wato_confirm(_("Confirm restore snapshot"), + _("Are you sure you want to restore the snapshot <br><br>%s ?") % + snapshot_file + ) + if c: + restore_snapshot(snapshot_file) + return None, _("Snapshot restored.") + elif c == False: # not yet confirmed + return "" + else: + return None # browser reload + return False + else: + snapshots = [] + if os.path.exists(snapshot_dir): + for f in os.listdir(snapshot_dir): + snapshots.append(f) + snapshots.sort(reverse=True) + + html.begin_form("upload_form", None, "POST") + html.upload_file("upload_file") + html.button("upload_button", _("Restore from file"), "submit") + html.hidden_fields() + html.end_form() + html.write("<br><br>") + + if len(snapshots) == 0: + html.write("<div class=info>" + _("There are no snapshots available.") + "</div>") + else: + html.write('<table class=data>') + html.write('<h3>' + _("Snapshots") + '</h3>') + + odd = "odd" + for name in snapshots: + odd = odd == "odd" and "even" or "odd" + html.write('<tr class="data %s0"><td>' % odd) + html.buttonlink(make_action_link([("mode","snapshot"),("restore_snapshot", name)]), _("Restore")) + html.buttonlink(make_action_link([("mode","snapshot"),("delete_file", name)]), _("Delete")) + html.write("<td>") + html.write('<a href="%s">%s</a>' % (make_action_link([("mode","snapshot"),("download_file", name)]), name)) + html.write('</table>') + +def create_snapshot(): + if not os.path.exists(snapshot_dir): + os.mkdir(snapshot_dir) + + snapshot_name = "wato-snapshot-%s.tar.gz" % time.strftime("%Y-%m-%d-%H-%M-%S", time.localtime(time.time())) + tar = tarfile.open(os.path.join(snapshot_dir, snapshot_name),"w:gz") + + len_abs = len(defaults.check_mk_configdir) + for root, dirs, files in os.walk(defaults.check_mk_configdir): + for filename in files: + tar.add(os.path.join(root,filename), os.path.join(root[len_abs:], filename)) + tar.close() + + log_pending(None, "snapshot-created", _("Created snapshot %s") % snapshot_name) + + # Maintenance, remove old snapshots + snapshots = [] + for f in os.listdir(snapshot_dir): + snapshots.append(f) + snapshots.sort(reverse=True) + while len(snapshots) > config.max_snapshots: + log_pending(None, "snapshot-removed", _("Removed snapshot %s") % snapshots[-1]) + os.remove(os.path.join(snapshot_dir,snapshots.pop())) + +def restore_snapshot( filename, tarstream = None ): + if not os.path.exists(snapshot_dir): + os.mkdir(snapshot_dir) + + del_config_dir() + if filename: + if not os.path.exists(os.path.join(snapshot_dir, filename)): + raise MKGeneralException("Snapshot does not exist %s" % filename) + snapshot = tarfile.open(os.path.join(snapshot_dir, filename), "r:gz") + elif tarstream: + stream = StringIO.StringIO() + stream.write(tarstream) + stream.seek(0) + snapshot = tarfile.open(None, "r:gz", stream) + else: + return + + snapshot.extractall(defaults.omd_root) + snapshot.close() + log_pending(None, "snapshot-restored", _("Restored snapshot %s") % (filename or _('from uploaded file'))) + +def del_config_dir(): + if not defaults.check_mk_configdir.endswith("conf.d"): + raise MKGeneralException("ERROR: config directory seems incorrect. check_mk_configdir %s" % defaults.check_mk_configdir) + # Clear directories, DANGER + for root, dirs, files in os.walk(defaults.check_mk_configdir): + for f in files: + if (f.endswith('.mk') and not '.' in f[:-3]) or (f.endswith('.mk.wato') and not '.' in f[:-8]) or f == '.wato': + os.remove(os.path.join(root, f)) + + +# +----------------------------------------------------------------------+ # | ____ _ | # | / ___| ___ __ _ _ __ ___| |__ | # | \___ \ / _ \/ _` | '__/ __| '_ \ | @@ -1404,6 +1562,7 @@ def mode_changelog(phase): return export_audit_log() elif html.check_transaction(): + create_snapshot() try: check_mk_automation("restart") call_hook_activate_changes() @@ -3372,6 +3531,7 @@ mode_functions = { "bulkedit" : mode_bulk_edit, "bulkcleanup" : mode_bulk_cleanup, "changelog" : mode_changelog, + "snapshot" : mode_snapshot, "file" : mode_file, }

13 years

Check_MK Git: check_mk: Merge branch 'master' of ssh://mathias-kettner.de/ check_mk

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: afc982cd392f4c5d25e05e601d6fd769f448d560 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=afc982cd392f4c… Author: Andreas Boesl <boesl(a)linux.fritz.box> Date: Thu Sep 8 10:42:53 2011 +0200 Merge branch 'master' of ssh://mathias-kettner.de/check_mk ---

13 years

Check_MK Git: check_mk: snapshot. probleme beim reload / hidden_fields behoben

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 9d492eb15582021e71a2c1a1d11d435799ce1433 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=9d492eb1558202… Author: Andreas Boesl <boesl(a)linux.fritz.box> Date: Thu Sep 8 10:17:45 2011 +0200 snapshot. probleme beim reload / hidden_fields behoben --- web/htdocs/wato.py | 46 +++++++++++++++++++++++++--------------------- 1 files changed, 25 insertions(+), 21 deletions(-) diff --git a/web/htdocs/wato.py b/web/htdocs/wato.py index 0dd06ad..b060078 100644 --- a/web/htdocs/wato.py +++ b/web/htdocs/wato.py @@ -37,7 +37,7 @@ import config -import sys, pprint, socket, re, subprocess, time, datetime +import sys, pprint, socket, re, subprocess, time, datetime, tarfile, StringIO from lib import * import htmllib @@ -196,7 +196,7 @@ def mode_folder(phase): html.context_button(_("Properties"), make_link_to([("mode", "editfolder")], g_folder[".path"]), "properties") html.context_button(_("New folder"), make_link([("mode", "newfolder")]), "newfolder") html.context_button(_("New host list"), make_link([("mode", "newfile")]), "new") - html.context_button(_("Backup/Restore"), make_link([("mode", "snapshot")])) + html.context_button(_("Backup / Restore"), make_link([("mode", "snapshot")])) changelog_button() search_button() @@ -549,7 +549,7 @@ def mode_file(phase): html.context_button(_("Back"), make_link_to([("mode", "folder")], g_folder[".path"]), "back") html.context_button(_("Properties"), make_link_to([("mode", "editfile")], g_folder[".path"], g_file[".name"]), "properties") html.context_button(_("New host"), make_link([("mode", "newhost")]), "new") - html.context_button(_("Backup/Restore"), make_link([("mode", "snapshot")])) + html.context_button(_("Backup / Restore"), make_link([("mode", "snapshot")])) changelog_button() search_button() @@ -910,33 +910,37 @@ def mode_snapshot(phase): return _("Backup/Restore") elif phase == "buttons": html.context_button(_("Back"), make_link([("mode", "folder")]), "back") - html.context_button(_("Create Snapshot"), make_action_link([("mode", "snapshot"),("create_snapshot","Yes")])) + html.context_button(_("Create Snapshot"), make_action_link([("mode", "snapshot"),("_create_snapshot","Yes")])) return elif phase == "action": - if html.has_var("download_file"): - download_file = os.path.join(snapshot_dir, html.var("download_file")) + if html.has_var("_download_file"): + download_file = os.path.join(snapshot_dir, html.var("_download_file")) if os.path.exists(download_file): - html.req.headers_out['Content-Disposition'] = 'Attachment; filename=' + html.var("download_file") + html.req.headers_out['Content-Disposition'] = 'Attachment; filename=' + html.var("_download_file") html.req.headers_out['content_type'] = 'application/x-tar' html.write(open(download_file).read()) return False # create snapshot - elif html.has_var("create_snapshot"): + elif html.has_var("_create_snapshot"): if html.check_transaction(): create_snapshot() return None, _("Snapshot created.") else: return None # upload snapshot - elif html.has_var("upload_file"): + elif html.has_var("_upload_file"): + if html.var("_upload_file") == "": + raise MKUserError(None, _("You need to select a file for upload")) + + return None if html.check_transaction(): - restore_snapshot(None, html.var('upload_file')) + restore_snapshot(None, html.var('_upload_file')) return None, _("Successfully uploaded configuration.") else: return None # delete file - elif html.has_var("delete_file"): - delete_file = html.var("delete_file") + elif html.has_var("_delete_file"): + delete_file = html.var("_delete_file") c = wato_confirm(_("Confirm delete snapshot"), _("Are you sure you want to delete the snapshot <br><br>%s?") % delete_file @@ -949,8 +953,8 @@ def mode_snapshot(phase): else: return None # browser reload # restore snapshot - elif html.has_var("restore_snapshot"): - snapshot_file = html.var("restore_snapshot") + elif html.has_var("_restore_snapshot"): + snapshot_file = html.var("_restore_snapshot") c = wato_confirm(_("Confirm restore snapshot"), _("Are you sure you want to restore the snapshot <br><br>%s ?") % snapshot_file @@ -970,12 +974,12 @@ def mode_snapshot(phase): snapshots.append(f) snapshots.sort(reverse=True) + html.write("<br>") html.begin_form("upload_form", None, "POST") - html.upload_file("upload_file") + html.upload_file("_upload_file") html.button("upload_button", _("Restore from file"), "submit") html.hidden_fields() html.end_form() - html.write("<br><br>") if len(snapshots) == 0: html.write("<div class=info>" + _("There are no snapshots available.") + "</div>") @@ -987,10 +991,10 @@ def mode_snapshot(phase): for name in snapshots: odd = odd == "odd" and "even" or "odd" html.write('<tr class="data %s0"><td>' % odd) - html.buttonlink(make_action_link([("mode","snapshot"),("restore_snapshot", name)]), _("Restore")) - html.buttonlink(make_action_link([("mode","snapshot"),("delete_file", name)]), _("Delete")) + html.buttonlink(make_action_link([("mode","snapshot"),("_restore_snapshot", name)]), _("Restore")) + html.buttonlink(make_action_link([("mode","snapshot"),("_delete_file", name)]), _("Delete")) html.write("<td>") - html.write('<a href="%s">%s</a>' % (make_action_link([("mode","snapshot"),("download_file", name)]), name)) + html.write('<a href="%s">%s</a>' % (make_action_link([("mode","snapshot"),("_download_file", name)]), name)) html.write('</table>') def create_snapshot(): @@ -1024,7 +1028,7 @@ def restore_snapshot( filename, tarstream = None ): del_config_dir() if filename: if not os.path.exists(os.path.join(snapshot_dir, filename)): - raise MKGeneralException("Snapshot does not exist %s" % filename) + raise MKGeneralException(_("Snapshot does not exist %s" % filename)) snapshot = tarfile.open(os.path.join(snapshot_dir, filename), "r:gz") elif tarstream: stream = StringIO.StringIO() @@ -1034,7 +1038,7 @@ def restore_snapshot( filename, tarstream = None ): else: return - snapshot.extractall(defaults.omd_root) + snapshot.extractall(defaults.check_mk_configdir) snapshot.close() log_pending(None, "snapshot-restored", _("Restored snapshot %s") % (filename or _('from uploaded file')))

13 years

Check_MK Git: check_mk: Updated bug entries

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: be8c05d14e084b5a09c510367944436046f632fe URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=be8c05d14e084b… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Thu Sep 8 10:21:36 2011 +0200 Updated bug entries --- .bugs/367 | 12 ++++++++++++ 1 files changed, 12 insertions(+), 0 deletions(-) diff --git a/.bugs/367 b/.bugs/367 new file mode 100644 index 0000000..d949932 --- /dev/null +++ b/.bugs/367 @@ -0,0 +1,12 @@ +Title: OMD user cannot do --scan-parents +Component: core +Benefit: 1 +State: open +Cost: 2 +Date: 2011-09-08 10:20:21 +Class: nastiness + +As an OMD user you cannot always do a parent scan since +traceroute might miss the SUID bit. We could make the +command configurable in main.mk and maybe prepare OMD +such that it always works correctly...

13 years

Check_MK Git: check_mk: AIX agent now outputs the user and performance data in <<<ps>>>

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: c806d071d5dbed8bad79d25fef83a271a34bd7f1 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=c806d071d5dbed… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Thu Sep 8 10:27:06 2011 +0200 AIX agent now outputs the user and performance data in <<<ps>>> --- ChangeLog | 1 + agents/check_mk_agent.aix | 2 +- 2 files changed, 2 insertions(+), 1 deletions(-) diff --git a/ChangeLog b/ChangeLog index 6a981d3..f985438 100644 --- a/ChangeLog +++ b/ChangeLog @@ -10,6 +10,7 @@ * ipmi_sensors: correctly handle further positive status texts (thanks to Sebastian Talmon) * FIX: nfsmounts handles zero-sized volumes correctly + * AIX agent now outputs the user and performance data in <<<ps>>> Multisite: * FIX: WATO filtered status GUIs did not update the title after changing diff --git a/agents/check_mk_agent.aix b/agents/check_mk_agent.aix index 7ee99ad..7eab7fb 100755 --- a/agents/check_mk_agent.aix +++ b/agents/check_mk_agent.aix @@ -45,7 +45,7 @@ echo '<<<df>>>' df -kP | sed 's/ / - /' | grep -v ^/proc | grep -v ^Filesystem | grep -v : echo '<<<ps>>>' -ps -ef -F args | sed 1d +ps -ef -F user,vszsize,rssize,pcpu,args | sed -e 1d -e 's/ *\([^ ]*\) *\([^ ]*\) *\([^ ]*\) *\([^ ]*\) */(\1,\2,\3,\4) /' if type lparstat >/dev/null 2>&1 then

13 years

← Newer
1
2
3
4
5
6
7
8
9
...
13
Older →

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits September 2011