Merge tag '0.4.0' into debian/yoga

oslo.metrics 0.4.0 release

meta:version: 0.4.0
meta:diff-start: -
meta:series: yoga
meta:release-type: release
meta:pypi: yes
meta:first: yes
meta:release:Author: Hervé Beraud <hberaud@redhat.com>
meta:release:Commit: Hervé Beraud <hberaud@redhat.com>
meta:release:Change-Id: Ic6d479ec8720cdf5fcdb958dde3b66669bf7a2e0
meta:release:Code-Review+2: Elod Illes <elod.illes@est.tech>
meta:release:Code-Review+2: Thierry Carrez <thierry@openstack.org>
meta:release:Workflow+1: Thierry Carrez <thierry@openstack.org>

oslo_metrics/__main__.py

@@ -17,7 +17,6 @@ import os
 import select
 import signal
 import socket
-import stat
 import sys
 import threading
 from wsgiref.simple_server import make_server
@@ -33,7 +32,9 @@ oslo_metrics_configs = [
     cfg.StrOpt('metrics_socket_file',
                default='/var/tmp/metrics_collector.sock',
                help='Unix domain socket file to be used'
-                    'to send rpc related metrics'),
+                    ' to send rpc related metrics'),
+    cfg.IntOpt('prometheus_port', default=3000,
+               help='Port number to expose metrics in prometheus format.'),
 ]
 cfg.CONF.register_opts(oslo_metrics_configs, group='oslo_metrics')
 
@@ -97,7 +98,7 @@ def main():
     socket_path = cfg.CONF.oslo_metrics.metrics_socket_file
     m = MetricsListener(socket_path)
     try:
-        os.chmod(socket_path, stat.S_IRWXU | stat.S_IRWXO)
+        os.chmod(socket_path, 0o660)
     except OSError:
         LOG.error("Changing the mode of the file failed.... continuing")
     mt = threading.Thread(target=m.serve)
@@ -107,7 +108,7 @@ def main():
     app = make_wsgi_app()
     try:
         global httpd
-        httpd = make_server('', 3000, app)
+        httpd = make_server('', CONF.oslo_metrics.prometheus_port, app)
         signal.signal(signal.SIGTERM, handle_sigterm)
         httpd.serve_forever()
     except KeyboardInterrupt:

releasenotes/notes/port-config-ac5d9ee247a8ff9b.yaml

+---
+features:
+  - |
+    Port number to expose metrics in Prometheus format is now configurable.

releasenotes/source/index.rst

@@ -6,4 +6,5 @@ oslo.metrics Release Notes
    :maxdepth: 1
 
    unreleased
+   xena
    wallaby

releasenotes/source/xena.rst

+=========================
+Xena Series Release Notes
+=========================
+
+.. release-notes::
+   :branch: stable/xena

setup.cfg

 [metadata]
 name = oslo.metrics
 author = OpenStack
-author-email = openstack-discuss@lists.openstack.org
+author_email = openstack-discuss@lists.openstack.org
 summary = Oslo Metrics API
-description-file =
+description_file =
     README.rst
-home-page = https://opendev.org/openstack/oslo.metrics
-python-requires = >=3.6
+home_page = https://opendev.org/openstack/oslo.metrics
+python_requires = >=3.6
 classifier =
     Environment :: OpenStack
     Intended Audience :: Developers

tox.ini

 [tox]
-minversion = 3.2.0
+minversion = 3.18.0
 envlist = py3,pep8
 ignore_basepython_conflict = True
 
 [testenv]
 basepython = python3
-whitelist_externals =
+allowlist_externals =
   find
 deps =
   -c{env:TOX_CONSTRAINTS_FILE:https://releases.openstack.org/constraints/upper/master}
@@ -24,7 +24,7 @@ commands =
 commands = {posargs}
 
 [testenv:docs]
-whitelist_externals = rm
+allowlist_externals = rm
 deps =
   -c{env:TOX_CONSTRAINTS_FILE:https://releases.openstack.org/constraints/upper/master}
   -r{toxinidir}/doc/requirements.txt
@@ -51,7 +51,7 @@ exclude=.venv,.git,.tox,dist,doc,*lib/python*,*egg,build
 import_exceptions =
 
 [testenv:releasenotes]
-whitelist_externals =
+allowlist_externals =
   rm
 deps = {[testenv:docs]deps}
 commands =