From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from firstgate.proxmox.com (firstgate.proxmox.com [IPv6:2a01:7e0:0:424::9]) by lore.proxmox.com (Postfix) with ESMTPS id 70F841FF56B for ; Mon, 22 Apr 2024 13:58:00 +0200 (CEST) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id E5040F9F3; Mon, 22 Apr 2024 13:58:04 +0200 (CEST) Date: Mon, 22 Apr 2024 13:57:26 +0200 From: Fabian =?iso-8859-1?q?Gr=FCnbichler?= To: Proxmox Backup Server development discussion References: <20240422075910.24041-1-g.goller@proxmox.com> In-Reply-To: <20240422075910.24041-1-g.goller@proxmox.com> MIME-Version: 1.0 User-Agent: astroid/0.16.0 (https://github.com/astroidmail/astroid) Message-Id: <1713786903.gsnmmbiuhg.astroid@yuna.none> X-SPAM-LEVEL: Spam detection results: 0 AWL 0.055 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: Re: [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" On April 22, 2024 9:59 am, Gabriel Goller wrote: > 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. these are passed as-is into the URI, and there are characters not allowed in queries (without encoding), so either these restrictions need to be added here, or proxmox-metrics needs to learn to encode them ;) > > 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 > > > _______________________________________________ pbs-devel mailing list pbs-devel@lists.proxmox.com https://lists.proxmox.com/cgi-bin/mailman/listinfo/pbs-devel