chore: update charm libraries (#191)

Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>

Author: github-actions[bot]

lib/charms/grafana_agent/v0/cos_agent.py

@@ -254,7 +254,7 @@ class _MetricsEndpointDict(TypedDict):
 
 LIBID = "dc15fa84cef84ce58155fb84f6c6213a"
 LIBAPI = 0
-LIBPATCH = 23
+LIBPATCH = 24
 
 PYDEPS = ["cosl >= 0.0.50", "pydantic"]
 
@@ -711,11 +711,16 @@ def _scrape_jobs(self) -> List[Dict]:
             scrape_configs = self._scrape_configs.copy()
 
         # Convert "metrics_endpoints" to standard scrape_configs, and add them in
+        unit_name = self._charm.unit.name.replace("/", "_")
         for endpoint in self._metrics_endpoints:
+            port = endpoint["port"]
+            path = endpoint["path"]
+            sanitized_path = path.strip("/").replace("/", "_")
             scrape_configs.append(
                 {
-                    "metrics_path": endpoint["path"],
-                    "static_configs": [{"targets": [f"localhost:{endpoint['port']}"]}],
+                    "job_name": f"{unit_name}_localhost_{port}_{sanitized_path}",
+                    "metrics_path": path,
+                    "static_configs": [{"targets": [f"localhost:{port}"]}],
                 }
             )
 

lib/charms/operator_libs_linux/v0/passwd.py

@@ -12,7 +12,20 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-"""Simple library for managing Linux users and groups.
+"""Legacy Charmhub-hosted passwd library, deprecated in favour of ``charmlibs.passwd``.
+
+WARNING: This library is deprecated and will no longer receive feature updates or bugfixes.
+``charmlibs.passwd`` version 1.0 is a bug-for-bug compatible migration of this library.
+Add 'charmlibs-passwd~=1.0' to your charm's dependencies, and remove this Charmhub-hosted library.
+Then replace `from charms.operator_libs_linux.v0 import passwd` with
+`from charmlibs import passwd`.
+Read more:
+- https://documentation.ubuntu.com/charmlibs
+- https://pypi.org/project/charmlibs-passwd
+
+---
+
+Simple library for managing Linux users and groups.
 
 The `passwd` module provides convenience methods and abstractions around users and groups on a
 Linux system, in order to make adding and managing users and groups easy.
@@ -45,7 +58,7 @@
 
 # Increment this PATCH version before using `charmcraft publish-lib` or reset
 # to 0 if you are raising the major API version
-LIBPATCH = 4
+LIBPATCH = 5
 
 
 def user_exists(user: Union[str, int]) -> Optional[pwd.struct_passwd]:
@@ -58,9 +71,9 @@ def user_exists(user: Union[str, int]) -> Optional[pwd.struct_passwd]:
         TypeError: where neither a string or int is passed as the first argument
     """
     try:
-        if type(user) is int:
+        if isinstance(user, int) and not isinstance(user, bool):
             return pwd.getpwuid(user)
-        elif type(user) is str:
+        elif isinstance(user, str):
             return pwd.getpwnam(user)
         else:
             raise TypeError("specified argument '%r' should be a string or int", user)
@@ -79,9 +92,9 @@ def group_exists(group: Union[str, int]) -> Optional[grp.struct_group]:
         TypeError: where neither a string or int is passed as the first argument
     """
     try:
-        if type(group) is int:
+        if isinstance(group, int) and not isinstance(group, bool):
             return grp.getgrgid(group)
-        elif type(group) is str:
+        elif isinstance(group, str):
             return grp.getgrnam(group)
         else:
             raise TypeError("specified argument '%r' should be a string or int", group)

lib/charms/operator_libs_linux/v1/systemd.py

@@ -13,7 +13,20 @@
 # limitations under the License.
 
 
-"""Abstractions for stopping, starting and managing system services via systemd.
+"""Legacy Charmhub-hosted systemd library, deprecated in favour of ``charmlibs.systemd``.
+
+WARNING: This library is deprecated and will no longer receive feature updates or bugfixes.
+``charmlibs.systemd`` version 1.0 is a bug-for-bug compatible migration of this library.
+Add 'charmlibs-systemd~=1.0' to your charm's dependencies, and remove this Charmhub-hosted library.
+Then replace `from charms.operator_libs_linux.v0 import systemd` with
+`from charmlibs import systemd`.
+Read more:
+- https://documentation.ubuntu.com/charmlibs
+- https://pypi.org/project/charmlibs-systemd
+
+---
+
+Abstractions for stopping, starting and managing system services via systemd.
 
 This library assumes that your charm is running on a platform that uses systemd. E.g.,
 Centos 7 or later, Ubuntu Xenial (16.04) or later.
@@ -64,7 +77,7 @@
 
 # Increment this PATCH version before using `charmcraft publish-lib` or reset
 # to 0 if you are raising the major API version
-LIBPATCH = 4
+LIBPATCH = 5
 
 
 class SystemdError(Exception):