Changeset f921b22e683e77376b8ad3a675d5a9a20e92e912

Timestamp:

05/22/08 17:45:35 (5 years ago)

Author:

Theo Schlossnagle <jesus@omniti.com>

git-committer:

Theo Schlossnagle <jesus@omniti.com> 1211478335 +0000

git-parent:

[fc879b8ebfb9f5de9e38c553a69f55837e32a394]

git-author:

Theo Schlossnagle <jesus@omniti.com> 1211478335 +0000

Message:

implements filter sets, fixes #24

Files:

• src/Makefile.in (modified) (1 diff)
• src/noit.conf (modified) (2 diffs)
• src/noit_check.c (modified) (8 diffs)
• src/noit_check.h (modified) (3 diffs)
• src/noit_check_log.c (modified) (2 diffs)
• src/noit_conf_checks.c (modified) (5 diffs)
• src/noit_filters.c (added)
• src/noit_filters.h (added)
• src/noitd.c (modified) (2 diffs)

src/Makefile.in

@@ -30 +30 @@
-        noit_check.o noit_check_log.o noit_check_tools.o \
-        noit_module.o noit_conf.o noit_conf_checks.o noit_tokenizer.o \
-
+ noit_filters.o
-
-STRATCON_OBJS=stratcond.o noit_listener.o \

src/noit.conf

@@ -73 +73 @@
-    </listener>
-  </listeners>
-
+ filterset="default"
-    <check uuid="1b4e28ba-2fa1-11d2-883f-b9b761bde3fb" module="ping_icmp" target="10.80.116.4" period="15000" timeout="14000"/>
-    <dc1 timeout="5000" period="60000">
@@ -122 +122 @@
-    <check uuid="002d58ff-20ff-4db0-9420-782fc1748dc4" module="ssh2" target="10.80.117.2" period="60000" timeout="4000"/>
-  </checks>
+  <filtersets>
+    <filterset name="default">
+      <rule type="deny" module="^ping_icmp$" metric="^(?:minimum|maximum|count)$" />
+    </filterset>
+  </filtersets>
-  <config_templates>
-    <config id="SwitchPort">

src/noit_check.c

@@ -100 +100 @@
-    char module[256];
-    char name[256];
+    char filterset[256];
-    char oncheck[1024] = "";
-    int no_period = 0;
@@ -131 +132 @@
-      busted = noit_true;
-    }
+
+    if(!INHERIT(stringbuf, filterset, filterset, sizeof(filterset)))
+      filterset[0] = '\0';
-
-    if(!MYATTR(stringbuf, name, name, sizeof(name)))
@@ -176 +180 @@
-        existing_check->module = strdup(module);
-      }
-
+filterset, 
-                           period, timeout, oncheck[0] ? oncheck : NULL,
-                           flags);
@@ -182 +186 @@
-    }
-    else {
-
+filterset, 
-                           period, timeout, oncheck[0] ? oncheck : NULL,
-                           flags, uuid, out_uuid);
@@ -326 +330 @@
-                  const char *target,
-                  const char *name,
+                  const char *filterset,
-                  noit_hash_table *config,
-                  u_int32_t period,
@@ -359 +364 @@
-  if(new_check->name) free(new_check->name);
-  new_check->name = name ? strdup(name): NULL;
+  if(new_check->filterset) free(new_check->filterset);
+  new_check->filterset = filterset ? strdup(filterset): NULL;
-
-  if(config != NULL) {
@@ -396 +403 @@
-                     const char *module,
-                     const char *name,
+                     const char *filterset,
-                     noit_hash_table *config,
-                     u_int32_t period,
@@ -414 +422 @@
-    uuid_copy(new_check->checkid, in);
-
-
+filterset, 
-                    period, timeout, oncheck, flags);
-  assert(noit_hash_store(&polls,

src/noit_check.h

@@ -93 +93 @@
-  char *module;
-  char *name;
+  char *filterset;
-  noit_hash_table *config;
-  char *oncheck;               /* target`name of the check that fires us */
@@ -130 +131 @@
-                       const char *module,
-                       const char *name,
+                       const char *filterset,
-                       noit_hash_table *config,
-                       u_int32_t period,
@@ -142 +144 @@
-                    const char *target,
-                    const char *name,
+                    const char *filterset,
-                    noit_hash_table *config,
-                    u_int32_t period,

src/noit_check_log.c

@@ -10 +10 @@
-
-#include "noit_check.h"
+#include "noit_filters.h"
-#include "utils/noit_log.h"
-#include "jlog/jlog.h"
@@ -69 +70 @@
-  c = &check->stats.current;
-  while(noit_hash_next(&c->metrics, &iter, &key, &klen, (void **)&m)) {
+    /* If we apply the filter set and it returns false, we don't log */
+    if(!noit_apply_filterset(check->filterset, check, m)) continue;
+
-    if(!m->metric_value.s) { /* they are all null */
-      noitL(metrics_log, "M\t%lu.%03lu\t%s\t%s\t%c\t[[null]]\n",

src/noit_conf_checks.c

@@ -19 +19 @@
-#include "noit_conf_private.h"
-#include "noit_check.h"
+#include "noit_filters.h"
-#include "noit_console.h"
-#include "utils/noit_hash.h"
@@ -40 +41 @@
-  { "/checks", "oncheck", "@oncheck", 0 },
-  { "/checks", "disable", "@disable", 0 },
+  { "/checks", "filterset", "@filterset", 0 },
-  { "/checks", "module", "@module", 1 },
+  { "/filtersets/filterset", "target", "@target", 1 },
+  { "/filtersets/filterset", "module", "@module", 1 },
+  { "/filtersets/filterset", "name", "@name", 1 },
+  { "/filtersets/filterset", "metric", "@metric", 1 },
-};
-
@@ -377 +383 @@
-    SHOW_ATTR(timeout);
-    SHOW_ATTR(oncheck);
+    SHOW_ATTR(filterset);
-    SHOW_ATTR(disable);
-    /* Print out all the config settings */
@@ -1072 +1079 @@
-   * that are descendent-or-self of this node.
-   */
-
+
+
+
+
-  return 0;
-}
@@ -1104 +1114 @@
-   * that are descendent-or-self of this node.
-   */
-
+
+
+
+
-  return 0;
-}

src/noitd.c

@@ -17 +17 @@
-#include "noit_conf.h"
-#include "noit_conf_checks.h"
+#include "noit_filters.h"
-
-#define APPNAME "noit"
@@ -105 +106 @@
-
-  noit_module_init();
+  noit_filters_init();
-  noit_poller_init();
-  noit_listener_init(APPNAME);