[checkmk-commits] Cleaned up legacy sample config files

Module: check_mk Branch: master Commit: 6b3adcd42cbc40743fae2e5eb6399a660961852b URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=6b3adcd42cbc40… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Fri Dec 16 19:05:32 2016 +0100 Cleaned up legacy sample config files Change-Id: Ied70a59e78d0957f22db44737abce8efbcf51d03 --- Makefile | 4 -- main.mk | 3 -- multisite.mk | 112 ------------------------------------------------------- scripts/setup.sh | 5 ++- 4 files changed, 4 insertions(+), 120 deletions(-) diff --git a/Makefile b/Makefile index 36b142a..ff34b46 100644 --- a/Makefile +++ b/Makefile @@ -130,10 +130,6 @@ dist: mk-livestatus gzip $(DISTNAME)/doc.tar tar czf $(DISTNAME)/modules.tar.gz $(TAROPTS) -C modules $$(cd modules ; ls *.py) - cp main.mk main.mk-$(VERSION) - cp multisite.mk multisite.mk-$(VERSION) - tar czf $(DISTNAME)/conf.tar.gz $(TAROPTS) main.mk-$(VERSION) multisite.mk-$(VERSION) - rm -f main.mk-$(VERSION) multisite.mk-$(VERSION) tar czf $(DISTNAME)/agents.tar.gz $(TAROPTS) -C agents \ --exclude "msibuild" \ --exclude "build_version" \ diff --git a/main.mk b/main.mk deleted file mode 100644 index ecd627c..0000000 --- a/main.mk +++ /dev/null @@ -1,3 +0,0 @@ -# Put your host names here -# all_hosts = [ 'localhost' ] -all_hosts = [ ] diff --git a/multisite.mk b/multisite.mk deleted file mode 100644 index 0501d43..0000000 --- a/multisite.mk +++ /dev/null @@ -1,112 +0,0 @@ -# Confguration for Check_MK Multisite - -# Users with unrestricted permissions. These users will always -# have the permissions to edit users, roles and permissions, -# even if configuration has been edited via WATO -admin_users = [ "nagiosadmin" ] - -# NagVis -# -# The NagVis-Snapin needs to know the URL to nagvis. -# This is not always /nagvis/ - especially not for OMD -nagvis_base_url = '/nagvis' - -# Views allow to play alarm sounds according to the -# "worst" state of the shown items. Enable sounds here: -# enable_sounds = True - -# You can configure here which sounds to play. Possible events are "critical", -# "warning", "unknown", "ok", "up", "down", "unreachable" and -# "pending". Sounds are expected in the sounds subdirectory -# of htdocs (Default is /usr/share/check_mk/web/htdocs/sounds). The -# following setting is the default: -# sounds = [ -# ( "down", "down.wav" ), -# ( "critical", "critical.wav" ), -# ( "unknown", "unknown.wav" ), -# ( "warning", "warning.wav" ), -# ( None, "ok.wav" ), -# ] - -# Tabs for choosing number of columns refresh -# view_option_refreshes = [ 30, 60, 90, 0 ] -# view_option_columns = [ 1, 2, 3, 4, 5, 6, 8 ] - -# Custom links for "Custom Links" Snapin. Feel free to add your -# own links here. The boolean values True and False determine -# wether the sections are open or closed by default. - -# Links for everyone -custom_links['guest'] = [ - ( "Classical Nagios GUI", "../nagios/", "icon_home.png" ), - ( "Addons", True, [ - ( "PNP4Nagios", "../pnp4nagios/", "icon_pnp.png" ), - ( "NagVis", "../nagvis/", "icon_nagvis.png" ), - ]), -] - -# The members of the role 'user' get the same links as the guests -# but some in addition -custom_links['user'] = custom_links['guest'] + [ - ( "Open Source Components", False, [ - ( "Multisite", "http://mathias-kettner.de/checkmk_multisite.html", None, "_blank"), - ( "MK Livestatus", "http://mathias-kettner.de/checkmk_livestatus.html", None, "_blank"), - ( "Check_MK", "http://mathias-kettner.de/check_mk.html", None, "_blank"), - ( "Nagios", "http://www.nagios.org/", None, "_blank"), - ( "PNP4Nagios", "http://pnp4nagios.org/", None, "_blank"), - ( "NagVis", "http://nagvis.org/", None, "_blank"), - ( "RRDTool", "http://oss.oetiker.ch/rrdtool/", None, "_blank"), - ]) -] - -# The admins yet get further links -custom_links['admin'] = custom_links['user'] + [ - ( "Support", False, [ - ( "Mathias Kettner", "http://mathias-kettner.de/" ), - ( "Check_MK Mailinglists", "http://mathias-kettner.de/check_mk_lists.html" ), - ( "Check_MK Exchange (inofficial)", "http://exchange.check-mk.org/", None, "_blank" ), - ( "Monitoring Portal (German)", "http://monitoring-portal.org", None, "_blank"), - ]) -] - -# Hide certain views from the sidebar -# hidden_views = [ "hosttiles", "allhosts_mini" ] -# Vice versa: hide all views except these (be carefull, this - -# will also exclude custom views) -# visible_views = [ "allhosts", "searchsvc" ] - -# Load custom style sheet which can override styles defined in check_mk.css -# Put your style sheet into web/htdocs/ -# custom_style_sheet = "my_styles.css" - -# __ ___ _____ ___ -# \ \ / / \|_ _/ _ \ -# \ \ /\ / / _ \ | || | | | -# \ V V / ___ \| || |_| | -# \_/\_/_/ \_\_| \___/ -# -# Check_MK's Web Administration Tool - -# If you do not like WATO, you can disable it: -# wato_enabled = False - -# Host tags to be used in WATO -# wato_host_tags = [ -# ( "os_type", "Operating System", [ -# ( "lnx", "Linux", [ 'tcp' ],), -# ( "win", "Windows", [ 'tcp', 'snmp' ]), -# ( "net", "Network device", [ 'snmp' ]), -# ( "ping", "Other PING-only device", ), -# ]), -# ( "prod", "Productivity", [ -# ( "prod", "Production System" ), -# ( "test", "Test System" ), -# ]), -# ( "bulkwalk", "Bulkwalk (SNMP v2c)", [ -# ( None, "simple walk (SNMP v1)"), -# ( "bulk", "Bulkwalk (SNMP v2c)"), -# ], [ 'snmp' ]), -# -# ] - diff --git a/scripts/setup.sh b/scripts/setup.sh index 1c8ca37..51dc654 100755 --- a/scripts/setup.sh +++ b/scripts/setup.sh @@ -804,7 +804,10 @@ do chgrp $wwwgroup $DESTDIR$confdir/conf.d/distributed_wato.mk && chmod 664 $DESTDIR$confdir/conf.d/distributed_wato.mk fi && - tar xzf $SRCDIR/conf.tar.gz -C $DESTDIR$confdir && + echo -e "# Main configuration file of Check_MK\nWe highly recommend to use WATO to configure Check_MK these days." \ + > $DESTDIR$confdir/main.mk-$VERSION && + echo -e "# Main configuration file of the Check_MK GUI\nWe highly recommend to use WATO to configure Check_MK these days." \ + > $DESTDIR$confdir/multisite.mk-$VERSION && if [ -e $DESTDIR$confdir/check_mk.cfg -a ! -e $DESTDIR$confdir/main.mk ] ; then mv -v $DESTDIR$confdir/check_mk.cfg $DESTDIR$confdir/main.mk echo "Renamed check_mk.cfg into main.mk."