more stats

2 files changed, 22 insertions, 8 deletions

diff --git a/src/plugins/stats/functions.c b/src/plugins/stats/functions.c
index 851d544b..5fc11442 100644
--- a/src/plugins/stats/functions.c
+++ b/src/plugins/stats/functions.c
@@ -127,16 +127,30 @@ static int getConnectedNodesStat(const void * closure,
   return OK;
 }
 
-static int getCPULoadStat(const void * closure,
+static int getLoadStat(const void * closure,
                           gfloat ** data) {
-  long long val;
+  long long valc;
+  long long valu;
+  long long vald;
 
-  if (OK != getStatValue(&val,
+  if (OK != getStatValue(&valc,
                          NULL,
                          NULL,
                         "% of allowed cpu load"))
     return SYSERR;
-  data[0][0] = (gfloat) val / 100.0;
+  if (OK != getStatValue(&valu,
+                         NULL,
+                         NULL,
+                        "% of allowed network load (up)"))
+    return SYSERR;
+  if (OK != getStatValue(&vald,
+                         NULL,
+                         NULL,
+                        "% of allowed network load (down)"))
+    return SYSERR;
+  data[0][0] = (gfloat) valc / 100.0;
+  data[0][1] = (gfloat) valu / 100.0;
+  data[0][2] = (gfloat) vald / 100.0;
   return OK;
 }
 
@@ -479,9 +493,9 @@ StatEntry stats[] = {
     NO,
   },
   {
-    gettext_noop("CPU load"),
-    gettext_noop("CPU load (in percent of allowed load)"),
-    &getCPULoadStat,
+    gettext_noop("System load"),
+    gettext_noop("CPU load (red), Network upload (green), Network download (yellow)"),
+    &getLoadStat,
     NULL,
     1,
     NO,
diff --git a/src/plugins/stats/statistics.c b/src/plugins/stats/statistics.c
index d9c17495..7e22d284 100644
--- a/src/plugins/stats/statistics.c
+++ b/src/plugins/stats/statistics.c
@@ -441,7 +441,7 @@ void init_stats(struct GE_Context * ectx,
                                     "STATS-INTERVAL",
                                     1,
                                     99 * cronYEARS,
-                                    30 * cronSECONDS,
+                                    3 * cronSECONDS,
                                     &UPDATE_INTERVAL);
   init_functions(ectx,
                  cfg);