Checkmk git commits September 2017

checkmk-commits@lists.checkmk.com

11 participants
255 discussions

by Sven Panne

Module: check_mk Branch: master Commit: 215ecb700095f00d6313c1fa446d7ec660aa978f URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=215ecb700095f0… Author: Sven Panne <sp(a)mathias-kettner.de> Date: Tue Sep 5 15:15:47 2017 +0200 Reserved 10 Werk IDS Change-Id: I2ad3158fe720732cd68d18655a577166dbe03b7b --- .werks/first_free | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.werks/first_free b/.werks/first_free index 814974a..acd8018 100644 --- a/.werks/first_free +++ b/.werks/first_free @@ -1 +1 @@ -5188 +5198

7 years

5183 FIX Updated shipped navicli to 7.33.9.1.84

by Lars Michelsen

Module: check_mk Branch: master Commit: 246f3810c60a8dacc78c0d5605bbd500b433549c URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=246f3810c60a8d… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Tue Sep 5 14:40:17 2017 +0200 5183 FIX Updated shipped navicli to 7.33.9.1.84 This update may fix segmentation faults on different Linux distributions. Change-Id: I7861a581951b7169806080905387d842d99f5670 --- .werks/5183 | 10 ++++++++++ omd/packages/navicli/README | 5 +++++ omd/packages/navicli/navisphere-64/bin/naviseccli | Bin 14980582 -> 12488890 bytes .../lib/seccli/libNonFipsUtilities.so | Bin 104362 -> 104362 bytes .../navisphere-64/lib/seccli/libcrypto.so.0.9.8 | Bin 1764683 -> 0 bytes .../navisphere-64/lib/seccli/libcrypto.so.1.0.0 | Bin 0 -> 2437884 bytes .../navisphere-64/lib/seccli/libssl.so.0.9.8 | Bin 367323 -> 0 bytes .../navisphere-64/lib/seccli/libssl.so.1.0.0 | Bin 0 -> 521815 bytes 8 files changed, 15 insertions(+) diff --git a/.werks/5183 b/.werks/5183 new file mode 100644 index 0000000..ebe90bb --- /dev/null +++ b/.werks/5183 @@ -0,0 +1,10 @@ +Title: Updated shipped navicli to 7.33.9.1.84 +Level: 1 +Component: omd/packages +Compatible: compat +Edition: cre +Version: 1.5.0i1 +Date: 1504615159 +Class: fix + +This update may fix segmentation faults on different Linux distributions. diff --git a/omd/packages/navicli/README b/omd/packages/navicli/README new file mode 100644 index 0000000..0905021 --- /dev/null +++ b/omd/packages/navicli/README @@ -0,0 +1,5 @@ +Versions + +navisphere-32/ -> 7.33.6.0.96 +navisphere-64/ -> NaviCLI-Linux-64-x86-en_US-7.33.9.1.84-1.x86_64.rpm + diff --git a/omd/packages/navicli/navisphere-64/bin/naviseccli b/omd/packages/navicli/navisphere-64/bin/naviseccli index 0726423..c2e1660 100755 Binary files a/omd/packages/navicli/navisphere-64/bin/naviseccli and b/omd/packages/navicli/navisphere-64/bin/naviseccli differ diff --git a/omd/packages/navicli/navisphere-64/lib/seccli/libNonFipsUtilities.so b/omd/packages/navicli/navisphere-64/lib/seccli/libNonFipsUtilities.so index b1498cd..3f0b42e 100755 Binary files a/omd/packages/navicli/navisphere-64/lib/seccli/libNonFipsUtilities.so and b/omd/packages/navicli/navisphere-64/lib/seccli/libNonFipsUtilities.so differ diff --git a/omd/packages/navicli/navisphere-64/lib/seccli/libcrypto.so.0.9.8 b/omd/packages/navicli/navisphere-64/lib/seccli/libcrypto.so.0.9.8 deleted file mode 100755 index a72b922..0000000 Binary files a/omd/packages/navicli/navisphere-64/lib/seccli/libcrypto.so.0.9.8 and /dev/null differ diff --git a/omd/packages/navicli/navisphere-64/lib/seccli/libcrypto.so.1.0.0 b/omd/packages/navicli/navisphere-64/lib/seccli/libcrypto.so.1.0.0 new file mode 100755 index 0000000..d9bfb61 Binary files /dev/null and b/omd/packages/navicli/navisphere-64/lib/seccli/libcrypto.so.1.0.0 differ diff --git a/omd/packages/navicli/navisphere-64/lib/seccli/libssl.so.0.9.8 b/omd/packages/navicli/navisphere-64/lib/seccli/libssl.so.0.9.8 deleted file mode 100755 index fcb30b8..0000000 Binary files a/omd/packages/navicli/navisphere-64/lib/seccli/libssl.so.0.9.8 and /dev/null differ diff --git a/omd/packages/navicli/navisphere-64/lib/seccli/libssl.so.1.0.0 b/omd/packages/navicli/navisphere-64/lib/seccli/libssl.so.1.0.0 new file mode 100755 index 0000000..2f514dc Binary files /dev/null and b/omd/packages/navicli/navisphere-64/lib/seccli/libssl.so.1.0.0 differ

