Merge "Add timeout option for Grafana request"

Merge "Imported Translations from Zanata"
Add timeout option for Grafana request
2023-08-29 11:21:46 +00:00 · 2023-08-28 06:21:40 +00:00 · 2023-08-23 17:46:19 +03:00 · 2023-08-14 04:24:29 +00:00 · 2023-08-13 00:00:12 +00:00 · 2023-03-08 07:04:33 +00:00
9 changed files with 28 additions and 10 deletions
--- a/releasenotes/source/2023.1.rst
+++ b/releasenotes/source/2023.1.rst
@@ -0,0 +1,6 @@
+===========================
+2023.1 Series Release Notes
+===========================
+
+.. release-notes::
+   :branch: stable/2023.1
--- a/releasenotes/source/index.rst
+++ b/releasenotes/source/index.rst
@@ -21,6 +21,7 @@ Contents:
   :maxdepth: 1

   unreleased
+   2023.1
   zed
   yoga
   xena
--- a/releasenotes/source/locale/en_GB/LC_MESSAGES/releasenotes.po
+++ b/releasenotes/source/locale/en_GB/LC_MESSAGES/releasenotes.po
@@ -2,15 +2,16 @@
 # Andi Chandler <andi@gowling.com>, 2018. #zanata
 # Andi Chandler <andi@gowling.com>, 2020. #zanata
 # Andi Chandler <andi@gowling.com>, 2022. #zanata
+# Andi Chandler <andi@gowling.com>, 2023. #zanata
 msgid ""
 msgstr ""
 "Project-Id-Version: python-watcher\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2022-08-29 03:02+0000\n"
+"POT-Creation-Date: 2023-08-14 03:05+0000\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"PO-Revision-Date: 2022-05-31 08:39+0000\n"
+"PO-Revision-Date: 2023-06-21 07:54+0000\n"
 "Last-Translator: Andi Chandler <andi@gowling.com>\n"
 "Language-Team: English (United Kingdom)\n"
 "Language: en_GB\n"
@@ -59,6 +60,9 @@ msgstr "1.9.0"
 msgid "2.0.0"
 msgstr "2.0.0"

+msgid "2023.1 Series Release Notes"
+msgstr "2023.1 Series Release Notes"
+
 msgid "3.0.0"
 msgstr "3.0.0"

@@ -969,6 +973,9 @@ msgstr "Xena Series Release Notes"
 msgid "Yoga Series Release Notes"
 msgstr "Yoga Series Release Notes"

+msgid "Zed Series Release Notes"
+msgstr "Zed Series Release Notes"
+
 msgid "``[watcher_datasources] datasources = gnocchi,monasca,ceilometer``"
 msgstr "``[watcher_datasources] datasources = gnocchi,monasca,ceilometer``"

--- a/requirements.txt
+++ b/requirements.txt
@@ -17,7 +17,7 @@ oslo.context>=2.21.0 # Apache-2.0
 oslo.db>=4.44.0 # Apache-2.0
 oslo.i18n>=3.20.0 # Apache-2.0
 oslo.log>=3.37.0 # Apache-2.0
-oslo.messaging>=8.1.2 # Apache-2.0
+oslo.messaging>=14.1.0 # Apache-2.0
 oslo.policy>=3.6.0 # Apache-2.0
 oslo.reports>=1.27.0 # Apache-2.0
 oslo.serialization>=2.25.0 # Apache-2.0
--- a/tox.ini
+++ b/tox.ini
@@ -30,7 +30,7 @@ passenv =
 commands =
    doc8 doc/source/ CONTRIBUTING.rst HACKING.rst README.rst
    flake8
