Merge lp:~kampka/ubuntu/quantal/zabbix/upstart-support into lp:ubuntu/quantal/zabbix

[Christian Kampka]

Ubuntu uses Upstart instead of SysVInit to run the init process.
This merge proposes upstart scripts that will allow Upstart to
start/stop all zabbix daemon components. Installation of the scripts
will happen automatically using Ubuntus Upstart debhelper scripts.

[James Page (james-page)]

I think that the upstart configurations look good; however I'm reticent to push a change in the way that zabbix is started to quantal so late in the development cycle.

LGTM and should be uploaded as soon as R opens...

review: Approve

[James Hunt (jamesodhunt)]

I agree with James - these configurations look good. Please could someone with appropriate privs upload to Raring?

[Dimitri John Ledkov (xnox)]

Uploaded.

review: Approve

=== modified file 'debian/changelog'
--- debian/changelog	2012-08-07 13:36:06 +0000
+++ debian/changelog	2012-09-17 12:22:54 +0000
@@ -1,3 +1,10 @@
+zabbix (1:2.0.2+dfsg-3ubuntu1) quantal; urgency=low
+
+  * Extended default config for agent and proxy.
+  * Upstart support for all zabbix components.
+
+ -- Christian Kampka <[e-mail]>  Mon, 17 Sep 2012 14:14:45 +0200
+
 zabbix (1:2.0.2+dfsg-3) unstable; urgency=low
 
   * init scripts update:

=== added file 'debian/zabbix-agent.default'
--- debian/zabbix-agent.default	1970-01-01 00:00:00 +0000
+++ debian/zabbix-agent.default	2012-09-17 12:22:54 +0000
@@ -0,0 +1,8 @@
+# defaults file for zabbix-agent
+
+# Start the Zabbix on init?
+# (Possible values: "yes" or "no")
+START="yes"
+
+# Absolute path to the configuration file
+CONFIG_FILE="/etc/zabbix/zabbix_agentd.conf"

=== added file 'debian/zabbix-agent.upstart'
--- debian/zabbix-agent.upstart	1970-01-01 00:00:00 +0000
+++ debian/zabbix-agent.upstart	2012-09-17 12:22:54 +0000
@@ -0,0 +1,41 @@
+# Upstart job to start the zabbix agent
+
+description "Zabbix agent"
+author "Christian Kampka <[e-mail]>"
+
+start on (filesystem and net-device-up IFACE=lo)
+stop on runlevel [!2345]
+
+expect daemon
+
+respawn
+
+# wait for agent to properly disconnect from server before killing it
+kill timeout 30
+
+console log
+
+env DIR="/var/run/zabbix"
+
+pre-start script
+
+  # stop job from continuing if no config file found for daemon
+  [ ! -f /etc/default/zabbix-agent ] && { stop; exit 0; }
+
+  # source the config file
+  . /etc/default/zabbix-agent
+
+  # stop job from continuing if admin has not enabled service in
+  # config file.
+  [ "x$START" = "xyes" ] || { stop; exit 0; }
+
+  [ -d "$DIR" ] || mkdir "$DIR"
+  chown -R zabbix:zabbix "$DIR"
+
+end script
+
+script
+  . /etc/default/zabbix-agent
+
+  exec /usr/sbin/zabbix_agentd -c $CONFIG_FILE
+end script

=== added file 'debian/zabbix-proxy-.upstart'
--- debian/zabbix-proxy-.upstart	1970-01-01 00:00:00 +0000
+++ debian/zabbix-proxy-.upstart	2012-09-17 12:22:54 +0000
@@ -0,0 +1,41 @@
+# Upstart job to start the zabbix proxy
+
+description "Zabbix proxy"
+author "Christian Kampka <[e-mail]>"
+
+start on (filesystem and net-device-up IFACE=lo)
+stop on runlevel [!2345]
+
+expect daemon
+
+respawn
+
+# wait for proxy to properly disconnect from server and agents before killing it
+kill timeout 30
+
+console log
+
+env DIR="/var/run/zabbix"
+
+pre-start script
+
+  # stop job from continuing if no config file found for daemon
+  [ ! -f /etc/default/zabbix-proxy ] && { stop; exit 0; }
+
+  # source the config file
+  . /etc/default/zabbix-proxy
+
+  # stop job from continuing if admin has not enabled service in
+  # config file.
+  [ "x$START" = "xyes" ] || { stop; exit 0; }
+
+  [ -d "$DIR" ] || mkdir "$DIR"
+  chown -R zabbix:zabbix "$DIR"
+
+end script
+
+script
+  . /etc/default/zabbix-proxy
+
+  exec /usr/sbin/zabbix_proxy -c $CONFIG_FILE
+end script

=== modified file 'debian/zabbix-proxy-mysql.zabbix-proxy.default'
--- debian/zabbix-proxy-mysql.zabbix-proxy.default	2012-05-24 00:34:04 +0000
+++ debian/zabbix-proxy-mysql.zabbix-proxy.default	2012-09-17 12:22:54 +0000
@@ -10,3 +10,5 @@
 # /usr/share/doc/zabbix-proxy-mysql/README.Debian
 START=no
 
