July 2019 - openSUSE Commits - openSUSE Mailing Lists

commit python-ansel for openSUSE:Factory
by root 31 Jul '19

31 Jul '19

Hello community, here is the log from the commit of package python-ansel for openSUSE:Factory checked in at 2019-07-31 14:36:47 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/python-ansel (Old) and /work/SRC/openSUSE:Factory/.python-ansel.new.4126 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "python-ansel" Wed Jul 31 14:36:47 2019 rev:1 rq:720016 version:0.1.1 Changes: -------- New Changes file: --- /dev/null 2019-07-18 00:53:00.979475821 +0200 +++ /work/SRC/openSUSE:Factory/.python-ansel.new.4126/python-ansel.changes 2019-07-31 14:36:51.073850946 +0200 @@ -0,0 +1,4 @@ +------------------------------------------------------------------- +Wed Jul 31 01:30:30 AM UTC 2019 - John Vandenberg <jayvdb(a)gmail.com> + +- Initial spec for v0.1.1 New: ---- ansel-0.1.1.tar.gz python-ansel.changes python-ansel.spec ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ python-ansel.spec ++++++ # # spec file for package python-ansel # # Copyright (c) 2019 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed # upon. The license for this file, and modifications and additions to the # file, is the same license as for the pristine package itself (unless the # license for the pristine package is not an Open Source License, in which # case the license is the MIT License). An "Open Source License" is a # license that conforms to the Open Source Definition (Version 1.9) # published by the Open Source Initiative. # Please submit bugfixes or comments via https://bugs.opensuse.org/ # %{?!python_module:%define python_module() python-%{**} python3-%{**}} Name: python-ansel Version: 0.1.1 Release: 0 Summary: Codecs for reading/writing documents in the ANSEL character set License: MIT Group: Development/Languages/Python URL: https://github.com/haney/python-ansel Source: https://files.pythonhosted.org/packages/source/a/ansel/ansel-%{version}.tar… BuildRequires: %{python_module pytest-runner} BuildRequires: %{python_module setuptools} BuildRequires: fdupes BuildRequires: python-rpm-macros Requires: python-six BuildArch: noarch # SECTION test requirements BuildRequires: %{python_module pyfakefs} BuildRequires: %{python_module pytest} BuildRequires: %{python_module six} # /SECTION %python_subpackages %description Codecs for reading/writing documents in the ANSEL character set. %prep %setup -q -n ansel-%{version} %build %python_build %install %python_install %python_expand %fdupes %{buildroot}%{$python_sitelib} %check %python_exec setup.py test %files %{python_files} %doc AUTHORS.rst README.rst %license LICENSE %{python_sitelib}/* %changelog

1 0

commit python-audioread for openSUSE:Factory
by root 31 Jul '19

31 Jul '19

Hello community, here is the log from the commit of package python-audioread for openSUSE:Factory checked in at 2019-07-31 14:36:42 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/python-audioread (Old) and /work/SRC/openSUSE:Factory/.python-audioread.new.4126 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "python-audioread" Wed Jul 31 14:36:42 2019 rev:6 rq:720014 version:2.1.8 Changes: -------- --- /work/SRC/openSUSE:Factory/python-audioread/python-audioread.changes 2019-02-26 22:21:30.814085055 +0100 +++ /work/SRC/openSUSE:Factory/.python-audioread.new.4126/python-audioread.changes 2019-07-31 14:36:43.901854998 +0200 @@ -1,0 +2,18 @@ +Wed Jul 31 08:47:01 UTC 2019 - pgajdos(a)suse.com + +- version update to 2.1.8 + * Fix an unhandled ``OSError`` when FFmpeg is not installed. + * Properly close some filehandles in the FFmpeg backend (thanks to + @RyanMarcus and @ssssam). + * The maddec backend now always produces bytes objects, like the other + backends (thanks to @ssssam). + * Resolve an audio data memory leak in the GStreamer backend (thanks again to + @ssssam). + * You can now optionally specify which specific backends ``audio_open`` should + try (thanks once again to @ssssam). +- deleted patches + - 0001-maddec-Ensure-that-the-audio-blocks-are-of-type-bytes.patch (upstreamed) +- deleted sources + - LICENSE (not needed) + +------------------------------------------------------------------- Old: ---- 0001-maddec-Ensure-that-the-audio-blocks-are-of-type-bytes.patch LICENSE audioread-2.1.6.tar.gz New: ---- v2.1.8.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ python-audioread.spec ++++++ --- /var/tmp/diff_new_pack.mOSGsz/_old 2019-07-31 14:36:44.733854527 +0200 +++ /var/tmp/diff_new_pack.mOSGsz/_new 2019-07-31 14:36:44.737854526 +0200 @@ -18,18 +18,18 @@ %{?!python_module:%define python_module() python-%{**} python3-%{**}} Name: python-audioread -Version: 2.1.6 +Version: 2.1.8 Release: 0 Summary: Wrapper for audio decoding via selectable backends License: MIT Group: Development/Languages/Python Url: https://github.com/sampsyo/audioread -Source0: https://files.pythonhosted.org/packages/source/a/audioread/audioread-%{vers… -Source10: https://raw.githubusercontent.com/beetbox/audioread/master/LICENSE -# PATCH-FIX-UPSTREAM -Patch0: 0001-maddec-Ensure-that-the-audio-blocks-are-of-type-bytes.patch +Source0: https://github.com/beetbox/audioread/archive/v%{version}.tar.gz BuildRequires: %{python_module base} +BuildRequires: %{python_module pytest-runner} +BuildRequires: %{python_module setuptools} BuildRequires: fdupes +BuildRequires: ffmpeg BuildRequires: python-rpm-macros BuildArch: noarch Recommends: ffmpeg @@ -51,8 +51,6 @@ %prep %setup -q -n audioread-%{version} -%patch0 -p1 -cp %{SOURCE10} . %build %python_build @@ -60,6 +58,9 @@ %install %python_install +%check +%pytest + %files %{python_files} %doc README.rst %license LICENSE

1 0

commit python-marshmallow for openSUSE:Factory
by root 31 Jul '19

31 Jul '19

