Checkmk git commits

checkmk-commits@lists.checkmk.com

1 participants
64160 discussions

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

Check_MK Git: check_mk: FIX: nfsmounts handles zero-sized volumes correctly

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 1dc2ab087ac19d206f1d8856f19c733e9784969d URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=1dc2ab087ac19d… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Thu Sep 8 10:11:06 2011 +0200 FIX: nfsmounts handles zero-sized volumes correctly --- ChangeLog | 1 + checks/nfsmounts | 3 +++ 2 files changed, 4 insertions(+), 0 deletions(-) diff --git a/ChangeLog b/ChangeLog index 9743b49..6a981d3 100644 --- a/ChangeLog +++ b/ChangeLog @@ -9,6 +9,7 @@ * Added 4 new checks dell_powerconnect_* by Chris Bowlby * ipmi_sensors: correctly handle further positive status texts (thanks to Sebastian Talmon) + * FIX: nfsmounts handles zero-sized volumes correctly Multisite: * FIX: WATO filtered status GUIs did not update the title after changing diff --git a/checks/nfsmounts b/checks/nfsmounts index faddfa3..89dcc25 100644 --- a/checks/nfsmounts +++ b/checks/nfsmounts @@ -42,6 +42,9 @@ def check_nfsmounts(item, params, info): if line[1] == 'ok': gb = 1024 * 1024 * 1024.0 size_gb = (size_blocks * blocksize) / gb + if size_gb == 0: + return (0, "OK - server is responding") + free_gb = (free_blocks * blocksize) / gb used_gb = size_gb - free_gb used_perc = 100.0 * used_gb / size_gb

13 years

