Fix %s/%S unit autoscaling in gprint for json/xml

diff --git a/src/rrd_graph.c b/src/rrd_graph.c
index bf8ffde89abc8bc911cb839c8b9611f8cc6caaf6..39c7fc4f179f67ee41d889c3549f37bd8101e987 100644 (file)
--- a/src/rrd_graph.c
+++ b/src/rrd_graph.c
@@ -5603,7 +5603,7 @@ int bad_format_axis(char *fmt){
 }
 
 int bad_format_print(char *fmt){
-    return bad_format_check("^" SAFE_STRING FLOAT_STRING SAFE_STRING "(?:%s)?" SAFE_STRING "$",fmt);
+    return bad_format_check("^" SAFE_STRING FLOAT_STRING SAFE_STRING "(?:%[sS])?" SAFE_STRING "$",fmt);
 }
 
 int vdef_parse(

diff --git a/src/rrd_xport.c b/src/rrd_xport.c
index f569784ecdb7da3afc24843773be7d3f3ad27ec8..22193f6bd1e744a63fa15da1248f4703d1a6b3b4 100644 (file)
--- a/src/rrd_xport.c
+++ b/src/rrd_xport.c
@@ -999,7 +999,8 @@ static int rrd_xport_format_addprints(
     stringbuffer_t gprints = { 4096, 0, NULL, NULL };
     char      buf[256];
     char      dbuf[1024];
-    char     *val;
+    double    magfact = -1; /* for unit autoscaling, see %s and %S */
+    char     *val, *si_symb = "";
     char     *timefmt = NULL;
 
     if (im->xlab_user.minsec != -1.0) {
@@ -1108,8 +1109,28 @@ static int rrd_xport_format_addprints(
                     ("bad format for PRINT in \"%s'", im->gdes[i].format);
                 return -1;
             } else {
+                char     *percent_s;
+
+                /* unit autoscaling for %S and %s, logic copied from rrd_graph.c */
+                if ((percent_s = strstr(im->gdes[i].format, "%S")) != NULL) {
+                    /* Magfact is set to -1 upon function entry. If it
+                     * is still less than 0, then we need to run auto_scale.
+                     * Otherwise, put the value into the correct units. If
+                     * the value is 0, then do not set the symbol or magnification
+                     * so next the calculation will be performed again. */
+                    if (magfact < 0.0) {
+                        auto_scale(im, &printval, &si_symb, &magfact);
+                        if (printval == 0.0)
+                            magfact = -1.0;
+                    } else {
+                        printval /= magfact;
+                    }
+                    *(++percent_s) = 's';
+                } else if (strstr(im->gdes[i].format, "%s") != NULL) {
+                    auto_scale(im, &printval, &si_symb, &magfact);
+                }
                 rrd_snprintf(dbuf, sizeof(dbuf), im->gdes[i].format, printval,
-                             "");
+                             si_symb);
             }
             /* print */
             if (json) {