Hello community, here is the log from the commit of package python-marshmallow for openSUSE:Factory checked in at 2019-07-31 14:36:36 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/python-marshmallow (Old) and /work/SRC/openSUSE:Factory/.python-marshmallow.new.4126 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "python-marshmallow" Wed Jul 31 14:36:36 2019 rev:8 rq:720011 version:2.19.5 Changes: -------- --- /work/SRC/openSUSE:Factory/python-marshmallow/python-marshmallow.changes 2019-07-28 10:19:44.684601598 +0200 +++ /work/SRC/openSUSE:Factory/.python-marshmallow.new.4126/python-marshmallow.changes 2019-07-31 14:36:40.205857085 +0200 @@ -1,0 +2,6 @@ +Wed Jul 31 09:13:51 UTC 2019 - Tomáš Chvátal <tchvatal(a)suse.com> + +- Add patch to fix building with pytest5 from upstream git: + * pytest5.patch + +------------------------------------------------------------------- New: ---- pytest5.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ python-marshmallow.spec ++++++ --- /var/tmp/diff_new_pack.Q7ZRLU/_old 2019-07-31 14:36:40.785856758 +0200 +++ /var/tmp/diff_new_pack.Q7ZRLU/_new 2019-07-31 14:36:40.785856758 +0200 @@ -28,6 +28,7 @@ # https://github.com/humitos/sphinx-version-warning/issues/22 Patch0: python-marshmallow-no-version-warning.patch Patch1: reproducible.patch +Patch2: pytest5.patch BuildRequires: %{python_module setuptools} BuildRequires: fdupes BuildRequires: python-rpm-macros @@ -61,8 +62,8 @@ %prep %setup -q -n marshmallow-%{version} -%patch0 -p1 -%patch1 -p1 +%autopatch -p1 + # remove py3 only tests rm -r tests/test_py3 ++++++ pytest5.patch ++++++ >From a7014176a7f211aaaa06b516eceb5468402fd9fc Mon Sep 17 00:00:00 2001 From: Steven Loria <sloria1(a)gmail.com> Date: Sun, 30 Jun 2019 12:47:01 -0400 Subject: [PATCH] Fix tests (#1271) Fix compatibility with pytest 5.0 --- tests/test_decorators.py | 3 +- tests/test_deserialization.py | 30 ++++++------------- tests/test_marshalling.py | 9 ------ tests/test_registry.py | 9 +++--- tests/test_schema.py | 14 ++++----- tests/test_serialization.py | 5 ++-- tests/test_validate.py | 54 ++++++++++++----------------------- 7 files changed, 39 insertions(+), 85 deletions(-) diff --git a/tests/test_decorators.py b/tests/test_decorators.py index fa95405f..b8fecb9e 100644 --- a/tests/test_decorators.py +++ b/tests/test_decorators.py @@ -305,9 +305,8 @@ def validate_bar(self, value): schema = BadSchema() - with pytest.raises(ValueError) as excinfo: + with pytest.raises(ValueError, match='"bar" field does not exist.'): schema.validate({'foo': 42}) - assert '"bar" field does not exist.' in str(excinfo) def test_precedence(self): class Schema2(ValidatesSchema): diff --git a/tests/test_deserialization.py b/tests/test_deserialization.py index 01d5a637..bd7afc27 100644 --- a/tests/test_deserialization.py +++ b/tests/test_deserialization.py @@ -38,9 +38,8 @@ def test_fields_dont_allow_none_by_default(self, FieldClass): field = FieldClass(src_str='foo') else: field = FieldClass() - with pytest.raises(ValidationError) as excinfo: + with pytest.raises(ValidationError, match='Field may not be null.'): field.deserialize(None) - assert 'Field may not be null.' in str(excinfo) def test_allow_none_is_true_if_missing_is_true(self): field = fields.Field(missing=None) @@ -311,10 +310,9 @@ class MyBoolean(fields.Boolean): ]) def test_invalid_datetime_deserialization(self, in_value): field = fields.DateTime() - with pytest.raises(ValidationError) as excinfo: - field.deserialize(in_value) msg = 'Not a valid datetime.'.format(in_value) - assert msg in str(excinfo) + with pytest.raises(ValidationError, match=msg): + field.deserialize(in_value) def test_datetime_passed_year_is_invalid(self): field = fields.DateTime() @@ -328,16 +326,11 @@ def test_custom_date_format_datetime_field_deserialization(self): field = fields.DateTime(format='%d-%m-%Y %H:%M:%S') #deserialization should fail when datestring is not of same format - with pytest.raises(ValidationError) as excinfo: + with pytest.raises(ValidationError, match='Not a valid datetime.'): field.deserialize(datestring) - msg = 'Not a valid datetime.' - assert msg in str(excinfo) field = fields.DateTime(format='%H:%M:%S.%f %Y-%m-%d') assert_datetime_equal(field.deserialize(datestring), dtime) - field = fields.DateTime() - assert msg in str(excinfo) - @pytest.mark.parametrize('fmt', ['rfc', 'rfc822']) def test_rfc_datetime_field_deserialization(self, fmt): dtime = dt.datetime.now().replace(microsecond=0) @@ -667,9 +660,8 @@ def __call__(self, val): field = fields.Field(validate=MyValidator()) assert field.deserialize('valid') == 'valid' - with pytest.raises(ValidationError) as excinfo: + with pytest.raises(ValidationError, match='Invalid value.'): field.deserialize('invalid') - assert 'Invalid value.' in str(excinfo) def test_field_deserialization_with_user_validator_that_raises_error_with_list(self): def validator(val): @@ -710,16 +702,14 @@ def test_field_deserialization_with_user_validators(self): for field in m_colletion_type: assert field.deserialize('Valid') == 'Valid' - with pytest.raises(ValidationError) as excinfo: + with pytest.raises(ValidationError, match='Invalid value.'): field.deserialize('invalid') - assert 'Invalid value.' in str(excinfo) def test_field_deserialization_with_custom_error_message(self): field = fields.String(validate=lambda s: s.lower() == 'valid', error_messages={'validator_failed': 'Bad value.'}) - with pytest.raises(ValidationError) as excinfo: + with pytest.raises(ValidationError, match='Bad value.'): field.deserialize('invalid') - assert 'Bad value.' in str(excinfo) def test_field_deserialization_with_non_utf8_value(self): non_utf8_char = '\xc8' @@ -1235,10 +1225,9 @@ class MethodSerializer(Schema): def get_name(self, val): return val.upper() assert MethodSerializer(strict=True).load({'name': 'joe'}) - with pytest.raises(ValidationError) as excinfo: + with pytest.raises(ValidationError, match='Invalid value.'): MethodSerializer(strict=True).load({'name': 'joseph'}) - assert 'Invalid value.' in str(excinfo) # Regression test for https://github.com/marshmallow-code/marshmallow/issues/269 def test_nested_data_is_stored_when_validation_fails(self): @@ -1312,9 +1301,8 @@ def test_deserialize_raises_exception_if_strict_is_true_and_input_type_is_incorr class MySchema(Schema): foo = fields.Field() bar = fields.Field() - with pytest.raises(ValidationError) as excinfo: + with pytest.raises(ValidationError, match='Invalid input type.') as excinfo: MySchema(strict=True).load([]) - assert 'Invalid input type.' in str(excinfo) exc = excinfo.value assert exc.field_names == ['_schema'] assert exc.fields == [] diff --git a/tests/test_marshalling.py b/tests/test_marshalling.py index 252b1f09..213ac7d0 100644 --- a/tests/test_marshalling.py +++ b/tests/test_marshalling.py @@ -122,15 +122,6 @@ def test_extra_data_is_ignored(self, unmarshal): ret = unmarshal({'extra': 42, 'name': 'Steve'}, fields_) assert 'extra' not in ret - # def test_strict_mode_many(self, unmarshal): - # users = [ - # {'email': 'foobar'}, - # {'email': 'bar(a)example.com'} - # ] - # with pytest.raises(ValidationError) as excinfo: - # unmarshal(users, {'email': fields.Email()}, strict=True, many=True) - # assert 'Not a valid email address.' in str(excinfo) - def test_stores_errors(self, unmarshal): data = {'email': 'invalid-email'} try: diff --git a/tests/test_registry.py b/tests/test_registry.py index 1f3c0be9..ae877a32 100644 --- a/tests/test_registry.py +++ b/tests/test_registry.py @@ -131,9 +131,9 @@ def test_invalid_class_name_in_nested_field_raises_error(user): class MySchema(Schema): nf = fields.Nested('notfound') sch = MySchema() - with pytest.raises(RegistryError) as excinfo: + msg = 'Class with name {0!r} was not found'.format('notfound') + with pytest.raises(RegistryError, match=msg): sch.dump({'nf': None}) - assert 'Class with name {0!r} was not found'.format('notfound') in str(excinfo) class FooSerializer(Schema): _id = fields.Integer() @@ -149,11 +149,10 @@ class MySchema(Schema): # Using a nested field with the class name fails because there are # two defined classes with the same name sch = MySchema() - with pytest.raises(RegistryError) as excinfo: - sch.dump({'foo': {'_id': 1}}) msg = 'Multiple classes with name {0!r} were found.'\ .format('FooSerializer') - assert msg in str(excinfo) + with pytest.raises(RegistryError, match=msg) as excinfo: + sch.dump({'foo': {'_id': 1}}) def test_multiple_classes_with_all(): # Import a class with the same name diff --git a/tests/test_schema.py b/tests/test_schema.py index b9f7534b..a4b46342 100755 --- a/tests/test_schema.py +++ b/tests/test_schema.py @@ -549,9 +549,8 @@ def test_prefix(SchemaClass, user): def test_fields_must_be_declared_as_instances(user): class BadUserSchema(Schema): name = fields.String - with pytest.raises(TypeError) as excinfo: + with pytest.raises(TypeError, match='must be declared as a Field instance'): BadUserSchema().dump(user) - assert 'must be declared as a Field instance' in str(excinfo) @pytest.mark.parametrize('SchemaClass', [UserSchema, UserMetaSchema]) @@ -1768,11 +1767,10 @@ def test_nested_errors(self): assert "collaborators" not in errors def test_nested_strict(self): - with pytest.raises(ValidationError) as excinfo: + with pytest.raises(ValidationError, match='email'): _, errors = BlogSchema(strict=True).load( {'title': "Monty's blog", 'user': {'name': 'Monty', 'email': 'foo'}} ) - assert 'email' in str(excinfo) def test_nested_dump_errors(self, blog): blog.user.email = "foo" @@ -1785,9 +1783,8 @@ def test_nested_dump_errors(self, blog): def test_nested_dump_strict(self, blog): blog.user.email = "foo" - with pytest.raises(ValidationError) as excinfo: + with pytest.raises(ValidationError, match='email'): _, errors = BlogSchema(strict=True).dump(blog) - assert 'email' in str(excinfo) def test_nested_method_field(self, blog): data = BlogSchema().dump(blog)[0] @@ -2127,10 +2124,9 @@ class UserFunctionContextSchema(Schema): serializer = UserFunctionContextSchema(strict=True) # no context serializer.context = None - with pytest.raises(ValidationError) as excinfo: - serializer.dump(owner) msg = 'No context available for Function field {0!r}'.format('is_collab') - assert msg in str(excinfo) + with pytest.raises(ValidationError, match=msg) as excinfo: + serializer.dump(owner) def test_fields_context(self): class CSchema(Schema): diff --git a/tests/test_serialization.py b/tests/test_serialization.py index f188386a..1c0c1c19 100644 --- a/tests/test_serialization.py +++ b/tests/test_serialization.py @@ -705,11 +705,10 @@ class ASchema(Schema): id = fields.Int() with pytest.raises(ValueError): fields.List("string") - with pytest.raises(ValueError) as excinfo: - fields.List(ASchema) expected_msg = ('The type of the list elements must be a subclass ' 'of marshmallow.base.FieldABC') - assert expected_msg in str(excinfo) + with pytest.raises(ValueError, match=expected_msg): + fields.List(ASchema) def test_serialize_does_not_apply_validators(self, user): field = fields.Field(validate=lambda x: False) diff --git a/tests/test_validate.py b/tests/test_validate.py index 288881af..cafd1e98 100644 --- a/tests/test_validate.py +++ b/tests/test_validate.py @@ -131,9 +131,8 @@ def test_url_relative_and_custom_schemes(): def test_url_custom_message(): validator = validate.URL(error="{input} ain't an URL") - with pytest.raises(ValidationError) as excinfo: + with pytest.raises(ValidationError, match="invalid ain't an URL"): validator('invalid') - assert "invalid ain't an URL" in str(excinfo) def test_url_repr(): assert ( @@ -187,9 +186,8 @@ def test_email_invalid(invalid_email): def test_email_custom_message(): validator = validate.Email(error='{input} is not an email addy.') - with pytest.raises(ValidationError) as excinfo: + with pytest.raises(ValidationError, match='invalid is not an email addy.'): validator('invalid') - assert 'invalid is not an email addy.' in str(excinfo) def test_email_repr(): assert ( @@ -228,19 +226,16 @@ def test_range_max(): def test_range_custom_message(): v = validate.Range(2, 3, error='{input} is not between {min} and {max}') - with pytest.raises(ValidationError) as excinfo: + with pytest.raises(ValidationError, match='1 is not between 2 and 3'): v(1) - assert '1 is not between 2 and 3' in str(excinfo) v = validate.Range(2, None, error='{input} is less than {min}') - with pytest.raises(ValidationError) as excinfo: + with pytest.raises(ValidationError, match='1 is less than 2'): v(1) - assert '1 is less than 2' in str(excinfo) v = validate.Range(None, 3, error='{input} is greater than {max}') - with pytest.raises(ValidationError) as excinfo: + with pytest.raises(ValidationError, match='4 is greater than 3'): v(4) - assert '4 is greater than 3' in str(excinfo) def test_range_repr(): assert ( @@ -312,24 +307,20 @@ def test_length_equal(): def test_length_custom_message(): v = validate.Length(5, 6, error='{input} is not between {min} and {max}') - with pytest.raises(ValidationError) as excinfo: + with pytest.raises(ValidationError, match='foo is not between 5 and 6'): v('foo') - assert 'foo is not between 5 and 6' in str(excinfo) v = validate.Length(5, None, error='{input} is shorter than {min}') - with pytest.raises(ValidationError) as excinfo: + with pytest.raises(ValidationError, match='foo is shorter than 5'): v('foo') - assert 'foo is shorter than 5' in str(excinfo) v = validate.Length(None, 2, error='{input} is longer than {max}') - with pytest.raises(ValidationError) as excinfo: + with pytest.raises(ValidationError, match='foo is longer than 2'): v('foo') - assert 'foo is longer than 2' in str(excinfo) v = validate.Length(None, None, equal=4, error='{input} does not have {equal}') - with pytest.raises(ValidationError) as excinfo: + with pytest.raises(ValidationError, match='foo does not have 4'): v('foo') - assert 'foo does not have 4' in str(excinfo) def test_length_repr(): assert ( @@ -362,9 +353,8 @@ def test_equal(): def test_equal_custom_message(): v = validate.Equal('a', error='{input} is not equal to {other}.') - with pytest.raises(ValidationError) as excinfo: + with pytest.raises(ValidationError, match='b is not equal to a.'): v('b') - assert 'b is not equal to a.' in str(excinfo) def test_equal_repr(): assert ( @@ -415,9 +405,8 @@ def test_regexp_compile(): def test_regexp_custom_message(): rex = r'[0-9]+' v = validate.Regexp(rex, error='{input} does not match {regex}') - with pytest.raises(ValidationError) as excinfo: + with pytest.raises(ValidationError, match='a does not match'): v('a') - assert 'a does not match [0-9]+' in str(excinfo) def test_regexp_repr(): assert ( @@ -457,9 +446,8 @@ def _identity(self, arg): assert validate.Predicate('_identity', arg=1)(d) == d assert validate.Predicate('_identity', arg='abc')(d) == d - with pytest.raises(ValidationError) as excinfo: + with pytest.raises(ValidationError, match='Invalid input.'): validate.Predicate('_false')(d) - assert 'Invalid input.' in str(excinfo) with pytest.raises(ValidationError): validate.Predicate('_empty')(d) with pytest.raises(ValidationError): @@ -477,9 +465,8 @@ def _false(self): def __str__(self): return 'Dummy' d = Dummy() - with pytest.raises(ValidationError) as excinfo: + with pytest.raises(ValidationError, match='Dummy._false is invalid!'): validate.Predicate('_false', error='{input}.{method} is invalid!')(d) - assert 'Dummy._false is invalid!' in str(excinfo) def test_predicate_repr(): assert ( @@ -502,9 +489,8 @@ def test_noneof(): assert validate.NoneOf([])([]) == [] assert validate.NoneOf([1, 2, 3])(None) is None - with pytest.raises(ValidationError) as excinfo: + with pytest.raises(ValidationError, match='Invalid input.'): validate.NoneOf([1, 2, 3])(3) - assert 'Invalid input.' in str(excinfo) with pytest.raises(ValidationError): validate.NoneOf('abc')('c') with pytest.raises(ValidationError): @@ -513,17 +499,15 @@ def test_noneof(): validate.NoneOf('')('') def test_noneof_custom_message(): - with pytest.raises(ValidationError) as excinfo: + with pytest.raises(ValidationError, match='<not valid>'): validate.NoneOf([1, 2], error='<not valid>')(1) - assert '<not valid>' in str(excinfo) none_of = validate.NoneOf( [1, 2], error='{input} cannot be one of {values}' ) - with pytest.raises(ValidationError) as excinfo: + with pytest.raises(ValidationError, match='1 cannot be one of 1, 2'): none_of(1) - assert '1 cannot be one of 1, 2' in str(excinfo) def test_noneof_repr(): assert ( @@ -545,9 +529,8 @@ def test_oneof(): assert validate.OneOf(dict(a=0, b=1))('a') == 'a' assert validate.OneOf((1, 2, None))(None) is None - with pytest.raises(ValidationError) as excinfo: + with pytest.raises(ValidationError, match='Not a valid choice.'): validate.OneOf([1, 2, 3])(4) - assert 'Not a valid choice.' in str(excinfo) with pytest.raises(ValidationError): validate.OneOf('abc')('d') with pytest.raises(ValidationError): @@ -689,9 +672,8 @@ def test_contains_only_in_string(): validate.ContainsOnly('')('a') def test_contains_only_invalid(): - with pytest.raises(ValidationError) as excinfo: + with pytest.raises(ValidationError, match='One or more of the choices you made was not acceptable.'): validate.ContainsOnly([1, 2, 3])([1, 1]) - assert 'One or more of the choices you made was not acceptable.' in str(excinfo) with pytest.raises(ValidationError): validate.ContainsOnly([1, 1, 2])([2, 2]) with pytest.raises(ValidationError):

