OpensearchCOS module not needed, using COSAgent directly

canonical · Dec 4, 2023 · 2ed9511 · 2ed9511
1 parent df083e9
commit 2ed9511
Show file tree

Hide file tree

Showing 3 changed files with 2 additions and 64 deletions.
diff --git a/lib/charms/opensearch/v0/constants_charm.py b/lib/charms/opensearch/v0/constants_charm.py
@@ -76,7 +76,6 @@
 ClientRelationName = "opensearch-client"
 PeerRelationName = "opensearch-peers"
 PeerClusterRelationName = "peer-cluster"
-COSRelationName = "cos-agent"
 COSPort = "9200"
 
 

diff --git a/lib/charms/opensearch/v0/opensearch_base_charm.py b/lib/charms/opensearch/v0/opensearch_base_charm.py
@@ -8,14 +8,14 @@
 from datetime import datetime
 from typing import Dict, List, Optional, Type
 
+from charms.grafana_agent.v0.cos_agent import COSAgentProvider
 from charms.opensearch.v0.constants_charm import (
     AdminUserInitProgress,
     CertsExpirationError,
     ClientRelationName,
     ClusterHealthRed,
     ClusterHealthUnknown,
     COSPort,
-    COSRelationName,
     PeerRelationName,
     PluginConfigChangeError,
     RequestUnitServiceOps,
@@ -45,7 +45,6 @@
     generate_password,
 )
 from charms.opensearch.v0.opensearch_config import OpenSearchConfig
-from charms.opensearch.v0.opensearch_cos import OpenSearchCOSProvider
 from charms.opensearch.v0.opensearch_distro import OpenSearchDistribution
 from charms.opensearch.v0.opensearch_exceptions import (
     OpenSearchError,
@@ -137,7 +136,7 @@ def __init__(self, *args, distro: Type[OpenSearchDistribution] = None):
         self.status = Status(self)
         self.health = OpenSearchHealth(self)
         self.ops_lock = OpenSearchOpsLock(self)
-        self.cos_integration = OpenSearchCOSProvider(
+        self.cos_integration = COSAgentProvider(
             self,
             metrics_endpoints=[
                 {"path": "/_prometheus/metrics", "port": COSPort},
@@ -175,10 +174,6 @@ def __init__(self, *args, distro: Type[OpenSearchDistribution] = None):
         self.framework.observe(
             self.on[STORAGE_NAME].storage_detaching, self._on_opensearch_data_storage_detaching
         )
-        self.framework.observe(
-            self.on[COSRelationName].relation_created,
-            self.cos_integration._on_cos_agent_relation_created,
-        )
 
         self.framework.observe(self.on.set_password_action, self._on_set_password_action)
         self.framework.observe(self.on.get_password_action, self._on_get_password_action)

diff --git a/lib/charms/opensearch/v0/opensearch_cos.py b/lib/charms/opensearch/v0/opensearch_cos.py