7 years

Dropped obsolete code

by Lars Michelsen

Module: check_mk Branch: master Commit: 801def8008bb98b736fce22035d73239f8abe6ec URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=801def8008bb98… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Tue Sep 5 13:11:39 2017 +0200 Dropped obsolete code Change-Id: Ie9deeb6c18921731b2494fdc510e5b5c64bebd61 --- web/plugins/userdb/ldap.py | 108 --------------------------------------------- 1 file changed, 108 deletions(-) diff --git a/web/plugins/userdb/ldap.py b/web/plugins/userdb/ldap.py index 2559766..c933175 100644 --- a/web/plugins/userdb/ldap.py +++ b/web/plugins/userdb/ldap.py @@ -334,114 +334,6 @@ class LDAPUserConnector(UserConnector): return domain - - # Active directory only: This function tries to detect the nearest domain controller of the - # AD found when connecting to the given server. It works as follows: - # - # 1. A connection is established with the configured server. Normally this is the - # DNS name of the AD domain. For this connection a "random DC" is used. In fact - # the given name is locally resolved using DNS and one answered IP is picked. - # 2. The authentication with the default credentials is done. - # 3. The AD site of the local system is detected. - # This is done by gathering the local IP subnets of the Check_MK server, then all subnets - # configured in the domain are fetched and all matching subnets are collected. Then the - # subnets are sorted by their size. - # 4. The domain controllers of the AD sites associated with the matched, sorted sites are - # are fetched from the AD - # 5. A random DC of the found AD site is used instead of "server". - # - # In case the detection does not work the "server" that has been handed over to this - # function is used. - #def _discover_nearest_dc(self, server): - # matched_site_dns = self._find_site_distinguished_names() - # if not matched_site_dns: - # self.log(" DISCOVERY: Found no site distinguished names matching the " - # "Check_MK servers IP range -> Skipping discovery") - # return server - - # self.log("%r" % matched_site_dns) - - # for site_dn in matched_site_dns: - # # Get list of DCs for this site - # results = self.ldap_search("CN=SERVERS,%s" % site_dn, - # filt="(objectclass=server)", - # columns=["dnshostname"], - # implicit_connect=False) - - # if not results: - # continue # Maybe there is another site to lookup - - # for server_dn, attrs in results: - # return attrs["dnshostname"][0] # In case there are multiple, use the first one - - # self.log(" DISCOVERY: Found no DC for the sites: %r -> Skipping discovery" % matched_site_dns) - # return server - - - #def _find_site_distinguished_names(self): - # server_subnets = self._subnets_of_check_mk_server() - - # if not server_subnets: - # self.log(" DISCOVERY: Failed to get the Check_MK server subnets") - # return [] - - # domain_subnet_map = self._subnets_of_domain() - - # if not domain_subnet_map: - # self.log(" DISCOVERY: Found no domain subnets") - # return [] - - # # Now get all nets from domain_subnet_map that match the Check_MK server subnets - # import ipaddress - - # matched = [] - # for subnet_txt in server_subnets: - # server_subnet = ipadress.IPv4Network(subnet_txt) - - # for domain_subnet_txt, site_dn in domain_subnet_map.items(): - # domain_subnet = ipadress.IPv4Network(domain_subnet_txt) - # if server_subnet == domain_subnet or server_subnet.subnet_of(domain_subnet): - # matched.append((domain_subnet.prefixlen, site_dn)) - - # # And sort them by their network size: Smallest subnets first - # return [ e[1] for e in sorted(matched) ] - - - #def _subnets_of_check_mk_server(self): - # subnets = [] - - # import netifaces, ipaddress - # for network_interface in netifaces.interfaces(): - # for link in netifaces.ifaddresses(network_interface).get(netifaces.AF_INET, []): - # ip_interface = ipaddress.IPv4Interface("%s/%s" % (link["addr"], link["netmask"])) - # network_addr = "%s" % ip_interface.network - # if not network_addr.startswith("127."): - # subnets.append(network_addr) - - # return subnets - - - #def _subnets_of_domain(self): - # domain_dn = self.get_forest_root_domain_dn() - # subnet_dn = "CN=Subnets,CN=Sites,CN=Configuration,%s" % domain_dn - - # results = self.ldap_search(subnet_dn, - # filt='(&(objectclass=subnet))', - # columns=["cn", "siteobject"], - # implicit_connect=False) - - # if not results: - # return [] - - # subnets = {} - # for subnet_dn, attrs in results: - # site_dn = attrs["siteobject"][0] - # cn = attrs["cn"][0] - # subnets[cn] = site_dn - - # return subnets - - # Bind with the default credentials def default_bind(self, conn): try:

7 years

Werk 5030: Skype section can now be enabled/disabled in agent bakery

by Jukka Aro

Module: check_mk Branch: master Commit: b98fe3944649fef7ddc7273b991dfe7d702b570f URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=b98fe3944649fe… Author: Jukka Aro <ja(a)mathias-kettner.de> Date: Tue Sep 5 13:19:43 2017 +0200 Werk 5030: Skype section can now be enabled/disabled in agent bakery Change-Id: I6a18752f4e839a6da3b70d56b4a4f8d24f7585a8 --- .werks/5030 | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/.werks/5030 b/.werks/5030 new file mode 100644 index 0000000..73794d5 --- /dev/null +++ b/.werks/5030 @@ -0,0 +1,10 @@ +Title: Skype section can now be enabled/disabled in agent bakery +Level: 1 +Component: wato +Compatible: compat +Edition: cee +Version: 1.5.0i1 +Date: 1504610186 +Class: feature + +

7 years

Fixed omd hook test

by Lars Michelsen

Module: check_mk Branch: master Commit: 1d5c5d9ca3d20ca6fa9b2223dc3c53be7619d8d9 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=1d5c5d9ca3d20c… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Tue Sep 5 12:50:01 2017 +0200 Fixed omd hook test Change-Id: I42b24af0f122cefe99d38dada30a1572da2d3e0e --- tests/omd/test_hooks.py | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/tests/omd/test_hooks.py b/tests/omd/test_hooks.py index 205b05b..172998b 100644 --- a/tests/omd/test_hooks.py +++ b/tests/omd/test_hooks.py @@ -12,10 +12,9 @@ def test_hooks(site): "APACHE_TCP_PORT", "AUTOSTART", "CORE", - "CRONTAB", - "DEFAULT_GUI", "DOKUWIKI_AUTH", "LIVESTATUS_TCP", + "LIVESTATUS_TCP_ONLY_FROM", "LIVESTATUS_TCP_PORT", "MKEVENTD", "MKEVENTD_SNMPTRAP", @@ -27,7 +26,6 @@ def test_hooks(site): "NSCA", "NSCA_TCP_PORT", "PNP4NAGIOS", - "TMPFS", ] if site.version.edition() == "enterprise":

7 years

5179 FIX Views: Fixed sorting of commands in different languages

by Lars Michelsen