1 0

commit lollypop for openSUSE:Factory
by root 31 Jul '19

31 Jul '19

Hello community, here is the log from the commit of package lollypop for openSUSE:Factory checked in at 2019-07-31 14:36:33 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/lollypop (Old) and /work/SRC/openSUSE:Factory/.lollypop.new.4126 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "lollypop" Wed Jul 31 14:36:33 2019 rev:94 rq:720008 version:1.1.4.8 Changes: -------- --- /work/SRC/openSUSE:Factory/lollypop/lollypop.changes 2019-07-29 17:31:23.790171894 +0200 +++ /work/SRC/openSUSE:Factory/.lollypop.new.4126/lollypop.changes 2019-07-31 14:36:34.777860151 +0200 @@ -1,0 +2,6 @@ +Wed Jul 31 08:13:36 UTC 2019 - antoine.belvire(a)opensuse.org + +- Update to version 1.1.4.8: + * Fix a crash on Ubuntu 18.04 (glgo#World/lollypop#1907). + +------------------------------------------------------------------- Old: ---- lollypop-1.1.4.7.tar.xz New: ---- lollypop-1.1.4.8.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ lollypop.spec ++++++ --- /var/tmp/diff_new_pack.wbaWIt/_old 2019-07-31 14:36:35.277859869 +0200 +++ /var/tmp/diff_new_pack.wbaWIt/_new 2019-07-31 14:36:35.281859866 +0200 @@ -17,7 +17,7 @@ Name: lollypop -Version: 1.1.4.7 +Version: 1.1.4.8 Release: 0 Summary: GNOME music playing application License: GPL-3.0-or-later ++++++ _service ++++++ --- /var/tmp/diff_new_pack.wbaWIt/_old 2019-07-31 14:36:35.305859853 +0200 +++ /var/tmp/diff_new_pack.wbaWIt/_new 2019-07-31 14:36:35.305859853 +0200 @@ -1,7 +1,7 @@ <services> <service mode="disabled" name="tar_scm"> <param name="changesgenerate">enable</param> - <param name="revision">1.1.4.7</param> + <param name="revision">1.1.4.8</param> <param name="scm">git</param> <param name="url">https://gitlab.gnome.org/World/lollypop.git</param> <param name="versionformat">@PARENT_TAG@</param> ++++++ _servicedata ++++++ --- /var/tmp/diff_new_pack.wbaWIt/_old 2019-07-31 14:36:35.321859844 +0200 +++ /var/tmp/diff_new_pack.wbaWIt/_new 2019-07-31 14:36:35.321859844 +0200 @@ -1,4 +1,4 @@ <servicedata> <service name="tar_scm"> <param name="url">https://gitlab.gnome.org/World/lollypop.git</param> - <param name="changesrevision">81067cb0ffbd2c3505ccaab47ab7e70879c25ead</param></service></servicedata> \ No newline at end of file + <param name="changesrevision">3c0b023250ae91b8aada6b2dafd0b48342420cb3</param></service></servicedata> \ No newline at end of file ++++++ lollypop-1.1.4.7.tar.xz -> lollypop-1.1.4.8.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/lollypop-1.1.4.7/lollypop/downloader_info.py new/lollypop-1.1.4.8/lollypop/downloader_info.py --- old/lollypop-1.1.4.7/lollypop/downloader_info.py 2019-07-29 00:25:36.000000000 +0200 +++ new/lollypop-1.1.4.8/lollypop/downloader_info.py 2019-07-31 01:04:17.000000000 +0200 @@ -17,7 +17,7 @@ from locale import getdefaultlocale from lollypop.define import App, AUDIODB_CLIENT_ID -from lollypop.utils import get_network_available +from lollypop.utils import get_network_available, escape from lollypop.logger import Logger from lollypop.downloader import Downloader @@ -75,7 +75,8 @@ if status: decode = json.loads(data.decode("utf-8")) for item in decode["query"]["search"]: - if item["title"].lower() == term.lower(): + if escape(item["title"].lower()) ==\ + escape(term.lower()): return (locale, item["pageid"]) else: for word in [_("band"), _("singer"), diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/lollypop-1.1.4.7/lollypop/view_artist.py new/lollypop-1.1.4.8/lollypop/view_artist.py --- old/lollypop-1.1.4.7/lollypop/view_artist.py 2019-07-29 00:25:36.000000000 +0200 +++ new/lollypop-1.1.4.8/lollypop/view_artist.py 2019-07-31 01:04:17.000000000 +0200 @@ -151,26 +151,29 @@ Connect signals and set active ids @param widget as Gtk.Widget """ - ArtistAlbumsView._on_map(self, widget) - self.__on_album_changed(App().player) - self.__art_signal_id = App().art.connect( - "artist-artwork-changed", - self.__on_artist_artwork_changed) - self.__party_signal_id = App().player.connect( - "party-changed", - self.__on_album_changed) - self.__added_signal_id = App().player.connect( - "album-added", - self.__on_album_changed) - self.__removed_signal_id = App().player.connect( - "album-removed", - self.__on_album_changed) - App().settings.set_value("state-one-ids", - GLib.Variant("ai", self._genre_ids)) - App().settings.set_value("state-two-ids", - GLib.Variant("ai", self._artist_ids)) - App().settings.set_value("state-three-ids", - GLib.Variant("ai", [])) + try: + ArtistAlbumsView._on_map(self, widget) + self.__on_album_changed(App().player) + self.__art_signal_id = App().art.connect( + "artist-artwork-changed", + self.__on_artist_artwork_changed) + self.__party_signal_id = App().player.connect( + "party-changed", + self.__on_album_changed) + self.__added_signal_id = App().player.connect( + "album-added", + self.__on_album_changed) + self.__removed_signal_id = App().player.connect( + "album-removed", + self.__on_album_changed) + App().settings.set_value("state-one-ids", + GLib.Variant("ai", self._genre_ids)) + App().settings.set_value("state-two-ids", + GLib.Variant("ai", self._artist_ids)) + App().settings.set_value("state-three-ids", + GLib.Variant("ai", [])) + except: + pass def _on_unmap(self, widget): """ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/lollypop-1.1.4.7/lollypop/view_artist_small.py new/lollypop-1.1.4.8/lollypop/view_artist_small.py --- old/lollypop-1.1.4.7/lollypop/view_artist_small.py 2019-07-29 00:25:36.000000000 +0200 +++ new/lollypop-1.1.4.8/lollypop/view_artist_small.py 2019-07-31 01:04:17.000000000 +0200 @@ -61,13 +61,16 @@ Connect signals and set active ids @param widget as Gtk.Widget """ - View._on_map(self, widget) - App().settings.set_value("state-one-ids", - GLib.Variant("ai", self._genre_ids)) - App().settings.set_value("state-two-ids", - GLib.Variant("ai", self._artist_ids)) - App().settings.set_value("state-three-ids", - GLib.Variant("ai", [])) + try: + View._on_map(self, widget) + App().settings.set_value("state-one-ids", + GLib.Variant("ai", self._genre_ids)) + App().settings.set_value("state-two-ids", + GLib.Variant("ai", self._artist_ids)) + App().settings.set_value("state-three-ids", + GLib.Variant("ai", [])) + except: + pass def _on_adaptive_changed(self, window, status): """ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/lollypop-1.1.4.7/meson.build new/lollypop-1.1.4.8/meson.build --- old/lollypop-1.1.4.7/meson.build 2019-07-29 00:25:36.000000000 +0200 +++ new/lollypop-1.1.4.8/meson.build 2019-07-31 01:04:17.000000000 +0200 @@ -1,5 +1,5 @@ project('lollypop', - version: '1.1.4.7', + version: '1.1.4.8', meson_version: '>= 0.40.0' ) i18n = import('i18n')

1 0

commit midori for openSUSE:Factory
by root 31 Jul '19

31 Jul '19

Hello community, here is the log from the commit of package midori for openSUSE:Factory checked in at 2019-07-31 14:36:30 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/midori (Old) and /work/SRC/openSUSE:Factory/.midori.new.4126 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "midori" Wed Jul 31 14:36:30 2019 rev:52 rq:720001 version:v9.0 Changes: -------- --- /work/SRC/openSUSE:Factory/midori/midori.changes 2019-03-05 12:26:05.516827337 +0100 +++ /work/SRC/openSUSE:Factory/.midori.new.4126/midori.changes 2019-07-31 14:36:32.949861184 +0200 @@ -1,0 +2,19 @@ +Tue Jul 30 01:50:39 UTC 2019 - Maurizio Galli <maurizio.galli(a)gmail.com> + +- Update to version 9.0 + * Use OpenGraph images for Speed Dial shortcuts + * Better support for Javascript popups + * (Re)store pinned tabs in the session + * Re-introduce the Trust (certificate) button + * Avoid key input recursion causing high CPU + * Close Tab/ Other context menu items + * Paste and Proceed option in the urlbar + * Better urlbar suggestion escaping + * Web extensions: Support for a sidebar action (experimental) + * Merge app and page menu into one + * Better focus handling of re-opened and background tabs + * Show volume icon for tabs playing music +- Updated _service file +- Dropped obsolete zoom-menu.patch + +------------------------------------------------------------------- Old: ---- midori-v8.0.tar.gz zoom-menu.patch New: ---- _service midori-v9.0.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ midori.spec ++++++ --- /var/tmp/diff_new_pack.OofPyt/_old 2019-07-31 14:36:33.749860732 +0200 +++ /var/tmp/diff_new_pack.OofPyt/_new 2019-07-31 14:36:33.749860732 +0200 @@ -18,16 +18,13 @@ %define major 0 Name: midori -Version: v8.0 +Version: v9.0 Release: 0 Summary: Lightweight Web Browser License: LGPL-2.1-or-later Group: Productivity/Networking/Web/Browsers URL: http://midori-browser.org/ Source: %{name}-%{version}.tar.gz -# PATCH-FIX-UPSTREAM zoom-menu.patch mauriziogalli(a)opensuse.org -- add page zoom in and out -# (issue gh#midori-browser/core#286) -Patch0: zoom-menu.patch BuildRequires: cmake BuildRequires: fdupes BuildRequires: gettext-tools @@ -92,7 +89,7 @@ %lang_package %prep -%autosetup -p1 +%autosetup %build %cmake -DCMAKE_INSTALL_PREFIX=/usr .. @@ -107,9 +104,6 @@ # remove redundant doc directory and files rm -rf %{buildroot}%{_datadir}/doc/midori/ -# fix desktop file name -mv %{buildroot}%{_datadir}/applications/org.midori_browser.Midori.desktop %{buildroot}%{_datadir}/applications/midori.desktop - %fdupes -s %{buildroot}%{_datadir}/ %post -n libmidori-core%{major} -p /sbin/ldconfig @@ -118,15 +112,15 @@ %postun -p /sbin/ldconfig %files -%doc ChangeLog README.md +%doc CHANGELOG.md README.md %license COPYING %dir %{_libdir}/%{name} %{_bindir}/%{name}* -%{_datadir}/applications/%{name}.desktop +%{_datadir}/applications/*.desktop %{_libdir}/%{name}/*.plugin %{_libdir}/%{name}/*.so %{_datadir}/icons/hicolor/* -%{_datadir}/metainfo/midori.appdata.xml +%{_datadir}/metainfo/*.xml %files -n libmidori-core%{major} %{_libdir}/libmidori-core.so.0 ++++++ _service ++++++ <?xml version="1.0"?> <services> <service name="download_url" mode="localonly"> <param name="protocol">https</param> <param name="host">github.com</param> <param name="path">/midori-browser/core/releases/download/v9.0/midori-v9.0.tar.gz</param> </service> <service name="obs_scm" mode="disabled"> <param name="url">https://github.com/midori-browser/core.git</param> <param name="scm">git</param> <param name="versionformat">@PARENT_TAG@+git@TAG_OFFSET@.%h</param> <param name="changesgenerate">enable</param> <param name="changesauthor">maurizio.galli(a)gmail.com</param> <param name="versionrewrite-pattern">core-v(.*)</param> </service> <service name="set_version" mode="disabled"/> <service name="tar" mode="disabled"/> <service name="recompress" mode="disabled"> <param name="compression">xz</param> <param name="file">*.tar</param> </service> </services> ++++++ midori-v8.0.tar.gz -> midori-v9.0.tar.gz ++++++ ++++ 4803 lines of diff (skipped)

1 0

commit minisat for openSUSE:Factory
by root 31 Jul '19

31 Jul '19

Hello community, here is the log from the commit of package minisat for openSUSE:Factory checked in at 2019-07-31 14:36:23 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/minisat (Old) and /work/SRC/openSUSE:Factory/.minisat.new.4126 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "minisat" Wed Jul 31 14:36:23 2019 rev:2 rq:719993 version:2.2.0+20130925 Changes: -------- --- /work/SRC/openSUSE:Factory/minisat/minisat.changes 2017-03-10 21:45:57.597391776 +0100 +++ /work/SRC/openSUSE:Factory/.minisat.new.4126/minisat.changes 2019-07-31 14:36:25.289865450 +0200 @@ -1,0 +2,6 @@ +Mon Jul 29 01:10:45 UTC 2019 - Simon Puchert <simonpuchert(a)alice.de> + +- Add friend-declaration.patch: + * Fix the illegal friend declaration that caused a build failure. + +------------------------------------------------------------------- New: ---- friend-declaration.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ minisat.spec ++++++ --- /var/tmp/diff_new_pack.x6FQBV/_old 2019-07-31 14:36:26.201864984 +0200 +++ /var/tmp/diff_new_pack.x6FQBV/_new 2019-07-31 14:36:26.201864984 +0200 @@ -25,6 +25,7 @@ Group: Development/Tools/Other Source0: %{name}-%{version}.tar.xz Patch0: Makefile_lib_rule.patch +Patch1: friend-declaration.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRequires: gcc-c++ BuildRequires: zlib-devel @@ -63,6 +64,7 @@ %prep %setup -q %patch0 -p1 +%patch1 -p1 %build export CXXFLAGS="%optflags" ++++++ friend-declaration.patch ++++++ diff -Nur minisat-2.2.0+20130925/minisat-2.2.0+20130925/minisat/core/SolverTypes.h minisat-2.2.0+20130925-p/minisat-2.2.0+20130925/minisat/core/SolverTypes.h --- a/minisat/core/SolverTypes.h 2013-09-25 14:16:18.000000000 +0200 +++ b/minisat/core/SolverTypes.h 2019-07-29 02:55:41.499558102 +0200 @@ -52,7 +52,7 @@ int x; // Use this as a constructor: - friend Lit mkLit(Var var, bool sign = false); + friend Lit mkLit(Var var, bool sign); bool operator == (Lit p) const { return x == p.x; } bool operator != (Lit p) const { return x != p.x; } @@ -60,7 +60,7 @@ }; -inline Lit mkLit (Var var, bool sign) { Lit p; p.x = var + var + (int)sign; return p; } +inline Lit mkLit (Var var, bool sign = false) { Lit p; p.x = var + var + (int)sign; return p; } inline Lit operator ~(Lit p) { Lit q; q.x = p.x ^ 1; return q; } inline Lit operator ^(Lit p, bool b) { Lit q; q.x = p.x ^ (unsigned int)b; return q; } inline bool sign (Lit p) { return p.x & 1; }

1 0

commit openSUSE-release-tools for openSUSE:Factory
by root 31 Jul '19

31 Jul '19

Hello community, here is the log from the commit of package openSUSE-release-tools for openSUSE:Factory checked in at 2019-07-31 14:36:21 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/openSUSE-release-tools (Old) and /work/SRC/openSUSE:Factory/.openSUSE-release-tools.new.4126 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "openSUSE-release-tools" Wed Jul 31 14:36:21 2019 rev:198 rq:719986 version:20190730.07c607e6 Changes: -------- --- /work/SRC/openSUSE:Factory/openSUSE-release-tools/openSUSE-release-tools.changes 2019-07-30 12:38:24.502941964 +0200 +++ /work/SRC/openSUSE:Factory/.openSUSE-release-tools.new.4126/openSUSE-release-tools.changes 2019-07-31 14:36:23.913866152 +0200 @@ -1,0 +2,13 @@ +Tue Jul 30 07:16:51 UTC 2019 - opensuse-releaseteam(a)opensuse.org + +- Update to version 20190730.07c607e6: + * Fix parsing of the --no-rebuild option + * Don't pollute Factory dashboard package with powerpc infos + +------------------------------------------------------------------- +Mon Jul 29 17:14:15 UTC 2019 - opensuse-releaseteam(a)opensuse.org + +- Update to version 20190729.3d7e928c: + * Fix leap 15.2: no problems in a repo wasn't tested :) + +------------------------------------------------------------------- Old: ---- openSUSE-release-tools-20190729.b3ec5fd8.obscpio New: ---- openSUSE-release-tools-20190730.07c607e6.obscpio ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ openSUSE-release-tools.spec ++++++ --- /var/tmp/diff_new_pack.uabeTp/_old 2019-07-31 14:36:24.693865754 +0200 +++ /var/tmp/diff_new_pack.uabeTp/_new 2019-07-31 14:36:24.693865754 +0200 @@ -20,7 +20,7 @@ %define source_dir openSUSE-release-tools %define announcer_filename factory-package-news Name: openSUSE-release-tools -Version: 20190729.b3ec5fd8 +Version: 20190730.07c607e6 Release: 0 Summary: Tools to aid in staging and release work for openSUSE/SUSE License: GPL-2.0-or-later AND MIT ++++++ _servicedata ++++++ --- /var/tmp/diff_new_pack.uabeTp/_old 2019-07-31 14:36:24.721865740 +0200 +++ /var/tmp/diff_new_pack.uabeTp/_new 2019-07-31 14:36:24.721865740 +0200 @@ -1,6 +1,6 @@ <servicedata> <service name="tar_scm"> <param name="url">https://github.com/openSUSE/openSUSE-release-tools.git</param> - <param name="changesrevision">350027d8f3ac609de25317d9041374e5c7ece326</param> + <param name="changesrevision">e073e7faa92d2aced24838741898233d4829dead</param> </service> </servicedata> ++++++ openSUSE-release-tools-20190729.b3ec5fd8.obscpio -> openSUSE-release-tools-20190730.07c607e6.obscpio ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/openSUSE-release-tools-20190729.b3ec5fd8/gocd/rebuild-trigger.gocd.yaml new/openSUSE-release-tools-20190730.07c607e6/gocd/rebuild-trigger.gocd.yaml --- old/openSUSE-release-tools-20190729.b3ec5fd8/gocd/rebuild-trigger.gocd.yaml 2019-07-29 18:26:30.000000000 +0200 +++ new/openSUSE-release-tools-20190730.07c607e6/gocd/rebuild-trigger.gocd.yaml 2019-07-30 09:10:38.000000000 +0200 @@ -39,7 +39,7 @@ tasks: - script: |- echo "openSUSE:Factory:PowerPC" - ./project-installcheck.py --debug check --store openSUSE:Factory:Staging/dashboard openSUSE:Factory:PowerPC + ./project-installcheck.py --debug check --store home:repo-checker/rebuilds openSUSE:Factory:PowerPC Trigger.Rebuild.Leap.152: group: openSUSE.Checkers lock_behavior: unlockWhenFinished diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/openSUSE-release-tools-20190729.b3ec5fd8/osclib/repochecks.py new/openSUSE-release-tools-20190730.07c607e6/osclib/repochecks.py --- old/openSUSE-release-tools-20190729.b3ec5fd8/osclib/repochecks.py 2019-07-29 18:26:30.000000000 +0200 +++ new/openSUSE-release-tools-20190730.07c607e6/osclib/repochecks.py 2019-07-30 09:10:38.000000000 +0200 @@ -116,7 +116,7 @@ if in_problem: reported_problems[package]['output'].append(filter_release(line[2:])) - return reported_problems + return reported_problems def installcheck(directories, arch, whitelist, ignore_conflicts): diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/openSUSE-release-tools-20190729.b3ec5fd8/project-installcheck.py new/openSUSE-release-tools-20190730.07c607e6/project-installcheck.py --- old/openSUSE-release-tools-20190729.b3ec5fd8/project-installcheck.py 2019-07-29 18:26:30.000000000 +0200 +++ new/openSUSE-release-tools-20190730.07c607e6/project-installcheck.py 2019-07-30 09:10:38.000000000 +0200 @@ -277,14 +277,14 @@ @cmdln.option('--store', help='Project/Package to store the rebuild infos in') @cmdln.option('-r', '--repo', dest='repo', help='Repository to check') - @cmdln.option('--no-rebuild', dest='rebuild', action='store_false', help='Only track issues, do not rebuild') + @cmdln.option('--no-rebuild', dest='norebuild', action='store_true', help='Only track issues, do not rebuild') def do_check(self, subcmd, opts, project): """${cmd_name}: Rebuild packages in rebuild=local projects ${cmd_usage} ${cmd_option_list} """ - self.tool.rebuild = opts.rebuild + self.tool.rebuild = not opts.norebuild self.tool.parse_store(opts.store) self.tool.apiurl = conf.config['apiurl'] self.tool.check(project, opts.repo) ++++++ openSUSE-release-tools.obsinfo ++++++ --- /var/tmp/diff_new_pack.uabeTp/_old 2019-07-31 14:36:25.141865525 +0200 +++ /var/tmp/diff_new_pack.uabeTp/_new 2019-07-31 14:36:25.141865525 +0200 @@ -1,5 +1,5 @@ name: openSUSE-release-tools -version: 20190729.b3ec5fd8 -mtime: 1564417590 -commit: b3ec5fd88f7ac07a41af5242721771cb278cc3e4 +version: 20190730.07c607e6 +mtime: 1564470638 +commit: 07c607e6647cdda8da9e9c2f6b5ef470b861deb3

