diff -pruN 15.0.0-1/.gitignore 15.0.0-0ubuntu1/.gitignore --- 15.0.0-1/.gitignore 2023-01-04 03:41:33.000000000 +0000 +++ 15.0.0-0ubuntu1/.gitignore 1970-01-01 00:00:00.000000000 +0000 @@ -1,68 +0,0 @@ -*.py[cod] - -# C extensions -*.so - -# Packages -*.egg* -*.egg-info -dist -build -eggs -parts -bin -var -sdist -develop-eggs -.installed.cfg -lib -lib64 - -# Installer logs -pip-log.txt - -# Unit test / coverage reports -cover/ -.coverage* -!.coveragerc -.tox -nosetests.xml -.stestr/ -.testrepository -.venv - -# Translations -*.mo - -# Mr Developer -.mr.developer.cfg -.project -.pydevproject - -# Complexity -output/*.html -output/*/index.html - -# Sphinx -doc/build - -# pbr generates these -AUTHORS -ChangeLog - -# Editors -*~ -.*.swp -.*sw? - -# Files created by releasenotes build -releasenotes/build - -# PyCharm IDE -.idea/ - -# configuration sample generation -etc/masakarimonitors/masakarimonitors.conf.sample - -# File/s created by doc build -doc/source/_static/masakarimonitors.conf.sample diff -pruN 15.0.0-1/.gitreview 15.0.0-0ubuntu1/.gitreview --- 15.0.0-1/.gitreview 2023-01-04 03:41:33.000000000 +0000 +++ 15.0.0-0ubuntu1/.gitreview 1970-01-01 00:00:00.000000000 +0000 @@ -1,4 +0,0 @@ -[gerrit] -host=review.opendev.org -port=29418 -project=openstack/masakari-monitors.git diff -pruN 15.0.0-1/AUTHORS 15.0.0-0ubuntu1/AUTHORS --- 15.0.0-1/AUTHORS 1970-01-01 00:00:00.000000000 +0000 +++ 15.0.0-0ubuntu1/AUTHORS 2023-03-22 12:21:43.000000000 +0000 @@ -0,0 +1,55 @@ +Andreas Jaeger +Chuck Short +Corey Bryant +Dinesh Bhor +Dmitriy Rabotyagov +Doug Hellmann +Ghanshyam Mann +Hervé Beraud +Keiji Niwa +Kengo Takahara +Kengo Takahara +Liam Young +Louie KWAN +Maksim Malchuk +Mark Goddard +Nguyen Hai +Nguyen Hung Phuong +OpenStack Release Bot +Radosław Piliszek +Sampath Priyankara +Sean McGinnis +Shilpa Devharakar +Takahiro Izumi +Takashi Kajinami +Takashi NATSUME +Takashi Natsume +Thomas Bechtold +Thomas Goirand +Tushar Patil +XinxinShen +YeHaiyang <6161910042@vip.jiangnan.edu.cn> +avnish +dengzhaosen +dineshbhor +ericxiett +gugug +huang.zhiping +jacky06 +jayashri bidwe +liyingjun +nitesh.vanarase +openstack +poojajadhav +shilpa.devharakar +songwenping +sue +sunjia +suzhengwei +suzhengwei +tpatil +wangqiangbj +wu.shiming +yangkun.lc +zhaoleilc <15247232416@163.com> +zhaoyixin diff -pruN 15.0.0-1/ChangeLog 15.0.0-0ubuntu1/ChangeLog --- 15.0.0-1/ChangeLog 1970-01-01 00:00:00.000000000 +0000 +++ 15.0.0-0ubuntu1/ChangeLog 2023-03-22 12:21:43.000000000 +0000 @@ -0,0 +1,253 @@ +CHANGES +======= + +15.0.0 +------ + +* not retry to send notification for specific http exception +* Fix tox4 issues +* [CI] Move queue setting to project level +* Switch to 2023.1 Python3 unit tests and generic template name +* Update master for stable/zed + +14.0.0 +------ + +* Use daemon property instead of setDaemon method +* Update python testing as per zed cycle testing runtime +* Libvirt auth support +* CI: Fix issue with absent stestr +* Fix typo +* Add Python3 zed unit tests +* Update master for stable/yoga + +13.0.0 +------ + +* Use LOG.warning instead of deprecated LOG.warn +* connection too much when large scale failure +* Updating python testing classifier as per Yoga testing runtime +* host monitor by consul +* Updating python testing classifier as per Yoga testing runtime +* Fix a typo +* Fix some typos +* Fix home\_page in setup.cfg +* Add note for package maintainers in requirements.txt +* Add Python3 yoga unit tests +* Update master for stable/xena + +12.0.0 +------ + +* Fix hostmonitor to respect quorum +* [CI] Gate on the same jobs as Masakari +* [CI] Run cover jobs +* Deprecate masakari-processmonitor +* Use pre-provided libvirt-python +* Use some better linting +* Generate PDF documentation +* [doc] Add config reference guide +* move DriverBase to the base dir +* [doc] Add masakari monitors usage +* Remove conditionals for an ancient openstacksdk +* Fix hostmonitor hanging forever after certain exceptions +* Fix typos +* Fix several code comment errors in process monitor +* Replace "split(' ')" with "split()" in masakari-monitors +* [community goal] Update contributor documentation +* setup.cfg: Replace dashes with underscores +* Fix one reno +* Add Python3 xena unit tests +* Update master for stable/wallaby + +11.0.0 +------ + +* Repeated check to determine host status +* [hostmonitor] Add pacemaker\_node\_type option +* Drop CAP\_NET\_ADMIN +* Drop unused samples +* Revert "remove py37" +* remove unused configration +* remove unicode from code +* remove unused script +* remove py37 +* Drop lower-constraints +* Update TOX\_CONSTRAINTS\_FILE +* [CI] Add periodic jobs +* Add py38 package metadata +* Add Python3 wallaby unit tests +* Update master for stable/victoria + +10.0.0 +------ + +* Fix tox for py38 and lower-contraints +* [goal] Migrate testing to ubuntu focal +* Add .stestr/ to .gitignore +* Add missing keystoneauth1 to requirements.txt +* Fix constraints URL enforcement for lower-constraints +* Drop Babel from reqs +* [goal] Migrate testing to ubuntu focal +* Use keystoneauth1 config option loading for masakari client +* Replace assertRaisesRegexp with assertRaisesRegex +* Remove elementtree deprecated methods +* Remove unnecessary continue statement +* drop mock from lower-constraints +* repeated parsing +* Switch to newer openstackdocstheme and reno versions +* Remove translation sections from setup.cfg +* Remove six +* Fix hacking min version to 3.0.1 +* Add Python3 victoria unit tests +* Update master for stable/ussuri +* reset nova-compute process name + +9.0.0 +----- + +* Use unittest.mock instead of third party mock +* Cleanup py27 support +* Update and replace http with https for doc links +* Check config file for hostname +* Update hacking for Python3 +* Use hostname to avoid clash with section +* [ussuri][goal] Drop python 2.7 support and testing +* Update constraints path to preferred static location +* Update master for stable/train +* Use crm\_mon for pacemaker-remote deployments + +8.0.0 +----- + +* Add Python 3 Train unit tests +* add libvirt-python for libvirt package +* Remove deprecated shell scripts +* Switch to using stestr +* Use template for lower-constraints +* OpenDev Migration Patch +* Dropping the py35 testing +* Switch from oslosphinx to openstackdocstheme +* Update master for stable/stein + +7.0.0 +----- + +* Run all jobs by default using python3 +* Add line for PyCharm IDE in gitignore file +* Removed unnecessary parantheses in yield statements + +7.0.0.0b1 +--------- + +* Increment versioning with pbr instruction +* import zuul job settings from project-config +* fix tox python3 overrides +* Pass region\_name and interface parameters during connection initialization +* Update reno for stable/rocky + +6.0.0 +----- + +* Remove python-openstackclient from global-requirements + +6.0.0.0b3 +--------- + +* add lower-constraints job +* Fix stable branch releasenotes +* Introspective Instance Monitoring through QEMU Guest Agent + +6.0.0.0b2 +--------- + +* Remove dependency on python-masakariclient +* Update for new openstacksdk changes to masakari-monitors + +6.0.0.0b1 +--------- + +* Updated from global requirements +* Updated from global requirements +* Update for upcoming openstacksdk changes to masakari-monitors +* Replaces yaml.load() with yaml.safe\_load() + +5.0.0 +----- + +* Use status\_code instead of http\_status +* fix misspelling of 'configuration' +* Support specify connection uri for libvirt + +4.0.0 +----- + +* Updated from global requirements +* Remove an extra word in process\_list.yaml.sample +* Use os-testr and add PY35 support +* Add testcases of hostmonitor +* Remove log translations +* Pass correct parameters to '\_get\_connection' method +* Fix typo of hostmonitor +* Change the required olso.privsep version +* Fix typo of processmonitor +* Add testcases of ha and processmonitor +* Add testcases of instancemonitor +* Change the condition of success or failure of notifying +* Fix syntax errors of README.rst +* Remove data\_files definition from setup.cfg + +3.0.1 +----- + +* Add README.rst +* Add warning messages about deprecation to process/host monitor +* Skip notification retry processing when HTTP status is 409 +* Fix global name '\_' is not defined +* Return user-friendly error message when monkey\_patch enabled +* Add hacking check to ensure \_ is imported +* Add implement of calling pre and post script +* Add implement of sending notification +* Add implement of preventing split-brain +* Add implement of sending a notification +* Add implement of comparing host status +* Add implement of monitoring host +* Add implement of restarting processes +* Add implement of monitoring processes +* Add unit test codes of instancemonitor +* Add implement of loading hostmonitor driver +* Add python hostmonitor only main process +* Add common notification sending functions +* Add initial start of processes +* Loading the process list written in YAML +* Add python processmonitor only main process +* Add missing packages in requirements.txt +* Using ServiceLauncher instead of ProcessLauncher +* Change the section name of settings that related keystone +* Update to match latest global-requirements +* Add stop method to terminate child process +* Fix missing translations for log messages +* Remove conversion of 'retry\_interval' parameter +* Remove unnecessary return and pass statements +* Fix unexpected bash error raised by hostmonitor +* Add the start scripts of processmonitor and hostmonitor +* Refactor: Move domainEventRegisterAny method in a loop +* Fix the regular expression for the check state of RA +* Change service type and service name +* Allow masakari-instancemonitor command anywhere +* To allow processmonitor recognize proc.list which exists anywhere +* Fix processmonitor's invalid messages +* masakari-instancemonitor: fix incorrect module specification + +2.0.0 +----- + +* Remove unnecessary methods +* Add hostmonitor +* Add processmonitor +* Add implementation of notifying +* Add implementation of handling events +* Add instancemonitor only main process +* Add a mechanism to use the oslo libraries +* Initial Cookiecutter Commit +* Added .gitreview diff -pruN 15.0.0-1/PKG-INFO 15.0.0-0ubuntu1/PKG-INFO --- 15.0.0-1/PKG-INFO 1970-01-01 00:00:00.000000000 +0000 +++ 15.0.0-0ubuntu1/PKG-INFO 2023-03-22 12:21:43.315543400 +0000 @@ -0,0 +1,82 @@ +Metadata-Version: 1.2 +Name: masakari-monitors +Version: 15.0.0 +Summary: Monitors for Masakari +Home-page: https://docs.openstack.org/masakari-monitors/latest/ +Author: OpenStack +Author-email: openstack-dev@lists.openstack.org +License: UNKNOWN +Description: =============================== + masakari-monitors + =============================== + + Monitors for Masakari + ===================== + + Monitors for Masakari provides Virtual Machine High Availability (VMHA) service + for OpenStack clouds by automatically detecting the failure events + such as VM process down, provisioning process down, and nova-compute host failure. + If it detect the events, it sends notifications to the masakari-api. + + Original version of Masakari: https://github.com/ntt-sic/masakari + + Tokyo Summit Session: https://www.youtube.com/watch?v=BmjNKceW_9A + + Monitors for Masakari is distributed under the terms of the Apache License, + Version 2.0. The full terms and conditions of this license are + detailed in the LICENSE file. + + * Free software: Apache license + * Documentation: https://docs.openstack.org/masakari-monitors + * Source: https://git.openstack.org/cgit/openstack/masakari-monitors + * Bugs: https://bugs.launchpad.net/masakari-monitors + + + Configure masakari-monitors + --------------------------- + + #. Clone masakari using:: + + $ git clone https://github.com/openstack/masakari-monitors.git + + #. Create masakarimonitors directory in /etc/. + + #. Run setup.py from masakari-monitors:: + + $ sudo python setup.py install + + #. Copy masakarimonitors.conf and process_list.yaml files from + masakari-monitors/etc/ to /etc/masakarimonitors folder and make necessary + changes to the masakarimonitors.conf and process_list.yaml files. + To generate the sample masakarimonitors.conf file, run the following + command from the top level of the masakari-monitors directory:: + + $ tox -egenconfig + + #. To run masakari-processmonitor, masakari-hostmonitor and + masakari-instancemonitor simply use following binary:: + + $ masakari-processmonitor + $ masakari-hostmonitor + $ masakari-instancemonitor + + + Features + -------- + + * TODO + + +Platform: UNKNOWN +Classifier: Environment :: OpenStack +Classifier: Intended Audience :: Information Technology +Classifier: Intended Audience :: System Administrators +Classifier: License :: OSI Approved :: Apache Software License +Classifier: Operating System :: POSIX :: Linux +Classifier: Programming Language :: Python +Classifier: Programming Language :: Python :: Implementation :: CPython +Classifier: Programming Language :: Python :: 3 :: Only +Classifier: Programming Language :: Python :: 3 +Classifier: Programming Language :: Python :: 3.8 +Classifier: Programming Language :: Python :: 3.9 +Requires-Python: >=3.8 diff -pruN 15.0.0-1/debian/changelog 15.0.0-0ubuntu1/debian/changelog --- 15.0.0-1/debian/changelog 2023-03-22 13:24:16.000000000 +0000 +++ 15.0.0-0ubuntu1/debian/changelog 2023-03-23 18:51:03.000000000 +0000 @@ -1,110 +1,264 @@ -masakari-monitors (15.0.0-1) experimental; urgency=medium +masakari-monitors (15.0.0-0ubuntu1) lunar; urgency=medium - * New upstream release. + * New upstream release for OpenStack Antelope. - -- Thomas Goirand Wed, 22 Mar 2023 14:24:16 +0100 + -- Corey Bryant Thu, 23 Mar 2023 14:51:03 -0400 -masakari-monitors (15.0.0~rc1-1) experimental; urgency=medium +masakari-monitors (15.0.0~rc1-0ubuntu1) lunar; urgency=medium - * New upstream release. - * Removed lsb-base depends. + * d/watch: Drop major version. + * New upstream release for OpenStack Antelope. - -- Thomas Goirand Thu, 02 Mar 2023 10:53:53 +0100 + -- Corey Bryant Tue, 28 Feb 2023 18:05:37 -0500 -masakari-monitors (14.0.0-1) unstable; urgency=medium +masakari-monitors (14.0.0+git2023011010.cf646dfc-0ubuntu1) lunar; urgency=medium - * New upstream release. + * New upstream snapshot for OpenStack Antelope. + * d/control: Align (Build-)Depends with upstream. - -- Thomas Goirand Wed, 05 Oct 2022 22:42:49 +0200 + -- Corey Bryant Tue, 10 Jan 2023 10:03:17 -0500 -masakari-monitors (14.0.0~rc1-2) unstable; urgency=medium +masakari-monitors (14.0.0-0ubuntu1) kinetic; urgency=medium - * Uploading to unstable. + * d/watch: Scope to 14.x. + * New upstream release for OpenStack Zed. - -- Thomas Goirand Sat, 24 Sep 2022 18:07:26 +0200 + -- Corey Bryant Wed, 05 Oct 2022 15:19:24 -0400 -masakari-monitors (14.0.0~rc1-1) experimental; urgency=medium +masakari-monitors (13.0.0+git2022091213.afcf34d-0ubuntu1) kinetic; urgency=medium - * New upstream release. - * Switched to python3-stestr. + * New upstream snapshot for OpenStack Zed. - -- Thomas Goirand Sun, 18 Sep 2022 22:21:55 +0200 + -- Corey Bryant Mon, 12 Sep 2022 13:15:20 -0400 -masakari-monitors (13.0.0-1) unstable; urgency=medium +masakari-monitors (13.0.0+git2022071414.b42b5e5-0ubuntu1) kinetic; urgency=medium - * New upstream release. + * New upstream snapshot for OpenStack Zed. + * d/control: Ensure openstack-pkg-tools has CIS hardening for log files + and pkgos_adduser. + * d/masakari-monitors-common.postinst: CIS hardening update to switch adduser to + use /usr/sbin/nologin when creating system account that does not run a shell. - -- Thomas Goirand Wed, 30 Mar 2022 17:53:31 +0200 + -- Corey Bryant Thu, 14 Jul 2022 14:15:55 -0400 -masakari-monitors (13.0.0~rc1-2) unstable; urgency=medium +masakari-monitors (13.0.0+git2022060213.b42b5e5-0ubuntu1) kinetic; urgency=medium - * Uploading to unstable. + * New upstream snapshot for OpenStack Zed. + * d/control: Update standards version to 4.6.1. - -- Thomas Goirand Sun, 27 Mar 2022 11:19:17 +0200 + -- Corey Bryant Thu, 02 Jun 2022 13:46:37 -0400 -masakari-monitors (13.0.0~rc1-1) experimental; urgency=medium +masakari-monitors (13.0.0-0ubuntu1) jammy; urgency=medium - * New upstream release. - * Add python3-consul as (build-)depends. - * Add autopkgtest. + * d/watch: Scope to 13.x. + * New upstream release for OpenStack Yoga. - -- Thomas Goirand Thu, 10 Mar 2022 09:27:09 +0100 + -- Corey Bryant Wed, 30 Mar 2022 21:10:35 -0400 -masakari-monitors (12.0.0-1) unstable; urgency=medium +masakari-monitors (12.0.0+git2022030313.a89511e-0ubuntu2) jammy; urgency=medium - * New upstream release. + * d/py3dist-overrides: Add python-consul as it is a Suggests. - -- Thomas Goirand Wed, 06 Oct 2021 17:10:46 +0200 + -- Corey Bryant Tue, 08 Mar 2022 10:44:57 -0500 -masakari-monitors (12.0.0~rc1-2) unstable; urgency=medium +masakari-monitors (12.0.0+git2022030313.a89511e-0ubuntu1) jammy; urgency=medium - * Uploading to unstable. + * New upstream snapshot for OpenStack Yoga. + * d/control: Align (Build-)Depends with upstream. - -- Thomas Goirand Thu, 30 Sep 2021 10:42:08 +0200 + -- Corey Bryant Thu, 03 Mar 2022 13:39:45 -0500 -masakari-monitors (12.0.0~rc1-1) experimental; urgency=medium +masakari-monitors (12.0.0+git2022011308.45adf21-0ubuntu1) jammy; urgency=medium - * New upstream release. + * New upstream snapshot for OpenStack Yoga. + * d/control, d/rules: Bump debhelper compat to 13. - -- Thomas Goirand Wed, 15 Sep 2021 13:47:27 +0200 + -- Corey Bryant Thu, 13 Jan 2022 08:29:20 -0500 -masakari-monitors (11.0.1-2) unstable; urgency=medium +masakari-monitors (12.0.0+git2021120910.5198a3c-0ubuntu1) jammy; urgency=medium - * Upload to unstable. + * New upstream snapshot for OpenStack Yoga. - -- Thomas Goirand Mon, 16 Aug 2021 13:22:56 +0200 + -- Corey Bryant Thu, 09 Dec 2021 10:55:31 -0500 -masakari-monitors (11.0.1-1) experimental; urgency=medium +masakari-monitors (12.0.0-0ubuntu1) impish; urgency=medium - * New upstream release. + * d/watch: Scope to 12.x. + * New upstream release for OpenStack Xena. - -- Michal Arbet Thu, 29 Jul 2021 10:06:12 +0200 + -- Chris MacNaughton Thu, 07 Oct 2021 07:32:45 +0000 -masakari-monitors (11.0.0-2) experimental; urgency=medium +masakari-monitors (11.0.1+git2021090814.4b99f75-0ubuntu1) impish; urgency=medium - * Add masakari-monitors sudoers file - * d/control: - - Add tcpdump to dependencies - - Add pacemaker-cli-utils to dependencies + * New upstream release for OpenStack Xena. - -- Michal Arbet Thu, 01 Jul 2021 16:09:54 +0200 + -- Chris MacNaughton Thu, 09 Sep 2021 07:59:57 +0000 -masakari-monitors (11.0.0-1) experimental; urgency=medium +masakari-monitors (11.0.0+git2021072117.6a496e7-0ubuntu1) impish; urgency=medium - * New upstream release. + * New upstream snapshot for OpenStack Xena. - -- Thomas Goirand Thu, 15 Apr 2021 18:58:38 +0200 + -- Corey Bryant Wed, 21 Jul 2021 17:07:08 -0400 -masakari-monitors (11.0.0~rc1-1) experimental; urgency=medium +masakari-monitors (11.0.0+git2021061112.fe5247c-0ubuntu1) impish; urgency=medium - * New upstream release. - * Removed (build-)depends version when satisfied in Bullseye. - * Do not attempt to install processmonitor.conf.sample. + * New upstream snapshot for OpenStack Xena. - -- Thomas Goirand Tue, 06 Apr 2021 15:14:11 +0200 + -- Chris MacNaughton Fri, 11 Jun 2021 12:51:44 +0000 -masakari-monitors (10.0.0-1) unstable; urgency=medium +masakari-monitors (11.0.0-0ubuntu1) hirsute; urgency=medium - * Initial release (Closes: #985118). + * New upstream release for OpenStack Wallaby. - -- Thomas Goirand Fri, 12 Mar 2021 18:56:25 +0100 + -- Chris MacNaughton Wed, 14 Apr 2021 14:46:13 +0000 + +masakari-monitors (11.0.0~rc1-0ubuntu1) hirsute; urgency=medium + + * d/watch: Scope to 11.x series. + * New upstream release candidate for OpenStack Wallaby. + * d/rules: Drop unused samples inline with upstream removal. + + -- Corey Bryant Fri, 09 Apr 2021 08:20:45 -0400 + +masakari-monitors (10.0.0+git2021012507.d8d7dbc-0ubuntu1) hirsute; urgency=medium + + * New upstream snapshot for OpenStack Wallaby. + + -- Chris MacNaughton Mon, 25 Jan 2021 08:06:25 +0000 + +masakari-monitors (10.0.0+git2020121014.bcf6129-0ubuntu1) hirsute; urgency=medium + + * New upstream snapshot for OpenStack Wallaby. + + -- Corey Bryant Thu, 10 Dec 2020 14:04:34 -0500 + +masakari-monitors (10.0.0-0ubuntu1) groovy; urgency=medium + + * New upstream release for OpenStack Victoria. + + -- Corey Bryant Thu, 15 Oct 2020 08:18:34 -0400 + +masakari-monitors (10.0.0~rc1-0ubuntu1) groovy; urgency=medium + + [ Chris MacNaughton ] + * d/control: Update VCS paths for move to lp:~ubuntu-openstack-dev. + * d/watch: Scope to 10.x series. + + [ Corey Bryant ] + * New upstream release candidate for OpenStack Victoria. + + -- Corey Bryant Fri, 09 Oct 2020 16:04:41 -0400 + +masakari-monitors (10.0.0~b3~git2020091408.58c78e9-0ubuntu1) groovy; urgency=medium + + * New upstream snapshot for OpenStack Victoria. + * d/control: Align (Build-)Depends with upstream. + + -- Chris MacNaughton Mon, 14 Sep 2020 08:07:19 +0000 + +masakari-monitors (10.0.0~b1~git2020070210.be1173e-0ubuntu1) groovy; urgency=medium + + * New upstream snapshot for OpenStack Victoria. + * d/control: Align (Build-)Depends with upstream. + * d/control: Update Standards-Version to 4.5.0. + + -- Corey Bryant Thu, 02 Jul 2020 10:00:17 -0400 + +masakari-monitors (9.0.0-0ubuntu1) groovy; urgency=medium + + * New upstream release OpenStack Ussuri (LP: #1877642). + * d/watch: Update to point at opendev.org. + + -- Chris MacNaughton Thu, 14 May 2020 09:09:44 +0000 + +masakari-monitors (9.0.0~b3~git2020041013.e225e6d-0ubuntu1) focal; urgency=medium + + * New upstream snapshot for OpenStack Ussuri. + * d/masakari-monitors-common.postinst: Set ownership and permissions for all /var/lib + files and directories. + + -- Corey Bryant Fri, 10 Apr 2020 13:14:02 -0400 + +masakari-monitors (9.0.0~b3~git2020032614.8711c07-0ubuntu1) focal; urgency=medium + + * New upstream snapshot for OpenStack Ussuri. + * d/masakari-monitors-common.postinst: Set default ownership and permissions + for /etc/, /var/lib/, and /var/log/ (LP: #1859422). + + -- Corey Bryant Thu, 26 Mar 2020 14:31:03 -0400 + +masakari-monitors (9.0.0~b1~git2019121714.b717be1-0ubuntu1) focal; urgency=medium + + * New upstream snapshot for OpenStack Ussuri. + * d/control: Drop remaining py2 BDs. + * d/control, d/rules, d/compat: Switch to debhelper compat 12 and pybuild. + * d/p/bug1728527.patch: Dropped. Fixed in snapshot. + * d/rules: Update PBR_VERSION to handle ~git versioning. + + -- Corey Bryant Tue, 17 Dec 2019 14:28:07 -0500 + +masakari-monitors (8.0.0-0ubuntu1) eoan; urgency=medium + + * New stable point release for OpenStack Train. + + -- Sahid Orentino Ferdjaoui Wed, 16 Oct 2019 17:28:19 +0100 + +masakari-monitors (8.0.0~rc1-0ubuntu1) eoan; urgency=medium + + [ Sahid Orentino Ferdjaoui ] + * New upstream snapshot for OpenStack Train. + + [ Corey Bryant ] + * d/watch: Scope to 8.x series. + * New upstream release candidate for OpenStack Train. + + -- Corey Bryant Fri, 27 Sep 2019 15:48:52 -0400 + +masakari-monitors (8.0.0~b2~git2019073018.ae3ab24-0ubuntu1) eoan; urgency=medium + + * New upstream snapshot for OpenStack Train. + + -- Sahid Orentino Ferdjaoui Tue, 30 Jul 2019 18:38:15 +0200 + +masakari-monitors (8.0.0~b1~git2019061810.8fe6937-0ubuntu1) eoan; urgency=medium + + * New upstream release 8.0.0~b1. + * d/control: Align (Build-)Depends with upstream. + + -- Sahid Orentino Ferdjaoui Wed, 19 Jun 2019 11:21:21 +0100 + +masakari-monitors (7.0.0-0ubuntu1) disco; urgency=medium + + * New upstream release for OpenStack Stein. + + -- James Page Fri, 12 Apr 2019 09:20:13 +0100 + +masakari-monitors (7.0.0~rc1-0ubuntu2) disco; urgency=medium + + [ Corey Bryant ] + * d/control: Set source package Section to net, fixing + binary-control-field-duplicates-source lintian tag. + + [ James Page ] + * d/p/bug1728527.patch: Cherry pick fix to resolve issues with use of + pacemaker-remote for remote management of hypervisors (LP: #1728527). + + -- Corey Bryant Tue, 09 Apr 2019 16:22:18 +0100 + +masakari-monitors (7.0.0~rc1-0ubuntu1) disco; urgency=medium + + * New upstream release candidate for OpenStack Stein. + + -- Corey Bryant Mon, 25 Mar 2019 13:27:40 -0400 + +masakari-monitors (7.0.0~b1-0ubuntu2) disco; urgency=medium + + * d/tests/*: Align test name with d/tests/control. + + -- Corey Bryant Mon, 25 Mar 2019 08:10:58 -0400 + +masakari-monitors (7.0.0~b1-0ubuntu1) disco; urgency=medium + + * Initial release. + + -- Corey Bryant Tue, 26 Feb 2019 14:50:38 -0500 diff -pruN 15.0.0-1/debian/control 15.0.0-0ubuntu1/debian/control --- 15.0.0-1/debian/control 2023-03-22 13:24:16.000000000 +0000 +++ 15.0.0-0ubuntu1/debian/control 2023-03-23 18:51:03.000000000 +0000 @@ -1,196 +1,167 @@ Source: masakari-monitors Section: net Priority: optional -Maintainer: Debian OpenStack -Uploaders: - Thomas Goirand , - Michal Arbet , +Maintainer: Ubuntu Developers +XSBC-Original-Maintainer: Corey Bryant Build-Depends: - debhelper-compat (= 11), + debhelper-compat (= 13), dh-python, - openstack-pkg-tools, - po-debconf, + openstack-pkg-tools (>= 119ubuntu1~), python3-all, - python3-pbr, python3-setuptools, - python3-sphinx , + python3-sphinx (>= 2.0.0), Build-Depends-Indep: - python3-automaton, + crudini, + python3-automaton (>= 1.9.0), python3-consul, - python3-coverage, - python3-ddt, - python3-hacking, - python3-keystoneauth1, - python3-libvirt, - python3-lxml, - python3-openstackdocstheme, - python3-openstacksdk, - python3-os-testr, - python3-oslo.cache, - python3-oslo.concurrency, - python3-oslo.config, - python3-oslo.i18n, - python3-oslo.log, - python3-oslo.middleware, - python3-oslo.privsep, - python3-oslo.service, - python3-oslo.utils, - python3-oslotest, - python3-pycodestyle, - python3-testscenarios, - python3-testtools, - python3-stestr, + python3-coverage (>= 4.0), + python3-ddt (>= 1.0.1), + python3-hacking (>= 1.1.0), + python3-libvirt (>= 6.0.0), + python3-lxml (>= 4.5.0), + python3-keystoneauth1 (>= 3.4.0), + python3-openstackdocstheme (>= 2.2.1), + python3-openstacksdk (>= 0.13.0), + python3-os-testr (>= 1.0.0), + python3-oslo.cache (>= 1.26.0), + python3-oslo.concurrency (>= 3.26.0), + python3-oslo.config (>= 1:5.2.0), + python3-oslo.i18n (>= 3.15.3), + python3-oslo.log (>= 3.36.0), + python3-oslo.middleware (>= 3.31.0), + python3-oslo.privsep (>= 1.23.0), + python3-oslo.service (>= 1.24.0), + python3-oslo.utils (>= 3.33.0), + python3-oslosphinx (>= 4.7.0), + python3-oslotest (>= 1:3.2.0), + python3-pbr (>= 2.0.0), + python3-six (>= 1.10.0), + python3-stestr (>= 1.0.0), + python3-subunit (>= 1.0.0), + python3-testrepository (>= 0.0.18), + python3-testscenarios (>= 0.4), + python3-testtools (>= 2.2.0), subunit, -Standards-Version: 4.5.1 -Vcs-Browser: https://salsa.debian.org/openstack-team/services/masakari-monitors -Vcs-Git: https://salsa.debian.org/openstack-team/services/masakari-monitors.git -Homepage: https://opendev.org/openstack/masakari-monitors + testrepository, +Standards-Version: 4.6.1 +Vcs-Browser: https://git.launchpad.net/~ubuntu-openstack-dev/ubuntu/+source/masakari-monitors +Vcs-Git: https://git.launchpad.net/~ubuntu-openstack-dev/ubuntu/+source/masakari-monitors +Homepage: https://github.com/openstack/masakari-monitors +Testsuite: autopkgtest-pkg-python -Package: masakari-instance-monitor +Package: masakari-host-monitor Architecture: all +Section: python Depends: - masakari-monitors-common (= ${binary:Version}), + python3-masakari-monitors (= ${source:Version}), ${misc:Depends}, - ${python3:Depends}, -Description: OpenStack Virtual Machine High Availability (VMHA) - instance monitor - Masakari provides Virtual Machine High Availability (VMHA) service for - OpenStack clouds by automatically recovering the KVM-based Virtual - Machine(VM)s from failure events such as VM process down, provisioning - process down, and nova-compute host failure. It also provides API service for - manage and control the automated rescue mechanism. - . - Monitors for Masakari provides Virtual Machine High Availability (VMHA) - service for OpenStack clouds by automatically detecting the failure events - such as VM process down, provisioning process down, and nova-compute host - failure. If it detect the events, it sends notifications to the masakari-api. +Description: Virtual Machine High Availability (VMHA) for OpenStack - Host Monitor + Monitors for Masakari provides Virtual Machine High Availability (VMHA) service + for OpenStack clouds by automatically detecting the failure events + such as VM process down, provisioning process down, and nova-compute host failure. + If it detect the events, it sends notifications to the masakari-api. . - This package contains the Masakari instance monitor. + This package contains the Masakari Host Monitor. -Package: masakari-host-monitor +Package: masakari-instance-monitor Architecture: all +Section: python Depends: - masakari-monitors-common (= ${binary:Version}), + python3-masakari-monitors (= ${source:Version}), ${misc:Depends}, - ${python3:Depends}, -Description: OpenStack Virtual Machine High Availability (VMHA) - host monitor - Masakari provides Virtual Machine High Availability (VMHA) service for - OpenStack clouds by automatically recovering the KVM-based Virtual - Machine(VM)s from failure events such as VM process down, provisioning - process down, and nova-compute host failure. It also provides API service for - manage and control the automated rescue mechanism. - . - Monitors for Masakari provides Virtual Machine High Availability (VMHA) - service for OpenStack clouds by automatically detecting the failure events - such as VM process down, provisioning process down, and nova-compute host - failure. If it detect the events, it sends notifications to the masakari-api. +Description: Virtual Machine High Availability (VMHA) for OpenStack - Instance Monitor + Monitors for Masakari provides Virtual Machine High Availability (VMHA) service + for OpenStack clouds by automatically detecting the failure events + such as VM process down, provisioning process down, and nova-compute host failure. + If it detect the events, it sends notifications to the masakari-api. . - This package contains the Masakari host monitor. + This package contains the Masakari Instance Monitor. Package: masakari-introspective-instance-monitor Architecture: all +Section: python Depends: - masakari-monitors-common (= ${binary:Version}), + python3-masakari-monitors (= ${source:Version}), ${misc:Depends}, - ${python3:Depends}, -Description: OpenStack VirtualMachine High Availability (VMHA) - introspective host monitor - Masakari provides Virtual Machine High Availability (VMHA) service for - OpenStack clouds by automatically recovering the KVM-based Virtual - Machine(VM)s from failure events such as VM process down, provisioning - process down, and nova-compute host failure. It also provides API service for - manage and control the automated rescue mechanism. - . - Monitors for Masakari provides Virtual Machine High Availability (VMHA) - service for OpenStack clouds by automatically detecting the failure events - such as VM process down, provisioning process down, and nova-compute host - failure. If it detect the events, it sends notifications to the masakari-api. +Description: Virtual Machine High Availability (VMHA) for OpenStack - Introspective Instance Monitor + Monitors for Masakari provides Virtual Machine High Availability (VMHA) service + for OpenStack clouds by automatically detecting the failure events + such as VM process down, provisioning process down, and nova-compute host failure. + If it detect the events, it sends notifications to the masakari-api. . - This package contains the Masakari introspective instance monitor. + This package contains the Masakari Introspective Instance Monitor. -Package: masakari-monitors-common +Package: masakari-process-monitor Architecture: all +Section: python Depends: - adduser, - pacemaker-cli-utils, - python3-masakari-monitors (= ${binary:Version}), - tcpdump, + python3-masakari-monitors (= ${source:Version}), ${misc:Depends}, - ${python3:Depends}, -Description: OpenStack Virtual Machine High Availability (VMHA) - monitors common files - Masakari provides Virtual Machine High Availability (VMHA) service for - OpenStack clouds by automatically recovering the KVM-based Virtual - Machine(VM)s from failure events such as VM process down, provisioning - process down, and nova-compute host failure. It also provides API service for - manage and control the automated rescue mechanism. +Description: Virtual Machine High Availability (VMHA) for OpenStack - Process Monitor + Monitors for Masakari provides Virtual Machine High Availability (VMHA) service + for OpenStack clouds by automatically detecting the failure events + such as VM process down, provisioning process down, and nova-compute host failure. + If it detect the events, it sends notifications to the masakari-api. . - This package contains common files for Masakari monitors. + This package contains the Masakari Process Monitor. -Package: masakari-monitors-doc -Section: doc +Package: python3-masakari-monitors Architecture: all Depends: + masakari-monitors-common (= ${source:Version}), + python3-automaton (>= 1.9.0), + python3-libvirt (>= 6.0.0), + python3-lxml (>= 4.5.0), + python3-keystoneauth1 (>= 3.4.0), + python3-openstacksdk (>= 0.13.0), + python3-oslo.cache (>= 1.26.0), + python3-oslo.concurrency (>= 3.26.0), + python3-oslo.config (>= 1:5.2.0), + python3-oslo.i18n (>= 3.15.3), + python3-oslo.log (>= 3.36.0), + python3-oslo.middleware (>= 3.31.0), + python3-oslo.privsep (>= 1.23.0), + python3-oslo.service (>= 1.24.0), + python3-oslo.utils (>= 3.33.0), + python3-pbr (>= 2.0.0), + python3-six (>= 1.10.0), ${misc:Depends}, - ${sphinxdoc:Depends}, -Description: OpenStack Virtual Machine High Availability (VMHA) - doc - Masakari provides Virtual Machine High Availability (VMHA) service for - OpenStack clouds by automatically recovering the KVM-based Virtual - Machine(VM)s from failure events such as VM process down, provisioning - process down, and nova-compute host failure. It also provides API service for - manage and control the automated rescue mechanism. + ${python3:Depends}, +Suggests: + python3-consul, +Description: Virtual Machine High Availability (VMHA) for OpenStack - Python 3 + Monitors for Masakari provides Virtual Machine High Availability (VMHA) service + for OpenStack clouds by automatically detecting the failure events + such as VM process down, provisioning process down, and nova-compute host failure. + If it detect the events, it sends notifications to the masakari-api. . - This package contains the monitors documentation. + This package contains the Python 3 module. -Package: masakari-process-monitor +Package: masakari-monitors-common Architecture: all +Section: python Depends: - masakari-monitors-common (= ${binary:Version}), + adduser, ${misc:Depends}, - ${python3:Depends}, -Description: OpenStack VM High Availability (VMHA) - process monitor - Masakari provides Virtual Machine High Availability (VMHA) service for - OpenStack clouds by automatically recovering the KVM-based Virtual - Machine(VM)s from failure events such as VM process down, provisioning - process down, and nova-compute host failure. It also provides API service for - manage and control the automated rescue mechanism. - . - Monitors for Masakari provides Virtual Machine High Availability (VMHA) - service for OpenStack clouds by automatically detecting the failure events - such as VM process down, provisioning process down, and nova-compute host - failure. If it detect the events, it sends notifications to the masakari-api. +Description: Virtual Machine High Availability (VMHA) for OpenStack - Common Files + Monitors for Masakari provides Virtual Machine High Availability (VMHA) service + for OpenStack clouds by automatically detecting the failure events + such as VM process down, provisioning process down, and nova-compute host failure. + If it detect the events, it sends notifications to the masakari-api. . - This package contains the Masakari process monitor. + This package contains the Masakari Monitors common files. -Package: python3-masakari-monitors +Package: masakari-monitors-doc Architecture: all -Section: python +Section: doc Depends: - python3-automaton, - python3-consul, - python3-keystoneauth1, - python3-libvirt, - python3-lxml, - python3-openstacksdk, - python3-oslo.cache, - python3-oslo.concurrency, - python3-oslo.config, - python3-oslo.i18n, - python3-oslo.log, - python3-oslo.middleware, - python3-oslo.privsep, - python3-oslo.service, - python3-oslo.utils, - python3-pbr, ${misc:Depends}, - ${python3:Depends}, -Description: OpenStack Virtual Machine High Availability (VMHA) - Python files - Masakari provides Virtual Machine High Availability (VMHA) service for - OpenStack clouds by automatically recovering the KVM-based Virtual - Machine(VM)s from failure events such as VM process down, provisioning - process down, and nova-compute host failure. It also provides API service for - manage and control the automated rescue mechanism. - . - Monitors for Masakari provides Virtual Machine High Availability (VMHA) - service for OpenStack clouds by automatically detecting the failure events - such as VM process down, provisioning process down, and nova-compute host - failure. If it detect the events, it sends notifications to the masakari-api. +Recommends: + libjs-jquery, +Description: Virtual Machine High Availability (VMHA) for OpenStack - Documentation + Monitors for Masakari provides Virtual Machine High Availability (VMHA) service + for OpenStack clouds by automatically detecting the failure events + such as VM process down, provisioning process down, and nova-compute host failure. + If it detect the events, it sends notifications to the masakari-api. . - This package contains the Python files and libraries for Masakari monitors. + This package contains the Masakari Monitors documentation. diff -pruN 15.0.0-1/debian/copyright 15.0.0-0ubuntu1/debian/copyright --- 15.0.0-1/debian/copyright 2023-03-22 13:24:16.000000000 +0000 +++ 15.0.0-0ubuntu1/debian/copyright 2023-03-23 18:51:03.000000000 +0000 @@ -1,20 +1,21 @@ Format: https://www.debian.org/doc/packaging-manuals/copyright-format/1.0/ Upstream-Name: masakari-monitors -Source: https://opendev.org/openstack/masakari-monitors +Source: https://github.com/openstack/masakari-monitors Files: * -Copyright: (c) 2010-2021, OpenStack Foundation - (c) 2016-2019, NTT DATA - (c) 2018 WindRiver Systems - (c) 2019 Canonical Ltd - (c) 2013 Hewlett-Packard Development Company, L.P. -License: Apache-2.0 +Copyright: (c) 2010-2011, 2016 OpenStack Foundation + (c) 2016-2018 Nippon Telegraph and Telephone Corporation + (c) 2018 WindRiver Systems + (c) 2016-2017 NTT Data + (c) 2013 Hewlett-Packard Development Company, L.P. + (c) 2006, 2008 Junio C Hamano +License: Apache-2 Files: debian/* -Copyright: (c) 2021, Thomas Goirand -License: Apache-2.0 +Copyright: (c) 2019, Canonical Ltd. +License: Apache-2 -License: Apache-2.0 +License: Apache-2 Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. You may obtain a copy of the License at @@ -28,4 +29,4 @@ License: Apache-2.0 limitations under the License. . On Debian-based systems the full text of the Apache version 2.0 license - can be found in `/usr/share/common-licenses/Apache-2.0'. + can be found in /usr/share/common-licenses/Apache-2.0. diff -pruN 15.0.0-1/debian/debian_control_vars 15.0.0-0ubuntu1/debian/debian_control_vars --- 15.0.0-1/debian/debian_control_vars 2023-03-22 13:24:16.000000000 +0000 +++ 15.0.0-0ubuntu1/debian/debian_control_vars 1970-01-01 00:00:00.000000000 +0000 @@ -1 +0,0 @@ -ostack-lsb-base= lsb-base diff -pruN 15.0.0-1/debian/gbp.conf 15.0.0-0ubuntu1/debian/gbp.conf --- 15.0.0-1/debian/gbp.conf 1970-01-01 00:00:00.000000000 +0000 +++ 15.0.0-0ubuntu1/debian/gbp.conf 2023-03-23 18:51:03.000000000 +0000 @@ -0,0 +1,7 @@ +[DEFAULT] +debian-branch = master +upstream-tag = %(version)s +pristine-tar = True + +[buildpackage] +export-dir = ../build-area diff -pruN 15.0.0-1/debian/masakari-host-monitor.init.in 15.0.0-0ubuntu1/debian/masakari-host-monitor.init.in --- 15.0.0-1/debian/masakari-host-monitor.init.in 2023-03-22 13:24:16.000000000 +0000 +++ 15.0.0-0ubuntu1/debian/masakari-host-monitor.init.in 2023-03-23 18:51:03.000000000 +0000 @@ -3,20 +3,19 @@ # Provides: masakari-host-monitor # Required-Start: $network $local_fs $remote_fs $syslog # Required-Stop: $remote_fs -# Should-Start: postgresql mysql keystone rabbitmq-server ntp chrony -# Should-Stop: postgresql mysql keystone rabbitmq-server ntp chrony +# Should-Start: libvirtd masakari-api keystone rabbitmq-server ntp +# Should-Stop: libvirtd masakari-api keystone rabbitmq-server ntp # Default-Start: 2 3 4 5 # Default-Stop: 0 1 6 -# Short-Description: Masakari Host Monitor daemon -# Description: Masakari provides Virtual Machine High Availability (VMHA) service for -# OpenStack clouds by automatically recovering the KVM-based Virtual -# Machine(VM)s from failure events such as VM process down, provisioning -# process down, and nova-compute host failure. It also provides API service for -# manage and control the automated rescue mechanism. +# Short-Description: Masakari Host Monitor +# Description: The Masakari Host Monitor provides Virtual Machine High +# Availability (VMHA) for OpenStack clouds by automatically +# detecting host events. If it detects events, it sends +# notifications to the masakari-api. ### END INIT INFO -# Author: Thomas Goirand -DESC="OpenStack Masakari Host Monitor (masakari-host-monitor)" -PROJECT_NAME=masakari -NAME=${PROJECT_NAME}-host-monitor -DAEMON=/usr/bin/${PROJECT_NAME}-hostmonitor +# Authors: Corey Bryant +DESC="OpenStack Masakari Host Monitor" +PROJECT_NAME=masakarimonitors +NAME=masakari-host-monitor +DAEMON=/usr/bin/masakari-hostmonitor diff -pruN 15.0.0-1/debian/masakari-instance-monitor.init.in 15.0.0-0ubuntu1/debian/masakari-instance-monitor.init.in --- 15.0.0-1/debian/masakari-instance-monitor.init.in 2023-03-22 13:24:16.000000000 +0000 +++ 15.0.0-0ubuntu1/debian/masakari-instance-monitor.init.in 2023-03-23 18:51:03.000000000 +0000 @@ -3,20 +3,20 @@ # Provides: masakari-instance-monitor # Required-Start: $network $local_fs $remote_fs $syslog # Required-Stop: $remote_fs -# Should-Start: postgresql mysql keystone rabbitmq-server ntp chrony -# Should-Stop: postgresql mysql keystone rabbitmq-server ntp chrony +# Should-Start: libvirtd masakari-api keystone rabbitmq-server ntp +# Should-Stop: libvirtd masakari-api keystone rabbitmq-server ntp # Default-Start: 2 3 4 5 # Default-Stop: 0 1 6 -# Short-Description: Masakari Instance Monitor daemon -# Description: Masakari provides Virtual Machine High Availability (VMHA) service for -# OpenStack clouds by automatically recovering the KVM-based Virtual -# Machine(VM)s from failure events such as VM process down, provisioning -# process down, and nova-compute host failure. It also provides API service for -# manage and control the automated rescue mechanism. +# Short-Description: Masakari Instance Monitor +# Description: The Masakari Instance Monitor provides Virtual +# Machine High Availability (VMHA) for OpenStack +# clouds by automatically detecting instance failure +# events. If it detects events, it sends notifications +# to the masakari-api. ### END INIT INFO -# Author: Thomas Goirand -DESC="OpenStack Masakari Instance Monitor (masakari-instancemonitor)" -PROJECT_NAME=masakari -NAME=${PROJECT_NAME}-instance-monitor -DAEMON=/usr/bin/${PROJECT_NAME}-instancemonitor +# Authors: Corey Bryant +DESC="OpenStack Masakari Instance Monitor" +PROJECT_NAME=masakarimonitors +NAME=masakari-instance-monitor +DAEMON=/usr/bin/masakari-instancemonitor diff -pruN 15.0.0-1/debian/masakari-introspective-instance-monitor.init.in 15.0.0-0ubuntu1/debian/masakari-introspective-instance-monitor.init.in --- 15.0.0-1/debian/masakari-introspective-instance-monitor.init.in 2023-03-22 13:24:16.000000000 +0000 +++ 15.0.0-0ubuntu1/debian/masakari-introspective-instance-monitor.init.in 2023-03-23 18:51:03.000000000 +0000 @@ -3,20 +3,20 @@ # Provides: masakari-introspective-instance-monitor # Required-Start: $network $local_fs $remote_fs $syslog # Required-Stop: $remote_fs -# Should-Start: postgresql mysql keystone rabbitmq-server ntp chrony -# Should-Stop: postgresql mysql keystone rabbitmq-server ntp chrony +# Should-Start: libvirtd masakari-api keystone rabbitmq-server ntp +# Should-Stop: libvirtd masakari-api keystone rabbitmq-server ntp # Default-Start: 2 3 4 5 # Default-Stop: 0 1 6 -# Short-Description: Masakari introspective-instance-monitor -# Description: Masakari provides Virtual Machine High Availability (VMHA) service for -# OpenStack clouds by automatically recovering the KVM-based Virtual -# Machine(VM)s from failure events such as VM process down, provisioning -# process down, and nova-compute host failure. It also provides API service for -# manage and control the automated rescue mechanism. +# Short-Description: Masakari Introspective Instance Monitor +# Description: The Masakari Introspective Instance Monitor provides +# Virtual Machine High Availability (VMHA) for OpenStack +# clouds by automatically detecting system-level failure +# events via the QEMU Guest Agent. If it detects events, +# it sends notifications to the masakari-api. ### END INIT INFO -# Author: Thomas Goirand -DESC="OpenStack Masakari Introspective Instance Monitor (masakari-introspective-instance-monitor)" -PROJECT_NAME=masakari -NAME=${PROJECT_NAME}-introspective-instance-monitor -DAEMON=/usr/bin/${PROJECT_NAME}-introspectiveinstancemonitor +# Authors: Corey Bryant +DESC="OpenStack Masakari Introspective Instance Monitor" +PROJECT_NAME=masakarimonitors +NAME=masakari-introspective-instance-monitor +DAEMON=/usr/bin/masakari-introspectiveinstancemonitor diff -pruN 15.0.0-1/debian/masakari-monitors-common.dirs 15.0.0-0ubuntu1/debian/masakari-monitors-common.dirs --- 15.0.0-1/debian/masakari-monitors-common.dirs 1970-01-01 00:00:00.000000000 +0000 +++ 15.0.0-0ubuntu1/debian/masakari-monitors-common.dirs 2023-03-23 18:51:03.000000000 +0000 @@ -0,0 +1,3 @@ +etc/masakarimonitors +var/lib/masakarimonitors +var/log/masakarimonitors diff -pruN 15.0.0-1/debian/masakari-monitors-common.install 15.0.0-0ubuntu1/debian/masakari-monitors-common.install --- 15.0.0-1/debian/masakari-monitors-common.install 2023-03-22 13:24:16.000000000 +0000 +++ 15.0.0-0ubuntu1/debian/masakari-monitors-common.install 2023-03-23 18:51:03.000000000 +0000 @@ -1 +1,3 @@ -debian/masakari_monitors_sudoers /etc/sudoers.d +debian/masakarimonitors_sudoers etc/sudoers.d +etc/masakarimonitors/masakarimonitors.conf +etc/masakarimonitors/process_list.yaml diff -pruN 15.0.0-1/debian/masakari-monitors-common.logrotate 15.0.0-0ubuntu1/debian/masakari-monitors-common.logrotate --- 15.0.0-1/debian/masakari-monitors-common.logrotate 2023-03-22 13:24:16.000000000 +0000 +++ 15.0.0-0ubuntu1/debian/masakari-monitors-common.logrotate 2023-03-23 18:51:03.000000000 +0000 @@ -3,5 +3,6 @@ missingok compress delaycompress + notifempty copytruncate } diff -pruN 15.0.0-1/debian/masakari-monitors-common.manpages 15.0.0-0ubuntu1/debian/masakari-monitors-common.manpages --- 15.0.0-1/debian/masakari-monitors-common.manpages 1970-01-01 00:00:00.000000000 +0000 +++ 15.0.0-0ubuntu1/debian/masakari-monitors-common.manpages 2023-03-23 18:51:03.000000000 +0000 @@ -0,0 +1 @@ +doc/build/man/* diff -pruN 15.0.0-1/debian/masakari-monitors-common.postinst 15.0.0-0ubuntu1/debian/masakari-monitors-common.postinst --- 15.0.0-1/debian/masakari-monitors-common.postinst 1970-01-01 00:00:00.000000000 +0000 +++ 15.0.0-0ubuntu1/debian/masakari-monitors-common.postinst 2023-03-23 18:51:03.000000000 +0000 @@ -0,0 +1,25 @@ +#!/bin/sh -e + +if [ "$1" = "configure" ]; then + if ! getent group masakarimonitors > /dev/null 2>&1; then + addgroup --system masakarimonitors >/dev/null + fi + + if ! getent passwd masakarimonitors > /dev/null 2>&1; then + adduser --system --home /var/lib/masakarimonitors --ingroup masakarimonitors --no-create-home --shell /usr/sbin/nologin masakarimonitors + fi + + chown masakarimonitors:adm /var/log/masakarimonitors + chmod 0750 /var/log/masakarimonitors + + find /etc/masakarimonitors -exec chown root:masakarimonitors "{}" + + find /etc/masakarimonitors -type f -exec chmod 0640 "{}" + -o -type d -exec chmod 0750 "{}" + + + find /var/lib/masakarimonitors -exec chown masakarimonitors:masakarimonitors "{}" + + find /var/lib/masakarimonitors -type f -exec chmod 0640 "{}" + -o -type d -exec chmod 0750 "{}" + + + if [ -f /etc/sudoers.d/masakarimonitors_sudoers ] ; then + chmod 0440 /etc/sudoers.d/masakarimonitors_sudoers + fi +fi +#DEBHELPER# diff -pruN 15.0.0-1/debian/masakari-monitors-common.postinst.in 15.0.0-0ubuntu1/debian/masakari-monitors-common.postinst.in --- 15.0.0-1/debian/masakari-monitors-common.postinst.in 2023-03-22 13:24:16.000000000 +0000 +++ 15.0.0-0ubuntu1/debian/masakari-monitors-common.postinst.in 1970-01-01 00:00:00.000000000 +0000 @@ -1,22 +0,0 @@ -#!/bin/sh - -set -e - -#PKGOS-INCLUDE# - -if [ "$1" = "configure" ] || [ "$1" = "reconfigure" ] ; then - pkgos_var_user_group masakari - - install -g masakari -o masakari -m 0750 -d /etc/masakarimonitors - if [ ! -e /etc/masakarimonitors/masakarimonitors.conf ] ; then - install -D -m 0640 -o root -g masakari /usr/share/masakari-monitors-common/masakarimonitors.conf /etc/masakarimonitors/masakarimonitors.conf - fi - if [ -f /etc/sudoers.d/masakari_monitors_sudoers ] ; then - chmod 0440 /etc/sudoers.d/masakari_monitors_sudoers - fi - -fi - -#DEBHELPER# - -exit 0 diff -pruN 15.0.0-1/debian/masakari-monitors-common.postrm.in 15.0.0-0ubuntu1/debian/masakari-monitors-common.postrm.in --- 15.0.0-1/debian/masakari-monitors-common.postrm.in 2023-03-22 13:24:16.000000000 +0000 +++ 15.0.0-0ubuntu1/debian/masakari-monitors-common.postrm.in 1970-01-01 00:00:00.000000000 +0000 @@ -1,22 +0,0 @@ -#!/bin/sh - -set -e - -#PKGOS-INCLUDE# - -if [ "$1" = "purge" ] ; then - # Purge config files copied in postinst - for i in masakarimonitorsmasakari.conf ; do - rm -f /etc/masakarimonitors/$i - done - - # and the folders - rmdir --ignore-fail-on-non-empty /etc/masakarimonitors || true - - [ -e /var/lib/masakarimonitors ] && rm -rf /var/lib/masakarimonitors - [ -e /var/log/masakarimonitors ] && rm -rf /var/log/masakarimonitors -fi - -#DEBHELPER# - -exit 0 diff -pruN 15.0.0-1/debian/masakari-monitors-doc.doc-base 15.0.0-0ubuntu1/debian/masakari-monitors-doc.doc-base --- 15.0.0-1/debian/masakari-monitors-doc.doc-base 2023-03-22 13:24:16.000000000 +0000 +++ 15.0.0-0ubuntu1/debian/masakari-monitors-doc.doc-base 2023-03-23 18:51:03.000000000 +0000 @@ -1,8 +1,8 @@ Document: masakari-monitors-doc Title: Masakari Monitors Documentation -Author: N/A +Author: OpenStack Abstract: Sphinx documentation for Masakari Monitors -Section: Programming/Python +Section: Network/File Transfer Format: HTML Index: /usr/share/doc/masakari-monitors-doc/html/index.html diff -pruN 15.0.0-1/debian/masakari-monitors-doc.docs 15.0.0-0ubuntu1/debian/masakari-monitors-doc.docs --- 15.0.0-1/debian/masakari-monitors-doc.docs 1970-01-01 00:00:00.000000000 +0000 +++ 15.0.0-0ubuntu1/debian/masakari-monitors-doc.docs 2023-03-23 18:51:03.000000000 +0000 @@ -0,0 +1 @@ +doc/build/html diff -pruN 15.0.0-1/debian/masakari-process-monitor.init.in 15.0.0-0ubuntu1/debian/masakari-process-monitor.init.in --- 15.0.0-1/debian/masakari-process-monitor.init.in 2023-03-22 13:24:16.000000000 +0000 +++ 15.0.0-0ubuntu1/debian/masakari-process-monitor.init.in 2023-03-23 18:51:03.000000000 +0000 @@ -3,20 +3,20 @@ # Provides: masakari-process-monitor # Required-Start: $network $local_fs $remote_fs $syslog # Required-Stop: $remote_fs -# Should-Start: postgresql mysql keystone rabbitmq-server ntp chrony -# Should-Stop: postgresql mysql keystone rabbitmq-server ntp chrony +# Should-Start: libvirtd masakari-api keystone rabbitmq-server ntp +# Should-Stop: libvirtd masakari-api keystone rabbitmq-server ntp # Default-Start: 2 3 4 5 # Default-Stop: 0 1 6 -# Short-Description: Masakari process-monitor -# Description: Masakari provides Virtual Machine High Availability (VMHA) service for -# OpenStack clouds by automatically recovering the KVM-based Virtual -# Machine(VM)s from failure events such as VM process down, provisioning -# process down, and nova-compute host failure. It also provides API service for -# manage and control the automated rescue mechanism. +# Short-Description: Masakari Process Monitor +# Description: The Masakari Process Monitor provides Virtual +# Machine High Availability (VMHA) for OpenStack +# clouds by automatically detecting host process +# failure events. If it detects events, it sends +# notifications to the masakari-api. ### END INIT INFO -# Author: Thomas Goirand -DESC="OpenStack Masakari Process Monitor (masakari-process-monitor)" -PROJECT_NAME=masakari -NAME=${PROJECT_NAME}-process-monitor -DAEMON=/usr/bin/${PROJECT_NAME}-processmonitor +# Authors: Corey Bryant +DESC="OpenStack Masakari Process Monitor" +PROJECT_NAME=masakarimonitors +NAME=masakari-process-monitor +DAEMON=/usr/bin/masakari-processmonitor diff -pruN 15.0.0-1/debian/masakari_monitors_sudoers 15.0.0-0ubuntu1/debian/masakari_monitors_sudoers --- 15.0.0-1/debian/masakari_monitors_sudoers 2023-03-22 13:24:16.000000000 +0000 +++ 15.0.0-0ubuntu1/debian/masakari_monitors_sudoers 1970-01-01 00:00:00.000000000 +0000 @@ -1,3 +0,0 @@ -masakari ALL=(root) NOPASSWD: /usr/bin/privsep-helper -masakari ALL=(root) NOPASSWD: /usr/bin/tcpdump * -masakari ALL=(root) NOPASSWD: /usr/sbin/crm_mon -X diff -pruN 15.0.0-1/debian/masakarimonitors_sudoers 15.0.0-0ubuntu1/debian/masakarimonitors_sudoers --- 15.0.0-1/debian/masakarimonitors_sudoers 1970-01-01 00:00:00.000000000 +0000 +++ 15.0.0-0ubuntu1/debian/masakarimonitors_sudoers 2023-03-23 18:51:03.000000000 +0000 @@ -0,0 +1,3 @@ +Defaults:masakarimonitors !requiretty + +masakarimonitors ALL = (root) NOPASSWD: /usr/bin/privsep-helper --config-file /etc/masakarimonitors/masakarimonitors.conf * diff -pruN 15.0.0-1/debian/patches/install-missing-files.patch 15.0.0-0ubuntu1/debian/patches/install-missing-files.patch --- 15.0.0-1/debian/patches/install-missing-files.patch 2023-03-22 13:24:16.000000000 +0000 +++ 15.0.0-0ubuntu1/debian/patches/install-missing-files.patch 1970-01-01 00:00:00.000000000 +0000 @@ -1,13 +0,0 @@ -Description: Install missing files - PBR misses the files, this fixes it. -Author: Thomas Goirand -Forwarded: no -Last-Update: 2016-03-24 - ---- a/MANIFEST.in 2021-03-13 00:11:05.458123314 +0100 -+++ b/MANIFEST.in 2021-03-13 00:56:12.930260326 +0100 -@@ -4,3 +4,4 @@ - exclude .gitreview - - global-exclude *.pyc -+recursive-include masakarimonitors * diff -pruN 15.0.0-1/debian/patches/series 15.0.0-0ubuntu1/debian/patches/series --- 15.0.0-1/debian/patches/series 2023-03-22 13:24:16.000000000 +0000 +++ 15.0.0-0ubuntu1/debian/patches/series 1970-01-01 00:00:00.000000000 +0000 @@ -1 +0,0 @@ -install-missing-files.patch diff -pruN 15.0.0-1/debian/py3dist-overrides 15.0.0-0ubuntu1/debian/py3dist-overrides --- 15.0.0-1/debian/py3dist-overrides 1970-01-01 00:00:00.000000000 +0000 +++ 15.0.0-0ubuntu1/debian/py3dist-overrides 2023-03-23 18:51:03.000000000 +0000 @@ -0,0 +1 @@ +python-consul diff -pruN 15.0.0-1/debian/python3-masakari-monitors.install 15.0.0-0ubuntu1/debian/python3-masakari-monitors.install --- 15.0.0-1/debian/python3-masakari-monitors.install 2023-03-22 13:24:16.000000000 +0000 +++ 15.0.0-0ubuntu1/debian/python3-masakari-monitors.install 1970-01-01 00:00:00.000000000 +0000 @@ -1 +0,0 @@ -/usr/* diff -pruN 15.0.0-1/debian/rules 15.0.0-0ubuntu1/debian/rules --- 15.0.0-1/debian/rules 2023-03-22 13:24:16.000000000 +0000 +++ 15.0.0-0ubuntu1/debian/rules 2023-03-23 18:51:03.000000000 +0000 @@ -1,59 +1,47 @@ #!/usr/bin/make -f -include /usr/share/openstack-pkg-tools/pkgos.make +# Verbose mode +#export DH_VERBOSE=1 -%: - dh $@ --buildsystem=python_distutils --with python3,sphinxdoc +export PYBUILD_NAME=masakari-monitors -override_dh_auto_clean: - rm -f debian/*.init debian/*.service debian/*.upstart - rm -rf build - rm -rf masakari.sqlite - rm -f debian/masakari-monitors-common.postinst debian/masakari-common.postrm +SHELL := /bin/sh -e -override_dh_auto_build: - /usr/share/openstack-pkg-tools/pkgos_insert_include pkgos_func masakari-monitors-common.postinst - /usr/share/openstack-pkg-tools/pkgos_insert_include pkgos_postrm masakari-monitors-common.postrm +DEBVERS ?= $(shell dpkg-parsechangelog | sed -n -e 's/^Version: //p') +VERSION ?= $(shell echo '$(DEBVERS)' | sed -e 's/^[[:digit:]]*://' -e 's/[-].*//' -e 's/[+].*//' -e 's/~git.*//g' -e 's/~/./g') +export PBR_VERSION=$(VERSION) -override_dh_auto_test: - echo "Do nothing..." +include /usr/share/openstack-pkg-tools/pkgos.make -override_dh_auto_install: - echo "Do nothing..." +%: + dh $@ --with python3 --buildsystem=pybuild + +override_dh_python3: + dh_python3 --shebang=/usr/bin/python3 override_dh_install: - for i in $(PYTHON3S) ; do \ - python$$i setup.py install --root=debian/tmp --install-layout=deb ; \ - done + rm -rf $(CURDIR)/debian/python3-masakari-monitors/usr/etc + PYTHONPATH=$(CURDIR) oslo-config-generator --config-file=etc/masakarimonitors/masakarimonitors-config-generator.conf + cp etc/masakarimonitors/masakarimonitors.conf.sample etc/masakarimonitors/masakarimonitors.conf + cp etc/masakarimonitors/process_list.yaml.sample etc/masakarimonitors/process_list.yaml + crudini --set etc/masakarimonitors/masakarimonitors.conf api auth_url http://localhost:5000/v3 + dh_install + dh_missing --fail-missing +override_dh_auto_test: ifeq (,$(findstring nocheck, $(DEB_BUILD_OPTIONS))) - pkgos-dh_auto_test --no-py2 'masakarimonitors\.tests\.unit.*' + PYTHONPATH=$(CURDIR) pkgos-dh_auto_test --no-py2 endif - # Generate the masakari.conf config - mkdir -p $(CURDIR)/debian/masakari-monitors-common/usr/share/masakari-monitors-common - PYTHONPATH=$(CURDIR)/debian/tmp/usr/lib/python3/dist-packages oslo-config-generator \ - --output-file $(CURDIR)/debian/masakari-monitors-common/usr/share/masakari-monitors-common/masakarimonitors.conf \ - --wrap-width 140 \ - --namespace masakarimonitors.conf \ - --namespace oslo.log \ - --namespace oslo.middleware - - mkdir -p $(CURDIR)/debian/masakari-monitors-common/etc/masakarimonitors - cp $(CURDIR)/etc/masakarimonitors/process_list.yaml.sample $(CURDIR)/debian/masakari-monitors-common/etc/masakarimonitors/process_list.yaml - -# mkdir -p $(CURDIR)/debian/masakari-process-monitor/etc/masakarimonitors -# cp $(CURDIR)/etc/masakarimonitors/processmonitor.conf.sample $(CURDIR)/debian/masakari-process-monitor/etc/masakarimonitors/processmonitor.conf - - dh_install - rm -rf $(CURDIR)/debian/tmp/usr/etc - dh_missing --fail-missing +override_dh_auto_clean: + dh_auto_clean + rm -rf doc/build/* doc/source/api doc/.autogenerated -override_dh_sphinxdoc: -ifeq (,$(findstring nodoc, $(DEB_BUILD_OPTIONS))) - PYTHONPATH=. PYTHON=python3 python3 -m sphinx -b html doc/source $(CURDIR)/debian/masakari-monitors-doc/usr/share/doc/masakari-monitors-doc/html - dh_sphinxdoc +override_dh_auto_build: + dh_auto_build +ifeq (,$(findstring nodocs, $(DEB_BUILD_OPTIONS))) + mkdir -p doc/build/html + mkdir -p doc/build/man + PYTHONPATH=$(CURDIR) sphinx-build -b man doc/source doc/build/man + PYTHONPATH=$(CURDIR) sphinx-build -b html doc/source doc/build/html endif - -override_dh_python3: - dh_python3 --shebang=/usr/bin/python3 diff -pruN 15.0.0-1/debian/salsa-ci.yml 15.0.0-0ubuntu1/debian/salsa-ci.yml --- 15.0.0-1/debian/salsa-ci.yml 2023-03-22 13:24:16.000000000 +0000 +++ 15.0.0-0ubuntu1/debian/salsa-ci.yml 1970-01-01 00:00:00.000000000 +0000 @@ -1,3 +0,0 @@ -include: - - https://salsa.debian.org/salsa-ci-team/pipeline/raw/master/salsa-ci.yml - - https://salsa.debian.org/salsa-ci-team/pipeline/raw/master/pipeline-jobs.yml diff -pruN 15.0.0-1/debian/source/options 15.0.0-0ubuntu1/debian/source/options --- 15.0.0-1/debian/source/options 1970-01-01 00:00:00.000000000 +0000 +++ 15.0.0-0ubuntu1/debian/source/options 2023-03-23 18:51:03.000000000 +0000 @@ -0,0 +1 @@ +extend-diff-ignore = "^[^/]*[.]egg-info/" diff -pruN 15.0.0-1/debian/tests/control 15.0.0-0ubuntu1/debian/tests/control --- 15.0.0-1/debian/tests/control 2023-03-22 13:24:16.000000000 +0000 +++ 15.0.0-0ubuntu1/debian/tests/control 2023-03-23 18:51:03.000000000 +0000 @@ -1,5 +1,5 @@ -Tests: unittests -Depends: - @, - @builddeps@, -Restrictions: allow-stderr needs-root +Tests: masakari-monitors-daemons +Depends: masakari-host-monitor, masakari-instance-monitor, + masakari-introspective-instance-monitor, masakari-process-monitor, + libvirt-daemon-system +Restrictions: needs-root, allow-stderr diff -pruN 15.0.0-1/debian/tests/masakari-monitors-daemons 15.0.0-0ubuntu1/debian/tests/masakari-monitors-daemons --- 15.0.0-1/debian/tests/masakari-monitors-daemons 1970-01-01 00:00:00.000000000 +0000 +++ 15.0.0-0ubuntu1/debian/tests/masakari-monitors-daemons 2023-03-23 18:51:03.000000000 +0000 @@ -0,0 +1,31 @@ +#!/bin/bash +#--------------------- +# Testing masakari-daemons +#--------------------- +set -e +DAEMONS=('masakari-host-monitor' + 'masakari-instance-monitor' + 'masakari-introspective-instance-monitor' + 'masakari-process-monitor') + +ret=0 + +for daemon in "${DAEMONS[@]}"; do + TIMEOUT=50 + systemctl restart $daemon + while [ "$TIMEOUT" -gt 0 ]; do + if pidof -x $daemon > /dev/null; then + echo "OK" + break + fi + TIMEOUT=$((TIMEOUT - 1)) + sleep 0.1 + done + + if [ "$TIMEOUT" -le 0 ]; then + echo "ERROR: ${daemon} IS NOT RUNNING" + ret=1 + fi +done + +exit $ret diff -pruN 15.0.0-1/debian/tests/unittests 15.0.0-0ubuntu1/debian/tests/unittests --- 15.0.0-1/debian/tests/unittests 2023-03-22 13:24:16.000000000 +0000 +++ 15.0.0-0ubuntu1/debian/tests/unittests 1970-01-01 00:00:00.000000000 +0000 @@ -1,5 +0,0 @@ -#!/bin/sh - -set -e - -pkgos-dh_auto_test --no-py2 'masakarimonitors\.tests\.unit.*' diff -pruN 15.0.0-1/debian/watch 15.0.0-0ubuntu1/debian/watch --- 15.0.0-1/debian/watch 2023-03-22 13:24:16.000000000 +0000 +++ 15.0.0-0ubuntu1/debian/watch 2023-03-23 18:51:03.000000000 +0000 @@ -1,3 +1,3 @@ version=3 -opts="uversionmangle=s/\.0rc/~rc/;s/\.0b1/~b1/;s/\.0b2/~b2/;s/\.0b3/~b3/" \ -https://github.com/openstack/masakari-monitors/tags .*/(\d[brc\d\.]+)\.tar\.gz +opts="uversionmangle=s/\.([a-zA-Z])/~$1/;s/%7E/~/;s/\.0b/~b/;s/\.0rc/~rc/" \ + https://tarballs.opendev.org/openstack/masakari-monitors/ masakari-monitors-(\d.*)\.tar\.gz diff -pruN 15.0.0-1/masakari_monitors.egg-info/PKG-INFO 15.0.0-0ubuntu1/masakari_monitors.egg-info/PKG-INFO --- 15.0.0-1/masakari_monitors.egg-info/PKG-INFO 1970-01-01 00:00:00.000000000 +0000 +++ 15.0.0-0ubuntu1/masakari_monitors.egg-info/PKG-INFO 2023-03-22 12:21:43.000000000 +0000 @@ -0,0 +1,82 @@ +Metadata-Version: 1.2 +Name: masakari-monitors +Version: 15.0.0 +Summary: Monitors for Masakari +Home-page: https://docs.openstack.org/masakari-monitors/latest/ +Author: OpenStack +Author-email: openstack-dev@lists.openstack.org +License: UNKNOWN +Description: =============================== + masakari-monitors + =============================== + + Monitors for Masakari + ===================== + + Monitors for Masakari provides Virtual Machine High Availability (VMHA) service + for OpenStack clouds by automatically detecting the failure events + such as VM process down, provisioning process down, and nova-compute host failure. + If it detect the events, it sends notifications to the masakari-api. + + Original version of Masakari: https://github.com/ntt-sic/masakari + + Tokyo Summit Session: https://www.youtube.com/watch?v=BmjNKceW_9A + + Monitors for Masakari is distributed under the terms of the Apache License, + Version 2.0. The full terms and conditions of this license are + detailed in the LICENSE file. + + * Free software: Apache license + * Documentation: https://docs.openstack.org/masakari-monitors + * Source: https://git.openstack.org/cgit/openstack/masakari-monitors + * Bugs: https://bugs.launchpad.net/masakari-monitors + + + Configure masakari-monitors + --------------------------- + + #. Clone masakari using:: + + $ git clone https://github.com/openstack/masakari-monitors.git + + #. Create masakarimonitors directory in /etc/. + + #. Run setup.py from masakari-monitors:: + + $ sudo python setup.py install + + #. Copy masakarimonitors.conf and process_list.yaml files from + masakari-monitors/etc/ to /etc/masakarimonitors folder and make necessary + changes to the masakarimonitors.conf and process_list.yaml files. + To generate the sample masakarimonitors.conf file, run the following + command from the top level of the masakari-monitors directory:: + + $ tox -egenconfig + + #. To run masakari-processmonitor, masakari-hostmonitor and + masakari-instancemonitor simply use following binary:: + + $ masakari-processmonitor + $ masakari-hostmonitor + $ masakari-instancemonitor + + + Features + -------- + + * TODO + + +Platform: UNKNOWN +Classifier: Environment :: OpenStack +Classifier: Intended Audience :: Information Technology +Classifier: Intended Audience :: System Administrators +Classifier: License :: OSI Approved :: Apache Software License +Classifier: Operating System :: POSIX :: Linux +Classifier: Programming Language :: Python +Classifier: Programming Language :: Python :: Implementation :: CPython +Classifier: Programming Language :: Python :: 3 :: Only +Classifier: Programming Language :: Python :: 3 +Classifier: Programming Language :: Python :: 3.8 +Classifier: Programming Language :: Python :: 3.9 +Requires-Python: >=3.8 diff -pruN 15.0.0-1/masakari_monitors.egg-info/SOURCES.txt 15.0.0-0ubuntu1/masakari_monitors.egg-info/SOURCES.txt --- 15.0.0-1/masakari_monitors.egg-info/SOURCES.txt 1970-01-01 00:00:00.000000000 +0000 +++ 15.0.0-0ubuntu1/masakari_monitors.egg-info/SOURCES.txt 2023-03-22 12:21:43.000000000 +0000 @@ -0,0 +1,165 @@ +.coveragerc +.mailmap +.stestr.conf +.yamllint +.zuul.yaml +AUTHORS +CONTRIBUTING.rst +ChangeLog +HACKING.rst +LICENSE +MANIFEST.in +README.rst +bindep.txt +requirements.txt +setup.cfg +setup.py +test-requirements.txt +tox.ini +doc/requirements.txt +doc/source/conf.py +doc/source/consul-usage.rst +doc/source/hostmonitor.rst +doc/source/index.rst +doc/source/installation.rst +doc/source/instancemonitor.rst +doc/source/introspectiveinstancemonitor.rst +doc/source/processmonitor.rst +doc/source/readme.rst +doc/source/usage.rst +doc/source/_static/.gitkeep +doc/source/contributor/contributing.rst +doc/source/reference/conf-file.rst +doc/source/reference/conf.rst +etc/masakarimonitors/README-masakarimonitors.conf.txt +etc/masakarimonitors/masakarimonitors-config-generator.conf +etc/masakarimonitors/matrix.yaml.sample +etc/masakarimonitors/process_list.yaml.sample +masakari_monitors.egg-info/PKG-INFO +masakari_monitors.egg-info/SOURCES.txt +masakari_monitors.egg-info/dependency_links.txt +masakari_monitors.egg-info/entry_points.txt +masakari_monitors.egg-info/not-zip-safe +masakari_monitors.egg-info/pbr.json +masakari_monitors.egg-info/requires.txt +masakari_monitors.egg-info/top_level.txt +masakarimonitors/__init__.py +masakarimonitors/config.py +masakarimonitors/i18n.py +masakarimonitors/manager.py +masakarimonitors/privsep.py +masakarimonitors/service.py +masakarimonitors/utils.py +masakarimonitors/version.py +masakarimonitors/cmd/__init__.py +masakarimonitors/cmd/hostmonitor.py +masakarimonitors/cmd/instancemonitor.py +masakarimonitors/cmd/introspectiveinstancemonitor.py +masakarimonitors/cmd/processmonitor.py +masakarimonitors/common/__init__.py +masakarimonitors/common/config.py +masakarimonitors/conf/__init__.py +masakarimonitors/conf/api.py +masakarimonitors/conf/base.py +masakarimonitors/conf/consul.py +masakarimonitors/conf/host.py +masakarimonitors/conf/instance.py +masakarimonitors/conf/introspectiveinstancemonitor.py +masakarimonitors/conf/opts.py +masakarimonitors/conf/process.py +masakarimonitors/conf/service.py +masakarimonitors/ha/__init__.py +masakarimonitors/ha/masakari.py +masakarimonitors/hacking/__init__.py +masakarimonitors/hacking/checks.py +masakarimonitors/hostmonitor/__init__.py +masakarimonitors/hostmonitor/driver.py +masakarimonitors/hostmonitor/host.py +masakarimonitors/hostmonitor/consul_check/__init__.py +masakarimonitors/hostmonitor/consul_check/consul_helper.py +masakarimonitors/hostmonitor/consul_check/manager.py +masakarimonitors/hostmonitor/consul_check/matrix_helper.py +masakarimonitors/hostmonitor/host_handler/__init__.py +masakarimonitors/hostmonitor/host_handler/handle_host.py +masakarimonitors/hostmonitor/host_handler/hold_host_status.py +masakarimonitors/hostmonitor/host_handler/parse_cib_xml.py +masakarimonitors/hostmonitor/host_handler/parse_crmmon_xml.py +masakarimonitors/instancemonitor/__init__.py +masakarimonitors/instancemonitor/instance.py +masakarimonitors/instancemonitor/libvirt_handler/__init__.py +masakarimonitors/instancemonitor/libvirt_handler/callback.py +masakarimonitors/instancemonitor/libvirt_handler/eventfilter.py +masakarimonitors/instancemonitor/libvirt_handler/eventfilter_table.py +masakarimonitors/introspectiveinstancemonitor/README.rst +masakarimonitors/introspectiveinstancemonitor/__init__.py +masakarimonitors/introspectiveinstancemonitor/cache.py +masakarimonitors/introspectiveinstancemonitor/instance.py +masakarimonitors/introspectiveinstancemonitor/qemu_utils.py +masakarimonitors/introspectiveinstancemonitor/scheduler.py +masakarimonitors/objects/__init__.py +masakarimonitors/objects/event_constants.py +masakarimonitors/processmonitor/__init__.py +masakarimonitors/processmonitor/process.py +masakarimonitors/processmonitor/process_handler/__init__.py +masakarimonitors/processmonitor/process_handler/handle_process.py +masakarimonitors/tests/__init__.py +masakarimonitors/tests/base.py +masakarimonitors/tests/test_masakarimonitors.py +masakarimonitors/tests/unit/__init__.py +masakarimonitors/tests/unit/test_hacking.py +masakarimonitors/tests/unit/ha/__init__.py +masakarimonitors/tests/unit/ha/test_masakari.py +masakarimonitors/tests/unit/hostmonitor/__init__.py +masakarimonitors/tests/unit/hostmonitor/test_host.py +masakarimonitors/tests/unit/hostmonitor/consul_check/__init__.py +masakarimonitors/tests/unit/hostmonitor/consul_check/test_consul_helper.py +masakarimonitors/tests/unit/hostmonitor/consul_check/test_manager.py +masakarimonitors/tests/unit/hostmonitor/consul_check/test_matrix_helper.py +masakarimonitors/tests/unit/hostmonitor/host_handler/__init__.py +masakarimonitors/tests/unit/hostmonitor/host_handler/test_handle_host.py +masakarimonitors/tests/unit/hostmonitor/host_handler/test_hold_host_status.py +masakarimonitors/tests/unit/hostmonitor/host_handler/test_parse_cib_xml.py +masakarimonitors/tests/unit/hostmonitor/host_handler/test_parse_crmmon_xml.py +masakarimonitors/tests/unit/instancemonitor/__init__.py +masakarimonitors/tests/unit/instancemonitor/test_instance.py +masakarimonitors/tests/unit/instancemonitor/libvirt_handler/__init__.py +masakarimonitors/tests/unit/instancemonitor/libvirt_handler/test_callback.py +masakarimonitors/tests/unit/instancemonitor/libvirt_handler/test_eventfilter.py +masakarimonitors/tests/unit/introspectiveinstancemonitor/__init__.py +masakarimonitors/tests/unit/introspectiveinstancemonitor/test_monitor_manager.py +masakarimonitors/tests/unit/introspectiveinstancemonitor/test_qemu_utils.py +masakarimonitors/tests/unit/processmonitor/__init__.py +masakarimonitors/tests/unit/processmonitor/test_process.py +masakarimonitors/tests/unit/processmonitor/process_handler/__init__.py +masakarimonitors/tests/unit/processmonitor/process_handler/test_handle_process.py +releasenotes/notes/.placeholder +releasenotes/notes/bp-retry-check-when-host-failure-78649c512ef79199.yaml +releasenotes/notes/bug-1866660-ef8624f5283b2e5e.yaml +releasenotes/notes/bug-1878548-5fab31aec6ba5407.yaml +releasenotes/notes/bug-1930361-fa8ce8e9781ea967.yaml +releasenotes/notes/deprecate-processmonitor-95c8aefbc749c1ed.yaml +releasenotes/notes/drop-cap-net-admin-8d7d7cfb274e9547.yaml +releasenotes/notes/drop-py-2-7-b28de816eac45468.yaml +releasenotes/notes/hostmonitor-driver-based-on-consul-03f7e619d91e7e06.yaml +releasenotes/notes/hostmonitor-systemd-89696f96a654a918.yaml +releasenotes/notes/introspectiveinstancemonitor-f4bc71f029b61d49.yaml +releasenotes/notes/libvirt-sasl-support-edf1388c556a594b.yaml +releasenotes/notes/libvirt-still-required-22a8d817ee8d0be8.yaml +releasenotes/notes/pythonize-monitors-081e74dfaf78fe99.yaml +releasenotes/source/conf.py +releasenotes/source/index.rst +releasenotes/source/ocata.rst +releasenotes/source/pike.rst +releasenotes/source/queens.rst +releasenotes/source/rocky.rst +releasenotes/source/stein.rst +releasenotes/source/train.rst +releasenotes/source/unreleased.rst +releasenotes/source/ussuri.rst +releasenotes/source/victoria.rst +releasenotes/source/wallaby.rst +releasenotes/source/xena.rst +releasenotes/source/yoga.rst +releasenotes/source/zed.rst +releasenotes/source/_static/.placeholder +releasenotes/source/_templates/.placeholder \ No newline at end of file diff -pruN 15.0.0-1/masakari_monitors.egg-info/dependency_links.txt 15.0.0-0ubuntu1/masakari_monitors.egg-info/dependency_links.txt --- 15.0.0-1/masakari_monitors.egg-info/dependency_links.txt 1970-01-01 00:00:00.000000000 +0000 +++ 15.0.0-0ubuntu1/masakari_monitors.egg-info/dependency_links.txt 2023-03-22 12:21:43.000000000 +0000 @@ -0,0 +1 @@ + diff -pruN 15.0.0-1/masakari_monitors.egg-info/entry_points.txt 15.0.0-0ubuntu1/masakari_monitors.egg-info/entry_points.txt --- 15.0.0-1/masakari_monitors.egg-info/entry_points.txt 1970-01-01 00:00:00.000000000 +0000 +++ 15.0.0-0ubuntu1/masakari_monitors.egg-info/entry_points.txt 2023-03-22 12:21:43.000000000 +0000 @@ -0,0 +1,20 @@ +[console_scripts] +masakari-hostmonitor = masakarimonitors.cmd.hostmonitor:main +masakari-instancemonitor = masakarimonitors.cmd.instancemonitor:main +masakari-introspectiveinstancemonitor = masakarimonitors.cmd.introspectiveinstancemonitor:main +masakari-processmonitor = masakarimonitors.cmd.processmonitor:main + +[hostmonitor.driver] +consul = masakarimonitors.hostmonitor.consul_check.manager:ConsulCheck +default = masakarimonitors.hostmonitor.host_handler.handle_host:HandleHost +simple = masakarimonitors.hostmonitor.host_handler.handle_host:HandleHost + +[oslo.config.opts] +masakarimonitors.conf = masakarimonitors.conf.opts:list_opts + +[oslo.config.opts.defaults] +masakarimonitors.hostmonitor = masakarimonitors.common.config:set_middleware_defaults +masakarimonitors.instancemonitor = masakarimonitors.common.config:set_middleware_defaults +masakarimonitors.introspectiveinstancemonitor = masakarimonitors.common.config:set_middleware_defaults +masakarimonitors.processmonitor = masakarimonitors.common.config:set_middleware_defaults + diff -pruN 15.0.0-1/masakari_monitors.egg-info/not-zip-safe 15.0.0-0ubuntu1/masakari_monitors.egg-info/not-zip-safe --- 15.0.0-1/masakari_monitors.egg-info/not-zip-safe 1970-01-01 00:00:00.000000000 +0000 +++ 15.0.0-0ubuntu1/masakari_monitors.egg-info/not-zip-safe 2023-03-22 12:21:43.000000000 +0000 @@ -0,0 +1 @@ + diff -pruN 15.0.0-1/masakari_monitors.egg-info/pbr.json 15.0.0-0ubuntu1/masakari_monitors.egg-info/pbr.json --- 15.0.0-1/masakari_monitors.egg-info/pbr.json 1970-01-01 00:00:00.000000000 +0000 +++ 15.0.0-0ubuntu1/masakari_monitors.egg-info/pbr.json 2023-03-22 12:21:43.000000000 +0000 @@ -0,0 +1 @@ +{"git_version": "cf646df", "is_release": true} \ No newline at end of file diff -pruN 15.0.0-1/masakari_monitors.egg-info/requires.txt 15.0.0-0ubuntu1/masakari_monitors.egg-info/requires.txt --- 15.0.0-1/masakari_monitors.egg-info/requires.txt 1970-01-01 00:00:00.000000000 +0000 +++ 15.0.0-0ubuntu1/masakari_monitors.egg-info/requires.txt 2023-03-22 12:21:43.000000000 +0000 @@ -0,0 +1,15 @@ +automaton>=1.9.0 +keystoneauth1>=3.4.0 +lxml>=4.5.0 +openstacksdk>=0.13.0 +oslo.cache>=1.26.0 +oslo.concurrency>=3.26.0 +oslo.config>=5.2.0 +oslo.i18n>=3.15.3 +oslo.log>=3.36.0 +oslo.middleware>=3.31.0 +oslo.privsep>=1.23.0 +oslo.service!=1.28.1,>=1.24.0 +oslo.utils>=3.33.0 +pbr!=2.1.0,>=2.0.0 +python-consul>=1.1.0 diff -pruN 15.0.0-1/masakari_monitors.egg-info/top_level.txt 15.0.0-0ubuntu1/masakari_monitors.egg-info/top_level.txt --- 15.0.0-1/masakari_monitors.egg-info/top_level.txt 1970-01-01 00:00:00.000000000 +0000 +++ 15.0.0-0ubuntu1/masakari_monitors.egg-info/top_level.txt 2023-03-22 12:21:43.000000000 +0000 @@ -0,0 +1 @@ +masakarimonitors diff -pruN 15.0.0-1/setup.cfg 15.0.0-0ubuntu1/setup.cfg --- 15.0.0-1/setup.cfg 2023-01-04 03:41:33.000000000 +0000 +++ 15.0.0-0ubuntu1/setup.cfg 2023-03-22 12:21:43.315543400 +0000 @@ -1,46 +1,48 @@ [metadata] name = masakari-monitors summary = Monitors for Masakari -description_file = - README.rst +description_file = + README.rst author = OpenStack author_email = openstack-dev@lists.openstack.org home_page = https://docs.openstack.org/masakari-monitors/latest/ python_requires = >=3.8 -classifier = - Environment :: OpenStack - Intended Audience :: Information Technology - Intended Audience :: System Administrators - License :: OSI Approved :: Apache Software License - Operating System :: POSIX :: Linux - Programming Language :: Python - Programming Language :: Python :: Implementation :: CPython - Programming Language :: Python :: 3 :: Only - Programming Language :: Python :: 3 - Programming Language :: Python :: 3.8 - Programming Language :: Python :: 3.9 +classifier = + Environment :: OpenStack + Intended Audience :: Information Technology + Intended Audience :: System Administrators + License :: OSI Approved :: Apache Software License + Operating System :: POSIX :: Linux + Programming Language :: Python + Programming Language :: Python :: Implementation :: CPython + Programming Language :: Python :: 3 :: Only + Programming Language :: Python :: 3 + Programming Language :: Python :: 3.8 + Programming Language :: Python :: 3.9 [files] -packages = - masakarimonitors +packages = + masakarimonitors [entry_points] -oslo.config.opts = - masakarimonitors.conf = masakarimonitors.conf.opts:list_opts +oslo.config.opts = + masakarimonitors.conf = masakarimonitors.conf.opts:list_opts +oslo.config.opts.defaults = + masakarimonitors.introspectiveinstancemonitor = masakarimonitors.common.config:set_middleware_defaults + masakarimonitors.instancemonitor = masakarimonitors.common.config:set_middleware_defaults + masakarimonitors.processmonitor = masakarimonitors.common.config:set_middleware_defaults + masakarimonitors.hostmonitor = masakarimonitors.common.config:set_middleware_defaults +console_scripts = + masakari-introspectiveinstancemonitor = masakarimonitors.cmd.introspectiveinstancemonitor:main + masakari-instancemonitor = masakarimonitors.cmd.instancemonitor:main + masakari-processmonitor = masakarimonitors.cmd.processmonitor:main + masakari-hostmonitor = masakarimonitors.cmd.hostmonitor:main +hostmonitor.driver = + simple = masakarimonitors.hostmonitor.host_handler.handle_host:HandleHost + default = masakarimonitors.hostmonitor.host_handler.handle_host:HandleHost + consul = masakarimonitors.hostmonitor.consul_check.manager:ConsulCheck -oslo.config.opts.defaults = - masakarimonitors.introspectiveinstancemonitor = masakarimonitors.common.config:set_middleware_defaults - masakarimonitors.instancemonitor = masakarimonitors.common.config:set_middleware_defaults - masakarimonitors.processmonitor = masakarimonitors.common.config:set_middleware_defaults - masakarimonitors.hostmonitor = masakarimonitors.common.config:set_middleware_defaults +[egg_info] +tag_build = +tag_date = 0 -console_scripts = - masakari-introspectiveinstancemonitor = masakarimonitors.cmd.introspectiveinstancemonitor:main - masakari-instancemonitor = masakarimonitors.cmd.instancemonitor:main - masakari-processmonitor = masakarimonitors.cmd.processmonitor:main - masakari-hostmonitor = masakarimonitors.cmd.hostmonitor:main - -hostmonitor.driver = - simple = masakarimonitors.hostmonitor.host_handler.handle_host:HandleHost - default = masakarimonitors.hostmonitor.host_handler.handle_host:HandleHost - consul = masakarimonitors.hostmonitor.consul_check.manager:ConsulCheck