tsarevvv/proxmox-backup
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

update to proxmox-rrd 0.4

Browse Source 
Signed-off-by: Wolfgang Bumiller <w.bumiller@proxmox.com>
This commit is contained in:
Wolfgang Bumiller 2024-09-18 16:04:20 +02:00
parent 0415304ca4
commit 79ed296f2d
6 changed files with 10 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
Cargo.toml
View File

@ -75,7 +75,8 @@ proxmox-openid = "0.10.0"
proxmox-rest-server = { version = "0.8", features = [ "templates" ] } proxmox-rest-server = { version = "0.8", features = [ "templates" ] }
# some use "cli", some use "cli" and "server", pbs-config uses nothing # some use "cli", some use "cli" and "server", pbs-config uses nothing
proxmox-router = { version = "3.0.0", default-features = false } 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" # everything but pbs-config and pbs-client use "api-macro"
proxmox-schema = "3" proxmox-schema = "3"
proxmox-section-config = "2" proxmox-section-config = "2"
@ -248,6 +249,7 @@ pbs-key-config.workspace = true
pbs-tape.workspace = true pbs-tape.workspace = true
pbs-tools.workspace = true pbs-tools.workspace = true
proxmox-rrd.workspace = true proxmox-rrd.workspace = true
proxmox-rrd-api-types.workspace = true
# Local path overrides # Local path overrides
# NOTE: You must run `cargo update` after changing this for it to take effect! # 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-rest-server = { path = "../proxmox/proxmox-rest-server" }
#proxmox-router = { path = "../proxmox/proxmox-router" } #proxmox-router = { path = "../proxmox/proxmox-router" }
#proxmox-rrd = { path = "../proxmox/proxmox-rrd" } #proxmox-rrd = { path = "../proxmox/proxmox-rrd" }
#proxmox-rrd-api-types = { path = "../proxmox/proxmox-rrd-api-types" }
#proxmox-schema = { path = "../proxmox/proxmox-schema" } #proxmox-schema = { path = "../proxmox/proxmox-schema" }
#proxmox-section-config = { path = "../proxmox/proxmox-section-config" } #proxmox-section-config = { path = "../proxmox/proxmox-section-config" }
#proxmox-serde = { path = "../proxmox/proxmox-serde" } #proxmox-serde = { path = "../proxmox/proxmox-serde" }

4
debian/control vendored
View File

@ -82,8 +82,8 @@ Build-Depends: bash-completion,
librust-proxmox-rest-server-0.8+templates-dev, librust-proxmox-rest-server-0.8+templates-dev,
librust-proxmox-router-3+cli-dev, librust-proxmox-router-3+cli-dev,
librust-proxmox-router-3+server-dev, librust-proxmox-router-3+server-dev,
librust-proxmox-rrd-0.3+api-types-dev, librust-proxmox-rrd-0.4+default-dev,
librust-proxmox-rrd-0.3+default-dev, librust-proxmox-rrd-api-types-1+default-dev,
librust-proxmox-schema-3+api-macro-dev, librust-proxmox-schema-3+api-macro-dev,
librust-proxmox-schema-3+default-dev, librust-proxmox-schema-3+default-dev,
librust-proxmox-section-config-2+default-dev, librust-proxmox-section-config-2+default-dev,

2
src/api2/admin/datastore.rs
View File

@ -22,7 +22,7 @@ use proxmox_router::{
http_err, list_subdirs_api_method, ApiHandler, ApiMethod, ApiResponseFuture, Permission, http_err, list_subdirs_api_method, ApiHandler, ApiMethod, ApiResponseFuture, Permission,
Router, RpcEnvironment, RpcEnvironmentType, SubdirMap, Router, RpcEnvironment, RpcEnvironmentType, SubdirMap,
}; };
use proxmox_rrd::api_types::{RRDMode, RRDTimeFrame}; use proxmox_rrd_api_types::{RRDMode, RRDTimeFrame};
use proxmox_schema::*; use proxmox_schema::*;
use proxmox_sortable_macro::sortable; use proxmox_sortable_macro::sortable;
use proxmox_sys::fs::{ use proxmox_sys::fs::{

2
src/api2/node/rrd.rs
View File

@ -3,7 +3,7 @@ use serde_json::{json, Value};
use std::collections::BTreeMap; use std::collections::BTreeMap;
use proxmox_router::{Permission, Router}; use proxmox_router::{Permission, Router};
use proxmox_rrd::api_types::{RRDMode, RRDTimeFrame}; use proxmox_rrd_api_types::{RRDMode, RRDTimeFrame};
use proxmox_schema::api; use proxmox_schema::api;
use pbs_api_types::{NODE_SCHEMA, PRIV_SYS_AUDIT}; use pbs_api_types::{NODE_SCHEMA, PRIV_SYS_AUDIT};

2
src/api2/status.rs
View File

@ -5,7 +5,7 @@ use serde_json::Value;
use proxmox_router::list_subdirs_api_method; use proxmox_router::list_subdirs_api_method;
use proxmox_router::{ApiMethod, Permission, Router, RpcEnvironment, SubdirMap}; 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 proxmox_schema::api;
use pbs_api_types::{ use pbs_api_types::{

2
src/rrd_cache.rs
View File

@ -14,7 +14,7 @@ use proxmox_rrd::Cache;
use proxmox_sys::fs::CreateOptions; use proxmox_sys::fs::CreateOptions;
use pbs_buildcfg::PROXMOX_BACKUP_STATE_DIR_M; 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"); const RRD_CACHE_BASEDIR: &str = concat!(PROXMOX_BACKUP_STATE_DIR_M!(), "/rrdb");