Module: check_mk Branch: master Commit: cfdc778e1dff21c6d186b657dcb635d6fa809ed3 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=cfdc778e1dff21… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Tue Sep 5 09:15:03 2017 +0200 5179 FIX Views: Fixed sorting of commands in different languages Change-Id: If195162280a8c4c4e9272677e72bedc582838376 --- .werks/5179 | 10 ++++++++++ web/htdocs/views.py | 20 ++++++++++++++------ web/plugins/views/commands.py | 37 +++++++++++++++++++++++++++++++------ 3 files changed, 55 insertions(+), 12 deletions(-) diff --git a/.werks/5179 b/.werks/5179 new file mode 100644 index 0000000..4534c50 --- /dev/null +++ b/.werks/5179 @@ -0,0 +1,10 @@ +Title: Views: Fixed sorting of commands in different languages +Level: 1 +Component: multisite +Compatible: compat +Edition: cre +Version: 1.5.0i1 +Date: 1504595683 +Class: fix + + diff --git a/web/htdocs/views.py b/web/htdocs/views.py index ab7822f..ffae17c 100644 --- a/web/htdocs/views.py +++ b/web/htdocs/views.py @@ -55,6 +55,7 @@ def load_plugins(force): global multisite_builtin_views ; multisite_builtin_views = {} global multisite_painter_options ; multisite_painter_options = {} global multisite_commands ; multisite_commands = [] + global multisite_command_groups ; multisite_command_groups = {} global view_hooks ; view_hooks = {} global inventory_displayhints ; inventory_displayhints = {} @@ -2544,14 +2545,13 @@ def show_command_form(is_open, datasource): # It is currently only used in custom views, not shipped with check_mk. if command.get('only_view') and html.var('view_name') != command['only_view']: continue - group = command.get("group", _("Various Commands")) + group = command.get("group", "various") by_group.setdefault(group, []).append(command) - groups = by_group.keys() - groups.sort() - for group in groups: - forms.header(group, narrow=True) - for command in by_group[group]: + for group_ident, group_commands in sorted(by_group.items(), + key=lambda x: multisite_command_groups[x[0]]["sort_index"]): + forms.header(multisite_command_groups[group_ident]["title"], narrow=True) + for command in group_commands: forms.section(command["title"]) command["render"]() @@ -2739,6 +2739,14 @@ def get_view_by_name(view_name): # | | # '----------------------------------------------------------------------' + +def register_command_group(ident, title, sort_index): + multisite_command_groups[ident] = { + "title" : title, + "sort_index" : sort_index, + } + + def register_hook(hook, func): if not hook in view_hooks: view_hooks[hook] = [] diff --git a/web/plugins/views/commands.py b/web/plugins/views/commands.py index 2b19944..c8ed595 100644 --- a/web/plugins/views/commands.py +++ b/web/plugins/views/commands.py @@ -36,6 +36,11 @@ # - function that outputs the HTML input fields # - function that creates the nagios command and title +register_command_group( + ident = "various", + title = _("Various Commands"), + sort_index = 20, +) # .--Reschedule----------------------------------------------------------. # | ____ _ _ _ | @@ -303,11 +308,18 @@ def render_fake_form(what): html.close_table() + +register_command_group( + ident = "fake_check", + title = _("Fake check results"), + sort_index = 15, +) + multisite_commands.append({ "tables" : [ "host" ], "permission" : "action.fakechecks", "title" : _("Fake check results"), - "group" : _("Fake check results"), + "group" : "fake_check", "render" : lambda: render_fake_form("host"), "action" : command_fake_checks, }) @@ -316,7 +328,7 @@ multisite_commands.append({ "tables" : [ "service" ], "permission" : "action.fakechecks", "title" : _("Fake check results"), - "group" : _("Fake check results"), + "group" : "fake_check", "render" : lambda: render_fake_form("service"), "action" : command_fake_checks, }) @@ -442,6 +454,13 @@ def command_acknowledgement(cmdtag, spec, row): return commands, title +register_command_group( + ident = "acknowledge", + title = _("Acknowledge"), + sort_index = 5, +) + + multisite_commands.append({ "tables" : [ "host", "service", "aggr" ], "permission" : "action.acknowledge", @@ -463,7 +482,7 @@ multisite_commands.append({ html.write_text(_("Comment") + ": ") == \ html.text_input("_ack_comment", size=48, submit="_acknowledge"), "action" : command_acknowledgement, - "group" : _("Acknowledge"), + "group" : "acknowledge", }) @@ -764,13 +783,19 @@ def has_recurring_downtimes(): return False +register_command_group( + ident = "downtimes", + title = _("Downtimes"), + sort_index = 10, +) + multisite_commands.append({ "tables" : [ "host" ], "permission" : "action.downtimes", "title" : _("Schedule downtimes"), "render" : lambda: paint_downtime_buttons("host"), "action" : command_downtime, - "group" : _("Downtimes"), + "group" : "downtimes", }) multisite_commands.append({ @@ -779,7 +804,7 @@ multisite_commands.append({ "title" : _("Schedule downtimes"), "render" : lambda: paint_downtime_buttons("service"), "action" : command_downtime, - "group" : _("Downtimes"), + "group" : "downtimes", }) multisite_commands.append({ @@ -788,7 +813,7 @@ multisite_commands.append({ "title" : _("Schedule downtimes"), "render" : lambda: paint_downtime_buttons("aggr"), "action" : command_downtime, - "group" : _("Downtimes"), + "group" : "downtimes", }) # REMOVE DOWNTIMES (table downtimes)

7 years

5180 Add bash completion for OMD command

by Lars Michelsen

