diff --git a/CHANGELOG.md b/CHANGELOG.md index c3f59314..422262df 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,10 @@ # Changelog +## 0.22.0 (2018-08-30) + +* Add check-smtp #243 (shiimaxx) + + ## 0.21.2 (2018-07-25) * modify message check-windows-eventlog #241 (daiksy) diff --git a/Makefile b/Makefile index 72da028c..cd29c873 100644 --- a/Makefile +++ b/Makefile @@ -1,4 +1,4 @@ -VERSION = 0.21.2 +VERSION = 0.22.0 CURRENT_REVISION = $(shell git rev-parse --short HEAD) ifeq ($(OS),Windows_NT) GOPATH_ROOT:=$(shell cygpath ${GOPATH}) diff --git a/README.md b/README.md index d0cefbc1..61f32bed 100644 --- a/README.md +++ b/README.md @@ -26,6 +26,7 @@ Documentation for each plugin is located in its respective sub directory. * [check-postgresql](./check-postgresql/README.md) * [check-procs](./check-procs/README.md) * [check-redis](./check-redis/README.md) +* [check-smtp](./check-smtp/README.md) * [check-solr](./check-solr/README.md) * [check-ssh](./check-ssh/README.md) * [check-ssl-cert](./check-ssl-cert/README.md) diff --git a/mackerel-check.go b/mackerel-check.go index 78d8d994..25c0e660 100644 --- a/mackerel-check.go +++ b/mackerel-check.go @@ -60,7 +60,7 @@ func run(args []string) int { return exitOK } -const version = "0.21.2" +const version = "0.22.0" var gitcommit string diff --git a/packaging/deb-v2/debian/changelog b/packaging/deb-v2/debian/changelog index 8520cfed..d1ade2dd 100644 --- a/packaging/deb-v2/debian/changelog +++ b/packaging/deb-v2/debian/changelog @@ -1,3 +1,10 @@ +mackerel-check-plugins (0.22.0-1.v2) stable; urgency=low + + * Add check-smtp (by shiimaxx) + + + -- mackerel Thu, 30 Aug 2018 10:49:16 +0900 + mackerel-check-plugins (0.21.2-1.v2) stable; urgency=low * modify message check-windows-eventlog (by daiksy) diff --git a/packaging/deb-v2/debian/rules b/packaging/deb-v2/debian/rules index b43b9e8c..e79bd9b3 100755 --- a/packaging/deb-v2/debian/rules +++ b/packaging/deb-v2/debian/rules @@ -10,6 +10,6 @@ override_dh_auto_install: dh_auto_install install -d -m 755 debian/${package}/usr/bin install -m 755 debian/mackerel-check debian/${package}/usr/bin - for i in aws-sqs-queue-size cert-file disk elasticsearch file-age file-size http jmx-jolokia ldap load log mailq masterha memcached mysql ntpoffset postgresql procs redis solr ssh ssl-cert tcp uptime; do \ + for i in aws-sqs-queue-size cert-file disk elasticsearch file-age file-size http jmx-jolokia ldap load log mailq masterha memcached mysql ntpoffset postgresql procs redis smtp solr ssh ssl-cert tcp uptime; do \ ln -s ./mackerel-check debian/${package}/usr/bin/check-$$i; \ done diff --git a/packaging/deb/debian/changelog b/packaging/deb/debian/changelog index 810df378..3b606249 100644 --- a/packaging/deb/debian/changelog +++ b/packaging/deb/debian/changelog @@ -1,3 +1,10 @@ +mackerel-check-plugins (0.22.0-1) stable; urgency=low + + * Add check-smtp (by shiimaxx) + + + -- mackerel Thu, 30 Aug 2018 10:49:16 +0900 + mackerel-check-plugins (0.21.2-1) stable; urgency=low * modify message check-windows-eventlog (by daiksy) diff --git a/packaging/deb/debian/rules b/packaging/deb/debian/rules index 2a4086c2..b33f3fb6 100755 --- a/packaging/deb/debian/rules +++ b/packaging/deb/debian/rules @@ -8,7 +8,7 @@ package=mackerel-check-plugins override_dh_auto_install: dh_auto_install install -d -m 755 debian/${package}/usr/bin - for i in aws-sqs-queue-size cert-file disk elasticsearch file-age file-size http jmx-jolokia ldap load log mailq masterha memcached mysql ntpoffset postgresql procs redis solr ssh ssl-cert tcp uptime; do \ + for i in aws-sqs-queue-size cert-file disk elasticsearch file-age file-size http jmx-jolokia ldap load log mailq masterha memcached mysql ntpoffset postgresql procs redis smtp solr ssh ssl-cert tcp uptime; do \ install -m755 debian/check-$$i debian/${package}/usr/bin; \ done install -d -m 755 debian/${package}/usr/local/bin diff --git a/packaging/deb/debian/source/include-binaries b/packaging/deb/debian/source/include-binaries index 89db3453..a7d529ed 100644 --- a/packaging/deb/debian/source/include-binaries +++ b/packaging/deb/debian/source/include-binaries @@ -17,6 +17,7 @@ debian/check-ntpoffset debian/check-postgresql debian/check-procs debian/check-redis +debian/check-smtp debian/check-solr debian/check-ssh debian/check-ssl-cert diff --git a/packaging/mackerel-check-plugins_0.21.2.orig.tar.gz b/packaging/mackerel-check-plugins_0.22.0.orig.tar.gz similarity index 100% rename from packaging/mackerel-check-plugins_0.21.2.orig.tar.gz rename to packaging/mackerel-check-plugins_0.22.0.orig.tar.gz diff --git a/packaging/rpm/mackerel-check-plugins-v2.spec b/packaging/rpm/mackerel-check-plugins-v2.spec index 0f0d6f57..34b64030 100644 --- a/packaging/rpm/mackerel-check-plugins-v2.spec +++ b/packaging/rpm/mackerel-check-plugins-v2.spec @@ -25,7 +25,7 @@ mackerel.io check plugins %{__install} -m0755 %{_sourcedir}/build/mackerel-check %{buildroot}%{__targetdir}/ -for i in aws-sqs-queue-size cert-file disk elasticsearch file-age file-size http jmx-jolokia ldap load log mailq masterha memcached mysql ntpoffset postgresql procs redis solr ssh ssl-cert tcp uptime; do \ +for i in aws-sqs-queue-size cert-file disk elasticsearch file-age file-size http jmx-jolokia ldap load log mailq masterha memcached mysql ntpoffset postgresql procs redis smtp solr ssh ssl-cert tcp uptime; do \ ln -s ./mackerel-check %{buildroot}%{__targetdir}/check-$i; \ done @@ -37,6 +37,9 @@ done %{__targetdir}/* %changelog +* Thu Aug 30 2018 - 0.22.0 +- Add check-smtp (by shiimaxx) + * Wed Jul 25 2018 - 0.21.2 - modify message check-windows-eventlog (by daiksy) diff --git a/packaging/rpm/mackerel-check-plugins.spec b/packaging/rpm/mackerel-check-plugins.spec index 234ecf6b..9c41fc12 100644 --- a/packaging/rpm/mackerel-check-plugins.spec +++ b/packaging/rpm/mackerel-check-plugins.spec @@ -26,7 +26,7 @@ mackerel.io check plugins %{__mkdir} -p %{buildroot}%{__targetdir} -for i in aws-sqs-queue-size cert-file disk elasticsearch file-age file-size http jmx-jolokia ldap load log mailq masterha memcached mysql ntpoffset postgresql procs redis solr ssh ssl-cert tcp uptime; do \ +for i in aws-sqs-queue-size cert-file disk elasticsearch file-age file-size http jmx-jolokia ldap load log mailq masterha memcached mysql ntpoffset postgresql procs redis smtp solr ssh ssl-cert tcp uptime; do \ %{__install} -m0755 %{_sourcedir}/build/check-$i %{buildroot}%{__targetdir}/; \ done @@ -46,6 +46,9 @@ done %{__oldtargetdir}/* %changelog +* Thu Aug 30 2018 - 0.22.0 +- Add check-smtp (by shiimaxx) + * Wed Jul 25 2018 - 0.21.2 - modify message check-windows-eventlog (by daiksy)