Check_MK Git: check_mk: FIX: fix Stats: sum/min/max/ avg for columns of type time

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 4ab1cc4e8101ad1da74f6b831b09f662d0293957 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=4ab1cc4e8101ad… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Thu Sep 8 09:45:55 2011 +0200 FIX: fix Stats: sum/min/max/avg for columns of type time --- ChangeLog | 1 + livestatus/src/Query.cc | 2 +- livestatus/src/StatsColumn.cc | 2 +- 3 files changed, 3 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index a3e813c..9743b49 100644 --- a/ChangeLog +++ b/ChangeLog @@ -45,6 +45,7 @@ * FIX: tables comments and downtimes now honor AuthUser * Table log honors AuthUser for entries that belong to hosts (not for external commands, though. Sorry...) + * FIX: fix Stats: sum/min/max/avg for columns of type time 1.1.11i3: Core, Setup, etc.: diff --git a/livestatus/src/Query.cc b/livestatus/src/Query.cc index 2519340..d1142d0 100644 --- a/livestatus/src/Query.cc +++ b/livestatus/src/Query.cc @@ -379,7 +379,7 @@ void Query::parseStatsLine(char *line) operation = STATS_OP_STD; char *column_name; - if (operation == STATS_OP_COUNT) + if (operation == STATS_OP_COUNT) column_name = col_or_op; else { // aggregation operator is followed by column name diff --git a/livestatus/src/StatsColumn.cc b/livestatus/src/StatsColumn.cc index c010577..bda53c4 100644 --- a/livestatus/src/StatsColumn.cc +++ b/livestatus/src/StatsColumn.cc @@ -42,7 +42,7 @@ Aggregator *StatsColumn::createAggregator() { if (_operation == STATS_OP_COUNT) return new CountAggregator(_filter); - else if (_column->type() == COLTYPE_INT) + else if (_column->type() == COLTYPE_INT || _column->type() == COLTYPE_TIME) return new IntAggregator((IntColumn *)_column, _operation); else if (_column->type() == COLTYPE_DOUBLE) return new DoubleAggregator((DoubleColumn *)_column, _operation);

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: 4aea56aa65b0108d0f8e4a55d71b79a8500c67da URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=4aea56aa65b010… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Thu Sep 8 09:32:18 2011 +0200 Merge branch 'master' of ssh://mathias-kettner.de/check_mk ---

13 years

Check_MK Git: check_mk: Livestatus: downtimes/comment/ logs now honor AuthUser:

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: f1c7ee228270b083e81dbdf7b13108686caf9024 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=f1c7ee228270b0… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Thu Sep 8 09:16:51 2011 +0200 Livestatus: downtimes/comment/logs now honor AuthUser: Table log does honor AuthUser only for entries of type notification, alert, passive check or state. Entries for deleted hosts are hidden if AuthUser is used. --- .bugs/366 | 11 +++++++++++ ChangeLog | 3 +++ livestatus/src/Makefile.am | 2 +- livestatus/src/Query.cc | 1 + livestatus/src/Query.h | 1 - livestatus/src/TableDownComm.cc | 7 +++++++ livestatus/src/TableDownComm.h | 1 + livestatus/src/TableHosts.cc | 7 ++----- livestatus/src/TableLog.cc | 14 ++++++++++---- livestatus/src/TableServices.cc | 15 +-------------- livestatus/src/auth.cc | 25 +++++++++++++++++++++++++ livestatus/src/auth.h | 14 ++++++++++++++ 12 files changed, 76 insertions(+), 25 deletions(-) diff --git a/.bugs/366 b/.bugs/366 new file mode 100644 index 0000000..62167c8 --- /dev/null +++ b/.bugs/366 @@ -0,0 +1,11 @@ +Title: Livestatus: table log: EXTERNAL_COMMAND should get host info +Component: livestatus +Benefit: 1 +State: open +Cost: 5 +Date: 2011-09-08 09:29:57 +Class: feature + +The table log could parse the external command entries and assign +them to the correct host and service. This needs a complete list +of all known external commands :-(. diff --git a/ChangeLog b/ChangeLog index 2ea7ba4..a3e813c 100644 --- a/ChangeLog +++ b/ChangeLog @@ -42,6 +42,9 @@ Livestatus: * FIX: fix compile error in TableLog.cc by including stddef.h + * FIX: tables comments and downtimes now honor AuthUser + * Table log honors AuthUser for entries that belong to hosts + (not for external commands, though. Sorry...) 1.1.11i3: Core, Setup, etc.: diff --git a/livestatus/src/Makefile.am b/livestatus/src/Makefile.am index 054027d..7a7f6c2 100644 --- a/livestatus/src/Makefile.am +++ b/livestatus/src/Makefile.am @@ -47,7 +47,7 @@ livestatus_so_SOURCES = \ OffsetStringHostMacroColumn.cc StatsColumn.cc IntAggregator.cc CountAggregator.cc \ DoubleAggregator.cc AttributelistColumn.cc AttributelistFilter.cc \ global_counters.c module.c logger.c waittriggers.c TimeperiodsCache.cc pnp4nagios.cc \ - ContactgroupsColumn.cc opids.cc + ContactgroupsColumn.cc opids.cc auth.cc livestatus_so_CXXFLAGS = -I$(top_srcdir)/nagios -fPIC livestatus_so_CFLAGS = $(livestatus_so_CXXFLAGS) diff --git a/livestatus/src/Query.cc b/livestatus/src/Query.cc index d429440..2519340 100644 --- a/livestatus/src/Query.cc +++ b/livestatus/src/Query.cc @@ -44,6 +44,7 @@ #include "NegatingFilter.h" #include "waittriggers.h" #include "data_encoding.h" +#include "auth.h" extern int g_debug_level; extern unsigned long g_max_response_size; diff --git a/livestatus/src/Query.h b/livestatus/src/Query.h index 187d267..b7df988 100644 --- a/livestatus/src/Query.h +++ b/livestatus/src/Query.h @@ -55,7 +55,6 @@ class Aggregator; #define ANDOR_AND 1 #define ANDOR_NEGATE 2 -#define UNKNOWN_AUTH_USER ((contact *)0xdeadbeaf) class Query { diff --git a/livestatus/src/TableDownComm.cc b/livestatus/src/TableDownComm.cc index c16dc93..4b6d529 100644 --- a/livestatus/src/TableDownComm.cc +++ b/livestatus/src/TableDownComm.cc @@ -31,6 +31,7 @@ #include "OffsetStringColumn.h" #include "OffsetIntColumn.h" #include "OffsetTimeColumn.h" +#include "auth.h" #include "tables.h" // Todo: the dynamic data in this table must be @@ -158,6 +159,12 @@ void TableDownComm::answerQuery(Query *query) } } +bool TableDownComm::isAuthorized(contact *ctc, void *data) +{ + DowntimeOrComment *dtc = (DowntimeOrComment *)data; + return is_authorized_for(ctc, dtc->_host, dtc->_service); +} + DowntimeOrComment *TableDownComm::findEntry(unsigned long id) { _entries_t::iterator it = _entries.find(id); diff --git a/livestatus/src/TableDownComm.h b/livestatus/src/TableDownComm.h index 652bb35..d12cf5e 100644 --- a/livestatus/src/TableDownComm.h +++ b/livestatus/src/TableDownComm.h @@ -54,6 +54,7 @@ public: void add(DowntimeOrComment *data); void remove(unsigned id); void answerQuery(Query *); + bool isAuthorized(contact *ctc, void *data); _entries_t::iterator entriesIteratorBegin() { return _entries.begin(); } _entries_t::iterator entriesIteratorEnd() { return _entries.end(); } }; diff --git a/livestatus/src/TableHosts.cc b/livestatus/src/TableHosts.cc index a3d03eb..a629c77 100644 --- a/livestatus/src/TableHosts.cc +++ b/livestatus/src/TableHosts.cc @@ -45,6 +45,7 @@ #include "ContactgroupsColumn.h" #include "HostSpecialIntColumn.h" #include "tables.h" +#include "auth.h" extern host *host_list; extern hostgroup *hostgroup_list; @@ -57,12 +58,8 @@ struct hostbygroup { bool TableHosts::isAuthorized(contact *ctc, void *data) { - if (ctc == UNKNOWN_AUTH_USER) - return false; - host *hst = (host *)data; - return is_contact_for_host(hst, ctc) - || is_escalated_contact_for_host(hst, ctc); + return is_authorized_for(ctc, hst, 0); } diff --git a/livestatus/src/TableLog.cc b/livestatus/src/TableLog.cc index 912c2a9..5d3031a 100644 --- a/livestatus/src/TableLog.cc +++ b/livestatus/src/TableLog.cc @@ -42,6 +42,7 @@ #include "TableHosts.h" #include "TableCommands.h" #include "TableContacts.h" +#include "auth.h" #define CHECK_MEM_CYCLE 1000 /* Check memory every N'th new message */ @@ -399,10 +400,15 @@ bool TableLog::isAuthorized(contact *ctc, void *data) service *svc = entry->_service; host *hst = entry->_host; - if (svc) - return g_table_services->isAuthorized(ctc, svc); - else if (hst) - return g_table_hosts->isAuthorized(ctc, hst); + if (hst || svc) + return is_authorized_for(ctc, hst, svc); + // suppress entries for messages that belong to + // hosts that do not exist anymore. + else if (entry->_logclass == LOGCLASS_ALERT + || entry->_logclass == LOGCLASS_NOTIFICATION + || entry->_logclass == LOGCLASS_PASSIVECHECK + || entry->_logclass == LOGCLASS_STATE) + return false; else return true; } diff --git a/livestatus/src/TableServices.cc b/livestatus/src/TableServices.cc index f53e7b3..c381211 100644 --- a/livestatus/src/TableServices.cc +++ b/livestatus/src/TableServices.cc @@ -160,21 +160,8 @@ void TableServices::answerQuery(Query *query) bool TableServices::isAuthorized(contact *ctc, void *data) { - if (ctc == UNKNOWN_AUTH_USER) - return false; - service *svc = (service *)data; - if (g_service_authorization == AUTH_STRICT) { - return is_contact_for_service(svc, ctc); - is_escalated_contact_for_service(svc, ctc); - } - else { // AUTH_LOOSE - host *hst = svc->host_ptr; - return is_contact_for_host(hst, ctc) - || is_escalated_contact_for_host(hst, ctc) - || is_contact_for_service(svc, ctc) - || is_escalated_contact_for_service(svc, ctc); - } + return is_authorized_for(ctc, svc->host_ptr, svc); } TableServices::TableServices(bool by_group, bool by_hostgroup) diff --git a/livestatus/src/auth.cc b/livestatus/src/auth.cc new file mode 100644 index 0000000..d63f01f --- /dev/null +++ b/livestatus/src/auth.cc @@ -0,0 +1,25 @@ +#include "auth.h" + +int is_authorized_for(contact *ctc, host *hst, service *svc) { + if (ctc == UNKNOWN_AUTH_USER) + return false; + + if (svc) { + if (g_service_authorization == AUTH_STRICT) { + return is_contact_for_service(svc, ctc) + || is_escalated_contact_for_service(svc, ctc); + } + else { // AUTH_LOOSE + return is_contact_for_host(hst, ctc) + || is_escalated_contact_for_host(hst, ctc) + || is_contact_for_service(svc, ctc) + || is_escalated_contact_for_service(svc, ctc); + } + } + // Entries for hosts + else { + return is_contact_for_host(hst, ctc) + || is_escalated_contact_for_host(hst, ctc); + } +} + diff --git a/livestatus/src/auth.h b/livestatus/src/auth.h index 754558b..0fceb3c 100644 --- a/livestatus/src/auth.h +++ b/livestatus/src/auth.h @@ -25,11 +25,25 @@ #ifndef auth_h #define auth_h +#include "nagios.h" + #define AUTH_LOOSE 0 #define AUTH_STRICT 1 +// Dummy pointer for unknown user (not no user) +#define UNKNOWN_AUTH_USER ((contact *)0xdeadbeaf) + + extern int g_service_authorization; extern int g_group_authorization; +#ifdef __cplusplus +extern "C" { +#endif + int is_authorized_for(contact *ctc, host *host, service *svc); +#ifdef __cplusplus +} +#endif + #endif // auth_h

13 years

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits