added abs() function to expressions; added health.d/net.conf

diff --git a/conf.d/Makefile.am b/conf.d/Makefile.am
index 56510c3f421edc3f0642435a3abc2a6d67d48bdc..8ba4bcbce05595772ad08019aa61c44b01b09cb4 100644 (file)
--- a/conf.d/Makefile.am
+++ b/conf.d/Makefile.am
@@ -41,5 +41,6 @@ dist_pythonconfig_DATA = \
 
 healthconfigdir=$(configdir)/health.d
 dist_healthconfig_DATA = \
+       health.d/net.conf \
        health.d/disks.conf \
        $(NULL)

diff --git a/conf.d/health.d/net.conf b/conf.d/health.d/net.conf
new file mode 100644 (file)
index 0000000..25d54b1
--- /dev/null
+++ b/conf.d/health.d/net.conf
@@ -0,0 +1,22 @@
+
+# check if an interface is dropping packets
+# the alarm is checked every 10 seconds
+# and examines the last minute of data
+
+template: packet_drops_1m
+      on: net.drops
+  lookup: sum -1m unaligned absolute
+   every: 10s
+    crit: $this > 0
+
+
+# check if a QoS class is dropping packets
+# the alarm is checked every 10 seconds
+# and examines the last minute of data
+
+template: qos_packet_drops_1m
+      on: tc.qos_dropped
+  lookup: sum -1m unaligned absolute
+   every: 10s
+    crit: $this > 0
+