1 0

commit icinga2 for openSUSE:Factory
by root 31 Jul '19

31 Jul '19

Hello community, here is the log from the commit of package icinga2 for openSUSE:Factory checked in at 2019-07-31 14:36:15 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/icinga2 (Old) and /work/SRC/openSUSE:Factory/.icinga2.new.4126 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "icinga2" Wed Jul 31 14:36:15 2019 rev:19 rq:719985 version:2.10.6 Changes: -------- --- /work/SRC/openSUSE:Factory/icinga2/icinga2.changes 2019-05-24 11:33:11.341371293 +0200 +++ /work/SRC/openSUSE:Factory/.icinga2.new.4126/icinga2.changes 2019-07-31 14:36:21.753867255 +0200 @@ -1,0 +2,7 @@ +Tue Jul 30 22:43:16 UTC 2019 - ecsos(a)opensuse.org + +- Update to 2.10.6 + * Bugfixes + - Fix el7 not loading ECDHE cipher suites #7247 + +------------------------------------------------------------------- Old: ---- v2.10.5.tar.gz New: ---- v2.10.6.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ icinga2.spec ++++++ --- /var/tmp/diff_new_pack.dDKIMz/_old 2019-07-31 14:36:22.969866634 +0200 +++ /var/tmp/diff_new_pack.dDKIMz/_new 2019-07-31 14:36:22.969866634 +0200 @@ -86,7 +86,7 @@ %else %endif # suse Name: icinga2 -Version: 2.10.5 +Version: 2.10.6 Release: %{revision}%{?dist} Url: https://www.icinga.com/ Source: https://github.com/Icinga/%{name}/archive/v%{version}.tar.gz ++++++ v2.10.5.tar.gz -> v2.10.6.tar.gz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/icinga2-2.10.5/CHANGELOG.md new/icinga2-2.10.6/CHANGELOG.md --- old/icinga2-2.10.5/CHANGELOG.md 2019-05-23 13:56:44.000000000 +0200 +++ new/icinga2-2.10.6/CHANGELOG.md 2019-07-30 14:50:01.000000000 +0200 @@ -1,4 +1,19 @@ -# Icinga 2.x CHANGELOG +# Icinga 2 CHANGELOG + +Please make sure to always read our [Upgrading](https://icinga.com/docs/icinga2/latest/doc/16-upgrading-icinga-2… +documentation before switching to a new version. + +Released closed milestones can be found [here](https://github.com/Icinga/icinga2/milestones?state=closed). + + +## 2.10.6 (2019-07-30) + +[Issue and PRs](https://github.com/Icinga/icinga2/issues?utf8=%E2%9C%93&q=milestone%3A… + +### Bugfixes + +* Fix el7 not loading ECDHE cipher suites #7247 + ## 2.10.5 (2019-05-23) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/icinga2-2.10.5/VERSION new/icinga2-2.10.6/VERSION --- old/icinga2-2.10.5/VERSION 2019-05-23 13:56:44.000000000 +0200 +++ new/icinga2-2.10.6/VERSION 2019-07-30 14:50:01.000000000 +0200 @@ -1,2 +1,2 @@ -Version: 2.10.5 +Version: 2.10.6 Revision: 1 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/icinga2-2.10.5/doc/05-service-monitoring.md new/icinga2-2.10.6/doc/05-service-monitoring.md --- old/icinga2-2.10.5/doc/05-service-monitoring.md 2019-05-23 13:56:44.000000000 +0200 +++ new/icinga2-2.10.6/doc/05-service-monitoring.md 2019-07-30 14:50:01.000000000 +0200 @@ -4,48 +4,142 @@ community plugins available next to the standard plugins provided by the [Monitoring Plugins project](https://www.monitoring-plugins.org). +Start your research on [Icinga Exchange](https://exchange.icinga.com) +and look which services are already [covered](05-service-monitoring.md#service-monitoring-overview). + +The [requirements chapter](05-service-monitoring.md#service-monitoring-requirements) guides you +through the plugin setup, tests and their integration with an [existing](05-service-monitoring.md#service-monitoring-plugin-checkcommand) +or [new](05-service-monitoring.md#service-monitoring-plugin-checkcommand-new) CheckCommand object +and host/service objects inside the [Director](05-service-monitoring.md#service-monitoring-plugin-checkcommand-integration-director) +or [Icinga config files](05-service-monitoring.md#service-monitoring-plugin-checkcommand-integration-config-files). +It also adds hints on [modifying](05-service-monitoring.md#service-monitoring-plugin-checkcommand-modify) existing commands. + +Plugins follow the [Plugin API specification](05-service-monitoring.md#service-monitoring-plugin-api) +which is enriched with examples and also code examples to get you started with +[your own plugin](05-service-monitoring.md#service-monitoring-plugin-new). + + + ## Requirements <a id="service-monitoring-requirements"></a> ### Plugins <a id="service-monitoring-plugins"></a> -All existing Nagios or Icinga 1.x plugins work with Icinga 2. Community +All existing Icinga or Nagios plugins work with Icinga 2. Community plugins can be found for example on [Icinga Exchange](https://exchange.icinga.com). -The recommended way of setting up these plugins is to copy them to a common directory -and create a new global constant, e.g. `CustomPluginDir` in your [constants.conf](04-configuring-icinga-2.md#constants-conf) -configuration file: +The recommended way of setting up these plugins is to copy them +into the `PluginDir` directory. -``` -# cp check_snmp_int.pl /opt/monitoring/plugins -# chmod +x /opt/monitoring/plugins/check_snmp_int.pl +If you have plugins with many dependencies, consider creating a +custom RPM/DEB package which handles the required libraries and binaries. -# cat /etc/icinga2/constants.conf -/** - * This file defines global constants which can be used in - * the other configuration files. At a minimum the - * PluginDir constant should be defined. - */ +Configuration management tools such as Puppet, Ansible, Chef or Saltstack +also help with automatically installing the plugins on different +operating systems. They can also help with installing the required +dependencies, e.g. Python libraries, Perl modules, etc. -const PluginDir = "/usr/lib/nagios/plugins" -const CustomPluginDir = "/opt/monitoring/plugins" -``` +### Plugin Setup <a id="service-monitoring-plugins-setup"></a> + +Good plugins provide installations and configuration instructions +in their docs and/or README on GitHub. + +Sometimes dependencies are not listed, or your distribution differs from the one +described. Try running the plugin after setup and [ensure it works](05-service-monitoring.md#service-monitoring-plugins-it-works). + +#### Ensure it works <a id="service-monitoring-plugins-it-works"></a> Prior to using the check plugin with Icinga 2 you should ensure that it is working properly by trying to run it on the console using whichever user Icinga 2 is running as: +RHEL/CentOS/Fedora + ``` -# su - icinga -s /bin/bash -$ /opt/monitoring/plugins/check_snmp_int.pl --help +sudo -u icinga /usr/lib64/nagios/plugins/check_mysql_health --help +``` + +Debian/Ubuntu + +``` +sudo -u nagios /usr/lib/nagios/plugins/check_mysql_health --help ``` Additional libraries may be required for some plugins. Please consult the plugin documentation and/or the included README file for installation instructions. Sometimes plugins contain hard-coded paths to other components. Instead of changing -the plugin it might be easier to create a symbolic link to make sure it doesn't get overwritten during the next update. +the plugin it might be easier to create a symbolic link to make sure it doesn't get +overwritten during the next update. Sometimes there are plugins which do not exactly fit your requirements. In that case you can modify an existing plugin or just write your own. +#### Plugin Dependency Errors <a id="service-monitoring-plugins-setup-dependency-errors"></a> + +Plugins can be scripts (Shell, Python, Perl, Ruby, PHP, etc.) +or compiled binaries (C, C++, Go). + +These scripts/binaries may require additional libraries +which must be installed on every system they are executed. + +> **Tip** +> +> Don't test the plugins on your master instance, instead +> do that on the satellites and clients which execute the +> checks. + +There are errors, now what? Typical errors are missing libraries, +binaries or packages. + +##### Python Example + +Example for a Python plugin which uses the `tinkerforge` module +to query a network service: + +``` +ImportError: No module named tinkerforge.ip_connection +``` + +Its [documentation](https://github.com/NETWAYS/check_tinkerforge#installation) +points to installing the `tinkerforge` Python module. + +##### Perl Example + +Example for a Perl plugin which uses SNMP: + +``` +Can't locate Net/SNMP.pm in @INC (you may need to install the Net::SNMP module) +``` + +Prior to installing the Perl module via CPAN, look for a distribution +specific package, e.g. `libnet-snmp-perl` on Debian/Ubuntu or `perl-Net-SNMP` +on RHEL/CentOS. + + +#### Optional: Custom Path <a id="service-monitoring-plugins-custom-path"></a> + +If you are not using the default `PluginDir` directory, you +can create a custom plugin directory and constant +and reference this in the created CheckCommand objects. + +Create a common directory e.g. `/opt/monitoring/plugins` +and install the plugin there. + +``` +mkdir -p /opt/monitoring/plugins +cp check_snmp_int.pl /opt/monitoring/plugins +chmod +x /opt/monitoring/plugins/check_snmp_int.pl +``` + +Next create a new global constant, e.g. `CustomPluginDir` +in your [constants.conf](04-configuring-icinga-2.md#constants-conf) +configuration file: + +``` +vim /etc/icinga2/constants.conf + +const PluginDir = "/usr/lib/nagios/plugins" +const CustomPluginDir = "/opt/monitoring/plugins" +``` + ### CheckCommand Definition <a id="service-monitoring-plugin-checkcommand"></a> Each plugin requires a [CheckCommand](09-object-types.md#objecttype-checkcommand) object in your @@ -54,55 +148,617 @@ Please check if the Icinga 2 package already provides an [existing CheckCommand definition](10-icinga-template-library.md#icinga-template-library). -If that's the case, throroughly check the required parameters and integrate the check command -into your host and service objects. + +If that's the case, thoroughly check the required parameters and integrate the check command +into your host and service objects. Best practice is to run the plugin on the CLI +with the required parameters first. + +Example for database size checks with [check_mysql_health](10-icinga-template-library.md#plugin-contrib-command-mysql_health). + +``` +/usr/lib64/nagios/plugins/check_mysql_health --hostname '127.0.0.1' --username root --password icingar0xx --mode sql --name 'select sum(data_length + index_length) / 1024 / 1024 from information_schema.tables where table_schema = '\''icinga'\'';' '--name2' 'db_size' --units 'MB' --warning 4096 --critical 8192 +``` + +The parameter names inside the ITL commands follow the +`<command name>_<parameter name>` schema. + +#### Icinga Director Integration <a id="service-monitoring-plugin-checkcommand-integration-director"></a> + +Navigate into `Commands > External Commands` and search for `mysql_health`. +Select `mysql_health` and navigate into the `Fields` tab. + +In order to access the parameters, the Director requires you to first +define the needed custom data fields: + +* `mysql_health_hostname` +* `mysql_health_username` and `mysql_health_password` +* `mysql_health_mode` +* `mysql_health_name`, `mysql_health_name2` and `mysql_health_units` +* `mysql_health_warning` and `mysql_health_critical` + +Create a new host template and object where you'll generic +settings like `mysql_health_hostname` (if it differs from the host's +`address` attribute) and `mysql_health_username` and `mysql_health_password`. + +Create a new service template for `mysql-health` and set the `mysql_health` +as check command. You can also define a default for `mysql_health_mode`. + +Next, create a service apply rule or a new service set which gets assigned +to matching host objects. + + +#### Icinga Config File Integration <a id="service-monitoring-plugin-checkcommand-integration-config-files"></a> + +Create or modify a host object which stores +the generic database defaults and prepares details +for a service apply for rule. + +``` +object Host "icinga2-master1.localdomain" { + check_command = "hostalive" + address = "..." + + // Database listens locally, not external + vars.mysql_health_hostname = "127.0.0.1" + + // Basic database size checks for Icinga DBs + vars.databases["icinga"] = { + mysql_health_warning = 4096 //MB + mysql_health_critical = 8192 //MB + } + vars.databases["icingaweb2"] = { + mysql_health_warning = 4096 //MB + mysql_health_critical = 8192 //MB + } +} +``` + +The host object prepares the database details and thresholds already +for advanced [apply for](03-monitoring-basics.md#using-apply-for) rules. It also uses +conditions to fetch host specified values, or set default values. + +``` +apply Service "db-size-" for (db_name => config in host.vars.databases) { + check_interval = 1m + retry_interval = 30s + + check_command = "mysql_health" + + if (config.mysql_health_username) { + vars.mysql_healt_username = config.mysql_health_username + } else { + vars.mysql_health_username = "root" + } + if (config.mysql_health_password) { + vars.mysql_healt_password = config.mysql_health_password + } else { + vars.mysql_health_password = "icingar0xx" + } + + vars.mysql_health_mode = "sql" + vars.mysql_health_name = "select sum(data_length + index_length) / 1024 / 1024 from information_schema.tables where table_schema = '" + db_name + "';" + vars.mysql_health_name2 = "db_size" + vars.mysql_health_units = "MB" + + if (config.mysql_health_warning) { + vars.mysql_health_warning = config.mysql_health_warning + } + if (config.mysql_health_critical) { + vars.mysql_health_critical = config.mysql_health_critical + } + + vars += config +} +``` + +#### New CheckCommand <a id="service-monitoring-plugin-checkcommand-new"></a> + +This chapter describes how to add a new CheckCommand object for a plugin. Please make sure to follow these conventions when adding a new command object definition: * Use [command arguments](03-monitoring-basics.md#command-arguments) whenever possible. The `command` attribute must be an array in `[ ... ]` for shell escaping. -* Define a unique `prefix` for the command's specific arguments. That way you can safely -set them on host/service level and you'll always know which command they control. +* Define a unique `prefix` for the command's specific arguments. Best practice is to follow this schema: + +``` +<command name>_<parameter name> +``` + +That way you can safely set them on host/service level and you'll always know which command they control. * Use command argument default values, e.g. for thresholds. * Use [advanced conditions](09-object-types.md#objecttype-checkcommand) like `set_if` definitions. -This is an example for a custom `my-snmp-int` check command: +Before starting with the CheckCommand definition, please check +the existing objects available inside the ITL. They follow best +practices and are maintained by developers and our community. + +This example picks a new plugin called [check_systemd](https://exchange.icinga.com/joseffriedrich/check_systemd) +uploaded to Icinga Exchange in June 2019. + +First, [install](05-service-monitoring.md#service-monitoring-plugins-setup) the plugin and ensure +that [it works](05-service-monitoring.md#service-monitoring-plugins-it-works). Then run it with the +`--help` parameter to see the actual parameters (docs might be outdated). + +``` +./check_systemd.py --help + +usage: check_systemd.py [-h] [-c SECONDS] [-e UNIT | -u UNIT] [-v] [-V] + [-w SECONDS] + +... + +optional arguments: + -h, --help show this help message and exit + -c SECONDS, --critical SECONDS + Startup time in seconds to result in critical status. + -e UNIT, --exclude UNIT + Exclude a systemd unit from the checks. This option + can be applied multiple times. For example: -e mnt- + data.mount -e task.service. + -u UNIT, --unit UNIT Name of the systemd unit that is beeing tested. + -v, --verbose Increase output verbosity (use up to 3 times). + -V, --version show program's version number and exit + -w SECONDS, --warning SECONDS + Startup time in seconds to result in warning status. +``` + +The argument description is important, based on this you need to create the +command arguments. + +> **Tip** +> +> When you are using the Director, you can prepare the commands as files +> e.g. inside the `global-templates` zone. Then run the kickstart wizard +> again to import the commands as external reference. +> +> If you prefer to use the Director GUI/CLI, please apply the steps +> in the `Add Command` form. + +Start with the basic plugin call without any parameters. ``` -object CheckCommand "my-snmp-int" { - command = [ CustomPluginDir + "/check_snmp_int.pl" ] +object CheckCommand "systemd" { // Plugin name without 'check_' prefix + command = [ PluginContribDir + "/check_systemd.py" ] // Use the 'PluginContribDir' constant, see the contributed ITL commands +} +``` +Run a config validation to see if that works, `icinga2 daemon -C` + +Next, analyse the plugin parameters. Plugins with a good help output show +optional parameters in square brackes. This is the case for all parameters +for this plugin. If there are required parameters, use the `required` key +inside the argument. + +The `arguments` attribute is a dictionary which takes the parameters as keys. + +``` arguments = { - "-H" = "$snmp_address$" - "-C" = "$snmp_community$" - "-p" = "$snmp_port$" - "-2" = { - set_if = "$snmp_v2$" + "--unit" = { ... } + } +``` + +If there a long parameter names available, prefer them. This increases +readability in both the configuration as well as the executed command line. + +The argument value itself is a sub dictionary which has additional keys: + +* `value` which references the runtime macro string +* `description` where you copy the plugin parameter help text into +* `required`, `set_if`, etc. for advanced parameters, check the [CheckCommand object](09-object-types.md#objecttype-checkcommand) chapter. + +The runtime macro syntax is required to allow value extraction when +the command is executed. + +> **Tip** +> +> Inside the Director, store the new command first in order to +> unveil the `Arguments` tab. + +Best practice is to use the command name as prefix, in this specific +case e.g. `systemd_unit`. + +``` + arguments = { + "--unit" = { + value = "$systemd_unit$" // The service parameter would then be defined as 'vars.systemd_unit = "icinga2"' + description = "Name of the systemd unit that is beeing tested." } - "-n" = "$snmp_interface$" - "-f" = { - set_if = "$snmp_perf$" + "--warning" = { + value = "$systemd_warning$" + description = "Startup time in seconds to result in warning status." + } + "--critical" = { + value = "$systemd_critical$" + description = "Startup time in seconds to result in critical status." } - "-w" = "$snmp_warn$" - "-c" = "$snmp_crit$" } +``` + +This may take a while -- validate the configuration in between up until +the CheckCommand definition is done. + +Then test and integrate it into your monitoring configuration. + +Remember: Do it once and right, and never touch the CheckCommand again. +Optional arguments allow different use cases and scenarios. + - vars.snmp_v2 = true - vars.snmp_perf = true - vars.snmp_warn = "300,400" - vars.snmp_crit = "0,600" +Once you have created your really good CheckCommand, please consider +sharing it with our community by creating a new PR on [GitHub](https://github.com/Icinga/icinga2/blob/master/CONTRIBUTING.md). +_Please also update the documentation for the ITL._ + + +> **Tip** +> +> Inside the Director, you can render the configuration in the Deployment +> section. Extract the static configuration object and use that as a source +> for sending it upstream. + + + +#### Modify Existing CheckCommand <a id="service-monitoring-plugin-checkcommand-modify"></a> + +Sometimes an existing CheckCommand inside the ITL is missing a parameter. +Or you don't need a default parameter value being set. + +Instead of copying the entire configuration object, you can import +an object into another new object. + +``` +object CheckCommand "http-custom" { + import "http" // Import existing http object + + arguments += { // Use additive assignment to add missing parameters + "--key" = { + value = "$http_..." // Keep the parameter name the same as with http + } + } + + // Override default parameters + vars.http_address = "..." } ``` -For further information on your monitoring configuration read the -[Monitoring Basics](03-monitoring-basics.md#monitoring-basics) chapter. +This CheckCommand can then be referenced in your host/service object +definitions. -If you have created your own `CheckCommand` definition, please kindly -[send it upstream](https://github.com/Icinga/icinga2/blob/master/CONTRIBUTING.md). ### Plugin API <a id="service-monitoring-plugin-api"></a> -Currently Icinga 2 supports the native plugin API specification from the Monitoring Plugins project. It is defined in the [Monitoring Plugins Development Guidelines](https://www.monitoring-plugins.org/doc/guidelines.html). +Icinga 2 supports the native plugin API specification from the Monitoring Plugins project. +It is defined in the [Monitoring Plugins](https://www.monitoring-plugins.org) guidelines. + +The Icinga documentation revamps the specification into our +own guideline enriched with examples and best practices. + +#### Output <a id="service-monitoring-plugin-api-output"></a> + +The output should be as short and as detailed as possible. The +most common cases include: + +- Viewing a problem list in Icinga Web and dashboards +- Getting paged about a problem +- Receiving the alert on the CLI or forwarding it to external (ticket) systems + +Examples: + +``` +<STATUS>: <A short description what happened> + +OK: MySQL connection time is fine (0.0002s) +WARNING: MySQL connection time is slow (0.5s > 0.1s threshold) +CRITICAL: MySQL connection time is causing degraded performance (3s > 0.5s threshold) +``` + +Icinga supports reading multi-line output where Icinga Web +only shows the first line in the listings and everything in the detail view. + +Example for an end2end check with many smaller test cases integrated: + +``` +OK: Online banking works. +Testcase 1: Site reached. +Testcase 2: Attempted login, JS loads. +Testcase 3: Login succeeded. +Testcase 4: View current state works. +Testcase 5: Transactions fine. +``` + +If the extended output shouldn't be visible in your monitoring, but only for testing, +it is recommended to implement the `--verbose` plugin parameter to allow +developers and users to debug further. Check [here](05-service-monitoring.md#service-monitoring-plugin-api-verbose) +for more implementation tips. + +> **Tip** +> +> More debug output also helps when implementing your plugin. +> +> Best practice is to have the plugin parameter and handling implemented first, +> then add it anywhere you want to see more, e.g. from initial database connections +> to actual query results. + + +#### Status <a id="service-monitoring-plugin-api-status"></a> + +Value | Status | Description +------|-----------|------------------------------- +0 | OK | The check went fine and everything is considered working. +1 | Warning | The check is above the given warning threshold, or anything else is suspicious requiring attention before it breaks. +2 | Critical | The check exceeded the critical threshold, or something really is broken and will harm the production environment. +3 | Unknown | Invalid parameters, low level resource errors (IO device busy, no fork resources, TCP sockets, etc.) preventing the actual check. Higher level errors such as DNS resolving, TCP connection timeouts should be treated as `Critical` instead. Whenever the plugin reaches its timeout (best practice) it should also terminate with `Unknown`. + +Keep in mind that these are service states. Icinga automatically maps +the [host state](03-monitoring-basics.md#check-result-state-mapping) from the returned plugin states. + +#### Thresholds <a id="service-monitoring-plugin-api-thresholds"></a> + +A plugin calculates specific values and may decide about the exit state on its own. +This is done with thresholds - warning and critical values which are compared with +the actual value. Upon this logic, the exit state is determined. + +Imagine the following value and defined thresholds: + +``` +ptc_value = 57.8 + +warning = 50 +critical = 60 +``` + +Whenever `ptc_value` is higher than warning or critical, it should return +the appropriate [state](05-service-monitoring.md#service-monitoring-plugin-api-status). + +The threshold evaluation order also is important: + +* Critical thresholds are evaluated first and superseed everything else. +* Warning thresholds are evaluated second +* If no threshold is matched, return the OK state + +Avoid using hardcoded threshold values in your plugins, always +add them to the argument parser. + +Example for Python: + +``` +import argparse +import signal +import sys + +if __name__ == '__main__': + parser = argparse.ArgumentParser() + + parser.add_argument("-w", "--warning", help="Warning threshold. Single value or range, e.g. '20:50'.") + parser.add_argument("-c", "--critical", help="Critical threshold. Single vluae or range, e.g. '25:45'.") + + args = parser.parse_args() +``` + +Users might call plugins only with the critical threshold parameter, +leaving out the warning parameter. Keep this in mind when evaluating +the thresholds, always check if the parameters have been defined before. + +``` + if args.critical: + if ptc_value > args.critical: + print("CRITICAL - ...") + sys.exit(2) # Critical + + if args.warning: + if ptc_value > args.warning: + print("WARNING - ...") + sys.exit(1) # Warning + + print("OK - ...") + sys.exit(0) # OK +``` + +The above is a simplified example for printing the [output](05-service-monitoring.md#service-monitoring-plugin-api-output) +and using the [state](05-service-monitoring.md#service-monitoring-plugin-api-status) +as exit code. + +Before diving into the implementation, learn more about required +[performance data metrics](05-service-monitoring.md#service-monitoring-plugin-api-performance-data-metrics) +and more best practices below. + +##### Threshold Ranges <a id="service-monitoring-plugin-api-thresholds-ranges"></a> + +Threshold ranges can be used to specify an alert window, e.g. whenever a calculated +value is between a lower and higher critical threshold. + +The schema for threshold ranges looks as follows. The `@` character in square brackets +is optional. + +``` +[@]start:end +``` + +There are a few requirements for ranges: + +* `start <= end`. Add a check in your code and let the user know about problematic values. + +``` +10:20 # OK + +30:10 # Error +``` + +* `start:` can be omitted if its value is 0. This is the default handling for single threshold values too. + +``` +10 # Every value > 10 and < 0, outside of 0..10 +``` + +* If `end` is omitted, assume end is infinity. + +``` +10: # < 10, outside of 10..∞ +``` + +* In order to specify negative infinity, use the `~` character. + +``` +~:10 # > 10, outside of -∞..10 +``` + +* Raise alert if value is outside of the defined range. + +``` +10:20 # < 10 or > 20, outside of 10..20 +``` + +* Start with `@` to raise an alert if the value is **inside** the defined range, inclusive start/end values. + +``` +@10:20 # >= 10 and <= 20, inside of 10..20 +``` + +Best practice is to either implement single threshold values, or fully support ranges. +This requires parsing the input parameter values, therefore look for existing libraries +already providing this functionality. + +[check_tinkerforge](https://github.com/NETWAYS/check_tinkerforge/blob/master/check_tinkerforge.py) +implements a simple parser to avoid dependencies. + + +#### Performance Data Metrics <a id="service-monitoring-plugin-api-performance-data-metrics"></a> + +Performance data metrics must be appended to the plugin output with a preceding `|` character. +The schema is as follows: + +``` +<output> | 'label'=value[UOM];[warn];[crit];[min];[max] +``` + +The label should be encapsulated with single quotes. Avoid spaces or special characters such +as `%` in there, this could lead to problems with metric receivers such as Graphite. + +Labels must not include `'` and `=` characters. Keep the label length as short and unique as possible. + +Example: + +``` +'load1'=4.7 +``` + +Values must respect the C/POSIX locale and not implement e.g. German locale for floating point numbers with `,`. +Icinga sets `LC_NUMERIC=C` to enforce this locale on plugin execution. + +##### Unit of Measurement (UOM) <a id="service-monitoring-plugin-api-performance-data-metrics-uom"></a> + +Unit | Description +---------|--------------------------------- +None | Integer or floating point number for any type (processes, users, etc.). +`s` | Seconds, can be `s`, `ms`, `us`. +`%` | Percentage. +`B` | Bytes, can be `KB`, `MB`, `GB`, `TB`. Lowercase is also possible. +`c` | A continuous counter (e.g. interface traffic counters). + +Icinga metric writers normalize these values to the lowest common base, e.g. seconds and bytes. +Bad plugins change the UOM for different sizing, e.g. returning the disk usage in MB and later GB +for the same performance data label. This is to ensure that graphs always look the same. + +``` +'rta'=12.445000ms 'pl'=0% +``` + +##### Thresholds and Min/Max <a id="service-monitoring-plugin-api-performance-data-metrics-thresholds-min-max"></a> + +Next to the performance data value, warn, crit, min, max can optionally be provided. They must be separated +with the semi-colon `;` character. They share the same UOM with the performance data value. + +``` +$ check_ping -4 -H icinga.com -c '200,15%' -w '100,5%' + +PING OK - Packet loss = 0%, RTA = 12.44 ms|rta=12.445000ms;100.000000;200.000000;0.000000 pl=0%;5;15;0 +``` + +##### Multiple Performance Data Values <a id="service-monitoring-plugin-api-performance-data-metrics-multiple"></a> + +Multiple performance data values must be joined with a space character. The below example +is from the [check_load](10-icinga-template-library.md#plugin-check-command-load) plugin. + +``` +load1=4.680;1.000;2.000;0; load5=0.000;5.000;10.000;0; load15=0.000;10.000;20.000;0; +``` + +#### Timeout <a id="service-monitoring-plugin-api-timeout"></a> + +Icinga has a safety mechanism where it kills processes running for too +long. The timeout can be specified in [CheckCommand objects](09-object-types.md#objecttype-checkcommand) +or on the host/service object. + +Best practice is to control the timeout in the plugin itself +and provide a clear message followed by the Unknown state. + +Example in Python taken from [check_tinkerforge](https://github.com/NETWAYS/check_tinkerforge/blob/master…: + +``` +import argparse +import signal +import sys + +def handle_sigalrm(signum, frame, timeout=None): + output('Plugin timed out after %d seconds' % timeout, 3) + +if __name__ == '__main__': + parser = argparse.ArgumentParser() + # ... add more arguments + parser.add_argument("-t", "--timeout", help="Timeout in seconds (default 10s)", type=int, default=10) + args = parser.parse_args() + + signal.signal(signal.SIGALRM, partial(handle_sigalrm, timeout=args.timeout)) + signal.alarm(args.timeout) + + # ... perform the check and generate output/status +``` + +#### Versions <a id="service-monitoring-plugin-api-versions"></a> + +Plugins should provide a version via `-V` or `--version` parameter +which is bumped on releases. This allows to identify problems with +too old or new versions on the community support channels. + +Example in Python taken from [check_tinkerforge](https://github.com/NETWAYS/check_tinkerforge/blob/master…: + +``` +import argparse +import signal +import sys + +__version__ = '0.9.1' + +if __name__ == '__main__': + parser = argparse.ArgumentParser() + + parser.add_argument('-V', '--version', action='version', version='%(prog)s v' + sys.modules[__name__].__version__) +``` + +#### Verbose <a id="service-monitoring-plugin-api-verbose"></a> + +Plugins should provide a verbose mode with `-v` or `--verbose` in order +to show more detailed log messages. This helps to debug and analyse the +flow and execution steps inside the plugin. + +Ensure to add the parameter prior to implementing the check logic into +the plugin. + +Example in Python taken from [check_tinkerforge](https://github.com/NETWAYS/check_tinkerforge/blob/master…: + +``` +import argparse +import signal +import sys + +if __name__ == '__main__': + parser = argparse.ArgumentParser() + + parser.add_argument('-v', '--verbose', action='store_true') + + if args.verbose: + print("Verbose debug output") +``` + ### Create a new Plugin <a id="service-monitoring-plugin-new"></a> @@ -118,17 +774,28 @@ On the other hand plugins for specific services and hardware might not yet exist. -Common best practices when creating a new plugin are for example: +> **Tip** +> +> Watch this presentation from Icinga Camp Berlin to learn more +> about [How to write checks that don't suck](https://www.youtube.com/watch?v=Ey_APqSCoFQ). + +Common best practices: * Choose the programming language wisely * Scripting languages (Bash, Python, Perl, Ruby, PHP, etc.) are easier to write and setup but their check execution might take longer (invoking the script interpreter as overhead, etc.). * Plugins written in C/C++, Go, etc. improve check execution time but may generate an overhead with installation and packaging. -* Use a modern VCS such as Git for developing the plugin (e.g. share your plugin on GitHub). +* Use a modern VCS such as Git for developing the plugin, e.g. share your plugin on GitHub and let it sync to [Icinga Exchange](https://exchange.icinga.com). +* **Look into existing plugins endorsed by community members.** + +Implementation hints: + * Add parameters with key-value pairs to your plugin. They should allow long names (e.g. `--host localhost`) and also short parameters (e.g. `-H localhost`) - * `-h|--help` should print the version and all details about parameters and runtime invocation. -* Add a verbose/debug output functionality for detailed on-demand logging. + * `-h|--help` should print the version and all details about parameters and runtime invocation. Note: Python's ArgParse class provides this OOTB. + * `--version` should print the plugin [version](05-service-monitoring.md#service-monitoring-plugin-api-versions). +* Add a [verbose/debug output](05-service-monitoring.md#service-monitoring-plugin-api-verbose) functionality for detailed on-demand logging. * Respect the exit codes required by the [Plugin API](05-service-monitoring.md#service-monitoring-plugin-api). -* Always add performance data to your plugin output +* Always add [performance data](05-service-monitoring.md#service-monitoring-plugin-api-performance-data-metrics) to your plugin output. +* Allow to specify [warning/critical thresholds](05-service-monitoring.md#service-monitoring-plugin-api-thresholds) as parameters. Example skeleton: @@ -169,12 +836,17 @@ Once you've finished your plugin please upload/sync it to [Icinga Exchange](https://exchange.icinga.com/new). Thanks in advance! + ## Service Monitoring Overview <a id="service-monitoring-overview"></a> The following examples should help you to start implementing your own ideas. There is a variety of plugins available. This collection is not complete -- if you have any updates, please send a documentation patch upstream. +Please visit our [community forum](https://community.icinga.com) which +may provide an answer to your use case already. If not, do not hesitate +to create a new topic. + ### General Monitoring <a id="service-monitoring-general"></a> If the remote service is available (via a network protocol and port), diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/icinga2-2.10.5/doc/09-object-types.md new/icinga2-2.10.6/doc/09-object-types.md --- old/icinga2-2.10.5/doc/09-object-types.md 2019-05-23 13:56:44.000000000 +0200 +++ new/icinga2-2.10.6/doc/09-object-types.md 2019-07-30 14:50:01.000000000 +0200 @@ -1262,7 +1262,6 @@ ca\_path | String | **Optional.** Path to CA certificate to validate the remote host. Requires `enable_tls` set to `true`. cert\_path | String | **Optional.** Path to host certificate to present to the remote host for mutual verification. Requires `enable_tls` set to `true`. key\_path | String | **Optional.** Path to host key to accompany the cert\_path. Requires `enable_tls` set to `true`. - enable\_ha | Boolean | **Optional.** Enable the high availability functionality. Only valid in a [cluster setup](06-distributed-monitoring.md#distributed-monitoring-high-availability-features). Defaults to `false`. Note: If `flush_threshold` is set too low, this will force the feature to flush all data to Elasticsearch too often. Experiment with the setting, if you are processing more than 1024 metrics per second or similar. @@ -1344,7 +1343,6 @@ port | Number | **Optional.** GELF receiver port. Defaults to `12201`. source | String | **Optional.** Source name for this instance. Defaults to `icinga2`. enable\_send\_perfdata | Boolean | **Optional.** Enable performance data for 'CHECK RESULT' events. - enable\_ha | Boolean | **Optional.** Enable the high availability functionality. Only valid in a [cluster setup](06-distributed-monitoring.md#distributed-monitoring-high-availability-features). Defaults to `false`. ### GraphiteWriter <a id="objecttype-graphitewriter"></a> @@ -1372,7 +1370,6 @@ service\_name\_template | String | **Optional.** Metric prefix for service name. Defaults to `icinga2.$host.name$.services.$service.name$.$service.check_command$`. enable\_send\_thresholds | Boolean | **Optional.** Send additional threshold metrics. Defaults to `false`. enable\_send\_metadata | Boolean | **Optional.** Send additional metadata metrics. Defaults to `false`. - enable\_ha | Boolean | **Optional.** Enable the high availability functionality. Only valid in a [cluster setup](06-distributed-monitoring.md#distributed-monitoring-high-availability-features). Defaults to `false`. Additional usage examples can be found [here](14-features.md#graphite-carbon-cache-writer). @@ -1647,7 +1644,6 @@ enable\_send\_metadata | Boolean | **Optional.** Whether to send check metadata e.g. states, execution time, latency etc. flush\_interval | Duration | **Optional.** How long to buffer data points before transferring to InfluxDB. Defaults to `10s`. flush\_threshold | Number | **Optional.** How many data points to buffer before forcing a transfer to InfluxDB. Defaults to `1024`. - enable\_ha | Boolean | **Optional.** Enable the high availability functionality. Only valid in a [cluster setup](06-distributed-monitoring.md#distributed-monitoring-high-availability-features). Defaults to `false`. Note: If `flush_threshold` is set too low, this will always force the feature to flush all data to InfluxDB. Experiment with the setting, if you are processing more than 1024 metrics per second @@ -1728,7 +1724,6 @@ --------------------------|-----------------------|---------------------------------- host | String | **Optional.** OpenTSDB host address. Defaults to `127.0.0.1`. port | Number | **Optional.** OpenTSDB port. Defaults to `4242`. - enable\_ha | Boolean | **Optional.** Enable the high availability functionality. Only valid in a [cluster setup](06-distributed-monitoring.md#distributed-monitoring-high-availability-features). Defaults to `false`. ### PerfdataWriter <a id="objecttype-perfdatawriter"></a> @@ -1763,7 +1758,6 @@ host\_format\_template | String | **Optional.** Host Format template for the performance data file. Defaults to a template that's suitable for use with PNP4Nagios. service\_format\_template | String | **Optional.** Service Format template for the performance data file. Defaults to a template that's suitable for use with PNP4Nagios. rotation\_interval | Duration | **Optional.** Rotation interval for the files specified in `{host,service}_perfdata_path`. Defaults to `30s`. - enable\_ha | Boolean | **Optional.** Enable the high availability functionality. Only valid in a [cluster setup](06-distributed-monitoring.md#distributed-monitoring-high-availability-features). Defaults to `false`. When rotating the performance data file the current UNIX timestamp is appended to the path specified in `host_perfdata_path` and `service_perfdata_path` to generate a unique filename. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/icinga2-2.10.5/lib/base/tlsutility.cpp new/icinga2-2.10.6/lib/base/tlsutility.cpp --- old/icinga2-2.10.5/lib/base/tlsutility.cpp 2019-05-23 13:56:44.000000000 +0200 +++ new/icinga2-2.10.6/lib/base/tlsutility.cpp 2019-07-30 14:50:01.000000000 +0200 @@ -101,6 +101,14 @@ SSL_CTX_set_mode(sslContext.get(), SSL_MODE_ENABLE_PARTIAL_WRITE | SSL_MODE_ACCEPT_MOVING_WRITE_BUFFER); SSL_CTX_set_session_id_context(sslContext.get(), (const unsigned char *)"Icinga 2", 8); + // Explicitly load ECC ciphers, required on el7 - https://github.com/Icinga/icinga2/issues/7247 + // SSL_CTX_set_ecdh_auto is deprecated and removed in OpenSSL 1.1.x - https://github.com/openssl/openssl/issues/1437 +#if OPENSSL_VERSION_NUMBER < 0x10100000L +# ifdef SSL_CTX_set_ecdh_auto + SSL_CTX_set_ecdh_auto(sslContext.get(), 1); +# endif /* SSL_CTX_set_ecdh_auto */ +#endif /* OPENSSL_VERSION_NUMBER < 0x10100000L */ + if (!pubkey.IsEmpty()) { if (!SSL_CTX_use_certificate_chain_file(sslContext.get(), pubkey.CStr())) { Log(LogCritical, "SSL")

