Hi,
i just forgot to add you to the developers list of perfparse and give=20
you cvs access. Now you have write access. Simply cvs commit your=20
changes. Thanks!
Flo
C=E9dric Temple schrieb:
> Hi,
>=20
> I test the new version of perfparse (latest CVS version) and correct tw=
o bugs.=20
> Here is the patch:
> diff -Naurb perfparse-all perfparse-cvs-ctemple
>=20
> Hope this can help.
> Bye.
>=20
>=20
>=20
> -----------------------------------------------------------------------=
-
>=20
> diff -Naurb perfparse-all/ChangeLog perfparse-cvs-ctemple/ChangeLog
> --- perfparse-all/ChangeLog 2006-12-29 01:01:12.000000000 +0000
> +++ perfparse-cvs-ctemple/ChangeLog 2007-02-15 17:29:03.000000000 +0000
> @@ -1,4 +1,6 @@
> Version 0.106.2
> + Correct creation of table perfdata_delete_policy (MySQL) (C Temple)
> + Correct bug in page "all_bin" when selected one graph (C Temple)
> Added comments to policies (FG)
> Changed database schema. Normalized some tables (FG)
> Added option to set port and/or socket for database connection (FG)
> diff -Naurb perfparse-all/phpgui/templates/all_bin.tpl.html perfparse-c=
vs-ctemple/phpgui/templates/all_bin.tpl.html
> --- perfparse-all/phpgui/templates/all_bin.tpl.html 2006-11-10 15:32:17=
.000000000 +0000
> +++ perfparse-cvs-ctemple/phpgui/templates/all_bin.tpl.html 2007-02-15 =
17:11:30.000000000 +0000
> @@ -93,7 +93,7 @@
> <td bgcolor=3D"#FFFFFF"><font face=3D"Arial, Helvetica" size=3D2>&nb=
sp;<{$item.host_name}> </td>
> <td bgcolor=3D"#FFFFFF"><font face=3D"Arial, Helvetica" size=3D2>&nb=
sp;<{$item.service_description}> </td>
> <td align=3D"center" bgcolor=3D"#FFFFFF"><font face=3D"Arial, Helvet=
ica" size=3D"2">
> - <a href=3Dperfparse.php?page=3Dgraph&host_name=3D<{$item.host_na=
me_url|escape:"url"}>&service=3D<{$item.service_description_url|escape:"u=
rl"}>&metric=3D<{$item.metric|escape:"url"}>>
> + <a href=3Dperfparse.php?page=3Dgraph&graphs[<{$item.metric_id}>>
> <img src=3D"<{$http_image_path}>perfgraph-sm.png" border=3D0><=
/a>
> </td> =20
> <td bgcolor=3D"#FFFFFF"><font face=3D"Arial, Helvetica" size=3D2>&nb=
sp;<{$item.metric}> </td>
> diff -Naurb perfparse-all/phpgui/utils.php perfparse-cvs-ctemple/phpgui=
/utils.php
> --- perfparse-all/phpgui/utils.php 2006-12-30 01:01:12.000000000 +0000
> +++ perfparse-cvs-ctemple/phpgui/utils.php 2007-02-15 17:12:46.00000000=
0 +0000
> @@ -311,7 +311,7 @@
> }
> =20
> // build query
> - $query =3D'SELECT h.host_name,s.service_description,m.metric,b.cti=
me,value,m.unit,b.state from ';
> + $query =3D'SELECT h.host_name,s.service_description,m.metric,b.cti=
me,value,m.unit,b.state,b.metric_id from ';
> $query.=3D'perfdata_service_metric m, perfdata_host h,perfdata_ser=
vice_bin b, perfdata_service s ';
> // group_id=3D=3D0 means all groups
> if ($groupId =3D=3D 0) {
> @@ -338,6 +338,7 @@
> 'service_description' =3D> $t['service_descriptio=
n'],
> 'service_description_url' =3D> $t['service_descri=
ption'],
> 'metric' =3D> $t['metric'],
> + 'metric_id' =3D> $t['metric_id'],
> 'ctime' =3D> $t['ctime'],
> 'value' =3D> $t['value'],
> 'unit' =3D> $t['unit'],
> diff -Naurb perfparse-all/scripts/mysql_create.sql perfparse-cvs-ctempl=
e/scripts/mysql_create.sql
> --- perfparse-all/scripts/mysql_create.sql 2006-12-29 01:01:13.00000000=
0 +0000
> +++ perfparse-cvs-ctemple/scripts/mysql_create.sql 2007-02-15 17:07:10.=
000000000 +0000
> @@ -24,7 +24,7 @@
> policy_id INT AUTO_INCREMENT PRIMARY KEY,
> policy_name VARCHAR(20) NOT NULL UNIQUE,
> delete_policy_seconds INT DEFAULT NULL,
> - policy_comment TEXT,
> + policy_comment TEXT
> ) TYPE=3DInnoDB;
> =20
> =20
|
