Revision: 48607
Author: river
Date: 2009-03-19 19:32:17 +0000 (Thu, 19 Mar 2009)
Log Message:
-----------
TSzabbix: new spec
Added Paths:
-----------
trunk/tools/ts-specs/TSzabbix.spec
trunk/tools/ts-specs/ext-sources/zabbix_agentd.xml
trunk/tools/ts-specs/ext-sources/zabbix_server.xml
trunk/tools/ts-specs/patches/zabbix-01-configure.diff
trunk/tools/ts-specs/patches/zabbix-02-snmp-localname.diff
Added: trunk/tools/ts-specs/TSzabbix.spec
===================================================================
--- trunk/tools/ts-specs/TSzabbix.spec (rev 0)
+++ trunk/tools/ts-specs/TSzabbix.spec 2009-03-19 19:32:17 UTC (rev 48607)
@@ -0,0 +1,117 @@
+%include Solaris.inc
+
+Name: TSzabbix
+Summary: Zabbix monitoring system
+Version: 1.6.2
+Source:
http://freefr.dl.sourceforge.net/sourceforge/zabbix/zabbix-%{version}.tar.gz
+Source1: zabbix_server.xml
+Source2: zabbix_agentd.xml
+Patch1: zabbix-01-configure.diff
+Patch2: zabbix-02-snmp-localname.diff
+SUNW_BaseDir: %{_basedir}
+BuildRoot: %{_tmppath}/%{name}-%{version}-build
+%include default-depend.inc
+
+BuildRequires: TSmysql
+BuildRequires: TScurl
+
+Requires: TSmysql
+Requires: TScurl
+
+%package agent
+Summary: %{summary} - agent daemon
+SUNW_BaseDir: %{_basedir}
+
+%package root
+Summary: %{summary} - / filesystem
+SUNW_BaseDir: /
+
+%package agent-root
+Summary: %{summary} - agent daemon - / filesystem
+SUNW_BaseDir: /
+
+%package proxy
+Summary: %{summary} - proxy daemon
+SUNW_BaseDir: %{_basedir}
+Requires: TSmysql
+
+%package proxy-root
+Summary: %{summary} - proxy daemon - / filesystem
+SUNW_BaseDir: /
+
+%prep
+%setup -q -n zabbix-%version
+%patch1 -p0
+%patch2 -p0
+
+%build
+%include stdenv.inc
+autoconf
+%_configure --enable-server \
+ --enable-proxy \
+ --enable-agent \
+ --enable-ipv6 \
+ --with-pgsql=/usr/postgres/8.3/bin/pg_config \
+ --with-libcurl=/opt/ts/bin/curl-config \
+ --with-net-snmp=/usr/sfw/bin/net-snmp-config \
+ --with-ldap
+
+%_make
+
+%install
+%include stdenv.inc
+%_make install DESTDIR=$RPM_BUILD_ROOT
+mkdir -p $RPM_BUILD_ROOT/etc/zabbix
+cp misc/conf/zabbix_agentd.conf
$RPM_BUILD_ROOT/etc/zabbix/zabbix_agentd.conf.example
+cp misc/conf/zabbix_agent.conf
$RPM_BUILD_ROOT/etc/zabbix/zabbix_agent.conf.example
+cp misc/conf/zabbix_server.conf
$RPM_BUILD_ROOT/etc/zabbix/zabbix_server.conf.example
+cp misc/conf/zabbix_proxy.conf
$RPM_BUILD_ROOT/etc/zabbix/zabbix_proxy.conf.example
+mkdir -p $RPM_BUILD_ROOT/var/svc/manifest/network
+cp %SOURCE1 %SOURCE2 $RPM_BUILD_ROOT/var/svc/manifest/network
+
+%clean
+rm -rf $RPM_BUILD_ROOT
+
+%files
+%defattr (-, root, root)
+%{_sbindir}/zabbix_sender
+%{_sbindir}/zabbix_get
+%{_sbindir}/zabbix_server
+
+%files root
+%defattr (-, root, sys)
+%dir /etc
+%dir /etc/zabbix
+/etc/zabbix/zabbix_server.conf.example
+%dir /var
+%dir /var/svc
+%dir /var/svc/manifest
+%dir /var/svc/manifest/network
+%class(manifest) /var/svc/manifest/network/zabbix_server.xml
+
+%files agent
+%defattr (-, root, root)
+%{_sbindir}/zabbix_agent
+%{_sbindir}/zabbix_agentd
+
+%files agent-root
+%defattr (-, root, sys)
+%dir /etc
+%dir /etc/zabbix
+/etc/zabbix/zabbix_agent.conf.example
+/etc/zabbix/zabbix_agentd.conf.example
+%dir /var
+%dir /var/svc
+%dir /var/svc/manifest
+%dir /var/svc/manifest/network
+%class(manifest) /var/svc/manifest/network/zabbix_agentd.xml
+
+%files proxy
+%defattr (-, root, root)
+%{_sbindir}/zabbix_proxy
+
+%files proxy-root
+%defattr (-, root, sys)
+%dir /etc
+%dir /etc/zabbix
+/etc/zabbix/zabbix_proxy.conf.example
Added: trunk/tools/ts-specs/ext-sources/zabbix_agentd.xml
===================================================================
--- trunk/tools/ts-specs/ext-sources/zabbix_agentd.xml
(rev 0)
+++ trunk/tools/ts-specs/ext-sources/zabbix_agentd.xml 2009-03-19 19:32:17 UTC
(rev 48607)
@@ -0,0 +1,23 @@
+<?xml version='1.0'?>
+<!DOCTYPE service_bundle SYSTEM '/usr/share/lib/xml/dtd/service_bundle.dtd.1'>
+<service_bundle type='manifest' name='zabbix-agentd'>
+ <service name='network/zabbix/agentd' type='service' version='0'>
+
+ <create_default_instance enabled="false" />
+ <single_instance/>
+
+ <dependency name='multi-user-server' grouping='optional_all'
restart_on='none' type='service'>
+ <service_fmri value='svc:/milestone/multi-user-server'/>
+ </dependency>
+
+ <exec_method name='start' type='method' exec='/opt/ts/sbin/zabbix_agentd'
timeout_seconds='60'/>
+ <exec_method name='stop' type='method' exec='pkill zabbix_agentd'
timeout_seconds='60'/>
+
+ <template>
+ <common_name>
+ <loctext xml:lang='C'>Zabbix agent daemon</loctext>
+ </common_name>
+ </template>
+
+ </service>
+</service_bundle>
Added: trunk/tools/ts-specs/ext-sources/zabbix_server.xml
===================================================================
--- trunk/tools/ts-specs/ext-sources/zabbix_server.xml
(rev 0)
+++ trunk/tools/ts-specs/ext-sources/zabbix_server.xml 2009-03-19 19:32:17 UTC
(rev 48607)
@@ -0,0 +1,23 @@
+<?xml version='1.0'?>
+<!DOCTYPE service_bundle SYSTEM '/usr/share/lib/xml/dtd/service_bundle.dtd.1'>
+<service_bundle type='manifest' name='zabbix-server'>
+ <service name='network/zabbix/server' type='service' version='0'>
+
+ <create_default_instance enabled="false" />
+ <single_instance/>
+
+ <dependency name='multi-user-server' grouping='optional_all'
restart_on='none' type='service'>
+ <service_fmri value='svc:/milestone/multi-user-server'/>
+ </dependency>
+
+ <exec_method name='start' type='method' exec='/opt/ts/sbin/zabbix_server'
timeout_seconds='60'/>
+ <exec_method name='stop' type='method' exec='pkill zabbix_server'
timeout_seconds='60'/>
+
+ <template>
+ <common_name>
+ <loctext xml:lang='C'>Zabbix server</loctext>
+ </common_name>
+ </template>
+
+ </service>
+</service_bundle>
Added: trunk/tools/ts-specs/patches/zabbix-01-configure.diff
===================================================================
--- trunk/tools/ts-specs/patches/zabbix-01-configure.diff
(rev 0)
+++ trunk/tools/ts-specs/patches/zabbix-01-configure.diff 2009-03-19
19:32:17 UTC (rev 48607)
@@ -0,0 +1,15 @@
+--- configure.in.old Wed Mar 18 07:13:07 2009
++++ configure.in Wed Mar 18 07:13:46 2009
+@@ -788,8 +788,10 @@
+
+ dnl Check if we want to compile everything with static
+ AC_ARG_ENABLE(static,[ --enable-static Build statically linked
binaries],
+-[ LDFLAGS="${LDFLAGS} -static";
+- enable_static=yes])
++[case "$enableval" in
++ yes) LDFLAGS="${LDFLAGS} -static"; enable_static=yes;;
++ *) ;;
++esac])
+
+ AC_ARG_ENABLE(server,[ --enable-server Turn on build of server],
+ [case "${enableval}" in
Added: trunk/tools/ts-specs/patches/zabbix-02-snmp-localname.diff
===================================================================
--- trunk/tools/ts-specs/patches/zabbix-02-snmp-localname.diff
(rev 0)
+++ trunk/tools/ts-specs/patches/zabbix-02-snmp-localname.diff 2009-03-19
19:32:17 UTC (rev 48607)
@@ -0,0 +1,24 @@
+--- ./src/zabbix_server/poller/checks_snmp.c.old Wed Mar 18 07:18:30 2009
++++ ./src/zabbix_server/poller/checks_snmp.c Wed Mar 18 07:18:46 2009
+@@ -176,8 +176,10 @@
+
+ zabbix_log (LOG_LEVEL_DEBUG, "OID [%s]", OID);
+
++#if 0
+ if (NULL != CONFIG_SOURCE_IP)
+ session.localname = CONFIG_SOURCE_IP;
++#endif
+
+ SOCK_STARTUP;
+ ss = snmp_open (&session);
+@@ -469,8 +471,10 @@
+ session.remote_port);
+ }
+
++#if 0
+ if (NULL != CONFIG_SOURCE_IP)
+ session.localname = CONFIG_SOURCE_IP;
++#endif
+
+ SOCK_STARTUP;
+ ss = snmp_open(&session);
_______________________________________________
MediaWiki-CVS mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-cvs