1 0

commit python-caja for openSUSE:Factory
by root 31 Jul '19

31 Jul '19

Hello community, here is the log from the commit of package python-caja for openSUSE:Factory checked in at 2019-07-31 14:36:13 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/python-caja (Old) and /work/SRC/openSUSE:Factory/.python-caja.new.4126 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "python-caja" Wed Jul 31 14:36:13 2019 rev:16 rq:719973 version:1.23.0 Changes: -------- --- /work/SRC/openSUSE:Factory/python-caja/python-caja.changes 2019-05-16 22:05:04.682564643 +0200 +++ /work/SRC/openSUSE:Factory/.python-caja.new.4126/python-caja.changes 2019-07-31 14:36:20.645867820 +0200 @@ -1,0 +2,8 @@ +Thu Jul 18 13:53:42 UTC 2019 - Jonathan Brielmaier <jbrielmaier(a)suse.de> + +- Update to version 1.23.0: + * Update translations. + * Add support for building with Python 3.8 + * Make Caja.OperationHandle usable + +------------------------------------------------------------------- Old: ---- python-caja-1.22.0.tar.xz New: ---- python-caja-1.23.0.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ python-caja.spec ++++++ --- /var/tmp/diff_new_pack.uiqmPr/_old 2019-07-31 14:36:21.437867416 +0200 +++ /var/tmp/diff_new_pack.uiqmPr/_new 2019-07-31 14:36:21.441867414 +0200 @@ -17,16 +17,17 @@ %define _name caja-python -%define _version 1.22 +%define _version 1.23 Name: python-caja -Version: 1.22.0 +Version: 1.23.0 Release: 0 Summary: Python bindings for Caja License: GPL-2.0-or-later Group: System/GUI/Other URL: https://mate-desktop.org/ Source: https://pub.mate-desktop.org/releases/%{_version}/%{name}-%{version}.tar.xz -BuildRequires: mate-common >= %{_version} +# set to _version when mate-common has an equal release +BuildRequires: mate-common >= 1.22 BuildRequires: pkgconfig BuildRequires: pkgconfig(libcaja-extension) >= %{_version} BuildRequires: pkgconfig(pygobject-3.0) ++++++ python-caja-1.22.0.tar.xz -> python-caja-1.23.0.tar.xz ++++++ ++++ 2459 lines of diff (skipped)

