From 79ed296f2dfac7748776d311c8a77c14e4f090b9 Mon Sep 17 00:00:00 2001
From: Wolfgang Bumiller <w.bumiller@proxmox.com>
Date: Wed, 18 Sep 2024 16:04:20 +0200
Subject: [PATCH] update to proxmox-rrd 0.4

Signed-off-by: Wolfgang Bumiller <w.bumiller@proxmox.com>
---
 Cargo.toml                  | 5 ++++-
 debian/control              | 4 ++--
 src/api2/admin/datastore.rs | 2 +-
 src/api2/node/rrd.rs        | 2 +-
 src/api2/status.rs          | 2 +-
 src/rrd_cache.rs            | 2 +-
 6 files changed, 10 insertions(+), 7 deletions(-)

diff --git a/Cargo.toml b/Cargo.toml
index 15ee0c7c0..4668baffe 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -75,7 +75,8 @@ proxmox-openid = "0.10.0"
 proxmox-rest-server = { version = "0.8", features = [ "templates" ] }
 # some use "cli", some use "cli" and "server", pbs-config uses nothing
 proxmox-router = { version = "3.0.0", default-features = false }
-proxmox-rrd = { version = "0.3", features = [ "api-types" ]}
+proxmox-rrd = "0.4"
+proxmox-rrd-api-types = "1"
 # everything but pbs-config and pbs-client use "api-macro"
 proxmox-schema = "3"
 proxmox-section-config = "2"
@@ -248,6 +249,7 @@ pbs-key-config.workspace = true
 pbs-tape.workspace = true
 pbs-tools.workspace = true
 proxmox-rrd.workspace = true
+proxmox-rrd-api-types.workspace = true
 
 # Local path overrides
 # NOTE: You must run `cargo update` after changing this for it to take effect!
@@ -274,6 +276,7 @@ proxmox-rrd.workspace = true
 #proxmox-rest-server = { path = "../proxmox/proxmox-rest-server" }
 #proxmox-router = { path = "../proxmox/proxmox-router" }
 #proxmox-rrd = { path = "../proxmox/proxmox-rrd" }
+#proxmox-rrd-api-types = { path = "../proxmox/proxmox-rrd-api-types" }
 #proxmox-schema = { path = "../proxmox/proxmox-schema" }
 #proxmox-section-config = { path = "../proxmox/proxmox-section-config" }
 #proxmox-serde = { path = "../proxmox/proxmox-serde" }
diff --git a/debian/control b/debian/control
index 3928a23d5..902d1d609 100644
--- a/debian/control
+++ b/debian/control
@@ -82,8 +82,8 @@ Build-Depends: bash-completion,
                librust-proxmox-rest-server-0.8+templates-dev,
                librust-proxmox-router-3+cli-dev,
                librust-proxmox-router-3+server-dev,
-               librust-proxmox-rrd-0.3+api-types-dev,
-               librust-proxmox-rrd-0.3+default-dev,
+               librust-proxmox-rrd-0.4+default-dev,
+               librust-proxmox-rrd-api-types-1+default-dev,
                librust-proxmox-schema-3+api-macro-dev,
                librust-proxmox-schema-3+default-dev,
                librust-proxmox-section-config-2+default-dev,
diff --git a/src/api2/admin/datastore.rs b/src/api2/admin/datastore.rs
index b66449bde..0fd89760f 100644
--- a/src/api2/admin/datastore.rs
+++ b/src/api2/admin/datastore.rs
@@ -22,7 +22,7 @@ use proxmox_router::{
     http_err, list_subdirs_api_method, ApiHandler, ApiMethod, ApiResponseFuture, Permission,
     Router, RpcEnvironment, RpcEnvironmentType, SubdirMap,
 };
-use proxmox_rrd::api_types::{RRDMode, RRDTimeFrame};
+use proxmox_rrd_api_types::{RRDMode, RRDTimeFrame};
 use proxmox_schema::*;
 use proxmox_sortable_macro::sortable;
 use proxmox_sys::fs::{
diff --git a/src/api2/node/rrd.rs b/src/api2/node/rrd.rs
index dc7826d47..88b753e7e 100644
--- a/src/api2/node/rrd.rs
+++ b/src/api2/node/rrd.rs
@@ -3,7 +3,7 @@ use serde_json::{json, Value};
 use std::collections::BTreeMap;
 
 use proxmox_router::{Permission, Router};
-use proxmox_rrd::api_types::{RRDMode, RRDTimeFrame};
+use proxmox_rrd_api_types::{RRDMode, RRDTimeFrame};
 use proxmox_schema::api;
 
 use pbs_api_types::{NODE_SCHEMA, PRIV_SYS_AUDIT};
diff --git a/src/api2/status.rs b/src/api2/status.rs
index f1ae0ef5d..9fcc55c67 100644
--- a/src/api2/status.rs
+++ b/src/api2/status.rs
@@ -5,7 +5,7 @@ use serde_json::Value;
 
 use proxmox_router::list_subdirs_api_method;
 use proxmox_router::{ApiMethod, Permission, Router, RpcEnvironment, SubdirMap};
-use proxmox_rrd::api_types::{RRDMode, RRDTimeFrame};
+use proxmox_rrd_api_types::{RRDMode, RRDTimeFrame};
 use proxmox_schema::api;
 
 use pbs_api_types::{
diff --git a/src/rrd_cache.rs b/src/rrd_cache.rs
index 8210ef6d5..c1a193427 100644
--- a/src/rrd_cache.rs
+++ b/src/rrd_cache.rs
@@ -14,7 +14,7 @@ use proxmox_rrd::Cache;
 use proxmox_sys::fs::CreateOptions;
 
 use pbs_buildcfg::PROXMOX_BACKUP_STATE_DIR_M;
-use proxmox_rrd::api_types::{RRDMode, RRDTimeFrame};
+use proxmox_rrd_api_types::{RRDMode, RRDTimeFrame};
 
 const RRD_CACHE_BASEDIR: &str = concat!(PROXMOX_BACKUP_STATE_DIR_M!(), "/rrdb");