Accepting request 105243 from server:monitoring

Automatic submission by obs-autosubmit

OBS-URL: https://build.opensuse.org/request/show/105243
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/nagios-rpm-macros?expand=0&rev=2

macros.check_mk

@@ -0,0 +1,37 @@
+#
+# directories and files for check_mk
+#
+# place for livestatus.o libdir
+%livestatus_libdir				%{_prefix}/lib/check_mk
+#
+%livestatus_socketdir           %{_var}/spool/check_mk
+# 
+%livestatus_datadir				%{_datadir}/check_mk
+# confdir
+%livestatus_sysconfdir 			%{_sysconfdir}/check_mk
+# vardir
+%livestatus_vardir				%{_var}/lib/check_mk
+# livesock
+%livestatus_socket_file			%{livestatus_socketdir}/livestatus.cmd
+# livebackendsdir
+%livestatus_livebackendsdir		%{livestatus_datadir}/livestatius
+# check_mk_configdir
+%livestatus_check_mk_configdir	%{livestatus_sysconfdir}/conf.d
+# agentsdir
+%livestatus_agentsdir			%{livestatus_datadir}/agents
+# checksdir
+%livestatus_checksdir			%{livestatus_datadir}/checks
+# modulesdir
+%livestatus_modulesdir			%{livestatus_datadir}/modules
+# web_dir
+%livestatus_webdir				%{livestatus_datadir}/web
+# agentslibdir
+%livestatus_agentslibdir		%{_prefix}/lib/check_mk_agent
+# agentsconfdir
+%livestatus_agentsconfdir		%{livestatus_sysconfdir}
+# htdocsdir
+%livestatus_htdocsdir			%{nagios_datadir}
+# nagconfdir
+%livestatus_nagconfdir			%{nagios_sysconfdir}/check_mk.d
+# rrddir
+%livestatus_rrddir				%{livestatus_libdir}/rrd

macros.icinga

@@ -0,0 +1,55 @@
+# macros.icinga file
+# macros for Icinga (sub-)package building - handle with care
+#
+
+#
+# directories
+#
+
+# install all plugins into this directory
+# Please note: we use the old Nagios directory here, as plugins are 
+# currently compatible
+%icinga_plugindir       %{_prefix}/lib/nagios/plugins
+# install all event handler scripts into this directory
+%icinga_eventhandlerdir %{_prefix}/lib/icinga/eventhandler
+# files like p1.pl are located directly in this directory
+%icinga_libdir          %{_prefix}/lib/icinga
+# Icinga uses this directory for status files
+%icinga_localstatedir   %{_var}/lib/icinga
+# Icinga configuration should be stored here
+%icinga_sysconfdir      %{_sysconfdir}/icinga
+# Icinga static webpages, stylesheets and theme(s), online documentation
+%icinga_datadir         %{_datadir}/icinga
+# Icinga spool dir (checkresult-dir)
+%icinga_spooldir        %{_var}/spool/icinga
+# Icinga logfile dir
+%icinga_logdir          %{_var}/log/icinga
+# Icinga cgi directory
+%icinga_cgidir          %{_prefix}/lib/icinga/cgi
+
+#
+# files
+#
+
+# This is the file that Icinga checks for external command requests
+%icinga_command_file         %{_var}/spool/icinga/icinga.cmd
+# This is where the current status of all monitored services and
+# hosts is stored. 
+%icinga_status_file          %{_var}/lib/icinga/status.dat
+# This is the file that Icinga should use to store host and
+# service state information before it shuts down.
+%icinga_state_retention_file %{_var}/lib/icinga/retention.dat
+
+#
+# users and groups
+#
+
+# User, Icinga runs under
+%icinga_user    icinga
+# Group, Icinga runs under
+%icinga_group   icinga
+# User, that can execute commands via %{icinga_command_file}
+%icinga_command_user   wwwrun
+# Group, that can execute commands via %{icinga_command_file}
+%icinga_command_group  icingacmd
+

macros.nagiosgrapher

@@ -0,0 +1,2 @@
+# used at least by nagios-plugins-traffic_limit
+%nagiosgrapher_sysconfdir %{nagios_sysconfdir}/ngraph.d

