Changeset 529ead1224b4f4c376941c9b2091f1c4200e2cba

Timestamp:

11/16/11 16:42:48 (2 years ago)

Author:

Theo Schlossnagle <jesus@omniti.com>

git-committer:

Theo Schlossnagle <jesus@omniti.com> 1321461768 -0500

git-parent:

[7e10f7cd6a31e714c883c3b0f528f09b004a2d9f]

git-author:

Theo Schlossnagle <jesus@omniti.com> 1321461768 -0500

Message:

add an uptime metric to the internal stratcond metrics

Files:

• src/stratcon_jlog_streamer.c (modified) (4 diffs)
• test/t/108_noit_strat.t (modified) (1 diff)
• test/t/testconfig.pm (modified) (1 diff)

src/stratcon_jlog_streamer.c

@@ -1133 +1133 @@
-  char str[1024];
-  char uuid_str[UUID_STR_LEN+1];
+  struct timeval epoch, diff;
+  u_int64_t uptime = 0;
-
-  uuid_unparse_lower(self_stratcon_id, uuid_str);
+
+#define PUSH_BOTH(type, str) do { \
+  stratcon_datastore_push(type, \
+                          (struct sockaddr *)&self_stratcon_ip, \
+                          self_stratcon_hostname, str, NULL); \
+  stratcon_iep_line_processor(type, \
+                              (struct sockaddr *)&self_stratcon_ip, \
+                              self_stratcon_hostname, str, NULL); \
+} while(0)
-
-  if(closure == NULL) {
@@ -1145 +1156 @@
-             (long unsigned int)now->tv_usec/1000UL, uuid_str, ip_str,
-             self_stratcon_hostname);
-
-
-
-
-
-
+
-  }
-
@@ -1163 +1169 @@
-  pthread_mutex_unlock(&noits_lock);
-
-
+ %d noits
-           (long unsigned int)now->tv_sec,
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-  for(i=0; i<n; i++) {
-    emit_noit_info_metrics(now, uuid_str, ctxs[i]);
@@ -1177 +1190 @@
-  }
-  free(ctxs);
-
-
-
-
-
-
+
-
-  add_timeval(e->whence, whence, &whence);

test/t/108_noit_strat.t

@@ -18 +18 @@
-  { id => '52f1f2ec-0275-11e0-a846-b757d1de0f4a',
-    topic => 'numeric',
-'select * from NoitMetricNumeric as r'
+"select * from NoitMetricNumeric(check_module='selfcheck') as r"
-  },
-  { id => '8f04d54c-0275-11e0-b62c-6fdd90cb8bde',

test/t/testconfig.pm

@@ -485 +485 @@
-  open (my $o, ">$file") || BAIL_OUT("can't write config: $file");
-  print $o qq{<?xml version="1.0" encoding="utf8" standalone="yes"?>\n};
-
+ id="8325581c-1068-11e1-ac63-db8546d81c8b" metric_period="1000"
-  make_eventer_config($o, $options);
-  make_rest_acls($o, $options);