1 |
diff -Nur -x '*.orig' -x '*.rej' smeserver-zabbix-agent-0.1/root/etc/e-smith/templates/etc/sudoers/00zabbixAgentAlias mezzanine_patched_smeserver-zabbix-agent-0.1/root/etc/e-smith/templates/etc/sudoers/00zabbixAgentAlias |
2 |
--- smeserver-zabbix-agent-0.1/root/etc/e-smith/templates/etc/sudoers/00zabbixAgentAlias 2009-03-01 20:26:14.000000000 +0100 |
3 |
+++ mezzanine_patched_smeserver-zabbix-agent-0.1/root/etc/e-smith/templates/etc/sudoers/00zabbixAgentAlias 2009-03-01 20:24:36.000000000 +0100 |
4 |
@@ -1,4 +1,5 @@ |
5 |
Cmnd_Alias ZABBIX_AGENT_ROOT = /usr/bin/mysqladmin status |
6 |
+Cmns_Alias ZABBIX_AGENT_MYSQL = /usr/bin/du -s /var/lib/mysql |
7 |
Cmnd_Alias ZABBIX_AGENT_SMELOG = /var/lib/zabbix/bin/logtail.pl /var/log/qpsmtpd/current /var/lib/zabbix/tmp/* |
8 |
Cmnd_Alias ZABBIX_AGENT_QMAIL = /var/lib/zabbix/bin/logtail.pl /var/log/qmail/current /var/lib/zabbix/tmp/* |
9 |
|
10 |
diff -Nur -x '*.orig' -x '*.rej' smeserver-zabbix-agent-0.1/root/etc/e-smith/templates/etc/sudoers/30zabbixAgent mezzanine_patched_smeserver-zabbix-agent-0.1/root/etc/e-smith/templates/etc/sudoers/30zabbixAgent |
11 |
--- smeserver-zabbix-agent-0.1/root/etc/e-smith/templates/etc/sudoers/30zabbixAgent 2009-03-01 20:26:14.000000000 +0100 |
12 |
+++ mezzanine_patched_smeserver-zabbix-agent-0.1/root/etc/e-smith/templates/etc/sudoers/30zabbixAgent 2009-03-01 20:25:02.000000000 +0100 |
13 |
@@ -1,4 +1,5 @@ |
14 |
zabbix ALL=(root) NOPASSWD: ZABBIX_AGENT_ROOT |
15 |
+zabbix ALL=(mysql) NOPASSWD: ZABBIX_AGENT_MYSQL |
16 |
zabbix ALL=(smelog) NOPASSWD: ZABBIX_AGENT_SMELOG |
17 |
zabbix ALL=(qmaill) NOPASSWD: ZABBIX_AGENT_QMAIL |
18 |
|
19 |
diff -Nur -x '*.orig' -x '*.rej' smeserver-zabbix-agent-0.1/root/etc/e-smith/templates/etc/zabbix/zabbix_agentd.conf/90UserParameters_mysql mezzanine_patched_smeserver-zabbix-agent-0.1/root/etc/e-smith/templates/etc/zabbix/zabbix_agentd.conf/90UserParameters_mysql |
20 |
--- smeserver-zabbix-agent-0.1/root/etc/e-smith/templates/etc/zabbix/zabbix_agentd.conf/90UserParameters_mysql 2009-03-01 20:26:14.000000000 +0100 |
21 |
+++ mezzanine_patched_smeserver-zabbix-agent-0.1/root/etc/e-smith/templates/etc/zabbix/zabbix_agentd.conf/90UserParameters_mysql 2009-03-01 20:25:57.000000000 +0100 |
22 |
@@ -1,21 +1,10 @@ |
23 |
-####### USER-DEFINED MONITORED PARAMETERS ####### |
24 |
-# Format: UserParameter=<key>,<shell command> |
25 |
-# Note that shell command must not return empty string or EOL only |
26 |
-#UserParameter=system.test,who|wc -l |
27 |
-### Set of parameter for monitoring MySQL server (v3.23.42 and later) |
28 |
-### Change -u<username> and add -p<password> if required |
29 |
-#UserParameter=mysql.ping,mysqladmin -uroot ping|grep alive|wc -l |
30 |
-#UserParameter=mysql.uptime,mysqladmin -uroot status|cut -f2 -d":"|cut -f1 -d"T" |
31 |
-#UserParameter=mysql.threads,mysqladmin -uroot status|cut -f3 -d":"|cut -f1 -d"Q" |
32 |
-#UserParameter=mysql.questions,mysqladmin -uroot status|cut -f4 -d":"|cut -f1 -d"S" |
33 |
-#UserParameter=mysql.slowqueries,mysqladmin -uroot status|cut -f5 -d":"|cut -f1 -d"O" |
34 |
-#UserParameter=mysql.qps,mysqladmin -uroot status|cut -f9 -d":" |
35 |
-#UserParameter=mysql.version,mysql -V |
36 |
|
37 |
-# SME Server |
38 |
+# Some stats about MySQL |
39 |
UserParameter=mysql.uptime,/var/lib/zabbix/bin/mysqladmin_status | cut -d" " -f2 |
40 |
UserParameter=mysql.threads,/var/lib/zabbix/bin/mysqladmin_status | cut -d" " -f5 |
41 |
UserParameter=mysql.questions,/var/lib/zabbix/bin/mysqladmin_status | cut -d" " -f8 |
42 |
UserParameter=mysql.slowqueries,/var/lib/zabbix/bin/mysqladmin_status | cut -d" " -f12 |
43 |
UserParameter=mysql.qps,/var/lib/zabbix/bin/mysqladmin_status | cut -d" " -f29 |
44 |
+UserParameter=mysql.qps,/var/lib/zabbix/bin/mysqladmin_status | cut -d" " -f29 |
45 |
+UserParameter=mysql.size,/usr/bin/sudo /usr/bin/du -s /var/lib/mysql | awk '\{print $1\}' |
46 |
|