Changes - j0ke.net Open Build Service

Difference Between Revision 10 and home:jg:projects:monitoring / monit

[-] [+]	Changed	monit.spec
@@ -10,6 +10,8 @@ Source1: monit-sysv-initscript Source2: monit.logrotate Source3: create_monit_ssl.sh +Source4: stunnel-check +source5: ix-monit.conf Patch0: monit-default-config-name.patch Patch1: monit-no-startup-msg.patch BuildRoot: %{_tmppath}/%{name}-%{version}-root @@ -40,7 +42,9 @@ make install DESTDIR=$RPM_BUILD_ROOT install -p -D -m0755 %{SOURCE1} $RPM_BUILD_ROOT%{_initrddir}/monit -install -p -D -m0600 monitrc $RPM_BUILD_ROOT%{_sysconfdir}/monit.conf +install -p -D -m0600 monitrc $RPM_BUILD_ROOT%{_sysconfdir}/monitrc +install -p -D -m0755 %{SOURCE4} $RPM_BUILD_ROOT%{_sysconfdir}/monit.d/stunnel +install -p -D -m0755 %{SOURCE5} $RPM_BUILD_ROOT%{_sysconfdir}/monit.d/ix-monit.conf install -p -D -m0755 monit $RPM_BUILD_ROOT%{_bindir}/monit install -p -D -m0755 %{SOURCE3} $RPM_BUILD_ROOT%{_bindir}/create_monit_ssl @@ -55,7 +59,7 @@ # set daemon mode timeout to 1 minute set daemon 60 # Include all files from %{_sysconfdir}/monit.d/ -include %{_sysconfdir}/monit.d/" >> $RPM_BUILD_ROOT%{_sysconfdir}/monit.conf +include %{_sysconfdir}/monit.d/" >> $RPM_BUILD_ROOT%{_sysconfdir}/monitrc echo "# log to monit.log set logfile /var/log/monit @@ -74,6 +78,8 @@ /sbin/service monit stop >/dev/null 2>&1 /sbin/chkconfig --del monit fi +mv /etc/monitrc /etc/monit.conf + %postun if [ "$1" -ge "1" ]; then @@ -84,8 +90,11 @@ %files %defattr(-,root,root,-) %doc COPYING README +%config(noreplace) %{_sysconfdir}/monitrc %config(noreplace) %{_sysconfdir}/monit.conf %config(noreplace) %{_sysconfdir}/monit.d/logging +%config(noreplace) %{_sysconfdir}/monit.d/stunnel +%config(noreplace) %{_sysconfdir}/monit.d/ix-monit.conf %config(noreplace) %{_sysconfdir}/logrotate.d/monit %ghost %{_localstatedir}/log/monit %{_sysconfdir}/monit.d/
[-] [+]	Changed	monit-default-config-name.patch ^
@@ -1,11 +1,11 @@ ---- monitor.h.renamed_config 2008-12-07 01:15:10.000000000 +0100 -+++ monitor.h 2008-12-07 01:15:19.000000000 +0100 -@@ -71,7 +71,7 @@ +--- src/monit.h 2013-11-12 15:27:49.959734900 +0100 ++++ src/monit.h~ 2013-08-27 23:35:08.000000000 +0200 +@@ -87,7 +87,7 @@ + #include "util/StringBuffer.h" - #define VERSION PACKAGE_VERSION --#define MONITRC "monitrc" -+#define MONITRC "monit.conf" +-#define MONITRC "monit.conf" ++#define MONITRC "monitrc" #define TIMEFORMAT "%Z %b %e %T" #define STRERROR strerror(errno) #define STRLEN 256
[-] [+]	Added	ix-monit.conf ^
@@ -0,0 +1,31 @@ +### set passwords where "CHANGEME is added" + +set daemon 30 + with start delay 60 + +set logfile syslog facility log_daemon +set idfile /var/.monit.id +set statefile /var/.monit.state + +set mailserver localhost + +set eventqueue + basedir /var/monit + slots 1000 + + +set mmonit http://monit:CHANGEME@85.236.36.116:8080/collector + +set alert techprojects@internetx.com + + +set httpd port 2812 and + use address 192.168.110.230 + allow 85.236.36.116 + allow 62.116.129.3 + allow 192.168.100.0/24 + allow localhost + allow monit:CHANGEME + allow admin:CHANGEME + allow @monit + allow @users readonly
[-] [+]	Added	stunnel-check ^
@@ -0,0 +1,22 @@ +check process stunnel with pidfile /var/run/stunnel/stunnel.pid + start program = "/etc/init.d/stunnel start" + stop program = "/etc/init.d/stunnel stop" + if failed host 192.168.110.230 port 3307 type TCP protocol MYSQL then + restart + group stunnel + depends stunnel_init + depends stunnel_bin + +check file stunnel_bin with path /usr/bin/stunnel + group stunnel + if failed checksum then unmonitor + if failed permission 755 then unmonitor + if failed uid root then unmonitor + if failed gid root then unmonitor + +check file stunnel_init with path /etc/init.d/stunnel + group stunnel + if failed checksum then unmonitor + if failed permission 755 then unmonitor + if failed uid root then unmonitor + if failed gid root then unmonitor