mirror of
https://abf.rosa.ru/djam/zabbix.git
synced 2025-02-23 09:52:49 +00:00
version update 2.0.3
This commit is contained in:
Alexander Khryukin
parent
5d7997d641
commit
9788ea0bbf
19 changed files with 779 additions and 522 deletions
3
.abf.yml
3
.abf.yml
|
|
@ -1,2 +1,3 @@
|
|||
sources:
|
||||
"zabbix-1.8.4.tar.gz": b70a31a39d7f54f32a3d6956594c2bfc4fd1e0e4
|
||||
"zabbix-2.0.1-free.tar.gz": f89cd75d92e5c9e8be8067742c26930131310b07
|
||||
"zabbix-2.0.3.tar.gz": be8902444890db9fb2c4795e62073ce7eea32d96
|
||||
|
|
|
|||
|
|
@ -1,16 +0,0 @@
|
|||
diff -p -up zabbix-1.6.2/include/zbxdb.h.mysqlheaders zabbix-1.6.2/include/zbxdb.h
|
||||
--- zabbix-1.6.2/include/zbxdb.h.mysqlheaders 2009-01-16 13:18:56.000000000 +0100
|
||||
+++ zabbix-1.6.2/include/zbxdb.h 2009-03-14 13:47:38.000000000 +0100
|
||||
@@ -30,9 +30,9 @@
|
||||
#define ZBX_MAX_SQL_SIZE 262144 /* 256KB */
|
||||
|
||||
#ifdef HAVE_MYSQL
|
||||
-# include "mysql.h"
|
||||
-# include "errmsg.h"
|
||||
-# include "mysqld_error.h"
|
||||
+# include <mysql.h>
|
||||
+# include <errmsg.h>
|
||||
+# include <mysqld_error.h>
|
||||
# define DB_HANDLE MYSQL
|
||||
extern MYSQL *conn;
|
||||
#endif /* HAVE_MYSQL */
|
||||
|
|
@ -1,24 +0,0 @@
|
|||
diff -p -up zabbix-1.6.2/src/libs/zbxdb/Makefile.in.mysqlcflags zabbix-1.6.2/src/libs/zbxdb/Makefile.in
|
||||
--- zabbix-1.6.2/src/libs/zbxdb/Makefile.in.mysqlcflags 2009-01-16 13:20:14.000000000 +0100
|
||||
+++ zabbix-1.6.2/src/libs/zbxdb/Makefile.in 2009-03-14 13:47:38.000000000 +0100
|
||||
@@ -63,7 +63,7 @@ DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(t
|
||||
depcomp = $(SHELL) $(top_srcdir)/depcomp
|
||||
am__depfiles_maybe = depfiles
|
||||
COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
|
||||
- $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
|
||||
+ $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) $(MYSQL_CFLAGS)
|
||||
CCLD = $(CC)
|
||||
LINK = $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
|
||||
SOURCES = $(libzbxdb_a_SOURCES)
|
||||
diff -p -up zabbix-1.6.2/src/libs/zbxdbhigh/Makefile.in.mysqlcflags zabbix-1.6.2/src/libs/zbxdbhigh/Makefile.in
|
||||
--- zabbix-1.6.2/src/libs/zbxdbhigh/Makefile.in.mysqlcflags 2009-01-16 13:20:15.000000000 +0100
|
||||
+++ zabbix-1.6.2/src/libs/zbxdbhigh/Makefile.in 2009-03-14 13:47:38.000000000 +0100
|
||||
@@ -67,7 +67,7 @@ DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(t
|
||||
depcomp = $(SHELL) $(top_srcdir)/depcomp
|
||||
am__depfiles_maybe = depfiles
|
||||
COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
|
||||
- $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
|
||||
+ $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) $(MYSQL_CFLAGS)
|
||||
CCLD = $(CC)
|
||||
LINK = $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
|
||||
SOURCES = $(libzbxdbhigh_a_SOURCES)
|
||||
39
zabbix-1.8.12-fping3.patch
Normal file
39
zabbix-1.8.12-fping3.patch
Normal file
|
|
@ -0,0 +1,39 @@
|
|||
diff -up zabbix-1.8.12/src/libs/zbxicmpping/icmpping.c.fping3 zabbix-1.8.12/src/libs/zbxicmpping/icmpping.c
|
||||
--- zabbix-1.8.12/src/libs/zbxicmpping/icmpping.c.fping3 2012-04-24 16:31:36.000000000 +0200
|
||||
+++ zabbix-1.8.12/src/libs/zbxicmpping/icmpping.c 2012-04-24 16:32:31.000000000 +0200
|
||||
@@ -42,34 +42,7 @@ static const char *source_ip6_option = N
|
||||
|
||||
static void get_source_ip_option(const char *fping, const char **option, unsigned char *checked)
|
||||
{
|
||||
- FILE *f;
|
||||
- char *p, tmp[MAX_STRING_LEN];
|
||||
-
|
||||
- zbx_snprintf(tmp, sizeof(tmp), "%s -h 2>&1", fping);
|
||||
-
|
||||
- if (NULL == (f = popen(tmp, "r")))
|
||||
- return;
|
||||
-
|
||||
- while (NULL != fgets(tmp, sizeof(tmp), f))
|
||||
- {
|
||||
- for (p = tmp; isspace(*p); p++)
|
||||
- ;
|
||||
-
|
||||
- if ('-' == p[0] && 'I' == p[1] && isspace(p[2]))
|
||||
- {
|
||||
- *option = "-I";
|
||||
- break;
|
||||
- }
|
||||
-
|
||||
- if ('-' == p[0] && 'S' == p[1] && isspace(p[2]))
|
||||
- {
|
||||
- *option = "-S";
|
||||
- break;
|
||||
- }
|
||||
- }
|
||||
-
|
||||
- pclose(f);
|
||||
-
|
||||
+ *option = "-S";
|
||||
*checked = 1;
|
||||
}
|
||||
|
||||
13
zabbix-2.0.1-config.patch
Normal file
13
zabbix-2.0.1-config.patch
Normal file
|
|
@ -0,0 +1,13 @@
|
|||
diff -up zabbix-2.0.1/frontends/php/include/config.inc.php.orig zabbix-2.0.1/frontends/php/include/config.inc.php
|
||||
--- zabbix-2.0.1/frontends/php/include/config.inc.php.orig 2012-06-27 23:03:03.000000000 +0200
|
||||
+++ zabbix-2.0.1/frontends/php/include/config.inc.php 2012-07-12 16:17:32.000000000 +0200
|
||||
@@ -64,8 +64,7 @@ $USER_DETAILS = array();
|
||||
$USER_RIGHTS = array();
|
||||
$ZBX_LOCALNODEID = 0;
|
||||
$ZBX_LOCMASTERID = 0;
|
||||
-$ZBX_CONFIGURATION_FILE = './conf/zabbix.conf.php';
|
||||
-$ZBX_CONFIGURATION_FILE = realpath(dirname($ZBX_CONFIGURATION_FILE)).DIRECTORY_SEPARATOR.basename($ZBX_CONFIGURATION_FILE);
|
||||
+$ZBX_CONFIGURATION_FILE = '/etc/zabbix/web/zabbix.conf.php';
|
||||
|
||||
// include tactical overview modules
|
||||
require_once dirname(__FILE__).'/locales.inc.php';
|
||||
12
zabbix-2.0.1-fonts-config.patch
Normal file
12
zabbix-2.0.1-fonts-config.patch
Normal file
|
|
@ -0,0 +1,12 @@
|
|||
diff -up zabbix-2.0.1/frontends/php/include/defines.inc.php.orig zabbix-2.0.1/frontends/php/include/defines.inc.php
|
||||
--- zabbix-2.0.1/frontends/php/include/defines.inc.php.orig 2012-06-27 23:03:03.000000000 +0200
|
||||
+++ zabbix-2.0.1/frontends/php/include/defines.inc.php 2012-07-12 16:19:11.000000000 +0200
|
||||
@@ -31,7 +31,7 @@ define('ZBX_PERIOD_DEFAULT', 3600); //
|
||||
|
||||
define('ZBX_WIDGET_ROWS', 20);
|
||||
|
||||
-define('ZBX_FONTPATH', realpath('fonts')); // where to search for font (GD > 2.0.18)
|
||||
+define('ZBX_FONTPATH', '/usr/share/fonts/dejavu'); // where to search for font (GD > 2.0.18)
|
||||
define('ZBX_GRAPH_FONT_NAME', 'DejaVuSans'); // font file name
|
||||
define('ZBX_GRAPH_LEGEND_HEIGHT', 120); // when graph height is less then this value, some legend will not show up
|
||||
|
||||
11
zabbix-2.0.1-no-flash.patch
Normal file
11
zabbix-2.0.1-no-flash.patch
Normal file
|
|
@ -0,0 +1,11 @@
|
|||
diff -up zabbix-2.0.1/frontends/php/include/screens.inc.php.orig zabbix-2.0.1/frontends/php/include/screens.inc.php
|
||||
--- zabbix-2.0.1/frontends/php/include/screens.inc.php.orig 2012-06-27 23:03:03.000000000 +0200
|
||||
+++ zabbix-2.0.1/frontends/php/include/screens.inc.php 2012-07-12 16:29:02.000000000 +0200
|
||||
@@ -25,7 +25,6 @@ require_once dirname(__FILE__).'/js.inc.
|
||||
|
||||
function screen_resources($resource = null) {
|
||||
$resources = array(
|
||||
- SCREEN_RESOURCE_CLOCK => _('Clock'),
|
||||
SCREEN_RESOURCE_DATA_OVERVIEW => _('Data overview'),
|
||||
SCREEN_RESOURCE_GRAPH => _('Graph'),
|
||||
SCREEN_RESOURCE_ACTIONS => _('History of actions'),
|
||||
|
|
@ -1,65 +0,0 @@
|
|||
#! /bin/sh
|
||||
#
|
||||
# chkconfig: 345 85 15
|
||||
# description: zabbix agent daemon
|
||||
#
|
||||
### BEGIN INIT INFO
|
||||
# Provides: zabbix-agent
|
||||
# Should-Start: $network
|
||||
# Should-Stop: $network
|
||||
# Default-Start: 345
|
||||
# Short-Description: Starts the Zabbix agent daemon
|
||||
# Description: This startup script launches Zabbix agent daemon
|
||||
### END INIT INFO
|
||||
|
||||
# zabbix details
|
||||
ZABBIX_AGENTD=/usr/sbin/zabbix_agentd
|
||||
CONF=/etc/zabbix/zabbix_agentd.conf
|
||||
PIDFILE=/var/run/zabbix-agent.pid
|
||||
|
||||
# Source function library.
|
||||
. /etc/rc.d/init.d/functions
|
||||
|
||||
# Source networking configuration.
|
||||
. /etc/sysconfig/network
|
||||
|
||||
# Check that networking is up.
|
||||
[ ${NETWORKING} = "no" ] && exit 0
|
||||
|
||||
[ -x $ZABBIX_AGENTD ] || exit 0
|
||||
[ -e $CONF ] || exit 0
|
||||
|
||||
RETVAL=0
|
||||
|
||||
case "$1" in
|
||||
start)
|
||||
echo -n "Starting zabbix agent: "
|
||||
daemon $ZABBIX_AGENTD -c $CONF
|
||||
RETVAL=$?
|
||||
echo
|
||||
[ $RETVAL -eq 0 ] && touch /var/lock/subsys/zabbix-agent
|
||||
;;
|
||||
stop)
|
||||
echo -n "Shutting down zabbix agent: "
|
||||
killproc zabbix_agentd
|
||||
RETVAL=$?
|
||||
echo
|
||||
[ $RETVAL -eq 0 ] && rm -f /var/lock/subsys/zabbix-agent
|
||||
;;
|
||||
restart|reload)
|
||||
$0 stop
|
||||
$0 start
|
||||
RETVAL=$?
|
||||
;;
|
||||
status)
|
||||
status zabbix_agentd
|
||||
RETVAL=$?
|
||||
;;
|
||||
*)
|
||||
echo "Usage: $0 {start|stop|restart|reload|status}"
|
||||
exit 1
|
||||
;;
|
||||
esac
|
||||
|
||||
exit $RETVAL
|
||||
|
||||
11
zabbix-agent.service
Normal file
11
zabbix-agent.service
Normal file
|
|
@ -0,0 +1,11 @@
|
|||
[Unit]
|
||||
Description=ZABBIX Monitor Agent
|
||||
After=syslog.target network.target
|
||||
|
||||
[Service]
|
||||
Type=oneshot
|
||||
ExecStart=/usr/sbin/zabbix_agentd
|
||||
RemainAfterExit=yes
|
||||
|
||||
[Install]
|
||||
WantedBy=multi-user.target
|
||||
11
zabbix-proxy-mysql.service
Normal file
11
zabbix-proxy-mysql.service
Normal file
|
|
@ -0,0 +1,11 @@
|
|||
[Unit]
|
||||
Description=ZABBIX MySQL Proxy Agent
|
||||
After=syslog.target network.target mysqld.service
|
||||
|
||||
[Service]
|
||||
Type=oneshot
|
||||
ExecStart=/usr/sbin/zabbix_proxy_mysql
|
||||
RemainAfterExit=yes
|
||||
|
||||
[Install]
|
||||
WantedBy=multi-user.target
|
||||
11
zabbix-proxy-pgsql.service
Normal file
11
zabbix-proxy-pgsql.service
Normal file
|
|
@ -0,0 +1,11 @@
|
|||
[Unit]
|
||||
Description=ZABBIX PostgreSQL Proxy Agent
|
||||
After=syslog.target network.target postgresql.service
|
||||
|
||||
[Service]
|
||||
Type=oneshot
|
||||
ExecStart=/usr/sbin/zabbix_proxy_pgsql
|
||||
RemainAfterExit=yes
|
||||
|
||||
[Install]
|
||||
WantedBy=multi-user.target
|
||||
11
zabbix-proxy-sqlite3.service
Normal file
11
zabbix-proxy-sqlite3.service
Normal file
|
|
@ -0,0 +1,11 @@
|
|||
[Unit]
|
||||
Description=ZABBIX SQLite3 Proxy Agent
|
||||
After=syslog.target network.target
|
||||
|
||||
[Service]
|
||||
Type=oneshot
|
||||
ExecStart=/usr/sbin/zabbix_proxy_sqlite3
|
||||
RemainAfterExit=yes
|
||||
|
||||
[Install]
|
||||
WantedBy=multi-user.target
|
||||
11
zabbix-server-mysql.service
Normal file
11
zabbix-server-mysql.service
Normal file
|
|
@ -0,0 +1,11 @@
|
|||
[Unit]
|
||||
Description=ZABBIX Server with MySQL DB
|
||||
After=syslog.target network.target mysqld.service
|
||||
|
||||
[Service]
|
||||
Type=oneshot
|
||||
ExecStart=/usr/sbin/zabbix_server_mysql
|
||||
RemainAfterExit=yes
|
||||
|
||||
[Install]
|
||||
WantedBy=multi-user.target
|
||||
11
zabbix-server-pgsql.service
Normal file
11
zabbix-server-pgsql.service
Normal file
|
|
@ -0,0 +1,11 @@
|
|||
[Unit]
|
||||
Description=ZABBIX Server with PostgreSQL DB
|
||||
After=syslog.target network.target postgresql.service
|
||||
|
||||
[Service]
|
||||
Type=oneshot
|
||||
ExecStart=/usr/sbin/zabbix_server_pgsql
|
||||
RemainAfterExit=yes
|
||||
|
||||
[Install]
|
||||
WantedBy=multi-user.target
|
||||
11
zabbix-server-sqlite3.service
Normal file
11
zabbix-server-sqlite3.service
Normal file
|
|
@ -0,0 +1,11 @@
|
|||
[Unit]
|
||||
Description=ZABBIX Server with SQLite3 DB
|
||||
After=syslog.target network.target
|
||||
|
||||
[Service]
|
||||
Type=oneshot
|
||||
ExecStart=/usr/sbin/zabbix_server_sqlite3
|
||||
RemainAfterExit=yes
|
||||
|
||||
[Install]
|
||||
WantedBy=multi-user.target
|
||||
|
|
@ -1,65 +0,0 @@
|
|||
#! /bin/sh
|
||||
#
|
||||
# chkconfig: 345 85 15
|
||||
# description: zabbix server daemon
|
||||
#
|
||||
### BEGIN INIT INFO
|
||||
# Provides: zabbix
|
||||
# Should-Start: $network
|
||||
# Should-Stop: $network
|
||||
# Default-Start: 345
|
||||
# Short-Description: Starts the Zabbix server daemon
|
||||
# Description: This startup script launches Zabbix server daemon
|
||||
### END INIT INFO
|
||||
|
||||
# zabbix details
|
||||
ZABBIX=/usr/sbin/zabbix_server
|
||||
CONF=/etc/zabbix/zabbix_server.conf
|
||||
PIDFILE=/var/run/zabbix.pid
|
||||
|
||||
# Source function library.
|
||||
. /etc/rc.d/init.d/functions
|
||||
|
||||
# Source networking configuration.
|
||||
. /etc/sysconfig/network
|
||||
|
||||
# Check that networking is up.
|
||||
[ ${NETWORKING} = "no" ] && exit 0
|
||||
|
||||
[ -x $ZABBIX ] || exit 0
|
||||
[ -e $CONF ] || exit 0
|
||||
|
||||
RETVAL=0
|
||||
|
||||
case "$1" in
|
||||
start)
|
||||
echo -n "Starting zabbix server: "
|
||||
daemon $ZABBIX -c $CONF
|
||||
RETVAL=$?
|
||||
echo
|
||||
[ $RETVAL -eq 0 ] && touch /var/lock/subsys/zabbix
|
||||
;;
|
||||
stop)
|
||||
echo -n "Shutting down zabbix server: "
|
||||
killproc zabbix_server
|
||||
RETVAL=$?
|
||||
echo
|
||||
[ $RETVAL -eq 0 ] && rm -f /var/lock/subsys/zabbix
|
||||
;;
|
||||
restart|reload)
|
||||
$0 stop
|
||||
$0 start
|
||||
RETVAL=$?
|
||||
;;
|
||||
status)
|
||||
status zabbix_server
|
||||
RETVAL=$?
|
||||
;;
|
||||
*)
|
||||
echo "Usage: $0 {start|stop|restart|reload|status}"
|
||||
exit 1
|
||||
;;
|
||||
esac
|
||||
|
||||
exit $RETVAL
|
||||
|
||||
1
zabbix-tmpfiles.conf
Normal file
1
zabbix-tmpfiles.conf
Normal file
|
|
@ -0,0 +1 @@
|
|||
D /var/run/zabbix 0755 zabbix zabbix -
|
||||
|
|
@ -9,10 +9,24 @@ Alias /zabbix /usr/share/zabbix
|
|||
AllowOverride None
|
||||
Order allow,deny
|
||||
Allow from all
|
||||
php_value memory_limit 128M
|
||||
php_value post_max_size 16M
|
||||
php_value max_execution_time 300
|
||||
php_value max_input_time 300
|
||||
</Directory>
|
||||
|
||||
<Directory "/usr/share/zabbix/conf">
|
||||
Order deny,allow
|
||||
Deny from all
|
||||
<files *.php>
|
||||
Order deny,allow
|
||||
Deny from all
|
||||
</files>
|
||||
</Directory>
|
||||
|
||||
<Directory "/usr/share/zabbix/api">
|
||||
Order deny,allow
|
||||
Deny from all
|
||||
<files *.php>
|
||||
Order deny,allow
|
||||
Deny from all
|
||||
</files>
|
||||
</Directory>
|
||||
|
||||
<Directory "/usr/share/zabbix/include">
|
||||
|
|
|
|||
953
zabbix.spec
953
zabbix.spec
File diff suppressed because it is too large
Load diff
Loading…
Add table
Reference in a new issue