add #defines for custom fields

kentik · Nov 22, 2016 · 0454038 · 0454038
1 parent 09adee4
commit 0454038
Show file tree

Hide file tree

Showing 3 changed files with 37 additions and 7 deletions.
diff --git a/demo.c b/demo.c
@@ -24,10 +24,10 @@ int main(int argc, char **argv) {
         exit(1);
     };
 
+    char *url = "http://foo.com";
     kflowCustom customs[] = {
-        { .name = "CUSTOM-STR", .vtype = KFLOWCUSTOMSTR, .value.str = &"foo"[0] },
-        { .name = "CUSTOM-U32", .vtype = KFLOWCUSTOMU32, .value.u32 = 42        },
-        { .name = "CUSTOM-F32", .vtype = KFLOWCUSTOMF32, .value.f32 = 3.14      },
+        { .name = KFLOWCUSTOM_HTTP_URL,    .vtype = KFLOWCUSTOMSTR, .value.str = url },
+        { .name = KFLOWCUSTOM_HTTP_STATUS, .vtype = KFLOWCUSTOMU32, .value.u32 = 200 },
     };
     uint32_t numCustoms = sizeof(customs) / sizeof(kflowCustom);
 

diff --git a/src/github.com/kentik/libkflow/cmd/server/main.go b/src/github.com/kentik/libkflow/cmd/server/main.go
@@ -30,9 +30,21 @@ func main() {
 		DeviceID:   1,
 		DeviceName: "dev1",
 		Customs: map[string]uint64{
-			"CUSTOM-STR": 1,
-			"CUSTOM-U32": 2,
-			"CUSTOM-F32": 3,
+			"RETRANSMITTED_IN_PKTS":  1,
+			"RETRANSMITTED_OUT_PKTS": 2,
+			"FRAGMENTS":              3,
+			"CLIENT_NW_LATENCY_MS":   4,
+			"SERVER_NW_LATENCY_MS":   5,
+			"APPL_LATENCY_MS":        6,
+			"OOORDER_IN_PKTS":        7,
+			"OOORDER_OUT_PKTS":       8,
+			"KFLOW_HTTP_URL":         9,
+			"KFLOW_HTTP_STATUS":      10,
+			"KFLOW_HTTP_UA":          11,
+			"KFLOW_HTTP_REFERER":     12,
+			"KFLOW_DNS_QUERY":        13,
+			"KFLOW_DNS_QUERY_TYPE":   14,
+			"KFLOW_DNS_RET_CODE":     15,
 		},
 	}
 

diff --git a/src/github.com/kentik/libkflow/kflow.h b/src/github.com/kentik/libkflow/kflow.h
@@ -34,7 +34,25 @@ typedef struct {
     } value;                     // field value
 } kflowCustom;
 
-// custom value types:
+// kflow custom field names:
+
+#define KFLOWCUSTOM_RETRANSMITTED_IN_PKTS   "RETRANSMITTED_IN_PKTS"
+#define KFLOWCUSTOM_RETRANSMITTED_OUT_PKTS  "RETRANSMITTED_OUT_PKTS"
+#define KFLOWCUSTOM_FRAGMENTS               "FRAGMENTS"
+#define KFLOWCUSTOM_CLIENT_NW_LATENCY_MS    "CLIENT_NW_LATENCY_MS"
+#define KFLOWCUSTOM_SERVER_NW_LATENCY_MS    "SERVER_NW_LATENCY_MS"
+#define KFLOWCUSTOM_APPL_LATENCY_MS         "APPL_LATENCY_MS"
+#define KFLOWCUSTOM_OOORDER_IN_PKTS         "OOORDER_IN_PKTS"
+#define KFLOWCUSTOM_OOORDER_OUT_PKTS        "OOORDER_OUT_PKTS"
+#define KFLOWCUSTOM_HTTP_URL                "KFLOW_HTTP_URL"
+#define KFLOWCUSTOM_HTTP_STATUS             "KFLOW_HTTP_STATUS"
+#define KFLOWCUSTOM_HTTP_UA                 "KFLOW_HTTP_UA"
+#define KFLOWCUSTOM_HTTP_REFERER            "KFLOW_HTTP_REFERER"
+#define KFLOWCUSTOM_DNS_QUERY               "KFLOW_DNS_QUERY"
+#define KFLOWCUSTOM_DNS_QUERY_TYPE          "KFLOW_DNS_QUERY_TYPE"
+#define KFLOWCUSTOM_DNS_RET_CODE            "KFLOW_DNS_RET_CODE"
+
+// kflow custom field value types:
 
 #define KFLOWCUSTOMSTR 1
 #define KFLOWCUSTOMU32 2