Skip to content

Commit

Permalink
Merge pull request #247 from mackerelio/bump-version-0.22.0
Browse files Browse the repository at this point in the history
Release version 0.22.0
  • Loading branch information
hayajo committed Aug 30, 2018
2 parents 6cd902e + d79f3bd commit f157128
Show file tree
Hide file tree
Showing 12 changed files with 33 additions and 6 deletions.
5 changes: 5 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -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)
Expand Down
2 changes: 1 addition & 1 deletion Makefile
Original file line number Diff line number Diff line change
@@ -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})
Expand Down
1 change: 1 addition & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
2 changes: 1 addition & 1 deletion mackerel-check.go
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,7 @@ func run(args []string) int {
return exitOK
}

const version = "0.21.2"
const version = "0.22.0"

var gitcommit string

Expand Down
7 changes: 7 additions & 0 deletions packaging/deb-v2/debian/changelog
Original file line number Diff line number Diff line change
@@ -1,3 +1,10 @@
mackerel-check-plugins (0.22.0-1.v2) stable; urgency=low

* Add check-smtp (by shiimaxx)
<https://github.com/mackerelio/go-check-plugins/pull/243>

-- mackerel <mackerel-developers@hatena.ne.jp> 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)
Expand Down
2 changes: 1 addition & 1 deletion packaging/deb-v2/debian/rules
Original file line number Diff line number Diff line change
Expand Up @@ -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
7 changes: 7 additions & 0 deletions packaging/deb/debian/changelog
Original file line number Diff line number Diff line change
@@ -1,3 +1,10 @@
mackerel-check-plugins (0.22.0-1) stable; urgency=low

* Add check-smtp (by shiimaxx)
<https://github.com/mackerelio/go-check-plugins/pull/243>

-- mackerel <mackerel-developers@hatena.ne.jp> 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)
Expand Down
2 changes: 1 addition & 1 deletion packaging/deb/debian/rules
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
1 change: 1 addition & 0 deletions packaging/deb/debian/source/include-binaries
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
5 changes: 4 additions & 1 deletion packaging/rpm/mackerel-check-plugins-v2.spec
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand All @@ -37,6 +37,9 @@ done
%{__targetdir}/*

%changelog
* Thu Aug 30 2018 <mackerel-developers@hatena.ne.jp> - 0.22.0
- Add check-smtp (by shiimaxx)

* Wed Jul 25 2018 <mackerel-developers@hatena.ne.jp> - 0.21.2
- modify message check-windows-eventlog (by daiksy)

Expand Down
5 changes: 4 additions & 1 deletion packaging/rpm/mackerel-check-plugins.spec
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand All @@ -46,6 +46,9 @@ done
%{__oldtargetdir}/*

%changelog
* Thu Aug 30 2018 <mackerel-developers@hatena.ne.jp> - 0.22.0
- Add check-smtp (by shiimaxx)

* Wed Jul 25 2018 <mackerel-developers@hatena.ne.jp> - 0.21.2
- modify message check-windows-eventlog (by daiksy)

Expand Down

0 comments on commit f157128

Please sign in to comment.