On Tue 2010.01.19 at 18:59 -0500, Okan Demirmen wrote:
> On Tue 2010.01.19 at 23:18 +0100, viq wrote:
> > On Mon, Jan 18, 2010 at 05:35:37PM -0500, Okan Demirmen wrote:
> > > On Sun 2010.01.17 at 22:38 -0500, Brad wrote:
> > > > I don't use this but someone mentioned it needed an update for
> > > > KERN_PROC2.
> > > >
> > > > Please test.
> > >
> > > i don't use this either; however, here's an updated diff with the the
> > > fifth and sixth levels added.
> > >
> > > please test.
> >
> > I don't use it either, but have it installed. And basing on this patch,
> > here's a plist update that makes it actually package - before it
> > complained about the dbpatches paths that changed. Also they started
> > keeping them instead of dbpatches/1/{mysql,postgresql,oracle} in
> > dbpatches/1.{6,8}/{mysql,postgresql,oracle} so I am not sure having
> > 1 replaced by ${MAJOR} in this case is useful.
> >
> > Man pages for zabbix_proxy and zabbix_server moved by hand to -server
> > subpackage - makes more sense to have them there, since that's where the
> > binaries are... Both mysql and pgsql flavor package fine with this.
> >
> > This brings quite a bit of changes to the -web subpackage, please
> > someone who knows something about it have a look at that.
>
> ugh, it didn't package before any of this...thank you for noticing!
>
> below includes the updated KERN_PROC2 adaptation, viq's PLIST changes to
> make it package and a few more PLIST changes from me: allow unprivileged
> users to review example configs (in share/examples/zabbix/), and remove
> MAJOR, since the db upgrade scripts are not tied to the current release,
> but rather for all previous releases.
oops, this one...
cheers,
okan
Index: Makefile
===================================================================
RCS file: /home/open/anoncvs/cvs/ports/net/zabbix/Makefile,v
retrieving revision 1.16
diff -u -p -r1.16 Makefile
--- Makefile 15 Jan 2010 09:08:02 -0000 1.16
+++ Makefile 19 Jan 2010 23:52:10 -0000
@@ -5,10 +5,9 @@ COMMENT-server = network and application
COMMENT-web = network and application monitoring - web frontend
VERSION = 1.8
-MAJOR = ${VERSION:R}
DISTNAME = zabbix-${VERSION}
-FULLPKGNAME-main = zabbix-agent-${VERSION}p0
-PKGNAME-server = zabbix-server-${VERSION}p1
+FULLPKGNAME-main = zabbix-agent-${VERSION}p1
+PKGNAME-server = zabbix-server-${VERSION}p2
PKGNAME-web = zabbix-web-${VERSION}
CATEGORIES = net
@@ -28,7 +27,7 @@ MULTI_PACKAGES = -main
PSEUDO_FLAVORS = no_server
FLAVORS = mysql pgsql
-SUBST_VARS += PREFIX-web ZABBIX_WEB MAJOR
+SUBST_VARS += PREFIX-web ZABBIX_WEB
WANTLIB = c kvm m
LIB_DEPENDS = lber,ldap::databases/openldap
Index: patches/patch-src_libs_zbxsysinfo_openbsd_proc_c
===================================================================
RCS file: patches/patch-src_libs_zbxsysinfo_openbsd_proc_c
diff -N patches/patch-src_libs_zbxsysinfo_openbsd_proc_c
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ patches/patch-src_libs_zbxsysinfo_openbsd_proc_c 19 Jan 2010 22:46:03
-0000
@@ -0,0 +1,173 @@
+$OpenBSD$
+--- src/libs/zbxsysinfo/openbsd/proc.c.orig Mon Dec 7 14:43:56 2009
++++ src/libs/zbxsysinfo/openbsd/proc.c Mon Jan 18 17:10:47 2010
+@@ -43,9 +43,11 @@ static int proc_argv(pid_t pid, char ***argv, size_t *
+ mib[1] = KERN_PROC_ARGS;
+ mib[2] = (int)pid;
+ mib[3] = KERN_PROC_ARGV;
++ mib[4] = sizeof(struct kinfo_proc2);
++ mib[5] = 0;
+ retry:
+ sz = *argv_alloc;
+- if (0 != sysctl(mib, 4, *argv, &sz, NULL, 0)) {
++ if (0 != sysctl(mib, 6, *argv, &sz, NULL, 0)) {
+ if (errno == ENOMEM) {
+ *argv_alloc *= 2;
+ *argv = zbx_realloc(*argv, *argv_alloc);
+@@ -57,7 +59,8 @@ retry:
+ mib[3] = KERN_PROC_NARGV;
+
+ sz = sizeof(int);
+- if (0 != sysctl(mib, 4, argc, &sz, NULL, 0))
++ mib[5] = (int)(sz / sizeof(struct kinfo_proc2));
++ if (0 != sysctl(mib, 6, argc, &sz, NULL, 0))
+ return FAIL;
+
+ return SUCCEED;
+@@ -98,7 +101,7 @@ int PROC_MEMORY(const char *cmd, const char *param
+
+ size_t sz;
+
+- struct kinfo_proc *proc = NULL;
++ struct kinfo_proc2 *proc = NULL;
+ struct passwd *usrinfo;
+
+ char **argv = NULL, *args = NULL;
+@@ -150,7 +153,7 @@ int PROC_MEMORY(const char *cmd, const char *param
+ pagesize = getpagesize();
+
+ mib[0] = CTL_KERN;
+- mib[1] = KERN_PROC;
++ mib[1] = KERN_PROC2;
+ if (NULL != usrinfo) {
+ mib[2] = KERN_PROC_UID;
+ mib[3] = usrinfo->pw_uid;
+@@ -158,28 +161,31 @@ int PROC_MEMORY(const char *cmd, const char *param
+ mib[2] = KERN_PROC_ALL;
+ mib[3] = 0;
+ }
++ mib[4] = sizeof(struct kinfo_proc2);
++ mib[5] = 0;
+
+ sz = 0;
+- if (0 != sysctl(mib, 4, NULL, &sz, NULL, 0))
++ if (0 != sysctl(mib, 6, NULL, &sz, NULL, 0))
+ return SYSINFO_RET_FAIL;
+
+- proc = (struct kinfo_proc *)zbx_malloc(proc, sz);
+- if (0 != sysctl(mib, 4, proc, &sz, NULL, 0)) {
++ proc = (struct kinfo_proc2 *)zbx_malloc(proc, sz);
++ mib[5] = (int)(sz / sizeof(struct kinfo_proc2));
++ if (0 != sysctl(mib, 6, proc, &sz, NULL, 0)) {
+ zbx_free(proc);
+ return SYSINFO_RET_FAIL;
+ }
+
+- count = sz / sizeof(struct kinfo_proc);
++ count = sz / sizeof(struct kinfo_proc2);
+
+ for (i = 0; i < count; i++) {
+ proc_ok = 0;
+ comm_ok = 0;
+
+- if (*procname == '\0' || 0 == strcmp(procname,
proc[i].kp_proc.p_comm))
++ if (*procname == '\0' || 0 == strcmp(procname, proc[i].p_comm))
+ proc_ok = 1;
+
+ if (*proccomm != '\0') {
+- if (SUCCEED == proc_argv(proc[i].kp_proc.p_pid, &argv,
&argv_alloc, &argc)) {
++ if (SUCCEED == proc_argv(proc[i].p_pid, &argv,
&argv_alloc, &argc)) {
+ collect_args(argv, argc, &args, &args_alloc);
+ if (NULL != zbx_regexp_match(args, proccomm,
NULL))
+ comm_ok = 1;
+@@ -188,9 +194,9 @@ int PROC_MEMORY(const char *cmd, const char *param
+ comm_ok = 1;
+
+ if (proc_ok && comm_ok) {
+- value = proc[i].kp_eproc.e_vm.vm_tsize
+- + proc[i].kp_eproc.e_vm.vm_dsize
+- + proc[i].kp_eproc.e_vm.vm_ssize;
++ value = proc[i].p_vm_tsize
++ + proc[i].p_vm_dsize
++ + proc[i].p_vm_ssize;
+ value *= pagesize;
+
+ if (0 == proccount++)
+@@ -231,7 +237,7 @@ int PROC_NUM(const char *cmd, const char *param,
unsig
+
+ size_t sz;
+
+- struct kinfo_proc *proc = NULL;
++ struct kinfo_proc2 *proc = NULL;
+ struct passwd *usrinfo;
+
+ char **argv = NULL, *args = NULL;
+@@ -281,7 +287,7 @@ int PROC_NUM(const char *cmd, const char *param,
unsig
+ *proccomm = '\0';
+
+ mib[0] = CTL_KERN;
+- mib[1] = KERN_PROC;
++ mib[1] = KERN_PROC2;
+ if (NULL != usrinfo) {
+ mib[2] = KERN_PROC_UID;
+ mib[3] = usrinfo->pw_uid;
+@@ -289,39 +295,42 @@ int PROC_NUM(const char *cmd, const char *param,
unsig
+ mib[2] = KERN_PROC_ALL;
+ mib[3] = 0;
+ }
++ mib[4] = sizeof(struct kinfo_proc2);
++ mib[5] = 0;
+
+ sz = 0;
+- if (0 != sysctl(mib, 4, NULL, &sz, NULL, 0))
++ if (0 != sysctl(mib, 6, NULL, &sz, NULL, 0))
+ return SYSINFO_RET_FAIL;
+
+- proc = (struct kinfo_proc *)zbx_malloc(proc, sz);
+- if (0 != sysctl(mib, 4, proc, &sz, NULL, 0)) {
++ proc = (struct kinfo_proc2 *)zbx_malloc(proc, sz);
++ mib[5] = (int)(sz / sizeof(struct kinfo_proc2));
++ if (0 != sysctl(mib, 6, proc, &sz, NULL, 0)) {
+ zbx_free(proc);
+ return SYSINFO_RET_FAIL;
+ }
+
+- count = sz / sizeof(struct kinfo_proc);
++ count = sz / sizeof(struct kinfo_proc2);
+
+ for (i = 0; i < count; i++) {
+ proc_ok = 0;
+ stat_ok = 0;
+ comm_ok = 0;
+
+- if (*procname == '\0' || 0 == strcmp(procname,
proc[i].kp_proc.p_comm))
++ if (*procname == '\0' || 0 == strcmp(procname, proc[i].p_comm))
+ proc_ok = 1;
+
+ if (zbx_proc_stat != ZBX_PROC_STAT_ALL) {
+ switch (zbx_proc_stat) {
+ case ZBX_PROC_STAT_RUN:
+- if (proc[i].kp_proc.p_stat == SRUN ||
proc[i].kp_proc.p_stat == SONPROC)
++ if (proc[i].p_stat == SRUN || proc[i].p_stat ==
SONPROC)
+ stat_ok = 1;
+ break;
+ case ZBX_PROC_STAT_SLEEP:
+- if (proc[i].kp_proc.p_stat == SSLEEP)
++ if (proc[i].p_stat == SSLEEP)
+ stat_ok = 1;
+ break;
+ case ZBX_PROC_STAT_ZOMB:
+- if (proc[i].kp_proc.p_stat == SZOMB ||
proc[i].kp_proc.p_stat == SDEAD)
++ if (proc[i].p_stat == SZOMB || proc[i].p_stat
== SDEAD)
+ stat_ok = 1;
+ break;
+ }
+@@ -329,7 +338,7 @@ int PROC_NUM(const char *cmd, const char *param,
unsig
+ stat_ok = 1;
+
+ if (*proccomm != '\0') {
+- if (SUCCEED == proc_argv(proc[i].kp_proc.p_pid, &argv,
&argv_alloc, &argc)) {
++ if (SUCCEED == proc_argv(proc[i].p_pid, &argv,
&argv_alloc, &argc)) {
+ collect_args(argv, argc, &args, &args_alloc);
+ if (zbx_regexp_match(args, proccomm, NULL) !=
NULL)
+ comm_ok = 1;
Index: pkg/PLIST-main
===================================================================
RCS file: /home/open/anoncvs/cvs/ports/net/zabbix/pkg/PLIST-main,v
retrieving revision 1.6
diff -u -p -r1.6 PLIST-main
--- pkg/PLIST-main 11 Jan 2010 18:30:01 -0000 1.6
+++ pkg/PLIST-main 19 Jan 2010 22:46:56 -0000
@@ -17,11 +17,15 @@ share/doc/zabbix/
share/doc/zabbix/README.OpenBSD
share/examples/zabbix/
@sample ${SYSCONFDIR}/zabbix/
+share/examples/zabbix/zabbix_agent.conf
@mode 640
@group _zabbix
-share/examples/zabbix/zabbix_agent.conf
@sample ${SYSCONFDIR}/zabbix/zabbix_agent.conf
+...@mode
+...@group
share/examples/zabbix/zabbix_agentd.conf
+...@mode 640
+...@group _zabbix
@sample ${SYSCONFDIR}/zabbix/zabbix_agentd.conf
@comment share/examples/zabbix/zabbix_agentd.win.conf
@mode
Index: pkg/PLIST-server
===================================================================
RCS file: /home/open/anoncvs/cvs/ports/net/zabbix/pkg/PLIST-server,v
retrieving revision 1.5
diff -u -p -r1.5 PLIST-server
--- pkg/PLIST-server 11 Jan 2010 18:30:01 -0000 1.5
+++ pkg/PLIST-server 19 Jan 2010 23:52:01 -0000
@@ -1,13 +1,19 @@
@comment $OpenBSD: PLIST-server,v 1.5 2010/01/11 18:30:01 jasper Exp $
@bin sbin/zabbix_proxy
@bin sbin/zabbix_server
-...@sample ${SYSCONFDIR}/zabbix/
+...@man man/man8/zabbix_proxy.8
+...@man man/man8/zabbix_server.8
share/examples/zabbix/
+...@sample ${SYSCONFDIR}/zabbix/
+share/examples/zabbix/zabbix_proxy.conf
@mode 640
@group _zabbix
-share/examples/zabbix/zabbix_proxy.conf
@sample ${SYSCONFDIR}/zabbix/zabbix_proxy.conf
+...@mode
+...@group
share/examples/zabbix/zabbix_server.conf
+...@mode 640
+...@group _zabbix
@sample ${SYSCONFDIR}/zabbix/zabbix_server.conf
@mode
@group
@@ -40,13 +46,21 @@ share/zabbix/data/images_oracle.sql
share/zabbix/data/images_pgsql.sql
share/zabbix/data/images_sqlite3.sql
share/zabbix/dbpatches/
-share/zabbix/dbpatches/${MAJOR}/
-share/zabbix/dbpatches/${MAJOR}/mysql/
-share/zabbix/dbpatches/${MAJOR}/mysql/patch.sql
-share/zabbix/dbpatches/${MAJOR}/oracle/
-share/zabbix/dbpatches/${MAJOR}/oracle/patch.sql
-share/zabbix/dbpatches/${MAJOR}/postgresql/
-share/zabbix/dbpatches/${MAJOR}/postgresql/patch.sql
+share/zabbix/dbpatches/1.6/
+share/zabbix/dbpatches/1.6/mysql/
+share/zabbix/dbpatches/1.6/mysql/patch.sql
+share/zabbix/dbpatches/1.6/oracle/
+share/zabbix/dbpatches/1.6/oracle/patch.sql
+share/zabbix/dbpatches/1.6/postgresql/
+share/zabbix/dbpatches/1.6/postgresql/patch.sql
+share/zabbix/dbpatches/1.8/
+share/zabbix/dbpatches/1.8/mysql/
+share/zabbix/dbpatches/1.8/mysql/patch.sql
+share/zabbix/dbpatches/1.8/mysql/upgrade
+share/zabbix/dbpatches/1.8/oracle/
+share/zabbix/dbpatches/1.8/oracle/patch.sql
+share/zabbix/dbpatches/1.8/postgresql/
+share/zabbix/dbpatches/1.8/postgresql/patch.sql
share/zabbix/schema/
share/zabbix/schema/mysql.sql
share/zabbix/schema/oracle.sql
Index: pkg/PLIST-web
===================================================================
RCS file: /home/open/anoncvs/cvs/ports/net/zabbix/pkg/PLIST-web,v
retrieving revision 1.7
diff -u -p -r1.7 PLIST-web
--- pkg/PLIST-web 24 Aug 2009 12:28:48 -0000 1.7
+++ pkg/PLIST-web 19 Jan 2010 22:46:03 -0000
@@ -5,6 +5,34 @@ conf/php5.sample/zabbix.ini
zabbix/
zabbix/acknow.php
zabbix/actionconf.php
+zabbix/api/
+zabbix/api/.htaccess
+zabbix/api/classes/
+zabbix/api/classes/class.caction.php
+zabbix/api/classes/class.calert.php
+zabbix/api/classes/class.capiinfo.php
+zabbix/api/classes/class.capplication.php
+zabbix/api/classes/class.cevent.php
+zabbix/api/classes/class.cgraph.php
+zabbix/api/classes/class.cgraphitem.php
+zabbix/api/classes/class.chost.php
+zabbix/api/classes/class.chostgroup.php
+zabbix/api/classes/class.citem.php
+zabbix/api/classes/class.cmaintenance.php
+zabbix/api/classes/class.cmap.php
+zabbix/api/classes/class.cscreen.php
+zabbix/api/classes/class.cscript.php
+zabbix/api/classes/class.ctemplate.php
+zabbix/api/classes/class.ctrigger.php
+zabbix/api/classes/class.cuser.php
+zabbix/api/classes/class.cusergroup.php
+zabbix/api/classes/class.cusermacro.php
+zabbix/api/classes/class.czbxapi.php
+zabbix/api/rpc/
+zabbix/api/rpc/class.cjsonrpc.php
+zabbix/api/rpc/class.czbxrpc.php
+zabbix/api_jsonrpc.php
+zabbix/applications.php
zabbix/audio/
zabbix/audio/trigger_off.wav
zabbix/audio/trigger_on.wav
@@ -12,7 +40,8 @@ zabbix/audio/trigger_on_average.wav
zabbix/audio/trigger_on_disaster.wav
zabbix/audio/trigger_on_high.wav
zabbix/audio/trigger_on_warning.wav
-zabbix/audit.php
+zabbix/auditacts.php
+zabbix/auditlogs.php
zabbix/authentication.php
zabbix/chart.php
zabbix/chart2.php
@@ -21,22 +50,28 @@ zabbix/chart4.php
zabbix/chart5.php
zabbix/chart6.php
zabbix/chart7.php
+zabbix/chart_bar.php
zabbix/chart_sla.php
zabbix/charts.php
@owner www
zabbix/conf/
@owner
+zabbix/conf/.htaccess
zabbix/conf/COPYING
zabbix/conf/maintenance.inc.php
+zabbix/conf/zabbix.conf.php.example
zabbix/config.php
zabbix/css.css
zabbix/dashboard.php
zabbix/discovery.php
zabbix/discoveryconf.php
zabbix/events.php
-zabbix/exp_imp.php
+zabbix/export.php
+zabbix/fonts/
+zabbix/fonts/DejaVuSans.ttf
zabbix/graphs.php
zabbix/history.php
+zabbix/hostgroups.php
zabbix/hostprofiles.php
zabbix/hosts.php
zabbix/httpconf.php
@@ -47,23 +82,27 @@ zabbix/images/
zabbix/images/flash/
zabbix/images/flash/zbxclock.swf
zabbix/images/general/
+zabbix/images/general/arrowdown.gif
+zabbix/images/general/arrowup.gif
zabbix/images/general/bar/
zabbix/images/general/bar/arrow_down.gif
-zabbix/images/general/bar/arrow_l.gif
-zabbix/images/general/bar/arrow_r.gif
zabbix/images/general/bar/arrow_sm.gif
zabbix/images/general/bar/arrow_up.gif
-zabbix/images/general/bar/bar_bg.gif
-zabbix/images/general/bar/bar_left.gif
-zabbix/images/general/bar/bar_middle.gif
-zabbix/images/general/bar/bar_right.gif
-zabbix/images/general/bar/bg.gif
+zabbix/images/general/bar/bar_bg.png
+zabbix/images/general/bar/bar_middle.png
+zabbix/images/general/bar/bg.png
zabbix/images/general/bar/cal.gif
-zabbix/images/general/bar/left.gif
-zabbix/images/general/bar/right.gif
+zabbix/images/general/bar/left.png
+zabbix/images/general/bar/left_arr.png
+zabbix/images/general/bar/right.png
+zabbix/images/general/bar/right_arr.png
zabbix/images/general/bttn/
zabbix/images/general/bttn/arrowdown.png
zabbix/images/general/bttn/arrowdown_bb.png
+zabbix/images/general/bttn/arrowleft.png
+zabbix/images/general/bttn/arrowleft_bb.png
+zabbix/images/general/bttn/arrowright.png
+zabbix/images/general/bttn/arrowright_bb.png
zabbix/images/general/bttn/arrowup.png
zabbix/images/general/bttn/arrowup_bb.png
zabbix/images/general/bttn/down.png
@@ -88,20 +127,46 @@ zabbix/images/general/bttn/up.png
zabbix/images/general/bttn/up_bb.png
zabbix/images/general/chart.png
zabbix/images/general/closed.gif
+zabbix/images/general/dbl_arrow_down.png
+zabbix/images/general/dbl_arrow_down2.png
+zabbix/images/general/dbl_arrow_up.png
+zabbix/images/general/dbl_arrow_up2.png
zabbix/images/general/down_icon.png
+zabbix/images/general/error.png
+zabbix/images/general/error_icon.png
zabbix/images/general/error_small.gif
zabbix/images/general/help.gif
zabbix/images/general/inst_completed.gif
zabbix/images/general/inst_current.gif
zabbix/images/general/inst_step.gif
+zabbix/images/general/ipmi_available.png
+zabbix/images/general/ipmi_available_bb.png
+zabbix/images/general/ipmi_unavailable.png
+zabbix/images/general/ipmi_unknown.png
+zabbix/images/general/ok.png
+zabbix/images/general/ok_bb.png
+zabbix/images/general/ok_icon.png
+zabbix/images/general/ok_icon_bb.png
zabbix/images/general/opened.gif
+zabbix/images/general/snmp_available.png
+zabbix/images/general/snmp_available_bb.png
+zabbix/images/general/snmp_unavailable.png
+zabbix/images/general/snmp_unknown.png
+zabbix/images/general/sort_down.png
+zabbix/images/general/sort_down_bb.png
zabbix/images/general/sort_downw.gif
+zabbix/images/general/sort_up.png
+zabbix/images/general/sort_up_bb.png
zabbix/images/general/sort_upw.gif
zabbix/images/general/sortdown.gif
zabbix/images/general/sortdown_off.gif
zabbix/images/general/sortup.gif
zabbix/images/general/sortup_off.gif
zabbix/images/general/tick.png
+zabbix/images/general/tr_space.gif
+zabbix/images/general/tr_top_bottom.gif
+zabbix/images/general/tr_top_right.gif
+zabbix/images/general/tr_top_right_bottom.gif
zabbix/images/general/tree/
zabbix/images/general/tree/minus.gif
zabbix/images/general/tree/plus.gif
@@ -109,23 +174,33 @@ zabbix/images/general/tree/point.gif
zabbix/images/general/tree/pointc.gif
zabbix/images/general/tree/pointl.gif
zabbix/images/general/tree/zero.gif
-zabbix/images/general/trigg_dep.gif
-zabbix/images/general/trigg_dep.png
zabbix/images/general/up_icon.png
zabbix/images/general/warning16r.gif
zabbix/images/general/warning_small.gif
zabbix/images/general/zabbix.ico
zabbix/images/general/zabbix.png
+zabbix/images/general/zabbix_available.png
+zabbix/images/general/zabbix_available_bb.png
zabbix/images/general/zabbix_bb.ico
zabbix/images/general/zabbix_bb.png
zabbix/images/general/zabbix_ob.ico
+zabbix/images/general/zabbix_unavailable.png
+zabbix/images/general/zabbix_unknown.png
+zabbix/images/general/zero.gif
zabbix/images/gradients/
zabbix/images/gradients/blink1.gif
zabbix/images/gradients/blink2.gif
zabbix/images/gradients/button.gif
zabbix/images/gradients/gradient.png
zabbix/images/gradients/menu_not_active.gif
+zabbix/images/gradients/menu_not_active2.gif
zabbix/images/gradients/menu_not_active_bb.gif
+zabbix/images/gradients/sla_blue.png
+zabbix/images/gradients/sla_blue15.png
+zabbix/images/gradients/sla_green.png
+zabbix/images/gradients/sla_green15.png
+zabbix/images/gradients/sla_red.png
+zabbix/images/gradients/sla_red15.png
zabbix/images/gradients/table_head.gif
zabbix/images/gradients/table_head2.gif
zabbix/images/gradients/table_head2_bb.gif
@@ -159,6 +234,8 @@ zabbix/images/sysmaps/old/Printer.png
zabbix/images/sysmaps/old/Router.png
zabbix/images/sysmaps/old/Server.png
zabbix/images/sysmaps/old/Workstation.png
+zabbix/imgstore.php
+zabbix/import.php
zabbix/include/
zabbix/include/.htaccess
zabbix/include/acknow.inc.php
@@ -167,39 +244,65 @@ zabbix/include/audit.inc.php
zabbix/include/blocks.inc.php
zabbix/include/classes/
zabbix/include/classes/.htaccess
-zabbix/include/classes/cbutton.inc.php
-zabbix/include/classes/ccheckbox.inc.php
-zabbix/include/classes/ccolor.inc.php
-zabbix/include/classes/ccombobox.inc.php
-zabbix/include/classes/cfile.inc.php
-zabbix/include/classes/cflash.inc.php
-zabbix/include/classes/cflashclock.mod.php
-zabbix/include/classes/cform.inc.php
-zabbix/include/classes/cformtable.inc.php
-zabbix/include/classes/chart.inc.php
-zabbix/include/classes/chelp.inc.php
-zabbix/include/classes/chostsinfo.mod.php
-zabbix/include/classes/ciframe.inc.php
-zabbix/include/classes/cimg.inc.php
-zabbix/include/classes/cldap.inc.php
-zabbix/include/classes/clink.inc.php
-zabbix/include/classes/clist.inc.php
-zabbix/include/classes/cmap.inc.php
-zabbix/include/classes/cpumenu.inc.php
-zabbix/include/classes/cscript.inc.php
-zabbix/include/classes/cserverinfo.mod.php
-zabbix/include/classes/cspan.inc.php
-zabbix/include/classes/ctable.inc.php
-zabbix/include/classes/ctableinfo.inc.php
-zabbix/include/classes/ctag.inc.php
-zabbix/include/classes/ctextarea.inc.php
-zabbix/include/classes/ctextbox.inc.php
-zabbix/include/classes/ctree.inc.php
-zabbix/include/classes/ctriggerinfo.mod.php
-zabbix/include/classes/curl.inc.php
-zabbix/include/classes/cvar.inc.php
-zabbix/include/classes/graph.inc.php
-zabbix/include/classes/pie.inc.php
+zabbix/include/classes/class.carea.php
+zabbix/include/classes/class.careamap.php
+zabbix/include/classes/class.cbar.php
+zabbix/include/classes/class.cbutton.php
+zabbix/include/classes/class.cbuttoncancel.php
+zabbix/include/classes/class.cbuttondelete.php
+zabbix/include/classes/class.cbuttonqmessage.php
+zabbix/include/classes/class.cchart.php
+zabbix/include/classes/class.ccheckbox.php
+zabbix/include/classes/class.ccol.php
+zabbix/include/classes/class.ccolor.php
+zabbix/include/classes/class.ccolorcell.php
+zabbix/include/classes/class.ccombobox.php
+zabbix/include/classes/class.ccomboitem.php
+zabbix/include/classes/class.cdiv.php
+zabbix/include/classes/class.ceditablecombobox.php
+zabbix/include/classes/class.cfile.php
+zabbix/include/classes/class.cflash.php
+zabbix/include/classes/class.cflashclock.php
+zabbix/include/classes/class.cflashembed.php
+zabbix/include/classes/class.cform.php
+zabbix/include/classes/class.cformtable.php
+zabbix/include/classes/class.cgraphdraw.php
+zabbix/include/classes/class.chelp.php
+zabbix/include/classes/class.chostsinfo.php
+zabbix/include/classes/class.chttp_request.php
+zabbix/include/classes/class.ciframe.php
+zabbix/include/classes/class.cimagetexttable.php
+zabbix/include/classes/class.cimg.php
+zabbix/include/classes/class.cipbox.php
+zabbix/include/classes/class.cjson.php
+zabbix/include/classes/class.cjsscript.php
+zabbix/include/classes/class.cldap.php
+zabbix/include/classes/class.clink.php
+zabbix/include/classes/class.clist.php
+zabbix/include/classes/class.clistbox.php
+zabbix/include/classes/class.clistitem.php
+zabbix/include/classes/class.cnumericbox.php
+zabbix/include/classes/class.cobject.php
+zabbix/include/classes/class.cparam.php
+zabbix/include/classes/class.cpassbox.php
+zabbix/include/classes/class.cpie.php
+zabbix/include/classes/class.cpumenu.php
+zabbix/include/classes/class.crow.php
+zabbix/include/classes/class.cserverinfo.php
+zabbix/include/classes/class.cspan.php
+zabbix/include/classes/class.ctable.php
+zabbix/include/classes/class.ctableinfo.php
+zabbix/include/classes/class.ctag.php
+zabbix/include/classes/class.ctextarea.php
+zabbix/include/classes/class.ctextbox.php
+zabbix/include/classes/class.ctree.php
+zabbix/include/classes/class.ctriggersinfo.php
+zabbix/include/classes/class.ctweenbox.php
+zabbix/include/classes/class.curl.php
+zabbix/include/classes/class.cvar.php
+zabbix/include/classes/class.cvartag.php
+zabbix/include/classes/class.cvisibilitybox.php
+zabbix/include/classes/class.cwidget.php
zabbix/include/config.inc.php
zabbix/include/copt.lib.php
zabbix/include/db.inc.php
@@ -214,7 +317,6 @@ zabbix/include/hosts.inc.php
zabbix/include/html.inc.php
zabbix/include/httptest.inc.php
zabbix/include/images.inc.php
-zabbix/include/import.inc.php
zabbix/include/items.inc.php
zabbix/include/js.inc.php
zabbix/include/locales/
@@ -234,13 +336,16 @@ zabbix/include/locales/pt_br.inc.php
zabbix/include/locales/ru_ru.inc.php
zabbix/include/locales/sp_sp.inc.php
zabbix/include/locales/sv_se.inc.php
+zabbix/include/maintenances.inc.php
zabbix/include/maps.inc.php
zabbix/include/media.inc.php
+zabbix/include/menu.inc.php
zabbix/include/nodes.inc.php
zabbix/include/page_footer.php
zabbix/include/page_header.php
zabbix/include/perm.inc.php
zabbix/include/profiles.inc.php
+zabbix/include/regexp.inc.php
zabbix/include/reports.inc.php
zabbix/include/screens.inc.php
zabbix/include/scripts.inc.php
@@ -253,53 +358,66 @@ zabbix/index.php
zabbix/instal.php
zabbix/items.php
zabbix/js/
-zabbix/js/ajax_req.js
-zabbix/js/calendar.js
+zabbix/js/class.calendar.js
+zabbix/js/class.cmap.js
+zabbix/js/class.cookie.js
+zabbix/js/class.cscreen.js
+zabbix/js/class.ctree.js
+zabbix/js/class.curl.js
+zabbix/js/class.pmaster.js
+zabbix/js/class.switcher.js
zabbix/js/common.js
-zabbix/js/gmenu.js
-zabbix/js/gpc.js
-zabbix/js/graphs.js
+zabbix/js/functions.js
+zabbix/js/gtlc.js
+zabbix/js/main.js
zabbix/js/menu.js
-zabbix/js/menu_scripts.js
zabbix/js/prototype.js
-zabbix/js/sbinit.js
-zabbix/js/sbox.js
-zabbix/js/scrollbar.js
-zabbix/js/services.js
-zabbix/js/showhint.js
-zabbix/js/tree.js
-zabbix/js/updater.js
+zabbix/js/scriptaculous/
+zabbix/js/scriptaculous.js
+zabbix/js/scriptaculous/builder.js
+zabbix/js/scriptaculous/controls.js
+zabbix/js/scriptaculous/dragdrop.js
+zabbix/js/scriptaculous/effects.js
+zabbix/js/scriptaculous/slider.js
+zabbix/js/scriptaculous/sound.js
zabbix/latest.php
zabbix/locales.php
+zabbix/maintenance.php
zabbix/map.php
zabbix/maps.php
zabbix/media_types.php
zabbix/nodes.php
zabbix/overview.php
zabbix/popup.php
+zabbix/popup_bitem.php
zabbix/popup_gitem.php
zabbix/popup_httpstep.php
zabbix/popup_link_tr.php
zabbix/popup_media.php
+zabbix/popup_period.php
zabbix/popup_right.php
zabbix/popup_trexpr.php
zabbix/popup_users.php
zabbix/popup_usrgrp.php
zabbix/profile.php
+zabbix/proxies.php
zabbix/queue.php
zabbix/report1.php
zabbix/report2.php
zabbix/report3.php
zabbix/report4.php
zabbix/report5.php
+zabbix/report6.php
zabbix/screenconf.php
zabbix/screenedit.php
zabbix/screens.php
zabbix/scripts.php
zabbix/scripts_exec.php
+zabbix/search.php
zabbix/services.php
zabbix/services_form.php
zabbix/setup.php
+zabbix/slides.php
zabbix/srv_status.php
zabbix/styles/
zabbix/styles/blocks.css
@@ -316,10 +434,14 @@ zabbix/styles/table.css
zabbix/styles/ul.css
zabbix/sysmap.php
zabbix/sysmaps.php
+zabbix/templates.php
zabbix/tr_comments.php
zabbix/tr_events.php
+zabbix/tr_logform.php
zabbix/tr_status.php
+zabbix/tr_testexpr.php
zabbix/triggers.php
+zabbix/usergrps.php
zabbix/users.php
zabbix/vtext.php
zabbix/warning.php
