diff -Nur smeserver-zabbix-server-0.1.old/createlinks smeserver-zabbix-server-0.1/createlinks --- smeserver-zabbix-server-0.1.old/createlinks 2020-05-13 22:05:14.431000000 -0400 +++ smeserver-zabbix-server-0.1/createlinks 2020-05-13 22:18:11.840000000 -0400 @@ -8,6 +8,8 @@ templates2events("/etc/httpd/conf/httpd.conf", $event); templates2events("/etc/zabbix/zabbix_server.conf", qw(zabbix-server-update bootstrap-console-save)); templates2events("/etc/zabbix/zabbix.conf.php", qw(zabbix-server-update bootstrap-console-save)); +# new path with zabbix 4.4.6 +templates2events("/etc/zabbix/web/zabbix.conf.php", qw(zabbix-server-update bootstrap-console-save)); templates2events("/etc/sudoers", $event); templates2events("/var/lib/zabbix/bin/sendxmpp", $event); templates2events("/var/lib/zabbix/.sendxmpprc", $event); @@ -15,10 +17,11 @@ templates2events("/etc/rc.d/init.d/masq", $event); # Services to restart -safe_symlink("restart", "root/etc/e-smith/events/$event/services2adjust/mysql.init"); +#safe_symlink("restart", "root/etc/e-smith/events/$event/services2adjust/mysql.init"); safe_symlink("sigusr1", "root/etc/e-smith/events/$event/services2adjust/httpd-e-smith"); safe_symlink("restart", "root/etc/e-smith/events/$event/services2adjust/zabbix-server"); safe_symlink("adjust", "root/etc/e-smith/events/$event/services2adjust/masq"); +safe_symlink("/etc/e-smith/events/actions/zabbix-server","root/etc/e-smith/events/$event/50zabbix-server"); # PHP header and footer safe_symlink("/etc/e-smith/templates-default/template-begin-php", "root/etc/e-smith/templates/etc/zabbix/zabbix.conf.php/template-begin"); diff -Nur smeserver-zabbix-server-0.1.old/root/etc/e-smith/events/actions/zabbix-server smeserver-zabbix-server-0.1/root/etc/e-smith/events/actions/zabbix-server --- smeserver-zabbix-server-0.1.old/root/etc/e-smith/events/actions/zabbix-server 1969-12-31 19:00:00.000000000 -0500 +++ smeserver-zabbix-server-0.1/root/etc/e-smith/events/actions/zabbix-server 2020-05-13 22:05:54.925000000 -0400 @@ -0,0 +1,7 @@ +#!/bin/bash +# restart mysql.init +/sbin/service zabbix-server stop 1>/dev/null +/sbin/service mysql.init restart 1>/dev/null +/sbin/service zabbix-server start 1>/dev/null +exit 0 + diff -Nur smeserver-zabbix-server-0.1.old/root/etc/e-smith/templates/etc/e-smith/sql/init/80zabbix-server smeserver-zabbix-server-0.1/root/etc/e-smith/templates/etc/e-smith/sql/init/80zabbix-server --- smeserver-zabbix-server-0.1.old/root/etc/e-smith/templates/etc/e-smith/sql/init/80zabbix-server 2020-05-13 22:05:14.450000000 -0400 +++ smeserver-zabbix-server-0.1/root/etc/e-smith/templates/etc/e-smith/sql/init/80zabbix-server 2020-05-13 22:07:18.871000000 -0400 @@ -1,27 +1,30 @@ { -my $db = ${'zabbix-server'}{'DbName'} || 'zabbix'; -my $user = ${'zabbix-server'}{'DbUser'} || 'zabbix'; +my $db = ${'zabbix-server'}{'DbName'} || 'zabbixdb'; +my $user = ${'zabbix-server'}{'DbUser'} || 'zabbixuser'; my $pass = ${'zabbix-server'}{'DbPassword'} || 'secret'; -my $schema = `rpm -qd zabbix-server-mysql | grep schema | grep mysql`; -$schema = `rpm -qd zabbix-server | grep schema | grep mysql` if $schema eq ''; -my $data = `rpm -qd zabbix-server-mysql | grep data.sql`; -$data = `rpm -qd zabbix-server| grep mysql | grep data.sql` if $data eq ''; -my $images = `rpm -qd zabbix-server-mysql | grep images_mysql`; -$images = `rpm -qd zabbix-server | grep mysql |grep images` if $images eq ''; - +my $schema = `rpm -qd zabbix-server-mysql | grep create`; +chomp $schema; +my $curcharset=`echo 'show variables like "character_set_database";'|mysql $db|grep character_set_database|sed -r 's/^character_set_database\\s*([a-zA-Z0-9_-]+)/\\1/'`; +chomp $curcharset; $OUT .= <<"END"; #! /bin/sh if [ -d /var/lib/mysql/$db ]; then - for P in \$(rpm -qd zabbix-server | grep dbpatch | grep mysql); do + + # check if utf8 + if [[ "$curcharset" != "utf8" ]] ;then + echo "ALTER DATABASE $db CHARACTER SET utf8 COLLATE utf8_bin;" |/usr/bin/mysql + echo 'ALTER TABLE `$db`.`problem_tag` DROP INDEX `problem_tag_1`, ADD INDEX `problem_tag_1` (`eventid`, `tag` (100), `value`(100));' |mysql + mysql --batch --skip-column-names --execute 'select concat("alter table ",TABLE_SCHEMA,".",TABLE_NAME," CONVERT TO CHARACTER SET utf8 COLLATE utf8_bin;") from information_schema.TABLES where TABLE_SCHEMA="$db"' |mysql + fi + for P in \$(rpm -qd zabbix-server-mysql | grep dbpatch | grep mysql); do /usr/bin/mysql $db < \$P done else - /usr/bin/mysqladmin create $db - /usr/bin/mysql $db < $schema - /usr/bin/mysql $db < $data - /usr/bin/mysql $db < $images + echo "CREATE DATABASE $db CHARACTER SET utf8 COLLATE utf8_bin;" | /usr/bin/mysql + /usr/bin/gunzip < $schema | /usr/bin/mysql $db + fi /usr/bin/mysql <