X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=src%2Fwrite_riemann.c;h=78f01c05e51da1d45fcdfe5e209008a184d83ec5;hb=480d66bbe1970d6cbb68765878f2ee6187bbd5b2;hp=2875a0177240d3d8219002d69298b82bee4666a3;hpb=639f00e946bb3182688661a99119aa5f5d6c81b6;p=collectd.git

diff --git a/src/write_riemann.c b/src/write_riemann.c
index 2875a017..78f01c05 100644
--- a/src/write_riemann.c
+++ b/src/write_riemann.c
@@ -1,20 +1,25 @@
 /**
  * collectd - src/write_riemann.c
- *
  * Copyright (C) 2012,2013  Pierre-Yves Ritschard
  * Copyright (C) 2013       Florian octo Forster
  *
- * Permission to use, copy, modify, and distribute this software for any
- * purpose with or without fee is hereby granted, provided that the above
- * copyright notice and this permission notice appear in all copies.
+ * Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of this software and associated documentation files (the "Software"),
+ * to deal in the Software without restriction, including without limitation
+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
  *
- * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
- * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
- * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
- * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
- * WHATSOEVER RESULTING FROM LOSS OF MIND, USE, DATA OR PROFITS, WHETHER
- * IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING
- * OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+ * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
+ * DEALINGS IN THE SOFTWARE.
  *
  * Authors:
  *   Pierre-Yves Ritschard <pyr at spootnik.org>
@@ -47,6 +52,7 @@ struct riemann_host {
 	uint8_t			 flags;
 	pthread_mutex_t		 lock;
     _Bool            notifications;
+    _Bool            check_thresholds;
 	_Bool			 store_rates;
 	_Bool			 always_append_ds;
 	char			*node;
@@ -153,7 +159,7 @@ static int riemann_connect(struct riemann_host *host) /* {{{ */
 		}
 
 		host->flags |= F_CONNECT;
-		DEBUG("write_riemann plugin: got a succesful connection for: %s:%s",
+		DEBUG("write_riemann plugin: got a successful connection for: %s:%s",
 				node, service);
 		break;
 	}
@@ -478,20 +484,22 @@ static Event *riemann_value_to_protobuf (struct riemann_host const *host, /* {{{
 	event->time = CDTIME_T_TO_TIME_T (vl->time);
 	event->has_time = 1;
 
-	switch (status) {
-	case STATE_OKAY:
-		event->state = strdup("ok");
-		break;
-	case STATE_ERROR:
-		event->state = strdup("critical");
-		break;
-	case STATE_WARNING:
-		event->state = strdup("warning");
-		break;
-	case STATE_MISSING:
-		event->state = strdup("unknown");
-		break;
-	}
+    if (host->check_thresholds) {
+        switch (status) {
+        case STATE_OKAY:
+            event->state = strdup("ok");
+            break;
+        case STATE_ERROR:
+            event->state = strdup("critical");
+            break;
+        case STATE_WARNING:
+            event->state = strdup("warning");
+            break;
+        case STATE_MISSING:
+            event->state = strdup("unknown");
+            break;
+        }
+    }
 
 	ttl = CDTIME_T_TO_DOUBLE (vl->interval) * host->ttl_factor;
 	event->ttl = (float) ttl;
@@ -662,7 +670,8 @@ static int riemann_write(const data_set_t *ds, /* {{{ */
 	struct riemann_host	*host = ud->data;
 	Msg			*msg;
 
-	write_riemann_threshold_check(ds, vl, statuses);
+    if (host->check_thresholds)
+        write_riemann_threshold_check(ds, vl, statuses);
 	msg = riemann_value_list_to_protobuf (host, ds, vl, statuses);
 	if (msg == NULL)
 		return (-1);
@@ -717,6 +726,7 @@ static int riemann_config_node(oconfig_item_t *ci) /* {{{ */
 	host->node = NULL;
 	host->service = NULL;
     host->notifications = 1;
+    host->check_thresholds = 0;
 	host->store_rates = 1;
 	host->always_append_ds = 0;
 	host->use_tcp = 0;
@@ -743,6 +753,10 @@ static int riemann_config_node(oconfig_item_t *ci) /* {{{ */
 				break;
         } else if (strcasecmp ("Notifications", child->key) == 0) {
             status = cf_util_get_boolean(child, &host->notifications);
+            if (status != 0)
+                break;
+        } else if (strcasecmp ("CheckThresholds", child->key) == 0) {
+            status = cf_util_get_boolean(child, &host->check_thresholds);
             if (status != 0)
                 break;
 		} else if (strcasecmp ("Port", child->key) == 0) {