diff --git a/src/write_sensu.c b/src/write_sensu.c
index 3f146f3c51b9458c16266e6ad66350bd78540bb9..791acb307c54612f3e78de98f322f7c48e6b0458 100644 (file)
--- a/src/write_sensu.c
+++ b/src/write_sensu.c
int reference_count;
};
-static char *sensu_tags;
-static char **sensu_attrs;
+static char *sensu_tags = NULL;
+static char **sensu_attrs = NULL;
static size_t sensu_attrs_num;
-static const char *alloc_err ="write_sensu plugin: Unable to alloc memory";
static int add_str_to_list(struct str_list *strs,
const char *str_to_add) /* {{{ */
char **old_strs_ptr = strs->strs;
char *newstr = strdup(str_to_add);
if (newstr == NULL) {
- ERROR(alloc_err);
+ ERROR("write_sensu plugin: Unable to alloc memory");
return -1;
}
strs->strs = realloc(strs->strs, sizeof(char *) *(strs->nb_strs + 1));
if (strs->strs == NULL) {
strs->strs = old_strs_ptr;
free(newstr);
- ERROR(alloc_err);
+ ERROR("write_sensu plugin: Unable to alloc memory");
return -1;
}
strs->strs[strs->nb_strs] = newstr;
@@ -230,7 +229,7 @@ static char *build_json_str_list(const char *tag, struct str_list const *list) /
if (list->nb_strs == 0) {
ret_str = malloc(sizeof(char));
if (ret_str == NULL) {
- ERROR(alloc_err);
+ ERROR("write_sensu plugin: Unable to alloc memory");
return NULL;
}
ret_str[0] = '\0';
@@ -238,14 +237,14 @@ static char *build_json_str_list(const char *tag, struct str_list const *list) /
res = asprintf(&temp_str, "\"%s\": [\"%s\"", tag, list->strs[0]);
if (res == -1) {
- ERROR(alloc_err);
+ ERROR("write_sensu plugin: Unable to alloc memory");
return NULL;
}
for (i=1; i<list->nb_strs; i++) {
res = asprintf(&ret_str, "%s, \"%s\"", temp_str, list->strs[i]);
free(temp_str);
if (res == -1) {
- ERROR(alloc_err);
+ ERROR("write_sensu plugin: Unable to alloc memory");
return NULL;
}
temp_str = ret_str;
@@ -253,7 +252,7 @@ static char *build_json_str_list(const char *tag, struct str_list const *list) /
res = asprintf(&ret_str, "%s]", temp_str);
free(temp_str);
if (res == -1) {
- ERROR(alloc_err);
+ ERROR("write_sensu plugin: Unable to alloc memory");
return NULL;
}
{
char name_buffer[5 * DATA_MAX_NAME_LEN];
char service_buffer[6 * DATA_MAX_NAME_LEN];
- int i;
+ size_t i;
char *ret_str;
char *temp_str;
char *value_str;
char *handlers_str = build_json_str_list("handlers", &(host->metric_handlers));
if (handlers_str == NULL) {
- ERROR(alloc_err);
+ ERROR("write_sensu plugin: Unable to alloc memory");
return NULL;
}
free(handlers_str);
ret_str = strdup(part1);
if (ret_str == NULL) {
- ERROR(alloc_err);
+ ERROR("write_sensu plugin: Unable to alloc memory");
return NULL;
}
}
res = asprintf(&ret_str, "%s, %s", part1, handlers_str);
free(handlers_str);
if (res == -1) {
- ERROR(alloc_err);
+ ERROR("write_sensu plugin: Unable to alloc memory");
return NULL;
}
}
res = asprintf(&temp_str, "%s, \"collectd_plugin\": \"%s\"", ret_str, vl->plugin);
free(ret_str);
if (res == -1) {
- ERROR(alloc_err);
+ ERROR("write_sensu plugin: Unable to alloc memory");
return NULL;
}
ret_str = temp_str;
res = asprintf(&temp_str, "%s, \"collectd_plugin_type\": \"%s\"", ret_str, vl->type);
free(ret_str);
if (res == -1) {
- ERROR(alloc_err);
+ ERROR("write_sensu plugin: Unable to alloc memory");
return NULL;
}
ret_str = temp_str;
res = asprintf(&temp_str, "%s, \"collectd_plugin_instance\": \"%s\"", ret_str, vl->plugin_instance);
free(ret_str);
if (res == -1) {
- ERROR(alloc_err);
+ ERROR("write_sensu plugin: Unable to alloc memory");
return NULL;
}
ret_str = temp_str;
res = asprintf(&temp_str, "%s, \"collectd_plugin_type_instance\": \"%s\"", ret_str, vl->type_instance);
free(ret_str);
if (res == -1) {
- ERROR(alloc_err);
+ ERROR("write_sensu plugin: Unable to alloc memory");
return NULL;
}
ret_str = temp_str;
res = asprintf(&temp_str, "%s, \"collectd_data_source_type\": \"%s\"", ret_str, ds_type);
free(ret_str);
if (res == -1) {
- ERROR(alloc_err);
+ ERROR("write_sensu plugin: Unable to alloc memory");
return NULL;
}
ret_str = temp_str;
res = asprintf(&temp_str, "%s, \"collectd_data_source_type\": \"%s\"", ret_str, DS_TYPE_TO_STRING(ds->ds[index].type));
free(ret_str);
if (res == -1) {
- ERROR(alloc_err);
+ ERROR("write_sensu plugin: Unable to alloc memory");
return NULL;
}
ret_str = temp_str;
res = asprintf(&temp_str, "%s, \"collectd_data_source_name\": \"%s\"", ret_str, ds->ds[index].name);
free(ret_str);
if (res == -1) {
- ERROR(alloc_err);
+ ERROR("write_sensu plugin: Unable to alloc memory");
return NULL;
}
ret_str = temp_str;
res = asprintf(&temp_str, "%s, \"collectd_data_source_index\": %s", ret_str, ds_index);
free(ret_str);
if (res == -1) {
- ERROR(alloc_err);
+ ERROR("write_sensu plugin: Unable to alloc memory");
return NULL;
}
ret_str = temp_str;
res = asprintf(&temp_str, "%s, \"%s\": \"%s\"", ret_str, sensu_attrs[i], sensu_attrs[i+1]);
free(ret_str);
if (res == -1) {
- ERROR(alloc_err);
+ ERROR("write_sensu plugin: Unable to alloc memory");
return NULL;
}
ret_str = temp_str;
res = asprintf(&temp_str, "%s, %s", ret_str, sensu_tags);
free(ret_str);
if (res == -1) {
- ERROR(alloc_err);
+ ERROR("write_sensu plugin: Unable to alloc memory");
return NULL;
}
ret_str = temp_str;
// calculate the value and set to a string
if (ds->ds[index].type == DS_TYPE_GAUGE) {
- double tmp_v = (double) vl->values[index].gauge;
- res = asprintf(&value_str, "%.8f", tmp_v, sensu_tags);
+ res = asprintf(&value_str, GAUGE_FORMAT, vl->values[index].gauge);
if (res == -1) {
free(ret_str);
- ERROR(alloc_err);
+ ERROR("write_sensu plugin: Unable to alloc memory");
return NULL;
}
} else if (rates != NULL) {
- double tmp_v = (double) rates[index];
- res = asprintf(&value_str, "%.8f", tmp_v, sensu_tags);
+ res = asprintf(&value_str, GAUGE_FORMAT, rates[index]);
if (res == -1) {
free(ret_str);
- ERROR(alloc_err);
+ ERROR("write_sensu plugin: Unable to alloc memory");
return NULL;
}
} else {
- int64_t tmp_v;
- if (ds->ds[index].type == DS_TYPE_DERIVE)
- tmp_v = (int64_t) vl->values[index].derive;
- else if (ds->ds[index].type == DS_TYPE_ABSOLUTE)
- tmp_v = (int64_t) vl->values[index].absolute;
- else
- tmp_v = (int64_t) vl->values[index].counter;
- res = asprintf(&value_str, "%lld", tmp_v, sensu_tags);
- if (res == -1) {
- free(ret_str);
- ERROR(alloc_err);
- return NULL;
+ if (ds->ds[index].type == DS_TYPE_DERIVE) {
+ res = asprintf(&value_str, "%"PRIi64, vl->values[index].derive);
+ if (res == -1) {
+ free(ret_str);
+ ERROR("write_sensu plugin: Unable to alloc memory");
+ return NULL;
+ }
+ }
+ else if (ds->ds[index].type == DS_TYPE_ABSOLUTE) {
+ res = asprintf(&value_str, "%"PRIu64, vl->values[index].absolute);
+ if (res == -1) {
+ free(ret_str);
+ ERROR("write_sensu plugin: Unable to alloc memory");
+ return NULL;
+ }
+ }
+ else {
+ res = asprintf(&value_str, "%llu", vl->values[index].counter);
+ if (res == -1) {
+ free(ret_str);
+ ERROR("write_sensu plugin: Unable to alloc memory");
+ return NULL;
+ }
}
}
free(ret_str);
free(value_str);
if (res == -1) {
- ERROR(alloc_err);
+ ERROR("write_sensu plugin: Unable to alloc memory");
return NULL;
}
ret_str = temp_str;
const char *p, *q;
size_t oldlen = strlen(old);
size_t count = strlen(new);
- size_t retlen = count;
+ size_t retlen;
size_t newlen = count;
int samesize = (oldlen == newlen);
{
char *msg = replace_str(message, "\\", "\\\\");
if (msg == NULL) {
- ERROR(alloc_err);
+ ERROR("write_sensu plugin: Unable to alloc memory");
return NULL;
}
char *tmp = replace_str(msg, "\"", "\\\"");
free(msg);
if (tmp == NULL) {
- ERROR(alloc_err);
+ ERROR("write_sensu plugin: Unable to alloc memory");
return NULL;
}
msg = replace_str(tmp, "\n", "\\\n");
free(tmp);
if (msg == NULL) {
- ERROR(alloc_err);
+ ERROR("write_sensu plugin: Unable to alloc memory");
return NULL;
}
return msg;
char *ret_str;
char *temp_str;
int status;
- int i;
+ size_t i;
int res;
// add the severity/status
switch (n->severity) {
}
res = asprintf(&temp_str, "{\"status\": %d", status);
if (res == -1) {
- ERROR(alloc_err);
+ ERROR("write_sensu plugin: Unable to alloc memory");
return NULL;
}
ret_str = temp_str;
res = asprintf(&temp_str, "%s, \"timestamp\": %ld", ret_str, CDTIME_T_TO_TIME_T(n->time));
free(ret_str);
if (res == -1) {
- ERROR(alloc_err);
+ ERROR("write_sensu plugin: Unable to alloc memory");
return NULL;
}
ret_str = temp_str;
char *handlers_str = build_json_str_list("handlers", &(host->notification_handlers));
if (handlers_str == NULL) {
- ERROR(alloc_err);
+ ERROR("write_sensu plugin: Unable to alloc memory");
return NULL;
}
// incorporate the handlers
free(ret_str);
free(handlers_str);
if (res == -1) {
- ERROR(alloc_err);
+ ERROR("write_sensu plugin: Unable to alloc memory");
return NULL;
}
ret_str = temp_str;
res = asprintf(&temp_str, "%s, \"collectd_plugin\": \"%s\"", ret_str, n->plugin);
free(ret_str);
if (res == -1) {
- ERROR(alloc_err);
+ ERROR("write_sensu plugin: Unable to alloc memory");
return NULL;
}
ret_str = temp_str;
res = asprintf(&temp_str, "%s, \"collectd_plugin_type\": \"%s\"", ret_str, n->type);
free(ret_str);
if (res == -1) {
- ERROR(alloc_err);
+ ERROR("write_sensu plugin: Unable to alloc memory");
return NULL;
}
ret_str = temp_str;
res = asprintf(&temp_str, "%s, \"collectd_plugin_instance\": \"%s\"", ret_str, n->plugin_instance);
free(ret_str);
if (res == -1) {
- ERROR(alloc_err);
+ ERROR("write_sensu plugin: Unable to alloc memory");
return NULL;
}
ret_str = temp_str;
res = asprintf(&temp_str, "%s, \"collectd_plugin_type_instance\": \"%s\"", ret_str, n->type_instance);
free(ret_str);
if (res == -1) {
- ERROR(alloc_err);
+ ERROR("write_sensu plugin: Unable to alloc memory");
return NULL;
}
ret_str = temp_str;
res = asprintf(&temp_str, "%s, \"%s\": \"%s\"", ret_str, sensu_attrs[i], sensu_attrs[i+1]);
free(ret_str);
if (res == -1) {
- ERROR(alloc_err);
+ ERROR("write_sensu plugin: Unable to alloc memory");
return NULL;
}
ret_str = temp_str;
res = asprintf(&temp_str, "%s, %s", ret_str, sensu_tags);
free(ret_str);
if (res == -1) {
- ERROR(alloc_err);
+ ERROR("write_sensu plugin: Unable to alloc memory");
return NULL;
}
ret_str = temp_str;
res = asprintf(&temp_str, "%s, \"name\": \"%s\"", ret_str, &service_buffer[1]);
free(ret_str);
if (res == -1) {
- ERROR(alloc_err);
+ ERROR("write_sensu plugin: Unable to alloc memory");
return NULL;
}
ret_str = temp_str;
if (n->message[0] != 0) {
char *msg = replace_json_reserved(n->message);
if (msg == NULL) {
- ERROR(alloc_err);
+ ERROR("write_sensu plugin: Unable to alloc memory");
return NULL;
}
res = asprintf(&temp_str, "%s, \"output\": \"%s - %s\"", ret_str, severity, msg);
free(ret_str);
free(msg);
if (res == -1) {
- ERROR(alloc_err);
+ ERROR("write_sensu plugin: Unable to alloc memory");
return NULL;
}
ret_str = temp_str;
res = asprintf(&temp_str, "%s, \"current_value\": \"%.8f\"", ret_str, meta->nm_value.nm_double);
free(ret_str);
if (res == -1) {
- ERROR(alloc_err);
+ ERROR("write_sensu plugin: Unable to alloc memory");
return NULL;
}
ret_str = temp_str;
res = asprintf(&temp_str, "%s, \"%s\": \"%s\"", ret_str, meta->name, meta->nm_value.nm_string);
free(ret_str);
if (res == -1) {
- ERROR(alloc_err);
+ ERROR("write_sensu plugin: Unable to alloc memory");
return NULL;
}
ret_str = temp_str;
res = asprintf(&temp_str, "%s}\n", ret_str);
free(ret_str);
if (res == -1) {
- ERROR(alloc_err);
+ ERROR("write_sensu plugin: Unable to alloc memory");
return NULL;
}
ret_str = temp_str;
int statuses[vl->values_len];
struct sensu_host *host = ud->data;
gauge_t *rates = NULL;
- int i;
+ size_t i;
char *msg;
pthread_mutex_lock(&host->lock);
return -1;
}
}
- for (i = 0; i < (size_t) vl->values_len; i++) {
+ for (i = 0; i < vl->values_len; i++) {
msg = sensu_value_to_json(host, ds, vl, (int) i, rates, statuses[i]);
if (msg == NULL) {
sfree(rates);
host->notification_handlers.strs = NULL;
host->separator = strdup("/");
if (host->separator == NULL) {
- ERROR(alloc_err);
+ ERROR("write_sensu plugin: Unable to alloc memory");
sensu_free(host);
return -1;
}
sensu_tags_arr.nb_strs = 0;
sensu_tags_arr.strs = NULL;
- sensu_tags = malloc(sizeof(char));
- if (sensu_tags == NULL) {
- ERROR(alloc_err);
- return -1;
- }
- sensu_tags[0] = '\0';
for (i = 0; i < ci->children_num; i++) {
child = &ci->children[i];
if (strcasecmp("Node", child->key) == 0) {
sensu_config_node(child);
} else if (strcasecmp(child->key, "attribute") == 0) {
- char *key = NULL;
- char *val = NULL;
-
if (child->values_num != 2) {
WARNING("sensu attributes need both a key and a value.");
- free(sensu_tags);
- return -1;
+ continue;
}
if (child->values[0].type != OCONFIG_TYPE_STRING ||
- child->values[1].type != OCONFIG_TYPE_STRING) {
+ child->values[1].type != OCONFIG_TYPE_STRING) {
WARNING("sensu attribute needs string arguments.");
- free(sensu_tags);
- return -1;
- }
- if ((key = strdup(child->values[0].value.string)) == NULL) {
- ERROR(alloc_err);
- free(sensu_tags);
- return -1;
- }
- if ((val = strdup(child->values[1].value.string)) == NULL) {
- free(sensu_tags);
- free(key);
- ERROR(alloc_err);
- return -1;
+ continue;
}
- strarray_add(&sensu_attrs, &sensu_attrs_num, key);
- strarray_add(&sensu_attrs, &sensu_attrs_num, val);
- DEBUG("write_sensu: got attr: %s => %s", key, val);
- sfree(key);
- sfree(val);
+
+ strarray_add(&sensu_attrs, &sensu_attrs_num, child->values[0].value.string);
+ strarray_add(&sensu_attrs, &sensu_attrs_num, child->values[1].value.string);
+
+ DEBUG("write_sensu plugin: New attribute: %s => %s",
+ child->values[0].value.string,
+ child->values[1].value.string);
} else if (strcasecmp(child->key, "tag") == 0) {
char *tmp = NULL;
status = cf_util_get_string(child, &tmp);
}
}
if (sensu_tags_arr.nb_strs > 0) {
- free(sensu_tags);
+ sfree (sensu_tags);
sensu_tags = build_json_str_list("tags", &sensu_tags_arr);
free_str_list(&sensu_tags_arr);
if (sensu_tags == NULL) {
- ERROR(alloc_err);
+ ERROR("write_sensu plugin: Unable to alloc memory");
return -1;
}
}