+# Absolute path to the configuration file
+CONFIG_FILE="/etc/zabbix/zabbix_proxy.conf"

=== added symlink 'debian/zabbix-proxy-mysql.zabbix-proxy.upstart'
=== target is u'zabbix-proxy-.upstart'
=== modified file 'debian/zabbix-proxy-pgsql.zabbix-proxy.default'
--- debian/zabbix-proxy-pgsql.zabbix-proxy.default	2012-05-24 00:34:04 +0000
+++ debian/zabbix-proxy-pgsql.zabbix-proxy.default	2012-09-17 12:22:54 +0000
@@ -11,3 +11,5 @@
 # /usr/share/doc/zabbix-proxy-pgsql/README.Debian
 START=no
 
+# Absolute path to the configuration file
+CONFIG_FILE="/etc/zabbix/zabbix_proxy.conf"

=== added symlink 'debian/zabbix-proxy-pgsql.zabbix-proxy.upstart'
=== target is u'zabbix-proxy-.upstart'
=== modified file 'debian/zabbix-proxy-sqlite3.zabbix-proxy.default'
--- debian/zabbix-proxy-sqlite3.zabbix-proxy.default	2012-05-24 00:34:04 +0000
+++ debian/zabbix-proxy-sqlite3.zabbix-proxy.default	2012-09-17 12:22:54 +0000
@@ -11,3 +11,5 @@
 # /usr/share/doc/zabbix-proxy-sqlite3/README.Debian
 START=no
 
+# Absolute path to the configuration file
+CONFIG_FILE="/etc/zabbix/zabbix_proxy.conf"

=== added symlink 'debian/zabbix-proxy-sqlite3.zabbix-proxy.upstart'
=== target is u'zabbix-proxy-.upstart'
=== added file 'debian/zabbix-server-.upstart'
--- debian/zabbix-server-.upstart	1970-01-01 00:00:00 +0000
+++ debian/zabbix-server-.upstart	2012-09-17 12:22:54 +0000
@@ -0,0 +1,41 @@
+# Upstart job to start the zabbix server
+
+description "Zabbix server"
+author "Christian Kampka <[e-mail]>"
+
+start on (filesystem and net-device-up IFACE=lo)
+stop on runlevel [!2345]
+
+expect daemon
+
+respawn
+
+# wait for server to properly disconnect from connected nodes
+kill timeout 30
+
+console log
+
+env DIR="/var/run/zabbix"
+
+pre-start script
+
+  # stop job from continuing if no config file found for daemon
+  [ ! -f /etc/default/zabbix-server ] && { stop; exit 0; }
+
+  # source the config file
+  . /etc/default/zabbix-server
+
+  # stop job from continuing if admin has not enabled service in
+  # config file.
+  [ "x$START" = "xyes" ] || { stop; exit 0; }
+
+  [ -d "$DIR" ] || mkdir "$DIR"
+  chown -R zabbix:zabbix "$DIR"
+
+end script
+
+script
+  . /etc/default/zabbix-server
+
+  exec /usr/sbin/zabbix_server -c $CONFIG_FILE
+end script

=== modified file 'debian/zabbix-server-mysql.zabbix-server.default'
--- debian/zabbix-server-mysql.zabbix-server.default	2012-05-24 00:34:04 +0000
+++ debian/zabbix-server-mysql.zabbix-server.default	2012-09-17 12:22:54 +0000
@@ -10,3 +10,5 @@
 # /usr/share/doc/zabbix-server-mysql/README.Debian
 START=no
 
+# Absolute path to the configuration file
+CONFIG_FILE="/etc/zabbix/zabbix_server.conf"

=== added symlink 'debian/zabbix-server-mysql.zabbix-server.upstart'
=== target is u'zabbix-server-.upstart'
=== modified file 'debian/zabbix-server-pgsql.zabbix-server.default'
--- debian/zabbix-server-pgsql.zabbix-server.default	2012-05-24 00:34:04 +0000
+++ debian/zabbix-server-pgsql.zabbix-server.default	2012-09-17 12:22:54 +0000
@@ -11,3 +11,5 @@
 # /usr/share/doc/zabbix-server-pgsql/README.Debian
 START=no
 
+# Absolute path to the configuration file
+CONFIG_FILE="/etc/zabbix/zabbix_server.conf"

=== added symlink 'debian/zabbix-server-pgsql.zabbix-server.upstart'
=== target is u'zabbix-server-.upstart'
=== modified file 'debian/zabbix-server-sqlite3.zabbix-server.default'
--- debian/zabbix-server-sqlite3.zabbix-server.default	2012-05-24 00:34:04 +0000
+++ debian/zabbix-server-sqlite3.zabbix-server.default	2012-09-17 12:22:54 +0000
@@ -11,3 +11,5 @@
 # /usr/share/doc/zabbix-server-sqlite3/README.Debian
 START=no
 
+# Absolute path to the configuration file
+CONFIG_FILE="/etc/zabbix/zabbix_server.conf"

=== added symlink 'debian/zabbix-server-sqlite3.zabbix-server.upstart'
=== target is u'zabbix-server-.upstart'