Skip to content

fixed schema in WeatherMapDataSource_cactithold.php to use new fields. #5

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
thurban merged 2 commits into from
Apr 17, 2020
Merged

fixed schema in WeatherMapDataSource_cactithold.php to use new fields. #5

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
646b917
fixed schema in WeatherMapDataSource_cactithold.php to use new fields.
Apr 9, 2020
e2ad9f8
added printf arguments to the -f CLI argument of rrdtool to resolve b…
Apr 14, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 5 additions & 5 deletions lib/datasources/WeatherMapDataSource_cactithold.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -106,10 +106,10 @@ function ReadData($targetstring, &$map, &$item)
// use target aggregation to build these up into a 'badness' percentage
// takes the same two values that are visible in thold's own URLs (the actual thold ID isn't shown anywhere)

$rra_id = intval($matches[1]);
$data_id = intval($matches[2]);
$local_data_id = intval($matches[1]);
$data_template_rrd_id = intval($matches[2]);

$SQL2 = "select thold_alert from thold_data where rra_id=$rra_id and data_id=$data_id and thold_enabled='on'";
$SQL2 = "select thold_alert from thold_data where local_data_id=$local_data_id and data_template_rrd_id=$data_template_rrd_id and thold_enabled='on'";
$result = db_fetch_row($SQL2);
if(isset($result))
{
Expand Down Expand Up @@ -179,13 +179,13 @@ function ReadData($targetstring, &$map, &$item)
wm_debug("CactiTHold ReadData: Checking threshold states for host $id\n");
$numthresh = 0;
$numfailing = 0;
$SQL2 = "select rra_id, data_id, thold_alert from thold_data,data_local where thold_data.rra_id=data_local.id and data_local.host_id=$id and thold_enabled='on'";
$SQL2 = "select local_data_id, data_template_rrd_id, thold_alert from thold_data,data_local where thold_data.local_data_id=data_local.id and data_local.host_id=$id and thold_enabled='on'";
# $result = db_fetch_row($SQL2);
$queryrows = db_fetch_assoc($SQL2);
if( is_array($queryrows) )
{
foreach ($queryrows as $th) {
$desc = $th['rra_id']."/".$th['data_id'];
$desc = $th['local_data_id']."/".$th['data_template_rrd_id'];
$v = $th['thold_alert'];
$numthresh++;
if(intval($th['thold_alert']) > 0)
Expand Down
2 changes: 1 addition & 1 deletion lib/datasources/WeatherMapDataSource_rrd.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -244,7 +244,7 @@ function wmrrd_read_from_real_rrdtool_aggregate($rrdfile,$cf,$aggregatefn,$start
$args[] = "graph";
$args[] = "/dev/null";
$args[] = "-f";
$args[] = "''";
$args[] = "'%s %lu %lu'";
$args[] = "--start";
$args[] = $start;
$args[] = "--end";
Expand Down