[omd-commits] OMD Git: omd: New version of Check_MK

[git version control]

Module: omd
Branch: master
Commit: 78eade576a0f1bf9dc6ed880354d9aa719d8bf99
URL:    http://omdistro.org/projects/omd/repository/revisions/78eade576a0f1bf9dc6ed880354d9aa719d8bf99

Author: Mathias Kettner <mk at mathias-kettner.de>
Date:   Fri Dec 10 17:02:55 2010 +0100

New version of Check_MK

---

 packages/check_mk/check_mk-1.1.9i1.tar.gz          |  Bin 2336126 -> 2340114 bytes
 packages/check_mk/skel/etc/check_mk/multisite.mk   |   76 ++++++++++++--------
 packages/mk-livestatus/Makefile                    |    2 +-
 packages/mk-livestatus/mk-livestatus-1.1.8.tar.gz  |  Bin 323754 -> 0 bytes
 .../mk-livestatus/mk-livestatus-1.1.9i1.tar.gz     |  Bin 0 -> 337541 bytes
 5 files changed, 47 insertions(+), 31 deletions(-)

diff --git a/packages/check_mk/check_mk-1.1.9i1.tar.gz b/packages/check_mk/check_mk-1.1.9i1.tar.gz
index 2146f5d..fc10115 100644
Binary files a/packages/check_mk/check_mk-1.1.9i1.tar.gz and b/packages/check_mk/check_mk-1.1.9i1.tar.gz differ
diff --git a/packages/check_mk/skel/etc/check_mk/multisite.mk b/packages/check_mk/skel/etc/check_mk/multisite.mk
index c6ec5ff..5a95e2c 100644
--- a/packages/check_mk/skel/etc/check_mk/multisite.mk
+++ b/packages/check_mk/skel/etc/check_mk/multisite.mk
@@ -18,21 +18,26 @@ admin_users = [ "omdadmin" ]
 
 # Sites to connect to. If this variable is unset, a single
 # connection to the local host is done.
-# sites = {
-#    # connect to local Nagios
-#    "local" : {
-#         "alias" : "Munich"
+#sites = {
+#   # connect to local Nagios
+#   "local" : {
+#        "alias" : "Munich"
+#   },
+#
+#   # connect to remote site (e.g. local OMD site 'paris')
+#   "paris": {
+#        "alias":          "Paris",
+#        "socket":         "tcp:127.0.0.1:6557",
+#        "url_prefix":     "/paris/",
 #    },
-# 
-#    # connect to remote site
-#    "paris": {
-#         "alias":          "Paris",
-#         "socket":         "tcp:10.0.0.2:6557",
-#         "nagios_url":     "/paris/nagios",
-#         "nagios_cgi_url": "/paris/nagios/cgi-bin",
-#         "pnp_url":        "/paris/pnp4nagios/",
-#     },
-# }
+#
+#   # connect to remote site (site on remote host)
+#   "rome": {
+#        "alias":          "Rome",
+#        "socket":         "tcp:10.0.0.2:6557",
+#        "url_prefix":     "http://10.0.0.2/rome/",
+#    },
+#}
 
 # 
 # NagVis
@@ -133,7 +138,6 @@ show_livestatus_errors = True
 # Default is 'main.py'
 # start_url = 'view.py?view_name=hostgroups'
 
-
 # Quicksearch: Limit the number of hits to shop in dropdown.
 # Default is to show at most 80 items.
 # quicksearch_dropdown_limit = 80
@@ -146,21 +150,33 @@ show_livestatus_errors = True
 #                             
 # Check_MK's Web Administration Tool
 
-# Host tags to be used in WATO
-config_files = [
-  ("wato-servers.mk", "Servers", [ "admin" ] ),
-  ("wato-network.mk", "Network", [ "admin" ] ),
-]
+# Declare files in conf.d/ to be editable with WATO. Please make
+# sure, that those files exist and are writable by Apache, e.g.:
+# touch /etc/check_mk/conf.d/network.mk
+# chgrp www /etc/check_mk/conf.d/network.mk
+# chmod 664 /etc/check_mk/conf.d/network.mk
+# 
+# config_files = [
+#   ("network.mk",    "Network, Infrastructure", [ "admin", "user" ] ),
+#   ("datacenter.mk", "Servers in Datacenter",   [ "admin" ]),
+# ]
 
 # Host tags to be used in WATO
-host_tags = [
-  ( "Check_MK Agent", [
-       ( "tcp",  "Yes" ),
-       ( "ping", "No"  ),
-    ]),
-  ( "SNMP", [
-       ( None,   "No"  ),
-       ( "snmp", "Yes" ),
-    ]),
-]
+# host_tags = [
+#  ( "Operating System", [
+#       ( "lnx", "Linux", [ 'tcp' ]),
+#       ( "win", "Windows", [ 'tcp', 'snmp' ]),
+#       ( "net", "Network device", [ 'snmp' ]),
+#       ( "ping", "Other PING-only device", ),
+#    ]),
+#  ( "Productivity", [
+#       ( "prod", "Production System" ),
+#       ( "test", "Test System" ),
+#    ]),
+#  ( "Bulkwalk (SNMP v2c)", [
+#       ( None,   "simple walk (SNMP v1)"),
+#       ( "bulk", "Bulkwalk (SNMP v2c)" ),
+#    ]),
+# 
+# ]
 
diff --git a/packages/mk-livestatus/Makefile b/packages/mk-livestatus/Makefile
index 0f13b97..f4eba31 100644
--- a/packages/mk-livestatus/Makefile
+++ b/packages/mk-livestatus/Makefile
@@ -1,7 +1,7 @@
 include ../../Makefile.omd
 
 NAME = mk-livestatus
-VERSION = 1.1.8
+VERSION = 1.1.9i1
 DIR = $(NAME)-$(VERSION)
 
 CONFIGUREOPTS = \
diff --git a/packages/mk-livestatus/mk-livestatus-1.1.8.tar.gz b/packages/mk-livestatus/mk-livestatus-1.1.8.tar.gz
deleted file mode 100644
index a95569d..0000000
Binary files a/packages/mk-livestatus/mk-livestatus-1.1.8.tar.gz and /dev/null differ
diff --git a/packages/mk-livestatus/mk-livestatus-1.1.9i1.tar.gz b/packages/mk-livestatus/mk-livestatus-1.1.9i1.tar.gz
new file mode 100644
index 0000000..46c3507
Binary files /dev/null and b/packages/mk-livestatus/mk-livestatus-1.1.9i1.tar.gz differ