From 973869e9733384062a7db9b692e541c85bbfb58a Mon Sep 17 00:00:00 2001 From: Barry O'Rourke Date: Thu, 23 Nov 2017 21:17:56 +0000 Subject: [PATCH 1/2] fix a bug in config_files() that I introduced in 0.4.3 --- CHANGELOG.md | 6 +++++- sensu_plugin/utils.py | 2 +- setup.py | 2 +- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 9e32ce9..9be7a2a 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -5,6 +5,9 @@ This CHANGELOG follows the format listed [here](https://github.com/sensu-plugins # [Unreleased] +# [0.4.4] +- Fixes a bug introduced to `utils.config_files` which only returns `/etc/sensu/config.json` (@barryorourke) + # [0.4.3] ## Fixed - Fixes `utils.config_files` so that it returns a list of files, rather than a list of `None`'s (@barryorourke) @@ -54,7 +57,8 @@ This CHANGELOG follows the format listed [here](https://github.com/sensu-plugins ## [0.1.0] 2014-01-06 - Initial release (@zsprackett) -[Unreleased]: https://github.com/sensu-plugins/sensu-plugin-python/compare/0.4.3...HEAD +[Unreleased]: https://github.com/sensu-plugins/sensu-plugin-python/compare/0.4.4...HEAD +[0.4.3]: https://github.com/sensu-plugins/sensu-plugin-python/compare/0.4.3...0.4.4 [0.4.2]: https://github.com/sensu-plugins/sensu-plugin-python/compare/0.4.2...0.4.3 [0.4.1]: https://github.com/sensu-plugins/sensu-plugin-python/compare/0.4.1...0.4.2 [0.4.1]: https://github.com/sensu-plugins/sensu-plugin-python/compare/0.4.0...0.4.1 diff --git a/sensu_plugin/utils.py b/sensu_plugin/utils.py index 716764b..a6b53f8 100644 --- a/sensu_plugin/utils.py +++ b/sensu_plugin/utils.py @@ -21,7 +21,7 @@ def config_files(): else: files = ['/etc/sensu/config.json'] filenames = [f for f in os.listdir('/etc/sensu/conf.d') - if os.path.splitext(f)[1] == 'json'] + if os.path.splitext(f)[1] == '.json'] for filename in filenames: files.append('/etc/sensu/conf.d/{}'.format(filename)) return files diff --git a/setup.py b/setup.py index 3182433..2f4f94d 100644 --- a/setup.py +++ b/setup.py @@ -2,7 +2,7 @@ setup( name='sensu_plugin', - version='0.4.3', + version='0.4.4', author='Sensu-Plugins and contributors', author_email='sensu-users@googlegroups.com', packages=['sensu_plugin', 'sensu_plugin.test'], From cdac9ead30c3210174975c8384dc0c451e9e13e5 Mon Sep 17 00:00:00 2001 From: Barry O'Rourke Date: Thu, 23 Nov 2017 21:19:17 +0000 Subject: [PATCH 2/2] fix CHANGELOG formatting --- CHANGELOG.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 9be7a2a..2920ec3 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -6,6 +6,7 @@ This CHANGELOG follows the format listed [here](https://github.com/sensu-plugins # [Unreleased] # [0.4.4] +## Fixed - Fixes a bug introduced to `utils.config_files` which only returns `/etc/sensu/config.json` (@barryorourke) # [0.4.3]