clickhouse-admin related fixes for ls-api

dev-tools/ls-apis/api-manifest.toml

@@ -139,11 +139,20 @@ label = "Bootstrap Agent"
 server_package_name = "bootstrap-agent-api"
 
 [[apis]]
-client_package_name = "clickhouse-admin-client"
-label = "Clickhouse Cluster Admin"
+client_package_name = "clickhouse-admin-keeper-client"
+label = "Clickhouse Cluster Admin for Keepers"
 server_package_name = "clickhouse-admin-api"
 notes = """
-This is the server running inside multi-node Clickhouse zones that's \
+This is the server running inside multi-node Clickhouse keeper zones that's \
+responsible for local configuration and monitoring.
+"""
+
+[[apis]]
+client_package_name = "clickhouse-admin-server-client"
+label = "Clickhouse Cluster Admin for Servers"
+server_package_name = "clickhouse-admin-api"
+notes = """
+This is the server running inside multi-node Clickhouse server zones that's \
 responsible for local configuration and monitoring.
 """
 

dev-tools/ls-apis/src/system_apis.rs

@@ -444,22 +444,6 @@ impl<'a> ServerComponentsTracker<'a> {
             return;
         }
 
-        // TODO Work around omicron#6829.
-        // Through the dependency tree, omicron-nexus appears to export the
-        // clickhouse-admin-api, but it doesn't really.
-        // This is just like the Crucible Pantry one above in that we can't
-        // build our data model unless we ignore it so we have to hardcode this
-        // here rather than use "dependency_filter_rules".
-        if **server_pkgname == "omicron-nexus"
-            && *api.client_package_name == "clickhouse-admin-client"
-        {
-            eprintln!(
-                "note: ignoring Cargo dependency from crucible-pantry -> \
-                 ... -> crucible-control-client",
-            );
-            return;
-        }
-
         if let Some((previous, _)) = self.api_producers.insert(
             api.client_package_name.clone(),
             (server_pkgname.clone(), dep_path.clone()),