Author: arekm Date: Wed Oct 5 20:16:47 2005 GMT
Module: SOURCES Tag: HEAD
---- Log message:
- new
---- Files affected:
SOURCES:
short_open_tag_parse_error.patch (NONE -> 1.1) (NEW),
graph_properties_zoom.patch (NONE -> 1.1) (NEW), script_server_snmp_auth.patch
(NONE -> 1.1) (NEW), mib_file_loading.patch (NONE -> 1.1) (NEW)
---- Diffs:
================================================================
Index: SOURCES/short_open_tag_parse_error.patch
diff -u /dev/null SOURCES/short_open_tag_parse_error.patch:1.1
--- /dev/null Wed Oct 5 22:16:47 2005
+++ SOURCES/short_open_tag_parse_error.patch Wed Oct 5 22:16:42 2005
@@ -0,0 +1,34 @@
+diff -ruBbd cacti-0.8.6g/graph_view.php cacti-0.8.6g-patched/graph_view.php
+--- cacti-0.8.6g/graph_view.php 2005-09-08 19:56:25.000000000 -0400
++++ cacti-0.8.6g-patched/graph_view.php 2005-09-13 22:14:01.000000000
-0400
+@@ -374,7 +374,7 @@
+
+ <tr bgcolor="<?php print $colors["panel"];?>">
+ <form name="form_graph_id" method="POST"
onSubmit='form_graph(document.graphs,document.form_graph_id)'>
+- <input type='hidden' name='graph_list' value='<? print
$graph_list_text; ?>'>
++ <input type='hidden' name='graph_list' value='<?php print
$graph_list_text; ?>'>
+ <input type='hidden' name='graph_add' value=''>
+ <input type='hidden' name='graph_remove' value=''>
+ <td>
+@@ -564,10 +564,10 @@
+ <input type='hidden' name='page' value='1'>
+ <input type='hidden' name='style' value='selective'>
+ <input type='hidden' name='action' value='preview'>
+- <input type='hidden' name='graph_list' value='<? print
$graph_list_text; ?>'>
++ <input type='hidden' name='graph_list' value='<?php print
$graph_list_text; ?>'>
+ <input type='hidden' name='graph_add' value=''>
+ <input type='hidden' name='graph_remove' value=''>
+- </form><?;
++ </form><?php
+
+ break;
+ }
+diff -ruBbd cacti-0.8.6g/include/html/inc_graph_view_filter_table.php
cacti-0.8.6g-patched/include/html/inc_graph_view_filter_table.php
+--- cacti-0.8.6g/include/html/inc_graph_view_filter_table.php 2005-09-08
19:56:24.000000000 -0400
++++ cacti-0.8.6g-patched/include/html/inc_graph_view_filter_table.php
2005-09-13 22:14:25.000000000 -0400
+@@ -1,4 +1,4 @@
+- <? if (empty($_REQUEST["host_id"])) { $_REQUEST["host_id"] = 0; }
++ <?php if (empty($_REQUEST["host_id"])) { $_REQUEST["host_id"] = 0; }
+ if (empty($_REQUEST["filter"])) { $_REQUEST["filter"] = ""; } ?>
+ <tr bgcolor="<?php print $colors["panel"];?>">
+ <form name="form_graph_id" method="post">
================================================================
Index: SOURCES/graph_properties_zoom.patch
diff -u /dev/null SOURCES/graph_properties_zoom.patch:1.1
--- /dev/null Wed Oct 5 22:16:47 2005
+++ SOURCES/graph_properties_zoom.patch Wed Oct 5 22:16:42 2005
@@ -0,0 +1,12 @@
+diff -ruBbd cacti-0.8.6g/graph.php cacti-0.8.6g-patched/graph.php
+--- cacti-0.8.6g/graph.php 2005-09-08 19:56:25.000000000 -0400
++++ cacti-0.8.6g-patched/graph.php 2005-09-13 22:22:25.000000000 -0400
+@@ -238,7 +238,7 @@
+ <img
src='graph_image.php?local_graph_id=<?php print
$_GET["local_graph_id"];?>&rra_id=<?php print
$_GET["rra_id"];?>&graph_start=<?php print (isset($_GET["graph_start"]) ?
$_GET["graph_start"] : 0);?>&graph_end=<?php print (isset($_GET["graph_end"]) ?
$_GET["graph_end"] : 0);?>' border='0' alt='<?php print $graph_title;?>'>
+ </td>
+ <td valign='top' style='padding: 3px;'>
+- <a
href='graph.php?action=zoom&local_graph_id=<?php print
$_GET["local_graph_id"];?>&rra_id=<?php print
$_GET["rra_id"];?>&view_type=<?php print
$_REQUEST["view_type"];?>&graph_start=<?php print (isset($_GET["graph_start"])
? $_GET["graph_start"] : 0);?>&graph_end=<?php print (isset($_GET["graph_end"])
? $_GET["graph_end"] : 0);?>'><img src='images/graph_zoom.gif' border='0'
alt='Zoom Graph' title='Zoom Graph' style='padding: 3px;'></a><br>
++ <a
href='graph.php?action=zoom&local_graph_id=<?php print
$_GET["local_graph_id"];?>&rra_id=<?php print
$_GET["rra_id"];?>&view_type=<?php print $_REQUEST["view_type"];?>'><img
src='images/graph_zoom.gif' border='0' alt='Zoom Graph' title='Zoom Graph'
style='padding: 3px;'></a><br>
+ </td>
+ </tr>
+ <tr>
================================================================
Index: SOURCES/script_server_snmp_auth.patch
diff -u /dev/null SOURCES/script_server_snmp_auth.patch:1.1
--- /dev/null Wed Oct 5 22:16:47 2005
+++ SOURCES/script_server_snmp_auth.patch Wed Oct 5 22:16:42 2005
@@ -0,0 +1,56 @@
+diff -ruBbd cacti-0.8.6g/scripts/ss_host_cpu.php
cacti-0.8.6g-patched/scripts/ss_host_cpu.php
+--- cacti-0.8.6g/scripts/ss_host_cpu.php 2005-09-08 19:56:25.000000000
-0400
++++ cacti-0.8.6g-patched/scripts/ss_host_cpu.php 2005-09-18
10:50:45.000000000 -0400
+@@ -76,7 +76,7 @@
+ }
+
+ function ss_host_cpu_get_cpu_usage($hostname, $snmp_community, $snmp_version,
$snmpv3_auth_username, $snmpv3_auth_password, $snmpv3_auth_protocol,
$snmpv3_priv_passphrase, $snmpv3_priv_protocol, $snmp_port, $snmp_timeout) {
+- $arr = ss_host_cpu_reindex(cacti_snmp_walk($hostname, $snmp_community,
".1.3.6.1.2.1.25.3.3.1", $snmp_version, $snmpv3_auth_username,
$snmpv3_auth_password, $snmpv3_auth_protocol, $snmpv3_priv_passphrase,
$snmpv3_priv_protocol, $snmp_port, $snmp_timeout, SNMP_POLLER));
++ $arr = ss_host_cpu_reindex(cacti_snmp_walk($hostname, $snmp_community,
".1.3.6.1.2.1.25.3.3.1", $snmp_version, $snmpv3_auth_username,
$snmpv3_auth_password, $snmp_port, $snmp_timeout, SNMP_POLLER));
+ $return_arr = array();
+
+ $j = 0;
+@@ -92,7 +92,7 @@
+ }
+
+ function ss_host_cpu_get_indexes($hostname, $snmp_community, $snmp_version,
$snmpv3_auth_username, $snmpv3_auth_password, $snmpv3_auth_protocol,
$snmpv3_priv_passphrase, $snmpv3_priv_protocol, $snmp_port, $snmp_timeout) {
+- $arr = ss_host_cpu_reindex(cacti_snmp_walk($hostname, $snmp_community,
".1.3.6.1.2.1.25.3.3.1", $snmp_version, $snmpv3_auth_username,
$snmpv3_auth_password, $snmpv3_auth_protocol, $snmpv3_priv_passphrase,
$snmpv3_priv_protocol, $snmp_port, $snmp_timeout, SNMP_POLLER));
++ $arr = ss_host_cpu_reindex(cacti_snmp_walk($hostname, $snmp_community,
".1.3.6.1.2.1.25.3.3.1", $snmp_version, $snmpv3_auth_username,
$snmpv3_auth_password, $snmp_port, $snmp_timeout, SNMP_POLLER));
+ $return_arr = array();
+
+ $j = 0;
+diff -ruBbd cacti-0.8.6g/scripts/ss_host_disk.php
cacti-0.8.6g-patched/scripts/ss_host_disk.php
+--- cacti-0.8.6g/scripts/ss_host_disk.php 2005-09-08 19:56:25.000000000
-0400
++++ cacti-0.8.6g-patched/scripts/ss_host_disk.php 2005-09-18
10:50:45.000000000 -0400
+@@ -47,7 +47,7 @@
+ );
+
+ if ($cmd == "index") {
+- $return_arr = ss_host_disk_reindex(cacti_snmp_walk($hostname,
$snmp_community, $oids["index"], $snmp_version, $snmpv3_auth_username,
$snmpv3_auth_password, $snmpv3_auth_protocol, $snmpv3_priv_passphrase,
$snmpv3_priv_protocol, $snmp_port, $snmp_timeout, SNMP_POLLER));
++ $return_arr = ss_host_disk_reindex(cacti_snmp_walk($hostname,
$snmp_community, $oids["index"], $snmp_version, $snmpv3_auth_username,
$snmpv3_auth_password, $snmp_port, $snmp_timeout, SNMP_POLLER));
+
+ for ($i=0;($i<sizeof($return_arr));$i++) {
+ print $return_arr[$i] . "\n";
+@@ -55,8 +55,8 @@
+ }elseif ($cmd == "query") {
+ $arg = $arg1;
+
+- $arr_index = ss_host_disk_reindex(cacti_snmp_walk($hostname,
$snmp_community, $oids["index"], $snmp_version, $snmpv3_auth_username,
$snmpv3_auth_password, $snmpv3_auth_protocol, $snmpv3_priv_passphrase,
$snmpv3_priv_protocol, $snmp_port, $snmp_timeout, SNMP_POLLER));
+- $arr = ss_host_disk_reindex(cacti_snmp_walk($hostname,
$snmp_community, $oids[$arg], $snmp_version, $snmpv3_auth_username,
$snmpv3_auth_password, $snmpv3_auth_protocol, $snmpv3_priv_passphrase,
$snmpv3_priv_protocol, $snmp_port, $snmp_timeout, SNMP_POLLER));
++ $arr_index = ss_host_disk_reindex(cacti_snmp_walk($hostname,
$snmp_community, $oids["index"], $snmp_version, $snmpv3_auth_username,
$snmpv3_auth_password, $snmp_port, $snmp_timeout, SNMP_POLLER));
++ $arr = ss_host_disk_reindex(cacti_snmp_walk($hostname,
$snmp_community, $oids[$arg], $snmp_version, $snmpv3_auth_username,
$snmpv3_auth_password, $snmp_port, $snmp_timeout, SNMP_POLLER));
+
+ for ($i=0;($i<sizeof($arr_index));$i++) {
+ print $arr_index[$i] . "!" . $arr[$i] . "\n";
+@@ -69,9 +69,9 @@
+ /* get hrStorageAllocationUnits from the snmp cache
since it is faster */
+ $sau = eregi_replace("[^0-9]", "",
db_fetch_cell("select field_value from host_snmp_cache where host_id=$host_id
and field_name='hrStorageAllocationUnits' and snmp_index='$index'"));
+
+- return cacti_snmp_get($hostname, $snmp_community,
$oids[$arg] . ".$index", $snmp_version, $snmpv3_auth_username,
$snmpv3_auth_password, $snmpv3_auth_protocol, $snmpv3_priv_passphrase,
$snmpv3_priv_protocol, $snmp_port, $snmp_timeout, SNMP_POLLER) * $sau;
++ return cacti_snmp_get($hostname, $snmp_community,
$oids[$arg] . ".$index", $snmp_version, $snmpv3_auth_username,
$snmpv3_auth_password, $snmp_port, $snmp_timeout, SNMP_POLLER) * $sau;
+ }else{
+- return cacti_snmp_get($hostname, $snmp_community,
$oids[$arg] . ".$index", $snmp_version, $snmpv3_auth_username,
$snmpv3_auth_password, $snmpv3_auth_protocol, $snmpv3_priv_passphrase,
$snmpv3_priv_protocol, $snmp_port, $snmp_timeout, SNMP_POLLER);
++ return cacti_snmp_get($hostname, $snmp_community,
$oids[$arg] . ".$index", $snmp_version, $snmpv3_auth_username,
$snmpv3_auth_password, $snmp_port, $snmp_timeout, SNMP_POLLER);
+ }
+ }
+ }
================================================================
Index: SOURCES/mib_file_loading.patch
diff -u /dev/null SOURCES/mib_file_loading.patch:1.1
--- /dev/null Wed Oct 5 22:16:47 2005
+++ SOURCES/mib_file_loading.patch Wed Oct 5 22:16:42 2005
@@ -0,0 +1,13 @@
+diff -ruBbd cacti-0.8.6g/poller.php cacti-0.8.6g-patched/poller.php
+--- cacti-0.8.6g/poller.php 2005-09-08 19:56:25.000000000 -0400
++++ cacti-0.8.6g-patched/poller.php 2005-09-18 10:48:52.000000000 -0400
+@@ -47,9 +47,6 @@
+ /* Let PHP Run Just as Long as It Has To */
+ ini_set("max_execution_time", "0");
+
+-/* Disable Mib File Loading */
+-putenv("MIBS=NONE");
+-
+ /* Get number of polling items from the database */
+ $polling_interval = read_config_option("poller_interval");
+
================================================================
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
