|
@@ -669,7 +669,7 @@ static inline void do_dimension_fixedstep(
|
|
|
// fill RRDR for the whole chart
|
|
|
|
|
|
#ifdef NETDATA_INTERNAL_CHECKS
|
|
|
-static void rrd2rrdr_log_request_response_metdata(RRDR *r
|
|
|
+static void rrd2rrdr_log_request_response_metadata(RRDR *r
|
|
|
, RRDR_GROUPING group_method
|
|
|
, int aligned
|
|
|
, long group
|
|
@@ -902,7 +902,7 @@ static RRDR *rrd2rrdr_fixedstep(
|
|
|
// align the requested timeframe to fit it.
|
|
|
|
|
|
if(aligned) {
|
|
|
- // alignement has been requested, so align the values
|
|
|
+ // alignment has been requested, so align the values
|
|
|
before_requested -= before_requested % (group * update_every);
|
|
|
after_requested -= after_requested % (group * update_every);
|
|
|
}
|
|
@@ -1143,27 +1143,27 @@ static RRDR *rrd2rrdr_fixedstep(
|
|
|
#ifdef NETDATA_INTERNAL_CHECKS
|
|
|
if (dimensions_used) {
|
|
|
if(r->internal.log)
|
|
|
- rrd2rrdr_log_request_response_metdata(r, group_method, aligned, group, resampling_time_requested, resampling_group, after_wanted, after_requested, before_wanted, before_requested, points_requested, points_wanted, /*after_slot, before_slot,*/ r->internal.log);
|
|
|
+ rrd2rrdr_log_request_response_metadata(r, group_method, aligned, group, resampling_time_requested, resampling_group, after_wanted, after_requested, before_wanted, before_requested, points_requested, points_wanted, /*after_slot, before_slot,*/ r->internal.log);
|
|
|
|
|
|
if(r->rows != points_wanted)
|
|
|
- rrd2rrdr_log_request_response_metdata(r, group_method, aligned, group, resampling_time_requested, resampling_group, after_wanted, after_requested, before_wanted, before_requested, points_requested, points_wanted, /*after_slot, before_slot,*/ "got 'points' is not wanted 'points'");
|
|
|
+ rrd2rrdr_log_request_response_metadata(r, group_method, aligned, group, resampling_time_requested, resampling_group, after_wanted, after_requested, before_wanted, before_requested, points_requested, points_wanted, /*after_slot, before_slot,*/ "got 'points' is not wanted 'points'");
|
|
|
|
|
|
if(aligned && (r->before % group) != 0)
|
|
|
- rrd2rrdr_log_request_response_metdata(r, group_method, aligned, group, resampling_time_requested, resampling_group, after_wanted, after_requested, before_wanted, before_requested, points_requested, points_wanted, /*after_slot, before_slot,*/ "'before' is not aligned but alignment is required");
|
|
|
+ rrd2rrdr_log_request_response_metadata(r, group_method, aligned, group, resampling_time_requested, resampling_group, after_wanted, after_requested, before_wanted, before_requested, points_requested, points_wanted, /*after_slot, before_slot,*/ "'before' is not aligned but alignment is required");
|
|
|
|
|
|
// 'after' should not be aligned, since we start inside the first group
|
|
|
//if(aligned && (r->after % group) != 0)
|
|
|
- // rrd2rrdr_log_request_response_metdata(r, group_method, aligned, group, resampling_time_requested, resampling_group, after_wanted, after_requested, before_wanted, before_requested, points_requested, points_wanted, after_slot, before_slot, "'after' is not aligned but alignment is required");
|
|
|
+ // rrd2rrdr_log_request_response_metadata(r, group_method, aligned, group, resampling_time_requested, resampling_group, after_wanted, after_requested, before_wanted, before_requested, points_requested, points_wanted, after_slot, before_slot, "'after' is not aligned but alignment is required");
|
|
|
|
|
|
if(r->before != before_requested)
|
|
|
- rrd2rrdr_log_request_response_metdata(r, group_method, aligned, group, resampling_time_requested, resampling_group, after_wanted, after_requested, before_wanted, before_requested, points_requested, points_wanted, /*after_slot, before_slot,*/ "chart is not aligned to requested 'before'");
|
|
|
+ rrd2rrdr_log_request_response_metadata(r, group_method, aligned, group, resampling_time_requested, resampling_group, after_wanted, after_requested, before_wanted, before_requested, points_requested, points_wanted, /*after_slot, before_slot,*/ "chart is not aligned to requested 'before'");
|
|
|
|
|
|
if(r->before != before_wanted)
|
|
|
- rrd2rrdr_log_request_response_metdata(r, group_method, aligned, group, resampling_time_requested, resampling_group, after_wanted, after_requested, before_wanted, before_requested, points_requested, points_wanted, /*after_slot, before_slot,*/ "got 'before' is not wanted 'before'");
|
|
|
+ rrd2rrdr_log_request_response_metadata(r, group_method, aligned, group, resampling_time_requested, resampling_group, after_wanted, after_requested, before_wanted, before_requested, points_requested, points_wanted, /*after_slot, before_slot,*/ "got 'before' is not wanted 'before'");
|
|
|
|
|
|
// reported 'after' varies, depending on group
|
|
|
if(r->after != after_wanted)
|
|
|
- rrd2rrdr_log_request_response_metdata(r, group_method, aligned, group, resampling_time_requested, resampling_group, after_wanted, after_requested, before_wanted, before_requested, points_requested, points_wanted, /*after_slot, before_slot,*/ "got 'after' is not wanted 'after'");
|
|
|
+ rrd2rrdr_log_request_response_metadata(r, group_method, aligned, group, resampling_time_requested, resampling_group, after_wanted, after_requested, before_wanted, before_requested, points_requested, points_wanted, /*after_slot, before_slot,*/ "got 'after' is not wanted 'after'");
|
|
|
}
|
|
|
#endif
|
|
|
|
|
@@ -1276,7 +1276,7 @@ static RRDR *rrd2rrdr_variablestep(
|
|
|
// align the requested timeframe to fit it.
|
|
|
|
|
|
if(aligned) {
|
|
|
- // alignement has been requested, so align the values
|
|
|
+ // alignment has been requested, so align the values
|
|
|
before_requested -= before_requested % (group * update_every);
|
|
|
after_requested -= after_requested % (group * update_every);
|
|
|
}
|
|
@@ -1520,27 +1520,27 @@ static RRDR *rrd2rrdr_variablestep(
|
|
|
|
|
|
if (dimensions_used) {
|
|
|
if(r->internal.log)
|
|
|
- rrd2rrdr_log_request_response_metdata(r, group_method, aligned, group, resampling_time_requested, resampling_group, after_wanted, after_requested, before_wanted, before_requested, points_requested, points_wanted, /*after_slot, before_slot,*/ r->internal.log);
|
|
|
+ rrd2rrdr_log_request_response_metadata(r, group_method, aligned, group, resampling_time_requested, resampling_group, after_wanted, after_requested, before_wanted, before_requested, points_requested, points_wanted, /*after_slot, before_slot,*/ r->internal.log);
|
|
|
|
|
|
if(r->rows != points_wanted)
|
|
|
- rrd2rrdr_log_request_response_metdata(r, group_method, aligned, group, resampling_time_requested, resampling_group, after_wanted, after_requested, before_wanted, before_requested, points_requested, points_wanted, /*after_slot, before_slot,*/ "got 'points' is not wanted 'points'");
|
|
|
+ rrd2rrdr_log_request_response_metadata(r, group_method, aligned, group, resampling_time_requested, resampling_group, after_wanted, after_requested, before_wanted, before_requested, points_requested, points_wanted, /*after_slot, before_slot,*/ "got 'points' is not wanted 'points'");
|
|
|
|
|
|
if(aligned && (r->before % group) != 0)
|
|
|
- rrd2rrdr_log_request_response_metdata(r, group_method, aligned, group, resampling_time_requested, resampling_group, after_wanted, after_requested, before_wanted, before_requested, points_requested, points_wanted, /*after_slot, before_slot,*/ "'before' is not aligned but alignment is required");
|
|
|
+ rrd2rrdr_log_request_response_metadata(r, group_method, aligned, group, resampling_time_requested, resampling_group, after_wanted, after_requested, before_wanted, before_requested, points_requested, points_wanted, /*after_slot, before_slot,*/ "'before' is not aligned but alignment is required");
|
|
|
|
|
|
// 'after' should not be aligned, since we start inside the first group
|
|
|
//if(aligned && (r->after % group) != 0)
|
|
|
- // rrd2rrdr_log_request_response_metdata(r, group_method, aligned, group, resampling_time_requested, resampling_group, after_wanted, after_requested, before_wanted, before_requested, points_requested, points_wanted, after_slot, before_slot, "'after' is not aligned but alignment is required");
|
|
|
+ // rrd2rrdr_log_request_response_metadata(r, group_method, aligned, group, resampling_time_requested, resampling_group, after_wanted, after_requested, before_wanted, before_requested, points_requested, points_wanted, after_slot, before_slot, "'after' is not aligned but alignment is required");
|
|
|
|
|
|
if(r->before != before_requested)
|
|
|
- rrd2rrdr_log_request_response_metdata(r, group_method, aligned, group, resampling_time_requested, resampling_group, after_wanted, after_requested, before_wanted, before_requested, points_requested, points_wanted, /*after_slot, before_slot,*/ "chart is not aligned to requested 'before'");
|
|
|
+ rrd2rrdr_log_request_response_metadata(r, group_method, aligned, group, resampling_time_requested, resampling_group, after_wanted, after_requested, before_wanted, before_requested, points_requested, points_wanted, /*after_slot, before_slot,*/ "chart is not aligned to requested 'before'");
|
|
|
|
|
|
if(r->before != before_wanted)
|
|
|
- rrd2rrdr_log_request_response_metdata(r, group_method, aligned, group, resampling_time_requested, resampling_group, after_wanted, after_requested, before_wanted, before_requested, points_requested, points_wanted, /*after_slot, before_slot,*/ "got 'before' is not wanted 'before'");
|
|
|
+ rrd2rrdr_log_request_response_metadata(r, group_method, aligned, group, resampling_time_requested, resampling_group, after_wanted, after_requested, before_wanted, before_requested, points_requested, points_wanted, /*after_slot, before_slot,*/ "got 'before' is not wanted 'before'");
|
|
|
|
|
|
// reported 'after' varies, depending on group
|
|
|
if(r->after != after_wanted)
|
|
|
- rrd2rrdr_log_request_response_metdata(r, group_method, aligned, group, resampling_time_requested, resampling_group, after_wanted, after_requested, before_wanted, before_requested, points_requested, points_wanted, /*after_slot, before_slot,*/ "got 'after' is not wanted 'after'");
|
|
|
+ rrd2rrdr_log_request_response_metadata(r, group_method, aligned, group, resampling_time_requested, resampling_group, after_wanted, after_requested, before_wanted, before_requested, points_requested, points_wanted, /*after_slot, before_slot,*/ "got 'after' is not wanted 'after'");
|
|
|
}
|
|
|
#endif
|
|
|
|