macros.pnp4nagios

@@ -0,0 +1,14 @@
+#
+# directories and files for pnp4nagios
+#
+# directory containing template files for pnp
+%pnp4nagios_baseurl					/pnp
+%pnp4nagios_datarootdir             %{_datadir}/pnp4nagios
+%pnp4nagios_datadir 	            %{_datadir}/pnp4nagios
+%pnp4nagios_logdir                  %{_var}/log/pnp4nagios
+%pnp4nagios_libdir                  %{_var}/lib/pnp4nagios
+%pnp4nagios_perfdata_dir 			%{_var}/lib/pnp4nagios/perfdata
+%pnp4nagios_perfdata_logfile 		%{_var}/log/pnp4nagios/perfdata.log
+%pnp4nagios_perfdata_spooldir 		%{_var}/spool/pnp4nagios
+%pnp4nagios_sysconfdir              %{_sysconfdir}/pnp4nagios
+%pnp4nagios_templatedir				%{_datadir}/pnp4nagios/templates

nagios-rpm-macros.changes

@@ -1,3 +1,24 @@
+-------------------------------------------------------------------
+Tue Feb  7 09:25:23 UTC 2012 - lars@linux-schulserver.de
+
+- added macros.icinga
+
+-------------------------------------------------------------------
+Wed Dec  7 15:42:27 UTC 2011 - lars@linux-schulserver.de
+
+- added macros.nagiosgrapher
+
+-------------------------------------------------------------------
+Tue Nov 29 13:25:23 UTC 2011 - lars@linux-schulserver.de
+
+- added %pnp4nagios_libdir
+
+-------------------------------------------------------------------
+Sat Nov  5 16:03:58 UTC 2011 - lars@linux-schulserver.de
+
+- added first set of macros for check_mk aka livestatus
+- added first set of macros for pnp4nagios
+
 -------------------------------------------------------------------
 Tue Nov  1 12:55:27 UTC 2011 - lars@linux-schulserver.de
 

nagios-rpm-macros.spec

@@ -1,6 +1,8 @@
 #
 # spec file for package nagios-rpm-macros
 #
+# Copyright (c) 2012 SUSE LINUX Products GmbH, Nuernberg, Germany.
+#
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
 # upon. The license for this file, and modifications and additions to the
@@ -10,26 +12,30 @@
 # license that conforms to the Open Source Definition (Version 1.9)
 # published by the Open Source Initiative.
 
-
+# Please submit bugfixes or comments via http://bugs.opensuse.org/
-# norootforbuild
+#
 
 
 Name:           nagios-rpm-macros
 Summary:        RPM Macros for Nagios based packages
-Version:        0.002
+License:        BSD-3-Clause
-Release:        1
-Url:            http://en.opensuse.org/Nagios
-License:        BSD3c(or similar)
 Group:          System/Monitoring
+Version:        0.03
+Release:        0
+Url:            http://en.opensuse.org/Nagios
 Source0:        macros.nagios
 Source1:        %{name}-README
 Source2:        nagios-rpm-macros-COPYING
+Source3:        macros.check_mk
+Source4:        macros.pnp4nagios
+Source5:        macros.nagiosgrapher
+Source6:        macros.icinga
 BuildArch:      noarch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 
 %description
 This package provides rpm macros for building packages for 
-Nagios and/or Icinga.
+Nagios, check_mk and/or Icinga.
 
 
 %prep
@@ -40,6 +46,10 @@ Nagios and/or Icinga.
 
 %install
 install -Dm644 %{S:0} %{buildroot}%{_sysconfdir}/rpm/macros.nagios
+cat %{S:3} >> %{buildroot}%{_sysconfdir}/rpm/macros.nagios
+cat %{S:4} >> %{buildroot}%{_sysconfdir}/rpm/macros.nagios
+cat %{S:5} >> %{buildroot}%{_sysconfdir}/rpm/macros.nagios
+cat %{S:6} >> %{buildroot}%{_sysconfdir}/rpm/macros.nagios
 
 %clean
 rm -rf %buildroot