Add missing symbols.

1 files changed, 61 insertions, 16 deletions

diff --git a/conf/metrics.conf b/conf/metrics.conf
index 6cbeb8771..73092a750 100644
--- a/conf/metrics.conf
+++ b/conf/metrics.conf
@@ -322,8 +322,18 @@ metric {
     }
     symbol {
         weight = 1.0;
-        description = "Received headers contains addresses from RBL";
-        name = "RECEIVED_RBL";
+        description = "Received headers contains addresses from zen spamhaus RBL";
+        name = "RBL_ZEN";
+    }
+    symbol {
+        weight = 1.0;
+        description = "Received headers contains addresses from senderscore.com RBL";
+        name = "RBL_SENDERSCORE";
+    }
+    symbol {
+        weight = 1.0;
+        description = "Received headers contains addresses from mailspike.com RBL";
+        name = "RBL_MAILSPIKE";
     }
     symbol {
         weight = 3.0;
@@ -397,46 +407,56 @@ metric {
     }
     symbol {
         weight = 1.0;
-        description = "";
+        description = "Generic fuzzy hash match";
         name = "R_FUZZY";
     }
     symbol {
         weight = 1.0;
-        description = "";
-        name = "R_FUZZY1";
+        description = "Denied fuzzy hash";
+        name = "FUZZY_DENIED";
     }
     symbol {
         weight = 1.0;
-        description = "";
-        name = "R_FUZZY2";
+        description = "Probable fuzzy hash";
+        name = "FUZZY_PROB";
     }
     symbol {
         weight = 1.0;
-        description = "";
-        name = "R_FUZZY3";
+        description = "Whitelisted fuzzy hash";
+        name = "FUZZY_WHITE";
     }
     symbol {
-        weight = 3.0;
+        weight = 1.0;
         description = "SPF verification failed";
         name = "R_SPF_FAIL";
     }
     symbol {
-        weight = 1.0;
+        weight = 0.0;
         description = "SPF verification soft-failed";
         name = "R_SPF_SOFTFAIL";
     }
     symbol {
-        weight = -3.0;
+        weight = -1.1;
         description = "SPF verification alowed";
         name = "R_SPF_ALLOW";
     }
     symbol {
-        weight = -2.0;
-        description = "Whitelisted client's IP";
-        name = "WHITELIST_IP";
+        weight = 1.0;
+        description = "DKIM verification failed";
+        name = "R_DKIM_REJECT";
+    }
+    symbol {
+        weight = 0.0;
+        description = "SPF verification soft-failed";
+        name = "R_DKIM_TEMPFAIL";
+    }
+    symbol {
+        weight = -1.1;
+        description = "DKIM verification succeed";
+        name = "R_DKIM_ALLOW";
     }
     symbol {
-        weight = -2.0;
+        weight = -1.0;
         description = "Message seems to be from maillist";
         name = "MAILLIST";
     }
@@ -476,6 +496,21 @@ metric {
         name = "RAMBLER_URIBL";
     }
     symbol {
+        weight = 7.5;
+        description = "uribl.com black url";
+        name = "URIBL_BLACK";
+    }
+    symbol {
+        weight = 3.5;
+        description = "uribl.com red url";
+        name = "URIBL_RED";
+    }
+    symbol {
+        weight = 1.5;
+        description = "uribl.com grey url";
+        name = "URIBL_GREY";
+    }
+    symbol {
         weight = 9.500000;
         description = "rambler.ru emailbl";
         name = "RAMBLER_EMAILBL";
@@ -590,4 +625,14 @@ metric {
         description = "Invalid Exim Received";
         name = "INVALID_EXIM_RECEIVED2";
     }
+    symbol {
+        weight = 4.0;
+        description = "Message date is in future";
+        name = "DATE_IN_FUTURE";
+    }
+    symbol {
+        weight = 1.0;
+        description = "Message date is in past";
+        name = "DATE_IN_PAST";
+    }
 }