Skip to content

GitLab

Z
zabbix
Commit 7c83d17f authored by Vladimir Bashkirtsev's avatar Vladimir Bashkirtsev
Browse files
Options

Updated zabbix to 5.4.12

parent dbc7e3b1
Show whitespace changes
Inline Side-by-side
Showing with 21 additions and 21 deletions
Makefile
View file @ 7c83d17f
...@@ -11,10 +11,10 @@ amlogics905x: amlogic ...@@ -11,10 +11,10 @@ amlogics905x: amlogic
agent: zabbix-agent-service zabbix-agent-config agent: zabbix-agent-service zabbix-agent-config
groupadd -g 26 zabbix groupadd -g 26 zabbix
useradd -c "Zabbix Monitoring System" -d /var/lib/zabbix -g zabbix -s /bin/false -u 26 zabbix useradd -c "Zabbix Monitoring System" -d /var/lib/zabbix -g zabbix -s /bin/false -u 26 zabbix
tar xf zabbix-5.4.2.tar.gz tar xf zabbix-5.4.12.tar.gz
cd zabbix-5.4.2 && ./configure --prefix=/usr --sysconfdir=/etc --enable-agent --with-openssl cd zabbix-5.4.12 && ./configure --prefix=/usr --sysconfdir=/etc --enable-agent --with-openssl
$(MAKE) -C zabbix-5.4.2 $(MAKE) -C zabbix-5.4.12
$(MAKE) -C zabbix-5.4.2 install $(MAKE) -C zabbix-5.4.12 install
install -v -Dm755 zabbix_agentd-configure /usr/sbin/zabbix_agentd-configure install -v -Dm755 zabbix_agentd-configure /usr/sbin/zabbix_agentd-configure
sed -e 's|.*PidFile=.*|PidFile=/run/zabbix/zabbix_agentd.pid|' -i /etc/zabbix_agentd.conf sed -e 's|.*PidFile=.*|PidFile=/run/zabbix/zabbix_agentd.pid|' -i /etc/zabbix_agentd.conf
sed -e 's|.*LogType=.*|LogType=system|' -i /etc/zabbix_agentd.conf sed -e 's|.*LogType=.*|LogType=system|' -i /etc/zabbix_agentd.conf
...@@ -32,7 +32,7 @@ agent: zabbix-agent-service zabbix-agent-config ...@@ -32,7 +32,7 @@ agent: zabbix-agent-service zabbix-agent-config
systemctl enable zabbix-agent.service systemctl enable zabbix-agent.service
@echo "$$ZABBIX_AGENT_CONFIG" >> /etc/config/zabbix @echo "$$ZABBIX_AGENT_CONFIG" >> /etc/config/zabbix
install -v -Dm755 zabbix_agent /usr/share/easycwmp/functions/zabbix install -v -Dm755 zabbix_agent /usr/share/easycwmp/functions/zabbix
rm -rf zabbix-5.4.2 rm -rf zabbix-5.4.12
zabbix-agent-service: zabbix-agent-service:
define ZABBIX_AGENT_SERVICE define ZABBIX_AGENT_SERVICE
...@@ -64,10 +64,10 @@ endef ...@@ -64,10 +64,10 @@ endef
export ZABBIX_AGENT_CONFIG export ZABBIX_AGENT_CONFIG
agent2: agent2:
tar xf zabbix-5.4.2.tar.gz tar xf zabbix-5.4.12.tar.gz
cd zabbix-5.4.2 && PATH=$$PATH:$(CURDIR)/../go/go/bin ./configure --prefix=/usr --sysconfdir=/etc --disable-agent --enable-agent2 --with-openssl cd zabbix-5.4.12 && PATH=$$PATH:$(CURDIR)/../go/go/bin ./configure --prefix=/usr --sysconfdir=/etc --disable-agent --enable-agent2 --with-openssl
$(MAKE) -C zabbix-5.4.2 PATH=$$PATH:$(CURDIR)/../go/go/bin GOCACHE=/tmp/gocache GOPATH=$(CURDIR)/../go/go $(MAKE) -C zabbix-5.4.12 PATH=$$PATH:$(CURDIR)/../go/go/bin GOCACHE=/tmp/gocache GOPATH=$(CURDIR)/../go/go
$(MAKE) -C zabbix-5.4.2 install PATH=$$PATH:$(CURDIR)/../go/go/bin GOCACHE=/tmp/gocache GOPATH=$(CURDIR)/../go/go $(MAKE) -C zabbix-5.4.12 install PATH=$$PATH:$(CURDIR)/../go/go/bin GOCACHE=/tmp/gocache GOPATH=$(CURDIR)/../go/go
install -v -Dm755 zabbix_agentd-configure /usr/sbin/zabbix_agentd-configure install -v -Dm755 zabbix_agentd-configure /usr/sbin/zabbix_agentd-configure
sed -e 's|.*LogType=.*|LogType=system|' -i /etc/zabbix_agent2.conf sed -e 's|.*LogType=.*|LogType=system|' -i /etc/zabbix_agent2.conf
sed -e 's|^LogFile=.*|# LogFile=|' -i /etc/zabbix_agent2.conf sed -e 's|^LogFile=.*|# LogFile=|' -i /etc/zabbix_agent2.conf
...@@ -81,7 +81,7 @@ agent2: ...@@ -81,7 +81,7 @@ agent2:
systemctl enable zabbix-agent2.service systemctl enable zabbix-agent2.service
@echo "$$ZABBIX_AGENT2_CONFIG" >> /etc/config/zabbix @echo "$$ZABBIX_AGENT2_CONFIG" >> /etc/config/zabbix
install -v -Dm755 zabbix_agent /usr/share/easycwmp/functions/zabbix install -v -Dm755 zabbix_agent /usr/share/easycwmp/functions/zabbix
rm -rf zabbix-5.4.2 rm -rf zabbix-5.4.12
zabbix-agent2-service: zabbix-agent2-service:
define ZABBIX_AGENT2_SERVICE define ZABBIX_AGENT2_SERVICE
...@@ -183,10 +183,10 @@ i7-8809g: ...@@ -183,10 +183,10 @@ i7-8809g:
echo 'UserParameter=system.cpu7.freq.min,echo "`cat /sys/devices/system/cpu/cpufreq/policy7/cpuinfo_min_freq`000"' >> /etc/zabbix_agentd.userparams.conf echo 'UserParameter=system.cpu7.freq.min,echo "`cat /sys/devices/system/cpu/cpufreq/policy7/cpuinfo_min_freq`000"' >> /etc/zabbix_agentd.userparams.conf
server: zabbix-server-service zabbix-server-config httpd-conf server: zabbix-server-service zabbix-server-config httpd-conf
tar xf zabbix-5.4.2.tar.gz tar xf zabbix-5.4.12.tar.gz
cd zabbix-5.4.2 && ./configure --prefix=/usr --sysconfdir=/etc --enable-server --with-openssl --with-mysql --enable-ipv6 --with-net-snmp --with-libcurl --with-libxml2 --with-openipmi cd zabbix-5.4.12 && ./configure --prefix=/usr --sysconfdir=/etc --enable-server --with-openssl --with-mysql --enable-ipv6 --with-net-snmp --with-libcurl --with-libxml2 --with-openipmi
$(MAKE) -C zabbix-5.4.2 $(MAKE) -C zabbix-5.4.12
$(MAKE) -C zabbix-5.4.2 install $(MAKE) -C zabbix-5.4.12 install
install -v -Dm755 zabbix_server-configure /usr/sbin/zabbix_server-configure install -v -Dm755 zabbix_server-configure /usr/sbin/zabbix_server-configure
sed -e 's|.*LogType=.*|LogType=system|' -i /etc/zabbix_server.conf sed -e 's|.*LogType=.*|LogType=system|' -i /etc/zabbix_server.conf
sed -e 's|^LogFile=.*|# LogFile=|' -i /etc/zabbix_server.conf sed -e 's|^LogFile=.*|# LogFile=|' -i /etc/zabbix_server.conf
...@@ -196,7 +196,7 @@ server: zabbix-server-service zabbix-server-config httpd-conf ...@@ -196,7 +196,7 @@ server: zabbix-server-service zabbix-server-config httpd-conf
sed -e 's|^Timeout=.*|Timeout=10|' -i /etc/zabbix_server.conf sed -e 's|^Timeout=.*|Timeout=10|' -i /etc/zabbix_server.conf
sed -e 's|^# Include=/usr/local/etc/zabbix_server\.conf\.d/\*\.conf|Include=/etc/zabbix_server.conf.d/*.conf|' -i /etc/zabbix_server.conf sed -e 's|^# Include=/usr/local/etc/zabbix_server\.conf\.d/\*\.conf|Include=/etc/zabbix_server.conf.d/*.conf|' -i /etc/zabbix_server.conf
sed -e 's|^# StartIPMIPollers=0|StartIPMIPollers=1|' -i /etc/zabbix_server.conf sed -e 's|^# StartIPMIPollers=0|StartIPMIPollers=1|' -i /etc/zabbix_server.conf
cp -rv zabbix-5.4.2/ui/* /srv/www cp -rv zabbix-5.4.12/ui/* /srv/www
cp zabbix.conf.php /srv/www/conf cp zabbix.conf.php /srv/www/conf
rm /srv/www/conf/zabbix.conf.php.example rm /srv/www/conf/zabbix.conf.php.example
chown -v -R apache:apache /srv/www chown -v -R apache:apache /srv/www
...@@ -216,7 +216,7 @@ server: zabbix-server-service zabbix-server-config httpd-conf ...@@ -216,7 +216,7 @@ server: zabbix-server-service zabbix-server-config httpd-conf
install -d -m 750 /etc/sudoers.d install -d -m 750 /etc/sudoers.d
echo "Defaults !requiretty" > /etc/sudoers.d/nmap echo "Defaults !requiretty" > /etc/sudoers.d/nmap
echo "ALL ALL=(ALL) NOPASSWD: /usr/bin/nmap" >> /etc/sudoers.d/nmap echo "ALL ALL=(ALL) NOPASSWD: /usr/bin/nmap" >> /etc/sudoers.d/nmap
rm -rf zabbix-5.4.2 rm -rf zabbix-5.4.12
zabbix-server-service: zabbix-server-service:
define ZABBIX_SERVER_SERVICE define ZABBIX_SERVER_SERVICE
...@@ -264,10 +264,10 @@ endef ...@@ -264,10 +264,10 @@ endef
export HTTPD_CONF export HTTPD_CONF
proxy: zabbix-proxy-service zabbix-proxy-config proxy: zabbix-proxy-service zabbix-proxy-config
tar xf zabbix-5.4.2.tar.gz tar xf zabbix-5.4.12.tar.gz
cd zabbix-5.4.2 && ./configure --prefix=/usr --sysconfdir=/etc --enable-proxy --with-openssl --with-mysql --enable-ipv6 --with-net-snmp --with-libcurl --with-libxml2 --with-openipmi cd zabbix-5.4.12 && ./configure --prefix=/usr --sysconfdir=/etc --enable-proxy --with-openssl --with-mysql --enable-ipv6 --with-net-snmp --with-libcurl --with-libxml2 --with-openipmi
$(MAKE) -C zabbix-5.4.2 $(MAKE) -C zabbix-5.4.12
$(MAKE) -C zabbix-5.4.2 install $(MAKE) -C zabbix-5.4.12 install
install -v -Dm755 zabbix_proxy-configure /usr/sbin/zabbix_proxy-configure install -v -Dm755 zabbix_proxy-configure /usr/sbin/zabbix_proxy-configure
sed -e 's|^Server=.*|# Server=|' -i /etc/zabbix_proxy.conf sed -e 's|^Server=.*|# Server=|' -i /etc/zabbix_proxy.conf
sed -e 's|^Hostname=.*|# Hostname=|' -i /etc/zabbix_proxy.conf sed -e 's|^Hostname=.*|# Hostname=|' -i /etc/zabbix_proxy.conf
...@@ -289,7 +289,7 @@ proxy: zabbix-proxy-service zabbix-proxy-config ...@@ -289,7 +289,7 @@ proxy: zabbix-proxy-service zabbix-proxy-config
install -d -m 750 /etc/sudoers.d install -d -m 750 /etc/sudoers.d
echo "Defaults !requiretty" > /etc/sudoers.d/nmap echo "Defaults !requiretty" > /etc/sudoers.d/nmap
echo "ALL ALL=(ALL) NOPASSWD: /usr/bin/nmap" >> /etc/sudoers.d/nmap echo "ALL ALL=(ALL) NOPASSWD: /usr/bin/nmap" >> /etc/sudoers.d/nmap
rm -rf zabbix-5.4.2 rm -rf zabbix-5.4.12
zabbix-proxy-service: zabbix-proxy-service:
define ZABBIX_PROXY_SERVICE define ZABBIX_PROXY_SERVICE
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment