FIX: threshold expert: configure timeout using Redis cache mixin

When the Redis cache functionality was moved to a mixin, the code that
set the cache timeout from the "timeout" parameter was removed, but
the error checking and documentation remained. Change documentation and
configuration checking code to refer to the standard redis_cache_ttl
parameter instead.

Also remove some redundant default values which are now set in the
cache mixin.

Fixes: 2a1b126 ("FIX: Use CacheMixins instead of lib.cache")

Signed-off-by: Karl-Johan Karlsson <[email protected]>

Author: creideiki

docs/user/bots.rst

@@ -3206,7 +3206,6 @@ Threshold
 
 * `filter_keys`: String, comma-separated list of field names to consider or ignore when determining which messages are similar.
 * `filter_type`: String, `whitelist` (consider only the fields in `filter_keys`) or `blacklist` (consider everything but the fields in `filter_keys`).
-* `timeout`: Integer, number of seconds before threshold counter is reset.
 * `threshold`: Integer, number of messages required before propagating one. In forwarded messages, the threshold is saved in the message as `extra.count`.
 * `add_keys`: Array of string->string, optional, fields and values to add (or update) to propagated messages. Example:
 

intelmq/bots/experts/threshold/expert.py

@@ -20,6 +20,9 @@
 
     redis_cache_password: string.  default: {None}
 
+    redis_cache_ttl: int, number of seconds to keep counts of similar
+                     messages.
+
     filter_type: string ["whitelist", "blacklist"], when determining
                  whether two messages are similar, consider either
                  only the named fields, or all but the named fields
@@ -35,11 +38,6 @@
                long as the count is above the threshold, no new
                messages will be sent.
 
-    timeout: int, number of seconds to keep counts of similar
-             messages. After this many seconds have elapsed, the count
-             is deleted and "threshold" number of new messages will
-             result in a new message being sent.
-
     add_keys: optional, array of strings to strings, keys to add to
               forwarded messages. Regardless of this setting, the
               field "extra.count" will be set to the number of
@@ -59,19 +57,16 @@ class ThresholdExpertBot(ExpertBot, CacheMixin):
     filter_keys: Iterable = ["raw", "time.observation"]
     filter_type: str = "blacklist"
     redis_cache_db: int = 11
-    redis_cache_host: str = "127.0.0.1"  # TODO: could be ipaddress
-    redis_cache_password: Optional[str] = None
-    redis_cache_port: int = 6379
+    redis_cache_ttl: int = 3600
     threshold: int = 100
-    timeout: int = 3600
 
     _message_processed_verb = 'Forwarded'
 
     _is_multithreadable = False
     bypass = False
 
     def init(self):
-        if self.timeout <= 0:
+        if self.redis_cache_ttl <= 0:
             raise ConfigurationError('Timeout', 'Invalid timeout specified, use positive integer seconds.')
         if self.threshold <= 0:
             raise ConfigurationError('Threshold', 'Invalid threshold specified, use positive integer count.')