diff --git a/src/eval.c b/src/eval.c
index f84e4e0d0ce60f4fa501d8f09375fcf6e6cb2974..13744adebe0cf714a4e6dd59c52f02c33d1fbb4c 100644 (file)
--- a/src/eval.c
+++ b/src/eval.c
@@ -43,6 +43,7 @@ typedef struct eval_node {
 #define EVAL_OPERATOR_DIVIDE                '/'
 #define EVAL_OPERATOR_SIGN_PLUS             'P'
 #define EVAL_OPERATOR_SIGN_MINUS            'M'
+#define EVAL_OPERATOR_ABS                   'A'
 
 // ----------------------------------------------------------------------------
 // forward function definitions
@@ -171,36 +172,42 @@ calculated_number eval_sign_plus(EVAL_EXPRESSION *exp, EVAL_NODE *op, int *error
 calculated_number eval_sign_minus(EVAL_EXPRESSION *exp, EVAL_NODE *op, int *error) {
     return -eval_value(exp, &op->ops[0], error);
 }
+calculated_number eval_abs(EVAL_EXPRESSION *exp, EVAL_NODE *op, int *error) {
+    calculated_number n = eval_value(exp, &op->ops[0], error);
+    return abs(n);
+}
 
 static struct operator {
     const char *print_as;
     char precedence;
     char parameters;
+    char isfunction;
     calculated_number (*eval)(EVAL_EXPRESSION *exp, EVAL_NODE *op, int *error);
 } operators[256] = {
         // this is a random access array
         // we always access it with a known EVAL_OPERATOR_X
 
-        [EVAL_OPERATOR_AND]                   = { "&&", 2, 2, eval_and },
-        [EVAL_OPERATOR_OR]                    = { "||", 2, 2, eval_or },
-        [EVAL_OPERATOR_GREATER_THAN_OR_EQUAL] = { ">=", 3, 2, eval_greater_than_or_equal },
-        [EVAL_OPERATOR_LESS_THAN_OR_EQUAL]    = { "<=", 3, 2, eval_less_than_or_equal },
-        [EVAL_OPERATOR_NOT_EQUAL]             = { "!=", 3, 2, eval_not_equal },
-        [EVAL_OPERATOR_EQUAL]                 = { "==", 3, 2, eval_equal },
-        [EVAL_OPERATOR_LESS]                  = { "<",  3, 2, eval_less },
-        [EVAL_OPERATOR_GREATER]               = { ">",  3, 2, eval_greater },
-        [EVAL_OPERATOR_PLUS]                  = { "+",  4, 2, eval_plus },
-        [EVAL_OPERATOR_MINUS]                 = { "-",  4, 2, eval_minus },
-        [EVAL_OPERATOR_MULTIPLY]              = { "*",  5, 2, eval_multiply },
-        [EVAL_OPERATOR_DIVIDE]                = { "/",  5, 2, eval_divide },
-        [EVAL_OPERATOR_NOT]                   = { "!",  6, 1, eval_not },
-        [EVAL_OPERATOR_SIGN_PLUS]             = { "+",  6, 1, eval_sign_plus },
-        [EVAL_OPERATOR_SIGN_MINUS]            = { "-",  6, 1, eval_sign_minus },
-        [EVAL_OPERATOR_NOP]                   = { NULL, 7, 1, eval_nop },
-        [EVAL_OPERATOR_EXPRESSION_OPEN]       = { NULL, 7, 1, eval_nop },
+        [EVAL_OPERATOR_AND]                   = { "&&", 2, 2, 0, eval_and },
+        [EVAL_OPERATOR_OR]                    = { "||", 2, 2, 0, eval_or },
+        [EVAL_OPERATOR_GREATER_THAN_OR_EQUAL] = { ">=", 3, 2, 0, eval_greater_than_or_equal },
+        [EVAL_OPERATOR_LESS_THAN_OR_EQUAL]    = { "<=", 3, 2, 0, eval_less_than_or_equal },
+        [EVAL_OPERATOR_NOT_EQUAL]             = { "!=", 3, 2, 0, eval_not_equal },
+        [EVAL_OPERATOR_EQUAL]                 = { "==", 3, 2, 0, eval_equal },
+        [EVAL_OPERATOR_LESS]                  = { "<",  3, 2, 0, eval_less },
+        [EVAL_OPERATOR_GREATER]               = { ">",  3, 2, 0, eval_greater },
+        [EVAL_OPERATOR_PLUS]                  = { "+",  4, 2, 0, eval_plus },
+        [EVAL_OPERATOR_MINUS]                 = { "-",  4, 2, 0, eval_minus },
+        [EVAL_OPERATOR_MULTIPLY]              = { "*",  5, 2, 0, eval_multiply },
+        [EVAL_OPERATOR_DIVIDE]                = { "/",  5, 2, 0, eval_divide },
+        [EVAL_OPERATOR_NOT]                   = { "!",  6, 1, 0, eval_not },
+        [EVAL_OPERATOR_SIGN_PLUS]             = { "+",  6, 1, 0, eval_sign_plus },
+        [EVAL_OPERATOR_SIGN_MINUS]            = { "-",  6, 1, 0, eval_sign_minus },
+        [EVAL_OPERATOR_ABS]                   = { "abs(",6,1, 1, eval_abs },
+        [EVAL_OPERATOR_NOP]                   = { NULL, 7, 1, 0, eval_nop },
+        [EVAL_OPERATOR_EXPRESSION_OPEN]       = { NULL, 7, 1, 0, eval_nop },
 
         // this should exist in our evaluation list
-        [EVAL_OPERATOR_EXPRESSION_CLOSE]      = { NULL, 7, 1, eval_nop }
+        [EVAL_OPERATOR_EXPRESSION_CLOSE]      = { NULL, 7, 1, 0, eval_nop }
 };
 
 #define eval_precedence(operator) (operators[(unsigned char)(operator)].precedence)
@@ -301,6 +308,9 @@ static inline void print_parsed_as_node(BUFFER *out, EVAL_NODE *op, int *error)
         print_parsed_as_value(out, &op->ops[1], error);
         buffer_strcat(out, ")");
     }
+
+    if(operators[op->operator].isfunction)
+        buffer_strcat(out, ")");
 }
 
 // ----------------------------------------------------------------------------
@@ -537,10 +547,12 @@ static inline int parse_open_subexpression(const char **string) {
     return 0;
 }
 