Module: check_mk Branch: master Commit: 48ee162e4263e28450f0c87a043fae50a7a79ad7 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=48ee162e4263e2… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Tue Sep 5 09:36:00 2017 +0200 5180 Add bash completion for OMD command OMD is now installing a bash completion configuration for the OMD command. Depending on the context (root or site user) the completion will show the available commands. This only works on platforms where the bash completion package is installed. Change-Id: Id84947a279b3f24d2184131c74a7c66f0ab86458 --- .bugs/2928 | 6 +- .werks/5180 | 14 ++++ omd/debian/postinst.in | 1 + omd/omd.spec.in | 2 + omd/packages/omd/Makefile | 2 + omd/packages/omd/bash_completion | 139 +++++++++++++++++++++++++++++++++++++++ omd/packages/omd/skel/.bashrc | 6 ++ 7 files changed, 168 insertions(+), 2 deletions(-) diff --git a/.bugs/2928 b/.bugs/2928 index bcd4ecc..ffd7cb2 100644 --- a/.bugs/2928 +++ b/.bugs/2928 @@ -1,8 +1,10 @@ Title: Order of command boxes in views are language dependent Component: multisite -State: open +Class: bug +State: done Date: 2017-07-18 11:29:17 Targetversion: 1.4.0 -Class: bug The order in Englisch and German is different but should not. + +2017-09-05 09:15:07: changed state open -> done diff --git a/.werks/5180 b/.werks/5180 new file mode 100644 index 0000000..70612bf --- /dev/null +++ b/.werks/5180 @@ -0,0 +1,14 @@ +Title: Add bash completion for OMD command +Level: 1 +Component: omd +Compatible: compat +Edition: cre +Version: 1.5.0i1 +Date: 1504596897 +Class: feature + +OMD is now installing a bash completion configuration for the OMD command. +Depending on the context (root or site user) the completion will show the +available commands. + +This only works on platforms where the bash completion package is installed. diff --git a/omd/debian/postinst.in b/omd/debian/postinst.in index f156993..45388d6 100755 --- a/omd/debian/postinst.in +++ b/omd/debian/postinst.in @@ -45,6 +45,7 @@ case "$1" in update-alternatives --install /omd/versions/default \ omd /omd/versions/###OMD_VERSION### ###OMD_SERIAL### \ --slave /usr/bin/omd omd.bin /omd/versions/###OMD_VERSION###/bin/omd \ + --slave /etc/bash_completion.d/omd omd.bash_completion /omd/versions/###OMD_VERSION###/lib/omd/omd_bash_completion \ --slave /usr/share/man/man8/omd.8.gz omd.man8 \ /omd/versions/###OMD_VERSION###/share/man/man8/omd.8.gz diff --git a/omd/omd.spec.in b/omd/omd.spec.in index f1e87c3..eff9f5a 100644 --- a/omd/omd.spec.in +++ b/omd/omd.spec.in @@ -81,6 +81,7 @@ ln -sfn "%{version}" /omd/versions/default ln -sfn /omd/versions/default/bin/omd /usr/bin/omd ln -sfn /omd/versions/default/share/man/man8/omd.8.gz /usr/share/man/man8/omd.8.gz ln -sfn /omd/versions/default/share/omd/apache.conf @APACHE_CONFDIR@/zzz_omd.conf +ln -sfn /omd/versions/default/lib/omd/omd_bash_completion /etc/bash_completion.d/omd IS_SYSTEMD=0 if [ -d /usr/lib/systemd ] && which systemctl >/dev/null 2>&1; then @@ -187,6 +188,7 @@ else echo "Removing global symbolic links" rm -f /usr/bin/omd rm -f /usr/share/man/man8/omd.8.gz + rm -f /etc/bash_completion.d/omd # Can be either the symlink /etc/init.d/omd or the regular # file /etc/systemd/system/omd.service. diff --git a/omd/packages/omd/Makefile b/omd/packages/omd/Makefile index bb06b8d..0db60a7 100644 --- a/omd/packages/omd/Makefile +++ b/omd/packages/omd/Makefile @@ -30,9 +30,11 @@ install: mkdir -p $(DESTDIR)$(OMD_ROOT)/lib/omd install -m 644 init_profile $(DESTDIR)$(OMD_ROOT)/lib/omd/ install -m 755 port_is_used $(DESTDIR)$(OMD_ROOT)/lib/omd/ + install -m 644 omd_bash_completion $(DESTDIR)$(OMD_ROOT)/lib/omd/ mkdir -p $(DESTDIR)$(OMD_ROOT)/lib/omd/scripts/post-create skel: + mkdir -p $(SKEL)/etc/bash_completion.d clean: diff --git a/omd/packages/omd/bash_completion b/omd/packages/omd/bash_completion new file mode 100644 index 0000000..b8589df --- /dev/null +++ b/omd/packages/omd/bash_completion @@ -0,0 +1,139 @@ +# Bash completion script for "omd" +# + +_omd_cmd_options() { + cmd=$1 + echo "-h --help" + omd $cmd -h | awk '{print $1}' | grep -v ^Possible | tr ',' ' ' + return +} + +_omd() +{ + local GLOBALCMDS="sites|version|versions|help" + local SITECMDS="start|stop|restart|reload|status|update|config|backup|restore|diff" + local ROOTCMDS="create|setversion" + local ROOTSITECMDS="rm|mv|cp|disable|enable|init|su" + + COMPREPLY=() + + local subcmd site + local opts="" + local cur="${COMP_WORDS[COMP_CWORD]}" + + # simply expland files and folders if current item starts with . or / + if [[ $cur =~ ^/|^\. ]]; then + COMPREPLY=( $(compgen -o default -- ${cur}) ) + return 0 + fi + + # check if first arg is omd + if [[ ${COMP_WORDS[0]} != omd ]]; then + COMPREPLY=( $(compgen -o default -- ${cur}) ) + return 0 + fi + + # parse args up to COMP_CWORD + subcmdargs=() + local i=1 + while [ $i -lt $COMP_CWORD ]; do + local arg=${COMP_WORDS[$i]} + case "$arg" in + -V) + i=$((i + 1)) + ;; + -*) + : + ;; + *) + if [ "x$subcmd" = "x" ]; then + subcmd=$arg + if [ $EUID -eq 0 ]; then + site="${COMP_WORDS[$i+1]}" + i=$((i + 1)) + else + site="$OMD_SITE" + fi + else + subcmdargs+=($arg) + fi + ;; + esac + i=$((i + 1)) + done + + local prev="${COMP_WORDS[COMP_CWORD-1]}" + + # omd -V|setversion ... + if [[ $prev =~ -V|setversion ]]; then + opts=$(cd /omd/versions && ls -1 | grep -v default) + + # omd ... + elif [ "x$subcmd" = "x" ]; then + opts="-V -f --force -v "$(omd help | grep ^\ *omd | awk '{print $2 }' | grep -v COMMAND) + + # omd versions|sites ... + elif [[ $subcmd =~ versions|sites ]]; then + opts="$(_omd_cmd_options $subcmd)" + + # omd version ... + elif [[ $subcmd =~ version ]]; then + opts="$(_omd_cmd_options $subcmd) $(omd sites --bare)" + + # omd <sitecmd> ... (as root) + elif _complete_as_root && [ $prev = $subcmd ] && [[ $subcmd =~ $ROOTSITECMDS|$SITECMDS ]]; then + # complete with site names + opts="-h --help $(omd sites --bare)" + + # omd backup|restore ... + elif [[ $subcmd =~ backup|restore ]]; then + opts="$(_omd_cmd_options $subcmd)" + COMPREPLY=( $(compgen -W "${opts}" -- ${cur}) $(compgen -o default -- ${cur}) ) + return 0 + + # omd diff ... + elif [[ $subcmd = diff ]]; then + if [ $EUID -eq 0 ]; then + opts="$(_omd_cmd_options $subcmd) $(omd diff -b $site | awk '{print $2}')" + else + opts="$(_omd_cmd_options $subcmd) $(omd diff -b | awk '{print $2}')" + fi + + # omd start|stop|restart|reload|status ... + elif [[ $subcmd =~ start|stop|restart|reload|status ]]; then + opts="$(_omd_cmd_options $subcmd) $(env ls -1 /omd/sites/$site/etc/init.d/ 2>/dev/null)" + + # omd config ... + elif [[ $subcmd =~ config ]]; then + + # omd config ... + if [ ${#subcmdargs[@]} -eq 0 ]; then + opts="$(_omd_cmd_options $subcmd) set show" + + # omd config set|show ... + elif [ ${#subcmdargs[@]} -eq 1 ]; then + opts=$(cat /omd/sites/$site/etc/omd/site.conf | awk -F= '{ print $1 }' | sed 's/^CONFIG_//') + + # omd config set <option> ... + elif [ ${subcmdargs[0]} = "set" ]; then + if [ $EUID -eq 0 ]; then + opts=$(su - $site ./lib/omd/hooks/$prev choices | awk -F: '{ print $1 }') + else + opts=$(./lib/omd/hooks/$prev choices | awk -F: '{ print $1 }') + fi + fi + + else + if [[ $subcmd =~ $SITECMDS|$ROOTSITECMDS|$GLOBALCMDS|$ROOTCMDS ]]; then + opts="$(_omd_cmd_options $subcmd)" + fi + fi + + if [ "x$opts" != "x" ]; then + COMPREPLY=( $(compgen -W "${opts}" -- ${cur}) ) + return 0 + fi +} + +# removing nospace breaks dir/file complete on ex. backup/restore +complete -o default -o nospace -F _omd omd diff --git a/omd/packages/omd/skel/.bashrc b/omd/packages/omd/skel/.bashrc index ab0e03d..84047bc 100644 --- a/omd/packages/omd/skel/.bashrc +++ b/omd/packages/omd/skel/.bashrc @@ -21,6 +21,12 @@ if [ "$PS1" ]; then alias la='ls -la' if [ -f /etc/bash_completion ]; then + # Load system wide bash completion (if available) . /etc/bash_completion + + # Load site specific bash completions + for file in $OMD_ROOT/etc/bash_completion.d/*; do + . $file; + done fi fi

