tiago/pve-cluster
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

add new pve2.3-vm stream (include template value)

Browse source 
skip=3 to handle new template value

but we still rite to /var/lib/rrdcached/db/pve2-vm as the rrds have not changed

bump version to 1.0-35
This commit is contained in:
Dietmar Maurer 2013-01-16 09:55:47 +01:00
parent db9751d855
commit ba9dcfc158
3 changed files with 28 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

4
Makefile
View file

@ -1,8 +1,8 @@
RELEASE=2.2
RELEASE=2.3
PACKAGE=pve-cluster
PKGVER=1.0
PKGREL=34
PKGREL=35
ARCH:=$(shell dpkg-architecture -qDEB_BUILD_ARCH)

25
data/src/status.c
View file

@ -920,7 +920,7 @@ update_rrd_data(
if (rrdc_connect(rrdcsock) != 0)
use_daemon = 0;
char *filename = g_strdup_printf(RRDDIR "/%s", key);
char *filename = NULL;
int skip = 0;
@ -935,6 +935,8 @@ update_rrd_data(
if (strlen(node) < 1)
goto keyerror;
filename = g_strdup_printf(RRDDIR "/%s", key);
if (!g_file_test(filename, G_FILE_TEST_EXISTS)) {
mkdir(RRDDIR "/pve2-node", 0755);
@ -942,10 +944,17 @@ update_rrd_data(
create_rrd_file(filename, argcount, rrd_def_node);
}
} else if (strncmp(key, "pve2-vm/", 8) == 0) {
const char *vmid = key + 8;
} else if ((strncmp(key, "pve2-vm/", 8) == 0) ||
(strncmp(key, "pve2.3-vm/", 10) == 0)) {
const char *vmid;
skip = 2;
if (strncmp(key, "pve2-vm/", 8) == 0) {
vmid = key + 8;
skip = 2;
} else {
vmid = key + 10;
skip = 3;
}
if (strchr(vmid, '/') != NULL)
goto keyerror;
@ -953,6 +962,8 @@ update_rrd_data(
if (strlen(vmid) < 1)
goto keyerror;
filename = g_strdup_printf(RRDDIR "/%s/%s", "pve2-vm", vmid);
if (!g_file_test(filename, G_FILE_TEST_EXISTS)) {
mkdir(RRDDIR "/pve2-vm", 0755);
@ -978,6 +989,8 @@ update_rrd_data(
if (strlen(storage) < 1)
goto keyerror;
filename = g_strdup_printf(RRDDIR "/%s", key);
if (!g_file_test(filename, G_FILE_TEST_EXISTS)) {
mkdir(RRDDIR "/pve2-storage", 0755);
@ -1017,7 +1030,9 @@ update_rrd_data(
}
ret:
g_free(filename);
if (filename)
g_free(filename);
return;
keyerror:

6
debian/changelog vendored
View file

@ -1,3 +1,9 @@
pve-cluster (1.0-35) unstable; urgency=low
* add new pve2.3-vm rrd stream (include template value)
-- Proxmox Support Team <support@proxmox.com> Wed, 16 Jan 2013 09:55:35 +0100
pve-cluster (1.0-34) unstable; urgency=low
* implement sendfd to support qemu fdset functionality.