+#define parse_close_function(x) parse_close_subexpression(x)
+
 static inline int parse_close_subexpression(const char **string) {
     const char *s = *string;
 
-    // (
+    // )
     if(s[0] == ')') {
         *string = &s[1];
         return 1;
@@ -583,6 +595,18 @@ static inline int parse_constant(const char **string, calculated_number *number)
     return 1;
 }
 
+static inline int parse_abs(const char **string) {
+    const char *s = *string;
+
+    // ABS
+    if((s[0] == 'A' || s[0] == 'a') && (s[1] == 'B' || s[1] == 'b') && (s[2] == 'S' || s[2] == 's') && s[3] == '(') {
+        *string = &s[3];
+        return 1;
+    }
+
+    return 0;
+}
+
 static struct operator_parser {
     unsigned char id;
     int (*parse)(const char **);
@@ -742,6 +766,10 @@ static inline EVAL_NODE *parse_one_full_operand(const char **string, int *error)
         op1 = parse_next_operand_given_its_operator(string, EVAL_OPERATOR_SIGN_MINUS, error);
         op1->precedence = eval_precedence(EVAL_OPERATOR_SIGN_MINUS);
     }
+    else if(parse_abs(string)) {
+        op1 = parse_next_operand_given_its_operator(string, EVAL_OPERATOR_ABS, error);
+        op1->precedence = eval_precedence(EVAL_OPERATOR_ABS);
+    }
     else if(parse_open_subexpression(string)) {
         EVAL_NODE *sub = parse_full_expression(string, error);
         if(sub) {

diff --git a/src/eval.h b/src/eval.h
index 0b174a20831a9841ba6604c218c0769233b10113..c1f049ce402d0953f1dc2f4ff35b32768ec775ac 100644 (file)
--- a/src/eval.h
+++ b/src/eval.h
@@ -27,26 +27,27 @@ typedef struct eval_expression {
     struct rrdcalc *rrdcalc;
 } EVAL_EXPRESSION;
 
-#define EVAL_VALUE_INVALID 0
-#define EVAL_VALUE_NUMBER 1
-#define EVAL_VALUE_VARIABLE 2
+#define EVAL_VALUE_INVALID    0
+#define EVAL_VALUE_NUMBER     1
+#define EVAL_VALUE_VARIABLE   2
 #define EVAL_VALUE_EXPRESSION 3
 
-#define EVAL_ERROR_OK 0
+// parsing and evaluation
+#define EVAL_ERROR_OK                             0
 
 // parsing errors
-#define EVAL_ERROR_MISSING_CLOSE_SUBEXPRESSION 1
-#define EVAL_ERROR_UNKNOWN_OPERAND 2
-#define EVAL_ERROR_MISSING_OPERAND 3
-#define EVAL_ERROR_MISSING_OPERATOR 4
-#define EVAL_ERROR_REMAINING_GARBAGE 5
+#define EVAL_ERROR_MISSING_CLOSE_SUBEXPRESSION    1
+#define EVAL_ERROR_UNKNOWN_OPERAND                2
+#define EVAL_ERROR_MISSING_OPERAND                3
+#define EVAL_ERROR_MISSING_OPERATOR               4
+#define EVAL_ERROR_REMAINING_GARBAGE              5
 
 // evaluation errors
-#define EVAL_ERROR_INVALID_VALUE 11
-#define EVAL_ERROR_INVALID_NUMBER_OF_OPERANDS 12
-#define EVAL_ERROR_VALUE_IS_NAN 13
-#define EVAL_ERROR_VALUE_IS_INFINITE 14
-#define EVAL_ERROR_UNKNOWN_VARIABLE 15
+#define EVAL_ERROR_INVALID_VALUE                101
+#define EVAL_ERROR_INVALID_NUMBER_OF_OPERANDS   102
+#define EVAL_ERROR_VALUE_IS_NAN                 103
+#define EVAL_ERROR_VALUE_IS_INFINITE            104
+#define EVAL_ERROR_UNKNOWN_VARIABLE             105
 
 // parse the given string as an expression and return:
 //   a pointer to an expression if it parsed OK