1 0

commit pluma for openSUSE:Factory
by root 31 Jul '19

31 Jul '19

Hello community, here is the log from the commit of package pluma for openSUSE:Factory checked in at 2019-07-31 14:36:09 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/pluma (Old) and /work/SRC/openSUSE:Factory/.pluma.new.4126 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "pluma" Wed Jul 31 14:36:09 2019 rev:23 rq:719972 version:1.23.1 Changes: -------- --- /work/SRC/openSUSE:Factory/pluma/pluma.changes 2019-06-19 20:58:26.169983011 +0200 +++ /work/SRC/openSUSE:Factory/.pluma.new.4126/pluma.changes 2019-07-31 14:36:15.613870390 +0200 @@ -1,0 +2,37 @@ +Fri Jul 19 08:00:21 UTC 2019 - Jonathan Brielmaier <jbrielmaier(a)suse.de> + +- Update to version 1.23.1: + * Translations update + * fix build error when gla11y is not installed + * avoid 'g_type_class_add_private' + * Add support for checking .ui accessibility with gla11y + * preferences: Fix inconsistent active state of trailing characters + * Add draw spaces/tabs/newlines options + * Draw spaces, tabs, newlines and nbsp. + * Fix use of deprecated glib-genmarshal types + * add snippet to toggle comment/uncomment + * pluma-print-preview: Fix warning: identical expressions + * Switch to Python 3 and change code for compatibility. + +------------------------------------------------------------------- +Thu Jul 18 13:48:08 UTC 2019 - Jonathan Brielmaier <jbrielmaier(a)suse.de> + +- Update to version 1.23.0: + * Translations update + * fix build error when gla11y is not installed + * avoid 'g_type_class_add_private' + * Add support for checking .ui accessibility with gla11y + * Use smart tabs to fix indentation and alignment + * preferences: Fix inconsistent active state of trailing characters + * Add draw spaces/tabs/newlines options + * Draw spaces, tabs, newlines and nbsp. + * Fix use of deprecated glib-genmarshal types + * add snippet to toggle comment/uncomment + * pluma-print-preview: Fix warning: identical expressions + * Switch to Python 3 and change code for compatibility. +- remove patch: + * pluma-gtk-3.20.patch: we don't support gtk3.20 anymore +- build require gtk >= 3.22, glib >= 2.50 and gio >= 2.50 + + +------------------------------------------------------------------- Old: ---- pluma-1.22.1.tar.xz pluma-gtk-3.20.patch New: ---- pluma-1.23.1.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ pluma.spec ++++++ --- /var/tmp/diff_new_pack.7QLzil/_old 2019-07-31 14:36:16.161870110 +0200 +++ /var/tmp/diff_new_pack.7QLzil/_new 2019-07-31 14:36:16.161870110 +0200 @@ -17,26 +17,25 @@ %define typelib typelib-1_0-Pluma-1_0 -%define _version 1.22 +%define _version 1.23 Name: pluma -Version: 1.22.1 +Version: 1.23.1 Release: 0 Summary: Text editor for the MATE desktop License: GPL-2.0-or-later Group: System/GUI/Other URL: https://mate-desktop.org/ Source: https://pub.mate-desktop.org/releases/%{_version}/%{name}-%{version}.tar.xz -# PATCH-FEATURE-OPENSUSE pluma-gtk-3.20.patch -- Restore GLib 2.48 and GTK+ 3.20 support. -Patch0: pluma-gtk-3.20.patch BuildRequires: fdupes -BuildRequires: mate-common >= %{_version} +# set to _version when mate-common has an equal release +BuildRequires: mate-common >= 1.22 BuildRequires: pkgconfig BuildRequires: update-desktop-files BuildRequires: yelp-tools BuildRequires: pkgconfig(enchant) -BuildRequires: pkgconfig(glib-2.0) >= 2.48 +BuildRequires: pkgconfig(glib-2.0) >= 2.50 BuildRequires: pkgconfig(gobject-introspection-1.0) -BuildRequires: pkgconfig(gtk+-3.0) >= 3.20 +BuildRequires: pkgconfig(gtk+-3.0) >= 3.22 BuildRequires: pkgconfig(gtksourceview-3.0) BuildRequires: pkgconfig(iso-codes) BuildRequires: pkgconfig(libpeas-gtk-1.0) ++++++ pluma-1.22.1.tar.xz -> pluma-1.23.1.tar.xz ++++++ ++++ 88514 lines of diff (skipped)

1 0