Merge pull request #230 from stefan-k/fix_es

Set elasticsearch client version to >=7.17,<8.0.0
MatterMiners · Apr 14, 2022 · add98d8 · add98d8
2 parents 8f1cd47 + 0eb31b1
commit add98d8
Show file tree

Hide file tree

Showing 3 changed files with 41 additions and 3 deletions.
diff --git a/setup.py b/setup.py
@@ -78,7 +78,7 @@ def get_cryptography_version():
         "cobald>=0.12.3",
         "asyncssh",
         "aiotelegraf",
-        "elasticsearch",
+        "elasticsearch>=7.17,<8.0.0",
         "aioprometheus>=21.9.0",
         "kubernetes_asyncio",
         "pydantic",

diff --git a/tardis/plugins/elasticsearchmonitoring.py b/tardis/plugins/elasticsearchmonitoring.py
@@ -25,7 +25,9 @@ def __init__(self):
         self._index = config.index
         self._meta = getattr(config, "meta", "")
 
-        self._es = Elasticsearch([{"host": config.host, "port": config.port}])
+        self._es = Elasticsearch(
+            [{"scheme": "http", "host": config.host, "port": config.port}]
+        )
 
     async def notify(self, state: State, resource_attributes: AttributeDict) -> None:
         """
@@ -47,7 +49,7 @@ async def notify(self, state: State, resource_attributes: AttributeDict) -> None
             "state": str(state),
             "meta": self._meta,
             "timestamp": int(time() * 1000),
-            "resource_status": str(resource_attributes["resource_status"]),
+            "resource_status": str(resource_attributes.get("resource_status", "")),
         }
 
         await self.async_execute(document)

diff --git a/tests/plugins_t/test_elasticsearchmonitoring.py b/tests/plugins_t/test_elasticsearchmonitoring.py
@@ -80,3 +80,39 @@ def test_notify(self):
             id=f"{test_param.drone_uuid}-2",
             index=f"{self.plugin._index}-{self.mock_datetime.now.return_value.strftime.return_value}",  # noqa: B950
         )
+
+    def test_notify_resource_status_missing(self):
+        test_param = AttributeDict(
+            site_name="test-site",
+            machine_type="test_machine_type",
+            created=datetime.now(),
+            updated=datetime.now(),
+            drone_uuid="test-drone",
+        )
+
+        test_param_ext = {
+            **test_param,
+            "state": str(CleanupState()),
+            "meta": self.plugin._meta,
+            "timestamp": int(self.mock_time.return_value * 1000),
+            "resource_status": "",
+            "revision": 2,
+        }
+
+        self.mock_elasticsearch.return_value.search.return_value = {
+            "hits": {"total": {"value": 2}}
+        }
+
+        run_async(
+            self.plugin.notify, state=CleanupState(), resource_attributes=test_param
+        )
+
+        self.mock_elasticsearch.return_value.search.assert_called_with(
+            index=f"{self.plugin._index}*",
+            body={"query": {"term": {"drone_uuid.keyword": test_param.drone_uuid}}},
+        )
+        self.mock_elasticsearch.return_value.create.assert_called_with(
+            body=test_param_ext,
+            id=f"{test_param.drone_uuid}-2",
+            index=f"{self.plugin._index}-{self.mock_datetime.now.return_value.strftime.return_value}",  # noqa: B950
+        )