From: Christian Ebner <c.ebner@proxmox.com>
To: pdm-devel@lists.proxmox.com
Subject: [pdm-devel] [PATCH datacenter-manager 1/7] server: api: add remote-type search category for resources
Date: Mon, 13 Oct 2025 10:56:17 +0200 [thread overview]
Message-ID: <20251013085623.211136-2-c.ebner@proxmox.com> (raw)
In-Reply-To: <20251013085623.211136-1-c.ebner@proxmox.com>
Extend the current search capability for resources by adding the
`RemoteType` search category, allowing to selectively filter remotes
of type PVE and PBS. While extending the search capabilities, this
will also be used to filter the resources to be gathered on status
api calls, to refine statistics based on remote type.
Since the current remote filtering is only applied in case of remotes
only search, add an additional helper to pre-filter the to be fetched
resources by the remote type.
With this it is now possible to search, e.g. `remote-type:pbs` to
only get resources from PBS remotes.
Signed-off-by: Christian Ebner <c.ebner@proxmox.com>
---
server/src/api/resources.rs | 44 +++++++++++++++++++++++++++++++++----
1 file changed, 40 insertions(+), 4 deletions(-)
diff --git a/server/src/api/resources.rs b/server/src/api/resources.rs
index f4f56bc..029106f 100644
--- a/server/src/api/resources.rs
+++ b/server/src/api/resources.rs
@@ -56,6 +56,7 @@ enum MatchCategory {
Status,
Template,
Remote,
+ RemoteType,
}
impl std::str::FromStr for MatchCategory {
@@ -69,6 +70,7 @@ impl std::str::FromStr for MatchCategory {
"status" => MatchCategory::Status,
"template" => MatchCategory::Template,
"remote" => MatchCategory::Remote,
+ "remote-type" => MatchCategory::RemoteType,
_ => bail!("invalid category"),
};
Ok(category)
@@ -88,11 +90,18 @@ impl MatchCategory {
(Ok(a), Ok(b)) => a == b,
_ => false,
},
+ MatchCategory::RemoteType => match (
+ RemoteType::from_str(value),
+ RemoteType::from_str(search_term),
+ ) {
+ (Ok(a), Ok(b)) => a == b,
+ _ => false,
+ },
}
}
}
-// returns None if we can't decide if it matches, currently only for the `Remote` category`
+// returns None if we can't decide if it matches, currently only for the `RemoteType` category
fn resource_matches_search_term(
remote_name: &str,
resource: &Resource,
@@ -112,6 +121,7 @@ fn resource_matches_search_term(
_ => false,
},
MatchCategory::Remote => category.matches(remote_name, &term.value),
+ MatchCategory::RemoteType => return None,
},
Some(Err(_)) => false,
None => {
@@ -122,7 +132,12 @@ fn resource_matches_search_term(
Some(matches)
}
-fn remote_matches_search_term(remote_name: &str, online: Option<bool>, term: &SearchTerm) -> bool {
+fn remote_matches_search_term(
+ remote_name: &str,
+ online: Option<bool>,
+ remote_type: Option<RemoteType>,
+ term: &SearchTerm,
+) -> bool {
match term.category.as_deref().map(|c| c.parse::<MatchCategory>()) {
Some(Ok(category)) => match category {
MatchCategory::Type => category.matches("remote", &term.value),
@@ -135,6 +150,10 @@ fn remote_matches_search_term(remote_name: &str, online: Option<bool>, term: &Se
None => true,
},
MatchCategory::Template => false,
+ MatchCategory::RemoteType => match remote_type {
+ Some(remote_type) => category.matches(&remote_type.to_string(), &term.value),
+ None => true,
+ },
},
Some(Err(_)) => false,
None => {
@@ -144,6 +163,17 @@ fn remote_matches_search_term(remote_name: &str, online: Option<bool>, term: &Se
}
}
+fn remote_type_matches_search_term(remote_type: RemoteType, term: &SearchTerm) -> bool {
+ match term.category.as_deref().map(|c| c.parse::<MatchCategory>()) {
+ Some(Ok(category)) => match category {
+ MatchCategory::RemoteType => category.matches(&remote_type.to_string(), &term.value),
+ _ => true,
+ },
+ Some(Err(_)) => false,
+ None => true,
+ }
+}
+
#[api(
// FIXME:: see list-like API calls in resource routers, we probably want more fine-grained
// checks..
@@ -248,8 +278,14 @@ pub(crate) async fn get_resources_impl(
}
}
+ if !filters.matches(|term| remote_type_matches_search_term(remote.ty, term)) {
+ continue;
+ }
+
if remotes_only
- && !filters.matches(|term| remote_matches_search_term(&remote_name, None, term))
+ && !filters.matches(|term| {
+ remote_matches_search_term(&remote_name, None, Some(remote.ty), term)
+ })
{
continue;
}
@@ -301,7 +337,7 @@ pub(crate) async fn get_resources_impl(
return true;
}
filters.matches(|filter| {
- remote_matches_search_term(&res.remote, Some(res.error.is_none()), filter)
+ remote_matches_search_term(&res.remote, Some(res.error.is_none()), None, filter)
})
})
}
--
2.47.3
_______________________________________________
pdm-devel mailing list
pdm-devel@lists.proxmox.com
https://lists.proxmox.com/cgi-bin/mailman/listinfo/pdm-devel
next prev parent reply other threads:[~2025-10-13 8:57 UTC|newest]
Thread overview: 19+ messages / expand[flat|nested] mbox.gz Atom feed top
2025-10-13 8:56 [pdm-devel] [PATCH datacenter-manager 0/7] add remote type based search and PBS node status panel to dashboard Christian Ebner
2025-10-13 8:56 ` Christian Ebner [this message]
2025-10-14 8:35 ` [pdm-devel] [PATCH datacenter-manager 1/7] server: api: add remote-type search category for resources Dominik Csapak
2025-10-14 9:01 ` Christian Ebner
2025-10-13 8:56 ` [pdm-devel] [PATCH datacenter-manager 2/7] pdm-api-types: extend resource status by list of failed remotes Christian Ebner
2025-10-13 8:56 ` [pdm-devel] [PATCH datacenter-manager 3/7] server: api: collect failed remotes list while getting status Christian Ebner
2025-10-14 8:37 ` Dominik Csapak
2025-10-14 12:41 ` Christian Ebner
2025-10-14 12:53 ` Dominik Csapak
2025-10-14 13:10 ` Christian Ebner
2025-10-14 13:17 ` Dominik Csapak
2025-10-13 8:56 ` [pdm-devel] [PATCH datacenter-manager 4/7] ui: dashboard: extend node panel creation by remote type Christian Ebner
2025-10-13 8:56 ` [pdm-devel] [PATCH datacenter-manager 5/7] ui: dashboard: distinguish failed remotes based on " Christian Ebner
2025-10-14 8:47 ` Dominik Csapak
2025-10-14 9:20 ` Christian Ebner
2025-10-14 9:24 ` Dominik Csapak
2025-10-13 8:56 ` [pdm-devel] [PATCH datacenter-manager 6/7] ui: dashboard: expose PBS nodes status panel Christian Ebner
2025-10-13 8:56 ` [pdm-devel] [PATCH datacenter-manager 7/7] ui: dashboard: filter by remote type for PVE and PBS node " Christian Ebner
2025-10-17 14:13 ` [pdm-devel] superseded: [PATCH datacenter-manager 0/7] add remote type based search and PBS node status panel to dashboard Christian Ebner
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20251013085623.211136-2-c.ebner@proxmox.com \
--to=c.ebner@proxmox.com \
--cc=pdm-devel@lists.proxmox.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.