From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from firstgate.proxmox.com (firstgate.proxmox.com [212.224.123.68]) by lore.proxmox.com (Postfix) with ESMTPS id B939D1FF56B for ; Mon, 22 Apr 2024 09:59:11 +0200 (CEST) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id 26CAFA678; Mon, 22 Apr 2024 09:59:16 +0200 (CEST) From: Gabriel Goller To: pbs-devel@lists.proxmox.com Date: Mon, 22 Apr 2024 09:59:07 +0200 Message-ID: <20240422075910.24041-1-g.goller@proxmox.com> X-Mailer: git-send-email 2.43.0 MIME-Version: 1.0 X-SPAM-LEVEL: Spam detection results: 0 AWL -0.080 Adjusted score from AWL reputation of From: address BAYES_00 -1.9 Bayes spam probability is 0 to 1% DMARC_MISSING 0.1 Missing DMARC policy KAM_DMARC_STATUS 0.01 Test Rule for DKIM or SPF Failure with Strict Alignment SPF_HELO_NONE 0.001 SPF: HELO does not publish an SPF Record SPF_PASS -0.001 SPF: sender matches SPF record Subject: [pbs-devel] [PATCH proxmox-backup v2] api-types: remove influxdb bucket name restrictions X-BeenThere: pbs-devel@lists.proxmox.com X-Mailman-Version: 2.1.29 Precedence: list List-Id: Proxmox Backup Server development discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-To: Proxmox Backup Server development discussion Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Errors-To: pbs-devel-bounces@lists.proxmox.com Sender: "pbs-devel" 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 -- 2.43.0 _______________________________________________ pbs-devel mailing list pbs-devel@lists.proxmox.com https://lists.proxmox.com/cgi-bin/mailman/listinfo/pbs-devel