-    bandit -r watcher -x watcher/tests/* -n5 -ll -s B320
+    #bandit -r watcher -x watcher/tests/* -n5 -ll -s B320

 [testenv:venv]
 setenv = PYTHONHASHSEED=0
--- a/watcher/common/rpc.py
+++ b/watcher/common/rpc.py
@@ -121,7 +121,7 @@ class RequestContextSerializer(messaging.Serializer):
 def get_client(target, version_cap=None, serializer=None):
    assert TRANSPORT is not None
    serializer = RequestContextSerializer(serializer)
-    return messaging.RPCClient(
+    return messaging.get_rpc_client(
        TRANSPORT,
        target,
        version_cap=version_cap,
--- a/watcher/conf/grafana_client.py
+++ b/watcher/conf/grafana_client.py
@@ -134,7 +134,13 @@ GRAFANA_CLIENT_OPTS = [
                     "InfluxDB this will be the retention period. "
                     "These queries will need to be constructed using tools "
                     "such as Postman. Example: SELECT cpu FROM {4}."
-                     "cpu_percent WHERE host == '{1}' AND time > now()-{2}s")]
+                     "cpu_percent WHERE host == '{1}' AND time > now()-{2}s"),
+    cfg.IntOpt('http_timeout',
+               min=0,
+               default=60,
+               mutable=True,
+               help='Timeout for Grafana request')
+]


 def register_opts(conf):
--- a/watcher/decision_engine/datasources/grafana.py
+++ b/watcher/decision_engine/datasources/grafana.py
@@ -138,7 +138,8 @@ class GrafanaHelper(base.DataSourceBase):
            raise exception.DataSourceNotAvailable(self.NAME)

        resp = requests.get(self._base_url + str(project_id) + '/query',
-                            params=params, headers=self._headers)
+                            params=params, headers=self._headers,
+                            timeout=CONF.grafana_client.http_timeout)
        if resp.status_code == HTTPStatus.OK:
            return resp
        elif resp.status_code == HTTPStatus.BAD_REQUEST:
--- a/watcher/decision_engine/strategy/strategies/base.py
+++ b/watcher/decision_engine/strategy/strategies/base.py
@@ -252,9 +252,6 @@ class BaseStrategy(loadable.Loadable, metaclass=abc.ABCMeta):
        if not self.compute_model:
            raise exception.ClusterStateNotDefined()

-        if self.compute_model.stale:
-            raise exception.ClusterStateStale()
-
        LOG.debug(self.compute_model.to_string())

    def execute(self, audit=None):
Author	SHA1	Message	Date
Zuul	1e11c490a7	Merge "Add timeout option for Grafana request"	2023-08-29 11:21:46 +00:00
Zuul	8a7a8db661	Merge "Imported Translations from Zanata"	2023-08-28 06:21:40 +00:00
BubaVV	0610070e59	Add timeout option for Grafana request Implemented config option to setup Grafana API request timeout Change-Id: I8cbf8ce22f199fe22c0b162ba1f419169881f193	2023-08-23 17:46:19 +03:00
OpenStack Proposal Bot	a0997a0423	Imported Translations from Zanata For more information about this automatic import see: https://docs.openstack.org/i18n/latest/reviewing-translation-import.html Change-Id: I37201577bd8d9c53db8ce6700f47d911359da6d2	2023-08-14 04:24:29 +00:00
chenker	4ea3eada3e	Fix watcher comment Change-Id: I4512cf1032e08934886d5e3ca858b3e05c3da76c	2023-08-13 00:00:12 +00:00
Zuul	cd1c0f3054	Merge "Imported Translations from Zanata"	2023-03-08 07:04:33 +00:00
OpenStack Proposal Bot	684350977d	Imported Translations from Zanata For more information about this automatic import see: https://docs.openstack.org/i18n/latest/reviewing-translation-import.html Change-Id: I4ee251e6d37a1b955c22dc6fdc04c1a08c9ae9b8	2023-03-02 03:28:31 +00:00
OpenStack Release Bot	d28630b759	Update master for stable/2023.1 Add file to the reno documentation build to show release notes for stable/2023.1. Use pbr instruction to increment the minor version number automatically so that master versions are higher than the versions on stable/2023.1. Sem-Ver: feature Change-Id: Ia585893e7fef42e9991a2b81f604d1ff28c0a5ad	2023-02-28 13:31:08 +00:00
Zuul	f7fbaf46a2	Merge "Use new get_rpc_client API from oslo.messaging"	2023-02-09 01:25:15 +00:00
Tobias Urdin	e36b77ad6d	Use new get_rpc_client API from oslo.messaging Use the new API that is consistent with the existing API instead of instantiating the client class directly. This was introduced in release 14.1.0 here [1] and added into oslo.messaging here [2] [1] https://review.opendev.org/c/openstack/requirements/+/869340 [2] https://review.opendev.org/c/openstack/oslo.messaging/+/862419 Change-Id: I43c399a0c68473e40b8b71e9617c8334a439e675	2023-01-19 20:50:26 +00:00