7 years

5129 FIX fixed inventory plugin detection for SNMP devices

by Tom Baerwinkel

Module: check_mk Branch: master Commit: 77ea977ebde78e0874a4ee4064877ac12efcc43d URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=77ea977ebde78e… Author: Tom Baerwinkel <tb(a)mathias-kettner.de> Date: Mon Sep 4 15:29:21 2017 +0200 5129 FIX fixed inventory plugin detection for SNMP devices Fixes a problem with the HW/SW inventory of SNMP devices that resulted in too few entries. Change-Id: Ib02f65fe56ce6a6a4d8f0a28427eb65892e2399c --- .werks/5129 | 11 +++++++++++ cmk_base/agent_data.py | 2 +- cmk_base/discovery.py | 4 ++-- inventory/if | 2 +- 4 files changed, 15 insertions(+), 4 deletions(-) diff --git a/.werks/5129 b/.werks/5129 new file mode 100644 index 0000000..b9c4409 --- /dev/null +++ b/.werks/5129 @@ -0,0 +1,11 @@ +Title: fixed inventory plugin detection for SNMP devices +Level: 1 +Component: inv +Compatible: compat +Edition: cre +Version: 1.5.0i1 +Date: 1504531045 +Class: fix + +Fixes a problem with the HW/SW inventory of SNMP devices +that resulted in too few entries. diff --git a/cmk_base/agent_data.py b/cmk_base/agent_data.py index 5d6ffb5..15f874a 100644 --- a/cmk_base/agent_data.py +++ b/cmk_base/agent_data.py @@ -219,7 +219,7 @@ def get_realhost_info(hostname, ipaddress, check_type, max_cache_age, info_type = check_type.split(".")[0] if info_type in checks.snmp_info: oid_info = checks.snmp_info[info_type] - elif info_type in "inventory_plugins" in sys.modules: + elif info_type in inventory_plugins.inv_info: oid_info = inventory_plugins.inv_info[info_type].get("snmp_info") else: oid_info = None diff --git a/cmk_base/discovery.py b/cmk_base/discovery.py index 550f914..9d6364d 100644 --- a/cmk_base/discovery.py +++ b/cmk_base/discovery.py @@ -818,7 +818,7 @@ def snmp_scan(hostname, ipaddress, on_error = "ignore", for_inv=False): else: if for_inv and not inventory_plugins.is_snmp_plugin(check_type): continue - elif not checks.is_snmp_check(check_type): + elif not for_inv and not checks.is_snmp_check(check_type): continue basename = check_type.split(".")[0] @@ -830,7 +830,7 @@ def snmp_scan(hostname, ipaddress, on_error = "ignore", for_inv=False): scan_function = checks.snmp_scan_functions[check_type] elif basename in checks.snmp_scan_functions: scan_function = checks.snmp_scan_functions[basename] - elif "inventory_plugins" in sys.modules and basename in inventory_plugins.inv_info: + elif basename in inventory_plugins.inv_info: scan_function = inventory_plugins.inv_info[basename].get("snmp_scan_function") else: scan_function = None diff --git a/inventory/if b/inventory/if index dcc44f5..97657aa 100644 --- a/inventory/if +++ b/inventory/if @@ -134,5 +134,5 @@ inv_info['inv_if'] = { ( ".1.3.6.1.2.1.1", [ "3.0" ] ), # uptime ], 'snmp_scan_function': lambda oid: int(oid(".1.3.6.1.2.1.2.1.0")) >= 2, - 'includes': ['if.include'], + 'includes': ['if.include', 'uptime.include'], }

7 years

5178 Added option to hide edition/version from sidebar header

by Lars Michelsen

Module: check_mk Branch: master Commit: c160cbf2a408575be1120c920390ef8fb84b2584 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=c160cbf2a40857… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Mon Sep 4 12:25:28 2017 +0200 5178 Added option to hide edition/version from sidebar header You can use the new global setting "Show Check_MK edition & version in sidebar" to hide the version and edition information from the sidebar header. Change-Id: If9b5fb840185ef70d25ae16b16bcbe26be273d0d --- .werks/5178 | 11 +++++++++++ web/htdocs/sidebar.py | 12 +++++++----- web/plugins/config/builtin.py | 2 ++ web/plugins/wato/check_mk_configuration.py | 13 +++++++++++-- 4 files changed, 31 insertions(+), 7 deletions(-) diff --git a/.werks/5178 b/.werks/5178 new file mode 100644 index 0000000..d405d36 --- /dev/null +++ b/.werks/5178 @@ -0,0 +1,11 @@ +Title: Added option to hide edition/version from sidebar header +Level: 1 +Component: multisite +Compatible: compat +Edition: cre +Version: 1.5.0i1 +Date: 1504520670 +Class: feature + +You can use the new global setting "Show Check_MK edition & version in sidebar" to +hide the version and edition information from the sidebar header. diff --git a/web/htdocs/sidebar.py b/web/htdocs/sidebar.py index adb6bcd..a784637 100644 --- a/web/htdocs/sidebar.py +++ b/web/htdocs/sidebar.py @@ -229,11 +229,13 @@ def sidebar_head(): html.open_a(href=config.user.get_attribute("start_url") or config.start_url, target="main", title=_("Go to main overview")) html.img(src="images/sidebar_top.png", id_="side_bg") - html.open_div(id_="side_version") - html.open_a(href="version.py", target="main", title=_("Open release notes")) - html.write(get_check_mk_edition_title()) - html.br() - html.write(cmk.__version__) + + if config.sidebar_show_version_in_sidebar: + html.open_div(id_="side_version") + html.open_a(href="version.py", target="main", title=_("Open release notes")) + html.write(get_check_mk_edition_title()) + html.br() + html.write(cmk.__version__) if werks.may_acknowledge(): num_unacknowledged_werks = werks.num_unacknowledged_incompatible_werks() diff --git a/web/plugins/config/builtin.py b/web/plugins/config/builtin.py index 86c45e9..32e6963 100644 --- a/web/plugins/config/builtin.py +++ b/web/plugins/config/builtin.py @@ -79,6 +79,8 @@ sidebar_show_scrollbar = False # Enable regular checking for popup notifications sidebar_notify_interval = None +sidebar_show_version_in_sidebar = True + # Maximum number of results to show in quicksearch dropdown quicksearch_dropdown_limit = 80 diff --git a/web/plugins/wato/check_mk_configuration.py b/web/plugins/wato/check_mk_configuration.py index 7cd1983..d3546f9 100644 --- a/web/plugins/wato/check_mk_configuration.py +++ b/web/plugins/wato/check_mk_configuration.py @@ -448,8 +448,6 @@ register_configvar(group, domain = "multisite", ) - - register_configvar(group, "reschedule_timeout", Float(title = _("Timeout for rescheduling checks in Multisite"), @@ -462,6 +460,17 @@ register_configvar(group, display_format = "%.1f"), domain = "multisite") +register_configvar( + group, + "sidebar_show_version_in_sidebar", + Checkbox(title = _("Show Check_MK edition & version in sidebar"), + label = _("Show the edition ad version"), + help = _("Use this option to hide the Check_MK edition and version information from " + "the header of the sidebar."), + ), + domain = "multisite" +) + register_configvar(group, "sidebar_update_interval", Float(title = _("Interval of sidebar status updates"),

7 years

5176 CME: Custom design (Logo + color set) can now be set per customer

by Lars Michelsen

Module: check_mk Branch: master Commit: 7a3af2666b51af1cdc510d2f6b434b1920d94dd9 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=7a3af2666b51af… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Mon Sep 4 12:18:01 2017 +0200 5176 CME: Custom design (Logo + color set) can now be set per customer It is now possible to customize the GUI design for each customer individually. The customer individual setting overrides the globally configured things. Change-Id: I7d339a21c8261cd8a8552f891bb4f8c36bee7105 --- .werks/5176 | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/.werks/5176 b/.werks/5176 new file mode 100644 index 0000000..5065243 --- /dev/null +++ b/.werks/5176 @@ -0,0 +1,11 @@ +Title: CME: Custom design (Logo + color set) can now be set per customer +Level: 2 +Component: wato +Compatible: compat +Edition: cme +Version: 1.5.0i1 +Date: 1504520210 +Class: feature + +It is now possible to customize the GUI design for each customer individually. +The customer individual setting overrides the globally configured things.

7 years

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits September 2017