Merge tag 'upstream/1.3.0+dfsg'

Upstream version 1.3.0+dfsg

1 files changed, 20 insertions, 21 deletions

diff --git a/src/rrd2json.h b/src/rrd2json.h
index d1f850d4a..e3e5cb690 100644
--- a/src/rrd2json.h
+++ b/src/rrd2json.h
@@ -1,8 +1,3 @@
-#include <time.h>
-
-#include "web_buffer.h"
-#include "rrd.h"
-
 #ifndef NETDATA_RRD2JSON_H
 #define NETDATA_RRD2JSON_H 1
 
@@ -35,22 +30,26 @@ extern char *hostname;
 #define DATASOURCE_FORMAT_SSV_COMMA "ssvcomma"
 #define DATASOURCE_FORMAT_CSV_JSON_ARRAY "csvjsonarray"
 
-#define GROUP_AVERAGE	0
-#define GROUP_MAX 		1
-#define GROUP_SUM		2
+#define GROUP_UNDEFINED         0
+#define GROUP_AVERAGE           1
+#define GROUP_MIN               2
+#define GROUP_MAX               3
+#define GROUP_SUM               4
+#define GROUP_INCREMENTAL_SUM   5
 
-#define RRDR_OPTION_NONZERO 		0x00000001 // don't output dimensions will just zero values
-#define RRDR_OPTION_REVERSED		0x00000002 // output the rows in reverse order (oldest to newest)
-#define RRDR_OPTION_ABSOLUTE 		0x00000004 // values positive, for DATASOURCE_SSV before summing
-#define RRDR_OPTION_MIN2MAX	 		0x00000008 // for DATASOURCE_SSV, out max - min, instead of sum
-#define RRDR_OPTION_SECONDS			0x00000010 // output seconds, instead of dates
-#define RRDR_OPTION_MILLISECONDS	0x00000020 // output milliseconds, instead of dates
-#define RRDR_OPTION_NULL2ZERO		0x00000040 // do not show nulls, convert them to zeros
-#define RRDR_OPTION_OBJECTSROWS		0x00000080 // each row of values should be an object, not an array
-#define RRDR_OPTION_GOOGLE_JSON		0x00000100 // comply with google JSON/JSONP specs
-#define RRDR_OPTION_JSON_WRAP		0x00000200 // wrap the response in a JSON header with info about the result
-#define RRDR_OPTION_LABEL_QUOTES 	0x00000400 // in CSV output, wrap header labels in double quotes
-#define RRDR_OPTION_PERCENTAGE		0x00000800 // give values as percentage of total
+#define RRDR_OPTION_NONZERO         0x00000001 // don't output dimensions will just zero values
+#define RRDR_OPTION_REVERSED        0x00000002 // output the rows in reverse order (oldest to newest)
+#define RRDR_OPTION_ABSOLUTE        0x00000004 // values positive, for DATASOURCE_SSV before summing
+#define RRDR_OPTION_MIN2MAX         0x00000008 // when adding dimensions, use max - min, instead of sum
+#define RRDR_OPTION_SECONDS         0x00000010 // output seconds, instead of dates
+#define RRDR_OPTION_MILLISECONDS    0x00000020 // output milliseconds, instead of dates
+#define RRDR_OPTION_NULL2ZERO       0x00000040 // do not show nulls, convert them to zeros
+#define RRDR_OPTION_OBJECTSROWS     0x00000080 // each row of values should be an object, not an array
+#define RRDR_OPTION_GOOGLE_JSON     0x00000100 // comply with google JSON/JSONP specs
+#define RRDR_OPTION_JSON_WRAP       0x00000200 // wrap the response in a JSON header with info about the result
+#define RRDR_OPTION_LABEL_QUOTES    0x00000400 // in CSV output, wrap header labels in double quotes
+#define RRDR_OPTION_PERCENTAGE      0x00000800 // give values as percentage of total
+#define RRDR_OPTION_NOT_ALIGNED     0x00001000 // do not align charts for persistant timeframes
 
 extern void rrd_stats_api_v1_chart(RRDSET *st, BUFFER *wb);
 extern void rrd_stats_api_v1_charts(BUFFER *wb);
@@ -64,6 +63,6 @@ extern void rrd_stats_all_json(BUFFER *wb);
 extern time_t rrd_stats_json(int type, RRDSET *st, BUFFER *wb, long entries_to_show, long group, int group_method, time_t after, time_t before, int only_non_zero);
 
 extern int rrd2format(RRDSET *st, BUFFER *out, BUFFER *dimensions, uint32_t format, long points, long long after, long long before, int group_method, uint32_t options, time_t *latest_timestamp);
-
+extern int rrd2value(RRDSET *st, BUFFER *wb, calculated_number *n, const char *dimensions, long points, long long after, long long before, int group_method, uint32_t options, time_t *db_before, time_t *db_after, int *value_is_null);
 
 #endif /* NETDATA_RRD2JSON_H */