Changes - j0ke.net Open Build Service

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

[-] [+]	Changed	monit.spec
@@ -1,5 +1,5 @@ Name: monit -Version: 5.6 +Version: 5.8.1 Release: 99ix Summary: Manages and monitors processes, files, directories and devices @@ -10,6 +10,9 @@ Source1: monit-sysv-initscript Source2: monit.logrotate Source3: create_monit_ssl.sh +Source4: stunnel-check +Source5: ix-monit.conf +Source7: monit-logging-conf Patch0: monit-default-config-name.patch Patch1: monit-no-startup-msg.patch BuildRoot: %{_tmppath}/%{name}-%{version}-root @@ -20,6 +23,7 @@ BuildRequires: byacc BuildRequires: gcc, make BuildRequires: pam-devel +Requires: make %description monit is a utility for managing and monitoring, processes, files, directories @@ -28,7 +32,7 @@ %prep %setup -q -#%patch0 -b .confname +%patch0 -b .confname #%patch1 -b .nomsg %build @@ -40,7 +44,8 @@ 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 %{SOURCE5} $RPM_BUILD_ROOT%{_sysconfdir}/monit.conf +install -p -D -m0755 %{SOURCE7} $RPM_BUILD_ROOT%{_sysconfdir}/monit.d/logging.conf install -p -D -m0755 monit $RPM_BUILD_ROOT%{_bindir}/monit install -p -D -m0755 %{SOURCE3} $RPM_BUILD_ROOT%{_bindir}/create_monit_ssl @@ -51,15 +56,6 @@ # Let's include some good defaults mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/monit.d -echo " -# 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 - -echo "# log to monit.log -set logfile /var/log/monit -" > $RPM_BUILD_ROOT%{_sysconfdir}/monit.d/logging %clean @@ -69,12 +65,34 @@ # This adds the proper /etc/rc.d links for the script /sbin/chkconfig --add monit +exec > /dev/null 2> /dev/null +if [ ! -f %{_sysconfdir}/pki/tls/certs/monit.pem ] ; then +pushd %{_sysconfdir}/pki/tls/certs +umask 077 +cat << EOF \| make monit.pem +-- +Bavaria +Regensburg +Monit Default Cert +IX Tech +localhost.localdomain +root@localhost.localdomain +EOF +chown root:root monit.pem +chmod 600 monit.pem +popd +fi +exit 0 + + + %preun if [ $1 = 0 ]; then /sbin/service monit stop >/dev/null 2>&1 /sbin/chkconfig --del monit fi + %postun if [ "$1" -ge "1" ]; then /sbin/service monit condrestart >/dev/null 2>&1 \|\| : @@ -85,7 +103,9 @@ %defattr(-,root,root,-) %doc COPYING README %config(noreplace) %{_sysconfdir}/monit.conf -%config(noreplace) %{_sysconfdir}/monit.d/logging +%config(noreplace) %{_sysconfdir}/monit.d/logging.conf +#%config(noreplace) %{_sysconfdir}/monit.d/ix-monit.conf +#%config(noreplace) %{_sysconfdir}/monit.ssl/* %config(noreplace) %{_sysconfdir}/logrotate.d/monit %ghost %{_localstatedir}/log/monit %{_sysconfdir}/monit.d/
[-] [+]	Changed	monit-default-config-name.patch ^
@@ -1,9 +1,9 @@ ---- 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-08-27 23:35:08.000000000 +0200 ++++ src/monit.h 2013-11-12 16:16:10.957662500 +0100 +@@ -87,7 +87,7 @@ + #include "util/StringBuffer.h" - #define VERSION PACKAGE_VERSION -#define MONITRC "monitrc" +#define MONITRC "monit.conf" #define TIMEFORMAT "%Z %b %e %T"
[-] [+]	Changed	create_monit_ssl.sh ^
@@ -1,10 +1,10 @@ #!/bin/bash openssl genrsa \ --out /etc/monit_ssl_key.pem 1024 +-out /etc/monit.ssl/monit_ssl_key.pem 1024 openssl req -batch -new \ --key /etc/monit_ssl_key.pem \ --out /etc/monit_ssl_cert.csr +-key /etc/monit.ssl/monit_ssl_key.pem \ +-out /etc/monit.ssl/monit_ssl_cert.csr openssl x509 -req -days 999 \ --in /etc/monit_ssl_cert.csr \ --signkey /etc/monit_ssl_key.pem \ --out /etc/monit_ssl_cert.pem +-in /etc/monit.ssl/monit_ssl_cert.csr \ +-signkey /etc/monit.ssl/monit_ssl_key.pem \ +-out /etc/monit.ssl/monit_ssl_cert.pem
[-] [+]	Added	ix-monit.conf ^
@@ -0,0 +1,36 @@ +### 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 https://monit:CHANGEME@85.236.36.116:8443/collector + +set alert techprojects@internetx.com + + +set httpd port 2812 + SSL ENABLE + PEMFILE /etc/pki/tls/certs/monit.pem + ALLOWSELFCERTIFICATION + allow 85.236.36.116 + allow 62.116.161.144 + allow 85.236.36.115 + allow 62.116.129.3 + allow 192.168.100.0/24 + allow localhost + allow monit:CHANGEME + allow admin:CHANGEME + + +include /etc/monit.d/*.conf
[-] [+]	Changed	mmonit.pem ^
@@ -1,49 +1,16 @@ ------BEGIN PRIVATE KEY----- -MIIEvgIBADANBgkqhkiG9w0BAQEFAASCBKgwggSkAgEAAoIBAQDCgUoOW4FGza/q -7Tj0rF2PzCmBM3uhL+dfUYWBLL9yBvbyfG7J5VV+4VIdjLjW7pm0uF4p1EwgBbOd -OgYCeydtjH/VD8y8Xj98RQYv3ZhjDd8LRiUTh6YIY4n4MKbhxpA8Oy6nfvku5wo5 -re0Em4SpAN4M9DLIjslpRzuLE8XEpzpbuJHz/uaTz0rC0326BILFCjLWJoa5RANK -YdGmfDDcRj7G3wbe42j20MwoFZjLRLQr8oz4lrLJMPxMrF88+Kq75HmzhzO06cUh -LfzjMthE3TeuIEq2lnHApcRO2WwZ9pfX/Hqo4+4QEM5Tf15v82jjFlP2tHQsXOl/ -8c551QDHAgMBAAECggEAT65niDo0W60nxDYqfxGdwqsA1c0heIcHYiUjbCfIxg3U -XMJdIJiyzafA3BoqHuLgVQiyirBN/1BWpLKAg8OwA1DrjX1Lgl+Z4m7kefdt1iZ4 -mUXDKp0Hh6g/fU1xEE0oCYS1OCjsLCq6Jab60khjsFiKnwPrSf40xMxJuFABVO31 -CxSEgDvAyDdM+Ev4LD1DMPIhEmncZ+Ymjb+eiqM5GVOt6h9Ex6fsM9kFRwYp9okG -zs/UAkQuH32lsgQKdIfdUy9CnHGyYkkKautZ5tF+wErSJn/1nv8HsON0iYhp283i -Q6/Mi7rn0XeN1scmjcrT82LbbtSJ3qqc+11WIV8CAQKBgQD6kdDIf3j72fxboADi -dnCxBUOWmWFECR4qGkO0b4Awj4KB4TGJJSQzrWu8BortBn2LADF4CUwAI0TuDb8x -4OeqWSzZML32/rBHlYQHaxAGnpI5C5OZFiUKaAHWgihZIW2mrXydHua7hAQFews9 -fnriHxOZqCzclr4dYfznV6nZzwKBgQDGuGwQC9zeLYq4+usqIweeqGINZT95cPZq -ivxu4/k4K7ByKZhLnng60bxk9JRF42offBdnwZj1b39hs2Q1qzlps3SYxWozrDL2 -L078UFxvOswxHt4zAn8SEIZHsAn8WfLWwfl0nlyD5cNBidYZa6kGUzO2K+XyBgQj -76G99DK/iQKBgQC4+/OWQb2QuWK8RgjBJ82Ucp1uTjfnoY+aZ596UyLhNuGTfywx -4rCyUiKKQo5H5JXEi9T5mGt6Yo9d69ouOaruMT2R7pEgCvEbN/+r9ldze5fZ83j4 -+MdJwnUw5xBglPQ9rDCmUozm/NR3M1qeAIU58NVoiCbuh389c/zg0fA8MwKBgAKf -coWvsmWYUklovmva9IHKlSi6GmFe9VGorfZEughcw0JufB0bZVjZZdQrSj2157Os -rp5m9r7ejt7aQEtZDDPx82sEyAcQkcegDjnUUbQCIanQT3x63vR9FVii4S7cfREK -lGFOqcfv42jdCd9iBWQY+wi/gZR1Md7LjeX08CqJAoGBAJicVt6+9esxd3wtdJM8 -/5EfEYUykJifvJi5FNMzXywu11XiZtVnDTB6QQAH6yVyuP+Ew/u1rNp3efF8nif5 -nyn3rARJs4H636Ihj7QbutzBK2M57jFyj3A5iAcTsfkG4Omqm0+xHQhjNxzUgbvU -+dzhIsKvI1/f7Nx/yUyGHSD3 ------END PRIVATE KEY----- ------BEGIN CERTIFICATE----- -MIIDXTCCAkWgAwIBAgIJALiSwPpRI8YoMA0GCSqGSIb3DQEBBQUAMEUxCzAJBgNV -BAYTAkFVMRMwEQYDVQQIDApTb21lLVN0YXRlMSEwHwYDVQQKDBhJbnRlcm5ldCBX -aWRnaXRzIFB0eSBMdGQwHhcNMTMxMTAxMDMzODQ0WhcNMTUxMTAxMDMzODQ0WjBF -MQswCQYDVQQGEwJBVTETMBEGA1UECAwKU29tZS1TdGF0ZTEhMB8GA1UECgwYSW50 -ZXJuZXQgV2lkZ2l0cyBQdHkgTHRkMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIB -CgKCAQEAwoFKDluBRs2v6u049Kxdj8wpgTN7oS/nX1GFgSy/cgb28nxuyeVVfuFS -HYy41u6ZtLheKdRMIAWznToGAnsnbYx/1Q/MvF4/fEUGL92YYw3fC0YlE4emCGOJ -+DCm4caQPDsup375LucKOa3tBJuEqQDeDPQyyI7JaUc7ixPFxKc6W7iR8/7mk89K -wtN9ugSCxQoy1iaGuUQDSmHRpnww3EY+xt8G3uNo9tDMKBWYy0S0K/KM+JayyTD8 -TKxfPPiqu+R5s4cztOnFIS384zLYRN03riBKtpZxwKXETtlsGfaX1/x6qOPuEBDO -U39eb/No4xZT9rR0LFzpf/HOedUAxwIDAQABo1AwTjAdBgNVHQ4EFgQUovN0fiJv -EoO5YfkGjc4ccFQFj34wHwYDVR0jBBgwFoAUovN0fiJvEoO5YfkGjc4ccFQFj34w -DAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQUFAAOCAQEADaGihfebBF5om4/Hplmk -NrXbhbOpwL6z04W+W51hJ75aSo5D0tJcbP08EK2GLe4v1op9DMzDfnExnCDm1rom -Q2/U3ClaZU1P0jIdMxsS6fT/2xwpqknz34dTRAKVT6s6w7R9tTCFUqyciZg+xZnI -ZmB6G6yr4OziWtVNFGtaqldDcu38PUAkCtyUrBYDa/Y8a6P2qMeryORx0NKc6fNX -U/ZXu9tzKFf7eJEbLtEWNyuj9bE/BTK/3kPxd7Y6+hl8iij/vAi+kFvUY9/OOwKP -6M+e50esDnv/n02VuT92F9irFDGnoO9ilC4+6vN2mYhZYSnS6wIG+OMUgW3M2d8f -9A== ------END CERTIFICATE----- +-----BEGIN CERTIFICATE REQUEST----- +MIICijCCAXICAQAwRTELMAkGA1UEBhMCQVUxEzARBgNVBAgMClNvbWUtU3RhdGUx +ITAfBgNVBAoMGEludGVybmV0IFdpZGdpdHMgUHR5IEx0ZDCCASIwDQYJKoZIhvcN +AQEBBQADggEPADCCAQoCggEBAL7tx8JIkkFoownTEjRMiEYiyoKBupiZ1847Be2B +KKJDCLnaBf9Z8gAKtfXvcs46JPj7hrBKzlJcV30ksrdzV4fwnB2H0DD4PvgoQuiQ +aGHciyY5IwHZbuoqCpIzBFCkz3X5ah8W5DeGJDVmtbXuwr1PVn1fO6Ezs3BAvaRL ++Gh2u9WXnx6GFT6OnI8drXGNJIPBSV+qObFkenYP22R6XVm9v1EI9VmKZ12R1wne +jR4MCjjXm0Bj2tpg7yaAXd6ldlQPonoIdlKvy1pfouMBPOijeH3fgwiFJeZc65PH +hnF7EoEQOZtKUnryCCSZ5I1leoS8kcGLDMzWg+xblZSrnU8CAwEAAaAAMA0GCSqG +SIb3DQEBBQUAA4IBAQCKsrSUJkLLjwm79/lqwmNGZvbMJbOxD+xxIWfXJFi16sZw +avGP4vxsUAgDAe0zJIO0CIY+eLniWLYO+Y61AdXFThwD2D1ySwsVojWiuVZ9fD+Z +t0sjatG1ViiIzgyKELaKQHuui2qUGnZidjrEMq6JfiEG/ss6a7zn/5XGMQId7Wxz +fD45jvvK2tzmMlAMu+0WGPXjcIZH0wUE/GrrfeoIIg659HbAJ8vwWEIn6UM8YjXf +2ZPblDC55MRmxqCSgb8gc07zAD1KLR1RNtEAH6kusbsCHH93cwf3fu1pKuyWMy0O +sb2O5gHK1Uz/2eKaMPD5YjYDgkDKmtNdktmVNxU+ +-----END CERTIFICATE REQUEST-----
	Added	monit-5.8.1.tar.gz ^
[-] [+]	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