From 3e69aba2d8ccf3e4bfc645642ca93e8ab3655934 Mon Sep 17 00:00:00 2001 From: Gabriel Goller Date: Fri, 26 Apr 2024 16:02:43 +0200 Subject: [PATCH] api-types: remove influxdb bucket name restrictions Remove the regex for influxdb organizations and buckets. Influxdb does not place any constraints on these names and allows all characters. This allows influxdb organization names with slashes. Also remove a duplicate comment and add some missing ones. This also aligns the behavior to PVE as there are no restrictions there either. The motivation for this patch is this forum post: https://forum.proxmox.com/threads/influx-db-organization-doesnt-allow-slash.145402/ Signed-off-by: Gabriel Goller --- pbs-api-types/src/metrics.rs | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/pbs-api-types/src/metrics.rs b/pbs-api-types/src/metrics.rs index 6800c23b..23421035 100644 --- a/pbs-api-types/src/metrics.rs +++ b/pbs-api-types/src/metrics.rs @@ -12,14 +12,12 @@ pub const METRIC_SERVER_ID_SCHEMA: Schema = StringSchema::new("Metrics Server ID .schema(); pub const INFLUXDB_BUCKET_SCHEMA: Schema = StringSchema::new("InfluxDB Bucket.") - .format(&PROXMOX_SAFE_ID_FORMAT) .min_length(3) .max_length(32) .default("proxmox") .schema(); pub const INFLUXDB_ORGANIZATION_SCHEMA: Schema = StringSchema::new("InfluxDB Organization.") - .format(&PROXMOX_SAFE_ID_FORMAT) .min_length(3) .max_length(32) .default("proxmox") @@ -129,13 +127,14 @@ pub struct InfluxDbHttp { pub enable: bool, /// The base url of the influxdb server pub url: String, - /// The Optional Token #[serde(skip_serializing_if = "Option::is_none")] /// The (optional) API token pub token: Option, #[serde(skip_serializing_if = "Option::is_none")] + /// Named location where time series data is stored pub bucket: Option, #[serde(skip_serializing_if = "Option::is_none")] + /// Workspace for a group of users pub organization: Option, #[serde(skip_serializing_if = "Option::is_none")] /// The (optional) maximum body size